Fix build errors in Windows

Signed-off-by: HyukWoo Park <[email protected]>
Samsung · Nov 1, 2023 · 4cd5b0a · 4cd5b0a
1 parent 91093ae
commit 4cd5b0a
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 166 deletions.
diff --git a/src/jit/ByteCodeParser.cpp b/src/jit/ByteCodeParser.cpp
@@ -22,6 +22,11 @@
 
 #include <map>
 
+#if defined(COMPILER_MSVC)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 namespace Walrus {
 
 #define COMPUTE_OFFSET(idx, offset) \

diff --git a/src/jit/FloatConvInl.h b/src/jit/FloatConvInl.h
@@ -370,7 +370,7 @@ static void emitConvertFloat(sljit_compiler* compiler, Instruction* instr)
     argTypes |= SLJIT_ARG_RETURN(SLJIT_ARG_TYPE_W) | SLJIT_ARG_VALUE(SLJIT_ARG_TYPE_W, 2);
 #else /* !SLJIT_64BIT_ARCHITECTURE */
     argTypes |= SLJIT_ARG_VALUE(SLJIT_ARG_TYPE_W, 2);
-    argTypes |= (flags & IsTruncSat) ? SLJIT_ARG_RETURN(SLJIT_ARG_TYPE_VOID) : SLJIT_ARG_RETURN(SLJIT_ARG_TYPE_W);
+    argTypes |= (flags & IsTruncSat) ? SLJIT_ARG_RETURN(SLJIT_ARG_TYPE_RET_VOID) : SLJIT_ARG_RETURN(SLJIT_ARG_TYPE_W);
 #endif /* SLJIT_64BIT_ARCHITECTURE */
 
     sljit_emit_icall(compiler, SLJIT_CALL, argTypes, SLJIT_IMM, addr);

diff --git a/src/jit/IntMath32Inl.h b/src/jit/IntMath32Inl.h
@@ -549,7 +549,7 @@ static void emitDivRem64(sljit_compiler* compiler, sljit_s32 opcode, JITArgPair*
         break;
     }
 
-    sljit_s32 argTypes = isImm ? SLJIT_ARGS3(VOID, W, W, W) : SLJIT_ARGS3(W, W, W, W);
+    sljit_s32 argTypes = isImm ? SLJIT_ARGS3V(W, W, W) : SLJIT_ARGS3(W, W, W, W);
     sljit_emit_icall(compiler, SLJIT_CALL, argTypes, SLJIT_IMM, addr);
 
     if (!isImm) {
@@ -715,7 +715,7 @@ static void emitCountZeroes(sljit_compiler* compiler, sljit_s32 op, JITArgPair*
 
 static sljit_sw popcnt32(sljit_sw arg)
 {
-    return __builtin_popcount(arg);
+    return popCount((unsigned)arg);
 }
 
 static void emitPopcnt(sljit_compiler* compiler, JITArg* args)
@@ -729,7 +729,7 @@ static void emitPopcnt(sljit_compiler* compiler, JITArg* args)
 
 static sljit_sw popcnt64(sljit_sw arg1, sljit_sw arg2)
 {
-    return __builtin_popcount(arg1) + __builtin_popcount(arg2);
+    return popCount((unsigned)arg1) + popCount((unsigned)arg2);
 }
 
 static void emitPopcnt64(sljit_compiler* compiler, JITArgPair* args)

diff --git a/src/jit/IntMath64Inl.h b/src/jit/IntMath64Inl.h
@@ -246,12 +246,12 @@ static void emitBinary(sljit_compiler* compiler, Instruction* instr)
 
 static sljit_s32 popcnt32(sljit_s32 arg)
 {
-    return __builtin_popcount(arg);
+    return popCount((unsigned)arg);
 }
 
 static sljit_sw popcnt64(sljit_sw arg)
 {
-    return __builtin_popcountl(arg);
+    return popCount((unsigned long)arg);
 }
 
 static void emitPopcnt(sljit_compiler* compiler, ByteCode::Opcode opcode, JITArg* args)

diff --git a/src/jit/MemoryInl.h b/src/jit/MemoryInl.h
@@ -925,5 +925,5 @@ static void emitDataDrop(sljit_compiler* compiler, Instruction* instr)
     sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R1, 0, kContextReg, 0);
 
     sljit_sw addr = GET_FUNC_ADDR(sljit_sw, dropData);
-    sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(VOID, 32, W), SLJIT_IMM, addr);
+    sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2V(32, W), SLJIT_IMM, addr);
 }
