--- /sys/src/9/bcm/main.c Fri Jul 26 00:49:36 2013 +++ /sys/src/9/bcm/main.c Fri Sep 20 23:38:39 2013 @@ -17,7 +17,7 @@ /* Firmware compatibility */ #define Minfirmrev 326770 -#define Minfirmdate "22 Jul 2012" +#define Minfirmdate "19 Aug 2013" /* * Where configuration info is left for the loaded programme. @@ -245,8 +245,8 @@ rev = getfirmware(); print("firmware: rev %d\n", rev); if(rev < Minfirmrev){ - print("Sorry, firmware (start.elf) must be at least rev %d (%s)\n", - Minfirmrev, Minfirmdate); + print("Sorry, firmware (start*.elf) must be at least rev %d" + " or newer than %s\n", Minfirmrev, Minfirmdate); for(;;) ; } --- /sys/src/cmd/5c/cgen.c Wed Jul 4 19:35:53 2007 +++ /sys/src/cmd/5c/cgen.c Fri Sep 20 23:44:32 2013 @@ -701,7 +701,7 @@ if(true) o = comrel[relindex(o)]; if(typefd[n->type->etype]) { - gopcode(o, nodfconst(0), &nod, Z); + gopcode(true ? o | BTRUE : o, nodfconst(0), &nod, Z); } else gopcode(o, nodconst(0), &nod, Z); regfree(&nod); @@ -800,14 +800,14 @@ regalloc(&nod, r, nn); cgenrel(r, &nod, 1); o = invrel[relindex(o)]; - gopcode(o, l, &nod, Z); + gopcode(true ? o | BTRUE : o, l, &nod, Z); regfree(&nod); goto com; } if(sconst(r)) { regalloc(&nod, l, nn); cgenrel(l, &nod, 1); - gopcode(o, r, &nod, Z); + gopcode(true ? o | BTRUE : o, r, &nod, Z); regfree(&nod); goto com; } @@ -822,7 +822,7 @@ regalloc(&nod1, l, Z); cgenrel(l, &nod1, 1); } - gopcode(o, &nod, &nod1, Z); + gopcode(true ? o | BTRUE : o, &nod, &nod1, Z); regfree(&nod); regfree(&nod1); --- /sys/src/cmd/5c/gc.h Fri Jun 14 00:34:01 2013 +++ /sys/src/cmd/5c/gc.h Fri Sep 20 23:44:32 2013 @@ -14,6 +14,7 @@ #define SZ_VLONG 8 #define SZ_DOUBLE 8 #define FNX 100 +#define BTRUE 0x1000 typedef struct Adr Adr; typedef struct Prog Prog; --- /sys/src/cmd/5c/txt.c Fri Jan 25 00:53:39 2013 +++ /sys/src/cmd/5c/txt.c Fri Sep 20 23:44:32 2013 @@ -929,12 +929,14 @@ void gopcode(int o, Node *f1, Node *f2, Node *t) { - int a, et; + int a, et, true; Adr ta; et = TLONG; if(f1 != Z && f1->type != T) et = f1->type->etype; + true = o & BTRUE; + o &= ~BTRUE; a = AGOK; switch(o) { case OAS: @@ -1076,15 +1078,24 @@ break; case OLT: a = ABLT; + /* ensure NaN comparison is always false */ + if(typefd[et] && !true) + a = ABMI; break; case OLE: a = ABLE; + if(typefd[et] && !true) + a = ABLS; break; case OGE: a = ABGE; + if(typefd[et] && true) + a = ABPL; break; case OGT: a = ABGT; + if(typefd[et] && true) + a = ABHI; break; case OLO: a = ABLO;