OID change

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 1474de25f90607e4ecd34f8326ed8b6b8012445e..cc9b78fbce1ed09829ab3807b30c80bea9adf834 100644 (file)
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -1422,7 +1422,7 @@ public class BuildCode {
            output.println(generateTemp(fm, fgcn.getSrc(),lb)+"=(void *)transRead(trans, (unsigned int) "+generateTemp(fm, fgcn.getSrc(),lb)+");");
        } else {
            /* Need to convert to OID */
-           output.println(generateTemp(fm, fgcn.getSrc(),lb)+"=(void *)OID("+generateTemp(fm, fgcn.getSrc(),lb)+");");
+           output.println(generateTemp(fm, fgcn.getSrc(),lb)+"=(void *)COMPOID("+generateTemp(fm, fgcn.getSrc(),lb)+");");
        }
     }
 

diff --git a/Robust/src/Runtime/DSTM/interface/dstm.h b/Robust/src/Runtime/DSTM/interface/dstm.h
index 69408f029fd8fc6741e80bcad39c5c6d7ff2770b..766398b6fb85588a0174097d946af8ef1f292fcd 100644 (file)
--- a/Robust/src/Runtime/DSTM/interface/dstm.h
+++ b/Robust/src/Runtime/DSTM/interface/dstm.h
@@ -72,6 +72,9 @@ typedef struct objheader {
 #define OID(x)\
     (*((unsigned int *)&((struct ___Object___ *)((unsigned int) x + sizeof(objheader_t)))->___nextobject___))
 
+#define COMPOID(x)\
+    (*((unsigned int *)&((struct ___Object___ *) x)->___nextobject___))
+
 #define STATUS(x)\
         *((unsigned int *) &(((struct ___Object___ *)((unsigned int) x + sizeof(objheader_t)))->___localcopy___))
 

diff --git a/Robust/src/Runtime/DSTM/interface/trans.c b/Robust/src/Runtime/DSTM/interface/trans.c
index ca09e1a0d08c0b131008adfa97024889bb928f75..5a82d24d0690ced8a159e84ea861bbaa6ab4108c 100644 (file)
--- a/Robust/src/Runtime/DSTM/interface/trans.c
+++ b/Robust/src/Runtime/DSTM/interface/trans.c
@@ -187,7 +187,7 @@ transrecord_t *transStart()
 objheader_t *transRead(transrecord_t *record, unsigned int oid) {      
        unsigned int machinenumber;
        objheader_t *tmp, *objheader;
-       void *objcopy;
+       objheader_t *objcopy;
        int size, rc, found = 0;
        void *buf;
        struct timespec ts;