summaryrefslogtreecommitdiff
path: root/compiler/dex/quick/codegen_util.cc
diff options
context:
space:
mode:
author Ian Rogers <irogers@google.com> 2014-12-05 00:34:38 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-12-05 00:34:38 +0000
commita21fdd0432aa38b63d144ee4b92b6a567aab61d2 (patch)
treebe75911bfbe29a50fff685217c8ee155fb99ac10 /compiler/dex/quick/codegen_util.cc
parent7be36ae7979eb62dc34c59b18b0bb1202ffefa3f (diff)
parent27dee8bcd7b4a53840b60818da8d2c819ef199bd (diff)
Merge "X86_64 QBE: use RIP addressing"
Diffstat (limited to 'compiler/dex/quick/codegen_util.cc')
-rw-r--r--compiler/dex/quick/codegen_util.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc
index 00217549b0..066041c6ad 100644
--- a/compiler/dex/quick/codegen_util.cc
+++ b/compiler/dex/quick/codegen_util.cc
@@ -538,9 +538,12 @@ void Mir2Lir::InstallSwitchTables() {
bx_offset = tab_rec->anchor->offset + 4;
break;
case kX86:
- case kX86_64:
bx_offset = 0;
break;
+ case kX86_64:
+ // RIP relative to switch table.
+ bx_offset = tab_rec->offset;
+ break;
case kArm64:
case kMips:
bx_offset = tab_rec->anchor->offset;