diff --git a/src/jit/SimdArm32Inl.h b/src/jit/SimdArm32Inl.h
@@ -672,7 +672,7 @@ static void simdEmitFloatUnaryOpWithCB(sljit_compiler* compiler, JITArg src, JIT
     }
 
     sljit_emit_op2(compiler, SLJIT_ADD, SLJIT_R1, 0, kFrameReg, 0, SLJIT_IMM, dst.argw);
-    sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(VOID, P, P), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, cb));
+    sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2V(P, P), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, cb));
 }
 
 static void simdEmitFloatBinaryOpWithCB(sljit_compiler* compiler, JITArg src[2], JITArg dst, binaryCallbackFunction cb)
@@ -692,7 +692,7 @@ static void simdEmitFloatBinaryOpWithCB(sljit_compiler* compiler, JITArg src[2],
     }
 
     sljit_emit_op2(compiler, SLJIT_ADD, SLJIT_R2, 0, kFrameReg, 0, SLJIT_IMM, dst.argw);
-    sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS3(VOID, P, P, P), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, cb));
+    sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS3V(P, P, P), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, cb));
 }
 
 static void simdEmitF32x4Compare(sljit_compiler* compiler, JITArg src[2], JITArg dst, sljit_s32 opcode, sljit_s32 flag)

diff --git a/src/jit/SimdX86Inl.h b/src/jit/SimdX86Inl.h
@@ -365,7 +365,7 @@ static void simdEmitINeg(sljit_compiler* compiler, uint32_t signOpcode, uint32_t
             return;
         }
 
-        ASSERT(subOpcode = SimdOp::psubq);
+        ASSERT(subOpcode == SimdOp::psubq);
 
         if (sljit_has_cpu_feature(SLJIT_HAS_AVX)) {
             simdEmitSSEOp(compiler, SimdOp::pxor, tmp, tmp);

diff --git a/src/jit/TableInl.h b/src/jit/TableInl.h
@@ -97,7 +97,7 @@ static void emitElemDrop(sljit_compiler* compiler, Instruction* instr)
 
     sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_R0, 0, SLJIT_IMM, static_cast<sljit_sw>(elemDrop->segmentIndex()));
     sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R1, 0, kContextReg, 0);
-    sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(VOID, 32, W), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, dropElement));
+    sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2V(32, W), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, dropElement));
 }
 
 static void emitTable(sljit_compiler* compiler, Instruction* instr)
@@ -111,7 +111,7 @@ static void emitTable(sljit_compiler* compiler, Instruction* instr)
 
         sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_MEM1(kContextReg), OffsetOfContextField(tmp1), SLJIT_IMM, (reinterpret_cast<TableInit*>(instr->byteCode()))->tableIndex());
         sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_MEM1(kContextReg), OffsetOfContextField(tmp2), SLJIT_IMM, (reinterpret_cast<TableInit*>(instr->byteCode()))->segmentIndex());
-        sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS4(VOID, 32, 32, 32, W), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, initTable));
+        sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS4V(32, 32, 32, W), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, initTable));
         sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R2, 0, SLJIT_R0, 0);
         sljit_set_label(sljit_emit_cmp(compiler, SLJIT_NOT_EQUAL, SLJIT_R0, 0, SLJIT_IMM, ExecutionContext::NoError), context->trapLabel);
         break;
@@ -129,7 +129,7 @@ static void emitTable(sljit_compiler* compiler, Instruction* instr)
 
         sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_MEM1(kContextReg), OffsetOfContextField(tmp1), SLJIT_IMM, ((reinterpret_cast<TableCopy*>(instr->byteCode()))->srcIndex()));
         sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_MEM1(kContextReg), OffsetOfContextField(tmp2), SLJIT_IMM, ((reinterpret_cast<TableCopy*>(instr->byteCode()))->dstIndex()));
