shithub: scc

Download patch

ref: 7f8b4f86e59164d4b18f3a4285ca6d801522c77c
parent: 72997adf1bcc43832d71a66593f4ccf6b575ad4f
author: Roberto E. Vargas Caballero <[email protected]>
date: Thu Apr 14 21:01:34 EDT 2016

[cc1] Update cc1 tests after commit 6e1706

This commit changed the IR, and all the test failed after it.

--- a/cc1/tests/test001.c
+++ b/cc1/tests/test001.c
@@ -3,7 +3,7 @@
 description: Basic hello world test
 error:
 output:
-G6	F	"main
+G6	I	F	"main
 {
 \
 V8	K	#N13
--- a/cc1/tests/test002.c
+++ b/cc1/tests/test002.c
@@ -4,7 +4,7 @@
 error:
 output:
 G4	P	"x
-G8	F	"main
+G8	I	F	"main
 {
 \
 S2	"S	#NC	#N2
--- a/cc1/tests/test003.c
+++ b/cc1/tests/test003.c
@@ -3,17 +3,17 @@
 description: Select function to call inside ternary operator
 error:
 output:
-G2	F	"foo
+G2	I	F	"foo
 {
 \
 	h	#I2A
 }
-G3	F	"bar
+G3	I	F	"bar
 {
 \
 	h	#I18
 }
-G4	F	"main
+G4	I	F	"main
 {
 \
 	h	G2	cI
--- a/cc1/tests/test004.c
+++ b/cc1/tests/test004.c
@@ -3,7 +3,7 @@
 description: Test integer operations
 error:
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	I	"x
--- a/cc1/tests/test005.c
+++ b/cc1/tests/test005.c
@@ -3,7 +3,7 @@
 description: Test unary integer operations
 error:
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	I	"x
--- a/cc1/tests/test006.c
+++ b/cc1/tests/test006.c
@@ -7,7 +7,7 @@
 test006.c:10: warning: conditional expression is constant
 output:
 G1	K	"c
-G3	F	"main
+G3	I	F	"main
 {
 \
 	y	L4	#I0
--- a/cc1/tests/test007.c
+++ b/cc1/tests/test007.c
@@ -3,7 +3,7 @@
 description: basic while test
 error:
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	I	"x
--- a/cc1/tests/test008.c
+++ b/cc1/tests/test008.c
@@ -3,7 +3,7 @@
 description: Basic do while loop
 error:
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	I	"x
--- a/cc1/tests/test009.c
+++ b/cc1/tests/test009.c
@@ -3,7 +3,7 @@
 description: Basic test for loops
 error:
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	I	"x
--- a/cc1/tests/test010.c
+++ b/cc1/tests/test010.c
@@ -6,7 +6,7 @@
 test010.c:10: warning: conditional expression is constant
 test010.c:30: warning: conditional expression is constant
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	I	"x
--- a/cc1/tests/test011.c
+++ b/cc1/tests/test011.c
@@ -5,7 +5,7 @@
 test011.c:13: warning: 'foo' defined but not used
 test011.c:13: warning: 'start' defined but not used
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 L3
--- a/cc1/tests/test012.c
+++ b/cc1/tests/test012.c
@@ -4,7 +4,7 @@
 error:
 test012.c:38: warning: 'foo' defined but not used
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	I	"x
--- a/cc1/tests/test013.c
+++ b/cc1/tests/test013.c
@@ -17,7 +17,7 @@
 G9	O	"i
 G10	I	"j
 G11	N	"k
-G13	F	"main
+G13	I	F	"main
 {
 \
 	G1	G2	gI	:I
--- a/cc1/tests/test014.c
+++ b/cc1/tests/test014.c
@@ -21,7 +21,7 @@
 G1	I	"a
 Y2	K	"b
 X3	I	"c
-G6	F	"func1
+G6	I	F	"func1
 {
 \
 A7	I	"h
@@ -31,13 +31,13 @@
 T11	Z	"a
 	h	#I0
 }
-G14	F	"func2
+G14	0	F	"func2
 {
 R12	I	"par
 \
 A15	I	"par
 }
-T17	F	"func3
+T17	0	F	"func3
 {
 R16	I	"par
 \
--- a/cc1/tests/test015.c
+++ b/cc1/tests/test015.c
@@ -12,7 +12,7 @@
 S2	"s	#N4	#N1
 M11	S5	"s	#N0
 G12	S2	"s2
-G14	F	"main
+G14	I	F	"main
 {
 \
 	j	L15
--- a/cc1/tests/test016.c
+++ b/cc1/tests/test016.c
@@ -6,7 +6,7 @@
 test016.c:46: error: incompatible types when assigning
 output:
 G1	I	"g
-G3	F	"func1
+G3	I	F	"func1
 {
 \
 A4	I	"x
@@ -25,7 +25,7 @@
 L8
 	h	#I0
 }
-G9	F	"func2
+G9	I	F	"func2
 {
 \
 A10	I	"x
--- a/cc1/tests/test017.c
+++ b/cc1/tests/test017.c
@@ -3,7 +3,7 @@
 description: Basic test about pointers and structs
 error:
 output:
-G10	F	"main
+G10	I	F	"main
 {
 \
 S2	"s1	#N4	#N1
--- a/cc1/tests/test018.c
+++ b/cc1/tests/test018.c
@@ -3,7 +3,7 @@
 description: Basic test for arrays
 error:
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 V3	K	#N4
--- a/cc1/tests/test019.c
+++ b/cc1/tests/test019.c
@@ -6,7 +6,7 @@
 test019.c:12: warning: division by 0
 test019.c:13: warning: division by 0
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	I	"i
--- a/cc1/tests/test020.c
+++ b/cc1/tests/test020.c
@@ -6,7 +6,7 @@
 test020.c:81: warning: division by 0
 test020.c:82: warning: division by 0
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	I	"i
--- a/cc1/tests/test021.c
+++ b/cc1/tests/test021.c
@@ -5,7 +5,7 @@
 comments: This test is done for z80 implementation
 error:
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	K	"uc
--- a/cc1/tests/test022.c
+++ b/cc1/tests/test022.c
@@ -5,7 +5,7 @@
 comments: This test is done for z80 data types
 error:
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	I	"i
--- a/cc1/tests/test023.c
+++ b/cc1/tests/test023.c
@@ -5,7 +5,7 @@
 comments: This test is done for z80 data types
 error:
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	W	"i
--- a/cc1/tests/test024.c
+++ b/cc1/tests/test024.c
@@ -5,7 +5,7 @@
 comments: This test is done for z80 data types
 error:
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	Q	"i
--- a/cc1/tests/test026.c
+++ b/cc1/tests/test026.c
@@ -4,7 +4,7 @@
 descritpion: Test of predefined cpp macros
 error:
 output:
-G3	F	"main
+G3	I	F	"main
 {
 \
 A4	I	"y
--- a/cc1/tests/test027.c
+++ b/cc1/tests/test027.c
@@ -4,7 +4,7 @@
 description: Test of cpp stringizer
 error:
 output:
-G3	F	"main
+G3	I	F	"main
 {
 \
 A5	P	"p
--- a/cc1/tests/test028.c
+++ b/cc1/tests/test028.c
@@ -4,7 +4,7 @@
 description: Test of reinterpretation in define
 error:
 output:
-G6	F	"foo
+G6	P	F	"foo
 {
 \
 V8	K	#N3
--- a/cc1/tests/test029.c
+++ b/cc1/tests/test029.c
@@ -9,7 +9,7 @@
 test029.c:34: error: redefinition of 'f1'
 test029.c:35: error: 'f' undeclared
 output:
-G3	F	"f1
+G3	I	F	"f1
 {
 \
 A4	I	"f
--- a/cc1/tests/test030.c
+++ b/cc1/tests/test030.c
@@ -4,7 +4,7 @@
 description: Basic test for vararg functions
 error:
 output:
-G14	F	"f1
+G14	I	F	"f1
 {
 S2	"foo	#N24	#N2
 M3	I	"i	#N0
@@ -21,7 +21,7 @@
 L15
 	h	A11	@S2	M4	.I	A12	+I
 }
-G17	F	"main
+G17	I	F	"main
 {
 \
 A18	S2	"f
--- a/cc1/tests/test032.c
+++ b/cc1/tests/test032.c
@@ -4,7 +4,7 @@
 description: test special characters @ and $ in macro definitions
 error:
 output:
-G5	F	"main
+G5	I	F	"main
 {
 \
 V9	K	#N44
--- a/cc1/tests/test034.c
+++ b/cc1/tests/test034.c
@@ -7,13 +7,13 @@
 test034.c:44: error: redeclaration of 'bar'
 output:
 X3	S2	"x
-G6	F	"main
+G6	I	F	"main
 {
 \
 X7	S2	"x
 	h	X7	'P	#P0	!I
 }
-G5	F	"foo
+G5	I	F	"foo
 {
 \
 	X3	M9	.I	#I0	:I
--- a/cc1/tests/test035.c
+++ b/cc1/tests/test035.c
@@ -4,7 +4,7 @@
 description: Basic test for enumerations
 error:
 output:
-G7	F	"main
+G7	I	F	"main
 {
 \
 A8	I	"e
--- a/cc1/tests/test036.c
+++ b/cc1/tests/test036.c
@@ -5,7 +5,7 @@
 error:
 test036.c:60: warning: type defaults to 'int' in declaration
 output:
-G5	F	"send
+G5	I	F	"send
 {
 R1	P	"to
 R2	P	"from
--- a/cc1/tests/test037.c
+++ b/cc1/tests/test037.c
@@ -8,7 +8,7 @@
 test037.c:31: warning: conditional expression is constant
 test037.c:33: warning: conditional expression is constant
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 	y	L3	#I0
--- a/cc1/tests/test038.c
+++ b/cc1/tests/test038.c
@@ -9,12 +9,12 @@
 G1	I	"x	(
 	#I0
 )
-G5	F	"foo
+G5	P	F	"foo
 {
 \
 	h	X3	'P
 }
-G3	F	"main
+G3	I	F	"main
 {
 \
 	G1	#I0	:I
--- a/cc1/tests/test039.c
+++ b/cc1/tests/test039.c
@@ -5,7 +5,7 @@
 comments: This test is done for z80 sizes
 error:
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	I	"i
--- a/cc1/tests/test040.c
+++ b/cc1/tests/test040.c
@@ -3,7 +3,7 @@
 description: Test for bug parsing typenames in struct definition
 error:
 output:
-G9	F	"main
+G9	I	F	"main
 {
 \
 S2	"List	#N1C	#N2
--- a/cc1/tests/test041.c
+++ b/cc1/tests/test041.c
@@ -9,7 +9,7 @@
 test041.c:50: warning: 'foo' defined but not used
 test041.c:50: warning: 's' defined but not used
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 A3	I	"i
--- a/cc1/tests/test042.c
+++ b/cc1/tests/test042.c
@@ -4,7 +4,7 @@
 error:
 test042.c:17: error: bad type convertion requested
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 */
--- a/cc1/tests/test045.c
+++ b/cc1/tests/test045.c
@@ -6,7 +6,7 @@
 G1	I	"x	(
 	#I5
 )
-G3	F	"main
+G3	I	F	"main
 {
 \
 	y	L4	G1	#I5	=I
--- a/cc1/tests/test046.c
+++ b/cc1/tests/test046.c
@@ -9,7 +9,7 @@
 	#I2
 	#I3
 )
-G4	F	"main
+G4	I	F	"main
 {
 \
 	y	L5	G2	#I1	=I
--- a/cc1/tests/test047.c
+++ b/cc1/tests/test047.c
@@ -12,7 +12,7 @@
 	#I2
 	#I3
 )
-G8	F	"main
+G8	I	F	"main
 {
 \
 	y	L9	G6	M3	.I	#I1	=I
--- a/cc1/tests/test048.c
+++ b/cc1/tests/test048.c
@@ -11,7 +11,7 @@
 	#I1
 	#I2
 )
-G8	F	"main
+G8	I	F	"main
 {
 \
 	y	L9	G6	M3	.I	#I1	=I
--- a/cc1/tests/test049.c
+++ b/cc1/tests/test049.c
@@ -9,7 +9,7 @@
 G3	P	"p	(
 	G1	'P
 )
-G5	F	"main
+G5	I	F	"main
 {
 \
 	y	L6	G3	@I	#I5	=I
--- a/cc1/tests/test051.c
+++ b/cc1/tests/test051.c
@@ -9,7 +9,7 @@
 	#I1
 	#I2
 )
-G4	F	"main
+G4	I	F	"main
 {
 \
 	y	L5	G2	#I0	=I
--- a/cc1/tests/test052.c
+++ b/cc1/tests/test052.c
@@ -13,7 +13,7 @@
 	#I3
 	#I4
 )
-G8	F	"main
+G8	I	F	"main
 {
 \
 	y	L9	G6	M3	.I	#I1	=I
--- a/cc1/tests/test053.c
+++ b/cc1/tests/test053.c
@@ -10,7 +10,7 @@
 	#I1
 	#I2
 )
-G7	F	"main
+G7	I	F	"main
 {
 \
 	y	L8	G5	M3	.I	#I1	=I
--- a/cc1/tests/test056.c
+++ b/cc1/tests/test056.c
@@ -22,7 +22,7 @@
 V10	K	#N0
 G11	V10	"m	(
 )
-G13	F	"main
+G13	I	F	"main
 {
 \
 	h	G9	M7	.V6	'P	#P2	+P	@K	gI	gN	#N0	!I
--- a/cc1/tests/test057.c
+++ b/cc1/tests/test057.c
@@ -22,7 +22,7 @@
 	#I1
 	#I2
 )
-G6	F	"main
+G6	I	F	"main
 {
 \
 	h	G3	'P	#P6	+P	#P4	+P	@I	G4	'P	#P6	+P	#P6	+P	@I	!I
--- a/cc1/tests/test058.c
+++ b/cc1/tests/test058.c
@@ -38,7 +38,7 @@
 	#I0
 	#I0
 )
-G6	F	"main
+G6	I	F	"main
 {
 \
 	h	G4	'P	#PA	+P	#P8	+P	@I	G4	'P	#P1E	+P	#PA	+P	#P8	+P	@I	!I
--- a/cc1/tests/test060.c
+++ b/cc1/tests/test060.c
@@ -3,7 +3,7 @@
 description: Test for correctness of #line
 error:
 output:
-G2	F	"main
+G2	I	F	"main
 {
 \
 	h	#I0