Fix CI buildbot failures: MSVC C89, SSE2 32-bit, webOS cross-compile

- libretro.c: Move extern declarations to top of function blocks for
  MSVC 2005/2010 C89 compliance (error C2143 mid-block declarations)
- blitter_simd_sse2.c: Replace _mm_cvtsi128_si64 with _mm_storel_epi64
  helper — the former only exists on x86_64, breaking 32-bit x86 builds
  (Linux i686, Windows i686 MinGW). Also fix C89 mid-block declaration
  in sse2_zcomp and sse2_byte_merge.
- Makefile.common: Detect cross-compiler prefixes (arm-, aarch64-, mips,
  powerpc) in CC to skip host uname -m SIMD fallback. Fixes webOS ARM
  build getting SSE2 when built on an x86_64 host.

Made-with: Cursor

Author: JoeMatt

Makefile.common

@@ -109,7 +109,10 @@ endif
 # Native build fallback: auto-detect from host architecture, but only for
 # native-build platforms (unix/osx/win). Cross-compile targets (vita, ps3,
 # libnx, etc.) set platform explicitly and should not use host detection.
+# Also skip when CC looks like a cross-compiler (e.g. arm-webos-linux-gnueabi-gcc).
+BLITTER_CROSS_CC := $(findstring arm-,$(CC))$(findstring aarch64-,$(CC))$(findstring mips,$(CC))$(findstring powerpc,$(CC))
 ifeq ($(BLITTER_SIMD_SRC),)
+ifeq ($(BLITTER_CROSS_CC),)
 ifneq (,$(filter unix osx win,$(platform)))
 ifneq (,$(filter x86_64 i686 i386,$(shell uname -m 2>/dev/null)))
    BLITTER_SIMD_SRC := $(CORE_DIR)/src/blitter_simd_sse2.c
@@ -120,6 +123,7 @@ endif
 endif
 endif
 endif
+endif
 
 # Fall back to scalar if no SIMD was selected (e.g., exotic platforms)
 ifeq ($(BLITTER_SIMD_SRC),)

libretro.c

@@ -781,6 +781,8 @@ bool retro_serialize(void *data, size_t size)
    uint8_t *buf, *start;
    size_t written;
    uint32_t magic, version, flags, reserved;
+   extern uint8_t jerry_ram_8[];
+   extern bool lowerField;
 
    if (!data || size < STATE_SIZE)
       return false;
@@ -802,11 +804,9 @@ bool retro_serialize(void *data, size_t size)
    STATE_SAVE_BUF(buf, jaguarMainRAM, 0x200000);  /* 2 MB main RAM */
    STATE_SAVE_BUF(buf, tomRam8, 0x4000);           /* 16 KB TOM registers */
 
-   extern uint8_t jerry_ram_8[];
    STATE_SAVE_BUF(buf, jerry_ram_8, 0x10000);      /* 64 KB JERRY registers */
 
    /* Jaguar misc state */
-   extern bool lowerField;
    STATE_SAVE_VAR(buf, lowerField);
 
    /* Module state */
