Skip to content

Commit 35805c7

Browse files
spotlessmind1975spotlessmind1975
committed
Fixed CR+LF in strings when printing.
1 parent ae654e8 commit 35805c7

File tree

9 files changed

+47
-151
lines changed

9 files changed

+47
-151
lines changed

‎ugbc/src/hw/6847/text_at_text.asm

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,6 @@ TEXTATXAT
218218
JMP TEXTATAT
219219

220220
TEXTATLF
221-
LDA CURRENTTILESWIDTH
222-
SUBA <XCURSYS
223-
ADDA CONSOLEX1
224-
SUBA #1
225-
LEAX A,X
226221
LEAY 1,Y
227222
DECB
228223
JMP TEXTATNEXT2
@@ -349,6 +344,8 @@ TEXTATNEXT
349344
JMP TEXTATLOOP2
350345
TEXTATXLOOP2
351346
LEAX 1, X
347+
CMPB #0
348+
BEQ TEXTATEND
352349
JMP TEXTATLOOP2
353350
TEXTATEND2
354351
TEXTATEND

‎ugbc/src/hw/ef9345/text_at.asm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,8 @@ TEXTATCLS:
136136
JMP TEXTATNEXT
137137

138138
TEXTATLF:
139-
LD A, (XCURSYS)
140-
LD B, A
141-
LD A, (CURRENTTILESWIDTH)
142-
SUB A, B
143-
DEC A
139+
INC DE
140+
DEC C
144141

145142
JMP TEXTATNEXT2
146143

@@ -381,6 +378,9 @@ TEXTATNEXT:
381378
JR Z, TEXTATXLOOP2
382379
JMP TEXTATLOOP2
383380
TEXTATXLOOP2:
381+
LD A, C
382+
CP 0
383+
JR Z, TEXTATEND
384384
JMP TEXTATLOOP2
385385
TEXTATEND2:
386386
TEXTATEND:

‎ugbc/src/hw/gime/text_at_text.asm

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -281,21 +281,21 @@ TEXTATCLS
281281

282282
TEXTATLF
283283

284-
; In order to move to the next line, I have to move ahead of
285-
; an entire line, and "come back" for a number of character
286-
; that is equal to the horizontal position. Move one character
287-
; back and update the address.
288-
289-
LDA CURRENTTILESWIDTH
290-
SUBA <XCURSYS
291-
SUBA #1
292-
PSHS D
293-
TFR A, B
294-
ABX
295-
PULS D
296-
297-
; Move to the routine that should scroll the video if we are
298-
; printing on the last line of the screen.
284+
; ; In order to move to the next line, I have to move ahead of
285+
; ; an entire line, and "come back" for a number of character
286+
; ; that is equal to the horizontal position. Move one character
287+
; ; back and update the address.
288+
289+
; LDA CURRENTTILESWIDTH
290+
; SUBA <XCURSYS
291+
; SUBA #1
292+
; PSHS D
293+
; TFR A, B
294+
; ABX
295+
; PULS D
296+
297+
; ; Move to the routine that should scroll the video if we are
298+
; ; printing on the last line of the screen.
299299

300300
JMP TEXTATNEXT2
301301

@@ -619,7 +619,7 @@ TEXTATNEXT
619619
; loop again.
620620

621621
CMPB #0
622-
LBNE TEXTATLOOP2
622+
BEQ TEXTATEND2
623623

624624
JSR GIMEBANKROM
625625

‎ugbc/src/hw/gtia/text_at_text.asm

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -201,27 +201,8 @@ TEXTATXAT:
201201
JMP TEXTATAT
202202

203203
TEXTATLF:
204-
SEC
205-
LDA CURRENTTILESWIDTH
206-
SBC XCURSYS
207-
SBC #1
208-
CLC
209-
ADC COPYOFTEXTADDRESS
210-
STA COPYOFTEXTADDRESS
211-
LDA #0
212-
ADC COPYOFTEXTADDRESS+1
213-
STA COPYOFTEXTADDRESS+1
214-
215-
SEC
216-
LDA CURRENTTILESWIDTH
217-
SBC XCURSYS
218-
SBC #1
219-
CLC
220-
ADC COPYOFCOLORMAPADDRESS
221-
STA COPYOFCOLORMAPADDRESS
222-
LDA #0
223-
ADC COPYOFCOLORMAPADDRESS+1
224-
STA COPYOFCOLORMAPADDRESS+1
204+
INC TEXTPTR
205+
DEX
225206
JMP TEXTATNEXT2
226207

227208
TEXTATPEN:
@@ -434,6 +415,8 @@ TEXTATNEXT:
434415
JMP TEXTATLOOP2
435416
TEXTATXLOOP2:
436417
INY
418+
CPX #0
419+
BEQ TEXTATEND
437420
JMP TEXTATLOOP2
438421
TEXTATEND2:
439422
TEXTATEND:

‎ugbc/src/hw/ted/text_at_text.asm

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -158,27 +158,8 @@ TEXTATXAT:
158158
JMP TEXTATAT
159159

160160
TEXTATLF:
161-
SEC
162-
LDA CURRENTTILESWIDTH
163-
SBC XCURSYS
164-
SBC #1
165-
CLC
166-
ADC COPYOFTEXTADDRESS
167-
STA COPYOFTEXTADDRESS
168-
LDA #0
169-
ADC COPYOFTEXTADDRESS+1
170-
STA COPYOFTEXTADDRESS+1
171-
172-
SEC
173-
LDA CURRENTTILESWIDTH
174-
SBC XCURSYS
175-
SBC #1
176-
CLC
177-
ADC COPYOFCOLORMAPADDRESS
178-
STA COPYOFCOLORMAPADDRESS
179-
LDA #0
180-
ADC COPYOFCOLORMAPADDRESS+1
181-
STA COPYOFCOLORMAPADDRESS+1
161+
INC TEXTPTR
162+
DEX
182163
JMP TEXTATNEXT2
183164

184165
TEXTATPEN:
@@ -427,6 +408,8 @@ TEXTATNEXT:
427408
JMP TEXTATLOOP2
428409
TEXTATXLOOP2:
429410
INY
411+
CPX #0
412+
BEQ TEXTATEND
430413
JMP TEXTATLOOP2
431414
TEXTATEND2:
432415
TEXTATEND:

‎ugbc/src/hw/tms9918/text_at_text.asm

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -197,19 +197,7 @@ TEXTATCLS:
197197

198198
TEXTATLF:
199199
INC DE
200-
LD A, (XCURSYS)
201-
LD B, A
202-
LD A, (CURRENTTILESWIDTH)
203-
SUB A, B
204-
205-
PUSH DE
206-
LD HL, (COPYOFTEXTADDRESS)
207-
LD D, 0
208-
LD E, A
209-
ADD HL, DE
210-
LD (COPYOFTEXTADDRESS), HL
211-
POP DE
212-
200+
DEC C
213201
JMP TEXTATNEXT2
214202

215203
TEXTATXAT:
@@ -583,6 +571,9 @@ TEXTATNEXT:
583571
JR Z, TEXTATXLOOP2
584572
JMP TEXTATLOOP2
585573
TEXTATXLOOP2:
574+
LD A, C
575+
CP 0
576+
JR Z, TEXTATTILEMODEDONE
586577
JMP TEXTATLOOP2
587578
TEXTATEND:
588579
TEXTATEND2:

‎ugbc/src/hw/vdcz/text_at_text.asm

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -175,33 +175,7 @@ TEXTATCLS:
175175

176176
TEXTATLF:
177177
INC DE
178-
LD A, (XCURSYS)
179-
LD B, A
180-
LD A, (CURRENTTILESWIDTH)
181-
SUB A, B
182-
183-
PUSH DE
184-
LD HL, (COPYOFTEXTADDRESS)
185-
LD D, 0
186-
LD E, A
187-
ADD HL, DE
188-
LD (COPYOFTEXTADDRESS), HL
189-
POP DE
190-
191-
PUSH HL
192-
PUSH DE
193-
LD HL, (TEXTADDRESS)
194-
LD DE, HL
195-
LD HL, (COPYOFTEXTADDRESS)
196-
AND A
197-
SBC HL, DE
198-
LD DE, HL
199-
LD HL, (COLORMAPADDRESS)
200-
ADD HL, DE
201-
LD (COPYOFCOLORMAPADDRESS), HL
202-
POP DE
203-
POP HL
204-
178+
DEC C
205179
JMP TEXTATNEXT2
206180

207181
TEXTATXAT:
@@ -500,6 +474,9 @@ TEXTATNEXT:
500474
JR Z, TEXTATXLOOP2
501475
JMP TEXTATLOOP2
502476
TEXTATXLOOP2:
477+
LD C, A
478+
CP 0
479+
JR Z, TEXTATTILEMODEDONE
503480
JMP TEXTATLOOP2
504481
TEXTATEND2:
505482
TEXTATEND:

‎ugbc/src/hw/vic1/text_at.asm

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -542,27 +542,8 @@ TEXTATXAT:
542542
JMP TEXTATAT
543543

544544
TEXTATLF:
545-
SEC
546-
LDA CURRENTTILESWIDTH
547-
SBC XCURSYS
548-
SBC #1
549-
CLC
550-
ADC COPYOFTEXTADDRESS
551-
STA COPYOFTEXTADDRESS
552-
LDA #0
553-
ADC COPYOFTEXTADDRESS+1
554-
STA COPYOFTEXTADDRESS+1
555-
556-
SEC
557-
LDA CURRENTTILESWIDTH
558-
SBC XCURSYS
559-
SBC #1
560-
CLC
561-
ADC COPYOFCOLORMAPADDRESS
562-
STA COPYOFCOLORMAPADDRESS
563-
LDA #0
564-
ADC COPYOFCOLORMAPADDRESS+1
565-
STA COPYOFCOLORMAPADDRESS+1
545+
INC TEXTPTR
546+
DEX
566547
JMP TEXTATNEXT2
567548

568549
TEXTATPEN:
@@ -811,6 +792,8 @@ TEXTATNEXT:
811792
JMP TEXTATLOOP2
812793
TEXTATXLOOP2:
813794
INY
795+
CPX #0
796+
BEQ TEXTATEND
814797
JMP TEXTATLOOP2
815798
TEXTATEND2:
816799
TEXTATEND:

‎ugbc/src/hw/vic2/text_at_text.asm

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -169,28 +169,8 @@ TEXTATCLS:
169169
JMP TEXTATNEXT
170170

171171
TEXTATLF:
172-
SEC
173-
LDA CURRENTTILESWIDTH
174-
SBC XCURSYS
175-
SBC #1
176-
CLC
177-
ADC COPYOFTEXTADDRESS
178-
STA COPYOFTEXTADDRESS
179-
LDA #0
180-
ADC COPYOFTEXTADDRESS+1
181-
STA COPYOFTEXTADDRESS+1
182-
183-
SEC
184-
LDA CURRENTTILESWIDTH
185-
SBC XCURSYS
186-
SBC #1
187-
CLC
188-
ADC COPYOFCOLORMAPADDRESS
189-
STA COPYOFCOLORMAPADDRESS
190-
LDA #0
191-
ADC COPYOFCOLORMAPADDRESS+1
192-
STA COPYOFCOLORMAPADDRESS+1
193-
172+
INC TEXTPTR
173+
DEX
194174
JMP TEXTATNEXT2
195175

196176
TEXTATXAT:
@@ -445,6 +425,8 @@ TEXTATNEXT:
445425
JMP TEXTATLOOP2
446426
TEXTATXLOOP2:
447427
INY
428+
CPX #0
429+
BEQ TEXTATEND
448430
JMP TEXTATLOOP2
449431
TEXTATEND2:
450432
TEXTATEND:

0 commit comments

Comments
 (0)