Skip to content

Commit

Permalink
Changes for MAME 0.122.
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaronsgiles
aaronsgiles committed Dec 18, 2007
1 parent 8a9ea25 commit 75265e5
Show file tree
Hide file tree
Showing 78 changed files with 1,620 additions and 1,108 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,8 @@ src/emu/sound/k053260.c svneol=native#text/plain
src/emu/sound/k053260.h svneol=native#text/plain
src/emu/sound/k054539.c svneol=native#text/plain
src/emu/sound/k054539.h svneol=native#text/plain
src/emu/sound/m58817.c svneol=native#text/plain
src/emu/sound/m58817.h svneol=native#text/plain
src/emu/sound/msm5205.c svneol=native#text/plain
src/emu/sound/msm5205.h svneol=native#text/plain
src/emu/sound/msm5232.c svneol=native#text/plain
Expand Down
4 changes: 2 additions & 2 deletions src/emu/cpu/m68000/m68k.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* ======================================================================== */
/*
* MUSASHI
* Version 3.31
* Version 3.32
*
* A portable Motorola M680x0 processor emulation engine.
* Copyright 1998-2007 Karl Stenerud. All rights reserved.
Expand All @@ -15,7 +15,7 @@
* copyright notice remains unaltered in the source code and any binary files
* containing this code in compiled form.
*
* All other lisencing terms must be negotiated with the author
* All other licensing terms must be negotiated with the author
* (Karl Stenerud).
*
* The latest version of this code can be obtained at:
Expand Down
8 changes: 4 additions & 4 deletions src/emu/cpu/m68000/m68k_in.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ must fix:
/* ======================================================================== */
/*
* MUSASHI
* Version 3.31
* Version 3.32
*
* A portable Motorola M680x0 processor emulation engine.
* Copyright 1998-2007 Karl Stenerud. All rights reserved.
Expand All @@ -17,7 +17,7 @@ must fix:
* copyright notice remains unaltered in the source code and any binary files
* containing this code in compiled form.
*
* All other lisencing terms must be negotiated with the author
* All other licensing terms must be negotiated with the author
* (Karl Stenerud).
*
* The latest version of this code can be obtained at:
Expand Down Expand Up @@ -141,7 +141,7 @@ typedef struct


/* Opcode handler table */
static opcode_handler_struct m68k_opcode_handler_table[] =
static const opcode_handler_struct m68k_opcode_handler_table[] =
{
/* function mask match 000 010 020 040 */

Expand All @@ -157,7 +157,7 @@ M68KMAKE_TABLE_FOOTER
/* Build the opcode handler jump table */
void m68ki_build_opcode_table(void)
{
opcode_handler_struct *ostruct;
const opcode_handler_struct *ostruct;
int instr;
int i;
int j;
Expand Down
4 changes: 2 additions & 2 deletions src/emu/cpu/m68000/m68kconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* ======================================================================== */
/*
* MUSASHI
* Version 3.31
* Version 3.32
*
* A portable Motorola M680x0 processor emulation engine.
* Copyright 1998-2007 Karl Stenerud. All rights reserved.
Expand All @@ -12,7 +12,7 @@
* copyright notice remains unaltered in the source code and any binary files
* containing this code in compiled form.
*
* All other lisencing terms must be negotiated with the author
* All other licensing terms must be negotiated with the author
* (Karl Stenerud).
*
* The latest version of this code can be obtained at:
Expand Down
18 changes: 9 additions & 9 deletions src/emu/cpu/m68000/m68kcpu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
/* ======================================================================== */

#if 0
static const char* copyright_notice =
static const char copyright_notice[] =
"MUSASHI\n"
"Version 3.31 (2007-07-09)\n"
"Version 3.32 (2007-12-15)\n"
"A portable Motorola M680x0 processor emulation engine.\n"
"Copyright 1998-2007 Karl Stenerud. All rights reserved.\n"
"\n"
"This code may be freely used for non-commercial purpooses as long as this\n"
"copyright notice remains unaltered in the source code and any binary files\n"
"containing this code in compiled form.\n"
"\n"
"All other lisencing terms must be negotiated with the author\n"
"All other licensing terms must be negotiated with the author\n"
"(Karl Stenerud).\n"
"\n"
"The latest version of this code can be obtained at:\n"
Expand Down Expand Up @@ -49,7 +49,7 @@ uint m68ki_tracing = 0;
uint m68ki_address_space;

#ifdef M68K_LOG_ENABLE
const char* m68ki_cpu_names[] =
const char *const m68ki_cpu_names[] =
{
"Invalid CPU",
"M68000",
Expand Down Expand Up @@ -83,7 +83,7 @@ uint m68ki_aerr_write_mode;
uint m68ki_aerr_fc;

/* Used by shift & rotate instructions */
uint8 m68ki_shift_8_table[65] =
const uint8 m68ki_shift_8_table[65] =
{
0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
Expand All @@ -92,7 +92,7 @@ uint8 m68ki_shift_8_table[65] =
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff
};
uint16 m68ki_shift_16_table[65] =
const uint16 m68ki_shift_16_table[65] =
{
0x0000, 0x8000, 0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00, 0xff00,
0xff80, 0xffc0, 0xffe0, 0xfff0, 0xfff8, 0xfffc, 0xfffe, 0xffff, 0xffff,
Expand All @@ -103,7 +103,7 @@ uint16 m68ki_shift_16_table[65] =
0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
0xffff, 0xffff
};
uint m68ki_shift_32_table[65] =
const uint m68ki_shift_32_table[65] =
{
0x00000000, 0x80000000, 0xc0000000, 0xe0000000, 0xf0000000, 0xf8000000,
0xfc000000, 0xfe000000, 0xff000000, 0xff800000, 0xffc00000, 0xffe00000,
Expand All @@ -122,7 +122,7 @@ uint m68ki_shift_32_table[65] =
/* Number of clock cycles to use for exception processing.
* I used 4 for any vectors that are undocumented for processing times.
*/
uint8 m68ki_exception_cycle_table[4][256] =
const uint8 m68ki_exception_cycle_table[4][256] =
{
{ /* 000 */
4, /* 0: Reset - Initial Stack Pointer */
Expand Down Expand Up @@ -418,7 +418,7 @@ uint8 m68ki_exception_cycle_table[4][256] =
}
};

uint8 m68ki_ea_idx_cycle_table[64] =
const uint8 m68ki_ea_idx_cycle_table[64] =
{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, /* ..01.000 no memory indirect, base NULL */
Expand Down
20 changes: 10 additions & 10 deletions src/emu/cpu/m68000/m68kcpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/* ======================================================================== */
/*
* MUSASHI
* Version 3.31
* Version 3.32
*
* A portable Motorola M680x0 processor emulation engine.
* Copyright 1998-2007 Karl Stenerud. All rights reserved.
Expand All @@ -13,7 +13,7 @@
* copyright notice remains unaltered in the source code and any binary files
* containing this code in compiled form.
*
* All other lisencing terms must be negotiated with the author
* All other licensing terms must be negotiated with the author
* (Karl Stenerud).
*
* The latest version of this code can be obtained at:
Expand Down Expand Up @@ -591,7 +591,7 @@
#if M68K_LOG_ENABLE
#include <stdio.h>
extern FILE* M68K_LOG_FILEHANDLE
extern char* m68ki_cpu_names[];
extern const char *const m68ki_cpu_names[];

#define M68K_DO_LOG(A) if(M68K_LOG_FILEHANDLE) fprintf A
#if M68K_LOG_1010_1111
Expand Down Expand Up @@ -893,8 +893,8 @@ typedef struct
uint cyc_movem_l;
uint cyc_shift;
uint cyc_reset;
uint8* cyc_instruction;
uint8* cyc_exception;
const uint8* cyc_instruction;
const uint8* cyc_exception;

/* Callbacks to host */
int (*int_ack_callback)(int int_line); /* Interrupt Acknowledge */
Expand All @@ -913,12 +913,12 @@ typedef struct
extern m68ki_cpu_core m68ki_cpu;
extern sint m68ki_remaining_cycles;
extern uint m68ki_tracing;
extern uint8 m68ki_shift_8_table[];
extern uint16 m68ki_shift_16_table[];
extern uint m68ki_shift_32_table[];
extern uint8 m68ki_exception_cycle_table[][256];
extern const uint8 m68ki_shift_8_table[];
extern const uint16 m68ki_shift_16_table[];
extern const uint m68ki_shift_32_table[];
extern const uint8 m68ki_exception_cycle_table[][256];
extern uint m68ki_address_space;
extern uint8 m68ki_ea_idx_cycle_table[];
extern const uint8 m68ki_ea_idx_cycle_table[];

extern uint m68ki_aerr_address;
extern uint m68ki_aerr_write_mode;
Expand Down
12 changes: 6 additions & 6 deletions src/emu/cpu/m68000/m68kdasm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* ======================================================================== */
/*
* MUSASHI
* Version 3.31
* Version 3.32
*
* A portable Motorola M680x0 processor emulation engine.
* Copyright 1998-2007 Karl Stenerud. All rights reserved.
Expand All @@ -12,7 +12,7 @@
* copyright notice remains unaltered in the source code and any binary files
* containing this code in compiled form.
*
* All other lisencing terms must be negotiated with the author
* All other licensing terms must be negotiated with the author
* (Karl Stenerud).
*
* The latest version of this code can be obtained at:
Expand Down Expand Up @@ -208,18 +208,18 @@ static const unsigned char* g_rawop;
static uint g_rawbasepc;

/* used by ops like asr, ror, addq, etc */
static uint g_3bit_qdata_table[8] = {8, 1, 2, 3, 4, 5, 6, 7};
static const uint g_3bit_qdata_table[8] = {8, 1, 2, 3, 4, 5, 6, 7};

static uint g_5bit_data_table[32] =
static const uint g_5bit_data_table[32] =
{
32, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
};

static const char* g_cc[16] =
static const char *const g_cc[16] =
{"t", "f", "hi", "ls", "cc", "cs", "ne", "eq", "vc", "vs", "pl", "mi", "ge", "lt", "gt", "le"};

static const char* g_cpcc[64] =
static const char *const g_cpcc[64] =
{/* 000 001 010 011 100 101 110 111 */
"f", "eq", "ogt", "oge", "olt", "ole", "ogl", "or", /* 000 */
"un", "ueq", "ugt", "uge", "ult", "ule", "ne", "t", /* 001 */
Expand Down
Loading

0 comments on commit 75265e5

Please sign in to comment.