Skip to content

Commit 4348055

Browse files
borielboriel
authored
Merge pull request #199 from boriel/feature/optimize_mul16
Feature/optimize mul16
2 parents 42434de + 8e65e54 commit 4348055

154 files changed

Lines changed: 549 additions & 1158 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎library-asm/mul16.asm‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack
1010
pop hl ; Return address
1111
ex (sp), hl ; CALLEE caller convention
1212

13-
;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand
14-
;; ld c, h
15-
;; ld a, l ; C,A => 1st Operand
16-
;;
17-
;; ld hl, 0 ; Accumulator
18-
;; ld b, 16
19-
;;
20-
;;__MUL16LOOP:
21-
;; sra c ; C,A >> 1 (Arithmetic)
22-
;; rra
23-
;;
24-
;; jr nc, __MUL16NOADD
25-
;; add hl, de
26-
;;
27-
;;__MUL16NOADD:
28-
;; sla e
29-
;; rl d
30-
;;
31-
;; djnz __MUL16LOOP
32-
3313
__MUL16_FAST:
3414
ld b, 16
35-
ld a, d
36-
ld c, e
37-
ex de, hl
15+
ld a, h
16+
ld c, l
3817
ld hl, 0
3918

4019
__MUL16LOOP:

‎tests/functional/27.asm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,9 @@ __MEM_START:
405405
__MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE
406406
ld a, h ; HL = NULL (No memory available?)
407407
or l
408-
#line 111 "/src/zxb/trunk/library-asm/alloc.asm"
408+
#line 111 "/zbasic/library-asm/alloc.asm"
409409
ret z ; NULL
410-
#line 113 "/src/zxb/trunk/library-asm/alloc.asm"
410+
#line 113 "/zbasic/library-asm/alloc.asm"
411411
; HL = Pointer to Free block
412412
ld e, (hl)
413413
inc hl

‎tests/functional/28.asm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,9 @@ __MEM_START:
408408
__MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE
409409
ld a, h ; HL = NULL (No memory available?)
410410
or l
411-
#line 111 "/src/zxb/trunk/library-asm/alloc.asm"
411+
#line 111 "/zbasic/library-asm/alloc.asm"
412412
ret z ; NULL
413-
#line 113 "/src/zxb/trunk/library-asm/alloc.asm"
413+
#line 113 "/zbasic/library-asm/alloc.asm"
414414
; HL = Pointer to Free block
415415
ld e, (hl)
416416
inc hl

‎tests/functional/29.asm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,9 @@ __MEM_START:
327327
__MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE
328328
ld a, h ; HL = NULL (No memory available?)
329329
or l
330-
#line 111 "/src/zxb/trunk/library-asm/alloc.asm"
330+
#line 111 "/zbasic/library-asm/alloc.asm"
331331
ret z ; NULL
332-
#line 113 "/src/zxb/trunk/library-asm/alloc.asm"
332+
#line 113 "/zbasic/library-asm/alloc.asm"
333333
; HL = Pointer to Free block
334334
ld e, (hl)
335335
inc hl

‎tests/functional/46.asm‎

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -75,31 +75,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack
7575
pop hl ; Return address
7676
ex (sp), hl ; CALLEE caller convention
7777

78-
;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand
79-
;; ld c, h
80-
;; ld a, l ; C,A => 1st Operand
81-
;;
82-
;; ld hl, 0 ; Accumulator
83-
;; ld b, 16
84-
;;
85-
;;__MUL16LOOP:
86-
;; sra c ; C,A >> 1 (Arithmetic)
87-
;; rra
88-
;;
89-
;; jr nc, __MUL16NOADD
90-
;; add hl, de
91-
;;
92-
;;__MUL16NOADD:
93-
;; sla e
94-
;; rl d
95-
;;
96-
;; djnz __MUL16LOOP
97-
9878
__MUL16_FAST:
9979
ld b, 16
100-
ld a, d
101-
ld c, e
102-
ex de, hl
80+
ld a, h
81+
ld c, l
10382
ld hl, 0
10483

10584
__MUL16LOOP:
@@ -118,7 +97,7 @@ __MUL16NOADD:
11897

11998
#line 20 "array.asm"
12099

