--- mon/src/mon_cmd.cpp 1999/10/04 19:31:09 1.1 +++ mon/src/mon_cmd.cpp 2000/10/06 00:04:22 1.8 @@ -1,20 +1,34 @@ /* * mon_cmd.cpp - mon standard commands * - * (C) 1997-1999 Christian Bauer + * mon (C) 1997-1999 Christian Bauer, Marc Hellwig + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include -#include +#include "sysdeps.h" + +#include #include "mon.h" #include "mon_cmd.h" -#include "mon_ppc.h" -#include "mon_68k.h" -#include "mon_x86.h" -#include "mon_6502.h" -#include "mon_8080.h" +#include "mon_disass.h" + +#ifndef VERSION +#define VERSION "2" +#endif /* @@ -104,7 +118,7 @@ static inline uint8 char2print(uint8 c) void version(void) { - fprintf(monout, "mon V%d.%d\n", MON_VERSION, MON_REVISION); + fprintf(monout, "mon V" VERSION "\n"); } @@ -157,14 +171,14 @@ void print_expr(void) } if (val > 0x7fffffff) { - fprintf(monout, "Hex unsigned: $%08lx\n" - "Hex signed : -$%08lx\n" - "Dec unsigned: %lu\n" - "Dec signed : %ld\n", val, -val, val, val); + fprintf(monout, "Hex unsigned: $%08x\n" + "Hex signed : -$%08x\n" + "Dec unsigned: %u\n" + "Dec signed : %d\n", val, -val, val, val); fprintf(monout, "Char : '%c%c%c%c'\n", char2print(val >> 24), char2print(val >> 16), char2print(val >> 8), char2print(val)); } else { - fprintf(monout, "Hex : $%08lx\n" - "Dec : %ld\n", val, val); + fprintf(monout, "Hex : $%08x\n" + "Dec : %d\n", val, val); fprintf(monout, "Char: '%c%c%c%c'\n", char2print(val >> 24), char2print(val >> 16), char2print(val >> 8), char2print(val)); } } @@ -208,10 +222,10 @@ void memory_dump(void) return; while (adr <= end_adr && !mon_aborted()) { - fprintf(monout, "%08lx:", mon_use_real_mem ? adr: adr % mon_mem_size); + fprintf(monout, "%08x:", mon_use_real_mem ? adr: adr % mon_mem_size); for (int i=0; i>=1, i++) + str[i] = (b & m) ? '*' : '.'; + fprintf(monout, " '%s'\n", str); + adr++; + } + + mon_dot_address = adr; +} + + +/* * Disassemble * d [start [end]] * d65 [start [end]] @@ -263,7 +305,8 @@ enum CPUType { CPU_6502, CPU_680x0, CPU_8080, - CPU_80x86 + CPU_80x86_32, + CPU_80x86_16 }; static void disassemble(CPUType type) @@ -277,7 +320,7 @@ static void disassemble(CPUType type) case CPU_PPC: while (adr <= end_adr && !mon_aborted()) { uint32 w = mon_read_word(adr); - fprintf(monout, "%08lx: %08lx\t", mon_use_real_mem ? adr : adr % mon_mem_size, w); + fprintf(monout, "%08x: %08x\t", mon_use_real_mem ? adr : adr % mon_mem_size, w); disass_ppc(monout, mon_use_real_mem ? adr : adr % mon_mem_size, w); adr += 4; } @@ -288,24 +331,15 @@ static void disassemble(CPUType type) uint8 op = mon_read_byte(adr); uint8 lo = mon_read_byte(adr + 1); uint8 hi = mon_read_byte(adr + 2); - fprintf(monout, "%08lx: ", mon_use_real_mem ? adr : adr % mon_mem_size); + fprintf(monout, "%08x: ", mon_use_real_mem ? adr : adr % mon_mem_size); adr += disass_6502(monout, mon_use_real_mem ? adr : adr % mon_mem_size, op, lo, hi); } break; case CPU_680x0: while (adr <= end_adr && !mon_aborted()) { - uint16 buf[8]; - buf[0] = mon_read_half(adr); - buf[1] = mon_read_half(adr + 2); - buf[2] = mon_read_half(adr + 4); - buf[3] = mon_read_half(adr + 6); - buf[4] = mon_read_half(adr + 8); - buf[5] = mon_read_half(adr + 10); - buf[6] = mon_read_half(adr + 12); - buf[7] = mon_read_half(adr + 14); - fprintf(monout, "%08lx: ", mon_use_real_mem ? adr : adr % mon_mem_size); - adr += disass_68k(monout, mon_use_real_mem ? adr : adr % mon_mem_size, buf); + fprintf(monout, "%08x: ", mon_use_real_mem ? adr : adr % mon_mem_size); + adr += disass_68k(monout, mon_use_real_mem ? adr : adr % mon_mem_size); } break; @@ -314,18 +348,22 @@ static void disassemble(CPUType type) uint8 op = mon_read_byte(adr); uint8 lo = mon_read_byte(adr + 1); uint8 hi = mon_read_byte(adr + 2); - fprintf(monout, "%08lx: ", mon_use_real_mem ? adr : adr % mon_mem_size); + fprintf(monout, "%08x: ", mon_use_real_mem ? adr : adr % mon_mem_size); adr += disass_8080(monout, mon_use_real_mem ? adr : adr % mon_mem_size, op, lo, hi); } break; - case CPU_80x86: + case CPU_80x86_32: while (adr <= end_adr && !mon_aborted()) { - uint8 buf[16]; - for (int i=0; i<16; i++) - buf[i] = mon_read_byte(adr + i); - fprintf(monout, "%08lx: ", mon_use_real_mem ? adr : adr % mon_mem_size); - adr += disass_x86(monout, mon_use_real_mem ? adr : adr % mon_mem_size, buf); + fprintf(monout, "%08x: ", mon_use_real_mem ? adr : adr % mon_mem_size); + adr += disass_x86(monout, mon_use_real_mem ? adr : adr % mon_mem_size, false); + } + break; + + case CPU_80x86_16: + while (adr <= end_adr && !mon_aborted()) { + fprintf(monout, "%08x: ", mon_use_real_mem ? adr : adr % mon_mem_size); + adr += disass_x86(monout, mon_use_real_mem ? adr : adr % mon_mem_size, true); } break; } @@ -353,9 +391,14 @@ void disassemble_8080(void) disassemble(CPU_8080); } -void disassemble_80x86(void) +void disassemble_80x86_32(void) +{ + disassemble(CPU_80x86_32); +} + +void disassemble_80x86_16(void) { - disassemble(CPU_80x86); + disassemble(CPU_80x86_16); } @@ -460,7 +503,7 @@ void compare(void) while (adr <= end_adr && !mon_aborted()) { if (mon_read_byte(adr) != mon_read_byte(dest)) { - fprintf(monout, "%08lx ", mon_use_real_mem ? adr : adr % mon_mem_size); + fprintf(monout, "%08x ", mon_use_real_mem ? adr : adr % mon_mem_size); num++; if (!(num & 7)) fputc('\n', monout); @@ -500,7 +543,7 @@ void hunt(void) break; if (i == len) { - fprintf(monout, "%08lx ", mon_use_real_mem ? adr : adr % mon_mem_size); + fprintf(monout, "%08x ", mon_use_real_mem ? adr : adr % mon_mem_size); num++; if (num == 1) mon_dot_address = adr; @@ -552,7 +595,7 @@ void load_data(void) mon_write_byte(adr++, fc); fclose(file); - fprintf(monerr, "%08lx bytes read from %08lx to %08lx\n", adr - start_adr, mon_use_real_mem ? start_adr : start_adr % mon_mem_size, mon_use_real_mem ? adr-1 : (adr-1) % mon_mem_size); + fprintf(monerr, "%08x bytes read from %08x to %08x\n", adr - start_adr, mon_use_real_mem ? start_adr : start_adr % mon_mem_size, mon_use_real_mem ? adr-1 : (adr-1) % mon_mem_size); mon_dot_address = adr; } } @@ -595,6 +638,6 @@ void save_data(void) fputc(mon_read_byte(adr++), file); fclose(file); - fprintf(monerr, "%08lx bytes written from %08lx to %08lx\n", size, mon_use_real_mem ? start_adr : start_adr % mon_mem_size, mon_use_real_mem ? end_adr : end_adr % mon_mem_size); + fprintf(monerr, "%08x bytes written from %08x to %08x\n", size, mon_use_real_mem ? start_adr : start_adr % mon_mem_size, mon_use_real_mem ? end_adr : end_adr % mon_mem_size); } }