Browse Source

remove -p flag

vampirefrog 1 year ago
parent
commit
628a6624c7
14 changed files with 69 additions and 45 deletions
  1. 12
    6
      Makefile
  2. 1
    1
      bind.s
  3. 1
    1
      cmd.s
  4. 13
    7
      commando.s
  5. 6
    5
      human.s
  6. 1
    1
      iplrom30.s
  7. 1
    1
      iplromxv.s
  8. 17
    9
      mdxp.s
  9. 9
    8
      mopmdrv.s
  10. 4
    2
      mxdrv16.s
  11. 1
    1
      mxdrv17.s
  12. 1
    1
      mxp.s
  13. 1
    1
      pcm8.s
  14. 1
    1
      process.s

+ 12
- 6
Makefile View File

@@ -5,31 +5,37 @@ DIS_DEBUG=-x -a1
5 5
 else
6 6
 DIS_DEBUG=
7 7
 endif
8
+COLUMNS=120
8 9
 
9
-all: iplrom30.s iplromxv.s human.s commando.s cmd.s process.s bind.s mxdrv17.s mxdrv16.s mopmdrv.s pcm8.s mxp.s mdxp.s
10
+all: iplrom30.s iplromxv.s human.s commando.s cmd.s process.s bind.s opmdrv3.s mopmdrv.s mxdrv17.s mxdrv16.s pcm8.s mxp.s mdxp.s
10 11
 
11 12
 translations: mxdrv17.en.s
12 13
 
13 14
 iplrom30.s: iplrom30.dat iplrom30.lab iplrom30.tab
14
-	dis_include=$(DIS_INCLUDE) $(DIS) $(DIS_DEBUG) -b2 -h -i -m68030 -m68882 -zfe0000,ff0038 -q -p -B -M --exclude-fefunc-mac -Tiplrom30.tab -giplrom30.lab --overwrite $< $@
15
+	dis_include=$(DIS_INCLUDE) $(DIS) $(DIS_DEBUG) -b2 -h -i -m68030 -m68882 -zfe0000,ff0038 -q -B -M --exclude-fefunc-mac -Tiplrom30.tab -giplrom30.lab --overwrite $< $@
15 16
 	sed -i -e 's/;  Code Generate date .\+/;/' $@
16 17
 iplromxv.s: iplromxv.dat iplromxv.lab iplromxv.tab
17
-	dis_include=$(DIS_INCLUDE) $(DIS) $(DIS_DEBUG) -b2 -h -i -m68030 -m68882 -zfe0000,ff0010 -q -p -B -M --exclude-fefunc-mac -Tiplromxv.tab -giplromxv.lab --overwrite $< $@
18
+	dis_include=$(DIS_INCLUDE) $(DIS) $(DIS_DEBUG) -b2 -h -i -m68030 -m68882 -zfe0000,ff0010 -q -B -M --exclude-fefunc-mac -Tiplromxv.tab -giplromxv.lab --overwrite $< $@
18 19
 	sed -i -e 's/;  Code Generate date .\+/;/' $@
19 20
 
20 21
 %.en.s: %.s %.en.sed
21 22
 	sed -f $(patsubst %.s,%.sed,$@) < $< > $@
22 23
 
23 24
 %.s: %.x %.lab
24
-	dis_include=$(DIS_INCLUDE) $(DIS) $(DIS_DEBUG) -b2 -h -m68000 --sp -q1 -B -M -p -o120 -g$(patsubst %.s,%.lab,$@) --overwrite $< $@
25
+	dis_include=$(DIS_INCLUDE) $(DIS) $(DIS_DEBUG) -b2 -h -m68000 --sp -q1 -B -M -o$(COLUMNS) -g$(patsubst %.s,%.lab,$@) --overwrite $< $@
26
+	sed -i -e 's/;  Code Generate date .\+/;/' $@
27
+
28
+# Useful for new .x files
29
+%.new.s: %.x
30
+	dis_include=$(DIS_INCLUDE) $(DIS) $(DIS_DEBUG) -b2 -h -m68000 --sp -q1 -B -M -o$(COLUMNS) -e$(patsubst %.s,%.lab,$@) --overwrite $< $@
25 31
 	sed -i -e 's/;  Code Generate date .\+/;/' $@
