fix some failing tests

totalspectrum · Dec 8, 2024 · f00fd01 · f00fd01
1 parent 5ee2537
commit f00fd01
Show file tree

Hide file tree

Showing 13 changed files with 71 additions and 101 deletions.
diff --git a/Test/Expect/stest073.pasm b/Test/Expect/stest073.pasm
@@ -5,20 +5,19 @@ dat
 entry
 
 _get
+	mov	result1, #0
 	mov	_var01, #0
-	mov	_var02, #0
 LR__0001
-	mov	_var03, _var02
-	or	_var03, #496
-	'.live	_var04
-	movs	wrcog, _var03
-	movd	wrcog, #_var04
+	mov	_var02, _var01
+	or	_var02, #496
+	'.live	_var03
+	movs	wrcog, _var02
+	movd	wrcog, #_var03
 	call	#wrcog
-	add	_var01, _var04
-	add	_var02, #1
-	cmps	_var02, #10 wc
+	add	result1, _var03
+	add	_var01, #1
+	cmps	_var01, #10 wc
  if_b	jmp	#LR__0001
-	mov	result1, _var01
 _get_ret
 	ret
 
@@ -52,6 +51,4 @@ _var02
 	res	1
 _var03
 	res	1
-_var04
-	res	1
 	fit	496
diff --git a/Test/Expect/stest109.pasm b/Test/Expect/stest109.pasm
@@ -6,19 +6,18 @@ entry
 
 _fibolp
 	mov	_var01, #1
-	mov	_var02, #1
-	mov	_var03, #0
+	mov	result1, #1
+	mov	_var02, #0
 	sub	arg01, #1 wz
  if_e	jmp	#LR__0002
 LR__0001
-	add	_var03, _var01
+	add	_var02, _var01
+	mov	_var03, _var02
+	mov	_var02, _var01
+	mov	_var01, result1
 	mov	result1, _var03
-	mov	_var03, _var01
-	mov	_var01, _var02
-	mov	_var02, result1
 	djnz	arg01, #LR__0001
 LR__0002
-	mov	result1, _var02
 _fibolp_ret
 	ret
 

diff --git a/Test/Expect/stest152.pasm b/Test/Expect/stest152.pasm
@@ -5,17 +5,16 @@ dat
 entry
 
 _foo
-	mov	_var01, #99
+	mov	result1, #99
 	cmp	arg01, #0 wz
  if_e	jmp	#LR__0001
 	cmp	arg01, #1 wz
  if_e	jmp	#LR__0002
 	jmp	#LR__0003
 LR__0001
 LR__0002
-	mov	_var01, #2
+	mov	result1, #2
 LR__0003
-	mov	result1, _var01
 _foo_ret
 	ret
 
@@ -24,8 +23,6 @@ result1
 COG_BSS_START
 	fit	496
 	org	COG_BSS_START
-_var01
-	res	1
 arg01
 	res	1
 	fit	496
diff --git a/Test/Expect/stest184.pasm b/Test/Expect/stest184.pasm
@@ -20,13 +20,13 @@ _fetchv
  if_ne	mov	result1, arg02
 	mov	arg01, result1
 	mov	arg03, #20
-	mov	arg02, arg01
+	mov	result1, arg01
 	cmps	arg01, fetchv_tmp002_ wc
  if_ae	jmp	#LR__0002
 	mov	_inline__inline___system____builtin_memmove__idx__0000, #20
 LR__0001
-	rdbyte	result1, fetchv_tmp002_
-	wrbyte	result1, arg01
+	rdbyte	arg03, fetchv_tmp002_
+	wrbyte	arg03, arg01
 	add	arg01, #1
 	add	fetchv_tmp002_, #1
 	djnz	_inline__inline___system____builtin_memmove__idx__0000, #LR__0001
@@ -44,8 +44,8 @@ LR__0003
 	djnz	_inline__inline___system____builtin_memmove__idx__0001, #LR__0003
 LR__0004
 LR__0005
-	add	arg02, #12
-	rdlong	result1, arg02
+	add	result1, #12
+	rdlong	result1, result1
 _fetchv_ret
 	ret
 