121-
#line 24 "/src/zxb/trunk/library-asm/array.asm"
100+
#line 24 "/zbasic/library-asm/array.asm"
122101

123102
__ARRAY:
124103
PROC
@@ -141,10 +120,10 @@ __ARRAY:
141120
ld hl, 0 ; BC = Offset "accumulator"
142121

143122
LOOP:
144-
#line 49 "/src/zxb/trunk/library-asm/array.asm"
123+
#line 49 "/zbasic/library-asm/array.asm"
145124
pop bc ; Get next index (Ai) from the stack
146125

147-
#line 59 "/src/zxb/trunk/library-asm/array.asm"
126+
#line 59 "/zbasic/library-asm/array.asm"
148127

149128
add hl, bc ; Adds current index
150129

@@ -174,7 +153,7 @@ ARRAY_END:
174153
push de
175154
exx
176155

177-
#line 92 "/src/zxb/trunk/library-asm/array.asm"
156+
#line 92 "/zbasic/library-asm/array.asm"
178157
LOCAL ARRAY_SIZE_LOOP
179158

180159
ex de, hl
@@ -205,7 +184,7 @@ ARRAY_SIZE_LOOP:
205184

206185
;add hl, de
207186
;__ARRAY_FIN:
208-
#line 123 "/src/zxb/trunk/library-asm/array.asm"
187+
#line 123 "/zbasic/library-asm/array.asm"
209188

210189
pop de
211190
add hl, de ; Adds element start

‎tests/functional/47.asm‎

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -102,31 +102,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack
102102
pop hl ; Return address
103103
ex (sp), hl ; CALLEE caller convention
104104

105-
;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand
106-
;; ld c, h
107-
;; ld a, l ; C,A => 1st Operand
108-
;;
109-
;; ld hl, 0 ; Accumulator
110-
;; ld b, 16
111-
;;
112-
;;__MUL16LOOP:
113-
;; sra c ; C,A >> 1 (Arithmetic)
114-
;; rra
115-
;;
116-
;; jr nc, __MUL16NOADD
117-
;; add hl, de
118-
;;
119-
;;__MUL16NOADD:
120-
;; sla e
121-
;; rl d
122-
;;
123-
;; djnz __MUL16LOOP
124-
125105
__MUL16_FAST:
126106
ld b, 16
127-
ld a, d
128-
ld c, e
129-
ex de, hl
107+
ld a, h
108+
ld c, l
130109
ld hl, 0
131110

132111
__MUL16LOOP:
@@ -145,7 +124,7 @@ __MUL16NOADD:
145124

146125
#line 20 "array.asm"
147126

148-
#line 24 "/src/zxb/trunk/library-asm/array.asm"
127+
#line 24 "/zbasic/library-asm/array.asm"
149128

150129
__ARRAY:
151130
PROC
@@ -168,10 +147,10 @@ __ARRAY:
168147
ld hl, 0 ; BC = Offset "accumulator"
169148

170149
LOOP:
171-
#line 49 "/src/zxb/trunk/library-asm/array.asm"
150+
#line 49 "/zbasic/library-asm/array.asm"
172151
pop bc ; Get next index (Ai) from the stack
173152

174-
#line 59 "/src/zxb/trunk/library-asm/array.asm"
153+
#line 59 "/zbasic/library-asm/array.asm"
175154

176155
add hl, bc ; Adds current index
177156

@@ -201,7 +180,7 @@ ARRAY_END:
201180
push de
202181
exx
203182

204-
#line 92 "/src/zxb/trunk/library-asm/array.asm"
183+
#line 92 "/zbasic/library-asm/array.asm"
205184
LOCAL ARRAY_SIZE_LOOP
206185

207186
ex de, hl
@@ -232,7 +211,7 @@ ARRAY_SIZE_LOOP:
232211

233212
;add hl, de
234213
;__ARRAY_FIN:
235-
#line 123 "/src/zxb/trunk/library-asm/array.asm"
214+
#line 123 "/zbasic/library-asm/array.asm"
236215

237216
pop de
238217
add hl, de ; Adds element start

