diff options
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/cheat.c | 4 | ||||
| -rw-r--r-- | src/emu/cpu/drcbex64.c | 4 | ||||
| -rw-r--r-- | src/emu/cpu/drcbex86.c | 4 | ||||
| -rw-r--r-- | src/emu/cpu/mips/mips3com.c | 4 | ||||
| -rw-r--r-- | src/emu/cpu/powerpc/ppccom.c | 2 | ||||
| -rw-r--r-- | src/emu/cpu/sharc/sharc.c | 8 | ||||
| -rw-r--r-- | src/emu/cpu/tms34010/tms34010.c | 2 | ||||
| -rw-r--r-- | src/emu/debug/debugcpu.c | 60 | ||||
| -rw-r--r-- | src/emu/debugger.h | 14 | ||||
| -rw-r--r-- | src/emu/machine/8257dma.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/smc91c9x.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/z80dma.c | 2 | ||||
| -rw-r--r-- | src/emu/mame.c | 2 | ||||
| -rw-r--r-- | src/emu/rendersw.c | 22 | ||||
| -rw-r--r-- | src/emu/sound/multipcm.c | 26 | ||||
| -rw-r--r-- | src/emu/sound/nile.c | 20 | ||||
| -rw-r--r-- | src/emu/sound/rf5c400.c | 42 | ||||
| -rw-r--r-- | src/emu/video.c | 4 | ||||
| -rw-r--r-- | src/emu/video/voodoo.c | 14 |
19 files changed, 119 insertions, 119 deletions
diff --git a/src/emu/cheat.c b/src/emu/cheat.c index ca7aeb5e73f..b7fd93da06c 100644 --- a/src/emu/cheat.c +++ b/src/emu/cheat.c @@ -925,7 +925,7 @@ static const int SEARCH_BYTE_STEP[] = 1 /* 1-bit */ }; -static const UINT32 BYTE_LOOP_TABLE[] = +static const UINT32 BYTE_LOOP_TABLE[] = { 1, /* 8-bit (1 byte) */ 3, /* 16-bit (2 bytes) */ @@ -2006,7 +2006,7 @@ void cheat_init(running_machine *machine) edit_cursor = 0; cheat_options = DEFAULT_CHEAT_OPTIONS; driverSpecifiedFlag = 0; - + horizontal_key_repeat_speed = 10; vertical_key_repeat_speed = 10; diff --git a/src/emu/cpu/drcbex64.c b/src/emu/cpu/drcbex64.c index ddaccadc70f..f9d15410c8a 100644 --- a/src/emu/cpu/drcbex64.c +++ b/src/emu/cpu/drcbex64.c @@ -3097,14 +3097,14 @@ static x86code *op_debug(drcbe_state *drcbe, x86code *dst, const drcuml_instruct /* test and branch */ emit_mov_r64_imm(&dst, REG_PARAM1, (FPTR)Machine); // mov param1,pcp - emit_test_m32_imm(&dst, MBD(REG_PARAM1, offsetof(running_machine, debug_flags)), DEBUG_FLAG_CALL_HOOK); + emit_test_m32_imm(&dst, MBD(REG_PARAM1, offsetof(running_machine, debug_flags)), DEBUG_FLAG_CALL_HOOK); // test [Machine->debug_flags],DEBUG_FLAG_CALL_HOOK emit_jcc_short_link(&dst, COND_Z, &skip); // jz skip /* push the parameter */ emit_mov_r32_p32(drcbe, &dst, REG_PARAM2, &pcp); // mov param1,pcp emit_smart_call_m64(drcbe, &dst, &drcbe->debug_cpu_instruction_hook); // call debug_cpu_instruction_hook - + resolve_link(&dst, &skip); // skip: } diff --git a/src/emu/cpu/drcbex86.c b/src/emu/cpu/drcbex86.c index 9d22d02d638..1fd865c3ed3 100644 --- a/src/emu/cpu/drcbex86.c +++ b/src/emu/cpu/drcbex86.c @@ -3217,7 +3217,7 @@ static x86code *op_debug(drcbe_state *drcbe, x86code *dst, const drcuml_instruct if ((Machine->debug_flags & DEBUG_FLAG_ENABLED) != 0) { drcuml_parameter pcp; - + /* normalize parameters */ param_normalize_1(drcbe, inst, &pcp, PTYPE_MRI); @@ -3229,7 +3229,7 @@ static x86code *op_debug(drcbe_state *drcbe, x86code *dst, const drcuml_instruct emit_mov_m32_p32(drcbe, &dst, MBD(REG_ESP, 4), &pcp); // mov [esp+4],pcp emit_mov_m32_imm(&dst, MBD(REG_ESP, 0), (FPTR)Machine); // mov [esp],Machine emit_call(&dst, (x86code *)debug_cpu_instruction_hook); // call debug_cpu_instruction_hook - + resolve_link(&dst, &skip); // skip: } diff --git a/src/emu/cpu/mips/mips3com.c b/src/emu/cpu/mips/mips3com.c index df9f5ba85b4..742cd915dd8 100644 --- a/src/emu/cpu/mips/mips3com.c +++ b/src/emu/cpu/mips/mips3com.c @@ -72,7 +72,7 @@ INLINE int tlb_entry_is_global(const mips3_tlb_entry *entry) void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, int index, int clock, const mips3_config *config, int (*irqcallback)(int)) { int tlbindex; - + /* initialize based on the config */ memset(mips, 0, sizeof(*mips)); mips->flavor = flavor; @@ -94,7 +94,7 @@ void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, int in /* reset the state */ mips3com_reset(mips); - + /* register for save states */ state_save_register_item("mips3", index, mips->pc); state_save_register_item_array("mips3", index, mips->r); diff --git a/src/emu/cpu/powerpc/ppccom.c b/src/emu/cpu/powerpc/ppccom.c index 10fdb9391b5..168317d9f4c 100644 --- a/src/emu/cpu/powerpc/ppccom.c +++ b/src/emu/cpu/powerpc/ppccom.c @@ -214,7 +214,7 @@ void ppccom_init(powerpc_state *ppc, powerpc_flavor flavor, UINT8 cap, int tb_di /* reset the state */ ppccom_reset(ppc); - + /* register for save states */ state_save_register_item("ppc", index, ppc->pc); state_save_register_item_array("ppc", index, ppc->r); diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c index ad1e801b511..b0c4daab21b 100644 --- a/src/emu/cpu/sharc/sharc.c +++ b/src/emu/cpu/sharc/sharc.c @@ -421,7 +421,7 @@ static void sharc_init(int index, int clock, const void *config, int (*irqcallba { const sharc_config *cfg = config; int saveindex; - + sharc.boot_mode = cfg->boot_mode; sharc.irq_callback = irqcallback; @@ -431,7 +431,7 @@ static void sharc_init(int index, int clock, const void *config, int (*irqcallba sharc.internal_ram = auto_malloc(2 * 0x10000 * sizeof(UINT16)); // 2x 128KB sharc.internal_ram_block0 = &sharc.internal_ram[0]; sharc.internal_ram_block1 = &sharc.internal_ram[0x20000/2]; - + state_save_register_item("sharc", index, sharc.pc); state_save_register_item_pointer("sharc", index, (&sharc.r[0].r), ARRAY_LENGTH(sharc.r)); state_save_register_item_pointer("sharc", index, (&sharc.reg_alt[0].r), ARRAY_LENGTH(sharc.reg_alt)); @@ -467,7 +467,7 @@ static void sharc_init(int index, int clock, const void *config, int (*irqcallba state_save_register_item_array("sharc", index, sharc.dag2_alt.m); state_save_register_item_array("sharc", index, sharc.dag2_alt.b); state_save_register_item_array("sharc", index, sharc.dag2_alt.l); - + for (saveindex = 0; saveindex < ARRAY_LENGTH(sharc.dma); saveindex++) { state_save_register_item("sharc", index * ARRAY_LENGTH(sharc.dma) + saveindex, sharc.dma[saveindex].control); @@ -506,7 +506,7 @@ static void sharc_init(int index, int clock, const void *config, int (*irqcallba state_save_register_item("sharc", index, sharc.px); state_save_register_item_pointer("sharc", index, sharc.internal_ram, 2 * 0x10000); - + state_save_register_item("sharc", index, sharc.opcode); state_save_register_item("sharc", index, sharc.fetch_opcode); state_save_register_item("sharc", index, sharc.decode_opcode); diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c index a37dfb3f08a..97106653891 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -855,7 +855,7 @@ static int tms34010_execute(int cycles) { if ((state.screen->machine->debug_flags & DEBUG_FLAG_CALL_HOOK) != 0) { - state.st = GET_ST(); + state.st = GET_ST(); debugger_instruction_hook(Machine, PC); } state.op = ROPCODE(); diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index 919c5138ad5..e371e9580c6 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -9,9 +9,9 @@ ********************************************************************** - Future work: - - - enable history to be enabled/disabled to improve performance + Future work: + + - enable history to be enabled/disabled to improve performance *********************************************************************/ @@ -60,7 +60,7 @@ struct _debugger_private int execution_state; int memory_hook_cpunum; - + UINT32 bpindex; UINT32 wpindex; @@ -119,7 +119,7 @@ static void set_cpu_reg(UINT32 ref, UINT64 value); ***************************************************************************/ /*------------------------------------------------- - debug_cpu_within_instruction_hook - true if + debug_cpu_within_instruction_hook - true if the debugger is currently live -------------------------------------------------*/ @@ -293,7 +293,7 @@ static void debug_cpu_exit(running_machine *machine) for (cpunum = 0; cpunum < MAX_CPU; cpunum++) { debug_cpu_info *info = &global.cpuinfo[cpunum]; - + /* close any tracefiles */ if (info->trace.file) fclose(info->trace.file); @@ -345,14 +345,14 @@ static void compute_debug_flags(running_machine *machine, const debug_cpu_info * /* many of our states require us to be called on each instruction */ if (global.execution_state == EXECUTION_STATE_STOPPED) machine->debug_flags |= DEBUG_FLAG_CALL_HOOK; - if ((info->flags & (DEBUG_FLAG_HISTORY | DEBUG_FLAG_TRACING_ANY | DEBUG_FLAG_HOOKED | + if ((info->flags & (DEBUG_FLAG_HISTORY | DEBUG_FLAG_TRACING_ANY | DEBUG_FLAG_HOOKED | DEBUG_FLAG_STEPPING_ANY | DEBUG_FLAG_STOP_PC | DEBUG_FLAG_LIVE_BP)) != 0) machine->debug_flags |= DEBUG_FLAG_CALL_HOOK; - + /* if we are stopping at a particular time and that time is within the current timeslice, we need to be called */ if ((info->flags & DEBUG_FLAG_STOP_TIME) && attotime_compare(info->endexectime, info->stoptime) <= 0) machine->debug_flags |= DEBUG_FLAG_CALL_HOOK; - + /* add in the watchpoint flags */ machine->debug_flags |= (info->flags & DEBUG_FLAG_WATCHPOINT) >> (24 - 4); } @@ -366,7 +366,7 @@ static void compute_debug_flags(running_machine *machine, const debug_cpu_info * static void reset_transient_flags(running_machine *machine) { int cpunum; - + /* loop over CPUs and reset the transient flags */ for (cpunum = 0; cpunum < ARRAY_LENGTH(global.cpuinfo); cpunum++) global.cpuinfo[cpunum].flags &= ~DEBUG_FLAG_TRANSIENT; @@ -374,8 +374,8 @@ static void reset_transient_flags(running_machine *machine) /*------------------------------------------------- - debug_cpu_start_hook - the CPU execution - system calls this hook before beginning + debug_cpu_start_hook - the CPU execution + system calls this hook before beginning execution for the given CPU -------------------------------------------------*/ @@ -391,7 +391,7 @@ void debug_cpu_start_hook(running_machine *machine, int cpunum, attotime endtime /* update the target execution end time */ info->endexectime = endtime; - + /* if a VBLANK occurred, check on things */ if (global.vblank_occurred && global.execution_state != EXECUTION_STATE_STOPPED) { @@ -403,7 +403,7 @@ void debug_cpu_start_hook(running_machine *machine, int cpunum, attotime endtime global.execution_state = EXECUTION_STATE_STOPPED; debug_console_printf("Stopped at VBLANK\n"); } - + /* check for debug keypresses */ else if (input_ui_pressed(machine, IPT_UI_DEBUG_BREAK)) { @@ -425,15 +425,15 @@ void debug_cpu_start_hook(running_machine *machine, int cpunum, attotime endtime /*------------------------------------------------- - debug_cpu_stop_hook - the CPU execution - system calls this hook when ending execution + debug_cpu_stop_hook - the CPU execution + system calls this hook when ending execution for the given CPU -------------------------------------------------*/ void debug_cpu_stop_hook(running_machine *machine, int cpunum) { debug_cpu_info *info = &global.cpuinfo[cpunum]; - + assert(global.livecpu == info); /* if we're stopping on a context switch, handle it now */ @@ -449,14 +449,14 @@ void debug_cpu_stop_hook(running_machine *machine, int cpunum) /*------------------------------------------------- - debug_cpu_interrupt_hook - called when an + debug_cpu_interrupt_hook - called when an interrupt is acknowledged -------------------------------------------------*/ void debug_cpu_interrupt_hook(running_machine *machine, int cpunum, int irqline) { debug_cpu_info *info = &global.cpuinfo[cpunum]; - + /* see if this matches a pending interrupt request */ if ((info->flags & DEBUG_FLAG_STOP_INTERRUPT) != 0 && (info->stopirq == -1 || info->stopirq == irqline)) { @@ -468,14 +468,14 @@ void debug_cpu_interrupt_hook(running_machine *machine, int cpunum, int irqline) /*------------------------------------------------- - debug_cpu_exception_hook - called when an + debug_cpu_exception_hook - called when an exception is generated -------------------------------------------------*/ void debug_cpu_exception_hook(running_machine *machine, int cpunum, int exception) { debug_cpu_info *info = &global.cpuinfo[cpunum]; - + /* see if this matches a pending interrupt request */ if ((info->flags & DEBUG_FLAG_STOP_EXCEPTION) != 0 && (info->stopexception == -1 || info->stopexception == exception)) { @@ -487,7 +487,7 @@ void debug_cpu_exception_hook(running_machine *machine, int cpunum, int exceptio /*------------------------------------------------- - debug_cpu_instruction_hook - called by the + debug_cpu_instruction_hook - called by the CPU cores before executing each instruction -------------------------------------------------*/ @@ -522,7 +522,7 @@ void debug_cpu_instruction_hook(running_machine *machine, offs_t curpc) /* if we hit 0, stop */ if (info->stepsleft == 0) global.execution_state = EXECUTION_STATE_STOPPED; - + /* update every 100 steps until we are within 200 of the end */ else if ((info->flags & DEBUG_FLAG_STEPPING_OUT) == 0 && (info->stepsleft < 200 || info->stepsleft % 100 == 0)) { @@ -791,7 +791,7 @@ void debug_cpu_ignore_cpu(int cpunum, int ignore) info->flags &= ~DEBUG_FLAG_OBSERVING; else info->flags |= DEBUG_FLAG_OBSERVING; - + if (info == global.livecpu && ignore) debug_cpu_next_cpu(); } @@ -1108,7 +1108,7 @@ void debug_cpu_get_memory_hooks(int cpunum, debug_hook_read_func *read, debug_ho void debug_cpu_set_instruction_hook(int cpunum, int (*hook)(offs_t pc)) { debug_cpu_info *info = &global.cpuinfo[cpunum]; - + /* set the hook and also the CPU's flag for fast knowledge of the hook */ info->instrhook = hook; if (hook != NULL) @@ -1144,7 +1144,7 @@ static void breakpoint_update_flags(debug_cpu_info *info) /*------------------------------------------------- - breakpoint_check - check the breakpoints for + breakpoint_check - check the breakpoints for a given CPU -------------------------------------------------*/ @@ -1202,7 +1202,7 @@ int debug_cpu_breakpoint_set(int cpunum, offs_t address, parsed_expression *cond /* hook us in */ bp->next = info->bplist; info->bplist = bp; - + /* ensure the live breakpoint flag is set */ breakpoint_update_flags(info); return bp->index; @@ -1237,7 +1237,7 @@ int debug_cpu_breakpoint_clear(int bpnum) if (bp->action != NULL) free(bp->action); free(bp); - + /* update the flags */ breakpoint_update_flags(info); return 1; @@ -1453,7 +1453,7 @@ int debug_cpu_watchpoint_clear(int wpnum) for (cpunum = 0; cpunum < MAX_CPU; cpunum++) { debug_cpu_info *info = &global.cpuinfo[cpunum]; - + for (spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++) for (pwp = NULL, wp = info->space[spacenum].wplist; wp != NULL; pwp = wp, wp = wp->next) if (wp->index == wpnum) @@ -1500,7 +1500,7 @@ int debug_cpu_watchpoint_enable(int wpnum, int enable) for (cpunum = 0; cpunum < MAX_CPU; cpunum++) { debug_cpu_info *info = &global.cpuinfo[cpunum]; - + for (spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++) for (wp = info->space[spacenum].wplist; wp; wp = wp->next) if (wp->index == wpnum) diff --git a/src/emu/debugger.h b/src/emu/debugger.h index fed1da3b997..b161e6bd4f6 100644 --- a/src/emu/debugger.h +++ b/src/emu/debugger.h @@ -38,7 +38,7 @@ void debugger_refresh_display(running_machine *machine); ***************************************************************************/ /*------------------------------------------------- - debugger_instruction_hook - CPU cores call + debugger_instruction_hook - CPU cores call this once per instruction from CPU cores -------------------------------------------------*/ @@ -50,8 +50,8 @@ INLINE void debugger_instruction_hook(running_machine *machine, offs_t curpc) /*------------------------------------------------- - debugger_start_cpu_hook - the CPU execution - system calls this hook before beginning + debugger_start_cpu_hook - the CPU execution + system calls this hook before beginning execution for the given CPU -------------------------------------------------*/ @@ -63,8 +63,8 @@ INLINE void debugger_start_cpu_hook(running_machine *machine, int cpunum, attoti /*------------------------------------------------- - debugger_stop_cpu_hook - the CPU execution - system calls this hook when ending execution + debugger_stop_cpu_hook - the CPU execution + system calls this hook when ending execution for the given CPU -------------------------------------------------*/ @@ -88,8 +88,8 @@ INLINE void debugger_break(running_machine *machine) /*------------------------------------------------- - debugger_within_instruction_hook - call this - to determine if the debugger is currently + debugger_within_instruction_hook - call this + to determine if the debugger is currently halted within the instruction hook -------------------------------------------------*/ diff --git a/src/emu/machine/8257dma.c b/src/emu/machine/8257dma.c index f8a322cad1c..6a15c364b89 100644 --- a/src/emu/machine/8257dma.c +++ b/src/emu/machine/8257dma.c @@ -325,7 +325,7 @@ WRITE8_DEVICE_HANDLER( dma8257_drq_w ) { dma8257_t *dma8257 = get_safe_token(device); int param = (offset << 1) | (data ? 1 : 0); - + timer_call_after_resynch(dma8257, param, dma8257_drq_write_callback); } diff --git a/src/emu/machine/smc91c9x.c b/src/emu/machine/smc91c9x.c index 6926269b0d1..0c5212aa98f 100644 --- a/src/emu/machine/smc91c9x.c +++ b/src/emu/machine/smc91c9x.c @@ -549,7 +549,7 @@ static DEVICE_START( smc91c9x ) static DEVICE_RESET( smc91c9x ) { smc91c9x_state *smc = get_safe_token(device); - + memset(smc->reg, 0, sizeof(smc->reg)); memset(smc->regmask, 0, sizeof(smc->regmask)); smc->irq_state = 0; diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c index 8d80380735c..414b05f39e3 100644 --- a/src/emu/machine/z80dma.c +++ b/src/emu/machine/z80dma.c @@ -402,7 +402,7 @@ WRITE8_DEVICE_HANDLER( z80dma_rdy_w) int param; assert( offset == 0); - + param = (data ? 1 : 0); LOG(("RDY: %d Active High: %d\n", data, READY_ACTIVE_HIGH(z80dma))); timer_call_after_resynch(z80dma, param, z80dma_rdy_write_callback); diff --git a/src/emu/mame.c b/src/emu/mame.c index de74d396274..1afdb99524f 100644 --- a/src/emu/mame.c +++ b/src/emu/mame.c @@ -740,7 +740,7 @@ void mame_schedule_load(running_machine *machine, const char *filename) /*------------------------------------------------- - mame_is_save_or_load_pending - is a save or + mame_is_save_or_load_pending - is a save or load pending? -------------------------------------------------*/ diff --git a/src/emu/rendersw.c b/src/emu/rendersw.c index 6893bfe1d8d..71de463fc1d 100644 --- a/src/emu/rendersw.c +++ b/src/emu/rendersw.c @@ -189,7 +189,7 @@ INLINE UINT32 get_texel_palette16_bilinear(const render_texinfo *texture, INT32 const UINT16 *texbase = texture->base; rgb_t pix00, pix01, pix10, pix11; INT32 u0, u1, v0, v1; - + u0 = curu >> 16; u1 = 1; if (u0 < 0) u0 = u1 = 0; @@ -198,7 +198,7 @@ INLINE UINT32 get_texel_palette16_bilinear(const render_texinfo *texture, INT32 v1 = texture->rowpixels; if (v0 < 0) v0 = v1 = 0; else if (v0 + 1 >= texture->height) v0 = texture->height - 1, v1 = 0; - + texbase += v0 * texture->rowpixels + u0; pix00 = texture->palette[texbase[0]]; @@ -232,7 +232,7 @@ INLINE UINT32 get_texel_rgb15_bilinear(const render_texinfo *texture, INT32 curu const UINT16 *texbase = texture->base; rgb_t pix00, pix01, pix10, pix11, filtered; INT32 u0, u1, v0, v1; - + u0 = curu >> 16; u1 = 1; if (u0 < 0) u0 = u1 = 0; @@ -241,7 +241,7 @@ INLINE UINT32 get_texel_rgb15_bilinear(const render_texinfo *texture, INT32 curu v1 = texture->rowpixels; if (v0 < 0) v0 = v1 = 0; else if (v0 + 1 >= texture->height) v0 = texture->height - 1, v1 = 0; - + texbase += v0 * texture->rowpixels + u0; pix00 = texbase[0]; @@ -281,7 +281,7 @@ INLINE UINT32 get_texel_yuy16_bilinear(const render_texinfo *texture, INT32 curu const UINT16 *texbase = texture->base; rgb_t pix00, pix01, pix10, pix11; INT32 u0, u1, v0, v1; - + u0 = curu >> 16; u1 = 1; if (u0 < 0) u0 = u1 = 0; @@ -290,7 +290,7 @@ INLINE UINT32 get_texel_yuy16_bilinear(const render_texinfo *texture, INT32 curu v1 = texture->rowpixels; if (v0 < 0) v0 = v1 = 0; else if (v0 + 1 >= texture->height) v0 = texture->height - 1, v1 = 0; - + texbase += v0 * texture->rowpixels + u0; if ((curu & 0x10000) == 0) @@ -350,7 +350,7 @@ INLINE UINT32 get_texel_rgb32_bilinear(const render_texinfo *texture, INT32 curu const UINT32 *texbase = texture->base; rgb_t pix00, pix01, pix10, pix11; INT32 u0, u1, v0, v1; - + u0 = curu >> 16; u1 = 1; if (u0 < 0) u0 = u1 = 0; @@ -359,7 +359,7 @@ INLINE UINT32 get_texel_rgb32_bilinear(const render_texinfo *texture, INT32 curu v1 = texture->rowpixels; if (v0 < 0) v0 = v1 = 0; else if (v0 + 1 >= texture->height) v0 = texture->height - 1, v1 = 0; - + texbase += v0 * texture->rowpixels + u0; pix00 = texbase[0]; @@ -394,7 +394,7 @@ INLINE UINT32 get_texel_argb32_bilinear(const render_texinfo *texture, INT32 cur const UINT32 *texbase = texture->base; rgb_t pix00, pix01, pix10, pix11; INT32 u0, u1, v0, v1; - + u0 = curu >> 16; u1 = 1; if (u0 < 0) u0 = u1 = 0; @@ -403,7 +403,7 @@ INLINE UINT32 get_texel_argb32_bilinear(const render_texinfo *texture, INT32 cur v1 = texture->rowpixels; if (v0 < 0) v0 = v1 = 0; else if (v0 + 1 >= texture->height) v0 = texture->height - 1, v1 = 0; - + texbase += v0 * texture->rowpixels + u0; pix00 = texbase[0]; @@ -2069,7 +2069,7 @@ static void FUNC_PREFIX(setup_and_draw_textured_quad)(const render_primitive *pr /* advance U/V to the middle of the first texel */ setup.startu += (setup.dudx + setup.dudy) / 2; setup.startv += (setup.dvdx + setup.dvdy) / 2; - + /* if we're bilinear filtering, we need to offset u/v by half a texel */ if (BILINEAR_FILTER) { diff --git a/src/emu/sound/multipcm.c b/src/emu/sound/multipcm.c index 6db27d1959f..378a49330fa 100644 --- a/src/emu/sound/multipcm.c +++ b/src/emu/sound/multipcm.c @@ -37,7 +37,7 @@ #include "streams.h" #include "multipcm.h" -//¿?¿? +//???? #define MULTIPCM_CLOCKDIV (180.0) struct _Sample @@ -113,7 +113,7 @@ static signed int LPANTABLE[0x800],RPANTABLE[0x800]; #define FIX(v) ((UINT32) ((float) (1<<SHIFT)*(v))) static const int val2chan[] = -{ +{ 0, 1, 2, 3, 4, 5, 6 , -1, 7, 8, 9, 10,11,12,13, -1, 14,15,16,17,18,19,20, -1, @@ -127,7 +127,7 @@ static const int val2chan[] = #define MULTIPCM_RATE 44100.0 /******************************* - ENVELOPE SECTION + ENVELOPE SECTION *******************************/ //Times are based on a 44100Hz timebase. It's adjusted to the actual sampling rate on startup @@ -202,7 +202,7 @@ static void EG_Calc(struct _MultiPCM *ptChip,struct _SLOT *slot) if(slot->Sample->KRS!=0xf) rate=(octave+slot->Sample->KRS)*2+((slot->Regs[3]>>3)&1); else - rate=0; + rate=0; slot->EG.AR=Get_RATE(ptChip->ARStep,rate,slot->Sample->AR); slot->EG.D1R=Get_RATE(ptChip->DRStep,rate,slot->Sample->DR1); @@ -213,7 +213,7 @@ static void EG_Calc(struct _MultiPCM *ptChip,struct _SLOT *slot) } /***************************** - LFO SECTION + LFO SECTION *****************************/ #define LFO_SHIFT 8 @@ -279,7 +279,7 @@ static void LFO_Init(void) INLINE signed int PLFO_Step(struct _LFO *LFO) { int p; - LFO->phase+=LFO->phase_step; + LFO->phase+=LFO->phase_step; p=LFO->table[(LFO->phase>>LFO_SHIFT)&0xff]; p=LFO->scale[p+128]; return p<<(SHIFT-LFO_SHIFT); @@ -288,7 +288,7 @@ INLINE signed int PLFO_Step(struct _LFO *LFO) INLINE signed int ALFO_Step(struct _LFO *LFO) { int p; - LFO->phase+=LFO->phase_step; + LFO->phase+=LFO->phase_step; p=LFO->table[(LFO->phase>>LFO_SHIFT)&0xff]; p=LFO->scale[p]; return p<<(SHIFT-LFO_SHIFT); @@ -357,7 +357,7 @@ void WriteSlot(struct _MultiPCM *ptChip,struct _SLOT *slot,int reg,unsigned char EG_Calc(ptChip,slot); slot->EG.state=ATTACK; slot->EG.volume=0; - + if(slot->Base>=0x100000) { if(slot->Pan&8) @@ -391,7 +391,7 @@ void WriteSlot(struct _MultiPCM *ptChip,struct _SLOT *slot,int reg,unsigned char } else slot->TL=slot->DstTL<<SHIFT; - } + } break; case 6: //LFO freq+PLFO { @@ -431,7 +431,7 @@ static void MultiPCM_update(void *param, stream_sample_t **inputs, stream_sample { signed int smpl=0; signed int smpr=0; - for(sl=0;sl<28;++sl) + for(sl=0;sl<28;++sl) { struct _SLOT *slot=ptChip->Slots+sl; if(slot->Playing) @@ -483,7 +483,7 @@ static void MultiPCM_update(void *param, stream_sample_t **inputs, stream_sample unsigned char MultiPCM_reg_r(int chip, int offset) { -// struct _MultiPCM *ptChip = sndti_token(SOUND_MULTIPCM, chip); +// struct _MultiPCM *ptChip = sndti_token(SOUND_MULTIPCM, chip); return 0; } @@ -514,7 +514,7 @@ static void *multipcm_start(int sndindex, int clock, const void *config) SegaDB=(float) iTL*(-24.0)/(float) 0x40; TL=pow(10.0,SegaDB/20.0); - + if(iPAN==0x8) { @@ -527,7 +527,7 @@ static void *multipcm_start(int sndindex, int clock, const void *config) else if(iPAN&0x8) { LPAN=1.0; - + iPAN=0x10-iPAN; SegaDB=(float) iPAN*(-12.0)/(float) 0x4; diff --git a/src/emu/sound/nile.c b/src/emu/sound/nile.c index 0744d3dd651..6faac4253fa 100644 --- a/src/emu/sound/nile.c +++ b/src/emu/sound/nile.c @@ -7,7 +7,7 @@ 00 01 - sptr ?? (always 0) - 02 - sptr LO + 02 - sptr LO 03 - sptr HI 04 05 - flags? 00000000 0000?L0? - bit 0 loops, other bits appear to be not used by the chip @@ -74,8 +74,8 @@ WRITE16_HANDLER(nile_sndctrl_w) COMBINE_DATA(&info->ctrl); -// printf("CTRL: %04x -> %04x (PC=%x)\n", ctrl, info->ctrl, activecpu_get_pc()); - +// printf("CTRL: %04x -> %04x (PC=%x)\n", ctrl, info->ctrl, activecpu_get_pc()); + ctrl^=info->ctrl; } @@ -99,7 +99,7 @@ READ16_HANDLER(nile_snd_r) { int slot=offset/16; int sptr = ((nile_sound_regs[slot*16+3]<<16)|nile_sound_regs[slot*16+2])+info->vpos[slot]; - + if(reg==2) { return sptr&0xffff; @@ -129,7 +129,7 @@ WRITE16_HANDLER(nile_snd_w) info->vpos[v] = info->frac[v] = info->lponce[v] = 0; } -// printf("v%02d: %04x to reg %02d (PC=%x)\n", v, nile_sound_regs[offset], r, activecpu_get_pc()); +// printf("v%02d: %04x to reg %02d (PC=%x)\n", v, nile_sound_regs[offset], r, activecpu_get_pc()); } static void nile_update(void *param, stream_sample_t **inputs, stream_sample_t **outputs, int length) @@ -142,7 +142,7 @@ static void nile_update(void *param, stream_sample_t **inputs, stream_sample_t * INT32 *mixp; INT16 sample; int sptr, eptr, freq, lsptr, leptr; - + lsptr=leptr=0; memset(mix, 0, sizeof(mix[0])*length*2); @@ -157,7 +157,7 @@ static void nile_update(void *param, stream_sample_t **inputs, stream_sample_t * sptr = slot[NILE_REG_SPTR_HI]<<16 | slot[NILE_REG_SPTR_LO]; eptr = slot[NILE_REG_EPTR_HI]<<16 | slot[NILE_REG_EPTR_LO]; - + freq=slot[NILE_REG_FREQ]<<4; lsptr = slot[NILE_REG_LSPTR_HI]<<16 | slot[NILE_REG_LSPTR_LO]; leptr = slot[NILE_REG_LEPTR_HI]<<16 | slot[NILE_REG_LEPTR_LO]; @@ -168,7 +168,7 @@ static void nile_update(void *param, stream_sample_t **inputs, stream_sample_t * *mixp++ += (sample * (INT32)slot[NILE_REG_VOL_R]) >> 16; *mixp++ += (sample * (INT32)slot[NILE_REG_VOL_L]) >> 16; - + info->frac[v] += freq; info->vpos[v] += info->frac[v]>>16; info->frac[v] &= 0xffff; @@ -187,7 +187,7 @@ static void nile_update(void *param, stream_sample_t **inputs, stream_sample_t * // not looped yet, check sample end if ((info->vpos[v] + sptr) >= eptr) { - // code at 11d8c: + // code at 11d8c: // if bit 2 (0x4) is set, check if loop start = loop end. // if they are equal, clear bit 0 and don't set the loop start/end // registers in the NiLe. if they aren't, set bit 0 and set @@ -203,7 +203,7 @@ static void nile_update(void *param, stream_sample_t **inputs, stream_sample_t * info->vpos[v] = (eptr - sptr); info->frac[v] = 0; } - + } } } diff --git a/src/emu/sound/rf5c400.c b/src/emu/sound/rf5c400.c index 59b98fe8620..c607df83d12 100644 --- a/src/emu/sound/rf5c400.c +++ b/src/emu/sound/rf5c400.c @@ -312,29 +312,29 @@ static void rf5c400_init_chip(struct rf5c400_info *info, int sndindex, int clock info->channels[i].env_step = 0.0; info->channels[i].env_scale = 1.0; } - + for (i = 0; i < ARRAY_LENGTH(info->channels); i++) { - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].startH); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].startL); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].freq); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].endL); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].endHloopH); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].loopL); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].pan); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].effect); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].volume); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].attack); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].decay); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].release); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].cutoff); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].pos); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].step); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].keyon); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].env_phase); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].env_level); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].env_step); - state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].env_scale); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].startH); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].startL); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].freq); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].endL); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].endHloopH); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].loopL); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].pan); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].effect); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].volume); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].attack); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].decay); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].release); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].cutoff); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].pos); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].step); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].keyon); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].env_phase); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].env_level); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].env_step); + state_save_register_item("rf5c400", sndindex * ARRAY_LENGTH(info->channels) + i, info->channels[i].env_scale); } info->stream = stream_create(0, 2, clock/384, info, rf5c400_update); diff --git a/src/emu/video.c b/src/emu/video.c index b2d91361e20..8e675cfb082 100644 --- a/src/emu/video.c +++ b/src/emu/video.c @@ -351,7 +351,7 @@ void video_init(running_machine *machine) /* create a render target for snapshots */ viewname = options_get_string(mame_options(), OPTION_SNAPVIEW); global.snap_native = (machine->primary_screen != NULL && (viewname[0] == 0 || strcmp(viewname, "native") == 0)); - + /* the native target is hard-coded to our internal layout and has all options disabled */ if (global.snap_native) { @@ -359,7 +359,7 @@ void video_init(running_machine *machine) assert(global.snap_target != NULL); render_target_set_layer_config(global.snap_target, 0); } - + /* other targets select the specified view and turn off effects */ else { diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c index 2a2b188f68f..9b8d573a7c6 100644 --- a/src/emu/video/voodoo.c +++ b/src/emu/video/voodoo.c @@ -599,7 +599,7 @@ static STATE_POSTLOAD( voodoo_postload ) { voodoo_state *v = param; int index, subindex; - + v->fbi.clut_dirty = TRUE; for (index = 0; index < ARRAY_LENGTH(v->tmu); index++) { @@ -607,7 +607,7 @@ static STATE_POSTLOAD( voodoo_postload ) for (subindex = 0; subindex < ARRAY_LENGTH(v->tmu[index].ncc); subindex++) v->tmu[index].ncc[subindex].dirty = TRUE; } - + /* recompute video memory to get the FBI FIFO base recomputed */ if (v->type <= VOODOO_2) recompute_video_memory(v); @@ -630,7 +630,7 @@ static void init_save_state(const device_config *device) state_save_register_item(unique_tag, 0, v->extra_cycles); state_save_register_item_pointer(unique_tag, 0, (&v->reg[0].u), ARRAY_LENGTH(v->reg)); state_save_register_item(unique_tag, 0, v->alt_regmap); - + /* register states: pci */ state_save_register_item(unique_tag, 0, v->pci.fifo.in); state_save_register_item(unique_tag, 0, v->pci.fifo.out); @@ -4239,7 +4239,7 @@ static WRITE32_DEVICE_HANDLER( banshee_agp_w ) WRITE32_DEVICE_HANDLER( banshee_w ) { voodoo_state *v = get_safe_token(device); - + /* if we have something pending, flush the FIFOs up to the current time */ if (v->pci.op_pending) flush_fifos(v, timer_get_time()); @@ -4464,10 +4464,10 @@ static DEVICE_START( voodoo ) assert(config->type >= VOODOO_1 && config->type < MAX_VOODOO_TYPES); assert(config->fbmem > 0); assert(config->type >= VOODOO_BANSHEE || config->tmumem0 > 0); - + /* store a pointer back to the device */ v->device = device; - + /* copy config data */ v->freq = config->clock; v->fbi.vblank_client = config->vblank; @@ -4613,7 +4613,7 @@ static DEVICE_START( voodoo ) /* do a soft reset to reset everything else */ soft_reset(v); - + /* register for save states */ init_save_state(device); } |