diff --git a/Test/Expect/stest192.pasm b/Test/Expect/stest192.pasm
@@ -5,9 +5,8 @@ dat
 entry
 
 _blah1
-	mov	_var01, #1
-	mov	_var01, #2
-	mov	result1, _var01
+	mov	result1, #1
+	mov	result1, #2
 _blah1_ret
 	ret
 
@@ -21,6 +20,4 @@ result1
 COG_BSS_START
 	fit	496
 	org	COG_BSS_START
-_var01
-	res	1
 	fit	496
diff --git a/Test/Expect/stest213.p2asm b/Test/Expect/stest213.p2asm
@@ -15,34 +15,32 @@ dat
 entry
 
 _demo
-	mov	_inline__func1_b, #0
+	mov	result1, #0
 	rep	@LR__0001, #8
 	testp	#15 wc
-	rcl	_inline__func1_b, #1
+	rcl	result1, #1
 LR__0001
-	mov	outb, _inline__func1_b
+	mov	outb, result1
 	call	#_func2
 	mov	outb, result1
 _demo_ret
 	ret
 
 _func1
-	mov	_var01, #0
+	mov	result1, #0
 	rep	@LR__0010, #8
 	testp	#15 wc
-	rcl	_var01, #1
+	rcl	result1, #1
 LR__0010
-	mov	result1, _var01
 _func1_ret
 	ret
 
 _func2
-	mov	_var01, #0
+	mov	result1, #0
 	rep	#2, #8
 	testp	#15 wc
-	rcl	_var01, #1
+	rcl	result1, #1
 LR__0020
-	mov	result1, _var01
 _func2_ret
 	ret
 builtin_bytefill_
@@ -68,8 +66,4 @@ COG_BSS_START
 	fit	480
 	orgh
 	org	COG_BSS_START
-_inline__func1_b
-	res	1
-_var01
-	res	1
 	fit	480
diff --git a/Test/Expect/stest232.pasm b/Test/Expect/stest232.pasm
@@ -10,11 +10,10 @@ _demo
 	mov	_var02, arg03
 	mov	_var04, arg01
 	add	_var04, #_var01
-	'.live	_var05
+	'.live	result1
 	movs	wrcog, _var04
-	movd	wrcog, #_var05
+	movd	wrcog, #result1
 	call	#wrcog
-	mov	result1, _var05
 _demo_ret
 	ret
 wrcog
@@ -35,8 +34,6 @@ _var03
 	res	1
 _var04
 	res	1
-_var05
-	res	1
 arg01
 	res	1
 arg02

diff --git a/Test/Expect/stest247.pasm b/Test/Expect/stest247.pasm
@@ -152,44 +152,45 @@ __system___float_mul_ret
 	ret
 
 __system___float_tointeger
-	mov	_var01, arg01
-	shr	_var01, #31
-	mov	_var02, arg01
-	shl	_var02, #1
-	shr	_var02, #24 wz
+	mov	_var01, arg02
+	mov	result1, arg01
+	shr	result1, #31
+	mov	result2, arg01
+	shl	result2, #1
+	shr	result2, #24 wz
 	and	arg01, imm_8388607_
  if_ne	shl	arg01, #6
  if_ne	or	arg01, imm_536870912_
  if_ne	jmp	#LR__0021
-	mov	_var03, arg01
-	mov	_var04, #32
+	mov	_var02, arg01
+	mov	_var03, #32
 LR__0020
-	shl	_var03, #1 wc
- if_ae	djnz	_var04, #LR__0020
-	sub	_var04, #23
-	mov	_var02, _var04
-	mov	_var03, #7
-	sub	_var03, _var04
-	shl	arg01, _var03
+	shl	_var02, #1 wc
+ if_ae	djnz	_var03, #LR__0020
+	sub	_var03, #23
+	mov	result2, _var03
+	mov	_var02, #7
+	sub	_var02, _var03
+	shl	arg01, _var02
 LR__0021
-	sub	_var02, #127
+	sub	result2, #127
 	mov	result3, arg01
-	mov	result2, _var02
+	mov	arg02, result1
 	cmps	result2, #31 wc
