| Index: src/stub-cache-arm.cc
|
| ===================================================================
|
| --- src/stub-cache-arm.cc (revision 1707)
|
| +++ src/stub-cache-arm.cc (working copy)
|
| @@ -33,7 +33,7 @@
|
|
|
| namespace v8 { namespace internal {
|
|
|
| -#define __ masm->
|
| +#define __ DEFINE_MASM(masm)
|
|
|
|
|
| static void ProbeTable(MacroAssembler* masm,
|
| @@ -183,7 +183,7 @@
|
|
|
| // Check that the maps haven't changed.
|
| Register reg =
|
| - __ CheckMaps(object, receiver, holder, scratch1, scratch2, miss_label);
|
| + masm->CheckMaps(object, receiver, holder, scratch1, scratch2, miss_label);
|
| GenerateFastPropertyLoad(masm, r0, reg, holder, index);
|
| __ Ret();
|
| }
|
| @@ -203,7 +203,7 @@
|
|
|
| // Check that the maps haven't changed.
|
| Register reg =
|
| - __ CheckMaps(object, receiver, holder, scratch1, scratch2, miss_label);
|
| + masm->CheckMaps(object, receiver, holder, scratch1, scratch2, miss_label);
|
|
|
| // Return the constant value.
|
| __ mov(r0, Operand(Handle<Object>(value)));
|
| @@ -226,7 +226,7 @@
|
|
|
| // Check that the maps haven't changed.
|
| Register reg =
|
| - __ CheckMaps(object, receiver, holder, scratch1, scratch2, miss_label);
|
| + masm->CheckMaps(object, receiver, holder, scratch1, scratch2, miss_label);
|
|
|
| // Push the arguments on the JS stack of the caller.
|
| __ push(receiver); // receiver
|
| @@ -256,7 +256,7 @@
|
|
|
| // Check that the maps haven't changed.
|
| Register reg =
|
| - __ CheckMaps(object, receiver, holder, scratch1, scratch2, miss_label);
|
| + masm->CheckMaps(object, receiver, holder, scratch1, scratch2, miss_label);
|
|
|
| // Push the arguments on the JS stack of the caller.
|
| __ push(receiver); // receiver
|
| @@ -456,10 +456,9 @@
|
|
|
|
|
| #undef __
|
| +#define __ DEFINE_MASM(masm())
|
|
|
| -#define __ masm()->
|
|
|
| -
|
| Object* StubCompiler::CompileLazyCompile(Code::Flags flags) {
|
| // ----------- S t a t e -------------
|
| // -- r1: function
|
| @@ -511,7 +510,7 @@
|
|
|
| // Do the right check and compute the holder register.
|
| Register reg =
|
| - __ CheckMaps(JSObject::cast(object), r0, holder, r3, r2, &miss);
|
| + masm()->CheckMaps(JSObject::cast(object), r0, holder, r3, r2, &miss);
|
| GenerateFastPropertyLoad(masm(), r1, reg, holder, index);
|
|
|
| // Check that the function really is a function.
|
|
|