From cbd2e9feed7c30ed517557352c4750ddedb2ac78 Mon Sep 17 00:00:00 2001 From: chaoskagami Date: Sat, 11 Jun 2016 21:11:30 -0400 Subject: [PATCH] Partially revert an interpreter change --- host/bytecode_asm.py | 1 - source/interp.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/host/bytecode_asm.py b/host/bytecode_asm.py index 6e81c1e..eef5c18 100755 --- 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 c31b5b9..9beb46e 100644 --- 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.) -- 2.39.5