Change behavior of -O0 and -O1 for backward compatibility

-O0: JMP default to NEAR, Jcc/LOOP/JCXZ default to SHORT.
      In other words, this is reverting to full-blown 0.98 behavior, not
      0.98.39.
-O1: JMP and Jcc default to NEAR, LOOP/JCXZ default to SHORT (only
      possible form).

diff --git a/assemble.c b/assemble.c
index 16c8861..9d23240 100644 (file)
--- a/assemble.c
+++ b/assemble.c
@@ -247,9 +247,13 @@ static int jmp_match(int32_t segment, int64_t offset, int bits,
     int64_t isize;
     uint8_t c = code[0];
 
-    if (c != 0370 && c != 0371)
+    if ((c != 0370 && c != 0371) || (ins->oprs[0].type & STRICT))
         return 0;
-    if ((optimizing <= 0 || (ins->oprs[0].type & STRICT)))
+    if (optimizing == 0)
+         {
+            return 0;
+         }
+    if (optimizing < 0 && c == 0371 )
          {
             return 0;
          }