@@ -838,6 +838,8 @@ bool retro_unserialize(const void *data, size_t size)
 {
    const uint8_t *buf;
    uint32_t magic, version, flags, reserved;
+   extern uint8_t jerry_ram_8[];
+   extern bool lowerField;
 
    if (!data || size < STATE_SIZE)
       return false;
@@ -857,11 +859,9 @@ bool retro_unserialize(const void *data, size_t size)
    STATE_LOAD_BUF(buf, jaguarMainRAM, 0x200000);
    STATE_LOAD_BUF(buf, tomRam8, 0x4000);
 
-   extern uint8_t jerry_ram_8[];
    STATE_LOAD_BUF(buf, jerry_ram_8, 0x10000);
 
    /* Jaguar misc state */
-   extern bool lowerField;
    STATE_LOAD_VAR(buf, lowerField);
 
    /* Module state */

src/blitter_simd_sse2.c

@@ -11,6 +11,15 @@
 #include "blitter_simd.h"
 #include <emmintrin.h>  /* SSE2 */
 
+/* _mm_cvtsi128_si64 only exists on x86_64 (needs 64-bit GP register).
+ * Use _mm_storel_epi64 which works on both 32-bit and 64-bit x86. */
+static uint64_t sse2_extract_u64(__m128i v)
+{
+   uint64_t r;
+   _mm_storel_epi64((__m128i *)&r, v);
+   return r;
+}
+
 /* Logic Function Unit — SSE2
  *
  * The truth table has 4 terms, each gated by one bit of lfu_func.
@@ -41,7 +50,7 @@ static uint64_t sse2_lfu(uint64_t srcd, uint64_t dstd, uint8_t lfu_func)
    __m128i t3 = _mm_and_si128(_mm_and_si128(vs,  vd),  vf3);
 
    __m128i result = _mm_or_si128(_mm_or_si128(t0, t1), _mm_or_si128(t2, t3));
-   return (uint64_t)_mm_cvtsi128_si64(result);
+   return sse2_extract_u64(result);
 }
 
 /* Data Comparator — SSE2
@@ -75,6 +84,7 @@ static uint8_t sse2_dcomp(uint64_t patd, uint64_t srcd, uint64_t dstd, bool cmpd
 static uint8_t sse2_zcomp(uint64_t srcz, uint64_t dstz, uint8_t zmode)
 {
    uint8_t result = 0;
+   uint8_t packed = 0;
 
    __m128i vs = _mm_set_epi64x(0, (int64_t)srcz);
    __m128i vd = _mm_set_epi64x(0, (int64_t)dstz);
@@ -107,7 +117,6 @@ static uint8_t sse2_zcomp(uint64_t srcz, uint64_t dstz, uint8_t zmode)
 
    /* movemask gives 2 bits per 16-bit lane (one per byte).
     * Convert to 1 bit per lane: lanes at positions 0,2,4,6 */
-   uint8_t packed = 0;
    if (result & 0x03) packed |= 0x01;  /* lane 0: bytes 0-1 */
    if (result & 0x0C) packed |= 0x02;  /* lane 1: bytes 2-3 */
    if (result & 0x30) packed |= 0x04;  /* lane 2: bytes 4-5 */
@@ -129,6 +138,8 @@ static uint64_t sse2_byte_merge(uint64_t src, uint64_t dst, uint16_t mask)
     * Bytes 1-7 = 0xFF or 0x00 from mask bits 8-14 (whole-byte select).
     * We expand each bit to a full 0xFF byte using sign-extension. */
    uint64_t sel64 = (uint64_t)(mask & 0xFF);  /* byte 0: per-bit */
+   __m128i vmask, vsrc, vdst, r;
+
    sel64 |= (uint64_t)((uint8_t)(-(int8_t)((mask >> 8)  & 1))) << 8;
    sel64 |= (uint64_t)((uint8_t)(-(int8_t)((mask >> 9)  & 1))) << 16;
    sel64 |= (uint64_t)((uint8_t)(-(int8_t)((mask >> 10) & 1))) << 24;
@@ -137,17 +148,17 @@ static uint64_t sse2_byte_merge(uint64_t src, uint64_t dst, uint16_t mask)
    sel64 |= (uint64_t)((uint8_t)(-(int8_t)((mask >> 13) & 1))) << 48;
    sel64 |= (uint64_t)((uint8_t)(-(int8_t)((mask >> 14) & 1))) << 56;
 
-   __m128i vmask = _mm_set_epi64x(0, (int64_t)sel64);
-   __m128i vsrc  = _mm_set_epi64x(0, (int64_t)src);
-   __m128i vdst  = _mm_set_epi64x(0, (int64_t)dst);
+   vmask = _mm_set_epi64x(0, (int64_t)sel64);
+   vsrc  = _mm_set_epi64x(0, (int64_t)src);
+   vdst  = _mm_set_epi64x(0, (int64_t)dst);
 
    /* result = (src & mask) | (dst & ~mask) */
-   __m128i r = _mm_or_si128(
+   r = _mm_or_si128(
       _mm_and_si128(vsrc, vmask),
       _mm_andnot_si128(vmask, vdst)
    );
 
-   return (uint64_t)_mm_cvtsi128_si64(r);
+   return sse2_extract_u64(r);
 }
 
 const blitter_simd_ops_t blitter_simd_ops = {