26 32
 
27 33
 mdxp.s: mdxp.r mdxp.lab
28
-	dis_include=$(DIS_INCLUDE) $(DIS) $(DIS_DEBUG) -b2 -h -m68000 --sp -q1 -B -M -p -o120 -g$(patsubst %.s,%.lab,$@) --overwrite $< $@
34
+	dis_include=$(DIS_INCLUDE) $(DIS) $(DIS_DEBUG) -b2 -h -m68000 --sp -q1 -B -M -o$(COLUMNS) -g$(patsubst %.s,%.lab,$@) --overwrite $< $@
29 35
 	sed -i -e 's/;  Code Generate date .\+/;/' $@
30 36
 
31 37
 human.s: human.sys human.lab
32
-	dis_include=$(DIS_INCLUDE) $(DIS) $(DIS_DEBUG) -b2 -h -m68030 --sp -q1 -B -M -p -o120 -g$(patsubst %.s,%.lab,$@) --overwrite $< $@
38
+	dis_include=$(DIS_INCLUDE) $(DIS) $(DIS_DEBUG) -b2 -h -m68030 --sp -q1 -B -M -o$(COLUMNS) -g$(patsubst %.s,%.lab,$@) --overwrite $< $@
33 39
 	sed -i -e 's/;  Code Generate date .\+/;/' $@
34 40
 
35 41
 clean:

+ 1
- 1
bind.s View File

@@ -9,7 +9,7 @@
9 9
 ;  Bss  size    00110a byte(s)
10 10
 ;  316 Labels
11 11
 ;
12
-;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -p -o120 -gbind.lab --overwrite bind.x bind.s
12
+;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -o120 -gbind.lab --overwrite bind.x bind.s
13 13
 ;          DIS version 3.16
14 14
 ;=============================================
15 15
 

+ 1
- 1
cmd.s View File

@@ -9,7 +9,7 @@
9 9
 ;  Bss  size    001000 byte(s)
10 10
 ;  40 Labels
11 11
 ;
12
-;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -p -o120 -gcmd.lab --overwrite cmd.x cmd.s
12
+;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -o120 -gcmd.lab --overwrite cmd.x cmd.s
13 13
 ;          DIS version 3.16
14 14
 ;=============================================
15 15
 

+ 13
- 7
commando.s View File

@@ -9,7 +9,7 @@
9 9
 ;  Bss  size    000fa2 byte(s)
10 10
 ;  1403 Labels
11 11
 ;
12
-;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -p -o120 -gcommando.lab --overwrite commando.x commando.s
12
+;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -o120 -gcommando.lab --overwrite commando.x commando.s
13 13
 ;          DIS version 3.16
14 14
 ;=============================================
15 15
 
@@ -406,7 +406,7 @@ L0004ea:
406 406
 	rts
407 407
 
408 408
 L0004ec:
409
-	.dc.b	$61,$b4
409
+	bsr.s	L0004a2
410 410
 L0004ee:
411 411
 	move.l	#$0000af20,-(sp)
412 412
 	bsr.w	L002e1c
@@ -516,7 +516,8 @@ L000624:
516 516
 	bra.w	L001ca2
517 517
 
518 518
 L000632:
519
-	.dc.b	$60,$00,$00,$fe
519
+	bra.w	L000732
520
+
520 521
 L000636:
521 522
 	cmp.b	#$64,d0			;'d'
522 523
 	bne.s	L000646
@@ -1963,7 +1964,9 @@ L0015e8:
1963 1964
 	rts
1964 1965
 
1965 1966
 L0015f0:
