shithub: scc

Info  •  Files  •  Log  •  Branches

Add stub support for assignations in cc2

--- a/cc2/cc2.h

+++ b/cc2/cc2.h

@@ -66,6 +66,7 @@

 #define LABEL     'L'

 #define OADD      '+'

 #define OSUB      '-'

+#define OASSIG    ':'

 extern void error(unsigned nerror, ...);

 extern void genaddable(Node *list[]);

--- a/cc2/cgen.c

+++ b/cc2/cgen.c

@@ -26,7 +26,7 @@

 }

 enum {

-	PUSH, POP, LD, ADD, RET, ADDI, LDI, ADDR, ADDX, ADCX

+	PUSH, POP, LD, ADD, RET, ADDI, LDI, ADDR, ADDX, ADCX, LDX

 };

 enum {

@@ -36,7 +36,7 @@

 char *opnames[] = {

 	[PUSH] = "PUSH", [POP] = "POP", [LD]  = "LD", [ADD] = "ADD",

 	[RET]  = "RET" , [ADDI]= "ADD", [LDI] = "LD", [ADDX] = "ADD",

-	[ADCX] = "ADC"

+	[ADCX] = "ADC" , [LDX] = "LD"

 };

 char *regnames[] = {

@@ -75,6 +75,13 @@

 		imm = va_arg(va, int);

 		printf("\t%s\t%s,%hd\n", opnames[op], regnames[reg1], imm);

 		break;

+	case LDX:

+		reg1 = va_arg(va, int);

+		off = va_arg(va, int);

+		reg2 = va_arg(va, int);

+		printf("\t%s\t(%s%+hd),%s\n",

+		       opnames[op], regnames[reg1], off, regnames[reg2]);

+		break;

 	case ADDX: case ADCX:

 		reg1 = va_arg(va, int);

 		reg2 = va_arg(va, int);

@@ -128,8 +135,17 @@

 			emit(LDI, A, imm >> 8);

 			emit(ADCX, A, IX, -off);

 			emit(LD, H, A);

+		} else {

+			abort();

 		}

 		break;

+	case OASSIG:

+		/*  TODO: check that it is really in HL and AUTO */

+		assert(lp->op == AUTO);

+		off = lp->u.sym->u.v.off;

+		emit(LDX, IX, -(off+1), L);

+		emit(LDX, IX, off, H);

+		break;

 	default:

 		abort();

 	}

@@ -193,7 +209,7 @@

 	case CONST:

 		np->addable = 20;

 		break;

-	case OADD: case OSUB:

+	case OASSIG: case OADD: case OSUB:

 		xaddable(lp);

 		xaddable(rp);

 		switch (rp->addable) {

@@ -215,6 +231,8 @@

 			default:

 				abort();

 			}

+		case 1:

+			break;

 		default:

 			abort();

 		}

--- a/cc2/parser.c

+++ b/cc2/parser.c

@@ -233,6 +233,7 @@

 	['-'] = operator,

 	['*'] = operator,

 	['/'] = operator,

+	[':'] = operator,

 	['A'] = variable,

 	['T'] = variable,

 	['G'] = variable,

-- 

⑨