mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-05 15:49:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into fix-pkg-install

Browse source
This commit is contained in:
Ani 2025-04-08 09:08:38 +02:00 • committed by GitHub
commit 61f572d194
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.cirrus.yml
View file

@ -58,7 +58,7 @@ env:
# linux_task: # linux_task:
# container: # container:
# image: rpcs3/rpcs3-ci-jammy:1.2 # image: rpcs3/rpcs3-ci-jammy:1.5
# cpu: 4 # cpu: 4
# memory: 16G # memory: 16G
# env: # env:
@ -134,7 +134,7 @@ freebsd_task:
# matrix: # matrix:
# - name: Cirrus Linux AArch64 Clang # - name: Cirrus Linux AArch64 Clang
# arm_container: # arm_container:
# image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.2' # image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.5'
# cpu: 8 # cpu: 8
# memory: 8G # memory: 8G
# clang_script: # clang_script:

6
.github/workflows/rpcs3.yml vendored
View file

@ -25,17 +25,17 @@ jobs:
matrix: matrix:
include: include:
- os: ubuntu-24.04 - os: ubuntu-24.04
docker_img: "rpcs3/rpcs3-ci-jammy:1.4" docker_img: "rpcs3/rpcs3-ci-jammy:1.5"
build_sh: "/rpcs3/.ci/build-linux.sh" build_sh: "/rpcs3/.ci/build-linux.sh"
compiler: clang compiler: clang
UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f
UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux" UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux"
- os: ubuntu-24.04 - os: ubuntu-24.04
docker_img: "rpcs3/rpcs3-ci-jammy:1.4" docker_img: "rpcs3/rpcs3-ci-jammy:1.5"
build_sh: "/rpcs3/.ci/build-linux.sh" build_sh: "/rpcs3/.ci/build-linux.sh"
compiler: gcc compiler: gcc
- os: ubuntu-24.04-arm - os: ubuntu-24.04-arm
docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.4" docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.5"
build_sh: "/rpcs3/.ci/build-linux-aarch64.sh" build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
compiler: clang compiler: clang
UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1 UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1

4
azure-pipelines.yml
View file

@ -40,13 +40,13 @@ jobs:
# displayName: ccache # displayName: ccache
# - bash: | # - bash: |
# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.4 # docker pull --quiet rpcs3/rpcs3-ci-jammy:1.5
# docker run \ # docker run \
# -v $(pwd):/rpcs3 \ # -v $(pwd):/rpcs3 \
# --env-file .ci/docker.env \ # --env-file .ci/docker.env \
# -v $CCACHE_DIR:/root/.ccache \ # -v $CCACHE_DIR:/root/.ccache \
# -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ # -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
# rpcs3/rpcs3-ci-jammy:1.4 \ # rpcs3/rpcs3-ci-jammy:1.5 \
# /rpcs3/.ci/build-linux.sh # /rpcs3/.ci/build-linux.sh
# displayName: Docker setup and build # displayName: Docker setup and build

2
rpcs3/Emu/Cell/PPUTranslator.cpp
View file

@ -4653,7 +4653,7 @@ void PPUTranslator::MTFSF(ppu_opcode_t op)
for (u32 i = 16; i < 20; i++) for (u32 i = 16; i < 20; i++)
{ {
if (i != 1 && i != 2 && (op.flm & (128 >> (i / 4))) != 0) if (op.flm & (128 >> (i / 4)) != 0)
{ {
SetFPSCRBit(i, Trunc(m_ir->CreateLShr(value, i ^ 31), GetType<bool>()), false); SetFPSCRBit(i, Trunc(m_ir->CreateLShr(value, i ^ 31), GetType<bool>()), false);
} }