This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch armhf_test in repository mupen64plus-rsp-hle.
commit d711ca0ddde4130707b32c796517fa1526129726 Author: Sven Eckelmann <[email protected]> Date: Sun Dec 2 21:30:25 2012 +0100 Imported Upstream version 1.99.5+11+bf4a5b4315de --- projects/unix/Makefile | 10 +++++++++- src/main.c | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/projects/unix/Makefile b/projects/unix/Makefile index 2c5dce8..1c9725c 100644 --- a/projects/unix/Makefile +++ b/projects/unix/Makefile @@ -83,7 +83,7 @@ ifneq ("$(filter pentium i%86,$(HOST_CPU))","") ARCH_DETECTED := 32BITS PIC ?= 0 endif -ifneq ("$(filter ppc powerpc,$(HOST_CPU))","") +ifneq ("$(filter ppc macppc socppc powerpc,$(HOST_CPU))","") CPU := PPC ARCH_DETECTED := 32BITS BIG_ENDIAN := 1 @@ -97,6 +97,14 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","") PIC ?= 1 $(warning Architecture "$(HOST_CPU)" not officially supported.') endif +ifneq ("$(filter arm%,$(HOST_CPU))","") + ifeq ("$(filter arm%b,$(HOST_CPU))","") + CPU := ARM + ARCH_DETECTED := 32BITS + PIC ?= 1 + $(warning Architecture "$(HOST_CPU)" not officially supported.') + endif +endif ifeq ("$(CPU)","NONE") $(error CPU type "$(HOST_CPU)" not supported. Please file bug report at 'http://code.google.com/p/mupen64plus/issues') endif diff --git a/src/main.c b/src/main.c index 5ec5d51..651ac30 100644 --- a/src/main.c +++ b/src/main.c @@ -144,6 +144,7 @@ static int audio_ucode(OSTask_t *task) { unsigned int *p_alist = (unsigned int*)(rsp.RDRAM + task->data_ptr); unsigned int i; + u32 inst1_idx; switch(audio_ucode_detect(task)) { @@ -167,7 +168,11 @@ static int audio_ucode(OSTask_t *task) { inst1 = p_alist[i]; inst2 = p_alist[i+1]; - ABI[inst1 >> 24](); + inst1_idx = inst1 >> 24; + if (inst1_idx < 0x20) + ABI[inst1_idx](); + else + DebugMessage(M64MSG_WARNING, "Invalid audio ABI index %u", inst1_idx); } return 0; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-rsp-hle.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
