Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimized _AllocSprite #48

Merged
merged 4 commits into from
Apr 6, 2017
Merged

Optimized _AllocSprite #48

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3b2a38
Optimized _AllocSprite
runer112 Feb 2, 2017
61efd2d
Utilized a preexisting jp (hl) for _indcallHL_ASM
runer112 Feb 2, 2017
2450577
Merge branch 'master' into opt/_AllocSprite
mateoconlechuga Apr 6, 2017
9cee925
Fix missing \.r
mateoconlechuga Apr 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 26 additions & 21 deletions src/graphx/graphx.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,27 +133,27 @@ _AllocSprite:
; arg2 : pointer to malloc routine
; Returns:
; Pointer to allocated sprite, first byte width, second height
ld iy,0
add iy,sp
ld l,(iy+3) ; l = width of sprite
ld h,(iy+6) ; h = height of sprite
ld iy,(iy+9) ; iy = pointer to some malloc
push hl
mlt hl ; width * height
inc hl
inc hl ; allocate space for width and height bytes
push hl
call __indcall ; call the malloc routine
pop de
pop de
add hl,de
or a,a
sbc hl,de
ret z ; check to make sure malloc did not fail
ld (hl),e ; store width
inc hl
ld (hl),d ; store height
dec hl ; return sprite pointer
ld bc,3
push bc
pop hl
add hl,sp
ld e,(hl) ; e = width
add hl,bc
ld d,(hl) ; d = height
add hl,bc
ld hl,(hl) ; hl = malloc
push de
mlt de ; de = width * height
inc de ; +2 to store width and height
inc de ; de = width * height + 2
push de
call _indcallHL_ASM \.r ; hl = malloc(width * height + 2)
pop de ; de = width * height + 2
add hl,de ; this should never carry
sbc hl,de ; check if malloc failed (hl == 0)
pop de ; e = width, d = height
ret z ; abort if malloc failed
ld (hl),de ; store width and height
ret

;-------------------------------------------------------------------------------
Expand Down Expand Up @@ -2689,6 +2689,11 @@ _SetTextXY:
ld (TextYPos_SMC),hl \.r
push hl ; xpos=don't care, sp=&xpos
ex de,hl ; hl=return address
;-------------------------------------------------------------------------------
_indcallHL_ASM:
; Calls HL
; Inputs:
; HL : Address to call
jp (hl)

;-------------------------------------------------------------------------------
Expand Down