Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 08:04:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Ghidra_12.1'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-03-24 09:26:31 -04:00
parent 5c932c52b7 07f43cfe80
commit 3e607aaf89
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/PseudoDisassemblerTest.java
+4 -4
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -56,13 +56,13 @@ public class PseudoDisassemblerTest extends AbstractGhidraHeadlessIntegrationTes
@Test @Test
public void testToStringArmSeparator() throws Exception { public void testToStringArmSeparator() throws Exception {
programBuilder.setBytes("0", "08 f8 00 00 40 00");// strb.w r0,[r8,r0,0x0] programBuilder.setBytes("0", "08 f8 10 00");// strb.w r0,[r8,r0,lsl 0x1]
programBuilder.setRegisterValue("TMode", "0", "1", 1); programBuilder.setRegisterValue("TMode", "0", "1", 1);
PseudoInstruction instr = PseudoInstruction instr =
disassembler.disassemble(program.getAddressFactory().getAddress("0")); disassembler.disassemble(program.getAddressFactory().getAddress("0"));
String str = instr.toString(); String str = instr.toString();
assertEquals("strb.w r0,[r8,r0,lsl #0x0]", str);// wan't to make sure all markup is printed assertEquals("strb.w r0,[r8,r0,lsl #0x1]", str);// want to make sure all markup is printed
programBuilder.setBytes("0", "00 f0 20 03");// nopeq programBuilder.setBytes("0", "00 f0 20 03");// nopeq
programBuilder.setRegisterValue("TMode", "0", "1", 0); programBuilder.setRegisterValue("TMode", "0", "1", 0);
Ghidra/Processors/ARM/data/languages/ARMTHUMBinstructions.sinc
+2 -2
View File
@@ -516,12 +516,12 @@ thBitWidth: "#"^w is imm3_shft & imm2_shft & thc0004 [ w = thc0004 - ((imm3_shft
@endif # VERSION_6T2 || VERSION_7 @endif # VERSION_6T2 || VERSION_7
thAddrShift:[Rn0003, Rm0003] is Rn0003; thc0405=0 & Rm0003 { thAddrShift:[Rn0003,Rm0003] is Rn0003; thc0405=0 & Rm0003 {
local addr = Rn0003 + Rm0003; local addr = Rn0003 + Rm0003;
export *:4 addr; export *:4 addr;
} }
thAddrShift: [Rn0003, Rm0003, "lsl #"^thc0405] is Rn0003; thc0405 & Rm0003 { thAddrShift: [Rn0003,Rm0003,"lsl #"^thc0405] is Rn0003; thc0405 & Rm0003 {
local addr = Rn0003 + (Rm0003 << thc0405); local addr = Rn0003 + (Rm0003 << thc0405);
export *:4 addr; export *:4 addr;
} }