- if_ae	cmp	_var01, #0 wz
- if_a	mov	_var05, imm_2147483648_
- if_nc_and_z	mov	_var05, imm_2147483647_
- if_ae	mov	result3, _var05
+ if_ae	cmp	arg02, #0 wz
+ if_a	mov	_var04, imm_2147483648_
+ if_nc_and_z	mov	_var04, imm_2147483647_
+ if_ae	mov	result3, _var04
  if_ae	jmp	#LR__0022
 	cmps	result2, imm_4294967295_ wc
  if_b	mov	result3, #0
  if_ae	shl	result3, #2
- if_ae	mov	_var06, #30
- if_ae	sub	_var06, result2
- if_ae	shr	result3, _var06
- if_ae	add	result3, arg02
+ if_ae	mov	_var05, #30
+ if_ae	sub	_var05, result2
+ if_ae	shr	result3, _var05
+ if_ae	add	result3, _var01
  if_ae	shr	result3, #1
- if_ae	cmp	_var01, #0 wz
+ if_ae	cmp	arg02, #0 wz
  if_a	neg	result3, result3
 LR__0022
 	mov	result1, result3
@@ -382,8 +383,6 @@ _var04
 	res	1
 _var05
 	res	1
-_var06
-	res	1
 arg01
 	res	1
 arg02

diff --git a/Test/Expect/stest264.p2asm b/Test/Expect/stest264.p2asm
@@ -15,18 +15,17 @@ dat
 entry
 
 _foo
-	mov	_var01, arg01
+	mov	result1, arg01
 	mov	LR__0002, LR__0003
 LR__0001
-	add	_var01, LR__0002
-	djnz	_var01, #LR__0001
+	add	result1, LR__0002
+	djnz	result1, #LR__0001
 	jmp	#LR__0004
 LR__0002
 	long	0
 LR__0003
 	long	1
 LR__0004
-	mov	result1, _var01
 _foo_ret
 	ret
 builtin_bytefill_
@@ -52,8 +51,6 @@ COG_BSS_START
 	fit	480
 	orgh
 	org	COG_BSS_START
-_var01
-	res	1
 arg01
 	res	1
 	fit	480
diff --git a/Test/Expect/stest269.p2asm b/Test/Expect/stest269.p2asm
@@ -15,11 +15,10 @@ dat
 entry
 
 _xoro_test
-	rdlong	result1, arg01
-	xoro32	result1
-	mov	_var01, 0 - 0
-	wrlong	result1, arg01
-	mov	result1, _var01
+	rdlong	_var01, arg01
+	xoro32	_var01
+	mov	result1, 0 - 0
+	wrlong	_var01, arg01
 _xoro_test_ret
 	ret
 builtin_bytefill_

diff --git a/Test/Expect/stest280.pasm b/Test/Expect/stest280.pasm
@@ -43,8 +43,8 @@ _blah2
  if_ae	jmp	#LR__0011
 	mov	_var02, #8
 LR__0010
-	rdbyte	result1, arg02
-	wrbyte	result1, arg01
+	rdbyte	arg03, arg02
+	wrbyte	arg03, arg01
 	add	arg01, #1
 	add	arg02, #1
 	djnz	_var02, #LR__0010

diff --git a/Test/Expect/stest289.p2asm b/Test/Expect/stest289.p2asm
@@ -15,12 +15,11 @@ dat
 entry
 
 _main
-	mov	_var01, #1
+	mov	result1, #1
 	mov	LR__0001 + 1, #0
 LR__0001
 	nop
-	mov	_var01, #2
-	mov	result1, _var01
+	mov	result1, #2
 _main_ret
 	ret
 builtin_bytefill_
@@ -46,6 +45,4 @@ COG_BSS_START
 	fit	480
 	orgh
 	org	COG_BSS_START
-_var01
-	res	1
 	fit	480
diff --git a/Test/Expect/stest296.pasm b/Test/Expect/stest296.pasm
@@ -11,9 +11,8 @@ entry
 _main
 	mov	outa, #1
 	mov	outa, #0
-	mov	_var01, #2
+	mov	result1, #2
 	mov	outb, #1
-	mov	result1, _var01
 _main_ret
 	ret
 
@@ -22,6 +21,4 @@ result1
 COG_BSS_START
 	fit	496
 	org	COG_BSS_START
-_var01
-	res	1
 	fit	496