1966
-	.dc.b	$70,$ff,$4e,$75
1967
+	moveq.l	#$ff,d0
1968
+	rts
1969
+
1967 1970
 L0015f4:
1968 1971
 	bsr.w	L001d3a
1969 1972
 	sub.b	#$41,d0			;'A'
@@ -2494,8 +2497,11 @@ L001b4c:
2494 2497
 	rts
2495 2498
 
2496 2499
 L001b58:
2497
-	.dc.b	$3f,$3c,$00,$20,$ff,$02,$54,$8f
2498
-	.dc.b	$4e,$75
2500
+	move.w	#$0020,-(sp)		;' '
2501
+	DOS	_PUTCHAR
2502
+	addq.l	#2,sp
2503
+	rts
2504
+
2499 2505
 L001b62:
2500 2506
 	movem.l	d0-d2/a0-a1,-(sp)
2501 2507
 	bsr.s	L001b7c
@@ -9160,7 +9166,7 @@ L0064ae:
9160 9166
 L0064b2:
9161 9167
 	.dc.b	'uuji'
9162 9168
 L0064b6:
9163
-	.dc.b	' Tan'
9169
+	.dc.l	$2054616e
9164 9170
 L0064ba:
9165 9171
 	.dc.b	'aka',$00
9166 9172
 L0064be:

+ 6
- 5
human.s View File

@@ -7,9 +7,9 @@
7 7
 ;  Text size    00a890 byte(s)
8 8
 ;  Data size    0033ea byte(s)
9 9
 ;  Bss  size    000000 byte(s)
10
-;  2676 Labels
10
+;  2677 Labels
11 11
 ;
12
-;  Commandline dis  -b2 -h -m68030 --sp -q1 -B -M -p -o120 -ghuman.lab --overwrite human.sys human.s
12
+;  Commandline dis  -b2 -h -m68030 --sp -q1 -B -M -o120 -ghuman.lab --overwrite human.sys human.s
13 13
 ;          DIS version 3.16
14 14
 ;=============================================
15 15
 
@@ -13307,9 +13307,9 @@ L00e752:
13307 13307
 	rts
13308 13308
 
13309 13309
 L00e762:
13310
-	.dc.b	$20,$3c
13311
-	.dc.l	L00e018
13312
-	.dc.b	$4e,$75
13310
+	move.l	#L00e018,d0
13311
+	rts
13312
+
13313 13313
 L00e76a:
13314 13314
 	move.l	($1c50),($1c24)
13315 13315
 L00e770:
@@ -17021,6 +17021,7 @@ L01098c:
17021 17021
 L010994:
17022 17022
 	jmp	(L010c1c)
17023 17023
 
17024
+L01099a:
17024 17025
 	jmp	(L010a46)
17025 17026
 
17026 17027
 L0109a0:

+ 1
- 1
iplrom30.s View File

@@ -9,7 +9,7 @@
9 9
 ;  Bss  size    000000 byte(s)
10 10
 ;  3198 Labels
11 11
 ;
12
-;  Commandline dis  -b2 -h -i -m68030 -m68882 -zfe0000,ff0038 -q -p -B -M --exclude-fefunc-mac -Tiplrom30.tab -giplrom30.lab --overwrite iplrom30.dat iplrom30.s
12
+;  Commandline dis  -b2 -h -i -m68030 -m68882 -zfe0000,ff0038 -q -B -M --exclude-fefunc-mac -Tiplrom30.tab -giplrom30.lab --overwrite iplrom30.dat iplrom30.s
13 13
 ;          DIS version 3.16
14 14
 ;=============================================
15 15
 

+ 1
- 1
iplromxv.s View File

@@ -9,7 +9,7 @@
9 9
 ;  Bss  size    000000 byte(s)
10 10
 ;  4751 Labels
11 11
 ;
