Skip to content

Commit

Permalink
git subrepo pull --force deps/lightrec
Browse files Browse the repository at this point in the history
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"
  • Loading branch information
pcercuei authored and notaz committed Jan 12, 2025
1 parent b7027db commit 560fa83
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions deps/lightrec/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions deps/lightrec/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)

[![Star History Chart](https://api.star-history.com/svg?repos=pcercuei/lightrec&type=Date)](https://star-history.com/#pcercuei/lightrec&Date)
4 changes: 3 additions & 1 deletion deps/lightrec/interpreter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 560fa83

Please sign in to comment.