‎tests/functional/48.asm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,9 @@ __MEM_START:
416416
__MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE
417417
ld a, h ; HL = NULL (No memory available?)
418418
or l
419-
#line 111 "/src/zxb/trunk/library-asm/alloc.asm"
419+
#line 111 "/zbasic/library-asm/alloc.asm"
420420
ret z ; NULL
421-
#line 113 "/src/zxb/trunk/library-asm/alloc.asm"
421+
#line 113 "/zbasic/library-asm/alloc.asm"
422422
; HL = Pointer to Free block
423423
ld e, (hl)
424424
inc hl

‎tests/functional/49.asm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,9 @@ __MEM_START:
416416
__MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE
417417
ld a, h ; HL = NULL (No memory available?)
418418
or l
419-
#line 111 "/src/zxb/trunk/library-asm/alloc.asm"
419+
#line 111 "/zbasic/library-asm/alloc.asm"
420420
ret z ; NULL
421-
#line 113 "/src/zxb/trunk/library-asm/alloc.asm"
421+
#line 113 "/zbasic/library-asm/alloc.asm"
422422
; HL = Pointer to Free block
423423
ld e, (hl)
424424
inc hl

‎tests/functional/55.asm‎

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack
7070
pop hl ; Return address
7171
ex (sp), hl ; CALLEE caller convention
7272

73-
;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand
74-
;; ld c, h
75-
;; ld a, l ; C,A => 1st Operand
76-
;;
77-
;; ld hl, 0 ; Accumulator
78-
;; ld b, 16
79-
;;
80-
;;__MUL16LOOP:
81-
;; sra c ; C,A >> 1 (Arithmetic)
82-
;; rra
83-
;;
84-
;; jr nc, __MUL16NOADD
85-
;; add hl, de
86-
;;
87-
;;__MUL16NOADD:
88-
;; sla e
89-
;; rl d
90-
;;
91-
;; djnz __MUL16LOOP
92-
9373
__MUL16_FAST:
9474
ld b, 16
95-
ld a, d
96-
ld c, e
97-
ex de, hl
75+
ld a, h
76+
ld c, l
9877
ld hl, 0
9978

10079
__MUL16LOOP:
@@ -113,7 +92,7 @@ __MUL16NOADD:
11392

11493
#line 20 "array.asm"
11594

116-
#line 24 "/src/zxb/trunk/library-asm/array.asm"
95+
#line 24 "/zbasic/library-asm/array.asm"
11796

11897
__ARRAY:
11998
PROC
@@ -136,10 +115,10 @@ __ARRAY:
136115
ld hl, 0 ; BC = Offset "accumulator"
137116

138117
LOOP:
139-
#line 49 "/src/zxb/trunk/library-asm/array.asm"
118+
#line 49 "/zbasic/library-asm/array.asm"
140119
pop bc ; Get next index (Ai) from the stack
141120

142-
#line 59 "/src/zxb/trunk/library-asm/array.asm"
121+
#line 59 "/zbasic/library-asm/array.asm"
143122

144123
add hl, bc ; Adds current index
145124

@@ -169,7 +148,7 @@ ARRAY_END:
169148
push de
170149
exx
171150

172-
#line 92 "/src/zxb/trunk/library-asm/array.asm"
151+
#line 92 "/zbasic/library-asm/array.asm"
173152
LOCAL ARRAY_SIZE_LOOP
174153

175154
ex de, hl
@@ -200,7 +179,7 @@ ARRAY_SIZE_LOOP:
200179

201180
;add hl, de
202181
;__ARRAY_FIN:
203-
#line 123 "/src/zxb/trunk/library-asm/array.asm"
182+
#line 123 "/zbasic/library-asm/array.asm"
204183

205184
pop de
206185
add hl, de ; Adds element start

‎tests/functional/addstr.asm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,9 @@ __MEM_START:
576576
__MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE
577577
ld a, h ; HL = NULL (No memory available?)
578578
or l
579-
#line 111 "/src/zxb/trunk/library-asm/alloc.asm"
579+
#line 111 "/zbasic/library-asm/alloc.asm"
580580
ret z ; NULL
581-
#line 113 "/src/zxb/trunk/library-asm/alloc.asm"
581+
#line 113 "/zbasic/library-asm/alloc.asm"
582582
; HL = Pointer to Free block
583583
ld e, (hl)
584584
inc hl

0 commit comments

Comments
 (0)