wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 542133 - Add a real NJConfig struct to nanojit (TM-specific part). code=stejohns, r=nnethercote.

Browse Source
This commit is contained in:
Nicholas Nethercote 2010-02-16 15:07:14 +11:00
parent c4144cff0a
commit fbc5612f2e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/Makefile.in
View File

@ -239,6 +239,7 @@ INSTALLED_HEADERS += \
Fragmento.h \ Fragmento.h \
Native.h \ Native.h \
Native$(NANOJIT_ARCH).h \ Native$(NANOJIT_ARCH).h \
njconfig.h \
RegAlloc.h \ RegAlloc.h \
nanojit.h \ nanojit.h \
VMPI.h \ VMPI.h \
@ -252,6 +253,7 @@ CPPSRCS += \
Containers.cpp \ Containers.cpp \
Fragmento.cpp \ Fragmento.cpp \
LIR.cpp \ LIR.cpp \
njconfig.cpp \
RegAlloc.cpp \ RegAlloc.cpp \
avmplus.cpp \ avmplus.cpp \
Native$(NANOJIT_ARCH).cpp \ Native$(NANOJIT_ARCH).cpp \

11
js/src/jstracer.cpp
View File

@ -2239,7 +2239,8 @@ TraceRecorder::TraceRecorder(JSContext* cx, VMSideExit* anchor, VMFragment* frag
} }
) )
// CseFilter must be downstream of SoftFloatFilter (see bug 527754 for why). // CseFilter must be downstream of SoftFloatFilter (see bug 527754 for why).
lir = new (tempAlloc()) CseFilter(lir, tempAlloc()); if (avmplus::AvmCore::config.cseopt)
lir = new (tempAlloc()) CseFilter(lir, tempAlloc());
#if NJ_SOFTFLOAT_SUPPORTED #if NJ_SOFTFLOAT_SUPPORTED
if (nanojit::AvmCore::config.soft_float) if (nanojit::AvmCore::config.soft_float)
lir = new (tempAlloc()) SoftFloatFilter(lir); lir = new (tempAlloc()) SoftFloatFilter(lir);
@ -2675,7 +2676,7 @@ TraceMonitor::flush()
globalStates[i].globalSlots = new (alloc) SlotList(&alloc); globalStates[i].globalSlots = new (alloc) SlotList(&alloc);
} }
assembler = new (alloc) Assembler(*codeAlloc, alloc, alloc, core, &LogController); assembler = new (alloc) Assembler(*codeAlloc, alloc, alloc, core, &LogController, avmplus::AvmCore::config);
verbose_only( branches = NULL; ) verbose_only( branches = NULL; )
memset(&vmfragments[0], 0, FRAGMENT_TABLE_SIZE * sizeof(TreeFragment*)); memset(&vmfragments[0], 0, FRAGMENT_TABLE_SIZE * sizeof(TreeFragment*));
@ -7341,9 +7342,9 @@ InitJIT(TraceMonitor *tm)
if (!did_we_check_processor_features) { if (!did_we_check_processor_features) {
#if defined NANOJIT_IA32 #if defined NANOJIT_IA32
avmplus::AvmCore::config.use_cmov = avmplus::AvmCore::config.i386_use_cmov =
avmplus::AvmCore::config.sse2 = CheckForSSE2(); avmplus::AvmCore::config.i386_sse2 = CheckForSSE2();
avmplus::AvmCore::config.fixed_esp = true; avmplus::AvmCore::config.i386_fixed_esp = true;
#endif #endif
#if defined NANOJIT_ARM #if defined NANOJIT_ARM