diff options
author | joerg <joerg@pkgsrc.org> | 2013-11-29 12:55:37 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-11-29 12:55:37 +0000 |
commit | b9d38410e823459fb0624598b6d7d763c846800d (patch) | |
tree | ce3169aa98456d86a64d779917d1fd2460d74602 /emulators | |
parent | d82897893f25a6a1f3f79632ff103ba0a6d36742 (diff) | |
download | pkgsrc-b9d38410e823459fb0624598b6d7d763c846800d.tar.gz |
Fix assembler syntax to not depend on horrendous GNU implementation
details.
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/realboy/distinfo | 3 | ||||
-rw-r--r-- | emulators/realboy/patches/patch-src_gboy__x86__64.S | 58 |
2 files changed, 60 insertions, 1 deletions
diff --git a/emulators/realboy/distinfo b/emulators/realboy/distinfo index 1cf36a2fe4f..663861ec2a7 100644 --- a/emulators/realboy/distinfo +++ b/emulators/realboy/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2013/11/15 14:58:07 wiz Exp $ +$NetBSD: distinfo,v 1.3 2013/11/29 12:55:37 joerg Exp $ SHA1 (realboy-0.1.4.tar.bz2) = 344be8f28498e457a370757c7f2e4dd6d31c107f RMD160 (realboy-0.1.4.tar.bz2) = 69bc1f5523ac15b7d9bde1634f545ab2b9e459ed Size (realboy-0.1.4.tar.bz2) = 150800 bytes +SHA1 (patch-src_gboy__x86__64.S) = ca69f3d065dc9225173f8a10b72a76ccce132a94 diff --git a/emulators/realboy/patches/patch-src_gboy__x86__64.S b/emulators/realboy/patches/patch-src_gboy__x86__64.S new file mode 100644 index 00000000000..cfe78f670ed --- /dev/null +++ b/emulators/realboy/patches/patch-src_gboy__x86__64.S @@ -0,0 +1,58 @@ +$NetBSD: patch-src_gboy__x86__64.S,v 1.1 2013/11/29 12:55:37 joerg Exp $ + +--- src/gboy_x86_64.S.orig 2013-11-27 23:28:07.000000000 +0000 ++++ src/gboy_x86_64.S +@@ -1824,7 +1824,7 @@ op_sbc: + andq $F_ZERO, %rdx # mask in zero flag + andq $~F_ZERO, (%r10) # zero zero flag + orq %rdx, (%r10) # copy new zero flag +- or $F_SUBTRACT, (%r10) # unset F_SUBTRACT ++ orl $F_SUBTRACT, (%r10) # unset F_SUBTRACT + movq %r11, %rdx + shlq $1, %rdx # move carry bit into position + andq $F_HCARRY, %rdx # mask in carry bit +@@ -3959,7 +3959,7 @@ op_jmp: + movq $addr_sp_ptrs, %rdi + movq %r13, %r11 # save + movq $regs_sets, %r10 +- movw %r13, PC(%r10) ++ movw %r13w, PC(%r10) + shrq $9, %r13 # get + andq $0x78, %r13 # offset to pointer in addr_sp_ptrs + addq %r13, %rdi # point to address space +@@ -3987,7 +3987,7 @@ op_jmp_nz: + andq $0xffff, %r13 # mask in word + movq $addr_sp_ptrs, %rdi + movq %r13, %r11 # save +- movw %r13, PC(%rbx) ++ movw %r13w, PC(%rbx) + shrq $9, %r13 # get + andq $0x78, %r13 # offset to pointer in addr_sp_ptrs + addq %r13, %rdi # point to address space +@@ -4016,7 +4016,7 @@ op_jmp_z: + andq $0xffff, %r13 # mask in word + movq $addr_sp_ptrs, %rdi + movq %r13, %r11 # save +- movw %r13, PC(%r10) ++ movw %r13w, PC(%r10) + shrq $9, %r13 # get + andq $0x78, %r13 # offset to pointer in addr_sp_ptrs + addq %r13, %rdi # point to address space +@@ -4046,7 +4046,7 @@ op_jmp_c: + andq $0xffff, %r13 # mask in word + movq $addr_sp_ptrs, %rdi + movq %r13, %r11 # save +- movw %r13, PC(%rbx) ++ movw %r13w, PC(%rbx) + shrq $9, %r13 # get + andq $0x78, %r13 # offset to pointer in addr_sp_ptrs + addq %r13, %rdi # point to address space +@@ -4076,7 +4076,7 @@ op_jmp_nc: + andq $0xffff, %r13 # mask in word + movq $addr_sp_ptrs, %rdi + movq %r13, %r11 # save +- movw %r13, PC(%rbx) ++ movw %r13w, PC(%rbx) + shrq $9, %r13 # get + andq $0x78, %r13 # offset to pointer in addr_sp_ptrs + addq %r13, %rdi # point to address space |