From 3848ef1cab34690dea7c9fba0ff08fe14b7a13e5 Mon Sep 17 00:00:00 2001 From: Cliff Click Date: Tue, 18 Mar 2025 13:50:39 -0700 Subject: Missed merge piece --- .../src/main/java/com/seaofnodes/simple/node/cpus/arm/MemOpARM.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter21/src/main/java/com/seaofnodes/simple/node/cpus/arm/MemOpARM.java b/chapter21/src/main/java/com/seaofnodes/simple/node/cpus/arm/MemOpARM.java index 0987b7bf..48e11522 100644 --- a/chapter21/src/main/java/com/seaofnodes/simple/node/cpus/arm/MemOpARM.java +++ b/chapter21/src/main/java/com/seaofnodes/simple/node/cpus/arm/MemOpARM.java @@ -53,8 +53,8 @@ public abstract class MemOpARM extends MemOpNode implements MachNode { short off = enc.reg(off()); short val = enc.reg(xval ); int body = off() == null - ? arm.load_str_imm(0b1111100101, off, ptr, val) - : arm.indr_adr(0b11111000011, off, arm.STORE_LOAD_OPTION.SXTX, 0, ptr, val); + ? arm.load_str_imm(opcode, off, ptr, val) + : arm.indr_adr(opcode+1, off, arm.STORE_LOAD_OPTION.SXTX, 0, ptr, val); enc.add4(body); } -- cgit v1.2.3