Emulator-Archive/box86
1
0
Fork 0
mirror of https://github.com/ptitSeb/box86.git synced 2024-11-26 16:31:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into remove_dynablocklist

Browse Source
This commit is contained in:
ptitSeb 2022-11-11 22:35:37 +01:00
commit 9c6f99f583
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dynarec/dynarec_arm_00.c
View File

@ -5,6 +5,7 @@
#include <errno.h>
#include <signal.h>
#include <string.h>
#include <sys/mman.h>
#include "debug.h"
#include "box86context.h"
@ -21,6 +22,7 @@
#include "dynarec_arm.h"
#include "dynarec_arm_private.h"
#include "arm_printer.h"
#include "custommem.h"
#include "dynarec_arm_functions.h"
#include "dynarec_arm_helper.h"
@ -2156,7 +2158,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
#if STEP < 2
if (i32==0)
tmp = dyn->insts[ninst].pass2choice = 1;
else if (((u32)>0x10000) && (PKa(u32+0)==0x8B) && (((PKa(u32+1))&0xC7)==0x04) && (PKa(u32+2)==0x24) && (PKa(u32+3)==0xC3))
else if ((getProtection(u32)&PROT_READ) && (PKa(u32+0)==0x8B) && (((PKa(u32+1))&0xC7)==0x04) && (PKa(u32+2)==0x24) && (PKa(u32+3)==0xC3))
tmp = dyn->insts[ninst].pass2choice = 2;
/*else if(isNativeCall(dyn, u32, &dyn->insts[ninst].natcall, &dyn->insts[ninst].retn))
tmp = dyn->insts[ninst].pass2choice = 3;*/

2
src/tools/bridge.c
View File

@ -131,7 +131,7 @@ uintptr_t AddBridge(bridge_t* bridge, wrapper_t w, void* fnc, int N, const char*
pthread_mutex_unlock(&my_context->mutex_bridge);
#ifdef DYNAREC
// only reprotect the block when stuffs are running
if(!my_context->deferedInit)
if(!my_context->deferedInit && box86_dynarec)
protectDB((uintptr_t)b->b, NBRICK*sizeof(onebridge_t));
#endif
#ifdef HAVE_TRACE