From 79f4349c785a644ed9494804495cb31a6d15bbc6 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 22 Feb 2015 00:44:30 -0800 Subject: 820 - bugfix in get-address --- cpp/017record | 5 ++++- cpp/018address | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'cpp') diff --git a/cpp/017record b/cpp/017record index 89516672..42fda587 100644 --- a/cpp/017record +++ b/cpp/017record @@ -116,7 +116,10 @@ case GET_ADDRESS: { assert(instructions[pc].ingredients[1].types.size() == 1); assert(instructions[pc].ingredients[1].types[0] == 0); // must be literal size_t offset = to_int(instructions[pc].ingredients[1].name); - int src = base_address+offset; + int src = base_address; + for (size_t i = 0; i < offset; ++i) { + src += size_of(reagent(Type[base_type].elements[i][0])); + } trace("run") << "address to copy is " << src; vector result; result.push_back(src); diff --git a/cpp/018address b/cpp/018address index 91954ec8..19650e84 100644 --- a/cpp/018address +++ b/cpp/018address @@ -161,7 +161,10 @@ case GET_ADDRESS: { assert(instructions[pc].ingredients[1].types.size() == 1); assert(instructions[pc].ingredients[1].types[0] == 0); // must be literal size_t offset = to_int(instructions[pc].ingredients[1].name); - int src = base_address+offset; + int src = base_address; + for (size_t i = 0; i < offset; ++i) { + src += size_of(reagent(Type[base_type].elements[i][0])); + } trace("run") << "address to copy is " << src; vector result; result.push_back(src); -- cgit 1.4.1-2-gfad0