diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/PseudoDisassemblerTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/PseudoDisassemblerTest.java index 5425838862..389b7cf8f5 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/PseudoDisassemblerTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/PseudoDisassemblerTest.java @@ -4,9 +4,9 @@ * 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. @@ -56,13 +56,13 @@ public class PseudoDisassemblerTest extends AbstractGhidraHeadlessIntegrationTes @Test 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); PseudoInstruction instr = disassembler.disassemble(program.getAddressFactory().getAddress("0")); 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.setRegisterValue("TMode", "0", "1", 0); diff --git a/Ghidra/Processors/ARM/data/languages/ARMTHUMBinstructions.sinc b/Ghidra/Processors/ARM/data/languages/ARMTHUMBinstructions.sinc index 4bfdff5b01..408634fc75 100644 --- a/Ghidra/Processors/ARM/data/languages/ARMTHUMBinstructions.sinc +++ b/Ghidra/Processors/ARM/data/languages/ARMTHUMBinstructions.sinc @@ -516,12 +516,12 @@ thBitWidth: "#"^w is imm3_shft & imm2_shft & thc0004 [ w = thc0004 - ((imm3_shft @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; 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); export *:4 addr; }