Commit ac27d5fb authored by m4xw's avatar m4xw
Browse files

git subrepo clone --force --branch=master ../mupen64plus-core mupen64plus-core

subrepo:
  subdir:   "mupen64plus-core"
  merged:   "ca987441"
upstream:
  origin:   "../mupen64plus-core"
  branch:   "master"
  commit:   "ca987441"
git-subrepo:
  version:  "0.4.0"
  origin:   "???"
  commit:   "???"
parent 855d2577
Pipeline #39386 passed with stages
in 4 minutes and 33 seconds
......@@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/libretro/mupen64plus-core.git
branch = master
commit = ed5c14f5f941d7c5763c955e1357f3dab5687c67
parent = de17151b4dc53767c71f0739d6248e217d615fb8
commit = ca987441cd60c73b6c6a603edad6c274ef13b515
parent = 855d2577d7e900dd619ac00a2b98e3799af5d337
method = rebase
cmdver = 0.4.0
......@@ -7069,10 +7069,8 @@ static void ujump_assemble(int i,struct regstat *i_regs)
if(i==(ba[i]-start)>>2) assem_debug("idle loop");
address_generation(i+1,i_regs,regs[i].regmap_entry);
//Deal with ROM Hacks
if(rt1[i+1]==31)
if((rt1[i]==31)&&(rt1[i+1]==31||rs1[i+1]==31||rs2[i+1]==31))
{
assert(rs1[i+1]==31);
signed char rt=get_reg(branch_regs[i].regmap,31);
assert(get_reg(i_regs->regmap,31)==rt);
emit_movimm(start+i*4+8,rt); // PC into link register
......@@ -9350,9 +9348,14 @@ int new_recompile_block(int addr)
if(ba[j]==start+i*4+4) done=j=0;
if(ba[j]==start+i*4+8) done=j=0;
}
// Tonic trouble is weird!
if(type==CJUMP)
done=0;
// Stop if we're compiling junk
if(type==UJUMP||type==CJUMP||type==SJUMP||type==RJUMP||type==FJUMP)
{
done=stop_after_jal=1;
itype[i]=NOP;
DebugMessage(M64MSG_VERBOSE, "Disabled speculative precompilation");
}
}
else {
if(stop_after_jal) done=1;
......@@ -9664,7 +9667,6 @@ int new_recompile_block(int addr)
if (rt1[i]==31) {
alloc_reg(&current,i,31);
dirty_reg(&current,31);
assert(rs2[i+1]!=31);
#ifdef REG_PREFETCH
alloc_reg(&current,i,PTEMP);
#endif
......
......@@ -140,6 +140,7 @@ ALIGN(4096, static char recomp_dbg_extra_memory[33554432]);
#include <inttypes.h>
#include <capstone.h>
#include "osal/files.h"
#if RECOMPILER_DEBUG == NEW_DYNAREC_X86
#define ARCHITECTURE CS_ARCH_X86
#define MODE CS_MODE_32
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment