Added note as to which version of Musashi we're using...

diff --git a/src/m68k.h b/src/m68k.h
index b94eeae21d3b40195ad55d1675c63f338e6e8b7e..53b3b5d8a64c3486c0e6ac2382dd0f8718ffce61 100644 (file)
--- a/src/m68k.h
+++ b/src/m68k.h
@@ -10,7 +10,7 @@ extern "C" {
 /* ======================================================================== */
 /*
  *                                  MUSASHI
 /* ======================================================================== */
 /*
  *                                  MUSASHI

- *                                Version 3.3
+ *                                Version 3.3.1

  *
  * A portable Motorola M680x0 processor emulation engine.
  * Copyright 1998-2001 Karl Stenerud.  All rights reserved.
  *
  * A portable Motorola M680x0 processor emulation engine.
  * Copyright 1998-2001 Karl Stenerud.  All rights reserved.


@@ -26,7 +26,8 @@ extern "C" {
  * http://kstenerud.cjb.net
  */
 
  * http://kstenerud.cjb.net
  */
 

-
+// NOTE: The 3.3.1 release is marked as 3.3 in this file. Changed by JLH
+//       in order to clarify which version we're using...

 
 /* ======================================================================== */
 /* ============================ GENERAL DEFINES =========================== */
 
 /* ======================================================================== */
 /* ============================ GENERAL DEFINES =========================== */


@@ -162,10 +163,7 @@ unsigned int  m68k_read_pcrelative_32(unsigned int address);
 /* Memory access for the disassembler */
 unsigned int m68k_read_disassembler_8  (unsigned int address);
 unsigned int m68k_read_disassembler_16 (unsigned int address);
 /* Memory access for the disassembler */
 unsigned int m68k_read_disassembler_8  (unsigned int address);
 unsigned int m68k_read_disassembler_16 (unsigned int address);

-unsigned int m68k_read_disassembler_32 (unsigned int address);//*/
-/*#define m68k_read_disassembler_8     m68k_read_memory_8
-#define m68k_read_disassembler_16      m68k_read_memory_16
-#define m68k_read_disassembler_32      m68k_read_memory_32//*/
+unsigned int m68k_read_disassembler_32 (unsigned int address);

 
 /* Write to anywhere */
 void m68k_write_memory_8(unsigned int address, unsigned int value);
 
 /* Write to anywhere */
 void m68k_write_memory_8(unsigned int address, unsigned int value);


@@ -329,6 +327,7 @@ unsigned int m68k_is_valid_instruction(unsigned int instruction, unsigned int cp
  */
 unsigned int m68k_disassemble(char* str_buff, unsigned int pc, unsigned int cpu_type);
 
  */
 unsigned int m68k_disassemble(char* str_buff, unsigned int pc, unsigned int cpu_type);
 

+

 /* ======================================================================== */
 /* ============================= CONFIGURATION ============================ */
 /* ======================================================================== */
 /* ======================================================================== */
 /* ============================= CONFIGURATION ============================ */
 /* ======================================================================== */