From d8d36da213be3c566bc4c7470350693cc48502c6 Mon Sep 17 00:00:00 2001 From: Vladimir Kononovich Date: Tue, 27 Jun 2023 12:39:19 +0300 Subject: [PATCH] Added missing files. Updated to 10.3.1 --- .classpath | 659 ++++++++++++++++++ .gitignore | 3 - .project | 24 + src/main/help/help/shared/Frontpage.css | 58 -- src/main/help/help/topics/amigahunk/help.html | 46 +- .../java/amigahunk/AmigaHunkAnalyzer.java | 2 +- 6 files changed, 707 insertions(+), 85 deletions(-) create mode 100644 .classpath create mode 100644 .project delete mode 100644 src/main/help/help/shared/Frontpage.css diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..8c9a406 --- /dev/null +++ b/.classpath @@ -0,0 +1,659 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index a4d7b10..30deef1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,3 @@ /dist/ /samples/ *.class -.antProperties.xml -/.classpath -/.project diff --git a/.project b/.project new file mode 100644 index 0000000..2e42f68 --- /dev/null +++ b/.project @@ -0,0 +1,24 @@ + + + AmigaHunk + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + + + Ghidra + 2 + D:/Ghidra/ghidra_10.3.1_PUBLIC + + + diff --git a/src/main/help/help/shared/Frontpage.css b/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 452bf6e..0000000 --- a/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,58 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -code { color: black; font-family: courier new; font-size: 14pt; } diff --git a/src/main/help/help/topics/amigahunk/help.html b/src/main/help/help/topics/amigahunk/help.html index 8f858d2..92d024a 100644 --- a/src/main/help/help/topics/amigahunk/help.html +++ b/src/main/help/help/topics/amigahunk/help.html @@ -1,23 +1,23 @@ - - - - - - - - - - - Skeleton Help File for a Module - - - - -

Skeleton Help File for a Module

- -

This is a simple skeleton help topic. For a better description of what should and should not - go in here, see the "sample" Ghidra extension in the Extensions/Ghidra directory, or see your - favorite help topic. In general, language modules do not have their own help topics.

- - + + + + + + + + + + + Skeleton Help File for a Module + + + + +

Skeleton Help File for a Module

+ +

This is a simple skeleton help topic. For a better description of what should and should not + go in here, see the "sample" Ghidra extension in the Extensions/Ghidra directory, or see your + favorite help topic. In general, language modules do not have their own help topics.

+ + diff --git a/src/main/java/amigahunk/AmigaHunkAnalyzer.java b/src/main/java/amigahunk/AmigaHunkAnalyzer.java index bc52a98..88dd26c 100644 --- a/src/main/java/amigahunk/AmigaHunkAnalyzer.java +++ b/src/main/java/amigahunk/AmigaHunkAnalyzer.java @@ -215,7 +215,7 @@ public AddressSetView flowConstants(final Program program, Address flowStart, throws CancelledException { ConstantPropagationContextEvaluator eval = - new ConstantPropagationContextEvaluator(true) { + new ConstantPropagationContextEvaluator(monitor, true) { @Override public boolean evaluateContext(VarnodeContext context, Instruction instr) { String mnemonic = instr.getMnemonicString();