--- mon/src/disass/m68k-dis.c	2003/04/13 09:54:26	1.4
+++ mon/src/disass/m68k-dis.c	2004/06/14 14:23:59	1.5
@@ -674,13 +674,7 @@ print_insn_arg (d, buffer, p0, addr, inf
       else
 	return -2;
 
-#if 1
-      /* FIXME: We are bound to have 32-bit addresses even if cxmon is
-         requested to run in real mode, because m68k is 32-bit.  */
-      (*info->fprintf_func) (info->stream, "$%08x", (uint32)(addr + disp));
-#else
       (*info->print_address_func) (addr + disp, info);
-#endif
       break;
 
     case 'd':
@@ -780,7 +774,9 @@ print_insn_arg (d, buffer, p0, addr, inf
 
 	    case 2:
 	      val = NEXTWORD (p);
-	      (*info->fprintf_func) (info->stream, "($%08x,pc)", addr + val);
+	      (*info->fprintf_func) (info->stream, "(");
+	      (*info->print_address_func) (addr + val, info);
+	      (*info->fprintf_func) (info->stream, ",pc)");
 	      break;
 
 	    case 3:
@@ -1216,9 +1212,9 @@ print_indexed (basereg, p, addr, info)
       buf[0] = '\0';
     }
   if (outer_disp)
-    (*info->fprintf_func) (info->stream, "],$%08x", outer_disp);
+    (*info->fprintf_func) (info->stream, "],$%08x", (uint32)outer_disp);
   else
-    (*info->fprintf_func) (info->stream, "]", outer_disp);
+    (*info->fprintf_func) (info->stream, "]");
   if (buf[0] != '\0')
     (*info->fprintf_func) (info->stream, ",%s", buf);
   (*info->fprintf_func) (info->stream, ")");