Skip to content

Commit

Permalink
refs #33 SETP incorrectly sets I flag in PSW to 0.
Browse files Browse the repository at this point in the history
  • Loading branch information
dgrfactory committed Jun 21, 2021
1 parent 774ceb4 commit 1f38d44
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions snesapu.dll/APU.asm
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ SECTION .data ALIGN=256
SECTION .data ALIGN=32
%endif

; ----- degrade-factory code [2021/06/15] -----
; ----- degrade-factory code [2021/06/19] -----
apuOpt DD (CPU_CYC << 24) | (DEBUG << 16) | (DSPINTEG << 17) | (VMETERM << 8) | (VMETERV << 9) | (1 << 10) | (STEREO << 11) \
| (HALFC << 1) | (CNTBK << 2) | (SPEED << 3) | (IPLW << 4) | (DSPBK << 5) | (INTBK << 6)
apuDllVer DD 21864h ;SNESAPU.DLL Current Version
apuCmpVer DD 11000h ;SNESAPU.DLL Backwards Compatible Version
apuVerStr DD "2.18.4 (build 7375)" ;SNESAPU.DLL Current Version (32byte String)
apuVerStr DD "2.18.4 (build 7379)" ;SNESAPU.DLL Current Version (32byte String)
DD 8
; ----- degrade-factory code [END] -----

Expand Down
5 changes: 2 additions & 3 deletions snesapu.dll/SPC700.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4560,7 +4560,7 @@ Ret
;===================================================================================================
;RETI - Return From Interrupt
; N V P B H I Z C
; ? ? ? ? ? 1 ? ?
; ? ? ? ? ? ? ? ?
;RetI
%macro Opc7F 0
PopB PS
Expand Down Expand Up @@ -4844,11 +4844,10 @@ Ret
;===================================================================================================
;SETP - Set Direct Page Flag
; N V P B H I Z C
; 1 0
; 1
;SetP
%macro Opc40 0
Mov byte [PSW+P],1
Mov byte [PSW+I],0
CleanUp 2,1
%endmacro

Expand Down
4 changes: 2 additions & 2 deletions snesapu.dll/version.rc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
1 VERSIONINFO
FILEVERSION 2,18,4,7375
FILEVERSION 2,18,4,7379
PRODUCTVERSION 2,18,4,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x8L
Expand All @@ -12,7 +12,7 @@ BEGIN
BLOCK "041103A4"
BEGIN
VALUE "FileDescription", "SNES SPC700 Emulator\0"
VALUE "FileVersion", "2.18.4 (build 7375)\0"
VALUE "FileVersion", "2.18.4 (build 7379)\0"
VALUE "LegalCopyright", "Copyright (C) 1999-2008 Alpha-II Productions; (C) 2003-2021 degrade-factory.\0"
VALUE "LegalTrademarks", "SNES is a registered trademark of Nintendo.\0"
VALUE "ProductName", "SNESAPU\0"
Expand Down
2 changes: 1 addition & 1 deletion spcplay.exe/spcplay.dpr
Original file line number Diff line number Diff line change
Expand Up @@ -2327,7 +2327,7 @@ const
DEFAULT_TITLE: string = 'SNES SPC700 Player';
SPCPLAY_TITLE = '[ SNES SPC700 Player ]' + CRLF + ' SPCPLAY.EXE v';
SNESAPU_TITLE = '[ SNES SPC700 Emulator ]' + CRLF + ' SNESAPU.DLL v';
SPCPLAY_VERSION = '2.18.4 (build 7375)';
SPCPLAY_VERSION = '2.18.4 (build 7379)';
SNESAPU_VERSION = $21864;
APPLINK_VERSION = $02170500;

Expand Down
4 changes: 2 additions & 2 deletions spcplay.exe/spcplay.rc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ MAINICON ICON DISCARDABLE "spcplay.ico"
MAINBMP BITMAP DISCARDABLE "spcplay.bmp"

1 VERSIONINFO
FILEVERSION 2,18,4,7375
FILEVERSION 2,18,4,7379
PRODUCTVERSION 2,18,4,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x8L
Expand All @@ -15,7 +15,7 @@ BEGIN
BLOCK "041103A4"
BEGIN
VALUE "FileDescription", "SNES SPC700 Player\0"
VALUE "FileVersion", "2.18.4 (build 7375)\0"
VALUE "FileVersion", "2.18.4 (build 7379)\0"
VALUE "LegalCopyright", "Copyright (C) 2003-2021 degrade-factory.\0"
VALUE "LegalTrademarks", "SNES is a registered trademark of Nintendo.\0"
VALUE "ProductName", "SPCPLAY\0"
Expand Down

0 comments on commit 1f38d44

Please sign in to comment.