1
0
mirror of https://github.com/cc65/cc65.git synced 2025-01-20 09:31:48 +00:00

Incorporated another round of feedback for pull request.

Adjusted comment formatting in several assembler files.
Removed dummy kbhit() function, as it's better to get a linker
error than an implementation that does the wrong thing.
This commit is contained in:
Stephan Mühlstrasser 2015-02-18 18:38:42 +01:00
parent e178a33d29
commit 92e75e9df8
7 changed files with 23 additions and 35 deletions

View File

@ -139,8 +139,7 @@ There are no loadable drivers available.
<sect1>conio implementation<p> <sect1>conio implementation<p>
The conio implementation is complete except for a working kbhit() function. The conio implementation is complete except for a kbhit() function.
kbhit() currently returns true unconditionally.
<sect1>stdio implementation<p> <sect1>stdio implementation<p>

View File

@ -22,7 +22,7 @@ _chline:
cmp #0 ; Is the length zero? cmp #0 ; Is the length zero?
beq L9 ; Jump if done beq L9 ; Jump if done
sta tmp1 sta tmp1
L1: lda #$94 ; Horizontal line, screen code L1: lda #$94 ; Horizontal line, screen code
jsr cputdirect ; Direct output jsr cputdirect ; Direct output
dec tmp1 dec tmp1
bne L1 bne L1

View File

@ -12,7 +12,7 @@
BANKS = VIDEORAMSIZE / $100 BANKS = VIDEORAMSIZE / $100
_clrscr: _clrscr:
lda #$20 ;' ' lda #$20 ; ' '
ldy #BANKS ldy #BANKS
ldx #$00 ldx #$00
staloc: staloc:
@ -22,10 +22,10 @@ staloc:
inc staloc+2 inc staloc+2
dey dey
bne staloc bne staloc
lda #>(SCRNBASE); load high byte lda #>(SCRNBASE) ; Load high byte
sta staloc+2 ; restore base address sta staloc+2 ; Restore base address
lda #$00 ; cursor in upper left corner lda #$00 ; Cursor in upper left corner
sta CURS_X sta CURS_X
sta CURS_Y sta CURS_Y
jmp plot ; Set the cursor position jmp plot ; Set the cursor position

View File

@ -7,8 +7,8 @@
.export _init, _exit .export _init, _exit
.import _main .import _main
.export __STARTUP__ : absolute = 1 ; Mark as startup .export __STARTUP__ : absolute = 1 ; Mark as startup
.import __RAM_START__, __RAM_SIZE__ ; Linker generated .import __RAM_START__, __RAM_SIZE__ ; Linker generated
.import zerobss, initlib, donelib .import zerobss, initlib, donelib
@ -24,9 +24,9 @@
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; A little light 6502 housekeeping ; A little light 6502 housekeeping
_init: ldx #$FF ; Initialize stack pointer to $01FF _init: ldx #$FF ; Initialize stack pointer to $01FF
txs txs
cld ; Clear decimal mode cld ; Clear decimal mode
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; Set cc65 argument stack pointer ; Set cc65 argument stack pointer
@ -39,8 +39,8 @@ _init: ldx #$FF ; Initialize stack pointer to $01FF
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; Initialize memory storage ; Initialize memory storage
jsr zerobss ; Clear BSS segment jsr zerobss ; Clear BSS segment
jsr initlib ; Run constructors jsr initlib ; Run constructors
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; Call main() ; Call main()
@ -48,7 +48,7 @@ _init: ldx #$FF ; Initialize stack pointer to $01FF
jsr _main jsr _main
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; Back from main (this is also the _exit entry): force a software break ; Back from main (this is also the _exit entry):
_exit: jsr donelib ; Run destructors _exit: jsr donelib ; Run destructors
jmp RESET ; Display boot menu after program exit jmp RESET ; Display boot menu after program exit

View File

@ -21,7 +21,7 @@ _cvline:
cmp #0 ; Is the length zero? cmp #0 ; Is the length zero?
beq L9 ; Jump if done beq L9 ; Jump if done
sta tmp1 sta tmp1
L1: lda #$95 ; Vertical bar L1: lda #$95 ; Vertical bar
jsr putchar ; Write, no cursor advance jsr putchar ; Write, no cursor advance
jsr newline ; Advance cursor to next line jsr newline ; Advance cursor to next line
dec tmp1 dec tmp1

View File

@ -1,11 +0,0 @@
;
; int kbhit (void);
;
; Currently a dummy function that returns always true
.export _kbhit
_kbhit:
lda #$01 ; load low byte with true value
ldx #$00 ; load high byte
rts

View File

@ -1,9 +1,9 @@
; Addresses ; Addresses
SCRNBASE := $D000 ; Base of video RAM SCRNBASE := $D000 ; Base of video RAM
INPUTC := $FD00 ; Input character from keyboard INPUTC := $FD00 ; Input character from keyboard
RESET := $FF00 ; Reset address, show boot prompt RESET := $FF00 ; Reset address, show boot prompt
; Other definitions ; Other definitions
VIDEORAMSIZE = $0400 ; Size of C1P video RAM (1 kB) VIDEORAMSIZE = $0400 ; Size of C1P video RAM (1 kB)
SCR_LINELEN = $18 ; screen width - 1 SCR_LINELEN = $18 ; screen width - 1
SCR_HEIGHT = $18 ; screen height - 1 SCR_HEIGHT = $18 ; screen height - 1