Apple-2gs-SW
/
ORCALib
mirror of https://github.com/byteworksinc/ORCALib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid excessively deep recursion in qsort. 

It could have O(n) recursion depth for some inputs (e.g. if already sorted or reverse sorted), which could easily cause stack overflows.

Now, recursion is only used for the smaller of the two subarrays at each step, so the maximum recursion depth is bounded to log2(n).
This commit is contained in:
Stephen Heumann 2023-02-15 22:04:10 -06:00
parent 3417a98d10
commit 2540b28ca3
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
stdlib.asm
View File

@ -767,10 +767,10 @@ right equ 5 right address
csubroutine (4:first,4:last),8 csubroutine (4:first,4:last),8
phb sr0 phb
phk phk
plb plb
sr0 lda last+2 if last <= first then quit lda last+2 if last <= first then quit
cmp first+2 cmp first+2
bne sr1 bne sr1
lda last lda last
@ -825,15 +825,24 @@ sr5 blt sr2
ph4 <left swap left/last entries ph4 <left swap left/last entries
ph4 <last ph4 <last
jsr swap jsr swap
sub4 left,lsize,right sort left part of array sub4 left,lsize,right calculate bounds of subarrays
add4 left,lsize (first..right and left..last)
add4 first,last,mid calculate midpoint of range being sorted
lsr mid+2
ror mid
cmpl right,mid if right < mid then
bge sr6
plb plb
ph4 <right ph4 <right sort left subarray recursively
ph4 <first ph4 <first
jsl rsort jsl rsort
phb move4 left,first sort right subarray via tail call
phk brl sr0
plb sr6 plb else
add4 left,lsize,first sort right part of array ph4 <last sort right subarray recursively
ph4 <left
jsl rsort
move4 right,last sort left subarray via tail call
brl sr0 brl sr0
; ;
; swap - swap two entries ; swap - swap two entries
@ -909,6 +918,7 @@ sw6 pld
lsize entry lsize entry
ds 4 local copy of size ds 4 local copy of size
banks ds 2 number of whole banks to swap banks ds 2 number of whole banks to swap
mid ds 4 midpoint of the elements being sorted
end end
**************************************************************** ****************************************************************

12
stdlib.macros
View File

@ -734,3 +734,15 @@
&l bne *+5 &l bne *+5
brl &bp brl &bp
mend mend
macro
&l cmpl &n1,&n2
lclb &yistwo
&l ~setm
~lda.h &n1
~op.h cmp,&n2
bne ~a&SYSCNT
~lda &n1
~op cmp,&n2
~a&SYSCNT anop
~restm
mend