summary refs log tree commit diff
path: root/lisc/lisc.h
diff options
context:
space:
mode:
authorQuentin Carbonneaux <quentin.carbonneaux@yale.edu>2015-07-10 16:17:55 -0400
committerQuentin Carbonneaux <quentin.carbonneaux@yale.edu>2015-09-15 23:01:27 -0400
commite4f07478ce93aacc41e70613b5a6ded99a0799f9 (patch)
tree6254258be710c8362e5245098638c87f838debdc /lisc/lisc.h
parentcec786d53014db0ad69ce0b120eed273f48ddad8 (diff)
downloadroux-e4f07478ce93aacc41e70613b5a6ded99a0799f9.tar.gz
fix naming
Diffstat (limited to 'lisc/lisc.h')
-rw-r--r--lisc/lisc.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/lisc/lisc.h b/lisc/lisc.h
index a26dc1e..7978c17 100644
--- a/lisc/lisc.h
+++ b/lisc/lisc.h
@@ -16,7 +16,7 @@ typedef unsigned char uchar;
 enum {
 	R = 0,  /* invalid reference */
 	NRegs = 32,
-	Temp0 = NRegs+1,
+	Tmp0 = NRegs+1,
 	NString = 32,
 	NPreds = 15,
 	NBlks = 128,
@@ -32,7 +32,7 @@ typedef struct Fn Fn;
 typedef ushort Ref;
 
 enum {
-	RTemp = 0,
+	RSym = 0,
 	RConst = 1,
 
 	RMask = 1,
@@ -40,7 +40,7 @@ enum {
 	NRefs = ((ushort)-1)>>RShift,
 };
 
-#define TEMP(x)  (((x)<<RShift) | RTemp)
+#define SYM(x)   (((x)<<RShift) | RSym)
 #define CONST(x) (((x)<<RShift) | RConst)
 
 enum {
@@ -88,17 +88,17 @@ struct Blk {
 	Blk *s2;
 	Blk *link;
 
-	char name[NString];
 	int rpo;
 	Blk **preds;
 	int npreds;
+	char name[NString];
 };
 
 struct Sym {
 	enum {
 		SUndef,
 		SReg,
-		STemp,
+		STmp,
 	} type;
 	char name[NString];
 	Blk *blk;
@@ -108,7 +108,7 @@ struct Sym {
 struct Fn {
 	Blk *start;
 	Sym *sym;
-	int ntemp;
+	int ntmp;
 	int nblk;
 	Blk **rpo;
 };
@@ -121,3 +121,4 @@ Fn *parsefn(FILE *);
 /* ssa.c */
 void fillpreds(Fn *);
 void fillrpo(Fn *);
+void ssafix(Fn *, int);