vm: fix RT_HERE fixup on image load

diff --git a/vm/compaction.cpp b/vm/compaction.cpp
index 3deb0afc2f00e04bc3289b29a26b1b324a4b86c4..9d26062a5c498895b9b7ec2f527f26be4118284b 100644 (file)
--- a/vm/compaction.cpp
+++ b/vm/compaction.cpp
@@ -117,8 +117,9 @@ struct code_block_compaction_relocation_visitor {
                case RT_HERE:
                        {
                                cell value = op.load_value(old_offset);
-                               cell offset = value & (data_alignment - 1);
-                               op.store_value((cell)fixup.fixup_code((code_block *)value) + offset);
+                               cell offset = TAG(value);
+                               code_block *compiled = (code_block *)UNTAG(value);
+                               op.store_value((cell)fixup.fixup_code(compiled) + offset);
                                break;
                        }
                case RT_THIS:

diff --git a/vm/image.cpp b/vm/image.cpp
index c9682ce192727cf8e3aa63ded5049b5aa6aa5126..4643d897797bee7e66325dc7683b7f6ab304284d 100755 (executable)
--- a/vm/image.cpp
+++ b/vm/image.cpp
@@ -180,8 +180,9 @@ struct startup_code_block_relocation_visitor {
                case RT_HERE:
                        {
                                cell value = op.load_value(old_offset);
-                               cell offset = value & (data_alignment - 1);
-                               op.store_value((cell)fixup.fixup_code((code_block *)value) + offset);
+                               cell offset = TAG(value);
+                               code_block *compiled = (code_block *)UNTAG(value);
+                               op.store_value((cell)fixup.fixup_code(compiled) + offset);
                                break;
                        }
                case RT_UNTAGGED: