commit afdcbcb56d0c2f985d0291c369bbc493eedb05b0
author Mathieu Chartier <mathieuc@google.com> Wed Apr 26 16:43:35 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Apr 26 16:48:27 2017 -0700
tree 236266aadd25eff5f37ca08e5295ae4b96065dcb
parent 8d0f3aaf28358697ec812955cdf975ca6c6ff901

Remove some hardcoded cases of kCardShift

Also added cpp-define-generator to do this. This makes it easier to
change the GC card size.

Bug: 36457259
Test: test-art-host

Change-Id: I03b59f2bbb9b483280bea34575f5373ec6b15b98

runtime/arch/arm64/quick_entrypoints_arm64.S

diff --git a/runtime/arch/arm64/quick_entrypoints_arm64.S b/runtime/arch/arm64/quick_entrypoints_arm64.S
index d043962..c555126 100644
--- a/runtime/arch/arm64/quick_entrypoints_arm64.S
+++ b/runtime/arch/arm64/quick_entrypoints_arm64.S
@@ -1416,7 +1416,7 @@
     POISON_HEAP_REF w2
     str w2, [x3, x1, lsl #2]                             // Heap reference = 32b
     ldr x3, [xSELF, #THREAD_CARD_TABLE_OFFSET]
-    lsr x0, x0, #7
+    lsr x0, x0, #CARD_TABLE_CARD_SHIFT
     strb w3, [x3, x0]
     ret
 .Ldo_aput_null:
@@ -1447,7 +1447,7 @@
     POISON_HEAP_REF w2
     str w2, [x3, x1, lsl #2]                              // Heap reference = 32b
     ldr x3, [xSELF, #THREAD_CARD_TABLE_OFFSET]
-    lsr x0, x0, #7
+    lsr x0, x0, #CARD_TABLE_CARD_SHIFT
     strb w3, [x3, x0]
     ret
     .cfi_restore_state            // Reset unwind info so following code unwinds.