Index: test/cctest/test-assembler-arm.cc |
diff --git a/test/cctest/test-assembler-arm.cc b/test/cctest/test-assembler-arm.cc |
index 80b7804b206d506f939696cf3bc35e9ddd8b0c92..92ed951279862a8924c715fb8ae46853a39a3533 100644 |
--- a/test/cctest/test-assembler-arm.cc |
+++ b/test/cctest/test-assembler-arm.cc |
@@ -59,17 +59,19 @@ TEST(0) { |
InitializeVM(); |
v8::HandleScope scope; |
- Assembler assm(Isolate::Current(), NULL, 0); |
+ Isolate* isolate = Isolate::Current(); |
+ Assembler assm(isolate, NULL, 0); |
__ add(r0, r0, Operand(r1)); |
__ mov(pc, Operand(lr)); |
CodeDesc desc; |
assm.GetCode(&desc); |
- Object* code = HEAP->CreateCode( |
+ Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |
- Handle<Object>(HEAP->undefined_value()))->ToObjectChecked(); |
+ Handle<Object>(isolate->heap()->undefined_value(), |
Michael Starzinger
2013/02/25 10:50:58
Just use "isolate->factory()->undefined_value()" h
Sven Panne
2013/02/25 14:44:43
Done.
|
+ isolate))->ToObjectChecked(); |
CHECK(code->IsCode()); |
#ifdef DEBUG |
Code::cast(code)->Print(); |
@@ -85,7 +87,8 @@ TEST(1) { |
InitializeVM(); |
v8::HandleScope scope; |
- Assembler assm(Isolate::Current(), NULL, 0); |
+ Isolate* isolate = Isolate::Current(); |
+ Assembler assm(isolate, NULL, 0); |
Label L, C; |
__ mov(r1, Operand(r0)); |
@@ -103,10 +106,11 @@ TEST(1) { |
CodeDesc desc; |
assm.GetCode(&desc); |
- Object* code = HEAP->CreateCode( |
+ Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |
- Handle<Object>(HEAP->undefined_value()))->ToObjectChecked(); |
+ Handle<Object>(isolate->heap()->undefined_value(), |
+ isolate))->ToObjectChecked(); |
CHECK(code->IsCode()); |
#ifdef DEBUG |
Code::cast(code)->Print(); |
@@ -122,7 +126,8 @@ TEST(2) { |
InitializeVM(); |
v8::HandleScope scope; |
- Assembler assm(Isolate::Current(), NULL, 0); |
+ Isolate* isolate = Isolate::Current(); |
+ Assembler assm(isolate, NULL, 0); |
Label L, C; |
__ mov(r1, Operand(r0)); |
@@ -149,10 +154,11 @@ TEST(2) { |
CodeDesc desc; |
assm.GetCode(&desc); |
- Object* code = HEAP->CreateCode( |
+ Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |
- Handle<Object>(HEAP->undefined_value()))->ToObjectChecked(); |
+ Handle<Object>(isolate->heap()->undefined_value(), |
+ isolate))->ToObjectChecked(); |
CHECK(code->IsCode()); |
#ifdef DEBUG |
Code::cast(code)->Print(); |
@@ -175,7 +181,8 @@ TEST(3) { |
} T; |
T t; |
- Assembler assm(Isolate::Current(), NULL, 0); |
+ Isolate* isolate = Isolate::Current(); |
+ Assembler assm(isolate, NULL, 0); |
Label L, C; |
__ mov(ip, Operand(sp)); |
@@ -197,10 +204,11 @@ TEST(3) { |
CodeDesc desc; |
assm.GetCode(&desc); |
- Object* code = HEAP->CreateCode( |
+ Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |
- Handle<Object>(HEAP->undefined_value()))->ToObjectChecked(); |
+ Handle<Object>(isolate->heap()->undefined_value(), |
+ isolate))->ToObjectChecked(); |
CHECK(code->IsCode()); |
#ifdef DEBUG |
Code::cast(code)->Print(); |
@@ -242,7 +250,8 @@ TEST(4) { |
// Create a function that accepts &t, and loads, manipulates, and stores |
// the doubles and floats. |
- Assembler assm(Isolate::Current(), NULL, 0); |
+ Isolate* isolate = Isolate::Current(); |
+ Assembler assm(isolate, NULL, 0); |
Label L, C; |
@@ -314,10 +323,11 @@ TEST(4) { |
CodeDesc desc; |
assm.GetCode(&desc); |
- Object* code = HEAP->CreateCode( |
+ Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |
- Handle<Object>(HEAP->undefined_value()))->ToObjectChecked(); |
+ Handle<Object>(isolate->heap()->undefined_value(), |
+ isolate))->ToObjectChecked(); |
CHECK(code->IsCode()); |
#ifdef DEBUG |
Code::cast(code)->Print(); |
@@ -360,7 +370,8 @@ TEST(5) { |
InitializeVM(); |
v8::HandleScope scope; |
- Assembler assm(Isolate::Current(), NULL, 0); |
+ Isolate* isolate = Isolate::Current(); |
+ Assembler assm(isolate, NULL, 0); |
if (CpuFeatures::IsSupported(ARMv7)) { |
CpuFeatures::Scope scope(ARMv7); |
@@ -374,10 +385,11 @@ TEST(5) { |
CodeDesc desc; |
assm.GetCode(&desc); |
- Object* code = HEAP->CreateCode( |
+ Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |
- Handle<Object>(HEAP->undefined_value()))->ToObjectChecked(); |
+ Handle<Object>(isolate->heap()->undefined_value(), |
+ isolate))->ToObjectChecked(); |
CHECK(code->IsCode()); |
#ifdef DEBUG |
Code::cast(code)->Print(); |
@@ -396,7 +408,8 @@ TEST(6) { |
InitializeVM(); |
v8::HandleScope scope; |
- Assembler assm(Isolate::Current(), NULL, 0); |
+ Isolate* isolate = Isolate::Current(); |
+ Assembler assm(isolate, NULL, 0); |
if (CpuFeatures::IsSupported(ARMv7)) { |
CpuFeatures::Scope scope(ARMv7); |
@@ -409,10 +422,11 @@ TEST(6) { |
CodeDesc desc; |
assm.GetCode(&desc); |
- Object* code = HEAP->CreateCode( |
+ Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |
- Handle<Object>(HEAP->undefined_value()))->ToObjectChecked(); |
+ Handle<Object>(isolate->heap()->undefined_value(), |
+ isolate))->ToObjectChecked(); |
CHECK(code->IsCode()); |
#ifdef DEBUG |
Code::cast(code)->Print(); |
@@ -439,7 +453,8 @@ static void TestRoundingMode(VCVTTypes types, |
InitializeVM(); |
v8::HandleScope scope; |
- Assembler assm(Isolate::Current(), NULL, 0); |
+ Isolate* isolate = Isolate::Current(); |
+ Assembler assm(isolate, NULL, 0); |
if (CpuFeatures::IsSupported(VFP3)) { |
CpuFeatures::Scope scope(VFP3); |
@@ -485,10 +500,11 @@ static void TestRoundingMode(VCVTTypes types, |
CodeDesc desc; |
assm.GetCode(&desc); |
- Object* code = HEAP->CreateCode( |
+ Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |
- Handle<Object>(HEAP->undefined_value()))->ToObjectChecked(); |
+ Handle<Object>(isolate->heap()->undefined_value(), |
+ isolate))->ToObjectChecked(); |
CHECK(code->IsCode()); |
#ifdef DEBUG |
Code::cast(code)->Print(); |
@@ -642,7 +658,8 @@ TEST(8) { |
// Create a function that uses vldm/vstm to move some double and |
// single precision values around in memory. |
- Assembler assm(Isolate::Current(), NULL, 0); |
+ Isolate* isolate = Isolate::Current(); |
+ Assembler assm(isolate, NULL, 0); |
if (CpuFeatures::IsSupported(VFP2)) { |
CpuFeatures::Scope scope(VFP2); |
@@ -671,10 +688,11 @@ TEST(8) { |
CodeDesc desc; |
assm.GetCode(&desc); |
- Object* code = HEAP->CreateCode( |
+ Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |
- Handle<Object>(HEAP->undefined_value()))->ToObjectChecked(); |
+ Handle<Object>(isolate->heap()->undefined_value(), |
+ isolate))->ToObjectChecked(); |
CHECK(code->IsCode()); |
#ifdef DEBUG |
Code::cast(code)->Print(); |
@@ -753,7 +771,8 @@ TEST(9) { |
// Create a function that uses vldm/vstm to move some double and |
// single precision values around in memory. |
- Assembler assm(Isolate::Current(), NULL, 0); |
+ Isolate* isolate = Isolate::Current(); |
+ Assembler assm(isolate, NULL, 0); |
if (CpuFeatures::IsSupported(VFP2)) { |
CpuFeatures::Scope scope(VFP2); |
@@ -786,10 +805,11 @@ TEST(9) { |
CodeDesc desc; |
assm.GetCode(&desc); |
- Object* code = HEAP->CreateCode( |
+ Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |
- Handle<Object>(HEAP->undefined_value()))->ToObjectChecked(); |
+ Handle<Object>(isolate->heap()->undefined_value(), |
+ isolate))->ToObjectChecked(); |
CHECK(code->IsCode()); |
#ifdef DEBUG |
Code::cast(code)->Print(); |
@@ -868,7 +888,8 @@ TEST(10) { |
// Create a function that uses vldm/vstm to move some double and |
// single precision values around in memory. |
- Assembler assm(Isolate::Current(), NULL, 0); |
+ Isolate* isolate = Isolate::Current(); |
+ Assembler assm(isolate, NULL, 0); |
if (CpuFeatures::IsSupported(VFP2)) { |
CpuFeatures::Scope scope(VFP2); |
@@ -897,10 +918,11 @@ TEST(10) { |
CodeDesc desc; |
assm.GetCode(&desc); |
- Object* code = HEAP->CreateCode( |
+ Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |
- Handle<Object>(HEAP->undefined_value()))->ToObjectChecked(); |
+ Handle<Object>(isolate->heap()->undefined_value(), |
+ isolate))->ToObjectChecked(); |
CHECK(code->IsCode()); |
#ifdef DEBUG |
Code::cast(code)->Print(); |
@@ -964,7 +986,8 @@ TEST(11) { |
i.a = 0xabcd0001; |
i.b = 0xabcd0000; |
- Assembler assm(Isolate::Current(), NULL, 0); |
+ Isolate* isolate = Isolate::Current(); |
+ Assembler assm(isolate, NULL, 0); |
// Test HeapObject untagging. |
__ ldr(r1, MemOperand(r0, OFFSET_OF(I, a))); |
@@ -994,10 +1017,11 @@ TEST(11) { |
CodeDesc desc; |
assm.GetCode(&desc); |
- Object* code = HEAP->CreateCode( |
+ Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |
- Handle<Object>(HEAP->undefined_value()))->ToObjectChecked(); |
+ Handle<Object>(isolate->heap()->undefined_value(), |
+ isolate))->ToObjectChecked(); |
CHECK(code->IsCode()); |
#ifdef DEBUG |
Code::cast(code)->Print(); |
@@ -1051,7 +1075,8 @@ TEST(13) { |
// Create a function that accepts &t, and loads, manipulates, and stores |
// the doubles and floats. |
- Assembler assm(Isolate::Current(), NULL, 0); |
+ Isolate* isolate = Isolate::Current(); |
+ Assembler assm(isolate, NULL, 0); |
Label L, C; |
@@ -1115,10 +1140,11 @@ TEST(13) { |
CodeDesc desc; |
assm.GetCode(&desc); |
- Object* code = HEAP->CreateCode( |
+ Object* code = isolate->heap()->CreateCode( |
desc, |
Code::ComputeFlags(Code::STUB), |
- Handle<Object>(HEAP->undefined_value()))->ToObjectChecked(); |
+ Handle<Object>(isolate->heap()->undefined_value(), |
+ isolate))->ToObjectChecked(); |
CHECK(code->IsCode()); |
#ifdef DEBUG |
Code::cast(code)->Print(); |