-        sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS4(VOID, 32, 32, 32, W), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, copyTable));
+        sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS4V(32, 32, 32, W), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, copyTable));
         sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R2, 0, SLJIT_R0, 0);
         sljit_set_label(sljit_emit_cmp(compiler, SLJIT_NOT_EQUAL, SLJIT_R0, 0, SLJIT_IMM, ExecutionContext::NoError), context->trapLabel);
         break;
@@ -138,7 +138,7 @@ static void emitTable(sljit_compiler* compiler, Instruction* instr)
         emitLoad3Arguments(compiler, instr->operands());
 
         sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_MEM1(kContextReg), OffsetOfContextField(tmp1), SLJIT_IMM, ((reinterpret_cast<TableFill*>(instr->byteCode()))->tableIndex()));
-        sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS4(VOID, 32, P, 32, W), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, fillTable));
+        sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS4V(32, P, 32, W), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, fillTable));
         sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R2, 0, SLJIT_R0, 0);
         sljit_set_label(sljit_emit_cmp(compiler, SLJIT_NOT_EQUAL, SLJIT_R0, 0, SLJIT_IMM, ExecutionContext::NoError), context->trapLabel);
         break;

diff --git a/src/jit/TryCatchInl.h b/src/jit/TryCatchInl.h
@@ -247,7 +247,7 @@ static void emitThrow(sljit_compiler* compiler, Instruction* instr)
     sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R0, 0, SLJIT_IMM, reinterpret_cast<sljit_sw>(instr->byteCode()));
     sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R1, 0, kFrameReg, 0);
     sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R2, 0, kContextReg, 0);
-    sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS3(VOID, W, W, W), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, throwTag));
+    sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS3V(W, W, W), SLJIT_IMM, GET_FUNC_ADDR(sljit_sw, throwTag));
 
     CompileContext* context = CompileContext::get(compiler);
     sljit_jump* jump = sljit_emit_jump(compiler, SLJIT_JUMP);

diff --git a/src/util/MathOperation.cpp b/src/util/MathOperation.cpp
diff --git a/src/util/MathOperation.h b/src/util/MathOperation.h
@@ -251,9 +251,6 @@ ALWAYS_INLINE T floatCopysign(ExecutionState& state, T lhs, T rhs)
 }
 #endif
 
-#if COMPILER_IS_MSVC
-#else
-#endif
 
 template <typename T>
 ALWAYS_INLINE T floatNeg(T val)
@@ -394,7 +391,7 @@ void resetPrecisionControl(FPControl old_ctrl)
 #endif
 
 
-double convertUint64ToDouble(uint64_t x)
+inline double convertUint64ToDouble(uint64_t x)
 {
 #if defined(WALRUS_X86_64)
     // MSVC on x64 generates uint64 -> float conversions but doesn't do
@@ -425,7 +422,8 @@ double convertUint64ToDouble(uint64_t x)
     return static_cast<double>(x);
 #endif
 }
-float convertUint64ToFloat(uint64_t x)
+
+inline float convertUint64ToFloat(uint64_t x)
 {
 #if defined(WALRUS_X86_64)
     // MSVC on x64 generates uint64 -> float conversions but doesn't do
@@ -456,7 +454,8 @@ float convertUint64ToFloat(uint64_t x)
     return static_cast<float>(x);
 #endif
 }
-double convertInt64ToDouble(int64_t x)
+
+inline double convertInt64ToDouble(int64_t x)
 {
 #if defined(CPU_X86)
     double result;
@@ -467,7 +466,8 @@ double convertInt64ToDouble(int64_t x)
     return static_cast<double>(x);
 #endif
 }
-float convertInt64ToFloat(int64_t x)
+
+inline float convertInt64ToFloat(int64_t x)
 {
 #if defined(CPU_X86)
     float result;

diff --git a/third_party/sljit b/third_party/sljit
+5 −0		API_CHANGES
+1 −1		regex_src/regexJIT.c
+1 −1		sljit_src/sljitLir.c
+31 −11		sljit_src/sljitLir.h
+1 −1		sljit_src/sljitNativeX86_common.c
+221 −221		test_src/sljitTest.c