Sync with upstream

libretro · Nov 1, 2023 · 0685381 · 0685381
2 parents b8fbf6c + dab534b
commit 0685381
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -114,6 +114,10 @@ jobs:
         {
           github_rest DELETE "/repos/${GITHUB_REPOSITORY}/releases/${1}"
         }
+        github_delete_tag()
+        {
+          github_rest DELETE "/repos/${GITHUB_REPOSITORY}/git/refs/tags/${1}"
+        }
         github_create_release()
         {
           local payload="{
@@ -156,7 +160,12 @@ jobs:
             { release_id=$(github_get_release_id_for_tag nightly); status=$?; } || true
             # Delete existing nightly release if it exists.
             case ${status} in
-              0) github_delete_release_by_id "${release_id}" ;;
+              0)
+                  github_delete_release_by_id "${release_id}"
+                  # Deleting the 'nightly' release doesn't delete
+                  # the 'nightly' tag, so let's do it manually.
+                  github_delete_tag nightly
+                  ;;
               22) >&2 echo "No current nightly release; skipping tag deletion." ;;
               *) >&2 echo "API call failed unexpectedly." && exit 1 ;;
             esac

diff --git a/bsnes/processor/wdc65816/instructions-other.cpp b/bsnes/processor/wdc65816/instructions-other.cpp
@@ -205,9 +205,10 @@ E S.h = 0x01;
 auto WDC65816::instructionPullB() -> void {
   idle();
   idle();
-L B = pull();
+L B = pullN();
   ZF = B == 0;
   NF = B & 0x80;
+E S.h = 0x01;
 }
 
 auto WDC65816::instructionPullP() -> void {

diff --git a/bsnes/target-bsnes/resource/bsnes.desktop b/bsnes/target-bsnes/resource/bsnes.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=bsnes
-Comment=Emulator
+Comment=SNES Emulator
 Exec=bsnes
 Icon=bsnes
 Terminal=false