Revision: 15268
Author: [email protected]
Date: Fri Jun 21 05:57:19 2013
Log: Distinguish times_8 and times_pointer_size for X64
[email protected]
Review URL: https://codereview.chromium.org/17550005
Patch from Haitao Feng <[email protected]>.
http://code.google.com/p/v8/source/detail?r=15268
Modified:
/branches/bleeding_edge/src/x64/codegen-x64.cc
/branches/bleeding_edge/src/x64/deoptimizer-x64.cc
/branches/bleeding_edge/src/x64/macro-assembler-x64.cc
=======================================
--- /branches/bleeding_edge/src/x64/codegen-x64.cc Thu May 23 02:51:06 2013
+++ /branches/bleeding_edge/src/x64/codegen-x64.cc Fri Jun 21 05:57:19 2013
@@ -346,7 +346,7 @@
// Allocate new backing store.
__ bind(&new_backing_store);
- __ lea(rdi, Operand(r9, times_pointer_size, FixedArray::kHeaderSize));
+ __ lea(rdi, Operand(r9, times_8, FixedArray::kHeaderSize));
__ Allocate(rdi, r14, r11, r15, fail, TAG_OBJECT);
// Set backing store's map
__ LoadRoot(rdi, Heap::kFixedDoubleArrayMapRootIndex);
@@ -381,7 +381,7 @@
// Conversion loop.
__ bind(&loop);
__ movq(rbx,
- FieldOperand(r8, r9, times_8, FixedArray::kHeaderSize));
+ FieldOperand(r8, r9, times_pointer_size,
FixedArray::kHeaderSize));
// r9 : current element's index
// rbx: current element (smi-tagged)
__ JumpIfNotSmi(rbx, &convert_hole);
@@ -459,7 +459,7 @@
__ bind(&loop);
__ movq(r14, FieldOperand(r8,
r9,
- times_pointer_size,
+ times_8,
FixedDoubleArray::kHeaderSize));
// r9 : current element's index
// r14: current element
=======================================
--- /branches/bleeding_edge/src/x64/deoptimizer-x64.cc Mon Jun 3 08:32:22
2013
+++ /branches/bleeding_edge/src/x64/deoptimizer-x64.cc Fri Jun 21 05:57:19
2013
@@ -548,7 +548,7 @@
// last FrameDescription**.
__ movl(rdx, Operand(rax, Deoptimizer::output_count_offset()));
__ movq(rax, Operand(rax, Deoptimizer::output_offset()));
- __ lea(rdx, Operand(rax, rdx, times_8, 0));
+ __ lea(rdx, Operand(rax, rdx, times_pointer_size, 0));
__ jmp(&outer_loop_header);
__ bind(&outer_push_loop);
// Inner loop state: rbx = current FrameDescription*, rcx = loop index.
=======================================
--- /branches/bleeding_edge/src/x64/macro-assembler-x64.cc Thu Jun 13
12:16:35 2013
+++ /branches/bleeding_edge/src/x64/macro-assembler-x64.cc Fri Jun 21
05:57:19 2013
@@ -2661,7 +2661,8 @@
// rax = exception, rdi = code object, rdx = state.
movq(rbx, FieldOperand(rdi, Code::kHandlerTableOffset));
shr(rdx, Immediate(StackHandler::kKindWidth));
- movq(rdx, FieldOperand(rbx, rdx, times_8, FixedArray::kHeaderSize));
+ movq(rdx,
+ FieldOperand(rbx, rdx, times_pointer_size,
FixedArray::kHeaderSize));
SmiToInteger64(rdx, rdx);
lea(rdi, FieldOperand(rdi, rdx, times_1, Code::kHeaderSize));
jmp(rdi);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.