mirror of
https://github.com/mi57730/a2d.git
synced 2025-02-09 04:30:43 +00:00
add overlay #2, and a refactoring (macro-replacing) tool
This commit is contained in:
Joshua Bell
parent
026485a841
commit
25d4eeb41c
@ -8,7 +8,7 @@ OUTDIR = out
|
||||
HEADERS = $(wildcard ../*.inc) $(wildcard ../inc/*.inc) $(wildcard *.inc)
|
||||
|
||||
SEGMENTS = loader mgtk desktop invoker \
|
||||
ovl1 ovl1a ovl5 ovl6 ovl7
|
||||
ovl1 ovl1a ovl2 ovl5 ovl6 ovl7
|
||||
|
||||
TARGETS = $(patsubst %,$(OUTDIR)/%.built,$(SEGMENTS))
|
||||
|
||||
|
||||
BIN
desktop/orig/DESKTOP2_ovl2
Normal file
BIN
desktop/orig/DESKTOP2_ovl2
Normal file
Binary file not shown.
2346
desktop/ovl2.s
Normal file
2346
desktop/ovl2.s
Normal file
File diff suppressed because it is too large
Load Diff
@ -31,7 +31,7 @@ function stats {
|
||||
#do_make clean
|
||||
do_make all
|
||||
|
||||
TARGETS="loader mgtk desktop invoker ovl1 ovl1a ovl5 ovl6 ovl7"
|
||||
TARGETS="loader mgtk desktop invoker ovl1 ovl1a ovl2 ovl5 ovl6 ovl7"
|
||||
|
||||
# Verify original and output match
|
||||
echo "Verifying diffs:"
|
||||
|
||||
162
res/refactor.pl
Executable file
162
res/refactor.pl
Executable file
@ -0,0 +1,162 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
my $text = do { local $/; <STDIN> };
|
||||
|
||||
my %mgtk = (
|
||||
'$00' => 'NoOp',
|
||||
'$01' => 'InitGraf',
|
||||
'$02' => 'SetSwitches',
|
||||
'$03' => 'InitPort',
|
||||
'$04' => 'SetPort',
|
||||
'$05' => 'GetPort',
|
||||
'$06' => 'SetPortBits',
|
||||
'$07' => 'SetPenMode',
|
||||
'$08' => 'SetPattern',
|
||||
'$09' => 'SetColorMasks',
|
||||
'$0A' => 'SetPenSize',
|
||||
'$0B' => 'SetFont',
|
||||
'$0C' => 'SetTextBG',
|
||||
'$0D' => 'Move',
|
||||
'$0E' => 'MoveTo',
|
||||
'$0F' => 'Line',
|
||||
'$10' => 'LineTo',
|
||||
'$11' => 'PaintRect',
|
||||
'$12' => 'FrameRect',
|
||||
'$13' => 'InRect',
|
||||
'$14' => 'PaintBits',
|
||||
'$15' => 'PaintPoly',
|
||||
'$16' => 'FramePoly',
|
||||
'$17' => 'InPoly',
|
||||
'$18' => 'TextWidth',
|
||||
'$19' => 'DrawText',
|
||||
'$1A' => 'SetZP1',
|
||||
'$1B' => 'SetZP2',
|
||||
'$1C' => 'Version',
|
||||
'$1D' => 'StartDeskTop',
|
||||
'$1E' => 'StopDeskTop',
|
||||
'$1F' => 'SetUserHook',
|
||||
'$20' => 'AttachDriver',
|
||||
'$21' => 'ScaleMouse',
|
||||
'$22' => 'KeyboardMouse',
|
||||
'$23' => 'GetIntHandler',
|
||||
'$24' => 'SetCursor',
|
||||
'$25' => 'ShowCursor',
|
||||
'$26' => 'HideCursor',
|
||||
'$27' => 'ObscureCursor',
|
||||
'$28' => 'GetCursorAddr',
|
||||
'$29' => 'CheckEvents',
|
||||
'$2A' => 'GetEvent',
|
||||
'$2B' => 'FlushEvents',
|
||||
'$2C' => 'PeekEvent',
|
||||
'$2D' => 'PostEvent',
|
||||
'$2E' => 'SetKeyEvent',
|
||||
'$2F' => 'InitMenu',
|
||||
'$30' => 'SetMenu',
|
||||
'$31' => 'MenuSelect',
|
||||
'$32' => 'MenuKey',
|
||||
'$33' => 'HiliteMenu',
|
||||
'$34' => 'DisableMenu',
|
||||
'$35' => 'DisableItem',
|
||||
'$36' => 'CheckItem',
|
||||
'$37' => 'SetMark',
|
||||
'$38' => 'OpenWindow',
|
||||
'$39' => 'CloseWindow',
|
||||
'$3A' => 'CloseAll',
|
||||
'$3B' => 'GetWinPtr',
|
||||
'$3C' => 'GetWinPort',
|
||||
'$3D' => 'SetWinPort',
|
||||
'$3E' => 'BeginUpdate',
|
||||
'$3F' => 'EndUpdate',
|
||||
'$40' => 'FindWindow',
|
||||
'$41' => 'FrontWindow',
|
||||
'$42' => 'SelectWindow',
|
||||
'$43' => 'TrackGoAway',
|
||||
'$44' => 'DragWindow',
|
||||
'$45' => 'GrowWindow',
|
||||
'$46' => 'ScreenToWindow',
|
||||
'$47' => 'WindowToScreen',
|
||||
'$48' => 'FindControl',
|
||||
'$49' => 'SetCtlMax',
|
||||
'$4A' => 'TrackThumb',
|
||||
'$4B' => 'UpdateThumb',
|
||||
'$4C' => 'ActivateCtl',
|
||||
);
|
||||
|
||||
$text =~ s/
|
||||
\b ldy \s+ \#(\$[0-9A-F]{2}) \n
|
||||
\s+ lda \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ ldx \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ jsr \s+ MGTK_RELAY \b
|
||||
/"MGTK_RELAY_CALL MGTK::$mgtk{$1}, \$$3$2"/egx;
|
||||
|
||||
$text =~ s/
|
||||
\b ldy \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ lda \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ ldx \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ jsr \s+ ((?:L|\$)[0-9A-F]{2,4}) \b
|
||||
/yax_call $4, \$$1, \$$3$2/gx;
|
||||
|
||||
$text =~ s/
|
||||
\b lda \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ ldx \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ ldy \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ jsr \s+ ((?:L|\$)[0-9A-F]{2,4}) \b
|
||||
/axy_call $4, \$$3, \$$2$1/gx;
|
||||
|
||||
$text =~ s/
|
||||
\b lda \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ ldx \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ jsr \s+ ((?:L|\$)[0-9A-F]{2,4}) \b
|
||||
/addr_call $3, \$$2$1/gx;
|
||||
|
||||
$text =~ s/
|
||||
\b lda \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ ldx \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ jmp \s+ ((?:L|\$)[0-9A-F]{2,4}) \b
|
||||
/addr_jump $3, \$$2$1/gx;
|
||||
|
||||
$text =~ s/
|
||||
\b lda \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ ldx \s+ \#\$([0-9A-F]{2}) \b
|
||||
/ldax #\$$2$1/gx;
|
||||
|
||||
$text =~ s/
|
||||
\b sta \s+ ([L\$][0-9A-F]{4}) \n
|
||||
\s+ stx \s+ ([L\$][0-9A-F]{4}) \b
|
||||
/(hex(substr($1,1)) + 1 == hex(substr($2,1)))
|
||||
? "stax $1" : $&/egx;
|
||||
|
||||
$text =~ s/
|
||||
\b lsr \s+ ([L\$][0-9A-F]{4}) \n
|
||||
\s+ ror \s+ ([L\$][0-9A-F]{4}) \b
|
||||
/(hex(substr($1,1)) == hex(substr($2,1)) + 1)
|
||||
? "lsr16 $1" : $&/egx;
|
||||
|
||||
$text =~ s/
|
||||
\b lda \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ sta \s+ ([L\$][0-9A-F]{2,4}) \n
|
||||
\s+ lda \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ sta \s+ ([L\$][0-9A-F]{2,4}) \b
|
||||
/(hex(substr($2,1)) + 1 == hex(substr($4,1))) ? "copy16 #\$$3$1, $2" : $&/egx;
|
||||
|
||||
$text =~ s/
|
||||
\b lda \s+ ([L\$][0-9A-F]{2,4}) \n
|
||||
\s+ clc \n
|
||||
\s+ adc \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ sta \s+ ([L\$][0-9A-F]{2,4}) \n
|
||||
\s+ lda \s+ ([L\$][0-9A-F]{2,4}) \n
|
||||
\s+ adc \s+ \#\$([0-9A-F]{2}) \n
|
||||
\s+ sta \s+ ([L\$][0-9A-F]{2,4}) \b
|
||||
/(hex(substr($1,1)) + 1 == hex(substr($4,1))) &&
|
||||
(hex(substr($3,1)) + 1 == hex(substr($6,1)))
|
||||
? "add16 $1, #\$$5$2, $3" : $&/egx;
|
||||
|
||||
$text =~ s/
|
||||
\b lda \s+ ( (?: [L\$][0-9A-F]{2,4} ) | (?: \#\$[0-9A-F]{2} ) ) \n
|
||||
\s+ rts \b
|
||||
/return $1/gx;
|
||||
|
||||
print $text;
|
||||
Loading…
x
Reference in New Issue
Block a user