Merge pull request dotnet#4481 from swaroop-sridhar/aagc2

GCInfo: Fix code-offset normalization on ARM
DrewScoggins · Apr 22, 2016 · 0ce162f · 0ce162f
2 parents aa1f7b1 + 50cf713
commit 0ce162f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/inc/gcinfotypes.h b/src/inc/gcinfotypes.h
@@ -215,8 +215,8 @@ struct GcStackSlot
 #define NORMALIZE_SIZE_OF_STACK_AREA(x) ((x)>>2)
 #define DENORMALIZE_SIZE_OF_STACK_AREA(x) ((x)<<2)
 #define CODE_OFFSETS_NEED_NORMALIZATION 1
-#define NORMALIZE_CODE_OFFSET(x) ((x)>>1)
-#define DENORMALIZE_CODE_OFFSET(x) ((x)<<1)
+#define NORMALIZE_CODE_OFFSET(x) (x)   // Instructions are 2/4 bytes long in Thumb/ARM states, 
+#define DENORMALIZE_CODE_OFFSET(x) (x) // but the safe-point offsets are encoded with a -1 adjustment.
 #define NORMALIZE_REGISTER(x) (x)
 #define DENORMALIZE_REGISTER(x) (x)
 #define NORMALIZE_NUM_SAFE_POINTS(x) (x)