Partially revert an interpreter change

diff --git a/host/bytecode_asm.py b/host/bytecode_asm.py
index 6e81c1e75987e4a89a6068bcc59903ba65175a07..eef5c183cddd1d3be0af231c6ad32f828b5f58a1 100755 (executable)
--- a/host/bytecode_asm.py
+++ b/host/bytecode_asm.py
@@ -348,7 +348,6 @@ with open(in_file, "r") as ins:
                        tokens = re.split("\s+", line.strip("\n")) # Split by whitespace.
                        bytes = parse_op(tokens, offsets) # Parse.
                        if bytes:
-                               print([bytes])
                                bytecode += bytes
 
                data  = bytearray("AIDA")

diff --git a/source/interp.c b/source/interp.c
index c31b5b9e46b1822b4ce82406b74859a543a8a20e..9beb46e6f40cfddb6b7914daca50498ff3531cb9 100644 (file)
--- a/source/interp.c
+++ b/source/interp.c
@@ -77,16 +77,16 @@ exec_bytecode(uint8_t *bytecode, uint16_t ver, uint32_t len, int debug)
 {
     if (!init_bytecode) {
 #ifndef LOADER
-        modes[0].memory = (uint8_t *)firm_loc + sizeof(firm_h);
-        modes[0].size   = firm_loc->section[0].size + firm_loc->section[1].size +
+        modes[0].memory = (uint8_t *)firm_loc;
+        modes[0].size   = firm_loc->section[0].size + firm_loc->section[1].size + sizeof(firm_h) +
                           firm_loc->section[2].size + firm_loc->section[3].size; // NATIVE_FIRM
 
-        modes[1].memory = (uint8_t *)agb_firm_loc + sizeof(firm_h);
-        modes[1].size   = agb_firm_loc->section[0].size + agb_firm_loc->section[1].size +
+        modes[1].memory = (uint8_t *)agb_firm_loc;
+        modes[1].size   = agb_firm_loc->section[0].size + agb_firm_loc->section[1].size + sizeof(firm_h) +
                           agb_firm_loc->section[2].size + agb_firm_loc->section[3].size; // AGB_FIRM
 
-        modes[2].memory = (uint8_t *)twl_firm_loc + sizeof(firm_h);
-        modes[2].size   = twl_firm_loc->section[0].size + twl_firm_loc->section[1].size +
+        modes[2].memory = (uint8_t *)twl_firm_loc;
+        modes[2].size   = twl_firm_loc->section[0].size + twl_firm_loc->section[1].size + sizeof(firm_h) +
                           twl_firm_loc->section[2].size + twl_firm_loc->section[3].size; // TWL_FIRM
 
         // NATIVE_FIRM Process9 (This is also the default mode.)