From c8193ee3c0a99a7281a22c540b9eb56bb3a2ba66 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Sat, 12 Mar 2011 22:12:19 +1100 Subject: [PATCH] Fix ARM breakage. No bug, r=me. --HG-- extra : convert_revision : e24543ca392a9420ab706b8a8842a8c9e0f78032 --- js/src/lirasm/lirasm.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/src/lirasm/lirasm.cpp b/js/src/lirasm/lirasm.cpp index ae5f523ed86..ea22d52c1d9 100644 --- a/js/src/lirasm/lirasm.cpp +++ b/js/src/lirasm/lirasm.cpp @@ -569,7 +569,7 @@ FragmentAssembler::FragmentAssembler(Lirasm &parent, const string &fragmentName, mLir = mCseFilter = new CseFilter(mLir, LIRASM_NUM_USED_ACCS, mParent.mAlloc); } #if NJ_SOFTFLOAT_SUPPORTED - if (mConfig.soft_float) { + if (mParent.mConfig.soft_float) { mLir = new SoftFloatFilter(mLir); } #endif @@ -1510,7 +1510,7 @@ FragmentAssembler::assembleRandomFragment(int nIns) D_I_ops.push_back(LIR_ui2d); #elif defined(NANOJIT_ARM) // The ARM back-end can detect FP support at run-time. - if (mConfig.arm_vfp) { + if (mParent.mConfig.arm_vfp) { D_I_ops.push_back(LIR_i2d); D_I_ops.push_back(LIR_ui2d); } @@ -1526,7 +1526,7 @@ FragmentAssembler::assembleRandomFragment(int nIns) I_D_ops.push_back(LIR_d2i); #elif defined(NANOJIT_ARM) // The ARM back-end can detect FP support at run-time. - if (avmplus::AvmCore::config.arm_vfp) { + if (mParent.mConfig.arm_vfp) { I_D_ops.push_back(LIR_d2i); } #endif