Bug 541491 - ARM_ARCH, ARM_VFP, and ARM_THUMB2 should be runtime options everywhere (TM-specific part). code=stejohns, r=nnethercote.

This commit is contained in:
Nicholas Nethercote 2010-01-28 09:41:07 +11:00
Родитель 672cf8b3e0
Коммит 6a4833dbff
2 изменённых файлов: 7 добавлений и 7 удалений

Просмотреть файл

@ -3181,7 +3181,7 @@ class RegExpNativeCompiler {
if (outOfMemory())
goto fail;
/* FIXME Use bug 463260 smart pointer when available. */
lir = lirBufWriter = new LirBufWriter(lirbuf);
lir = lirBufWriter = new LirBufWriter(lirbuf, nanojit::AvmCore::config);
/* FIXME Use bug 463260 smart pointer when available. */
#ifdef NJ_VERBOSE

Просмотреть файл

@ -2453,7 +2453,7 @@ TraceRecorder::TraceRecorder(JSContext* cx, VMSideExit* anchor, VMFragment* frag
#endif
nanojit::LirWriter*& lir = InitConst(this->lir);
lir = new (tempAlloc()) LirBufWriter(lirbuf);
lir = new (tempAlloc()) LirBufWriter(lirbuf, nanojit::AvmCore::config);
#ifdef DEBUG
lir = new (tempAlloc()) ValidateWriter(lir, "end of writer pipeline");
#endif
@ -7630,11 +7630,11 @@ InitJIT(TraceMonitor *tm)
enable_debugger_exceptions();
avmplus::AvmCore::config.vfp = arm_vfp;
avmplus::AvmCore::config.soft_float = !arm_vfp;
avmplus::AvmCore::config.thumb = arm_thumb;
avmplus::AvmCore::config.thumb2 = arm_thumb2;
avmplus::AvmCore::config.arch = arm_arch;
avmplus::AvmCore::config.arm_vfp = arm_vfp;
avmplus::AvmCore::config.soft_float = !arm_vfp;
avmplus::AvmCore::config.arm_thumb = arm_thumb;
avmplus::AvmCore::config.arm_thumb2 = arm_thumb2;
avmplus::AvmCore::config.arm_arch = arm_arch;
// Sanity-check the configuration detection.
// * We don't understand architectures prior to ARMv4.