Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-28 07:46:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Corrected ARM/Thumb adcs/sbcs flag update macros.

Browse Source
This commit is contained in:
ghidorahrex
2021-08-17 10:47:43 -04:00
parent 0956746cf7
commit 7130901ed5
9 changed files with 226 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Extensions/SleighDevTools/certification.manifest
+1
View File
@@ -23,5 +23,6 @@ pcodetest/c_src/ParameterPassing2.test||GHIDRA||||END|
pcodetest/c_src/ParameterPassing3.test||GHIDRA||||END|
pcodetest/c_src/PointerManipulation.test||GHIDRA||||END|
pcodetest/c_src/StructUnionManipulation.test||GHIDRA||||END|
pcodetest/c_src/arm/arm.test||GHIDRA||||END|
pcodetest/c_src/misc.test||GHIDRA||||END|
pcodetest/c_src/msp430x.ld||GHIDRA||||END|
Ghidra/Extensions/SleighDevTools/pcodetest/build.py
+4 -6
View File
@@ -112,10 +112,8 @@ class BuildUtil(object):
try:
if not os.path.isdir(dname):
self.makedirs(dname)
if os.path.isfile(fname):
else:
self.copy(fname, dname, verbose=True)
elif os.path.isdir(fname):
self.copy(fname, dname, dir=True, verbose=True)
except IOError as e:
self.log_err('Error occurred exporting %s to %s' % (fname, dname))
self.log_err("Unexpected error: %s" % str(e))
@@ -129,9 +127,9 @@ class BuildUtil(object):
try: os.makedirs(dir)
except: pass
# copy a file to a directory
def copy(self, fname, dname, verbose=True, dir=False):
if not dir:
# copy a file/directory to a directory
def copy(self, fname, dname, verbose=True):
if not os.path.isdir(fname):
if verbose: self.log_info('cp -av %s %s' % (fname, dname))
shutil.copy(fname, dname)
else:
Ghidra/Extensions/SleighDevTools/pcodetest/c_src/arm/arm.test
+43
View File
@@ -0,0 +1,43 @@
#include "pcode_test.h"
/* This test checks the correct carry flag handling for adc instructions */
TEST arm_adc_Main()
{
extern u4 u4_adc_carry(u4 a, u4 b, u1 carry);
extern u4 u4_adc_overflow(u4 a, u4 b, u1 carry);
ASSERTU1(u4_adc_carry(0xffffffff, 0, 1), 1);
ASSERTU1(u4_adc_carry(0, 0xffffffff, 1), 1);
ASSERTU1(u4_adc_carry(1, 0xffffffff, 1), 1);
ASSERTU1(u4_adc_carry(0xffffffff, 1, 1), 1);
ASSERTU1(u4_adc_carry(1, 0xfffffffe, 1), 1);
ASSERTU1(u4_adc_carry(0xfffffffe, 1, 1), 1);
ASSERTU1(u4_adc_carry(0xffffffff, 0, 0), 0);
ASSERTU1(u4_adc_carry(0, 0xffffffff, 0), 0);
ASSERTU1(u4_adc_carry(1, 0xffffffff, 0), 1);
ASSERTU1(u4_adc_carry(0xffffffff, 1, 0), 1);
ASSERTU1(u4_adc_carry(1, 0xfffffffe, 0), 0);
ASSERTU1(u4_adc_carry(0xfffffffe, 1, 0), 0);
ASSERTU1(u4_adc_overflow(0x80000000, 0xffffffff, 1), 0);
}
/* This test checks the correct carry flag handling for sbc instructions */
TEST arm_sbc_Main()
{
extern u4 u4_sbc_carry(i4 a, i4 b, u1 carry);
ASSERTU1(u4_sbc_carry(-1, 0, 0), 1);
ASSERTU1(u4_sbc_carry(0, 0x7fffffff, 0), 0);
ASSERTU1(u4_sbc_carry(-1, 0x7fffffff, 0), 1);
ASSERTU1(u4_sbc_carry(-1, 1, 1), 1);
ASSERTU1(u4_sbc_carry(1, 1, 1), 1);
ASSERTU1(u4_sbc_carry(-1, 1, 1), 1);
extern i4 i4_sbc(i4 a, i4 b, u1 carry);
ASSERTU1(i4_sbc(0, 0, 0), -1);
ASSERTU1(i4_sbc(-1, 0, 0), -2);
ASSERTU1(i4_sbc(0, 0, 1), 0);
ASSERTU1(i4_sbc(0, 1, 1), -1);
ASSERTU1(i4_sbc(2, 1, 0), 0);
}
MAIN asm_main() { }
Ghidra/Extensions/SleighDevTools/pcodetest/c_src/arm/arm_BODY.c
+149
View File
@@ -0,0 +1,149 @@
/* ###
* 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.
*/
#include "pcode_test.h"
u4 u4_adc_carry(u4 a, u4 b, u1 carry)
{
u4 res = 0;
u4 x = 0xffffffff;
u4 y = 1;
if (carry == 1) {
__asm__(
".syntax unified\n"
"adds %[x_res],%[x],%[y]\n" /* set the carry flag */
: [x_res] "=r" (x)
: [x] "r" (x), [y] "r" (y)
);
} else {
__asm__(
".syntax unified\n"
"adds %[x_res],%[y],%[y]\n" /* clear the carry flag */
: [x_res] "=r" (x)
: [y] "r" (y)
);
}
__asm__(
".syntax unified\n"
"adcs %[input_a],%[input_a],%[input_b]\n"
"bcc adc_nocarry\n"
"ldr %[result], =0x1\n"
"b adc_end\n"
"adc_nocarry:\n"
"ldr %[result], =0x0\n"
"adc_end:\n"
: [result] "=r" (res)
: [input_a] "r" (a), [input_b] "r" (b)
);
return res;
}
u4 u4_adc_overflow(u4 a, u4 b, u1 carry)
{
u4 res = 0;
u4 x = 0xffffffff;
u4 y = 1;
if (carry == 1) {
__asm__(
".syntax unified\n"
"adds %[x_res],%[x],%[y]\n" /* set the carry flag */
: [x_res] "=r" (x)
: [x] "r" (x), [y] "r" (y)
);
} else {
__asm__(
".syntax unified\n"
"adds %[x_res],%[y],%[y]\n" /* clear the carry flag */
: [x_res] "=r" (x)
: [y] "r" (y)
);
}
__asm__(
".syntax unified\n"
"adcs %[input_a],%[input_a],%[input_b], lsr #1\n"
"bvc adc_noover\n"
"ldr %[result], =0x1\n"
"b adc_o_end\n"
"adc_noover:\n"
"ldr %[result], =0x0\n"
"adc_o_end:\n"
: [result] "=r" (res)
: [input_a] "r" (a), [input_b] "r" (b)
);
return res;
}
u4 u4_sbc_carry(i4 a, i4 b, u1 carry)
{
u4 res = 0;
u4 x = 0xffffffff;
u4 y = 1;
if (carry == 1) {
__asm__(
".syntax unified\n"
"adds %[x_res],%[x],%[y]\n" /* set the carry flag */
: [x_res] "=r" (x)
: [x] "r" (x), [y] "r" (y)
);
} else {
__asm__(
".syntax unified\n"
"adds %[x_res],%[y],%[y]\n" /* clear the carry flag */
: [x_res] "=r" (x)
: [y] "r" (y)
);
}
__asm__(
".syntax unified\n"
"sbcs %[input_a],%[input_a],%[input_b]\n"
"bcc sbc_nocarry\n"
"ldr %[result], =0x1\n"
"b sbc_end\n"
"sbc_nocarry:\n"
"ldr %[result], =0x0\n"
"sbc_end:\n"
: [result] "=r" (res)
: [input_a] "r" (a), [input_b] "r" (b)
);
return res;
}
i4 i4_sbc(i4 a, i4 b, u1 carry)
{
u4 res = 0;
u4 x = 0xffffffff;
u4 y = 1;
if (carry == 1) {
__asm__(
".syntax unified\n"
"adds %[x_res],%[x],%[y]\n" /* set the carry flag */
: [x_res] "=r" (x)
: [x] "r" (x), [y] "r" (y)
);
} else {
__asm__(
".syntax unified\n"
"adds %[x_res],%[y],%[y]\n" /* clear the carry flag */
: [x_res] "=r" (x)
: [y] "r" (y)
);
}
__asm__(
"sbc %[result],%[input_a],%[input_b]\n"
: [result] "=r" (res)
: [input_a] "r" (a), [input_b] "r" (b)
);
return res;
}
Ghidra/Extensions/SleighDevTools/pcodetest/defaults.py
+1
View File
@@ -49,4 +49,5 @@ PCodeTest.defaults.readelf_exe = 'bin/readelf'
PCodeTest.defaults.nm_exe = 'bin/nm'
PCodeTest.defaults.strip_exe = 'bin/strip'
PCodeTest.defaults.variants = {'O0': '-O0', 'O3': '-O3'}
PCodeTest.defaults.proc_test = ''
Ghidra/Extensions/SleighDevTools/pcodetest/pcode_defs.py
+10
View File
@@ -24,6 +24,7 @@ PCodeTest({
'toolchain': 'ARM/arm-eabi',
'language_id': 'ARM:LE:32:v7',
'ccflags': '-L %(toolchain_dir)s/lib/gcc/arm-eabi/%(gcc_version)s -lgcc',
'proc_test': 'arm',
})
PCodeTest({
@@ -34,6 +35,7 @@ PCodeTest({
'toolchain': 'ARM/armbe-eabi',
'language_id': 'ARM:BE:32:v7',
'ccflags': '-mbig-endian -L %(toolchain_dir)s/lib/gcc/arm-eabi/%(gcc_version)s -lgcc',
'proc_test': 'arm',
'has_float': 0,
'has_double': 0,
'has_longlong': 0,
@@ -45,6 +47,7 @@ PCodeTest({
'toolchain': 'ARM/arm-eabi',
'ccflags': '-mcpu=arm2 -L %(toolchain_dir)s/lib/gcc/arm-eabi/%(gcc_version)s -lgcc',
'language_id': 'ARM:LE:32:v7',
'proc_test': 'arm',
})
PCodeTest({
@@ -52,6 +55,7 @@ PCodeTest({
'toolchain': 'ARM/arm-eabi',
'ccflags': '-mcpu=arm7 -L %(toolchain_dir)s/lib/gcc/arm-eabi/%(gcc_version)s -lgcc',
'language_id': 'ARM:LE:32:v7',
'proc_test': 'arm',
})
PCodeTest({
@@ -59,6 +63,7 @@ PCodeTest({
'toolchain': 'ARM/arm-eabi',
'ccflags': '-mcpu=arm8 -L %(toolchain_dir)s/lib/gcc/arm-eabi/%(gcc_version)s -lgcc',
'language_id': 'ARM:LE:32:v7',
'proc_test': 'arm',
})
PCodeTest({
@@ -66,6 +71,7 @@ PCodeTest({
'toolchain': 'ARM/arm-eabi',
'ccflags': '-mcpu=arm9 -L %(toolchain_dir)s/lib/gcc/arm-eabi/%(gcc_version)s -lgcc',
'language_id': 'ARM:LE:32:v7',
'proc_test': 'arm',
})
PCodeTest({
@@ -76,6 +82,7 @@ PCodeTest({
'toolchain': 'ARM/arm-eabi',
'ccflags': '-mcpu=arm10e -L %(toolchain_dir)s/lib/gcc/arm-eabi/%(gcc_version)s -lgcc',
'language_id': 'ARM:LE:32:v7',
'proc_test': 'arm',
})
PCodeTest({
@@ -86,6 +93,7 @@ PCodeTest({
'toolchain': 'ARM/arm-eabi',
'ccflags': '-mthumb -L %(toolchain_dir)s/lib/gcc/arm-eabi/%(gcc_version)s/thumb -lgcc',
'language_id': 'ARM:LE:32:v7',
'proc_test': 'arm',
})
PCodeTest({
@@ -94,6 +102,7 @@ PCodeTest({
'toolchain': 'ARM/armbe-eabi',
'ccflags': '-mthumb -mbig-endian -L %(toolchain_dir)s/lib/gcc/armbe-eabi/%(gcc_version)s/thumb -lgcc',
'language_id': 'ARM:BE:32:v7',
'proc_test': 'arm',
'has_float': 0,
'has_double': 0,
'has_longlong': 0,
@@ -107,6 +116,7 @@ PCodeTest({
'toolchain': 'ARM/arm-eabi',
'ccflags': '-mthumb -mcpu=cortex-a8 -mfloat-abi=softfp -L %(toolchain_dir)s/lib/gcc/arm-eabi/%(gcc_version)s/thumb -lgcc',
'language_id': 'ARM:LE:32:v7',
'proc_test': 'arm',
})
PCodeTest({
Ghidra/Extensions/SleighDevTools/pcodetest/pcodetest.py
+4 -1
View File
@@ -103,7 +103,10 @@ class PCodeTestBuild(BuildUtil):
# Get a list of strings to filter input files
available_files = sorted(glob.glob(self.config.format('%(pcodetest_src)s/*')))
if self.config.proc_test:
available_files.extend(sorted(glob.glob(self.config.format('%(pcodetest_src)s/%(proc_test)s/*'))))
available_files = [x for x in available_files if not os.path.isdir(x) ]
# skip any?
skip_files = self.config.skip_files
if len(skip_files) > 0: