# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1443620153 -7200
# Node ID 461dc858dc618019f68606349082146de7bf216c
# Parent  3abba3d4aef10709f1db1bd2ec53462b0cf7f97c
Fix confused heap base and thread register.

diff -r 3abba3d4aef1 -r 461dc858dc61 jvmci/jdk.internal.jvmci.hotspot.amd64/src/jdk/internal/jvmci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
--- a/jvmci/jdk.internal.jvmci.hotspot.amd64/src/jdk/internal/jvmci/hotspot/amd64/AMD64HotSpotRegisterConfig.java	Wed Sep 30 13:54:56 2015 +0200
+++ b/jvmci/jdk.internal.jvmci.hotspot.amd64/src/jdk/internal/jvmci/hotspot/amd64/AMD64HotSpotRegisterConfig.java	Wed Sep 30 15:35:53 2015 +0200
@@ -123,11 +123,11 @@
 
         int idx = 0;
         for (Register reg : allRegisters) {
-            if (reg.equals(rsp) || reg.equals(r12)) {
+            if (reg.equals(rsp) || reg.equals(r15)) {
                 // skip stack pointer and thread register
                 continue;
             }
-            if (reserveForHeapBase && reg.equals(r15)) {
+            if (reserveForHeapBase && reg.equals(r12)) {
                 // skip heap base register
                 continue;
             }