From ad672054ecfe46d31486d3414d6101f9950c0fa9 Mon Sep 17 00:00:00 2001 From: OBattler Date: Tue, 8 Aug 2023 21:10:56 +0200 Subject: [PATCH 1/2] Some missing extern's in cpu/x86_ops.h. --- src/cpu/x86_ops.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/cpu/x86_ops.h b/src/cpu/x86_ops.h index 15dc66960..ee3618d52 100644 --- a/src/cpu/x86_ops.h +++ b/src/cpu/x86_ops.h @@ -44,9 +44,9 @@ typedef int (*OpFn)(uint32_t fetchdat); #ifdef USE_DYNAREC -void x86_setopcodes(const OpFn *opcodes, const OpFn *opcodes_0f, - const OpFn *dynarec_opcodes, - const OpFn *dynarec_opcodes_0f); +extern void x86_setopcodes(const OpFn *opcodes, const OpFn *opcodes_0f, + const OpFn *dynarec_opcodes, + const OpFn *dynarec_opcodes_0f); extern const OpFn *x86_dynarec_opcodes; extern const OpFn *x86_dynarec_opcodes_0f; @@ -187,7 +187,7 @@ extern const OpFn dynarec_ops_REPNE[1024]; extern const OpFn dynarec_ops_3DNOW[256]; extern const OpFn dynarec_ops_3DNOWE[256]; #else -void x86_setopcodes(const OpFn *opcodes, const OpFn *opcodes_0f); +extern void x86_setopcodes(const OpFn *opcodes, const OpFn *opcodes_0f); #endif @@ -331,7 +331,7 @@ extern const OpFn ops_3DNOW[256]; extern const OpFn ops_3DNOWE[256]; -void x86_setopcodes_2386(const OpFn *opcodes, const OpFn *opcodes_0f); +extern void x86_setopcodes_2386(const OpFn *opcodes, const OpFn *opcodes_0f); extern const OpFn *x86_2386_opcodes; extern const OpFn *x86_2386_opcodes_0f; @@ -354,6 +354,9 @@ extern const OpFn *x86_2386_opcodes_df_a32; extern const OpFn *x86_2386_opcodes_REPE; extern const OpFn *x86_2386_opcodes_REPNE; +extern const OpFn ops_2386_186[1024]; +extern const OpFn ops_2386_186_0f[1024]; + extern const OpFn ops_2386_286[1024]; extern const OpFn ops_2386_286_0f[1024]; From 3796eb81631b6881e36b3583b5725d1314a689a9 Mon Sep 17 00:00:00 2001 From: OBattler Date: Tue, 8 Aug 2023 21:14:34 +0200 Subject: [PATCH 2/2] Moved an #endif in cpu/386_ops.h to the correct place. --- src/cpu/386_ops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpu/386_ops.h b/src/cpu/386_ops.h index 4f546e535..6a4646e4b 100644 --- a/src/cpu/386_ops.h +++ b/src/cpu/386_ops.h @@ -2100,6 +2100,7 @@ const OpFn OP_TABLE(pentium2d_0f)[1024] = { /*f0*/ ILLEGAL, opPSLLW_a32, opPSLLD_a32, opPSLLQ_a32, ILLEGAL, opPMADDWD_a32, ILLEGAL, ILLEGAL, opPSUBB_a32, opPSUBW_a32, opPSUBD_a32, ILLEGAL, opPADDB_a32, opPADDW_a32, opPADDD_a32, ILLEGAL, // clang-format on }; +#endif const OpFn OP_TABLE(186)[1024] = { // clang-format off @@ -2192,7 +2193,6 @@ const OpFn OP_TABLE(186)[1024] = { /*f0*/ opLOCK, opLOCK, opREPNE, opREPE, opHLT, opCMC, opF6_a16, opF7_w_a16, opCLC, opSTC, opCLI, opSTI, opCLD, opSTD, opINCDEC_b_a16, opFF_w_a16, // clang-format on }; -#endif const OpFn OP_TABLE(286)[1024] = { // clang-format off