deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #488 from oliverschmidt/master

Browse source 
Avoid access to the address register during auto-increment.
This commit is contained in:
Oliver Schmidt 2013-12-03 12:59:45 -08:00
parent 54719b75b8 9cdc6da040
commit 9a48bcf941
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
cpu/6502/net/w5100.S
View file

@ -79,7 +79,7 @@ fixup: .byte fixup02-fixup01, fixup03-fixup02, fixup04-fixup03
.byte fixup17-fixup16, fixup18-fixup17, fixup19-fixup18 .byte fixup17-fixup16, fixup18-fixup17, fixup19-fixup18
.byte fixup20-fixup19, fixup21-fixup20, fixup22-fixup21 .byte fixup20-fixup19, fixup21-fixup20, fixup22-fixup21
.byte fixup23-fixup22, fixup24-fixup23, fixup25-fixup24 .byte fixup23-fixup22, fixup24-fixup23, fixup25-fixup24
.byte fixup26-fixup25, fixup27-fixup26 .byte fixup26-fixup25
fixups = * - fixup fixups = * - fixup
@ -181,7 +181,7 @@ fixup09:lda data
: tax : tax
rts rts
; Socket RX Received Size Register: != 0 ? ; Socket 0 RX Received Size Register: != 0 ?
: ldy #$26 ; Socket RX Received Size Register : ldy #$26 ; Socket RX Received Size Register
jsr set_addrsocket0 jsr set_addrsocket0
fixup10:lda data ; Hibyte fixup10:lda data ; Hibyte
@ -199,9 +199,13 @@ fixup11:ora data ; Lobyte
; ldy #$28 ; Socket RX Read Pointer Register ; ldy #$28 ; Socket RX Read Pointer Register
; jsr set_addrsocket0 ; jsr set_addrsocket0
; Calculate and set pyhsical address ; Calculate and set physical address
jsr set_addrphysical jsr set_addrphysical
; Move physical address shadow to $F000-$FFFF
ora #>$F000
tax
; Read MAC raw 2byte packet size header ; Read MAC raw 2byte packet size header
jsr get_datacheckaddr ; Hibyte jsr get_datacheckaddr ; Hibyte
sta adv+1 sta adv+1
@ -241,8 +245,8 @@ fixup11:ora data ; Lobyte
; Advance pointer register ; Advance pointer register
common: jsr set_addrsocket0 common: jsr set_addrsocket0
tay ; Save command tay ; Save command
lda reg
clc clc
lda reg
adc adv adc adv
tax tax
lda reg+1 lda reg+1
@ -283,7 +287,7 @@ fixup15:lda data
bne :- bne :-
; Socket 0 TX Free Size Register: < length ? ; Socket 0 TX Free Size Register: < length ?
: ldy #$20 : ldy #$20 ; Socket TX Free Size Register
jsr set_addrsocket0 jsr set_addrsocket0
fixup16:lda data ; Hibyte fixup16:lda data ; Hibyte
fixup17:ldx data ; Lobyte fixup17:ldx data ; Lobyte
@ -318,8 +322,8 @@ exit:
set_addrphysical: set_addrphysical:
fixup18:lda data ; Hibyte fixup18:lda data ; Hibyte
fixup19:ldy data ; Lobyte fixup19:ldy data ; Lobyte
sta reg+1
sty reg sty reg
sta reg+1
and #>$1FFF ; Socket Mask Address (hibyte) and #>$1FFF ; Socket Mask Address (hibyte)
ora bas ; Socket Base Address (hibyte) ora bas ; Socket Base Address (hibyte)
tax tax
@ -341,10 +345,11 @@ set_addrbase:
get_datacheckaddr: get_datacheckaddr:
fixup22:lda data fixup22:lda data
fixup23:ldx addr ; Hibyte iny ; Physical address shadow (lobyte)
cpx lim ; Socket memory limit (hibyte) bne :+
bcs set_addrbase inx ; Physical address shadow (hibyte)
rts beq set_addrbase
: rts
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
@ -380,10 +385,10 @@ mov_data:
; R/W without address wraparound possible because ; R/W without address wraparound possible because
; highest R/W address > actual R/W address ? ; highest R/W address > actual R/W address ?
; sec ; sec
fixup24:sbc addr+1 ; Lobyte fixup23:sbc addr+1 ; Lobyte
tay tay
txa txa
fixup25:sbc addr ; Hibyte fixup24:sbc addr ; Hibyte
tax tax
tya tya
bcs :+ bcs :+
@ -444,7 +449,7 @@ rw_data:eor #$FF ; Two's complement part 1
; Read data ; Read data
: :
fixup26:lda data fixup25:lda data
sta (ptr),y sta (ptr),y
iny iny
bne :- bne :-
@ -455,7 +460,7 @@ fixup26:lda data
; Write data ; Write data
: lda (ptr),y : lda (ptr),y
fixup27:sta data fixup26:sta data
iny iny
bne :- bne :-
inc ptr+1 inc ptr+1