8c: handle 64 bit mixedmode asop and type vlong <-> float/double type conversions

2 files changed, 6 insertions, 6 deletions

diff --git a/sys/src/cmd/8c/machcap.c b/sys/src/cmd/8c/machcap.c
index 1734e9c32..db1cdcba6 100644
--- a/sys/src/cmd/8c/machcap.c
+++ b/sys/src/cmd/8c/machcap.c
@@ -18,7 +18,7 @@ machcap(Node *n)
 		if(typev[n->type->etype]) {
 //		if(typev[n->type->etype] && n->right->op == OCONST) {
 //			if(hi64v(n->right) == 0)
-				return 1;
+				return !mixedasop(n->left->type, n->right->type);
 		}
 		break;
 
@@ -58,6 +58,8 @@ machcap(Node *n)
 
 	case OASADD:
 	case OASSUB:
+		return !mixedasop(n->left->type, n->right->type);
+
 	case OASAND:
 	case OASOR:
 	case OASXOR:
diff --git a/sys/src/cmd/8c/txt.c b/sys/src/cmd/8c/txt.c
index 13f62539f..258d90f8e 100644
--- a/sys/src/cmd/8c/txt.c
+++ b/sys/src/cmd/8c/txt.c
@@ -621,20 +621,18 @@ gmove(Node *f, Node *t)
 		a = AMOVWLZX;
 		goto ld;
 	case TINT:
-	case TUINT:
 	case TLONG:
-	case TULONG:
-	case TIND:
 		if(typefd[tt]) {
 			gins(AFMOVL, f, &fregnode0);
 			gmove(&fregnode0, t);
 			return;
 		}
+	case TUINT:
+	case TULONG:
+	case TIND:
 		a = AMOVL;
-
 	ld:
 		regalloc(&nod, f, t);
-		nod.type = types[TLONG];
 		gins(a, f, &nod);
 		gmove(&nod, t);
 		regfree(&nod);