From e205856bc6b038e31a16d948e7830234412a3dfe Mon Sep 17 00:00:00 2001
From: Quentin Carbonneaux <quentin.carbonneaux@yale.edu>
Date: Thu, 22 Oct 2015 16:53:25 -0400
Subject: [PATCH] stick scales close to their instruction

---
 lisc/isel.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/lisc/isel.c b/lisc/isel.c
index 494f9ac..c6d9d65 100644
--- a/lisc/isel.c
+++ b/lisc/isel.c
@@ -159,20 +159,15 @@ sel(Ins i, ANum *an, Fn *fn)
 Emit:
 		emiti(i);
 		for (n=0; n<2; n++) {
-			/* load constants that do not fit in
-			 * a 32bit signed integer into a
-			 * long temporary
+			/* fuse memory loads into arithmetic
+			 * operations when the sizes match
 			 */
 			r0 = i.arg[n];
-			if (rtype(r0) == RCon && noimm(r0, fn)) {
-				curi->arg[n] = newtmp("isel", fn);
-				emit(OCopy, 1, curi->arg[n], r0, R);
-			}
 			if (opdesc[i.op].nmem > n)
 			if ((i0 = an[r0.val].i))
 			if (i0->op == OLoad+Tsw || i0->op == OLoad+Tl) {
 				amatch(&a, i0->arg[0], an, fn, 1);
-				i.arg[n] = a.base;
+				curi->arg[n] = a.base;
 				if (a.offset.type == CUndef)
 				if (req(a.index, R))
 					continue;
@@ -186,6 +181,17 @@ Emit:
 				emit(x, 0, R, r1, a.index);
 			}
 		}
+		for (n=0; n<2; n++) {
+			/* load constants that do not fit in
+			 * a 32bit signed integer into a
+			 * long temporary
+			 */
+			r0 = i.arg[n];
+			if (rtype(r0) == RCon && noimm(r0, fn)) {
+				curi->arg[n] = newtmp("isel", fn);
+				emit(OCopy, 1, curi->arg[n], r0, R);
+			}
+		}
 		break;
 	case OAlloc:
 	case OAlloc+1: