[ASM] FPU directive accepts ON/OFF

tgtakaoka · Jun 24, 2024 · aea855a · aea855a
1 parent ebdecf5
commit aea855a
Show file tree

Hide file tree

Showing 17 changed files with 18,793 additions and 18,757 deletions.
diff --git a/src/asm_i8086.cpp b/src/asm_i8086.cpp
@@ -85,9 +85,9 @@ void AsmI8086::reset() {
 Error AsmI8086::setFpu(StrScanner &scan) {
     auto p = scan;
     p.iexpect('i');
-    if (p.iequals_P(TEXT_FPU_8087)) {
+    if (scan.expectTrue() || p.iequals_P(TEXT_FPU_8087)) {
         setFpuType(FPU_I8087);
-    } else if (scan.iequals_P(TEXT_none)) {
+    } else if (scan.expectFalse() || scan.iequals_P(TEXT_none)) {
         setFpuType(FPU_NONE);
     } else {
         return UNKNOWN_OPERAND;

diff --git a/src/asm_mc68000.cpp b/src/asm_mc68000.cpp
@@ -112,9 +112,9 @@ void AsmMc68000::reset() {
 }
 
 Error AsmMc68000::setFpu(StrScanner &scan) {
-    if (scan.iequals_P(TEXT_FPU_68881) || scan.iequals_P(TEXT_FPU_MC68881)) {
+    if (scan.expectTrue() || scan.iequals_P(TEXT_FPU_68881) || scan.iequals_P(TEXT_FPU_MC68881)) {
         setFpuType(FPU_MC68881);
-    } else if (scan.iequals_P(TEXT_none)) {
+    } else if (scan.expectFalse() || scan.iequals_P(TEXT_none)) {
         setFpuType(FPU_NONE);
     } else {
         return UNKNOWN_OPERAND;

diff --git a/src/option_base.cpp b/src/option_base.cpp
@@ -25,27 +25,17 @@ namespace libasm {
 
 namespace {
 
-bool expectTrue(StrScanner &scan) {
-    return scan.iexpectWord_P(PSTR("enable")) || scan.iexpectWord_P(PSTR("true")) ||
-           scan.iexpectWord_P(PSTR("yes")) || scan.iexpectWord_P(PSTR("on"));
-}
-
-bool expectFalse(StrScanner &scan) {
-    return scan.iexpectWord_P(PSTR("disable")) || scan.iexpectWord_P(PSTR("false")) ||
-           scan.iexpectWord_P(PSTR("no")) || scan.iexpectWord_P(PSTR("off"));
-}
-
 Error parseBool(StrScanner &scan, bool &value) {
     auto p = scan;
     const auto dquote = p.expect('"');
-    if (expectTrue(p)) {
+    if (p.expectTrue()) {
         if (dquote && !p.expect('"'))
             return MISSING_CLOSING_DQUOTE;
         scan = p;
         value = true;
         return OK;
     }
-    if (expectFalse(p)) {
+    if (p.expectFalse()) {
         if (dquote && !p.expect('"'))
             return MISSING_CLOSING_DQUOTE;
         scan = p;

diff --git a/src/str_scanner.cpp b/src/str_scanner.cpp
@@ -52,6 +52,16 @@ bool StrScanner::iexpectWord_P(const /*PROGMEM*/ char *text_P) {
     return false;
 }
 
+bool StrScanner::expectTrue() {
+    return iexpectWord_P(PSTR("enable")) || iexpectWord_P(PSTR("true")) ||
+           iexpectWord_P(PSTR("yes")) || iexpectWord_P(PSTR("on"));
+}
+
+bool StrScanner::expectFalse() {
+    return iexpectWord_P(PSTR("disable")) || iexpectWord_P(PSTR("false")) ||
+           iexpectWord_P(PSTR("no")) || iexpectWord_P(PSTR("off"));
+}
+
 }  // namespace libasm
 
 // Local Variables:

diff --git a/src/str_scanner.h b/src/str_scanner.h
@@ -148,6 +148,16 @@ struct StrScanner {
      */
     bool iexpectWord_P(const /*PROGMEM*/ char *text_P);
 
+    /**
+     * return true if this starts with "true", "on", "enable", or "yes" with ignore case.
+     */
+    bool expectTrue();
+
+    /**
+     * return true if this starts with "false", "off", "disable", or "no" with ignore case.
+     */
+    bool expectFalse();
+
     /** return true if this equals to |text| with ignore case. */
     bool iequals(const StrScanner &text) const;
 

diff --git a/test/autogen/Makefile b/test/autogen/Makefile
@@ -29,7 +29,7 @@ help:
 # target which has ".inc" suffix for output.
 INC_targets  = \
     w65c816 tlcs90 i8080_z80syn i8085_z80syn v30emu_z80syn i8086 i80186 v30 \
-    z8001 z8002 z8k1 z8k2 ns32000 ns32k mn1610 mn1613 tms7000 tms9980
+    mc68000 z8001 z8002 z8k1 z8k2 ns32000 ns32k mn1610 mn1613 tms7000 tms9980
 # target which for GNU assembler
 GAS_targets  = z8k1 z8k2 ns32k
 

diff --git a/test/autogen/gen_i80186.asl b/test/autogen/gen_i80186.asl
diff --git a/test/autogen/gen_i80186.asm b/test/autogen/gen_i80186.asm
@@ -13,7 +13,7 @@
 ; limitations under the License.
 
         cpu     80186
-        fpu     8087
+        fpu     on
         org     0000h
         include "gen_i8086.inc"
         end

diff --git a/test/autogen/gen_i8086.asl b/test/autogen/gen_i8086.asl
diff --git a/test/autogen/gen_i8086.asm b/test/autogen/gen_i8086.asm
@@ -13,7 +13,7 @@
 ; limitations under the License.
 
         cpu     8086
-        fpu     8087
+        fpu     on
         org     0000h
         include "gen_i8086.inc"
         end