12
-;  Commandline dis  -b2 -h -i -m68030 -m68882 -zfe0000,ff0010 -q -p -B -M --exclude-fefunc-mac -Tiplromxv.tab -giplromxv.lab --overwrite iplromxv.dat iplromxv.s
12
+;  Commandline dis  -b2 -h -i -m68030 -m68882 -zfe0000,ff0010 -q -B -M --exclude-fefunc-mac -Tiplromxv.tab -giplromxv.lab --overwrite iplromxv.dat iplromxv.s
13 13
 ;          DIS version 3.16
14 14
 ;=============================================
15 15
 

+ 17
- 9
mdxp.s View File

@@ -7,9 +7,9 @@
7 7
 ;  Text size    00116c byte(s)
8 8
 ;  Data size    000000 byte(s)
9 9
 ;  Bss  size    000000 byte(s)
10
-;  202 Labels
10
+;  203 Labels
11 11
 ;
12
-;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -p -o120 -gmdxp.lab --overwrite mdxp.r mdxp.s
12
+;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -o120 -gmdxp.lab --overwrite mdxp.r mdxp.s
13 13
 ;          DIS version 3.16
14 14
 ;=============================================
15 15
 
@@ -89,7 +89,8 @@ L000118:
89 89
 	bra.s	L000160
90 90
 
91 91
 L00011e:
92
-	.dc.b	$10,$22,$10,$27
92
+	move.b	-(a2),d0
93
+	move.b	-(sp),d0
93 94
 L000122:
94 95
 	move.w	($1154,a6),d0
95 96
 	cmp.w	#$0002,d0
@@ -419,7 +420,7 @@ L000408:
419 420
 L00046a:
420 421
 	.dc.b	'Lß`',$00
421 422
 L00046e:
422
-	.dc.b	$61,$00,$03,$e8
423
+	bsr.w	L000858
423 424
 L000472:
424 425
 	st.b	($0025,a5)
425 426
 	movea.l	($115a,a6),a2
@@ -467,7 +468,7 @@ L000498:
467 468
 	jmp	($0002,a0)
468 469
 
469 470
 L0004fc:
470
-	.dc.b	$61,$00,$03,$5a
471
+	bsr.w	L000858
471 472
 L000500:
472 473
 	move.w	(L001164,pc),d1
473 474
 	or.w	(L001162,pc),d1
@@ -839,10 +840,17 @@ L000856:
839 840
 	rts
840 841
 
841 842
 L000858:
842
-	.dc.b	$0c,$38,$00,$03,$0c,$bc,$65,$12
843
-	.dc.b	$48,$e7,$e0,$00,$24,$2e,$13,$3a
844
-	.dc.b	$72,$04,$70,$ac,$4e,$4f,$4c,$df
845
-	.dc.b	$00,$07,$4e,$75
843
+	cmpi.b	#$03,($0cbc)
844
+	bcs.s	L000872
845
+	movem.l	d0-d2,-(sp)
846
+	move.l	($133a,a6),d2
847
+	moveq.l	#$04,d1
848
+	moveq.l	#$ac,d0
849
+	trap	#15
850
+	movem.l	(sp)+,d0-d2
851
+L000872:
852
+	rts
853
+
846 854
 L000874:
847 855
 	pea.l	($0000)
848 856
 	DOS	_MFREE

+ 9
- 8
mopmdrv.s View File

@@ -9,7 +9,7 @@
9 9
 ;  Bss  size    0086be byte(s)
10 10
 ;  511 Labels
11 11
 ;
12
-;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -p -o120 -gmopmdrv.lab --overwrite mopmdrv.x mopmdrv.s
12
+;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -o120 -gmopmdrv.lab --overwrite mopmdrv.x mopmdrv.s
13 13
 ;          DIS version 3.16
14 14
 ;=============================================
15 15
 
@@ -1518,11 +1518,12 @@ L000e58:
1518 1518
 	rts
1519 1519
 
1520 1520
 L000e64:
1521
-	.dc.b	$20,$11,$23,$c0
1522
-	.dc.l	L005252
1523
-	.dc.b	$70,$01,$23,$c0
1524
-	.dc.l	L005256
1525
-	.dc.b	$60,$00,$fd,$a0
1521
+	move.l	(a1),d0
1522
+	move.l	d0,(L005252)
1523
+	moveq.l	#$01,d0
1524
+	move.l	d0,(L005256)
1525
+	bra.w	L000c16
1526
+
1526 1527
 L000e78:
1527 1528
 	clr.l	(L005256)
1528 1529
 	bsr.w	L00160c
@@ -4521,9 +4522,9 @@ L00524a:
4521 4522
 L00524e:
4522 4523
 	.ds.b	4
4523 4524
 L005252:
4524
-	.ds.b	4
4525
+	.ds.l	1
4525 4526
 L005256:
4526
-	.ds.b	4
4527
+	.ds.l	1
4527 4528
 L00525a:
4528 4529
 	.ds.b	4
4529 4530
 L00525e:

+ 4
- 2
mxdrv16.s View File

@@ -9,7 +9,7 @@
9 9
 ;  Bss  size    000698 byte(s)
10 10
 ;  356 Labels
11 11
 ;
12
-;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -p -o120 -gmxdrv16.lab --overwrite mxdrv16.x mxdrv16.s
12
+;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -o120 -gmxdrv16.lab --overwrite mxdrv16.x mxdrv16.s
13 13
 ;          DIS version 3.16
14 14
 ;=============================================
15 15
 
@@ -379,7 +379,9 @@ L000346:
379 379
 	rts
380 380
 
381 381
 L00034c:
382
-	.dc.b	$08,$c0,$00,$1f,$4e,$75
382
+	bset.l	#$1f,d0
383
+	rts
384
+
383 385
 L_STOP:
384 386
 	tst.b	(-$03f4,a5)
385 387
 	bne.w	L00026e

+ 1
- 1
mxdrv17.s View File

@@ -9,7 +9,7 @@
9 9
 ;  Bss  size    0006a2 byte(s)
10 10
 ;  449 Labels
11 11
 ;
12
-;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -p -o120 -gmxdrv17.lab --overwrite mxdrv17.x mxdrv17.s
12
+;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -o120 -gmxdrv17.lab --overwrite mxdrv17.x mxdrv17.s
13 13
 ;          DIS version 3.16
14 14
 ;=============================================
15 15
 

+ 1
- 1
mxp.s View File

@@ -9,7 +9,7 @@
9 9
 ;  Bss  size    004204 byte(s)
10 10
 ;  124 Labels
11 11
 ;
12
-;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -p -o120 -gmxp.lab --overwrite mxp.x mxp.s
12
+;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -o120 -gmxp.lab --overwrite mxp.x mxp.s
13 13
 ;          DIS version 3.16
14 14
 ;=============================================
15 15
 

+ 1
- 1
pcm8.s View File

@@ -9,7 +9,7 @@
9 9
 ;  Bss  size    000000 byte(s)
10 10
 ;  966 Labels
11 11
 ;
12
-;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -p -o120 -gpcm8.lab --overwrite pcm8.x pcm8.s
12
+;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -o120 -gpcm8.lab --overwrite pcm8.x pcm8.s
13 13
 ;          DIS version 3.16
14 14
 ;=============================================
15 15
 

+ 1
- 1
process.s View File

@@ -9,7 +9,7 @@
9 9
 ;  Bss  size    004404 byte(s)
10 10
 ;  106 Labels
11 11
 ;
12
-;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -p -o120 -gprocess.lab --overwrite process.x process.s
12
+;  Commandline dis  -b2 -h -m68000 --sp -q1 -B -M -o120 -gprocess.lab --overwrite process.x process.s
13 13
 ;          DIS version 3.16
14 14
 ;=============================================
15 15
 

Loading…
Cancel
Save