improving cobc handling with MSVC assembler

OCamlPro · Jun 13, 2024 · e86ca86 · e86ca86
1 parent 4a9c1d5
commit e86ca86
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/cobc/cobc.c b/cobc/cobc.c
@@ -8193,6 +8193,9 @@ process_compile (struct filename *fn)
 		name = file_basename (fn->source, NULL);
 #ifndef	_MSC_VER
 		strcat (name, ".s");
+#else
+		/* earlier versions of msbuild don't recognize .s */
+		strcat (name, ".asm");
 #endif
 	}
 	size = strlen (name);
@@ -8207,6 +8210,7 @@ process_compile (struct filename *fn)
 	cobc_chk_buff_size (bufflen);
 
 #ifdef	_MSC_VER
+	/* TODO: we likely need to call ml.exe / ml64.exe */
 	sprintf (cobc_buffer, cb_source_debugging ?
 		"%s /c %s %s /Od /MDd /Zi /FR /c /Fa\"%s\" /Fo\"%s\" \"%s\"" :
 		"%s /c %s %s     /MD          /c /Fa\"%s\" /Fo\"%s\" \"%s\"",

diff --git a/tests/testsuite.src/used_binaries.at b/tests/testsuite.src/used_binaries.at
@@ -434,7 +434,7 @@ AT_CLEANUP
 
 
 AT_SETUP([save-temps in sub-directory])
-AT_KEYWORDS([runmisc])
+AT_KEYWORDS([runmisc cobc])
 
 AT_DATA([prog.cob], [
        IDENTIFICATION   DIVISION.
@@ -452,6 +452,7 @@ AT_CHECK([$COBCRUN_DIRECT ./prog.exe], [0], [OK])
 AT_CHECK([test -f debug/prog.$COB_OBJECT_EXT])
 AT_CHECK([test -f debug/prog.c])
 AT_CHECK([test -f debug/prog.s], [1])
+AT_CHECK([test -f debug/prog.asm], [1])
 AT_CHECK([test -f debug/prog.i])
 AT_CHECK([test -f debug/prog.c.h])
 AT_CHECK([test -f debug/prog.c.l.h])
@@ -464,14 +465,6 @@ AT_CHECK([test -f prog.$COB_OBJECT_EXT])
 AT_CHECK([$COMPILE -save-temps=debug -c -o program.$COB_OBJECT_EXT prog.cob])
 AT_CHECK([test -f program.$COB_OBJECT_EXT])
 
-# Check with -S
-
-AT_CHECK([test -f prog.s], [1])
-AT_CHECK([$COMPILE -save-temps=debug -S prog.cob])
-AT_CHECK([test -f prog.s])
-AT_CHECK([$COMPILE -save-temps=debug -S -o program.s prog.cob])
-AT_CHECK([test -f program.s])
-
 # Check with -C
 
 AT_CHECK([test -f prog.c], [1])
@@ -492,6 +485,22 @@ AT_CHECK([test -f prog.i])
 AT_CHECK([$COMPILE -save-temps=debug -E -o program.i prog.cob])
 AT_CHECK([test -f program.i])
 
+# Check with -S (last as we skip the testsuite entry for some compilers by returning 77)
+
+AT_CHECK([test -f prog.s], [1])
+AT_CHECK([test -f prog.asm], [1])
+AT_CHECK([$COMPILE -save-temps=debug -S prog.cob])
+AT_CHECK([test -f prog.s], [0], [], [],
+# Previous test "failed" --> prog.s not available --> likely a VS build
+[AT_CHECK([test -f prog.asm], [0], [], [])
+ AT_CHECK([$COMPILE -save-temps=debug -S -o program.asm prog.cob])
+ AT_CHECK([test -f program.asm])
+],
+# Previous test "passed" - .s is the extension to be used
+[AT_CHECK([$COMPILE -save-temps=debug -S -o program.s prog.cob])
+ AT_CHECK([test -f program.s])
+])
+
 AT_CLEANUP