Skip to content

Commit

Permalink
Cleanups and version bump.
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronsgiles committed Jan 4, 2009
1 parent ed893fe commit 835ace0
Show file tree
Hide file tree
Showing 67 changed files with 501 additions and 501 deletions.
8 changes: 4 additions & 4 deletions src/emu/clifront.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ int cli_info_listclones(core_options *options, const char *gamename)


/*-------------------------------------------------
cli_info_listbrothers - output the name and
cli_info_listbrothers - output the name and
source filename of one or more games
-------------------------------------------------*/

Expand All @@ -444,15 +444,15 @@ int cli_info_listbrothers(core_options *options, const char *gamename)
UINT8 *didit = malloc_or_die(driver_list_get_count(drivers));
astring *filename = astring_alloc();
int drvindex, count = 0;

memset(didit, 0, driver_list_get_count(drivers));

/* iterate over drivers */
for (drvindex = 0; drivers[drvindex] != NULL; drvindex++)
if (!didit[drvindex] && mame_strwildcmp(gamename, drivers[drvindex]->name) == 0)
{
int matchindex;

didit[drvindex] = TRUE;
if (count > 0)
mame_printf_info("\n");
Expand All @@ -464,7 +464,7 @@ int cli_info_listbrothers(core_options *options, const char *gamename)
{
const char *matchstring = (mame_strwildcmp(gamename, drivers[matchindex]->name) == 0) ? "-> " : " ";
const game_driver *clone_of = driver_get_clone(drivers[matchindex]);

if (clone_of != NULL && (clone_of->flags & GAME_IS_BIOS_ROOT) == 0)
mame_printf_info("%s%-8s [%s]\n", matchstring, drivers[matchindex]->name, clone_of->name);
else
Expand Down
22 changes: 11 additions & 11 deletions src/emu/cpu/esrip/esrip.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
***************************************************************************/

typedef struct
{
{
UINT16 ram[32];
UINT16 acc;
UINT16 d_latch;
Expand All @@ -74,7 +74,7 @@ typedef struct
UINT8 immflag;
UINT8 ct;
UINT8 t;

/* Instruction latches - current and previous values */
UINT8 l1, pl1;
UINT8 l2, pl2;
Expand Down Expand Up @@ -139,7 +139,7 @@ static STATE_POSTLOAD( esrip_postload )

//static void esrip_state_register(int index, const char *type)
//{
// state_save_register_item_pointer(type, index, cpustate->ipt_ram, IPT_RAM_SIZE / 2);
// state_save_register_item_pointer(type, index, cpustate->ipt_ram, IPT_RAM_SIZE / 2);
//}


Expand Down Expand Up @@ -261,9 +261,9 @@ static CPU_INIT( esrip )
cpustate->draw = _config->draw;

cpustate->ipt_ram = auto_malloc(IPT_RAM_SIZE);
//state_save_register_global_pointer(cpustate->ipt_ram, IPT_RAM_SIZE / 2); // TODO
//state_save_register_global_pointer(cpustate->ipt_ram, IPT_RAM_SIZE / 2); // TODO

// esrip_state_register(index, "esrip");
// esrip_state_register(index, "esrip");
cpustate->device = device;
cpustate->program = memory_find_address_space(device, ADDRESS_SPACE_PROGRAM);

Expand Down Expand Up @@ -1667,7 +1667,7 @@ static CPU_EXECUTE( esrip )
am29116_execute(cpustate, (cpustate->l7 << 8) | cpustate->l6, BIT(cpustate->l5, 2));

y_bus = cpustate->result;

if (BIT(cpustate->l5, 0))
cpustate->d_latch = y_bus;
}
Expand Down Expand Up @@ -1741,7 +1741,7 @@ static CPU_EXECUTE( esrip )
cpustate->l6 = (in_h >> 16);
cpustate->l7 = (in_h >> 24);

// if (RISING_EDGE(cpustate->pl7, cpustate->l2, 7))
// if (RISING_EDGE(cpustate->pl7, cpustate->l2, 7))

/* Colour latch */
if (RISING_EDGE(cpustate->pl3, cpustate->l3, 0))
Expand Down Expand Up @@ -1773,7 +1773,7 @@ static CPU_EXECUTE( esrip )
cpustate->y_scale = x_bus & 0xff;

/* Unknown */
// if (RISING_EDGE(cpustate->pl4, cpustate->l4, 7))
// if (RISING_EDGE(cpustate->pl4, cpustate->l4, 7))

/* Image ROM address */
if (RISING_EDGE(cpustate->pl3, cpustate->l3, 5))
Expand Down Expand Up @@ -1821,7 +1821,7 @@ static CPU_EXECUTE( esrip )
static CPU_DISASSEMBLE( esrip )
{
#if 0
static const char* const jmp_types[] =
static const char* const jmp_types[] =
{
"JCT",
"JT1",
Expand All @@ -1833,7 +1833,7 @@ static CPU_DISASSEMBLE( esrip )
"JMP",
};

static const char* const njmp_types[] =
static const char* const njmp_types[] =
{
"JNCT",
"JNT1",
Expand Down Expand Up @@ -1967,7 +1967,7 @@ CPU_GET_INFO( esrip )
case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break;
case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Philip J Bennett"); break;

case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c",
case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c",
cpustate->status & 0x80 ? '3' : '.',
cpustate->status & 0x40 ? '2' : '.',
cpustate->status & 0x20 ? '1' : '.',
Expand Down
2 changes: 1 addition & 1 deletion src/emu/cpu/i860/i860.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ CPU_GET_INFO( i860 )
case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "0.1"); break;
case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break;
case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Jason Eckhardt and Andrew Gardner"); break;

case CPUINFO_INT_PC: info->i = i860->pc; break;
case CPUINFO_INT_PREVIOUSPC: info->i = i860->ppc; break;
}
Expand Down
66 changes: 33 additions & 33 deletions src/emu/cpu/i860/i860dasm.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ CPU_DISASSEMBLE( i860 )

/* Little Endian */
const UINT32 op = (oprom[3] << 24) | (oprom[2] << 16) | (oprom[1] << 8) | (oprom[0] << 0);
//const UINT32 op = (oprom[2] << 24) | (oprom[3] << 16) | (oprom[0] << 8) | (oprom[1] << 0); /* Mixed Endian */
//const UINT32 op = (oprom[0] << 24) | (oprom[1] << 16) | (oprom[2] << 8) | (oprom[3] << 0); /* Big Endian */
//const UINT32 op = (oprom[1] << 24) | (oprom[0] << 16) | (oprom[3] << 8) | (oprom[2] << 0); /* Mixed Endian */
//const UINT32 op = (oprom[2] << 24) | (oprom[3] << 16) | (oprom[0] << 8) | (oprom[1] << 0); /* Mixed Endian */
//const UINT32 op = (oprom[0] << 24) | (oprom[1] << 16) | (oprom[2] << 8) | (oprom[3] << 0); /* Big Endian */
//const UINT32 op = (oprom[1] << 24) | (oprom[0] << 16) | (oprom[3] << 8) | (oprom[2] << 0); /* Mixed Endian */

/* The opcode is the top 6 bits */
UINT8 opcode = (op >> 26) & 0x3f;
Expand All @@ -61,53 +61,53 @@ CPU_DISASSEMBLE( i860 )
/* Main decode */
switch (opcode)
{
case 0x00:
case 0x00:
case 0x01:
case 0x04:
case 0x05: i860_dasm_ldx(op, tempB); break;

case 0x03:
case 0x07: i860_dasm_stx(op, tempB); break;

case 0x02: i860_dasm_ixfr(op, tempB); break;

case 0x06: sprintf(tempB, "(reserved)"); break;

case 0x08:
case 0x09:
case 0x0a:
case 0x0b: i860_dasm_fid_fst(op, tempB); break;

case 0x0d: i860_dasm_flush(op, tempB); break;

case 0x0f: i860_dasm_pstd(op, tempB); break;

case 0x0c:
case 0x0e: i860_dasm_ldc_sdc(op, tempB); break;

case 0x10: i860_dasm_bri(op, tempB); break;

case 0x11: i860_dasm_trap(op, tempB); break;

case 0x12: i860_dasm_floating_point_dasm(op, tempB); break; /* Floating point operation sub-group */

case 0x13: i860_dasm_core_dasm(op, tempB); break; /* Core operation sub-group */

case 0x14:
case 0x15:
case 0x16:
case 0x17: i860_dasm_bte_btne(op, tempB); break;

case 0x18:
case 0x19: i860_dasm_pfidy(op, tempB); break;

case 0x1a:
case 0x1b:
case 0x1c:
case 0x1d:
case 0x1e:
case 0x1f: i860_dasm_CTRL_dasm(op, tempB); break; /* CTRL operation sub-group */

case 0x20:
case 0x21:
case 0x22:
Expand All @@ -116,39 +116,39 @@ CPU_DISASSEMBLE( i860 )
case 0x25:
case 0x26:
case 0x27: i860_dasm_addu_subu(op, tempB); break;

case 0x28:
case 0x29:
case 0x2a:
case 0x2b: i860_dasm_shl_shr(op, tempB); break;

case 0x2c: i860_dasm_shrd(op, tempB); break;

case 0x2d: i860_dasm_bla(op, tempB); break;

case 0x2e:
case 0x2f: i860_dasm_shra(op, tempB); break;

case 0x30:
case 0x31:
case 0x32:
case 0x33: i860_dasm_and_andh(op, tempB); break;

case 0x34:
case 0x35:
case 0x36:
case 0x37: i860_dasm_andnot_andnoth(op, tempB); break;

case 0x38:
case 0x39:
case 0x3a:
case 0x3b: i860_dasm_or_orh(op, tempB); break;

case 0x3c:
case 0x3d:
case 0x3e:
case 0x3f: i860_dasm_xor_xorh(op, tempB); break;

default: sprintf(tempB, "(reserved)"); break;
}

Expand Down Expand Up @@ -228,11 +228,11 @@ static void i860_dasm_stx(const UINT32 op, char* buffer)

static void i860_dasm_ixfr(const UINT32 op, char* buffer)
{
// UINT16 val = op & 0x7ff;
// UINT8 opc = (op >> 26) & 0x3f;
// UINT8 src2 = (op >> 21) & 0x1f;
// UINT8 dest = (op >> 16) & 0x1f;
// UINT8 src1 = (op >> 11) & 0x1f;
// UINT16 val = op & 0x7ff;
// UINT8 opc = (op >> 26) & 0x3f;
// UINT8 src2 = (op >> 21) & 0x1f;
// UINT8 dest = (op >> 16) & 0x1f;
// UINT8 src1 = (op >> 11) & 0x1f;

sprintf(buffer, "ixfr");
}
Expand Down
2 changes: 1 addition & 1 deletion src/emu/cpu/m68000/m68000.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ enum
M68K_SFC, M68K_DFC, M68K_CACR, M68K_CAAR, M68K_PREF_ADDR, M68K_PREF_DATA,
M68K_D0, M68K_D1, M68K_D2, M68K_D3, M68K_D4, M68K_D5, M68K_D6, M68K_D7,
M68K_A0, M68K_A1, M68K_A2, M68K_A3, M68K_A4, M68K_A5, M68K_A6, M68K_A7,

M68K_GENPC = REG_GENPC,
M68K_GENSP = REG_GENSP,
M68K_GENPCBASE = REG_GENPCBASE
Expand Down
4 changes: 2 additions & 2 deletions src/emu/cpu/m68000/m68kcpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ static CPU_IMPORT_STATE( m68k )
case M68K_SR:
m68ki_set_sr(m68k, m68k->iotemp);
break;

case M68K_ISP:
if (m68k->s_flag && !m68k->m_flag)
REG_SP = m68k->iotemp;
Expand Down Expand Up @@ -707,7 +707,7 @@ static CPU_EXPORT_STATE( m68k )
case M68K_SR:
m68k->iotemp = m68ki_get_sr(m68k);
break;

case M68K_ISP:
m68k->iotemp = (m68k->s_flag && !m68k->m_flag) ? REG_SP : REG_ISP;
break;
Expand Down
2 changes: 1 addition & 1 deletion src/emu/cpu/m68000/m68kcpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ struct _m68ki_cpu_core
m68k_memory_interface memory;
offs_t encrypted_start;
offs_t encrypted_end;

cpu_state_table state;
UINT32 iotemp;

Expand Down
Loading

0 comments on commit 835ace0

Please sign in to comment.