Fix more problems caused by padding in the Capability structure

[ghc-hetmet.git] / rts / Capability.h

diff --git a/rts/Capability.h b/rts/Capability.h
index 478b0f1..ba0695c 100644 (file)
--- a/rts/Capability.h
+++ b/rts/Capability.h
@@ -32,11 +32,7 @@ struct Capability_ {
     // code.  During STG execution, the BaseReg register always points
     // to the StgRegTable of the current Capability (&cap->r).
     StgFunTable f;
-    StgRegTable r GNU_ATTRIBUTE(packed);
-       // packed eliminates any padding between f and r.  Not strictly
-       // necessary, but it means the negative offsets for accessing
-       // the fields of f when we are in STG code are as small as
-       // possible.
+    StgRegTable r;
 
     nat no;  // capability number.
 
@@ -147,12 +143,10 @@ struct Capability_ {
 
 // Converts a *StgRegTable into a *Capability.
 //
-#define OFFSET(s_type, field) ((size_t)&(((s_type*)0)->field))
-
 INLINE_HEADER Capability *
 regTableToCapability (StgRegTable *reg)
 {
-    return (Capability *)((void *)((unsigned char*)reg - OFFSET(Capability,r)));
+    return (Capability *)((void *)((unsigned char*)reg - FIELD_OFFSET(Capability,r)));
 }
 
 // Initialise the available capabilities.