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 1112769 - Followup to adjust (hopefully all) code not compiled on x86-64, determined by skimming prior patch and making corresponding changes to other architectures. r=bustage in a CLOSED TREE

Browse Source
This commit is contained in:
Jeff Walden 2015-01-06 16:20:28 -06:00
parent 95d6ec7e23
commit 2f1b228f1e
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jit/arm/CodeGenerator-arm.cpp
View File

@ -17,6 +17,7 @@
#include "jit/JitFrames.h"
#include "jit/MIR.h"
#include "jit/MIRGraph.h"
#include "js/Conversions.h"
#include "vm/Shape.h"
#include "vm/TraceLogging.h"
@ -30,6 +31,7 @@ using namespace js::jit;
using mozilla::FloorLog2;
using mozilla::NegativeInfinity;
using JS::GenericNaN;
using JS::ToInt32;
// shared
CodeGeneratorARM::CodeGeneratorARM(MIRGenerator *gen, LIRGraph *graph, MacroAssembler *masm)

2
js/src/jit/mips/CodeGenerator-mips.cpp
View File

@ -17,6 +17,7 @@
#include "jit/JitFrames.h"
#include "jit/MIR.h"
#include "jit/MIRGraph.h"
#include "js/Conversions.h"
#include "vm/Shape.h"
#include "vm/TraceLogging.h"
@ -30,6 +31,7 @@ using namespace js::jit;
using mozilla::FloorLog2;
using mozilla::NegativeInfinity;
using JS::GenericNaN;
using JS::ToInt32;
// shared
CodeGeneratorMIPS::CodeGeneratorMIPS(MIRGenerator *gen, LIRGraph *graph, MacroAssembler *masm)

7
js/src/jit/x86/CodeGenerator-x86.cpp
View File

@ -6,6 +6,7 @@
#include "jit/x86/CodeGenerator-x86.h"
#include "mozilla/Casting.h"
#include "mozilla/DebugOnly.h"
#include "jsnum.h"
@ -13,6 +14,7 @@
#include "jit/IonCaches.h"
#include "jit/MIR.h"
#include "jit/MIRGraph.h"
#include "js/Conversions.h"
#include "vm/Shape.h"
#include "jsscriptinlines.h"
@ -23,6 +25,7 @@
using namespace js;
using namespace js::jit;
using mozilla::BitwiseCast;
using mozilla::DebugOnly;
using mozilla::FloatingPoint;
using JS::GenericNaN;
@ -880,7 +883,7 @@ CodeGeneratorX86::visitOutOfLineTruncate(OutOfLineTruncate *ool)
if (gen->compilingAsmJS())
masm.callWithABI(AsmJSImm_ToInt32);
else
masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, js::ToInt32));
masm.callWithABI(BitwiseCast<void*, int32_t(*)(double)>(JS::ToInt32));
masm.storeCallResult(output);
restoreVolatile(output);
@ -972,7 +975,7 @@ CodeGeneratorX86::visitOutOfLineTruncateFloat32(OutOfLineTruncateFloat32 *ool)
if (gen->compilingAsmJS())
masm.callWithABI(AsmJSImm_ToInt32);
else
masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, js::ToInt32));
masm.callWithABI(BitwiseCast<void*, int32_t(*)(double)>(JS::ToInt32));
masm.storeCallResult(output);
masm.pop(input);