From 560fa8379f8a4b384b2de42addb79e65259c0b5e Mon Sep 17 00:00:00 2001
From: Paul Cercueil <paul@crapouillou.net>
Date: Sun, 12 Jan 2025 23:07:38 +0100
Subject: [PATCH] git subrepo pull --force deps/lightrec
subrepo:
subdir: "deps/lightrec"
merged: "8293acf768e"
upstream:
origin: "https://github.com/pcercuei/lightrec.git"
branch: "master"
commit: "8293acf768e"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "110b9eb"
---
deps/lightrec/.gitrepo | 4 ++--
deps/lightrec/README.md | 6 +++---
deps/lightrec/interpreter.c | 4 +++-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/deps/lightrec/.gitrepo b/deps/lightrec/.gitrepo
index 5045b807..e7d76955 100644
--- a/deps/lightrec/.gitrepo
+++ b/deps/lightrec/.gitrepo
@@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/pcercuei/lightrec.git
branch = master
- commit = 05f7e09e919327677454099664656e681f755ee5
- parent = 60e75dbfc3a5c7278e5bf4bf39801ea8fbcf3892
+ commit = 8293acf768e57060bb3ee66eeb0942d3d06b964e
+ parent = b7027dbf9b020077be29014680d96b19c97f7d20
method = merge
cmdver = 0.4.6
diff --git a/deps/lightrec/README.md b/deps/lightrec/README.md
index 449e06c1..849ec292 100644
--- a/deps/lightrec/README.md
+++ b/deps/lightrec/README.md
@@ -8,7 +8,7 @@ as the code emitter.
As such, in theory it should be able to run on every CPU that Lightning
can generate code for; including, but not limited to, __x86__, __x86_64__,
-__ARM__, __Aarch64__, __MIPS__, __PowerPC__ and __Risc-V__.
+__ARM__, __Aarch64__, __MIPS__, __PowerPC__, __SH4__ and __Risc-V__.
## Features
@@ -47,10 +47,10 @@ Lightrec has been ported to the following emulators:
* [__PCSX-ReArmed__ (libretro)](https://github.com/libretro/pcsx_rearmed)
-* [__pcsx4all__ (my own fork)](https://github.com/pcercuei/pcsx4all)
-
* [__Beetle__ (libretro)](https://github.com/libretro/beetle-psx-libretro/)
* [__CubeSX/WiiSX__](https://github.com/emukidid/pcsxgc/)
+* [__Bloom__](https://github.com/pcercuei/bloom)
+
[](https://star-history.com/#pcercuei/lightrec&Date)
diff --git a/deps/lightrec/interpreter.c b/deps/lightrec/interpreter.c
index c0a5d54d..ef2d8843 100644
--- a/deps/lightrec/interpreter.c
+++ b/deps/lightrec/interpreter.c
@@ -205,7 +205,9 @@ static u32 int_delay_slot(struct interpreter *inter, u32 pc, bool branch)
if (branch_in_ds) {
run_first_op = true;
- if (op->i.op == OP_SPECIAL)
+ if (!is_branch_taken(reg_cache, op->c))
+ next_pc = pc + 4;
+ else if (op->i.op == OP_SPECIAL)
next_pc = reg_cache[op->r.rs]; /* TODO: is it the old or new rs? */
else if (op->i.op == OP_J || op->i.op == OP_JAL)
next_pc = (pc & 0xf0000000) | (op->j.imm << 2);
--
2.39.5