lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Promote nested functions to macros, fix clang builds 

Add x86 Android builds back to the CI now that it's fixed (tested with
NDK r21)
This commit is contained in:
David Guillen Fandos 2021-07-26 21:41:07 +02:00
parent 1d8313cc14
commit b0947a1ae1
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -147,6 +147,12 @@ android-arm64-v8a:
- .libretro-android-jni-arm64-v8a - .libretro-android-jni-arm64-v8a
- .core-defs - .core-defs
# Android 32-bit x86
android-x86:
extends:
- .libretro-android-jni-x86
- .core-defs
# Android 64-bit x86 # Android 64-bit x86
android-x86_64: android-x86_64:
extends: extends:

16
x86/x86_emit.h
View File

@ -470,10 +470,12 @@ typedef enum
x86_emit_jmp_offset(x86_relative_offset(translation_ptr, \ x86_emit_jmp_offset(x86_relative_offset(translation_ptr, \
x86_indirect_branch_##type, 4)) \ x86_indirect_branch_##type, 4)) \
#define generate_block_prologue() \ #define block_prologue_size 0
#define generate_block_prologue()
#define generate_block_extra_vars_arm()
#define generate_block_extra_vars_thumb()
#define generate_block_extra_vars_arm() \ #define generate_indirect_branch_arm() \
void generate_indirect_branch_arm(void) \
{ \ { \
if(condition == 0x0E) \ if(condition == 0x0E) \
{ \ { \
@ -484,8 +486,8 @@ typedef enum
generate_indirect_branch_no_cycle_update(arm); \ generate_indirect_branch_no_cycle_update(arm); \
} \ } \
} \ } \
\
void generate_indirect_branch_dual() \ #define generate_indirect_branch_dual() \
{ \ { \
if(condition == 0x0E) \ if(condition == 0x0E) \
{ \ { \
@ -497,10 +499,6 @@ typedef enum
} \ } \
} \ } \
#define generate_block_extra_vars_thumb() \
#define block_prologue_size 0
#define calculate_z_flag(dest) \ #define calculate_z_flag(dest) \
reg[REG_Z_FLAG] = (dest == 0) \ reg[REG_Z_FLAG] = (dest == 0) \

6
x86/x86_stub.S
View File

@ -31,9 +31,6 @@ _##symbol:
#define _iwram iwram #define _iwram iwram
#define _ewram ewram #define _ewram ewram
#define _vram vram #define _vram vram
#define _oam_ram oam_ram
#define _bios_rom bios_rom
#define _io_registers io_registers
#define _update_gba update_gba #define _update_gba update_gba
#define _block_lookup_address_arm block_lookup_address_arm #define _block_lookup_address_arm block_lookup_address_arm
@ -52,9 +49,6 @@ _##symbol:
.global _iwram .global _iwram
.global _ewram .global _ewram
.global _vram .global _vram
.global _oam_ram
.global _bios_rom
.global _io_registers
.extern _spsr .extern _spsr