CogVM source as per VMMaker.oscog-eem.3623

Fix slip in CogARMv8Compiler>>usesOutOfLineLiteral for
LoadEffectiveAddressMwrR that generated unused out-of-line
literals for negative offsets such as FoxMFReceiver

Eliminate all excess spaces in the fix to ARMv8 disassembly
(commit d974202).

Author: eliotmiranda

processors/ARM/gdb-8.3.1/opcodes/aarch64-opc.c

@@ -3404,15 +3404,15 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc,
 	    {
 	      int imm32 = opnd->imm.value;
 #if COG
-	      snprintf (buf, size, "#0x%-8x  // #%d", imm32, imm32);
+	      snprintf (buf, size, "#0x%x  // #%d", imm32, imm32);
 #else
 	      snprintf (buf, size, "#0x%-20x\t// #%d", imm32, imm32);
 #endif
 	    }
 	  break;
 	case 8:	/* e.g. MOV Xd, #<imm64>.  */
 #if COG
-	  snprintf (buf, size, "#0x%-16" PRIx64 "  // #%" PRIi64,
+	  snprintf (buf, size, "#0x%" PRIx64 "  // #%" PRIi64,
 		    opnd->imm.value, opnd->imm.value);
 #else
 	  snprintf (buf, size, "#0x%-20" PRIx64 "\t// #%" PRIi64,

src/spur64.cog/cogitARMv8.c

@@ -1,10 +1,10 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3621 uuid: ca9e3bc9-55f3-4dbe-906b-b55feb2d3419
-	(Compiler-ct.519)
+	CCodeGenerator VMMaker.oscog-eem.3623 uuid: c9a77704-a949-4a44-a1e8-1b40ae8c6001
+	(* Compiler-ct.519)
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3621 uuid: ca9e3bc9-55f3-4dbe-906b-b55feb2d3419
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3623 uuid: c9a77704-a949-4a44-a1e8-1b40ae8c6001
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3621 uuid: ca9e3bc9-55f3-4dbe-906b-b55feb2d3419 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3623 uuid: c9a77704-a949-4a44-a1e8-1b40ae8c6001 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -7686,6 +7686,7 @@ usesOutOfLineLiteral(AbstractInstruction *self_in_CogARMv8Compiler)
 	case AddCqRR:
 	case SubCqR:
 	case CmpCqR:
+	case LoadEffectiveAddressMwrR:
 		immediate = ((sqLong) (((self_in_CogARMv8Compiler->operands))[0]));
 
 		/* begin isPossiblyShiftableNegatableImm12:ifTrue:ifFalse: */
@@ -7698,19 +7699,6 @@ usesOutOfLineLiteral(AbstractInstruction *self_in_CogARMv8Compiler)
 		}
 		return 1;
 
-	case LoadEffectiveAddressMwrR:
-		immediate = ((sqLong) (((self_in_CogARMv8Compiler->operands))[0]));
-
-		/* begin isPossiblyShiftableImm12:ifTrue:ifFalse: */
-		if (((immediate >= 0) && (immediate <= (0xFFF)))) {
-			return 0;
-		}
-		if (((!(immediate & (0xFFF))))
-		 && (((((immediate) >> 12) >= 0) && (((immediate) >> 12) <= (0xFFF))))) {
-			return 0;
-		}
-		return 1;
-
 	case AndCqR:
 	case AndCqRR:
 	case OrCqRR:

src/spur64.sista/cogitARMv8.c

@@ -1,10 +1,10 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3621 uuid: ca9e3bc9-55f3-4dbe-906b-b55feb2d3419
-	(Compiler-ct.519)
+	CCodeGenerator VMMaker.oscog-eem.3623 uuid: c9a77704-a949-4a44-a1e8-1b40ae8c6001
+	(* Compiler-ct.519)
    from
-	SistaCogit VMMaker.oscog-eem.3621 uuid: ca9e3bc9-55f3-4dbe-906b-b55feb2d3419
+	SistaCogit VMMaker.oscog-eem.3623 uuid: c9a77704-a949-4a44-a1e8-1b40ae8c6001
  */
-static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3621 uuid: ca9e3bc9-55f3-4dbe-906b-b55feb2d3419 " __DATE__ ;
+static char __buildInfo[] = "SistaCogit VMMaker.oscog-eem.3623 uuid: c9a77704-a949-4a44-a1e8-1b40ae8c6001 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -7541,7 +7541,7 @@ rewriteImm19JumpBeforetarget(AbstractInstruction *self_in_CogARMv8Compiler, sqIn
 static NoDbgRegParms sqInt
 rewriteImm26JumpBeforetarget(AbstractInstruction *self_in_CogARMv8Compiler, sqInt followingAddress, sqInt targetAddress)
 {
-    unsigned int instrOpcode;
+    sqInt instrOpcode;
     sqInt mcpc;
     sqInt offset;
 
@@ -7803,6 +7803,7 @@ usesOutOfLineLiteral(AbstractInstruction *self_in_CogARMv8Compiler)
 	case AddCqRR:
 	case SubCqR:
 	case CmpCqR:
+	case LoadEffectiveAddressMwrR:
 		immediate = ((sqLong) (((self_in_CogARMv8Compiler->operands))[0]));
 
 		/* begin isPossiblyShiftableNegatableImm12:ifTrue:ifFalse: */
@@ -7815,19 +7816,6 @@ usesOutOfLineLiteral(AbstractInstruction *self_in_CogARMv8Compiler)
 		}
 		return 1;
 
-	case LoadEffectiveAddressMwrR:
-		immediate = ((sqLong) (((self_in_CogARMv8Compiler->operands))[0]));
-
-		/* begin isPossiblyShiftableImm12:ifTrue:ifFalse: */
-		if (((immediate >= 0) && (immediate <= (0xFFF)))) {
-			return 0;
-		}
-		if (((!(immediate & (0xFFF))))
-		 && (((((immediate) >> 12) >= 0) && (((immediate) >> 12) <= (0xFFF))))) {
-			return 0;
-		}
-		return 1;
-
 	case AndCqR:
 	case AndCqRR:
 	case OrCqRR: