Fix header bug in NativeObject

hpi-swa · Aug 22, 2022 · e1df9b2 · e1df9b2
1 parent 28a2ce9
commit e1df9b2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/image/SqueakImageChunk.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/image/SqueakImageChunk.java
@@ -145,6 +145,10 @@ public int getHash() {
         return ObjectHeader.getHash(header);
     }
 
+    public long getHeader() {
+        return header;
+    }
+
     public ClassObject getSqueakClass() {
         if (squeakClass == null) {
             squeakClass = getClassChunk().asClassObject(null);

diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/NativeObject.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/NativeObject.java
@@ -44,7 +44,7 @@ public NativeObject() { // constructor for special selectors
         storage = ArrayUtils.EMPTY_ARRAY;
     }
 
-    private NativeObject(final int header, final ClassObject classObject, final Object storage) {
+    private NativeObject(final long header, final ClassObject classObject, final Object storage) {
         super(header, classObject);
         assert storage != null : "Unexpected `null` value";
         this.storage = storage;
@@ -62,7 +62,7 @@ private NativeObject(final NativeObject original, final Object storageCopy) {
     }
 
     public static NativeObject newNativeBytes(final SqueakImageChunk chunk) {
-        return new NativeObject(chunk.getHash(), chunk.getSqueakClass(), chunk.getBytes());
+        return new NativeObject(chunk.getHeader(), chunk.getSqueakClass(), chunk.getBytes());
     }
 
     public static NativeObject newNativeBytes(final SqueakImageContext img, final ClassObject klass, final byte[] bytes) {
@@ -74,7 +74,7 @@ public static NativeObject newNativeBytes(final SqueakImageContext img, final Cl
     }
 
     public static NativeObject newNativeInts(final SqueakImageChunk chunk) {
-        return new NativeObject(chunk.getHash(), chunk.getSqueakClass(), UnsafeUtils.toInts(chunk.getBytes()));
+        return new NativeObject(chunk.getHeader(), chunk.getSqueakClass(), UnsafeUtils.toInts(chunk.getBytes()));
     }
 
     public static NativeObject newNativeInts(final SqueakImageContext img, final ClassObject klass, final int size) {
@@ -86,7 +86,7 @@ public static NativeObject newNativeInts(final SqueakImageContext img, final Cla
     }
 
     public static NativeObject newNativeLongs(final SqueakImageChunk chunk) {
-        return new NativeObject(chunk.getHash(), chunk.getSqueakClass(), UnsafeUtils.toLongs(chunk.getBytes()));
+        return new NativeObject(chunk.getHeader(), chunk.getSqueakClass(), UnsafeUtils.toLongs(chunk.getBytes()));
     }
 
     public static NativeObject newNativeLongs(final SqueakImageContext img, final ClassObject klass, final int size) {
@@ -98,7 +98,7 @@ public static NativeObject newNativeLongs(final SqueakImageContext img, final Cl
     }
 
     public static NativeObject newNativeShorts(final SqueakImageChunk chunk) {
-        return new NativeObject(chunk.getHash(), chunk.getSqueakClass(), UnsafeUtils.toShorts(chunk.getBytes()));
+        return new NativeObject(chunk.getHeader(), chunk.getSqueakClass(), UnsafeUtils.toShorts(chunk.getBytes()));
     }
 
     public static NativeObject newNativeShorts(final SqueakImageContext img, final ClassObject klass, final int size) {