Previous 15994 Revisions Next

r3536 Tuesday 11th November, 2008 at 03:56:46 UTC by Nathan Woods
Updated to the MAME 0.128u3 core
[docs]messnew.txt
[src/emu]attotime.c attotime.h cpuexec.c cpuexec.h cpuint.c cpuint.h cpuintrf.c cpuintrf.h inptport.c mame.c mconfig.c mconfig.h memory.h rendersw.c timer.c timer.h validity.c
[src/emu/cpu]cpu.mak
[src/emu/cpu/adsp2100]2100dasm.c 2100ops.c adsp2100.c adsp2100.h
[src/emu/cpu/alph8201]8201dasm.c alph8201.c alph8201.h
[src/emu/cpu/apexc]apexc.c apexc.h apexcdsm.c
[src/emu/cpu/arm]arm.c arm.h
[src/emu/cpu/arm7]arm7.c arm7.h arm7core.c arm7core.h arm7exec.c
[src/emu/cpu/asap]asap.c asap.h asapdasm.c
[src/emu/cpu/ccpu]ccpu.c ccpu.h ccpudasm.c
[src/emu/cpu/cdp1802]1802dasm.c cdp1802.c cdp1802.h
[src/emu/cpu/cop400]cop400.h cop410.c cop410ds.c cop420.c cop420ds.c
[src/emu/cpu/cp1610]1610dasm.c cp1610.c cp1610.h
[src/emu/cpu/cubeqcpu]cubeqcpu.c
[src/emu/cpu/dsp32]dsp32.c dsp32.h
[src/emu/cpu/dsp56k]dsp56dsm.c dsp56k.c dsp56k.h dsp56ops.c
[src/emu/cpu/e132xs]e132xs.c e132xs.h
[src/emu/cpu/f8]f3853.c f3853.h f8.c f8.h f8dasm.c
[src/emu/cpu/g65816]g65816.c g65816.h g65816cm.h g65816op.h
[src/emu/cpu/h6280]6280dasm.c h6280.c h6280.h h6280ops.h
[src/emu/cpu/h83002]h83002.c h83002.h h8disasm.c h8priv.h
[src/emu/cpu/hd6309]6309dasm.c hd6309.c hd6309.h
[src/emu/cpu/i386]i386.c i386.h
[src/emu/cpu/i8085]8085dasm.c i8085.c i8085.h
[src/emu/cpu/i86]i186intf.h i188intf.h i286.c i286intf.h i86.c i86intf.h i88intf.h instr186.c instr86.c v20intf.h v30intf.h v33intf.h
[src/emu/cpu/i8x41]8x41dasm.c i8x41.c i8x41.h
[src/emu/cpu/i960]i960.c i960.h
[src/emu/cpu/jaguar]jaguar.c jaguar.h
[src/emu/cpu/konami]knmidasm.c konami.c konami.h
[src/emu/cpu/lh5801]5801dasm.c lh5801.c lh5801.h
[src/emu/cpu/lr35902]lr35902.c lr35902.h lr35902d.c
[src/emu/cpu/m37710]m37710.c m37710.h m37710cm.h m37710op.h
[src/emu/cpu/m6502]6502dasm.c m4510.c m4510.h m6502.c m6502.h m6509.c m6509.h m65ce02.c m65ce02.h minc4510.h mincce02.h ops02.h ops09.h ops4510.h opsc02.h t6502.c t6509.c t65c02.c t65ce02.c t65sc02.c tdeco16.c tn2a03.c
[src/emu/cpu/m6800]6800dasm.c 6800ops.c m6800.c m6800.h
[src/emu/cpu/m68000]m68000.h m68k.h m68k_in.c m68kconf.h m68kcpu.c m68kcpu.h m68kdasm.c m68kfpu.c m68kmake.c m68kmame.c m68kmame.h
[src/emu/cpu/m6805]6805dasm.c m6805.c m6805.h
[src/emu/cpu/m6809]6809dasm.c m6809.c m6809.h
[src/emu/cpu/mb86233]mb86233.c mb86233.h
[src/emu/cpu/mb88xx]mb88dasm.c mb88xx.c mb88xx.h
[src/emu/cpu/mc68hc11]mc68hc11.c mc68hc11.h
[src/emu/cpu/mcs48]mcs48.c mcs48.h mcs48dsm.c
[src/emu/cpu/mcs51]mcs51.c mcs51.h mcs51dasm.c mcs51ops.c
[src/emu/cpu/minx]minx.c minx.h minxd.c
[src/emu/cpu/mips]mips3.c mips3.h mips3com.c mips3com.h mips3drc.c psx.c psx.h r3000.c r3000.h
[src/emu/cpu/nec]nec.c necintrf.h
[src/emu/cpu/pdp1]pdp1.c pdp1.h pdp1dasm.c tx0.c tx0.h tx0dasm.c
[src/emu/cpu/pic16c5x]16c5xdsm.c pic16c5x.c pic16c5x.h
[src/emu/cpu/powerpc]drc_ops.c ppc.c ppc.h ppc403.c ppc602.c ppc603.c ppc_mem.c ppccom.c ppccom.h ppcdrc.c
[src/emu/cpu/rsp]rsp.c rsp.h
[src/emu/cpu/s2650]2650dasm.c s2650.c s2650.h
[src/emu/cpu/saturn]saturn.c saturn.h saturnds.c
[src/emu/cpu/sc61860]sc61860.c sc61860.h scdasm.c
[src/emu/cpu/se3208]se3208.c se3208.h se3208dis.c
[src/emu/cpu/sh2]sh2.c sh2.h sh2comn.c sh2comn.h sh2drc.c
[src/emu/cpu/sh4]sh4.c sh4.h sh4comn.c sh4comn.h
[src/emu/cpu/sharc]sharc.c sharc.h sharcops.c
[src/emu/cpu/sm8500]sm8500.c sm8500.h sm8500d.c
[src/emu/cpu/spc700]spc700.c spc700.h spc700ds.c spc700ds.h
[src/emu/cpu/ssp1601]ssp1601.c ssp1601.h
[src/emu/cpu/t11]t11.c t11.h t11dasm.c
[src/emu/cpu/tlcs90]tlcs90.c tlcs90.h
[src/emu/cpu/tms32010]32010dsm.c tms32010.c tms32010.h
[src/emu/cpu/tms32025]32025dsm.c tms32025.c tms32025.h
[src/emu/cpu/tms32031]tms32031.c tms32031.h
[src/emu/cpu/tms32051]dis32051.c tms32051.c tms32051.h
[src/emu/cpu/tms34010]34010dsm.c 34010gfx.c 34010ops.c 34010ops.h tms34010.c tms34010.h
[src/emu/cpu/tms7000]7000dasm.c tms7000.c tms7000.h
[src/emu/cpu/tms9900]99xxcore.h tms9900.h
[src/emu/cpu/upd7810]7810dasm.c upd7810.c upd7810.h
[src/emu/cpu/v30mz]necintrf.h v30mz.c
[src/emu/cpu/v60]v60.c v60.h v60d.c
[src/emu/cpu/v810]v810.c v810.h v810dasm.c
[src/emu/cpu/z180]z180.c z180.h z180dasm.c z180op.c z180ops.h
[src/emu/cpu/z80]z80.c z80.h z80dasm.c
[src/emu/cpu/z8000]8000dasm.c z8000.c z8000.h z8000cpu.h z8000tbl.c
[src/emu/debug]debugcmd.c
[src/emu/machine]74123.c 74123.h ldv1000.c ldvp931.c z80sio.c
[src/emu/sound]aica.c
[src/emu/video]mc6845.c
[src/mame]mamedriv.c
[src/mame/audio]cinemat.c dcs.c flower.c gomoku.c gottlieb.c gotya.c mcr.c polyplay.c rockola.c segag80r.c segasnd.c senjyo.c snes.c starwars.c suna8.c tiamc1.c williams.c
[src/mame/drivers]aerofgt.c aquarium.c argus.c armedf.c changela.c cliffhgr.c coolpool.c cps1.c cps2.c crimfght.c dec8.c dooyong.c drgnmst.c expro02.c exprraid.c fitfight.c flower.c fortecar.c fromanc2.c fuukifg2.c galpani3.c gameplan.c gomoku.c gotya.c gyruss.c halleys.c inufuku.c itech32.c jchan.c junofrst.c ksys573.c m10.c m72.c m79amb.c mcatadv.c meritm.c model1.c model2.c nbmj8688.c nbmj8891.c nbmj8991.c nbmj9195.c nemesis.c neogeo.c niyanpai.c nmk16.c nyny.c oneshot.c peplus.c pgm.c pipeline.c playmark.c plygonet.c polyplay.c powerins.c psikyo.c r2dtank.c rockola.c scregg.c segag80r.c segaorun.c segas16a.c segas18.c segas24.c segaxbd.c segaybd.c senjyo.c speedatk.c speglsht.c spiders.c sspeedr.c stv.c stvinit.c suna8.c superqix.c suprnova.c taito_b.c taotaido.c tecmosys.c tetrisp2.c tiamc1.c tmnt.c toobin.c tumbleb.c twin16.c vball.c wc90.c wrally.c xain.c xmen.c yumefuda.c
[src/mame/includes]aerofgt.h* aquarium.h* argus.h* armedf.h* changela.h* dec8.h* dooyong.h* drgnmst.h* fitfight.h* flower.h* fromanc2.h* gomoku.h* gotya.h* inufuku.h* m10.h madalien.h mcatadv.h* model2.h* nbmj8688.h* nbmj8891.h* nbmj8991.h* nbmj9195.h* nemesis.h* niyanpai.h* nmk16.h* oneshot.h* playmark.h* polyplay.h* rockola.h senjyo.h* snk.h sspeedr.h* st0016.h starshp1.h suna8.h* suprnova.h* taito_b.h* taotaido.h* tetrisp2.h* tiamc1.h* tmnt.h* tumbleb.h* twin16.h* vball.h* wc90.h* xmen.h*
[src/mame/machine]arkanoid.c asic65.c atarigen.c cchip.c dc.c fddebug.c harddriv.c pitnrun.c qix.c slikshot.c snes.c taitosj.c vertigo.c wrally.c
[src/mame/video]aerofgt.c aquarium.c argus.c armedf.c atarimo.c changela.c dec8.c dkong.c dooyong.c drgnmst.c fitfight.c flower.c fromanc2.c gomoku.c gotya.c inufuku.c mcatadv.c midzeus2.c model2.c nbmj8688.c nbmj8891.c nbmj8991.c nbmj9195.c nemesis.c niyanpai.c nmk16.c oneshot.c playmark.c polyplay.c senjyo.c speedatk.c srmp2.c sspeedr.c st0016.c stvvdp2.c suna8.c suprnova.c taito_b.c taotaido.c tetrisp2.c tiamc1.c tmnt.c toobin.c toypop.c tumbleb.c twin16.c vball.c wc90.c xmen.c
[src/mess/drivers]atarist.c glasgow.c mk1.c saturn.c
[src/mess/machine]amigacrt.c concept.c lisa.c
[src/mess/video]atarist.c

src/mame/audio/suna8.c
r3535r3536
99#include "driver.h"
1010#include "deprecat.h"
1111#include "sound/samples.h"
12#include "includes/suna8.h"
1213
1314static INT16 *samplebuf;
1415static int sample;
src/mame/audio/snes.c
r3535r3536
13111311      case 0x7:      /* Port 3 */
13121312//          mame_printf_debug("SPC: %02x to APU @ %d (PC=%x)\n", data, offset&3, activecpu_get_pc());
13131313         spc_port_out[offset - 4] = data;
1314         cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(20));
1314         cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(20));
13151315         break;
13161316      case 0xA:      /* Timer 0 */
13171317      case 0xB:      /* Timer 1 */
src/mame/audio/cinemat.c
r3535r3536
99    6/27/99 Jim Hernandez -- 1st Attempt at Fixing Drone Star Castle sound and
1010                             pitch adjustments.
1111    6/30/99 MLR added Rip Off, Solar Quest, Armor Attack (no samples yet)
12    11/04/08 Jim Hernandez -- Fixed Drone Star Castle sound again. It was
13                              broken for a long time due to some changes.
1214
1315    Bugs: Sometimes the death explosion (small explosion) does not trigger.
1416
r3535r3536
114116    last_frame = 0;
115117
116118   /* reset Star Castle pitch */
117    current_pitch = 0x20000;
119    current_pitch = 0x10000;
118120
119121    /* register for save states */
120122    state_save_register_global(sound_control);
r3535r3536
868870
869871      /* latch the drone pitch */
870872      target_pitch = (current_shift & 7) + ((current_shift & 2) << 2);
871        target_pitch = 0x10000 + (target_pitch << 12);
873        target_pitch = 0x5800 + (target_pitch << 12);
872874
873875        /* once per frame slide the pitch toward the target */
874876        if (video_screen_get_frame_number(Machine->primary_screen) > last_frame)
875877        {
876878            if (current_pitch > target_pitch)
877                current_pitch -= 300;
879                current_pitch -= 225;
878880            if (current_pitch < target_pitch)
879                current_pitch += 200;
881                current_pitch += 150;
880882            sample_set_freq(4, current_pitch);
881883            last_frame = video_screen_get_frame_number(Machine->primary_screen);
882884        }
src/mame/audio/senjyo.c
r3535r3536
11#include "driver.h"
22#include "deprecat.h"
3#include "cpu/z80/z80daisy.h"
4#include "machine/z80pio.h"
5#include "machine/z80ctc.h"
63#include "sound/samples.h"
4#include "includes/senjyo.h"
75
86
97/* single tone generator */
src/mame/audio/polyplay.c
r3535r3536
88  driver written by Martin Buchholz (buchholz@mail.uni-greifswald.de)
99
1010***************************************************************************/
11
12#include <math.h>
1113#include "driver.h"
12#include <math.h>
1314#include "sound/samples.h"
15#include "includes/polyplay.h"
1416
1517#define LFO_VOLUME 25
1618#define SAMPLE_LENGTH 32
src/mame/audio/mcr.c
r3535r3536
544544
545545   /* oftentimes games will write one nibble at a time; the sync on this is very */
546546   /* important, so we boost the interleave briefly while this happens */
547   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
547   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(100));
548548}
549549
550550static READ16_HANDLER( csdeluxe_pia_r )
r3535r3536
667667
668668   /* oftentimes games will write one nibble at a time; the sync on this is very */
669669   /* important, so we boost the interleave briefly while this happens */
670   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(250));
670   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(250));
671671}
672672
673673
r3535r3536
761761
762762   /* oftentimes games will write one nibble at a time; the sync on this is very */
763763   /* important, so we boost the interleave briefly while this happens */
764   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
764   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(100));
765765}
766766
767767
src/mame/audio/gotya.c
r3535r3536
11#include "driver.h"
22#include "sound/samples.h"
3#include "includes/gotya.h"
34
5
46struct gotya_sample
57{
68   int sound_command;
src/mame/audio/segasnd.c
r3535r3536
363363   timer_call_after_resynch(NULL, data, delayed_usb_data_w);
364364
365365   /* boost the interleave so that sequences can be sent */
366   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(250));
366   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(250));
367367}
368368
369369
src/mame/audio/rockola.c
r3535r3536
2424#define M_LN2      0.69314718055994530942
2525#endif
2626
27extern WRITE8_HANDLER( rockola_flipscreen_w );
28
2927#define TONE_VOLUME   50
3028#define CHANNELS   3
3129
src/mame/audio/gomoku.c
r3535r3536
99#include "driver.h"
1010#include "deprecat.h"
1111#include "streams.h"
12#include "sound/custom.h"
12#include "includes/gomoku.h"
1313
1414
1515/* 4 voices max */
src/mame/audio/tiamc1.c
r3535r3536
3333
3434#include "driver.h"
3535#include "streams.h"
36#include "sound/custom.h"
36#include "includes/tiamc1.h"
3737
3838#define CLOCK_DIVIDER 16
3939#define BUF_LEN 100000
src/mame/audio/segag80r.c
r3535r3536
934934    */
935935   n7751_command = data & 0x07;
936936   cpunum_set_input_line(device->machine, 1, 0, ((data & 0x08) == 0) ? ASSERT_LINE : CLEAR_LINE);
937   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
937   cpu_boost_interleave(device->machine, attotime_zero, ATTOTIME_IN_USEC(100));
938938}
939939
940940
src/mame/audio/williams.c
r3535r3536
666666   {
667667      cpunum_set_input_line(Machine, sound_cpunum, M6809_IRQ_LINE, ASSERT_LINE);
668668      williams_sound_int_state = 1;
669      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
669      cpu_boost_interleave(Machine, attotime_zero, ATTOTIME_IN_USEC(100));
670670   }
671671}
672672
src/mame/audio/flower.c
r3535r3536
77#include "driver.h"
88#include "deprecat.h"
99#include "streams.h"
10#include "sound/custom.h"
10#include "includes/flower.h"
1111
1212
1313/* 8 voices max */
src/mame/audio/starwars.c
r3535r3536
8989{
9090   riot6532_porta_in_set(riot, 0x40, 0x40);
9191   main_data = param;
92   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
92   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(100));
9393}
9494
9595
r3535r3536
132132
133133   riot6532_porta_in_set(riot, 0x80, 0x80);
134134   sound_data = param;
135   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
135   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(100));
136136}
137137
138138WRITE8_HANDLER( starwars_main_wr_w )
src/mame/audio/gottlieb.c
r3535r3536
1414#include "sound/ay8910.h"
1515//#include "sound/votrax.h"
1616#include "sound/sp0250.h"
17#include "includes/gottlieb.h"
1718
1819
1920#define SOUND1_CLOCK      XTAL_3_579545MHz
src/mame/audio/dcs.c
r3535r3536
14761476{
14771477   /* only boost for DCS2 boards */
14781478   if (!dcs.auto_ack && !transfer.hle_enabled)
1479      cpu_boost_interleave(ATTOTIME_IN_NSEC(500), ATTOTIME_IN_USEC(5));
1479      cpu_boost_interleave(Machine, ATTOTIME_IN_NSEC(500), ATTOTIME_IN_USEC(5));
14801480   return dcs.latch_control;
14811481}
14821482
r3535r3536
15341534      logerror("%08X:dcs_data_w(%04X)\n", activecpu_get_pc(), data);
15351535
15361536   /* boost the interleave temporarily */
1537   cpu_boost_interleave(ATTOTIME_IN_NSEC(500), ATTOTIME_IN_USEC(5));
1537   cpu_boost_interleave(machine, ATTOTIME_IN_NSEC(500), ATTOTIME_IN_USEC(5));
15381538
15391539   /* set the IRQ line on the ADSP */
15401540   cpunum_set_input_line(machine, dcs.cpunum, ADSP2105_IRQ2, ASSERT_LINE);
src/mame/machine/asic65.c
r3535r3536
196196   if (asic65.type == ASIC65_ROMBASED)
197197   {
198198      timer_call_after_resynch(NULL, data | (offset << 16), m68k_asic65_deferred_w);
199      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(20));
199      cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(20));
200200      return;
201201   }
202202
r3535r3536
234234   if (asic65.type == ASIC65_ROMBASED)
235235   {
236236      asic65._68full = 0;
237      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(5));
237      cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(5));
238238      return asic65._68data;
239239   }
240240
r3535r3536
452452      /* bit 14 = 68FULL */
453453      /* bit 13 = XFLG */
454454      /* bit 12 = controlled by jumper */
455      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(5));
455      cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(5));
456456      return (asic65.tfull << 15) | (asic65._68full << 14) | (asic65.xflg << 13) | 0x0000;
457457   }
458458   else
src/mame/machine/dc.c
r3535r3536
957957
958958READ32_HANDLER( dc_arm_aica_r )
959959{
960   return aica_0_r(machine, offset*2, 0xffff);
960   return aica_0_r(machine, offset*2, 0xffff) & 0xffff;
961961}
962962
963963WRITE32_HANDLER( dc_arm_aica_w )
src/mame/machine/pitnrun.c
r3535r3536
4343WRITE8_HANDLER( pitnrun_mcu_data_w )
4444{
4545   timer_call_after_resynch(NULL, data,pitnrun_mcu_real_data_w);
46   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(5));
46   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(5));
4747}
4848
4949READ8_HANDLER( pitnrun_mcu_status_r )
src/mame/machine/fddebug.c
r3535r3536
108108#include "driver.h"
109109#include "deprecat.h"
110110#include "machine/fd1094.h"
111#include "cpu/m68000/m68k.h"
111#include "cpu/m68000/m68kcpu.h"
112#undef REG_PC
112113
113114#include "debug/debugcmd.h"
114115#include "debug/debugcon.h"
src/mame/machine/qix.c
r3535r3536
428428      cpunum_set_input_line(machine, 3, M68705_IRQ_LINE, ASSERT_LINE);
429429      /* temporarily boost the interleave to sync things up */
430430      /* note: I'm using 50 because 30 is not enough for space dungeon at game over */
431      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(50));
431      cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(50));
432432   }
433433   else
434434      cpunum_set_input_line(machine, 3, M68705_IRQ_LINE, CLEAR_LINE);
src/mame/machine/snes.c
r3535r3536
593593   {
594594//          printf("816: %02x to APU @ %d\n", data, offset&3);
595595           spc_port_in[offset & 0x3] = data;
596      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(20));
596      cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(20));
597597      return;
598598   }
599599
src/mame/machine/taitosj.c
r3535r3536
121121   LOG(("%04x: protection write %02x\n",activecpu_get_pc(),data));
122122   timer_call_after_resynch(NULL, data,taitosj_mcu_real_data_w);
123123   /* temporarily boost the interleave to sync things up */
124   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(10));
124   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(10));
125125}
126126
127127READ8_HANDLER( taitosj_mcu_status_r )
128128{
129129   /* temporarily boost the interleave to sync things up */
130   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(10));
130   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(10));
131131
132132   /* bit 0 = the 68705 has read data from the Z80 */
133133   /* bit 1 = the 68705 has written data for the Z80 */
src/mame/machine/vertigo.c
r3535r3536
181181       quickly. Otherwise the main CPU gives up with sound. Boosting
182182       the interleave for a while helps. */
183183
184   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
184   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(100));
185185}
186186
187187
src/mame/machine/atarigen.c
r3535r3536
811811
812812   /* allocate a high frequency timer until a response is generated */
813813   /* the main CPU is *very* sensistive to the timing of the response */
814   cpu_boost_interleave(SOUND_TIMER_RATE, SOUND_TIMER_BOOST);
814   cpu_boost_interleave(machine, SOUND_TIMER_RATE, SOUND_TIMER_BOOST);
815815}
816816
817817
r3535r3536
833833
834834   /* allocate a high frequency timer until a response is generated */
835835   /* the main CPU is *very* sensistive to the timing of the response */
836   cpu_boost_interleave(SOUND_TIMER_RATE, SOUND_TIMER_BOOST);
836   cpu_boost_interleave(machine, SOUND_TIMER_RATE, SOUND_TIMER_BOOST);
837837}
838838
839839
src/mame/machine/arkanoid.c
r3535r3536
6262{
6363   timer_call_after_resynch(NULL, data, test);
6464   /* boost the interleave for a few usecs to make sure it is read successfully */
65   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(10));
65   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(10));
6666}
6767
6868READ8_HANDLER( arkanoid_68705_portA_r )
src/mame/machine/slikshot.c
r3535r3536
516516   }
517517
518518   /* boost the interleave whenever this is written to */
519   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
519   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(100));
520520
521521   /* stash the new value */
522522   z80_ctrl = data;
src/mame/machine/harddriv.c
r3535r3536
1414#include "machine/atarigen.h"
1515#include "machine/asic65.h"
1616#include "audio/atarijsa.h"
17#include "includes/slapstic.h"
1718#include "harddriv.h"
1819
1920
r3535r3536
8081UINT32 adsp_speedup_count[4];
8182
8283
83/* from slapstic.c */
84int slapstic_tweak(offs_t offset);
85void slapstic_reset(void);
86
87
88/* from video */
89extern UINT8 *hdgsp_vram;
90
91
92
9384/*************************************
9485 *
9586 *  Static globals
src/mame/machine/cchip.c
r3535r3536
3838***************************************************************************/
3939
4040#include "driver.h"
41#include "includes/taito_f2.h"
41#include "includes/cchip.h"
4242
4343static UINT16 current_bank = 0;
4444
src/mame/machine/wrally.c
r3535r3536
88***************************************************************************/
99
1010#include "driver.h"
11#include "cpu/ds5002fp/ds5002fp.h"
11#include "cpu/mcs51/mcs51.h"
1212#include "gaelcrpt.h"
1313#include "includes/wrally.h"
1414
r3535r3536
5050   coin_lockout_w( (offset >> 3) & 0x01, ~data & 0x01);
5151}
5252
53/* Converts memory offsets to the format expected by the Dallas */
54static READ32_HANDLER( wrally_external_ram_iaddr )
55{
56   return offset ^= 0x0001;
57}
58
59/***************************************************************************
60
61    World Rally init/reset machine
62
63***************************************************************************/
64
65DRIVER_INIT( wrally )
66{
67}
68
69MACHINE_RESET( wrally )
70{
71   /* sets the function to convert addresses for shared memory with the dallas */
72   ds5002fp_set_ebram_iaddr_callback(wrally_external_ram_iaddr);
73}
src/mame/mamedriv.c
r3535r3536
42874287   DRIVER( garyoret )   /* (c) 1987 Data East Corporation (Japan) */
42884288   DRIVER( cobracom )   /* (c) 1988 Data East Corporation (World) */
42894289   DRIVER( cobracmj )   /* (c) 1988 Data East Corporation (Japan) */
4290   DRIVER( oscar )      /* (c) 1988 Data East USA (US) */
4291   DRIVER( oscarj )   /* (c) 1987 Data East Corporation (Japan) */
4290   DRIVER( oscar )      /* (c) 1988 Data East Corporation (World) */
4291   DRIVER( oscaru )   /* (c) 1987 Data East USA (US) */
42924292   DRIVER( oscarj1 )   /* (c) 1987 Data East Corporation (Japan) */
4293   DRIVER( oscarj0 )   /* (c) 1987 Data East Corporation (Japan) */
4293   DRIVER( oscarj2 )   /* (c) 1987 Data East Corporation (Japan) */
42944294
42954295   /* Data East 16-bit games */
42964296   DRIVER( karnov )   /* (c) 1987 Data East USA (US) */
r3535r3536
62926292   DRIVER( zaryavos )   /* (c) 1983 Nova Games of Canada (prototype) */
62936293   DRIVER( timelimt )   /* (c) 1983 Chuo Co. Ltd */
62946294   DRIVER( progress )   /* (c) 1984 Chuo Co. Ltd */
6295   DRIVER( koroleva )      /* (c) 1988 Terminal */
62956296   DRIVER( rtriv )      /* (c) 198? Romar */
62966297
62976298   /* TIA-MC1 hardware games */
src/mame/includes/nmk16.h
r0r3536
1/*----------- defined in video/nmk16.c -----------*/
2
3extern UINT16 *nmk_bgvideoram,*nmk_fgvideoram,*nmk_txvideoram;
4extern UINT16 *gunnail_scrollram, *gunnail_scrollramy;
5extern UINT16 *afega_vram_0, *afega_scroll_0;
6extern UINT16 *afega_vram_1, *afega_scroll_1;
7
8
9READ16_HANDLER( nmk_bgvideoram_r );
10WRITE16_HANDLER( nmk_bgvideoram_w );
11READ16_HANDLER( nmk_fgvideoram_r );
12WRITE16_HANDLER( nmk_fgvideoram_w );
13READ16_HANDLER( nmk_txvideoram_r );
14WRITE16_HANDLER( nmk_txvideoram_w );
15WRITE16_HANDLER( nmk_scroll_w );
16WRITE16_HANDLER( nmk_scroll_2_w );
17WRITE16_HANDLER( nmk_scroll_3_w );
18WRITE16_HANDLER( nmk_flipscreen_w );
19WRITE16_HANDLER( nmk_tilebank_w );
20WRITE16_HANDLER( bioship_scroll_w );
21WRITE16_HANDLER( bioship_bank_w );
22WRITE16_HANDLER( mustang_scroll_w );
23WRITE16_HANDLER( bioshipbg_scroll_w );
24WRITE16_HANDLER( vandyke_scroll_w );
25WRITE16_HANDLER( manybloc_scroll_w );
26
27VIDEO_START( macross );
28VIDEO_UPDATE( manybloc );
29VIDEO_START( gunnail );
30VIDEO_START( macross2 );
31VIDEO_START( tdragon2 );
32VIDEO_START( bjtwin );
33VIDEO_START( bioship );
34VIDEO_START( strahl );
35VIDEO_UPDATE( bioship );
36VIDEO_UPDATE( strahl );
37VIDEO_UPDATE( macross );
38VIDEO_UPDATE( gunnail );
39VIDEO_UPDATE( bjtwin );
40VIDEO_UPDATE( tharrier );
41VIDEO_UPDATE( hachamf );
42VIDEO_UPDATE( tdragon );
43VIDEO_EOF( nmk );
44VIDEO_EOF( strahl );
45
46WRITE16_HANDLER( afega_vram_0_w );
47WRITE16_HANDLER( afega_vram_1_w );
48
49VIDEO_START( afega );
50VIDEO_START( grdnstrm );
51VIDEO_START( firehawk );
52VIDEO_UPDATE( afega );
53VIDEO_UPDATE( redhawkb );
54VIDEO_UPDATE(redhawki );
55VIDEO_UPDATE( bubl2000 );
56VIDEO_UPDATE( firehawk );
src/mame/includes/m10.h
r3535r3536
55****************************************************************************/
66
77
8#define IREMM10_MASTER_CLOCK      (25000000)
8#define IREMM10_MASTER_CLOCK      (12500000)
99
10#define IREMM10_CPU_CLOCK      (IREMM10_MASTER_CLOCK/20)
11#define IREMM10_PIXEL_CLOCK      (IREMM10_MASTER_CLOCK/5)
12#define IREMM10_HTOTAL         (318)
10#define IREMM10_CPU_CLOCK      (IREMM10_MASTER_CLOCK/16)
11#define IREMM10_PIXEL_CLOCK      (IREMM10_MASTER_CLOCK/2)
12#define IREMM10_HTOTAL         (360)   /* (0x100-0xd3)*8 */
1313#define IREMM10_HBSTART         (248)
1414#define IREMM10_HBEND         (8)
15#define IREMM10_VTOTAL         (262)
15#define IREMM10_VTOTAL         (281)   /* (0x200-0xe7) */
1616#define IREMM10_VBSTART         (240)
1717#define IREMM10_VBEND         (16)
1818
src/mame/includes/nbmj8891.h
r0r3536
1/*----------- defined in video/nbmj8891.c -----------*/
2
3VIDEO_UPDATE( nbmj8891 );
4VIDEO_START( nbmj8891_1layer );
5VIDEO_START( nbmj8891_2layer );
6
7READ8_HANDLER( nbmj8891_palette_type1_r );
8WRITE8_HANDLER( nbmj8891_palette_type1_w );
9READ8_HANDLER( nbmj8891_palette_type2_r );
10WRITE8_HANDLER( nbmj8891_palette_type2_w );
11READ8_HANDLER( nbmj8891_palette_type3_r );
12WRITE8_HANDLER( nbmj8891_palette_type3_w );
13WRITE8_HANDLER( nbmj8891_blitter_w );
14WRITE8_HANDLER( nbmj8891_scrolly_w );
15WRITE8_HANDLER( nbmj8891_vramsel_w );
16WRITE8_HANDLER( nbmj8891_romsel_w );
17WRITE8_HANDLER( nbmj8891_clutsel_w );
18READ8_HANDLER( nbmj8891_clut_r );
19WRITE8_HANDLER( nbmj8891_clut_w );
20WRITE8_HANDLER( nbmj8891_taiwanmb_blitter_w );
21WRITE8_HANDLER( nbmj8891_taiwanmb_gfxflag_w );
22WRITE8_HANDLER( nbmj8891_taiwanmb_gfxdraw_w );
23WRITE8_HANDLER( nbmj8891_taiwanmb_mcu_w );
src/mame/includes/aerofgt.h
r0r3536
1/*----------- defined in video/aerofgt.c -----------*/
2
3extern UINT16 *aerofgt_rasterram;
4extern UINT16 *aerofgt_bg1videoram,*aerofgt_bg2videoram;
5extern UINT16 *aerofgt_spriteram1,*aerofgt_spriteram2,*aerofgt_spriteram3;
6extern UINT16 *wbbc97_bitmapram;
7extern size_t aerofgt_spriteram1_size,aerofgt_spriteram2_size,aerofgt_spriteram3_size;
8extern UINT16 *spikes91_tx_tilemap_ram;
9
10WRITE16_HANDLER( aerofgt_bg1videoram_w );
11WRITE16_HANDLER( aerofgt_bg2videoram_w );
12WRITE16_HANDLER( pspikes_gfxbank_w );
13WRITE16_HANDLER( pspikesb_gfxbank_w );
14WRITE16_HANDLER( spikes91_lookup_w );
15WRITE16_HANDLER( karatblz_gfxbank_w );
16WRITE16_HANDLER( spinlbrk_gfxbank_w );
17WRITE16_HANDLER( turbofrc_gfxbank_w );
18WRITE16_HANDLER( aerofgt_gfxbank_w );
19WRITE16_HANDLER( aerofgt_bg1scrollx_w );
20WRITE16_HANDLER( aerofgt_bg1scrolly_w );
21WRITE16_HANDLER( aerofgt_bg2scrollx_w );
22WRITE16_HANDLER( aerofgt_bg2scrolly_w );
23WRITE16_HANDLER( pspikes_palette_bank_w );
24WRITE16_HANDLER( wbbc97_bitmap_enable_w );
25VIDEO_START( pspikes );
26VIDEO_START( karatblz );
27VIDEO_START( spinlbrk );
28VIDEO_START( turbofrc );
29VIDEO_UPDATE( pspikes );
30VIDEO_UPDATE( pspikesb );
31VIDEO_UPDATE( spikes91 );
32VIDEO_UPDATE( karatblz );
33VIDEO_UPDATE( spinlbrk );
34VIDEO_UPDATE( turbofrc );
35VIDEO_UPDATE( aerofgt );
36VIDEO_UPDATE( aerfboot );
37VIDEO_UPDATE( aerfboo2 );
38VIDEO_START( wbbc97 );
39VIDEO_UPDATE( wbbc97 );
src/mame/includes/vball.h
r0r3536
1/*----------- defined in video/vball.c -----------*/
2
3extern UINT8 *vb_attribram;
4extern UINT8 *vb_videoram;
5extern UINT8 *vb_scrolly_lo;
6extern int vb_scrollx_hi;
7extern int vb_scrolly_hi;
8extern int vb_scrollx_lo;
9extern int vball_gfxset;
10
11VIDEO_START( vb );
12VIDEO_UPDATE( vb );
13void vb_bgprombank_w(running_machine *machine, int bank);
14void vb_spprombank_w(running_machine *machine, int bank);
15WRITE8_HANDLER( vb_attrib_w );
16WRITE8_HANDLER( vb_videoram_w );
17void vb_mark_all_dirty(void);
18
19INTERRUPT_GEN( vball_interrupt );
src/mame/includes/nemesis.h
r0r3536
1/*----------- defined in video/nemesis.c -----------*/
2
3extern UINT16 *nemesis_videoram1b;
4extern UINT16 *nemesis_videoram1f;
5extern UINT16 *nemesis_videoram2b;
6extern UINT16 *nemesis_videoram2f;
7extern UINT16 *nemesis_characterram;
8extern UINT16 *nemesis_xscroll1,*nemesis_xscroll2, *nemesis_yscroll;
9extern size_t nemesis_characterram_size;
10extern UINT16 *nemesis_yscroll1, *nemesis_yscroll2;
11
12WRITE16_HANDLER( nemesis_videoram1b_word_w );
13WRITE16_HANDLER( nemesis_videoram1f_word_w );
14WRITE16_HANDLER( nemesis_videoram2b_word_w );
15WRITE16_HANDLER( nemesis_videoram2f_word_w );
16WRITE16_HANDLER( nemesis_characterram_word_w );
17VIDEO_UPDATE( nemesis );
18VIDEO_START( nemesis );
19VIDEO_UPDATE( salamand );
20
21WRITE16_HANDLER( nemesis_gfx_flipx_w );
22WRITE16_HANDLER( nemesis_gfx_flipy_w );
23WRITE16_HANDLER( salamander_palette_word_w );
24WRITE16_HANDLER( nemesis_palette_word_w );
src/mame/includes/senjyo.h
r0r3536
1#include "cpu/z80/z80daisy.h"
2#include "machine/z80pio.h"
3#include "machine/z80ctc.h"
4
5/*----------- defined in audio/senjyo.c -----------*/
6
7extern const z80_daisy_chain senjyo_daisy_chain[];
8extern const z80pio_interface senjyo_pio_intf;
9extern const z80ctc_interface senjyo_ctc_intf;
10
11void senjyo_sh_start(void);
12WRITE8_HANDLER( senjyo_volume_w );
13
14
15/*----------- defined in video/senjyo.c -----------*/
16
17extern UINT8 *senjyo_fgscroll;
18extern UINT8 *senjyo_scrollx1,*senjyo_scrolly1;
19extern UINT8 *senjyo_scrollx2,*senjyo_scrolly2;
20extern UINT8 *senjyo_scrollx3,*senjyo_scrolly3;
21extern UINT8 *senjyo_fgvideoram,*senjyo_fgcolorram;
22extern UINT8 *senjyo_bg1videoram,*senjyo_bg2videoram,*senjyo_bg3videoram;
23extern UINT8 *senjyo_radarram;
24extern UINT8 *senjyo_bgstripesram;
25extern int is_senjyo, senjyo_scrollhack;
26
27WRITE8_HANDLER( senjyo_fgvideoram_w );
28WRITE8_HANDLER( senjyo_fgcolorram_w );
29WRITE8_HANDLER( senjyo_bg1videoram_w );
30WRITE8_HANDLER( senjyo_bg2videoram_w );
31WRITE8_HANDLER( senjyo_bg3videoram_w );
32WRITE8_HANDLER( senjyo_bgstripes_w );
33
34VIDEO_START( senjyo );
35VIDEO_UPDATE( senjyo );
src/mame/includes/nbmj9195.h
r0r3536
1/*----------- defined in video/nbmj9195.c -----------*/
2
3VIDEO_UPDATE( nbmj9195 );
4VIDEO_START( nbmj9195_1layer );
5VIDEO_START( nbmj9195_2layer );
6VIDEO_START( nbmj9195_nb22090 );
7
8READ8_HANDLER( nbmj9195_palette_r );
9WRITE8_HANDLER( nbmj9195_palette_w );
10READ8_HANDLER( nbmj9195_nb22090_palette_r );
11WRITE8_HANDLER( nbmj9195_nb22090_palette_w );
12
13READ8_HANDLER( nbmj9195_blitter_0_r );
14READ8_HANDLER( nbmj9195_blitter_1_r );
15WRITE8_HANDLER( nbmj9195_blitter_0_w );
16WRITE8_HANDLER( nbmj9195_blitter_1_w );
17WRITE8_HANDLER( nbmj9195_clut_0_w );
18WRITE8_HANDLER( nbmj9195_clut_1_w );
19
20void nbmj9195_clutsel_w(int data);
21void nbmj9195_gfxflag2_w(int data);
src/mame/includes/fromanc2.h
r0r3536
1/*----------- defined in video/fromanc2.c -----------*/
2
3VIDEO_UPDATE( fromanc2 );
4VIDEO_START( fromanc2 );
5VIDEO_START( fromancr );
6VIDEO_START( fromanc4 );
7
8READ16_HANDLER( fromanc2_paletteram_0_r );
9READ16_HANDLER( fromanc2_paletteram_1_r );
10WRITE16_HANDLER( fromanc2_paletteram_0_w );
11WRITE16_HANDLER( fromanc2_paletteram_1_w );
12READ16_HANDLER( fromancr_paletteram_0_r );
13READ16_HANDLER( fromancr_paletteram_1_r );
14WRITE16_HANDLER( fromancr_paletteram_0_w );
15WRITE16_HANDLER( fromancr_paletteram_1_w );
16READ16_HANDLER( fromanc4_paletteram_0_r );
17READ16_HANDLER( fromanc4_paletteram_1_r );
18WRITE16_HANDLER( fromanc4_paletteram_0_w );
19WRITE16_HANDLER( fromanc4_paletteram_1_w );
20WRITE16_HANDLER( fromanc2_videoram_0_w );
21WRITE16_HANDLER( fromanc2_videoram_1_w );
22WRITE16_HANDLER( fromanc2_videoram_2_w );
23WRITE16_HANDLER( fromanc2_videoram_3_w );
24WRITE16_HANDLER( fromancr_videoram_0_w );
25WRITE16_HANDLER( fromancr_videoram_1_w );
26WRITE16_HANDLER( fromancr_videoram_2_w );
27WRITE16_HANDLER( fromanc4_videoram_0_w );
28WRITE16_HANDLER( fromanc4_videoram_1_w );
29WRITE16_HANDLER( fromanc4_videoram_2_w );
30WRITE16_HANDLER( fromanc2_gfxreg_0_w );
31WRITE16_HANDLER( fromanc2_gfxreg_1_w );
32WRITE16_HANDLER( fromanc2_gfxreg_2_w );
33WRITE16_HANDLER( fromanc2_gfxreg_3_w );
34WRITE16_HANDLER( fromancr_gfxreg_0_w );
35WRITE16_HANDLER( fromancr_gfxreg_1_w );
36WRITE16_HANDLER( fromanc2_gfxbank_0_w );
37WRITE16_HANDLER( fromanc2_gfxbank_1_w );
38void fromancr_gfxbank_w(int data);
39WRITE16_HANDLER( fromanc4_gfxreg_0_w );
40WRITE16_HANDLER( fromanc4_gfxreg_1_w );
41WRITE16_HANDLER( fromanc4_gfxreg_2_w );
src/mame/includes/flower.h
r0r3536
1#include "sound/custom.h"
2
3/*----------- defined in audio/flower.c -----------*/
4
5extern UINT8 *flower_soundregs1,*flower_soundregs2;
6
7WRITE8_HANDLER( flower_sound1_w );
8WRITE8_HANDLER( flower_sound2_w );
9void *flower_sh_start(int clock, const custom_sound_interface *config);
10
11
12/*----------- defined in video/flower.c -----------*/
13
14extern UINT8 *flower_textram, *flower_bg0ram, *flower_bg1ram, *flower_bg0_scroll, *flower_bg1_scroll;
15
16WRITE8_HANDLER( flower_textram_w );
17WRITE8_HANDLER( flower_bg0ram_w );
18WRITE8_HANDLER( flower_bg1ram_w );
19WRITE8_HANDLER( flower_flipscreen_w );
20
21VIDEO_UPDATE( flower );
22VIDEO_START( flower );
23PALETTE_INIT( flower );
src/mame/includes/niyanpai.h
r0r3536
1/*----------- defined in video/niyanpai.c -----------*/
2
3VIDEO_UPDATE( niyanpai );
4VIDEO_START( niyanpai );
5
6READ16_HANDLER( niyanpai_palette_r );
7WRITE16_HANDLER( niyanpai_palette_w );
8
9READ16_HANDLER( niyanpai_blitter_0_r );
10READ16_HANDLER( niyanpai_blitter_1_r );
11READ16_HANDLER( niyanpai_blitter_2_r );
12WRITE16_HANDLER( niyanpai_blitter_0_w );
13WRITE16_HANDLER( niyanpai_blitter_1_w );
14WRITE16_HANDLER( niyanpai_blitter_2_w );
15WRITE16_HANDLER( niyanpai_clut_0_w );
16WRITE16_HANDLER( niyanpai_clut_1_w );
17WRITE16_HANDLER( niyanpai_clut_2_w );
18WRITE16_HANDLER( niyanpai_clutsel_0_w );
19WRITE16_HANDLER( niyanpai_clutsel_1_w );
20WRITE16_HANDLER( niyanpai_clutsel_2_w );
src/mame/includes/suprnova.h
r0r3536
1/*----------- defined in drivers/suprnova.c -----------*/
2
3extern UINT32 *skns_tilemapA_ram, *skns_tilemapB_ram, *skns_v3slc_ram;
4extern UINT32 *skns_palette_ram;
5extern UINT32 *skns_pal_regs, *skns_v3_regs, *skns_spc_regs;
6extern UINT32 skns_v3t_dirty[0x4000]; // allocate this elsewhere?
7extern UINT32 skns_v3t_4bppdirty[0x8000]; // allocate this elsewhere?
8extern int skns_v3t_somedirty,skns_v3t_4bpp_somedirty;
9
10/*----------- defined in video/suprnova.c -----------*/
11
12void skns_sprite_kludge(int x, int y);
13void skns_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect);
14
15WRITE32_HANDLER ( skns_tilemapA_w );
16WRITE32_HANDLER ( skns_tilemapB_w );
17WRITE32_HANDLER ( skns_v3_regs_w );
18WRITE32_HANDLER ( skns_pal_regs_w );
19WRITE32_HANDLER ( skns_palette_ram_w );
20VIDEO_START(skns);
21VIDEO_RESET(skns);
22VIDEO_EOF(skns);
23VIDEO_UPDATE(skns);
src/mame/includes/nbmj8688.h
r0r3536
1/*----------- defined in video/nbmj8688.c -----------*/
2
3PALETTE_INIT( mbmj8688_8bit );
4PALETTE_INIT( mbmj8688_12bit );
5PALETTE_INIT( mbmj8688_16bit );
6VIDEO_UPDATE( mbmj8688 );
7VIDEO_UPDATE( mbmj8688_LCD );
8VIDEO_START( mbmj8688_8bit );
9VIDEO_START( mbmj8688_hybrid_12bit );
10VIDEO_START( mbmj8688_pure_12bit );
11VIDEO_START( mbmj8688_hybrid_16bit );
12VIDEO_START( mbmj8688_pure_16bit );
13VIDEO_START( mbmj8688_pure_16bit_LCD );
14
15WRITE8_HANDLER( nbmj8688_clut_w );
16WRITE8_HANDLER( nbmj8688_blitter_w );
17WRITE8_HANDLER( mjsikaku_gfxflag2_w );
18WRITE8_HANDLER( mjsikaku_scrolly_w );
19WRITE8_HANDLER( mjsikaku_romsel_w );
20WRITE8_HANDLER( secolove_romsel_w );
21WRITE8_HANDLER( seiha_romsel_w );
22WRITE8_HANDLER( crystalg_romsel_w );
23
24WRITE8_HANDLER( nbmj8688_HD61830B_0_instr_w );
25WRITE8_HANDLER( nbmj8688_HD61830B_0_data_w );
26WRITE8_HANDLER( nbmj8688_HD61830B_1_instr_w );
27WRITE8_HANDLER( nbmj8688_HD61830B_1_data_w );
28WRITE8_HANDLER( nbmj8688_HD61830B_both_instr_w );
29WRITE8_HANDLER( nbmj8688_HD61830B_both_data_w );
src/mame/includes/fitfight.h
r0r3536
1/*----------- defined in drivers/fitfight.c -----------*/
2
3extern UINT16 *fitfight_spriteram;
4extern UINT16 *fof_700000;
5extern UINT16 *fof_900000;
6extern UINT16 *fof_a00000;
7
8extern UINT16 *fof_bak_tileram;
9extern UINT16 *fof_mid_tileram;
10extern UINT16 *fof_txt_tileram;
11extern char bbprot_kludge;
12
13
14/*----------- defined in video/fitfight.c -----------*/
15
16WRITE16_HANDLER( fof_bak_tileram_w );
17WRITE16_HANDLER( fof_mid_tileram_w );
18WRITE16_HANDLER( fof_txt_tileram_w );
19VIDEO_START(fitfight);
20VIDEO_UPDATE(fitfight);
src/mame/includes/sspeedr.h
r0r3536
1/*----------- defined in video/sspeedr.c -----------*/
2
3WRITE8_HANDLER( sspeedr_driver_horz_w );
4WRITE8_HANDLER( sspeedr_driver_horz_2_w );
5WRITE8_HANDLER( sspeedr_driver_vert_w );
6WRITE8_HANDLER( sspeedr_driver_pic_w );
7
8WRITE8_HANDLER( sspeedr_drones_horz_w );
9WRITE8_HANDLER( sspeedr_drones_horz_2_w );
10WRITE8_HANDLER( sspeedr_drones_vert_w );
11WRITE8_HANDLER( sspeedr_drones_mask_w );
12
13WRITE8_HANDLER( sspeedr_track_horz_w );
14WRITE8_HANDLER( sspeedr_track_horz_2_w );
15WRITE8_HANDLER( sspeedr_track_vert_w );
16WRITE8_HANDLER( sspeedr_track_ice_w );
17
18VIDEO_START( sspeedr );
19VIDEO_UPDATE( sspeedr );
20VIDEO_EOF( sspeedr );
src/mame/includes/nbmj8991.h
r0r3536
1/*----------- defined in video/nbmj8991.c -----------*/
2
3VIDEO_UPDATE( nbmj8991_type1 );
4VIDEO_UPDATE( nbmj8991_type2 );
5VIDEO_START( nbmj8991 );
6
7WRITE8_HANDLER( nbmj8991_palette_type1_w );
8WRITE8_HANDLER( nbmj8991_palette_type2_w );
9WRITE8_HANDLER( nbmj8991_palette_type3_w );
10WRITE8_HANDLER( nbmj8991_blitter_w );
11READ8_HANDLER( nbmj8991_clut_r );
12WRITE8_HANDLER( nbmj8991_clut_w );
src/mame/includes/argus.h
r0r3536
1/*----------- defined in video/argus.c -----------*/
2
3extern UINT8 *argus_paletteram;
4extern UINT8 *argus_txram;
5extern UINT8 *argus_bg0_scrollx;
6extern UINT8 *argus_bg0_scrolly;
7extern UINT8 *argus_bg1ram;
8extern UINT8 *argus_bg1_scrollx;
9extern UINT8 *argus_bg1_scrolly;
10extern UINT8 *butasan_bg1ram;
11
12VIDEO_START( argus );
13VIDEO_START( valtric );
14VIDEO_START( butasan );
15VIDEO_RESET( argus );
16VIDEO_RESET( valtric );
17VIDEO_RESET( butasan );
18VIDEO_UPDATE( argus );
19VIDEO_UPDATE( valtric );
20VIDEO_UPDATE( butasan );
21
22READ8_HANDLER( argus_txram_r );
23READ8_HANDLER( argus_bg1ram_r );
24READ8_HANDLER( argus_paletteram_r );
25
26WRITE8_HANDLER( argus_txram_w );
27WRITE8_HANDLER( argus_bg1ram_w );
28WRITE8_HANDLER( argus_bg0_scrollx_w );
29WRITE8_HANDLER( argus_bg0_scrolly_w );
30WRITE8_HANDLER( argus_bg1_scrollx_w );
31WRITE8_HANDLER( argus_bg1_scrolly_w );
32WRITE8_HANDLER( argus_bg_status_w );
33WRITE8_HANDLER( argus_flipscreen_w );
34WRITE8_HANDLER( argus_paletteram_w );
35
36WRITE8_HANDLER( valtric_bg_status_w );
37WRITE8_HANDLER( valtric_paletteram_w );
38WRITE8_HANDLER( valtric_mosaic_w );
39WRITE8_HANDLER( valtric_unknown_w );
40
41READ8_HANDLER( butasan_pagedram_r );
42READ8_HANDLER( butasan_bg1ram_r );
43WRITE8_HANDLER( butasan_pageselect_w );
44WRITE8_HANDLER( butasan_pagedram_w );
45WRITE8_HANDLER( butasan_bg1ram_w );
46WRITE8_HANDLER( butasan_bg0_status_w );
47WRITE8_HANDLER( butasan_paletteram_w );
48WRITE8_HANDLER( butasan_bg1_status_w );
49WRITE8_HANDLER( butasan_unknown_w );
src/mame/includes/polyplay.h
r0r3536
1/*----------- defined in audio/polyplay.c -----------*/
2
3void polyplay_set_channel1(int active);
4void polyplay_set_channel2(int active);
5void polyplay_play_channel1(int data);
6void polyplay_play_channel2(int data);
7void polyplay_sh_start(void);
8
9
10/*----------- defined in video/polyplay.c -----------*/
11
12extern UINT8 *polyplay_characterram;
13
14PALETTE_INIT( polyplay );
15VIDEO_UPDATE( polyplay );
16WRITE8_HANDLER( polyplay_characterram_w );
src/mame/includes/gotya.h
r0r3536
1/*----------- defined in audio/gotya.c -----------*/
2
3WRITE8_HANDLER( gotya_soundlatch_w );
4
5
6/*----------- defined in video/gotya.c -----------*/
7
8extern UINT8 *gotya_scroll;
9extern UINT8 *gotya_videoram2;
10
11WRITE8_HANDLER( gotya_videoram_w );
12WRITE8_HANDLER( gotya_colorram_w );
13WRITE8_HANDLER( gotya_video_control_w );
14
15PALETTE_INIT( gotya );
16VIDEO_START( gotya );
17VIDEO_UPDATE( gotya );
src/mame/includes/armedf.h
r0r3536
1/*----------- defined in video/armedf.c -----------*/
2
3extern UINT16 armedf_vreg;
4extern UINT16 *armedf_bg_videoram;
5extern UINT16 *armedf_fg_videoram;
6extern UINT16 *terraf_text_videoram;
7extern UINT16 *legion_cmd;
8extern tilemap *armedf_tx_tilemap;
9
10void armedf_setgfxtype( int type );
11
12VIDEO_UPDATE( armedf );
13VIDEO_EOF( armedf );
14VIDEO_START( armedf );
15
16WRITE16_HANDLER( armedf_bg_videoram_w );
17WRITE16_HANDLER( armedf_fg_videoram_w );
18WRITE16_HANDLER( armedf_text_videoram_w );
19WRITE16_HANDLER( terraf_fg_scrollx_w );
20WRITE16_HANDLER( terraf_fg_scrolly_w );
21WRITE16_HANDLER( terraf_fg_scroll_msb_arm_w );
22WRITE16_HANDLER( armedf_fg_scrollx_w );
23WRITE16_HANDLER( armedf_fg_scrolly_w );
24WRITE16_HANDLER( armedf_bg_scrollx_w );
25WRITE16_HANDLER( armedf_bg_scrolly_w );
26WRITE16_HANDLER( armedf_mcu_cmd );
src/mame/includes/madalien.h
r3535r3536
2727MACHINE_DRIVER_EXTERN( madalien_video );
2828
2929
30/*----------- defined in sndhrdw/madalien.c -----------*/
30/*----------- defined in audio/madalien.c -----------*/
3131
3232DISCRETE_SOUND_EXTERN( madalien );
3333
src/mame/includes/oneshot.h
r0r3536
1/*----------- defined in drivers/oneshot.c -----------*/
2
3extern UINT16 *oneshot_sprites;
4extern UINT16 *oneshot_bg_videoram;
5extern UINT16 *oneshot_mid_videoram;
6extern UINT16 *oneshot_fg_videoram;
7extern UINT16 *oneshot_scroll;
8
9extern int gun_x_p1,gun_y_p1,gun_x_p2,gun_y_p2;
10extern int gun_x_shift;
11
12
13/*----------- defined in video/oneshot.c -----------*/
14
15WRITE16_HANDLER( oneshot_bg_videoram_w );
16WRITE16_HANDLER( oneshot_mid_videoram_w );
17WRITE16_HANDLER( oneshot_fg_videoram_w );
18VIDEO_START( oneshot );
19VIDEO_UPDATE( oneshot );
20VIDEO_UPDATE( maddonna );
src/mame/includes/wc90.h
r0r3536
1/*----------- defined in video/wc90.c -----------*/
2
3extern UINT8 *wc90_fgvideoram,*wc90_bgvideoram,*wc90_txvideoram;
4
5extern UINT8 *wc90_scroll0xlo, *wc90_scroll0xhi;
6extern UINT8 *wc90_scroll1xlo, *wc90_scroll1xhi;
7extern UINT8 *wc90_scroll2xlo, *wc90_scroll2xhi;
8
9extern UINT8 *wc90_scroll0ylo, *wc90_scroll0yhi;
10extern UINT8 *wc90_scroll1ylo, *wc90_scroll1yhi;
11extern UINT8 *wc90_scroll2ylo, *wc90_scroll2yhi;
12
13VIDEO_START( wc90 );
14VIDEO_START( wc90t );
15WRITE8_HANDLER( wc90_fgvideoram_w );
16WRITE8_HANDLER( wc90_bgvideoram_w );
17WRITE8_HANDLER( wc90_txvideoram_w );
18VIDEO_UPDATE( wc90 );
src/mame/includes/xmen.h
r0r3536
1/*----------- defined in drivers/xmen.c -----------*/
2
3extern UINT16 xmen_current_frame;
4extern UINT16 *xmen6p_spriteramleft;
5extern UINT16 *xmen6p_spriteramright;
6extern UINT16 *xmen6p_tilemapleft;
7extern UINT16 *xmen6p_tilemapright;
8
9
10/*----------- defined in video/xmen.c -----------*/
11
12VIDEO_START( xmen );
13VIDEO_START( xmen6p );
14VIDEO_UPDATE( xmen );
15VIDEO_UPDATE( xmen6p );
16VIDEO_EOF( xmen6p );
src/mame/includes/taito_b.h
r0r3536
1/*----------- defined in video/taito_b.c -----------*/
2
3extern UINT16 *taitob_scroll;
4extern UINT16 *TC0180VCU_ram;
5extern UINT16 *taitob_spriteram;
6extern UINT16 *taitob_pixelram;
7
8VIDEO_START( taitob_color_order0 );
9VIDEO_START( taitob_color_order1 );
10VIDEO_START( taitob_color_order2 );
11VIDEO_START( hitice );
12VIDEO_EOF( taitob );
13
14VIDEO_RESET( hitice );
15
16VIDEO_UPDATE( taitob );
17
18WRITE16_HANDLER( TC0180VCU_word_w );
19READ16_HANDLER ( TC0180VCU_word_r );
20
21READ16_HANDLER( TC0180VCU_framebuffer_word_r );
22WRITE16_HANDLER( TC0180VCU_framebuffer_word_w );
23
24WRITE16_HANDLER( taitob_v_control_w );
25READ16_HANDLER ( taitob_v_control_r );
26
27WRITE16_HANDLER( hitice_pixelram_w );
28WRITE16_HANDLER( hitice_pixel_scroll_w );
src/mame/includes/tumbleb.h
r0r3536
1/*----------- defined in drivers/tumbleb.c -----------*/
2
3extern UINT16* jumppop_control;
4extern UINT16* suprtrio_control;
5
6
7/*----------- defined in video/tumbleb.c -----------*/
8
9extern UINT16 *tumblepb_pf1_data,*tumblepb_pf2_data;
10
11VIDEO_START( tumblepb );
12VIDEO_START( fncywld );
13VIDEO_START( jumppop );
14VIDEO_START( sdfight );
15VIDEO_UPDATE( tumblepb );
16VIDEO_UPDATE( jumpkids );
17VIDEO_UPDATE( fncywld );
18VIDEO_UPDATE( jumppop );
19VIDEO_UPDATE( semicom );
20VIDEO_UPDATE( semicom_altoffsets );
21VIDEO_UPDATE( bcstory );
22VIDEO_UPDATE(semibase );
23VIDEO_START( suprtrio );
24VIDEO_UPDATE( suprtrio );
25VIDEO_START( pangpang );
26VIDEO_UPDATE( pangpang );
27VIDEO_UPDATE( sdfight );
28
29WRITE16_HANDLER( tumblepb_pf1_data_w );
30WRITE16_HANDLER( tumblepb_pf2_data_w );
31WRITE16_HANDLER( fncywld_pf1_data_w );
32WRITE16_HANDLER( fncywld_pf2_data_w );
33WRITE16_HANDLER( tumblepb_control_0_w );
34WRITE16_HANDLER( pangpang_pf1_data_w );
35WRITE16_HANDLER( pangpang_pf2_data_w );
36
37WRITE16_HANDLER( bcstory_tilebank_w );
38WRITE16_HANDLER( suprtrio_tilebank_w );
39WRITE16_HANDLER( chokchok_tilebank_w );
40WRITE16_HANDLER( wlstar_tilebank_w );
src/mame/includes/suna8.h
r0r3536
1/*----------- defined in audio/suna8.c -----------*/
2
3WRITE8_HANDLER( suna8_play_samples_w );
4WRITE8_HANDLER( suna8_samples_number_w );
5void suna8_sh_start(void);
6
7
8/*----------- defined in video/suna8.c -----------*/
9
10extern UINT8 suna8_rombank, suna8_spritebank, suna8_palettebank;
11extern UINT8 suna8_unknown;
12
13WRITE8_HANDLER( suna8_spriteram_w );         // for debug
14WRITE8_HANDLER( suna8_banked_spriteram_w );   // for debug
15
16READ8_HANDLER( suna8_banked_paletteram_r );
17READ8_HANDLER( suna8_banked_spriteram_r );
18
19WRITE8_HANDLER( brickzn_banked_paletteram_w );
20
21VIDEO_START( suna8_textdim0 );
22VIDEO_START( suna8_textdim8 );
23VIDEO_START( suna8_textdim12 );
24VIDEO_UPDATE( suna8 );
src/mame/includes/snk.h
r3535r3536
7070extern WRITE8_HANDLER( snk_bg_videoram_w );
7171extern WRITE8_HANDLER( marvins_fg_videoram_w );
7272extern WRITE8_HANDLER( marvins_bg_videoram_w );
73
74/*----------- defined in drivers/hal21.c -----------*/
75
76extern PALETTE_INIT( aso );
src/mame/includes/model2.h
r0r3536
1/*----------- defined in drivers/model2.c -----------*/
2
3extern UINT32 geo_read_start_address;
4extern UINT32 geo_write_start_address;
5extern UINT32 *model2_bufferram;
6extern UINT32 *model2_colorxlat;
7extern UINT32 *model2_textureram0;
8extern UINT32 *model2_textureram1;
9extern UINT32 *model2_lumaram;
10
11
12/*----------- defined in video/model2.c -----------*/
13
14VIDEO_START(model2);
15VIDEO_UPDATE(model2);
16
17void model2_3d_set_zclip( UINT8 clip );
src/mame/includes/gomoku.h
r0r3536
1#include "sound/custom.h"
2
3/*----------- defined in audio/gomoku.c -----------*/
4
5extern UINT8 *gomoku_soundregs1;
6extern UINT8 *gomoku_soundregs2;
7
8WRITE8_HANDLER( gomoku_sound1_w );
9WRITE8_HANDLER( gomoku_sound2_w );
10void *gomoku_sh_start(int clock, const custom_sound_interface *config);
11
12
13/*----------- defined in video/gomoku.c -----------*/
14
15extern UINT8 *gomoku_videoram;
16extern UINT8 *gomoku_colorram;
17extern UINT8 *gomoku_bgram;
18
19PALETTE_INIT( gomoku );
20VIDEO_START( gomoku );
21VIDEO_UPDATE( gomoku );
22
23WRITE8_HANDLER( gomoku_videoram_w );
24WRITE8_HANDLER( gomoku_colorram_w );
25WRITE8_HANDLER( gomoku_bgram_w );
26WRITE8_HANDLER( gomoku_flipscreen_w );
27WRITE8_HANDLER( gomoku_bg_dispsw_w );
src/mame/includes/tiamc1.h
r0r3536
1#include "sound/custom.h"
2
3/*----------- defined in audio/tiamc1.c -----------*/
4
5extern void *tiamc1_sh_start(int clock, const custom_sound_interface *config);
6WRITE8_HANDLER( tiamc1_timer0_w );
7WRITE8_HANDLER( tiamc1_timer1_w );
8WRITE8_HANDLER( tiamc1_timer1_gate_w );
9
10
11/*----------- defined in video/tiamc1.c -----------*/
12
13extern UINT8 *tiamc1_charram;
14extern UINT8 *tiamc1_tileram;
15extern UINT8 *tiamc1_spriteram_x;
16extern UINT8 *tiamc1_spriteram_y;
17extern UINT8 *tiamc1_spriteram_n;
18extern UINT8 *tiamc1_spriteram_a;
19
20PALETTE_INIT( tiamc1 );
21VIDEO_START( tiamc1 );
22VIDEO_UPDATE( tiamc1 );
23
24WRITE8_HANDLER( tiamc1_palette_w );
25WRITE8_HANDLER( tiamc1_videoram_w );
26WRITE8_HANDLER( tiamc1_bankswitch_w );
27WRITE8_HANDLER( tiamc1_sprite_x_w );
28WRITE8_HANDLER( tiamc1_sprite_y_w );
29WRITE8_HANDLER( tiamc1_sprite_a_w );
30WRITE8_HANDLER( tiamc1_sprite_n_w );
31WRITE8_HANDLER( tiamc1_bg_vshift_w );
32WRITE8_HANDLER( tiamc1_bg_hshift_w );
src/mame/includes/tmnt.h
r0r3536
1/*----------- defined in video/tmnt.c -----------*/
2
3WRITE16_HANDLER( tmnt_paletteram_word_w );
4WRITE16_HANDLER( tmnt_0a0000_w );
5WRITE16_HANDLER( punkshot_0a0020_w );
6WRITE16_HANDLER( lgtnfght_0a0018_w );
7WRITE16_HANDLER( blswhstl_700300_w );
8READ16_HANDLER( glfgreat_rom_r );
9WRITE16_HANDLER( glfgreat_122000_w );
10WRITE16_HANDLER( ssriders_1c0300_w );
11WRITE16_HANDLER( prmrsocr_122000_w );
12WRITE16_HANDLER( tmnt_priority_w );
13READ16_HANDLER( glfgreat_ball_r );
14READ16_HANDLER( prmrsocr_rom_r );
15VIDEO_START( sunsetbl );
16VIDEO_START( cuebrick );
17VIDEO_START( mia );
18VIDEO_START( tmnt );
19VIDEO_START( punkshot );
20VIDEO_START( lgtnfght );
21VIDEO_START( blswhstl );
22VIDEO_START( glfgreat );
23VIDEO_START( thndrx2 );
24VIDEO_START( prmrsocr );
25VIDEO_UPDATE( mia );
26VIDEO_UPDATE( tmnt );
27VIDEO_UPDATE( punkshot );
28VIDEO_UPDATE( lgtnfght );
29VIDEO_UPDATE( glfgreat );
30VIDEO_UPDATE( tmnt2 );
31VIDEO_UPDATE( thndrx2 );
32VIDEO_EOF( blswhstl );
33
src/mame/includes/starshp1.h
r3535r3536
7272VIDEO_START( starshp1 );
7373
7474
75/*----------- defined in sound/starshp1.c -----------*/
75/*----------- defined in audio/starshp1.c -----------*/
7676
7777DISCRETE_SOUND_EXTERN( starshp1 );
7878
src/mame/includes/playmark.h
r0r3536
1/*----------- defined in video/playmark.c -----------*/
2
3extern UINT16 *bigtwin_bgvideoram;
4extern UINT16 *wbeachvl_videoram1,*wbeachvl_videoram2,*wbeachvl_videoram3;
5extern UINT16 *wbeachvl_rowscroll;
6
7VIDEO_START( bigtwin );
8VIDEO_START( wbeachvl );
9VIDEO_START( excelsr );
10VIDEO_START( hotmind );
11VIDEO_START( hrdtimes );
12WRITE16_HANDLER( wbeachvl_txvideoram_w );
13WRITE16_HANDLER( wbeachvl_fgvideoram_w );
14WRITE16_HANDLER( wbeachvl_bgvideoram_w );
15WRITE16_HANDLER( hrdtimes_txvideoram_w );
16WRITE16_HANDLER( hrdtimes_fgvideoram_w );
17WRITE16_HANDLER( hrdtimes_bgvideoram_w );
18WRITE16_HANDLER( bigtwin_paletteram_w );
19WRITE16_HANDLER( bigtwin_scroll_w );
20WRITE16_HANDLER( wbeachvl_scroll_w );
21WRITE16_HANDLER( excelsr_scroll_w );
22WRITE16_HANDLER( hrdtimes_scroll_w );
23VIDEO_UPDATE( bigtwin );
24VIDEO_UPDATE( wbeachvl );
25VIDEO_UPDATE( excelsr );
26VIDEO_UPDATE( hrdtimes );
src/mame/includes/st0016.h
r3535r3536
1818#define ST0016_CHAR_BANK_MASK (ST0016_MAX_CHAR_BANK-1)
1919#define ST0016_PAL_BANK_MASK  (ST0016_MAX_PAL_BANK-1)
2020
21/*----------- defined in drivers/speglsht.c -----------*/
22
23extern UINT32 *speglsht_framebuffer;
24extern UINT32  speglsht_videoreg;
25
26
2127/*----------- defined in drivers/st0016.c -----------*/
2228
2329extern UINT32 st0016_rom_bank;
r3535r3536
5157extern UINT32 st0016_game;
5258
5359void st0016_save_init(running_machine *machine);
54
55
src/mame/includes/mcatadv.h
r0r3536
1/*----------- defined in drivers/mcatadv.c -----------*/
2
3extern UINT16 *mcatadv_videoram1, *mcatadv_videoram2;
4extern UINT16 *mcatadv_scroll, *mcatadv_scroll2;
5extern UINT16 *mcatadv_vidregs;
6
7
8/*----------- defined in video/mcatadv.c -----------*/
9
10VIDEO_UPDATE( mcatadv );
11VIDEO_START( mcatadv );
12VIDEO_EOF( mcatadv );
13
14WRITE16_HANDLER( mcatadv_videoram1_w );
15WRITE16_HANDLER( mcatadv_videoram2_w );
src/mame/includes/taotaido.h
r0r3536
1/*----------- defined in video/taotaido.c -----------*/
2
3extern UINT16 *taotaido_spriteram;
4extern UINT16 *taotaido_spriteram2;
5extern UINT16 *taotaido_scrollram;
6extern UINT16 *taotaido_bgram;
7
8WRITE16_HANDLER( taotaido_sprite_character_bank_select_w );
9WRITE16_HANDLER( taotaido_tileregs_w );
10WRITE16_HANDLER( taotaido_bgvideoram_w );
11VIDEO_START( taotaido );
12VIDEO_UPDATE( taotaido );
13VIDEO_EOF( taotaido );
src/mame/includes/tetrisp2.h
r0r3536
1/*----------- defined in drivers/tetrisp2.c -----------*/
2
3extern UINT16 tetrisp2_systemregs[0x10];
4
5
6/*----------- defined in video/tetrisp2.c -----------*/
7
8extern UINT16 *tetrisp2_vram_bg, *tetrisp2_scroll_bg;
9extern UINT16 *tetrisp2_vram_fg, *tetrisp2_scroll_fg;
10extern UINT16 *tetrisp2_vram_rot, *tetrisp2_rotregs;
11
12extern UINT16 *tetrisp2_priority;
13
14extern UINT16 *rocknms_sub_vram_bg, *rocknms_sub_scroll_bg;
15extern UINT16 *rocknms_sub_vram_fg, *rocknms_sub_scroll_fg;
16extern UINT16 *rocknms_sub_vram_rot, *rocknms_sub_rotregs;
17
18extern UINT16 *rocknms_sub_priority;
19
20WRITE16_HANDLER( tetrisp2_palette_w );
21WRITE16_HANDLER( rocknms_sub_palette_w );
22READ16_HANDLER( tetrisp2_priority_r );
23WRITE16_HANDLER( tetrisp2_priority_w );
24WRITE16_HANDLER( rockn_priority_w );
25READ16_HANDLER( rocknms_sub_priority_r );
26WRITE16_HANDLER( rocknms_sub_priority_w );
27READ16_HANDLER( nndmseal_priority_r );
28
29WRITE16_HANDLER( tetrisp2_vram_bg_w );
30WRITE16_HANDLER( tetrisp2_vram_fg_w );
31WRITE16_HANDLER( tetrisp2_vram_rot_w );
32
33WRITE16_HANDLER( rocknms_sub_vram_bg_w );
34WRITE16_HANDLER( rocknms_sub_vram_fg_w );
35WRITE16_HANDLER( rocknms_sub_vram_rot_w );
36
37VIDEO_START( tetrisp2 );
38VIDEO_UPDATE( tetrisp2 );
39
40VIDEO_START( rockntread );
41VIDEO_UPDATE( rockntread );
42
43VIDEO_START( rocknms );
44VIDEO_UPDATE( rocknms );
45
46VIDEO_START( nndmseal );
src/mame/includes/drgnmst.h
r0r3536
1/*----------- defined in drivers/drgnmst.c -----------*/
2
3extern UINT16 *drgnmst_vidregs;
4
5extern UINT16 *drgnmst_fg_videoram;
6extern UINT16 *drgnmst_bg_videoram;
7extern UINT16 *drgnmst_md_videoram;
8
9extern UINT16 *drgnmst_rowscrollram;
10extern UINT16 *drgnmst_vidregs2;
11
12
13/*----------- defined in video/drgnmst.c -----------*/
14
15WRITE16_HANDLER( drgnmst_fg_videoram_w );
16WRITE16_HANDLER( drgnmst_bg_videoram_w );
17WRITE16_HANDLER( drgnmst_md_videoram_w );
18VIDEO_START(drgnmst);
19VIDEO_UPDATE(drgnmst);
src/mame/includes/twin16.h
r0r3536
1/*----------- defined in drivers/twin16.c -----------*/
2
3extern UINT16 twin16_custom_video;
4extern UINT16 *twin16_gfx_rom;
5extern UINT16 *twin16_videoram2;
6extern UINT16 *twin16_sprite_gfx_ram;
7extern UINT16 *twin16_tile_gfx_ram;
8int twin16_spriteram_process_enable( void );
9
10
11/*----------- defined in video/twin16.c -----------*/
12
13WRITE16_HANDLER( twin16_videoram2_w );
14WRITE16_HANDLER( twin16_paletteram_word_w );
15WRITE16_HANDLER( fround_gfx_bank_w );
16WRITE16_HANDLER( twin16_video_register_w );
17
18VIDEO_START( twin16 );
19VIDEO_START( fround );
20VIDEO_UPDATE( twin16 );
21VIDEO_EOF( twin16 );
22
23void twin16_spriteram_process( void );
src/mame/includes/rockola.h
r3535r3536
77#include "sound/discrete.h"
88
99
10/*----------- defined in sndhrdw/rokola.c -----------*/
10/*----------- defined in audio/rockola.c -----------*/
1111
1212extern const custom_sound_interface custom_interface;
1313extern const samples_interface sasuke_samples_interface;
r3535r3536
3434int rockola_music0_playing(void);
3535
3636DISCRETE_SOUND_EXTERN( fantasy );
37
38
39/*----------- defined in video/rockola.c -----------*/
40
41extern UINT8 *rockola_videoram2;
42extern UINT8 *rockola_charram;
43
44WRITE8_HANDLER( rockola_videoram_w );
45WRITE8_HANDLER( rockola_videoram2_w );
46WRITE8_HANDLER( rockola_colorram_w );
47WRITE8_HANDLER( rockola_charram_w );
48WRITE8_HANDLER( rockola_flipscreen_w );
49WRITE8_HANDLER( rockola_scrollx_w );
50WRITE8_HANDLER( rockola_scrolly_w );
51
52PALETTE_INIT( rockola );
53VIDEO_START( rockola );
54VIDEO_UPDATE( rockola );
55
56WRITE8_HANDLER( satansat_b002_w );
57WRITE8_HANDLER( satansat_backcolor_w );
58
59PALETTE_INIT( satansat );
60VIDEO_START( satansat );
61
src/mame/includes/dooyong.h
r0r3536
1/*----------- defined in video/dooyong.c -----------*/
2
3extern UINT8 *dooyong_txvideoram;
4
5WRITE8_HANDLER( dooyong_bgscroll8_w );
6WRITE8_HANDLER( dooyong_fgscroll8_w );
7WRITE8_HANDLER( dooyong_fg2scroll8_w );
8
9WRITE16_HANDLER( dooyong_bgscroll16_w );
10WRITE16_HANDLER( dooyong_bg2scroll16_w );
11WRITE16_HANDLER( dooyong_fgscroll16_w );
12WRITE16_HANDLER( dooyong_fg2scroll16_w );
13
14WRITE8_HANDLER( dooyong_txvideoram8_w );
15
16WRITE8_HANDLER( lastday_ctrl_w );
17WRITE8_HANDLER( pollux_ctrl_w );
18WRITE8_HANDLER( primella_ctrl_w );
19WRITE8_HANDLER( flytiger_ctrl_w );
20WRITE16_HANDLER( rshark_ctrl_w );
21
22VIDEO_UPDATE( lastday );
23VIDEO_UPDATE( gulfstrm );
24VIDEO_UPDATE( pollux );
25VIDEO_UPDATE( bluehawk );
26VIDEO_UPDATE( flytiger );
27VIDEO_UPDATE( primella );
28VIDEO_UPDATE( rshark );
29VIDEO_UPDATE( popbingo );
30
31VIDEO_START( lastday );
32VIDEO_START( gulfstrm );
33VIDEO_START( pollux );
34VIDEO_START( bluehawk );
35VIDEO_START( flytiger );
36VIDEO_START( primella );
37VIDEO_START( rshark );
38VIDEO_START( popbingo );
39
40VIDEO_EOF( dooyong );
41VIDEO_EOF( rshark );
src/mame/includes/dec8.h
r0r3536
1/*----------- defined in video/dec8.c -----------*/
2
3extern UINT8 *dec8_pf0_data,*dec8_pf1_data,*dec8_row;
4
5PALETTE_INIT( ghostb );
6VIDEO_UPDATE( cobracom );
7VIDEO_UPDATE( ghostb );
8VIDEO_UPDATE( srdarwin );
9VIDEO_UPDATE( gondo );
10VIDEO_UPDATE( garyoret );
11VIDEO_UPDATE( lastmiss );
12VIDEO_UPDATE( shackled );
13VIDEO_UPDATE( oscar );
14VIDEO_START( cobracom );
15VIDEO_START( oscar );
16VIDEO_START( ghostb );
17VIDEO_START( lastmiss );
18VIDEO_START( shackled );
19VIDEO_START( srdarwin );
20VIDEO_START( gondo );
21VIDEO_START( garyoret );
22
23WRITE8_HANDLER( dec8_bac06_0_w );
24WRITE8_HANDLER( dec8_bac06_1_w );
25WRITE8_HANDLER( dec8_pf0_data_w );
26WRITE8_HANDLER( dec8_pf1_data_w );
27READ8_HANDLER( dec8_pf0_data_r );
28READ8_HANDLER( dec8_pf1_data_r );
29WRITE8_HANDLER( srdarwin_videoram_w );
30WRITE8_HANDLER( dec8_scroll2_w );
31WRITE8_HANDLER( srdarwin_control_w );
32WRITE8_HANDLER( gondo_scroll_w );
33WRITE8_HANDLER( shackled_control_w );
34WRITE8_HANDLER( lastmiss_control_w );
35WRITE8_HANDLER( lastmiss_scrollx_w );
36WRITE8_HANDLER( lastmiss_scrolly_w );
37WRITE8_HANDLER( dec8_videoram_w );
src/mame/includes/aquarium.h
r0r3536
1/*----------- defined in drivers/aquarium.c -----------*/
2
3extern UINT16 *aquarium_scroll;
4
5extern UINT16 *aquarium_txt_videoram;
6extern UINT16 *aquarium_mid_videoram;
7extern UINT16 *aquarium_bak_videoram;
8
9
10/*----------- defined in video/aquarium.c -----------*/
11
12WRITE16_HANDLER( aquarium_txt_videoram_w );
13WRITE16_HANDLER( aquarium_mid_videoram_w );
14WRITE16_HANDLER( aquarium_bak_videoram_w );
15
16VIDEO_START(aquarium);
17VIDEO_UPDATE(aquarium);
src/mame/includes/changela.h
r0r3536
1/*----------- defined in drivers/changela.c -----------*/
2
3extern UINT8 changela_tree0_col;
4extern UINT8 changela_tree1_col;
5extern UINT8 changela_left_bank_col;
6extern UINT8 changela_right_bank_col;
7extern UINT8 changela_boat_shore_col;
8extern UINT8 changela_collision_reset;
9extern UINT8 changela_tree_collision_reset;
10
11
12/*----------- defined in video/changela.c -----------*/
13
14VIDEO_START( changela );
15VIDEO_UPDATE( changela );
16
17WRITE8_HANDLER( changela_colors_w );
18WRITE8_HANDLER( changela_mem_device_select_w );
19WRITE8_HANDLER( changela_mem_device_w );
20READ8_HANDLER( changela_mem_device_r );
21WRITE8_HANDLER( changela_slope_rom_addr_hi_w );
22WRITE8_HANDLER( changela_slope_rom_addr_lo_w );
src/mame/includes/inufuku.h
r0r3536
1/*----------- defined in drivers/inufuku.c -----------*/
2
3extern UINT16 *inufuku_spriteram1;
4extern UINT16 *inufuku_spriteram2;
5extern size_t inufuku_spriteram1_size;
6
7extern UINT16 *inufuku_bg_videoram;
8extern UINT16 *inufuku_bg_rasterram;
9extern UINT16 *inufuku_text_videoram;
10
11
12/*----------- defined in video/inufuku.c -----------*/
13
14VIDEO_UPDATE( inufuku );
15VIDEO_START( inufuku );
16
17READ16_HANDLER( inufuku_bg_videoram_r );
18WRITE16_HANDLER( inufuku_bg_videoram_w );
19READ16_HANDLER( inufuku_text_videoram_r );
20WRITE16_HANDLER( inufuku_text_videoram_w );
21WRITE16_HANDLER( inufuku_palettereg_w );
22WRITE16_HANDLER( inufuku_scrollreg_w );
src/mame/video/aerofgt.c
r3535r3536
11#include "driver.h"
2#include "includes/aerofgt.h"
23
34
45UINT16 *aerofgt_rasterram;
src/mame/video/senjyo.c
r3535r3536
88
99#include "driver.h"
1010#include "machine/segacrpt.h"
11#include "includes/senjyo.h"
1112
1213UINT8 *senjyo_fgscroll;
1314UINT8 *senjyo_scrollx1,*senjyo_scrolly1;
src/mame/video/nbmj9195.c
r3535r3536
88******************************************************************************/
99
1010#include "driver.h"
11#include "includes/nbmj9195.h"
1112
1213
1314#define   VRAM_MAX   2
src/mame/video/speedatk.c
r3535r3536
8585   tilemap_mark_tile_dirty(bg_tilemap, offset);
8686}
8787
88WRITE8_HANDLER( speedatk_flip_screen_w )
88WRITE8_HANDLER( speedatk_videoregs_w )
8989{
90   flip_screen_set(data);
90   static UINT8 address;
91
92   if(offset == 0)
93      address = data;
94   else
95   {
96      switch(address)
97      {
98         /*temporary hook-up.*/
99         case 0x0d:
100            flip_screen_set(data & 8);
101            tilemap_set_scrolldx(bg_tilemap,0,data & 0x40);
102            break;
103         default:
104            logerror("Video Register %02x called with %02x data\n",address,data);
105      }
106   }
91107}
92108
93109static TILE_GET_INFO( get_tile_info )
src/mame/video/niyanpai.c
r3535r3536
77******************************************************************************/
88
99#include "driver.h"
10#include "includes/niyanpai.h"
1011
1112
1213#define   VRAM_MAX   3
src/mame/video/stvvdp2.c
r3535r3536
11/* Sega Saturn VDP2 */
22
3/*Debug features,remember to zero it if you publish this file.*/
4#define DEBUG_MODE 0
5
36/*
47
58the dirty marking stuff and tile decoding will probably be removed in the end anyway as we'll need custom
r3535r3536
2629
2730------------------------------------------------------------------------------------------
2831
32Video emulation TODO:
33-all games:
34 \-priorities (check myfairld,thunt)
35 \-complete windows effects
36 \-mosaic effect
37 \-ODD bit/H/V Counter not yet emulated.
38 \-Missing
39-batmanfr:
40 \-If you reset the game after the character selection screen,when you get again to it there's garbage
41   floating behind Batman.
42-hanagumi:
43 \-ending screens have corrupt graphics. (*untested*)
44-kiwames:
45 \-incorrect color emulation for the alpha blended flames on the title screen,it's caused by a bit
46 that writes 1 to the NBG1 bitmap color bank.It should be 0 but I don't know what is going on,
47 might be a SH-2 / irq issue.
48 \-the VDP1 sprites refresh is too slow,causing the "Draw by request" mode to
49   flicker.Moved back to default ATM...
50-pblbeach:
51 \-Sprites are offset, because it doesn't clear vdp1 local coordinates set by bios,
52   I guess that they are cleared when some vdp1 register is written (kludged for now)
53-prikura:
54 \-Attract mode presentation has corrupted graphics in various places,probably caused by incomplete
55   framebuffer data delete.
56-seabass:
57 \-Player sprite is corrupt/missing during movements,caused by incomplete framebuffer switching.
58
2959Notes of Interest:
3060
31-the test mode / bios is drawn with layer NBG3
61-the test mode / bios is drawn with layer NBG3;
3262
3363-hanagumi Puts a 'RED' dragon logo in tileram (base 0x64000, 4bpp, 8x8 tiles) but
3464its not displayed in gurus video.Update:It's actually not drawn because its
35priority value is 0.
65priority value is 0;
3666
3767-scrolling is screen display wise,meaning that a scrolling value is masked with the
38screen resolution size values.
68screen resolution size values;
3969
40-VDP1 priorities aren't taken into account yet,for now we fix the priority value to six...
41
42-AFAIK Suikoenbu & Winter Heat are the only ST-V games that use Mode 2 as the Color RAM
43format.
44
4570-Bitmaps USES transparency pens,examples are:
4671elandore's energy bars;
4772mausuke's foreground(the one used on the playfield)(I guess that this is also
r3535r3536
6489
6590In other words,the first three types uses the offset and not the color allocated...
6691
67-Debug key list(only on a debug build):
92-Debug key list(only if you enable the debug mode on top of this file):
6893    \-T: NBG3 layer toggle
6994    \-Y: NBG2 layer toggle
7095    \-U: NBG1 layer toggle
7196    \-I: NBG0 layer toggle
7297    \-O: SPRITE toggle
7398    \-K: RBG0 layer toggle
74    \-Z: Enables Window processing debug screen
75        \-C: Window 0 toggle
76        \-V: Window 1 toggle
7799    \-W Decodes the graphics for F4 menu.
78100    \-M Stores VDP1 ram contents from a file.
79101    \-N Stores VDP1 ram contents into a file.
r3535r3536
111133   STV_TRANSPARENCY_ADD_BLEND  = TRANSPARENCY_MODES
112134};
113135
114#ifdef MAME_DEBUG
136#if DEBUG_MODE
115137#define LOG_VDP2 1
116138#define LOG_ROZ 0
117139#else
r3535r3536
12641286
12651287/* 180098 - Reduction Enable
12661288 bit-> /----15----|----14----|----13----|----12----|----11----|----10----|----09----|----08----\
1267       |    --    |    --    |    --    |    --    |    --    |    --    |    --    |    --    |
1289       |    --    |    --    |    --    |    --    |    --    |    --    | N1ZMQT   | N1ZMHF   |
12681290       |----07----|----06----|----05----|----04----|----03----|----02----|----01----|----00----|
1269       |    --    |    --    |    --    |    --    |    --    |    --    |    --    |    --    |
1291       |    --    |    --    |    --    |    --    |    --    |    --    | N0ZMQT   | N0ZMHF   |
12701292       \----------|----------|----------|----------|----------|----------|----------|---------*/
12711293
1294   #define STV_VDP2_ZMCTL ((stv_vdp2_regs[0x098/4] >> 16)&0x0000ffff)
1295
1296   #define STV_VDP2_N1ZMQT  ((STV_VDP2_ZMCTL & 0x0200) >> 9)
1297   #define STV_VDP2_N1ZMHF  ((STV_VDP2_ZMCTL & 0x0100) >> 8)
1298   #define STV_VDP2_N0ZMQT  ((STV_VDP2_ZMCTL & 0x0002) >> 1)
1299   #define STV_VDP2_N0ZMHF  ((STV_VDP2_ZMCTL & 0x0001) >> 0)
1300
12721301/* 18009a - Line and Vertical Cell Scroll Control (NBG0, NBG1)
12731302 bit-> /----15----|----14----|----13----|----12----|----11----|----10----|----09----|----08----\
12741303       |    --    |    --    |    --    |    --    |    --    |    --    |    --    |    --    |
r3535r3536
13101339       |    --    |    --    |    --    |    --    |    --    |    --    |    --    |    --    |
13111340       \----------|----------|----------|----------|----------|----------|----------|---------*/
13121341
1313   #define STV_VDP2_LSTA0U ((stv_vdp2_regs[0x0a0/4] >> 16)&0x00000007)
1342   /*bit 2 unused when VRAM = 4 Mbits*/
1343   #define STV_VDP2_LSTA0U ((stv_vdp2_regs[0x0a0/4] >> 16)&0x00000003)
13141344
13151345/* 1800a2 - LSTA0L - Line Scroll Table Address (NBG0)
13161346 bit-> /----15----|----14----|----13----|----12----|----11----|----10----|----09----|----08----\
r3535r3536
13281358       |    --    |    --    |    --    |    --    |    --    |    --    |    --    |    --    |
13291359       \----------|----------|----------|----------|----------|----------|----------|---------*/
13301360
1331   #define STV_VDP2_LSTA1U ((stv_vdp2_regs[0x0a4/4] >> 16)&0x00000007)
1361   /*bit 2 unused when VRAM = 4 Mbits*/
1362   #define STV_VDP2_LSTA1U ((stv_vdp2_regs[0x0a4/4] >> 16)&0x00000003)
13321363
13331364/* 1800a6 - LSTA1L - Line Scroll Table Address (NBG1)
13341365 bit-> /----15----|----14----|----13----|----12----|----11----|----10----|----09----|----08----\
r3535r3536
28272858   static UINT16 *destline;
28282859   UINT16 pal_color_offset = 0;
28292860   UINT8* gfxdatalow, *gfxdatahigh;
2830
28312861   /*Window effect 1=no draw*/
2832   int tw;
2833
2862   int tw = 0;
28342863   /*Transparency code 1=opaque,0=transparent*/
28352864   int t_pen;
28362865   if (!stv2_current_tilemap.enabled) return;
r3535r3536
29122941                     if ( stv2_current_tilemap.colour_calculation_enabled == 0 )
29132942                        *BITMAP_ADDR16(bitmap, ycnt, xcnt) = machine->pens[((gfxdata[0] & 0xf0) >> 4) | (stv2_current_tilemap.bitmap_palette_number * 0x100) | pal_color_offset];
29142943                     else
2915                        *BITMAP_ADDR16(bitmap, ycnt, xcnt) = alpha_blend16(*BITMAP_ADDR16(bitmap, ycnt, xcnt), machine->pens[((gfxdata[0] & 0x0f) >> 0) | (stv2_current_tilemap.bitmap_palette_number * 0x100) | pal_color_offset]);
2944                        *BITMAP_ADDR16(bitmap, ycnt, xcnt) = alpha_blend16(*BITMAP_ADDR16(bitmap, ycnt, xcnt), machine->pens[((gfxdata[0] & 0xf0) >> 4) | (stv2_current_tilemap.bitmap_palette_number * 0x100) | pal_color_offset]);
29162945                  }
29172946               }
29182947               gfxdata++;
r3535r3536
29362965                  tw = stv_vdp2_window_process(xcnt,ycnt);
29372966                  if(tw == 0)
29382967                  {
2968                     //60aee2c = $0013 at @605d838
29392969                     t_pen = ((gfxdata[xs] & 0xff) != 0) ? (1) : (0);
29402970                     if(stv2_current_tilemap.transparency == TRANSPARENCY_NONE) t_pen = 1;
29412971                     if(t_pen)
2942                        *BITMAP_ADDR16(bitmap, ycnt, xcnt) = machine->pens[(gfxdata[xs] & 0xff) | (stv2_current_tilemap.bitmap_palette_number * 0x100) | pal_color_offset];
2972                     {
2973                        if ( stv2_current_tilemap.colour_calculation_enabled == 0 )
2974                           *BITMAP_ADDR16(bitmap, ycnt, xcnt) = machine->pens[(gfxdata[xs] & 0xff) | (stv2_current_tilemap.bitmap_palette_number * 0x100) | pal_color_offset];
2975                        else
2976                           *BITMAP_ADDR16(bitmap, ycnt, xcnt) = alpha_blend16(*BITMAP_ADDR16(bitmap, ycnt, xcnt), machine->pens[(gfxdata[xs] & 0xff) | (stv2_current_tilemap.bitmap_palette_number * 0x100) | pal_color_offset]);
2977                     }
29432978                  }
29442979                  if ( (gfxdata + xs) >= gfxdatahigh )
29452980                  {
r3535r3536
29773012                     t_pen = ((gfxdata[xs] & 0xff) != 0) ? 1 : 0;
29783013                     if(stv2_current_tilemap.transparency == TRANSPARENCY_NONE) t_pen = 1;
29793014                     if(t_pen)
2980                        *BITMAP_ADDR16(bitmap, ycnt, xcnt) = machine->pens[(gfxdata[xs] & 0xff) | (stv2_current_tilemap.bitmap_palette_number * 0x100) | pal_color_offset];
3015                     {
3016                        if ( stv2_current_tilemap.colour_calculation_enabled == 0 )
3017                           *BITMAP_ADDR16(bitmap, ycnt, xcnt) = machine->pens[(gfxdata[xs] & 0xff) | (stv2_current_tilemap.bitmap_palette_number * 0x100) | pal_color_offset];
3018                        else
3019                           *BITMAP_ADDR16(bitmap, ycnt, xcnt) = alpha_blend16(*BITMAP_ADDR16(bitmap, ycnt, xcnt), machine->pens[(gfxdata[xs] & 0xff) | (stv2_current_tilemap.bitmap_palette_number * 0x100) | pal_color_offset]);
3020                     }
29813021                  }
29823022
29833023                  if ( (gfxdata + xs) >= gfxdatahigh ) gfxdata = gfxdatalow;
r3535r3536
29973037                  t_pen = ((((gfxdata[0] & 0x07) * 0x100) | (gfxdata[1] & 0xff)) != 0) ? (1) : (0);
29983038                  if(stv2_current_tilemap.transparency == TRANSPARENCY_NONE) t_pen = 1;
29993039                  if(t_pen)
3000                     *BITMAP_ADDR16(bitmap, ycnt, xcnt) = machine->pens[((gfxdata[0] & 0x07) * 0x100) | (gfxdata[1] & 0xff) | pal_color_offset];
3040                  {
3041                     if ( stv2_current_tilemap.colour_calculation_enabled == 0 )
3042                        *BITMAP_ADDR16(bitmap, ycnt, xcnt) = machine->pens[((gfxdata[0] & 0x07) * 0x100) | (gfxdata[1] & 0xff) | pal_color_offset];
3043                     else
3044                        *BITMAP_ADDR16(bitmap, ycnt, xcnt) = alpha_blend16(*BITMAP_ADDR16(bitmap, ycnt, xcnt), machine->pens[((gfxdata[0] & 0x07) * 0x100) | (gfxdata[1] & 0xff) | pal_color_offset]);
3045                  }
30013046               }
30023047
30033048               gfxdata+=2;
r3535r3536
30543099         else
30553100         {
30563101            int xx, xs, yy=0;
3102
30573103            for (ycnt = cliprect->min_y; ycnt <= cliprect->max_y; yy+=stv2_current_tilemap.incy, ycnt++ )
30583104            {
30593105               gfxdata += xlinesize*(yy>>16);
r3535r3536
30873133
30883134                  if ( (gfxdata + 2*xs) >= gfxdatahigh ) gfxdata = gfxdatalow;
30893135               }
3090               gfxdata += xlinesize;
3136               /*Guess: myfairlady needs that the vertical resolution is doubled because it's using the double density mode.*/
3137               if(STV_VDP2_LSMD == 3) { gfxdata += xlinesize*(yy>>16); }
3138               else                { gfxdata += xlinesize; }
30913139               if ( gfxdata >= gfxdatahigh ) gfxdata = gfxdatalow + (gfxdata - gfxdatahigh);
30923140            }
30933141         }
r3535r3536
39433991
39443992   if (stv2_current_tilemap.bitmap_enable) // this layer is a bitmap
39453993   {
3946      if ( window_applied )
3994      /*elandore doesn't like current cliprect code,will be worked on...*/
3995      if ( window_applied && stv2_current_tilemap.colour_depth != 0)
39473996         stv2_current_tilemap.window_control = 0;
39483997      stv_vdp2_draw_basic_bitmap(machine, bitmap, &mycliprect);
39493998   }
39503999   else
39514000   {
4001
39524002      stv_vdp2_draw_basic_tilemap(machine, bitmap, &mycliprect);
39534003
39544004      if((stv2_current_tilemap.window_control & 6) != 0 && VDP2_ERR(1))
r3535r3536
43954445   stv2_current_tilemap.incy = STV_VDP2_ZMYN0;
43964446
43974447   stv2_current_tilemap.linescroll_enable = STV_VDP2_N0LSCX;
4398   stv2_current_tilemap.linescroll_interval = 1 << (STV_VDP2_N0LSS);
4448   stv2_current_tilemap.linescroll_interval = (((STV_VDP2_LSMD & 3) == 2) ? (2) : (1)) << (STV_VDP2_N0LSS);
43994449   stv2_current_tilemap.linescroll_table_address = ((STV_VDP2_LSTA0U << 16) | STV_VDP2_LSTA0L) * 2;
44004450   stv2_current_tilemap.vertical_linescroll_enable = STV_VDP2_N0LSCY;
44014451   stv2_current_tilemap.linezoom_enable = STV_VDP2_N0LZMX;
r3535r3536
44854535   stv2_current_tilemap.incy = STV_VDP2_ZMYN1;
44864536
44874537   stv2_current_tilemap.linescroll_enable = STV_VDP2_N1LSCX;
4488   stv2_current_tilemap.linescroll_interval = 1 << (STV_VDP2_N1LSS);
4538   stv2_current_tilemap.linescroll_interval = (((STV_VDP2_LSMD & 3) == 2) ? (2) : (1)) << (STV_VDP2_N1LSS);
44894539   stv2_current_tilemap.linescroll_table_address = ((STV_VDP2_LSTA1U << 16) | STV_VDP2_LSTA1L) * 2;
44904540   stv2_current_tilemap.vertical_linescroll_enable = STV_VDP2_N1LSCY;
44914541   stv2_current_tilemap.linezoom_enable = STV_VDP2_N1LZMX;
r3535r3536
50085058      fillbitmap(bitmap, get_black_pen(machine), cliprect);
50095059   else
50105060   {
5011      #ifdef MAME_DEBUG
5061      #if DEBUG_MODE
50125062      //popmessage("Back screen enabled %08x",STV_VDP2_BKTA);
50135063      #endif
50145064      gfxdata+=((STV_VDP2_BKTA)<<1);
r3535r3536
50965146   int r,g,b;
50975147   COMBINE_DATA(&stv_vdp2_cram[offset]);
50985148
5099//  popmessage("%01x",STV_VDP2_CRMD);
5149//  popmessage("%01x\n",STV_VDP2_CRMD);
51005150
51015151   switch( STV_VDP2_CRMD )
51025152   {
r3535r3536
53895439
53905440/******************************************************************************************
53915441
5392ST-V VDP2 window effect function version 0.03
5442ST-V VDP2 window effect function version 0.04
53935443
53945444How it works: returns 0 if the requested pixel is drawnable,1 if it isn't.
53955445For tilemap and sprite layer, clipping rectangle is changed.
r3535r3536
53995449-W0 (outside) for tilemaps and sprite layer.
54005450
54015451Not Done:
5402-Windows on cells.Requires that the tilemap are converted to bitmap AFAIK...
5452-Complete Windows on cells.A split between cells and bitmaps is in progress...
54035453-w0 & w1 at the same time.
54045454-Window logic.
54055455-Line window.
54065456-Color Calculation.
5407-Rotation parameter Window.
5457-Rotation parameter Window (already done?).
54085458
54095459Window Registers are hooked up like this ATM:
54105460    x--- ---- UNUSED
r3535r3536
55155565{
55165566   UINT16 s_x=0,e_x=0,s_y=0,e_y=0;
55175567
5518   if ((stv2_current_tilemap.window_control & 6) == 0)
5519      return 0;
5520
55215568   stv_vdp2_get_window0_coordinates(&s_x, &e_x, &s_y, &e_y);
55225569
55235570   if(stv2_current_tilemap.window_control & 2)
r3535r3536
60586105VIDEO_UPDATE( stv_vdp2 )
60596106{
60606107   static UINT8 pri;
6061
60626108   stv_vdp2_dynamic_res_change(screen->machine);
60636109
60646110   video_update_vdp1(screen->machine);
r3535r3536
60676113
60686114   stv_vdp2_draw_back(screen->machine, bitmap,cliprect);
60696115
6070   #ifdef MAME_DEBUG
6116   #if DEBUG_MODE
60716117   if(input_code_pressed_once(KEYCODE_T))
60726118   {
60736119      debug.l_en^=1;
r3535r3536
61096155      /*If a plane has a priority value of zero it isn't shown at all.*/
61106156      for(pri=1;pri<8;pri++)
61116157      {
6112         if (debug.l_en & 1)    {if(pri==STV_VDP2_N3PRIN) stv_vdp2_draw_NBG3(screen->machine, bitmap,cliprect);}
6113         if (debug.l_en & 2)    {if(pri==STV_VDP2_N2PRIN) stv_vdp2_draw_NBG2(screen->machine, bitmap,cliprect);}
6114         if (debug.l_en & 4)    {if(pri==STV_VDP2_N1PRIN) stv_vdp2_draw_NBG1(screen->machine, bitmap,cliprect);}
6115         if (debug.l_en & 8)    {if(pri==STV_VDP2_N0PRIN) stv_vdp2_draw_NBG0(screen->machine, bitmap,cliprect);}
6116         if (debug.l_en & 0x10) {if(pri==STV_VDP2_R0PRIN) stv_vdp2_draw_RBG0(screen->machine, bitmap,cliprect);}
6117         if (debug.l_en & 0x20) {draw_sprites(screen->machine,bitmap,cliprect,pri);}
6158         if (debug.l_en & 1)    { if(pri==STV_VDP2_N3PRIN) stv_vdp2_draw_NBG3(screen->machine, bitmap,cliprect); }
6159         if (debug.l_en & 2)    { if(pri==STV_VDP2_N2PRIN) stv_vdp2_draw_NBG2(screen->machine, bitmap,cliprect); }
6160         if (debug.l_en & 4)    { if(pri==STV_VDP2_N1PRIN) stv_vdp2_draw_NBG1(screen->machine, bitmap,cliprect); }
6161         if (debug.l_en & 8)    { if(pri==STV_VDP2_N0PRIN) stv_vdp2_draw_NBG0(screen->machine, bitmap,cliprect); }
6162         if (debug.l_en & 0x10) { if(pri==STV_VDP2_R0PRIN) stv_vdp2_draw_RBG0(screen->machine, bitmap,cliprect); }
6163         if (debug.l_en & 0x20) { draw_sprites(screen->machine,bitmap,cliprect,pri); }
61186164      }
61196165   }
61206166
6121#ifdef MAME_DEBUG
6167#if DEBUG_MODE
61226168   if(STV_VDP2_VRAMSZ && VDP2_ERR(0x80000000))
61236169   {
61246170      VDP2_CHK(0x80000000);
src/mame/video/suprnova.c
r3535r3536
1616
1717#include "driver.h"
1818#include "deprecat.h"
19#include "includes/suprnova.h"
1920
2021static bitmap_t *sprite_bitmap;
2122
r3535r3536
112113
113114#define SUPRNOVA_DECODE_BUFFER_SIZE 0x2000
114115
115extern UINT32 *skns_tilemapA_ram, *skns_tilemapB_ram, *skns_v3slc_ram;
116extern UINT32 *skns_palette_ram;
117extern UINT32 *skns_pal_regs, *skns_v3_regs, *skns_spc_regs;
118extern UINT32 skns_v3t_dirty[0x4000]; // allocate this elsewhere?
119extern UINT32 skns_v3t_4bppdirty[0x8000]; // allocate this elsewhere?
120extern int skns_v3t_somedirty,skns_v3t_4bpp_somedirty;
121
122116static UINT8 decodebuffer[SUPRNOVA_DECODE_BUFFER_SIZE];
123117static int depthA=0;
124118static int depthB=0;
src/mame/video/fitfight.c
r3535r3536
11/* Fit of Fighting Video Hardware */
22
33#include "driver.h"
4#include "includes/fitfight.h"
45
5extern UINT16 *fitfight_spriteram;
6extern UINT16 *fof_700000;
7extern UINT16 *fof_900000;
8extern UINT16 *fof_a00000;
9
10extern UINT16 *fof_bak_tileram;
116static tilemap *fof_bak_tilemap;
12extern UINT16 *fof_mid_tileram;
137static tilemap *fof_mid_tilemap;
14extern UINT16 *fof_txt_tileram;
158static tilemap *fof_txt_tilemap;
169
17extern char bbprot_kludge;
18
1910static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int layer )
2011{
2112   const gfx_element *gfx = machine->gfx[3];
src/mame/video/sspeedr.c
r3535r3536
55***************************************************************************/
66
77#include "driver.h"
8#include "includes/sspeedr.h"
89
10
911static int toggle;
1012
1113static unsigned driver_horz;
src/mame/video/argus.c
r3535r3536
115115
116116#include "driver.h"
117117#include "jalblend.h"
118#include "includes/argus.h"
118119
119120
120121UINT8 *argus_paletteram;
src/mame/video/armedf.c
r3535r3536
11#include "driver.h"
2#include "includes/armedf.h"
23
34
45UINT16 armedf_vreg;
src/mame/video/dkong.c
r3535r3536
902902      newset = input_port_read_direct(port);
903903      if (newset != state->vidhw)
904904      {
905         const UINT8 *color_prom;
905906         state->vidhw = newset;
906907         switch (newset)
907908         {
908909            case 0x00:
909               palette_init_radarscp(machine, memory_region(machine, "proms"));
910               color_prom = memory_region(machine, "proms");
911               PALETTE_INIT_CALL(radarscp);
910912               break;
911913            case 0x01:
912               palette_init_dkong2b(machine, memory_region(machine, "proms"));
914               color_prom = memory_region(machine, "proms");
915               PALETTE_INIT_CALL(dkong2b);
913916               break;
914917         }
915918      }
src/mame/video/wc90.c
r3535r3536
11#include "driver.h"
2#include "includes/wc90.h"
23
34
45UINT8 *wc90_fgvideoram,*wc90_bgvideoram,*wc90_txvideoram;
src/mame/video/atarimo.c
r3535r3536
406406   mo->slipram       = (map == 0) ? &atarimo_0_slipram : &atarimo_1_slipram;
407407
408408   /* allocate the temp bitmap */
409   mo->bitmap        = video_screen_auto_bitmap_alloc(machine->primary_screen);
409   mo->bitmap        = auto_bitmap_alloc(video_screen_get_width(machine->primary_screen), video_screen_get_height(machine->primary_screen), BITMAP_FORMAT_INDEXED16);
410410   fillbitmap(mo->bitmap, desc->transpen, NULL);
411411
412412   /* allocate the spriteram */
src/mame/video/taito_b.c
r3535r3536
11#include "driver.h"
22#include "profiler.h"
3#include "includes/taito_b.h"
34
45UINT16 *taitob_scroll;
56UINT16 *TC0180VCU_ram;
src/mame/video/suna8.c
r3535r3536
7070***************************************************************************/
7171
7272#include "driver.h"
73#include "includes/suna8.h"
7374
7475#define TILEMAPS 0
7576
src/mame/video/model2.c
r3535r3536
8686
8787*********************************************************************************************************************************/
8888#include "driver.h"
89#include "eminline.h"
8990#include "video/segaic24.h"
9091#include "video/poly.h"
91#include "eminline.h"
92#include "includes/model2.h"
9293
9394#define DEBUG 0
9495
95extern UINT32 geo_read_start_address;
96extern UINT32 geo_write_start_address;
97extern UINT32 *model2_bufferram;
98extern UINT32 *model2_colorxlat;
99extern UINT32 *model2_textureram0;
100extern UINT32 *model2_textureram1;
101extern UINT32 *model2_lumaram;
102
10396static poly_manager *poly;
10497
10598#define pz      p[0]
src/mame/video/tiamc1.c
r3535r3536
88***************************************************************************/
99
1010#include "driver.h"
11#include "includes/tiamc1.h"
1112
1213
1314UINT8 *tiamc1_tileram;
src/mame/video/tmnt.c
r3535r3536
11#include "driver.h"
22#include "machine/eeprom.h"
33#include "video/konamiic.h"
4#include "includes/tmnt.h"
45
56
67static int layer_colorbase[3],sprite_colorbase,bg_colorbase;
src/mame/video/midzeus2.c
r3535r3536
5757 *
5858 *************************************/
5959
60extern UINT32 *zeusbase;
61
6260static poly_manager *poly;
6361static UINT8 log_fifo;
6462
src/mame/video/playmark.c
r3535r3536
11#include "driver.h"
2#include "includes/playmark.h"
23
4
35UINT16 *bigtwin_bgvideoram;
46UINT16 *wbeachvl_videoram1,*wbeachvl_videoram2,*wbeachvl_videoram3;
57UINT16 *wbeachvl_rowscroll;
src/mame/video/st0016.c
r3535r3536
2121
2222//super eagle shot
2323static bitmap_t *speglsht_bitmap;
24extern UINT32 *speglsht_framebuffer;
25extern UINT32  speglsht_videoreg;
2624
2725static const gfx_layout charlayout =
2826{
src/mame/video/mcatadv.c
r3535r3536
1212
1313#include "driver.h"
1414#include "profiler.h"
15#include "includes/mcatadv.h"
1516
16/* Defined in driver */
17extern UINT16 *mcatadv_videoram1, *mcatadv_videoram2;
18extern UINT16 *mcatadv_scroll, *mcatadv_scroll2;
19extern UINT16 *mcatadv_vidregs;
20
2117static tilemap *mcatadv_tilemap1,  *mcatadv_tilemap2;
2218static UINT16 *spriteram_old, *vidregs_old;
2319static int palette_bank1, palette_bank2;
src/mame/video/tetrisp2.c
r3535r3536
3939***************************************************************************/
4040
4141#include "driver.h"
42#include "includes/tetrisp2.h"
4243
4344
44extern UINT16 tetrisp2_systemregs[0x10];
45
4645/* Variables needed by driver: */
4746
4847UINT16 *tetrisp2_vram_bg, *tetrisp2_scroll_bg;
src/mame/video/drgnmst.c
r3535r3536
33// layer priority register not fully understood
44
55#include "driver.h"
6#include "includes/drgnmst.h"
67
7extern UINT16 *drgnmst_vidregs;
8
9extern UINT16 *drgnmst_fg_videoram;
108static tilemap *drgnmst_fg_tilemap;
11extern UINT16 *drgnmst_bg_videoram;
129static tilemap *drgnmst_bg_tilemap;
13extern UINT16 *drgnmst_md_videoram;
1410static tilemap *drgnmst_md_tilemap;
1511
16extern UINT16 *drgnmst_rowscrollram;
17extern UINT16 *drgnmst_vidregs2;
1812
19
2013static TILE_GET_INFO( get_drgnmst_fg_tile_info )
2114{
2215   int tileno,colour, flipyx;
src/mame/video/aquarium.c
r3535r3536
11/* Aquarium */
22
33#include "driver.h"
4#include "includes/aquarium.h"
45
5extern UINT16 *aquarium_scroll;
6
76static tilemap *aquarium_txt_tilemap;
8extern UINT16 *aquarium_txt_videoram;
9
107static tilemap *aquarium_mid_tilemap;
11extern UINT16 *aquarium_mid_videoram;
12
138static tilemap *aquarium_bak_tilemap;
14extern UINT16 *aquarium_bak_videoram;
159
1610/* gcpinbal.c modified */
1711static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect,int y_offs)
src/mame/video/inufuku.c
r3535r3536
1212******************************************************************************/
1313
1414#include "driver.h"
15#include "includes/inufuku.h"
1516
1617
17extern UINT16 *inufuku_spriteram1;
18extern UINT16 *inufuku_spriteram2;
19extern size_t inufuku_spriteram1_size;
20
21extern UINT16 *inufuku_bg_videoram;
22extern UINT16 *inufuku_bg_rasterram;
23extern UINT16 *inufuku_text_videoram;
24
2518static int inufuku_bg_scrollx, inufuku_bg_scrolly;
2619static int inufuku_text_scrollx, inufuku_text_scrolly;
2720static int inufuku_bg_raster;
src/mame/video/nbmj8891.c
r3535r3536
88
99#include "driver.h"
1010#include "nb1413m3.h"
11#include "includes/nbmj8891.h"
1112
1213
1314static int nbmj8891_scrolly;
src/mame/video/vball.c
r3535r3536
99#include "driver.h"
1010#include "deprecat.h"
1111#include "cpu/m6502/m6502.h"
12#include "includes/vball.h"
1213
1314int vb_scrollx_hi=0;
1415int vb_scrollx_lo=0;
src/mame/video/nemesis.c
r3535r3536
55***************************************************************************/
66
77#include "driver.h"
8#include "includes/nemesis.h"
89
10
911UINT16 *nemesis_videoram1b;
1012UINT16 *nemesis_videoram2b;
1113UINT16 *nemesis_videoram1f;
src/mame/video/fromanc2.c
r3535r3536
77******************************************************************************/
88
99#include "driver.h"
10#include "includes/fromanc2.h"
1011
1112static int fromanc2_scrollx[2][4], fromanc2_scrolly[2][4];
1213static int fromanc2_gfxbank[2][4];
src/mame/video/flower.c
r3535r3536
11/* Flower Video Hardware */
22
33#include "driver.h"
4#include "includes/flower.h"
45
56static tilemap *flower_bg0_tilemap, *flower_bg1_tilemap, *flower_text_tilemap, *flower_text_right_tilemap;
67UINT8 *flower_textram, *flower_bg0ram, *flower_bg1ram, *flower_bg0_scroll, *flower_bg1_scroll;
src/mame/video/nbmj8688.c
r3535r3536
88
99#include "driver.h"
1010#include "nb1413m3.h"
11#include "includes/nbmj8688.h"
1112
1213
1314static int mjsikaku_scrolly;
src/mame/video/nbmj8991.c
r3535r3536
88
99#include "driver.h"
1010#include "nb1413m3.h"
11#include "includes/nbmj8991.h"
1112
1213
1314static int nbmj8991_scrollx, nbmj8991_scrolly;
src/mame/video/polyplay.c
r3535r3536
1010***************************************************************************/
1111
1212#include "driver.h"
13#include "includes/polyplay.h"
1314
1415
1516UINT8 *polyplay_characterram;
src/mame/video/gotya.c
r3535r3536
11#include "driver.h"
22#include "video/resnet.h"
3#include "includes/gotya.h"
34
5
46UINT8 *gotya_scroll;
57UINT8 *gotya_videoram2;
68
src/mame/video/srmp2.c
r3535r3536
434434
435435VIDEO_UPDATE( srmp2 )
436436{
437   fillbitmap(bitmap, 0x1f0, cliprect);
437   fillbitmap(bitmap, 0x1ff, cliprect);
438438   srmp2_draw_sprites(screen->machine, bitmap, cliprect);
439439   return 0;
440440}
src/mame/video/oneshot.c
r3535r3536
11/* One Shot One Kill Video Hardware */
22
33#include "driver.h"
4#include "includes/oneshot.h"
45
5extern UINT16 *oneshot_sprites;
6extern UINT16 *oneshot_bg_videoram;
7extern UINT16 *oneshot_mid_videoram;
8extern UINT16 *oneshot_fg_videoram;
9extern UINT16 *oneshot_scroll;
10
11extern int gun_x_p1,gun_y_p1,gun_x_p2,gun_y_p2;
12extern int gun_x_shift;
13
14
156static tilemap *oneshot_bg_tilemap;
167static tilemap *oneshot_mid_tilemap;
178static tilemap *oneshot_fg_tilemap;
src/mame/video/toobin.c
r3535r3536
1717 *************************************/
1818
1919static double brightness;
20static bitmap_t *pfbitmap;
2021
2122
2223
r3535r3536
101102   /* initialize the alphanumerics */
102103   atarigen_alpha_tilemap = tilemap_create(get_alpha_tile_info, tilemap_scan_rows,  8,8, 64,48);
103104   tilemap_set_transparent_pen(atarigen_alpha_tilemap, 0);
105
106   /* allocate a playfield bitmap for rendering */
107   pfbitmap = auto_bitmap_alloc(video_screen_get_width(machine->primary_screen), video_screen_get_height(machine->primary_screen), BITMAP_FORMAT_INDEXED16);
104108}
105109
106110
r3535r3536
227231
228232VIDEO_UPDATE( toobin )
229233{
234   const rgb_t *palette = palette_entry_list_adjusted(screen->machine->palette);
230235   atarimo_rect_list rectlist;
231236   bitmap_t *mobitmap;
232   int x, y, r;
237   int x, y;
233238
234239   /* draw the playfield */
235240   fillbitmap(priority_bitmap, 0, cliprect);
236   tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
237   tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 1, 1);
238   tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 2, 2);
239   tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 3, 3);
241   tilemap_draw(pfbitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
242   tilemap_draw(pfbitmap, cliprect, atarigen_playfield_tilemap, 1, 1);
243   tilemap_draw(pfbitmap, cliprect, atarigen_playfield_tilemap, 2, 2);
244   tilemap_draw(pfbitmap, cliprect, atarigen_playfield_tilemap, 3, 3);
240245
241246   /* draw and merge the MO */
242247   mobitmap = atarimo_render(0, cliprect, &rectlist);
243   for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
244      for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
248   for (y = cliprect->min_y; y <= cliprect->max_y; y++)
249   {
250      UINT32 *dest = BITMAP_ADDR32(bitmap, y, 0);
251      UINT16 *mo = BITMAP_ADDR16(mobitmap, y, 0);
252      UINT16 *pf = BITMAP_ADDR16(pfbitmap, y, 0);
253      UINT8 *pri = BITMAP_ADDR8(priority_bitmap, y, 0);
254      for (x = cliprect->min_x; x <= cliprect->max_x; x++)
245255      {
246         UINT16 *mo = (UINT16 *)mobitmap->base + mobitmap->rowpixels * y;
247         UINT16 *pf = (UINT16 *)bitmap->base + bitmap->rowpixels * y;
248         UINT8 *pri = (UINT8 *)priority_bitmap->base + priority_bitmap->rowpixels * y;
249         for (x = rectlist.rect->min_x; x <= rectlist.rect->max_x; x++)
250            if (mo[x])
251            {
252               /* not verified: logic is all controlled in a PAL
256         UINT16 pix = pf[x];
257         if (mo[x])
258         {
259            /* not verified: logic is all controlled in a PAL
253260
254                        factors: LBPRI1-0, LBPIX3, ANPIX1-0, PFPIX3, PFPRI1-0,
255                                 (~LBPIX3 & ~LBPIX2 & ~LBPIX1 & ~LBPIX0)
256                    */
261                   factors: LBPRI1-0, LBPIX3, ANPIX1-0, PFPIX3, PFPRI1-0,
262                            (~LBPIX3 & ~LBPIX2 & ~LBPIX1 & ~LBPIX0)
263               */
257264
258               /* only draw if not high priority PF */
259               if (!pri[x] || !(pf[x] & 8))
260                  pf[x] = mo[x];
265            /* only draw if not high priority PF */
266            if (!pri[x] || !(pix & 8))
267               pix = mo[x];
261268
262               /* erase behind ourselves */
263               mo[x] = 0;
264            }
269            /* erase behind ourselves */
270            mo[x] = 0;
271         }
272         dest[x] = palette[pix];
265273      }
274   }
266275
267276   /* add the alpha on top */
268277   tilemap_draw(bitmap, cliprect, atarigen_alpha_tilemap, 0, 0);
src/mame/video/xmen.c
r3535r3536
11#include "driver.h"
22#include "video/konamiic.h"
3#include "includes/xmen.h"
34
45
56static int layer_colorbase[3],sprite_colorbase,bg_colorbase;
r3535r3536
128129   return 0;
129130}
130131
131extern UINT16 xmen_current_frame;
132extern UINT16*xmen6p_spriteramleft;
133extern UINT16*xmen6p_spriteramright;
134extern UINT16*xmen6p_tilemapleft;
135extern UINT16*xmen6p_tilemapright;
136extern WRITE8_HANDLER( K052109_w );
137132
138
139
140133VIDEO_UPDATE( xmen6p )
141134{
142135   int x,y;
src/mame/video/toypop.c
r3535r3536
1010
1111UINT8 *toypop_videoram;
1212
13extern UINT8 *m68000_sharedram;
14
1513static tilemap *bg_tilemap;
1614UINT16 *toypop_bg_image;
1715static int bitmapflip,palettebank;
src/mame/video/tumbleb.c
r3535r3536
1515***************************************************************************/
1616
1717#include "driver.h"
18#include "includes/tumbleb.h"
1819
20
1921static UINT16 tumblepb_control_0[8];
2022UINT16 *tumblepb_pf1_data,*tumblepb_pf2_data;
2123static tilemap *pf1_tilemap,*pf1_alt_tilemap,*pf2_tilemap,*pf2_alt_tilemap;
2224static int flipscreen;
23extern UINT16* jumppop_control;
2425static UINT16 bcstory_tilebank;
25extern UINT16* suprtrio_control;
2626static int sprite_xoffset;
2727static int sprite_yoffset;
2828
src/mame/video/gomoku.c
r3535r3536
99******************************************************************************/
1010
1111#include "driver.h"
12#include "includes/gomoku.h"
1213
1314
1415static int gomoku_flipscreen;
src/mame/video/taotaido.c
r3535r3536
99*/
1010
1111#include "driver.h"
12#include "includes/taotaido.h"
1213
14UINT16 *taotaido_spriteram;
15UINT16 *taotaido_spriteram2;
16UINT16 *taotaido_scrollram;
17UINT16 *taotaido_bgram;
18
1319static UINT16 taotaido_sprite_character_bank_select[8];
1420static UINT16 taotaido_video_bank_select[8];
1521static tilemap *bg_tilemap;
1622
17extern UINT16 *taotaido_spriteram;
18extern UINT16 *taotaido_spriteram2;
19extern UINT16 *taotaido_scrollram;
20extern UINT16 *taotaido_bgram;
21
2223static UINT16 *taotaido_spriteram_old, *taotaido_spriteram_older;
2324static UINT16 *taotaido_spriteram2_old, *taotaido_spriteram2_older;
2425
src/mame/video/twin16.c
r3535r3536
1414*/
1515
1616#include "driver.h"
17#include "includes/twin16.h"
1718
18extern UINT16 twin16_custom_video;
19extern UINT16 *twin16_gfx_rom;
20extern UINT16 *twin16_videoram2;
21extern UINT16 *twin16_sprite_gfx_ram;
22extern UINT16 *twin16_tile_gfx_ram;
23extern int twin16_spriteram_process_enable( void );
24
2519static int need_process_spriteram;
2620static UINT16 gfx_bank;
2721static UINT16 scrollx[3], scrolly[3];
src/mame/video/dooyong.c
r3535r3536
11#include "driver.h"
2#include "includes/dooyong.h"
23
34
45UINT8 *dooyong_txvideoram;
src/mame/video/dec8.c
r3535r3536
4141***************************************************************************/
4242
4343#include "driver.h"
44#include "includes/dec8.h"
4445
4546//static int scroll1[4];
4647static int scroll2[4];
src/mame/video/changela.c
r3535r3536
1212***************************************************************************/
1313
1414#include "driver.h"
15#include "includes/changela.h"
1516
1617
17extern UINT8 changela_tree0_col;
18extern UINT8 changela_tree1_col;
19extern UINT8 changela_left_bank_col;
20extern UINT8 changela_right_bank_col;
21extern UINT8 changela_boat_shore_col;
22extern UINT8 changela_collision_reset;
23extern UINT8 changela_tree_collision_reset;
24
25
2618static UINT32 slopeROM_bank;
2719static UINT8 tree_en;
2820static UINT8 horizon;
src/mame/video/nmk16.c
r3535r3536
88*/
99
1010#include "driver.h"
11#include "includes/nmk16.h"
1112
1213UINT16 *nmk_bgvideoram,*nmk_fgvideoram,*nmk_txvideoram;
1314UINT16 *gunnail_scrollram, *gunnail_scrollramy;
src/mame/drivers/aerofgt.c
r3535r3536
6363#include "sound/2610intf.h"
6464#include "sound/3812intf.h"
6565#include "sound/okim6295.h"
66#include "includes/aerofgt.h"
6667
6768
68extern UINT16 *aerofgt_rasterram;
69extern UINT16 *aerofgt_bg1videoram,*aerofgt_bg2videoram;
70extern UINT16 *aerofgt_spriteram1,*aerofgt_spriteram2,*aerofgt_spriteram3;
71extern UINT16 *wbbc97_bitmapram;
72extern size_t aerofgt_spriteram1_size,aerofgt_spriteram2_size,aerofgt_spriteram3_size;
73extern UINT16 *spikes91_tx_tilemap_ram;
74
75WRITE16_HANDLER( aerofgt_bg1videoram_w );
76WRITE16_HANDLER( aerofgt_bg2videoram_w );
77WRITE16_HANDLER( pspikes_gfxbank_w );
78WRITE16_HANDLER( pspikesb_gfxbank_w );
79WRITE16_HANDLER( spikes91_lookup_w );
80WRITE16_HANDLER( karatblz_gfxbank_w );
81WRITE16_HANDLER( spinlbrk_gfxbank_w );
82WRITE16_HANDLER( turbofrc_gfxbank_w );
83WRITE16_HANDLER( aerofgt_gfxbank_w );
84WRITE16_HANDLER( aerofgt_bg1scrollx_w );
85WRITE16_HANDLER( aerofgt_bg1scrolly_w );
86WRITE16_HANDLER( aerofgt_bg2scrollx_w );
87WRITE16_HANDLER( aerofgt_bg2scrolly_w );
88WRITE16_HANDLER( pspikes_palette_bank_w );
89WRITE16_HANDLER( wbbc97_bitmap_enable_w );
90VIDEO_START( pspikes );
91VIDEO_START( karatblz );
92VIDEO_START( spinlbrk );
93VIDEO_START( turbofrc );
94VIDEO_UPDATE( pspikes );
95VIDEO_UPDATE( pspikesb );
96VIDEO_UPDATE( spikes91 );
97VIDEO_UPDATE( karatblz );
98VIDEO_UPDATE( spinlbrk );
99VIDEO_UPDATE( turbofrc );
100VIDEO_UPDATE( aerofgt );
101VIDEO_UPDATE( aerfboot );
102VIDEO_UPDATE( aerfboo2 );
103VIDEO_START( wbbc97 );
104VIDEO_UPDATE( wbbc97 );
105
106
10769static int pending_command;
10870
10971static WRITE16_HANDLER( sound_command_w )
src/mame/drivers/expro02.c
r3535r3536
149149#include "includes/kaneko16.h"
150150#include "sound/okim6295.h"
151151
152/*************************************
153 *
154 *  Game-specific port definitions
155 *
156 *************************************/
157
152158static INPUT_PORTS_START( galsnew )
159
153160   PORT_START("DSW1")
154   PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
161   PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )   PORT_DIPLOCATION("SWA:1,2")
155162   PORT_DIPSETTING(      0x0002, DEF_STR( Easy ) )
156163   PORT_DIPSETTING(      0x0003, DEF_STR( Normal ) )
157164   PORT_DIPSETTING(      0x0001, DEF_STR( Hard ) )
158165   PORT_DIPSETTING(      0x0000, DEF_STR( Hardest ) )
159   PORT_DIPNAME( 0x000C, 0x000C, DEF_STR( Lives ) )
166   PORT_DIPNAME( 0x000C, 0x000C, DEF_STR( Lives ) )   PORT_DIPLOCATION("SWA:3,4")
160167   PORT_DIPSETTING(      0x0004, "2" )
161168   PORT_DIPSETTING(      0x000C, "3" )
162169   PORT_DIPSETTING(      0x0008, "4" )
163170   PORT_DIPSETTING(      0x0000, "5" )
164   PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Demo_Sounds ) )
171   PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Demo_Sounds ) )   PORT_DIPLOCATION("SWA:5")
165172   PORT_DIPSETTING(      0x0000, DEF_STR( Off ) )
166173   PORT_DIPSETTING(      0x0010, DEF_STR( On ) )
167   PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) )
168   PORT_DIPSETTING(      0x0020, DEF_STR( Off ) )
169   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
170   PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) )
174   PORT_DIPNAME( 0x0020, 0x0020, "Use Button" )      PORT_DIPLOCATION("SWA:6")
175   PORT_DIPSETTING(      0x0000, DEF_STR( No ) )
176   PORT_DIPSETTING(      0x0020, DEF_STR( Yes ) )
177   PORT_DIPNAME( 0x0040, 0x0040, "Censored Girls" )   PORT_DIPLOCATION("SWA:7")
171178   PORT_DIPSETTING(      0x0040, DEF_STR( Off ) )
172179   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
173   PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) )
174   PORT_DIPSETTING(      0x0080, DEF_STR( Off ) )
175   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
180   PORT_DIPNAME( 0x0080, 0x0080, "Show Ending Picture" )   PORT_DIPLOCATION("SWA:8")
181   PORT_DIPSETTING(      0x0000, DEF_STR( Off ) )
182   PORT_DIPSETTING(      0x0080, DEF_STR( On ) )
176183
177184   PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
178185   PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
179186   PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
180187   PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
181188   PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
182   PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
183   PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
184   PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
189   PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)   /* "Shot2" in "test mode" */
190   PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
191   PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
185192
186193   PORT_START("DSW2")
187   PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
188   PORT_DIPSETTING(      0x0001, DEF_STR( Off ) )
189   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
190   PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Flip_Screen ) )   /* flip screen? */
194   PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0001, "SWB:1" )
195   PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Flip_Screen ) )   PORT_DIPLOCATION("SWB:2")
191196   PORT_DIPSETTING(      0x0002, DEF_STR( Off ) )
192197   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
193   PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Test ) )
194   PORT_DIPSETTING(      0x0004, DEF_STR( Off ) )
195   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
196   PORT_DIPNAME( 0x0038, 0x0038, DEF_STR( Coin_A ) )
198   PORT_SERVICE_DIPLOC( 0x0004, IP_ACTIVE_LOW, "SWB:3" )
199   PORT_DIPNAME( 0x0038, 0x0038, DEF_STR( Coin_A ) )   PORT_DIPLOCATION("SWB:4,5,6")
197200   PORT_DIPSETTING(      0x0028, DEF_STR( 2C_1C ) )
198201   PORT_DIPSETTING(      0x0038, DEF_STR( 1C_1C ) )
199202   PORT_DIPSETTING(      0x0018, DEF_STR( 1C_2C ) )
200203   PORT_DIPSETTING(      0x0010, DEF_STR( 1C_3C ) )
201204   PORT_DIPSETTING(      0x0000, DEF_STR( 1C_4C ) )
202205   PORT_DIPSETTING(      0x0008, DEF_STR( 1C_6C ) )
203   PORT_DIPNAME( 0x0040, 0x0040, "Coin B-1" )
204   PORT_DIPSETTING(      0x0040, DEF_STR( Off ) )
205   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
206   PORT_DIPNAME( 0x0080, 0x0080, "Coin B-2" )
207   PORT_DIPSETTING(      0x0080, DEF_STR( Off ) )
208   PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
209   /* Coinage - Japan (0x03ffff.b = 01) and US (0x03ffff.b = 02)
210    PORT_DIPNAME( 0x0030, 0x0030, DEF_STR( Coin_A ) )
211    PORT_DIPSETTING(      0x0010, DEF_STR( 2C_1C ) )
212    PORT_DIPSETTING(      0x0030, DEF_STR( 1C_1C ) )
213    PORT_DIPSETTING(      0x0000, DEF_STR( 2C_3C ) )
214    PORT_DIPSETTING(      0x0020, DEF_STR( 1C_2C ) )
215    PORT_DIPNAME( 0x00c0, 0x00c0, DEF_STR( Coin_B ) )
216    PORT_DIPSETTING(      0x0040, DEF_STR( 2C_1C ) )
217    PORT_DIPSETTING(      0x00c0, DEF_STR( 1C_1C ) )
218    PORT_DIPSETTING(      0x0000, DEF_STR( 2C_3C ) )
219    PORT_DIPSETTING(      0x0080, DEF_STR( 1C_2C ) )
220    */
206   PORT_DIPNAME( 0x00c0, 0x00c0, DEF_STR( Coin_B ) )   PORT_DIPLOCATION("SWB:7,8")
207   PORT_DIPSETTING(      0x0080, DEF_STR( 2C_1C ) )
208   PORT_DIPSETTING(      0x00c0, DEF_STR( 1C_1C ) )
209   PORT_DIPSETTING(      0x0040, DEF_STR( 1C_2C ) )
210   PORT_DIPSETTING(      0x0000, DEF_STR( 1C_6C ) )
211
212
221213   PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
222214   PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
223215   PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
224216   PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
225217   PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
226218   PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)   /* "Shot2" in "test mode" */
227   PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
228   PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
219   PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
220   PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
229221
230222   PORT_START("DSW3")
231223   PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
src/mame/drivers/senjyo.c
r3535r3536
6969***************************************************************************/
7070
7171#include "driver.h"
72#include "machine/z80ctc.h"
73#include "machine/z80pio.h"
7472#include "sound/sn76496.h"
7573#include "sound/samples.h"
76#include "cpu/z80/z80daisy.h"
7774#include "machine/segacrpt.h"
75#include "includes/senjyo.h"
7876
7977
80
81extern UINT8 *senjyo_fgscroll;
82extern UINT8 *senjyo_scrollx1,*senjyo_scrolly1;
83extern UINT8 *senjyo_scrollx2,*senjyo_scrolly2;
84extern UINT8 *senjyo_scrollx3,*senjyo_scrolly3;
85extern UINT8 *senjyo_fgvideoram,*senjyo_fgcolorram;
86extern UINT8 *senjyo_bg1videoram,*senjyo_bg2videoram,*senjyo_bg3videoram;
87extern UINT8 *senjyo_radarram;
88extern UINT8 *senjyo_bgstripesram;
89WRITE8_HANDLER( senjyo_fgvideoram_w );
90WRITE8_HANDLER( senjyo_fgcolorram_w );
91WRITE8_HANDLER( senjyo_bg1videoram_w );
92WRITE8_HANDLER( senjyo_bg2videoram_w );
93WRITE8_HANDLER( senjyo_bg3videoram_w );
94WRITE8_HANDLER( senjyo_bgstripes_w );
95
96VIDEO_START( senjyo );
97VIDEO_UPDATE( senjyo );
98extern int is_senjyo, senjyo_scrollhack;
99
100/* in audio/senjyo.c */
101extern const z80_daisy_chain senjyo_daisy_chain[];
102extern const z80pio_interface senjyo_pio_intf;
103void senjyo_sh_start(void);
104
105WRITE8_HANDLER( senjyo_volume_w );
106
107
108
109
11078static int int_delay_kludge;
11179
11280static MACHINE_RESET( senjyo )
r3535r3536
623591};
624592
625593
626extern const z80ctc_interface senjyo_ctc_intf;
627
628594static MACHINE_DRIVER_START( senjyo )
629595
630596   /* basic machine hardware */
src/mame/drivers/segaxbd.c
r3535r3536
107107   if (irq)
108108   {
109109      cpunum_set_input_line(machine, 0, irq, ASSERT_LINE);
110      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
110      cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(100));
111111   }
112112}
113113
r3535r3536
199199static void xboard_reset(void)
200200{
201201   cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE);
202   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
202   cpu_boost_interleave(Machine, attotime_zero, ATTOTIME_IN_USEC(100));
203203}
204204
205205
r3535r3536
455455static WRITE16_HANDLER( loffire_sync0_w )
456456{
457457   COMBINE_DATA(&loffire_sync[offset]);
458   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(10));
458   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(10));
459459}
460460
461461
src/mame/drivers/nbmj9195.c
r3535r3536
2525#include "sound/3812intf.h"
2626#include "sound/dac.h"
2727#include "cpu/z80/z80daisy.h"
28#include "includes/nbmj9195.h"
2829
2930
3031#define SIGNED_DAC   0      // 0:unsigned DAC, 1:signed DAC
r3535r3536
3738#endif
3839
3940
40extern VIDEO_UPDATE( nbmj9195 );
41extern VIDEO_START( nbmj9195_1layer );
42extern VIDEO_START( nbmj9195_2layer );
43extern VIDEO_START( nbmj9195_nb22090 );
44
45extern READ8_HANDLER( nbmj9195_palette_r );
46extern WRITE8_HANDLER( nbmj9195_palette_w );
47extern READ8_HANDLER( nbmj9195_nb22090_palette_r );
48extern WRITE8_HANDLER( nbmj9195_nb22090_palette_w );
49
50extern READ8_HANDLER( nbmj9195_blitter_0_r );
51extern READ8_HANDLER( nbmj9195_blitter_1_r );
52extern WRITE8_HANDLER( nbmj9195_blitter_0_w );
53extern WRITE8_HANDLER( nbmj9195_blitter_1_w );
54extern WRITE8_HANDLER( nbmj9195_clut_0_w );
55extern WRITE8_HANDLER( nbmj9195_clut_1_w );
56extern void nbmj9195_clutsel_w(int data);
57extern void nbmj9195_gfxflag2_w(int data);
58
59
6041static int nbmj9195_inputport;
6142static int nbmj9195_dipswbitsel;
6243static int nbmj9195_outcoin_flag;
src/mame/drivers/cliffhgr.c
r3535r3536
669669   vdp_interrupt
670670};
671671
672extern const discrete_sound_block cliffhgr_discrete_interface[];
672DISCRETE_SOUND_EXTERN( cliffhgr );
673673
674674
675675
src/mame/drivers/coolpool.c
r3535r3536
316316   cpunum_set_input_line(machine, 1, 0, HOLD_LINE);   /* ???  I have no idea who should generate this! */
317317                              /* the DSP polls the status bit so it isn't strictly */
318318                              /* necessary to also have an IRQ */
319   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(50));
319   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(50));
320320}
321321
322322
src/mame/drivers/speedatk.c
r3535r3536
55driver by Pierpaolo Prazzoli & Angelo Salese, based on early work by David Haywood
66
77TODO:
8 - Coinage Dip Switch doesn't match the readme? Also there are wrong coin insertions even
9   with the bit impulse macro. There are chances that there's a circuitry which controls
10   both...
8 - Video emulation requires a major conversion to the HD46505SP C.R.T. chip (MC6845 clone)
9 - It's possible that there is only one coin chute and not two,needs a real board to know
10   more about it.
1111
1212How to play:
1313 - A to D selects a card.
r3535r3536
7878#include "sound/ay8910.h"
7979
8080static UINT8 mux_data;
81static UINT8 km_status,coin_settings;
8182
8283extern WRITE8_HANDLER( speedatk_videoram_w );
8384extern WRITE8_HANDLER( speedatk_colorram_w );
84extern WRITE8_HANDLER( speedatk_flip_screen_w );
85extern WRITE8_HANDLER( speedatk_videoregs_w );
8586extern PALETTE_INIT( speedatk );
8687extern VIDEO_START( speedatk );
8788extern VIDEO_UPDATE( speedatk );
r3535r3536
9293 * it handles the multiplexer device between player one and two.                       */
9394static READ8_HANDLER( key_matrix_r )
9495{
96   static UINT8 coin_impulse;
97
98   if(coin_impulse > 0)
99   {
100      coin_impulse--;
101      return 0x80;
102   }
103
104   if((input_port_read(machine,"COINS") & 1) || (input_port_read(machine,"COINS") & 2))
105   {
106      coin_impulse = coin_settings;
107      coin_impulse--;
108      return 0x80;
109   }
110
95111   switch(mux_data)
96112   {
97113      case 0x02:
r3535r3536
109125            case 0x100: return 0x10;
110126            case 0x200: return 0x20;
111127            case 0x400: return 0x40;
112            case 0x800: return 0x80;
113128            default:   return 0x00;
114129         }
115130      }
r3535r3536
128143            case 0x100: return 0x10;
129144            case 0x200: return 0x20;
130145            case 0x400: return 0x40;
131            case 0x800: return 0x80;
132146            default:   return 0x00;
133147         }
134148      }
r3535r3536
143157   mux_data = data;
144158}
145159
146static READ8_HANDLER( read_8001 )
160/*Key matrix status,used for coin settings and I don't know what else...*/
161static READ8_HANDLER( key_matrix_status_r )
147162{
148   return 1;
163   /*bit 0: busy flag,active low*/
164   return (km_status & 0xfe) | 1;
149165}
150166
151static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
152   AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
153   AM_RANGE(0x8000, 0x8000) AM_READ(key_matrix_r)
154   AM_RANGE(0x8001, 0x8001) AM_READ(read_8001)
155   AM_RANGE(0x8588, 0x858f) AM_READ(SMH_RAM)
156   AM_RANGE(0x8800, 0x8bff) AM_READ(SMH_RAM)
157   AM_RANGE(0x8c00, 0x8fff) AM_READ(SMH_RAM)
158   AM_RANGE(0xa000, 0xa3ff) AM_READ(SMH_RAM)
159   AM_RANGE(0xb000, 0xb3ff) AM_READ(SMH_RAM)
160ADDRESS_MAP_END
167static WRITE8_HANDLER( key_matrix_status_w )
168{
169   km_status = data;
170   if(km_status & 0x80 && km_status < 0xa0)
171      coin_settings = km_status & 0xf;
172}
161173
162static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
163   AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
164   AM_RANGE(0x8000, 0x8000) AM_WRITE(key_matrix_w)
165   AM_RANGE(0x8588, 0x858f) AM_WRITE(SMH_RAM)
166   AM_RANGE(0x8800, 0x8bff) AM_WRITE(SMH_RAM)
167   AM_RANGE(0x8c00, 0x8fff) AM_WRITE(SMH_RAM)
168   AM_RANGE(0xa000, 0xa3ff) AM_WRITE(speedatk_videoram_w) AM_BASE(&videoram)
169   AM_RANGE(0xb000, 0xb3ff) AM_WRITE(speedatk_colorram_w) AM_BASE(&colorram)
174static ADDRESS_MAP_START( speedatk_mem, ADDRESS_SPACE_PROGRAM, 8 )
175   AM_RANGE(0x0000, 0x7fff) AM_ROM
176   AM_RANGE(0x8000, 0x8000) AM_READWRITE(key_matrix_r,key_matrix_w)
177   AM_RANGE(0x8001, 0x8001) AM_READWRITE(key_matrix_status_r,key_matrix_status_w)
178   AM_RANGE(0x8800, 0x8bff) AM_RAM
179   AM_RANGE(0xa000, 0xa3ff) AM_RAM_WRITE(speedatk_videoram_w) AM_BASE(&videoram)
180   AM_RANGE(0xb000, 0xb3ff) AM_RAM_WRITE(speedatk_colorram_w) AM_BASE(&colorram)
170181ADDRESS_MAP_END
171182
172static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
183static ADDRESS_MAP_START( speedatk_io, ADDRESS_SPACE_IO, 8 )
173184   ADDRESS_MAP_GLOBAL_MASK(0xff)
174   AM_RANGE(0x01, 0x01) AM_WRITE(speedatk_flip_screen_w)
185   AM_RANGE(0x00, 0x01) AM_WRITE(speedatk_videoregs_w) // HD46505SP video registers
186   AM_RANGE(0x24, 0x24) AM_WRITE(SMH_NOP) //video timing
175187   AM_RANGE(0x40, 0x40) AM_READ_PORT("DSW") AM_WRITE(ay8910_control_port_0_w)
176188   AM_RANGE(0x41, 0x41) AM_WRITE(ay8910_write_port_0_w)
177   /* are these not used? after they're read it sets bit 7 */
178   AM_RANGE(0x60, 0x60) AM_READ(SMH_NOP)
179   AM_RANGE(0x61, 0x61) AM_READ(SMH_NOP)
180   AM_RANGE(0x68, 0x68) AM_READ(SMH_NOP)
189   /*Used only during attract mode,unknown meaning.*/
190   AM_RANGE(0x60, 0x60) AM_READWRITE(SMH_NOP,SMH_NOP)//write the result to $62/$65
191   AM_RANGE(0x61, 0x61) AM_READ(SMH_NOP)//write the result to $66
192   AM_RANGE(0x62, 0x62) AM_WRITE(SMH_NOP)
193   AM_RANGE(0x65, 0x65) AM_WRITE(SMH_NOP)
194   AM_RANGE(0x66, 0x66) AM_WRITE(SMH_NOP)
195   AM_RANGE(0x68, 0x68) AM_READ(SMH_NOP)//bit 7 controls writings to ram address at $880f-$8810
181196ADDRESS_MAP_END
182197
183198static INPUT_PORTS_START( speedatk )
r3535r3536
197212   PORT_DIPSETTING(    0x20, DEF_STR( Normal ) )
198213   PORT_DIPSETTING(    0x10, DEF_STR( Hard ) )
199214   PORT_DIPSETTING(    0x30, DEF_STR( Hardest ) )
200   /* Doesn't work? */
201215   PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Coinage ) )
202216   PORT_DIPSETTING(    0x00, DEF_STR( 1C_1C ) )
203   PORT_DIPSETTING(    0x40, DEF_STR( 1C_2C ) )
204   PORT_DIPSETTING(    0x80, DEF_STR( 1C_5C ) )
217   PORT_DIPSETTING(    0x80, DEF_STR( 1C_2C ) )
218   PORT_DIPSETTING(    0x40, DEF_STR( 1C_5C ) )
205219   PORT_DIPSETTING(    0xc0, "1 Coin/10 Credits" )
206220
207221   PORT_START("P1")
r3535r3536
216230   PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_PLAYER(1) //P1 Turn
217231   PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED )
218232   PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED )
219   PORT_BIT( 0x800, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(2)
220233
221234   PORT_START("P2")
222235   PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) //P2 A
r3535r3536
230243   PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_PLAYER(2) //P2 Turn
231244   PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED )
232245   PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED )
233   PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(2)
246
247   PORT_START("COINS")
248   PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
249   PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
234250INPUT_PORTS_END
235251
236252static const gfx_layout charlayout_1bpp =
r3535r3536
263279
264280static MACHINE_DRIVER_START( speedatk )
265281   MDRV_CPU_ADD("main", Z80,12000000/2)
266   MDRV_CPU_PROGRAM_MAP(readmem,writemem)
267   MDRV_CPU_IO_MAP(io_map,0)
282   MDRV_CPU_PROGRAM_MAP(speedatk_mem,0)
283   MDRV_CPU_IO_MAP(speedatk_io,0)
268284   MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
269285
270286   /* video hardware */
r3535r3536
302318   ROM_REGION( 0x6000, "gfx2", ROMREGION_DISPOSE )
303319   ROM_LOAD( "cb0-5",        0x0000, 0x2000, CRC(47a966e7) SHA1(fdaa0f88656afc431bae367679ce6298fa962e0f) )
304320   ROM_LOAD( "cb0-6",        0x2000, 0x2000, CRC(cc1da937) SHA1(1697bb008bfa5c33a282bd470ac39c324eea7509) )
305   ROM_COPY( "gfx2",    0x0000, 0x4000, 0x1000 ) /* Fill the blank space with cards gfx */
306   ROM_COPY( "gfx1",    0x1000, 0x5000, 0x1000 ) /* Gfx from cb0-7 */
321   ROM_COPY( "gfx2",         0x0000, 0x4000, 0x1000 ) /* Fill the blank space with cards gfx */
322   ROM_COPY( "gfx1",         0x1000, 0x5000, 0x1000 ) /* Gfx from cb0-7 */
307323
308324   ROM_REGION( 0x0120, "proms", 0 )
309325   ROM_LOAD( "cb1.bpr",      0x0000, 0x0020, CRC(a0176c23) SHA1(133fb9eef8a6595cac2dcd7edce4789899a59e84) ) /* color PROM */
310326   ROM_LOAD( "cb2.bpr",      0x0020, 0x0100, CRC(a604cf96) SHA1(a4ef6e77dcd3abe4c27e8e636222a5ee711a51f5) ) /* lookup table */
311327ROM_END
312328
313GAME( 1984, speedatk, 0, speedatk, speedatk, 0, ROT0, "Seta Kikaku Corp.", "Speed Attack!", 0 )
329GAME( 1984, speedatk, 0, speedatk, speedatk, 0, ROT0, "Seta Kikaku Corp.", "Speed Attack! (Japan)", 0 )
314330
src/mame/drivers/powerins.c
r3535r3536
379379
380380   MDRV_SOUND_ADD("oki1", OKIM6295, 4000000)
381381   MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
382   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
382   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
383383
384384   MDRV_SOUND_ADD("oki2", OKIM6295, 4000000)
385385   MDRV_SOUND_CONFIG(okim6295_interface_pin7low)
386   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
386   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
387387
388388   MDRV_SOUND_ADD("ym2203", YM2203, 12000000 / 8)
389389   MDRV_SOUND_CONFIG(ym2203_config)
390   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
390   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
391391MACHINE_DRIVER_END
392392
393393static MACHINE_DRIVER_START( powerina )
src/mame/drivers/niyanpai.c
r3535r3536
3939#include "sound/dac.h"
4040#include "sound/3812intf.h"
4141#include "cpu/z80/z80daisy.h"
42#include "includes/niyanpai.h"
4243
4344
4445#define SIGNED_DAC   0      // 0:unsigned DAC, 1:signed DAC
r3535r3536
5253
5354
5455
55extern VIDEO_UPDATE( niyanpai );
56extern VIDEO_START( niyanpai );
57
58extern READ16_HANDLER( niyanpai_palette_r );
59extern WRITE16_HANDLER( niyanpai_palette_w );
60
61extern READ16_HANDLER( niyanpai_blitter_0_r );
62extern READ16_HANDLER( niyanpai_blitter_1_r );
63extern READ16_HANDLER( niyanpai_blitter_2_r );
64extern WRITE16_HANDLER( niyanpai_blitter_0_w );
65extern WRITE16_HANDLER( niyanpai_blitter_1_w );
66extern WRITE16_HANDLER( niyanpai_blitter_2_w );
67extern WRITE16_HANDLER( niyanpai_clut_0_w );
68extern WRITE16_HANDLER( niyanpai_clut_1_w );
69extern WRITE16_HANDLER( niyanpai_clut_2_w );
70extern WRITE16_HANDLER( niyanpai_clutsel_0_w );
71extern WRITE16_HANDLER( niyanpai_clutsel_1_w );
72extern WRITE16_HANDLER( niyanpai_clutsel_2_w );
73
74
7556static int musobana_inputport;
7657static int musobana_outcoin_flag;
7758
src/mame/drivers/suprnova.c
r3535r3536
187187#include "deprecat.h"
188188#include "sound/ymz280b.h"
189189#include "cpu/sh2/sh2.h"
190#include "includes/suprnova.h"
190191
191192#define BIOS_SKIP 1 // Skip Bios as it takes too long and doesn't complete atm.
192193
193// Defined in video
194extern void skns_sprite_kludge(int x, int y);
195
196194UINT32 *skns_tilemapA_ram, *skns_tilemapB_ram, *skns_v3slc_ram;
197195UINT32 *skns_palette_ram;
198196UINT32 *skns_pal_regs, *skns_v3_regs, *skns_spc_regs;
r3535r3536
201199UINT32 skns_v3t_4bppdirty[0x8000]; // allocate this elsewhere?
202200int skns_v3t_somedirty,skns_v3t_4bpp_somedirty;
203201
204WRITE32_HANDLER ( skns_tilemapA_w );
205WRITE32_HANDLER ( skns_tilemapB_w );
206WRITE32_HANDLER ( skns_v3_regs_w );
207WRITE32_HANDLER ( skns_pal_regs_w );
208WRITE32_HANDLER ( skns_palette_ram_w );
209VIDEO_START(skns);
210VIDEO_RESET(skns);
211VIDEO_EOF(skns);
212VIDEO_UPDATE(skns);
213
214202static UINT32 *skns_v3t_ram, *skns_main_ram, *skns_cache_ram;
215203
216204/* hit.c */
src/mame/drivers/galpani3.c
r3535r3536
6666#include "driver.h"
6767#include "deprecat.h"
6868#include "sound/ymz280b.h"
69#include "includes/suprnova.h"
6970
70extern UINT32* skns_spc_regs;
7171
7272/***************************************************************************
7373
r3535r3536
9797   skns_spc_regs = auto_malloc (0x40);
9898}
9999
100extern void skns_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect );
101
102
103100static VIDEO_UPDATE(galpani3)
104101{
105102   fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
src/mame/drivers/itech32.c
r3535r3536
788788   if (offset == 0) COMBINE_DATA(tms1_boot);
789789   if (offset == 0x382 && tms_spinning[0]) STOP_TMS_SPINNING(machine, 0);
790790   if (!tms_spinning[0])
791      cpu_boost_interleave(ATTOTIME_IN_HZ(CPU020_CLOCK/256), ATTOTIME_IN_USEC(20));
791      cpu_boost_interleave(machine, ATTOTIME_IN_HZ(CPU020_CLOCK/256), ATTOTIME_IN_USEC(20));
792792}
793793
794794
r3535r3536
797797   COMBINE_DATA(&tms2_ram[offset]);
798798   if (offset == 0x382 && tms_spinning[1]) STOP_TMS_SPINNING(machine, 1);
799799   if (!tms_spinning[1])
800      cpu_boost_interleave(ATTOTIME_IN_HZ(CPU020_CLOCK/256), ATTOTIME_IN_USEC(20));
800      cpu_boost_interleave(machine, ATTOTIME_IN_HZ(CPU020_CLOCK/256), ATTOTIME_IN_USEC(20));
801801}
802802
803803
804804static WRITE32_HANDLER( tms1_trigger_w )
805805{
806806   COMBINE_DATA(&tms1_ram[offset]);
807   cpu_boost_interleave(ATTOTIME_IN_HZ(CPU020_CLOCK/256), ATTOTIME_IN_USEC(20));
807   cpu_boost_interleave(machine, ATTOTIME_IN_HZ(CPU020_CLOCK/256), ATTOTIME_IN_USEC(20));
808808}
809809
810810
811811static WRITE32_HANDLER( tms2_trigger_w )
812812{
813813   COMBINE_DATA(&tms2_ram[offset]);
814   cpu_boost_interleave(ATTOTIME_IN_HZ(CPU020_CLOCK/256), ATTOTIME_IN_USEC(20));
814   cpu_boost_interleave(machine, ATTOTIME_IN_HZ(CPU020_CLOCK/256), ATTOTIME_IN_USEC(20));
815815}
816816
817817
src/mame/drivers/fitfight.c
r3535r3536
8484#include "driver.h"
8585#include "cpu/upd7810/upd7810.h"
8686#include "sound/okim6295.h"
87#include "includes/fitfight.h"
8788
8889
8990UINT16 *fitfight_spriteram;
r3535r3536
101102
102103static UINT16 fitfight_700000_data = 0;
103104
104WRITE16_HANDLER( fof_bak_tileram_w );
105WRITE16_HANDLER( fof_mid_tileram_w );
106WRITE16_HANDLER( fof_txt_tileram_w );
107VIDEO_START(fitfight);
108VIDEO_UPDATE(fitfight);
109
110105static READ16_HANDLER(fitfight_700000_r)
111106{
112107   UINT16 data = fitfight_700000_data;
src/mame/drivers/sspeedr.c
r3535r3536
55***************************************************************************/
66
77#include "driver.h"
8
98#include "sspeedr.lh"
9#include "includes/sspeedr.h"
1010
11extern WRITE8_HANDLER( sspeedr_driver_horz_w );
12extern WRITE8_HANDLER( sspeedr_driver_horz_2_w );
13extern WRITE8_HANDLER( sspeedr_driver_vert_w );
14extern WRITE8_HANDLER( sspeedr_driver_pic_w );
15
16extern WRITE8_HANDLER( sspeedr_drones_horz_w );
17extern WRITE8_HANDLER( sspeedr_drones_horz_2_w );
18extern WRITE8_HANDLER( sspeedr_drones_vert_w );
19extern WRITE8_HANDLER( sspeedr_drones_mask_w );
20
21extern WRITE8_HANDLER( sspeedr_track_horz_w );
22extern WRITE8_HANDLER( sspeedr_track_horz_2_w );
23extern WRITE8_HANDLER( sspeedr_track_vert_w );
24extern WRITE8_HANDLER( sspeedr_track_ice_w );
25
26extern VIDEO_START( sspeedr );
27extern VIDEO_UPDATE( sspeedr );
28extern VIDEO_EOF( sspeedr );
29
3011static UINT8 led_TIME[2];
3112static UINT8 led_SCORE[24];
3213
src/mame/drivers/argus.c
r3535r3536
8989#include "driver.h"
9090#include "deprecat.h"
9191#include "sound/2203intf.h"
92#include "includes/argus.h"
9293
9394
9495/***************************************************************************
9596
96  Variables
97
98***************************************************************************/
99
100extern UINT8 *argus_paletteram;
101extern UINT8 *argus_txram;
102extern UINT8 *argus_bg0ram;
103extern UINT8 *argus_bg0_scrollx;
104extern UINT8 *argus_bg0_scrolly;
105extern UINT8 *argus_bg1ram;
106extern UINT8 *argus_bg1_scrollx;
107extern UINT8 *argus_bg1_scrolly;
108extern UINT8 *butasan_bg1ram;
109
110VIDEO_START( argus );
111VIDEO_START( valtric );
112VIDEO_START( butasan );
113VIDEO_RESET( argus );
114VIDEO_RESET( valtric );
115VIDEO_RESET( butasan );
116VIDEO_UPDATE( argus );
117VIDEO_UPDATE( valtric );
118VIDEO_UPDATE( butasan );
119
120READ8_HANDLER( argus_txram_r );
121READ8_HANDLER( argus_bg1ram_r );
122READ8_HANDLER( argus_paletteram_r );
123
124WRITE8_HANDLER( argus_txram_w );
125WRITE8_HANDLER( argus_bg1ram_w );
126WRITE8_HANDLER( argus_bg0_scrollx_w );
127WRITE8_HANDLER( argus_bg0_scrolly_w );
128WRITE8_HANDLER( argus_bg1_scrollx_w );
129WRITE8_HANDLER( argus_bg1_scrolly_w );
130WRITE8_HANDLER( argus_bg_status_w );
131WRITE8_HANDLER( argus_flipscreen_w );
132WRITE8_HANDLER( argus_paletteram_w );
133
134WRITE8_HANDLER( valtric_bg_status_w );
135WRITE8_HANDLER( valtric_paletteram_w );
136WRITE8_HANDLER( valtric_mosaic_w );
137WRITE8_HANDLER( valtric_unknown_w );
138
139READ8_HANDLER( butasan_pagedram_r );
140READ8_HANDLER( butasan_bg1ram_r );
141READ8_HANDLER( butasan_txbackram_r );
142READ8_HANDLER( butasan_bg0backram_r );
143WRITE8_HANDLER( butasan_pageselect_w );
144WRITE8_HANDLER( butasan_pagedram_w );
145WRITE8_HANDLER( butasan_bg1ram_w );
146WRITE8_HANDLER( butasan_bg0_status_w );
147WRITE8_HANDLER( butasan_paletteram_w );
148WRITE8_HANDLER( butasan_txbackram_w );
149WRITE8_HANDLER( butasan_bg0backram_w );
150WRITE8_HANDLER( butasan_bg1_status_w );
151WRITE8_HANDLER( butasan_unknown_w );
152
153
154/***************************************************************************
155
15697  Interrupt(s)
15798
15899***************************************************************************/
src/mame/drivers/segaybd.c
r3535r3536
7777   cpunum_set_input_line(machine, 2, 6, timer_irq_state && vblank_irq_state ? ASSERT_LINE : CLEAR_LINE);
7878
7979   if(timer_irq_state || vblank_irq_state)
80      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(50));
80      cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(50));
8181}
8282
8383
src/mame/drivers/segaorun.c
r3535r3536
174174   cpunum_set_input_line(machine, 0, 6, vblank_irq_state && irq2_state ? ASSERT_LINE : CLEAR_LINE);
175175
176176   if(vblank_irq_state || irq2_state)
177      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
177      cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(100));
178178}
179179
180180
src/mame/drivers/armedf.c
r3535r3536
163163#include "cpu/z80/z80.h"
164164#include "sound/dac.h"
165165#include "sound/3812intf.h"
166#include "includes/armedf.h"
166167
167168#define LEGION_HACK   0
168169
169170
170extern void armedf_setgfxtype( int type );
171
172VIDEO_UPDATE( armedf );
173VIDEO_EOF( armedf );
174VIDEO_START( armedf );
175
176WRITE16_HANDLER( armedf_bg_videoram_w );
177WRITE16_HANDLER( armedf_fg_videoram_w );
178WRITE16_HANDLER( armedf_text_videoram_w );
179WRITE16_HANDLER( terraf_fg_scrollx_w );
180WRITE16_HANDLER( terraf_fg_scrolly_w );
181WRITE16_HANDLER( terraf_fg_scroll_msb_arm_w );
182WRITE16_HANDLER( armedf_fg_scrollx_w );
183WRITE16_HANDLER( armedf_fg_scrolly_w );
184WRITE16_HANDLER( armedf_bg_scrollx_w );
185WRITE16_HANDLER( armedf_bg_scrolly_w );
186WRITE16_HANDLER( armedf_mcu_cmd );
187
188extern UINT16 armedf_vreg;
189extern UINT16 *armedf_bg_videoram;
190extern UINT16 *armedf_fg_videoram;
191extern UINT16 *terraf_text_videoram;
192extern UINT16 *legion_cmd;
193extern tilemap *armedf_tx_tilemap;
194
195171static WRITE16_HANDLER( io_w )
196172{
197173   COMBINE_DATA(&armedf_vreg);
src/mame/drivers/wc90.c
r3535r3536
5454#include "driver.h"
5555#include "cpu/z80/z80.h"
5656#include "sound/2608intf.h"
57#include "includes/wc90.h"
5758
5859
59extern UINT8 *wc90_fgvideoram,*wc90_bgvideoram,*wc90_txvideoram;
60
61
62extern UINT8 *wc90_scroll0xlo, *wc90_scroll0xhi;
63extern UINT8 *wc90_scroll1xlo, *wc90_scroll1xhi;
64extern UINT8 *wc90_scroll2xlo, *wc90_scroll2xhi;
65
66extern UINT8 *wc90_scroll0ylo, *wc90_scroll0yhi;
67extern UINT8 *wc90_scroll1ylo, *wc90_scroll1yhi;
68extern UINT8 *wc90_scroll2ylo, *wc90_scroll2yhi;
69
70VIDEO_START( wc90 );
71VIDEO_START( wc90t );
72WRITE8_HANDLER( wc90_fgvideoram_w );
73WRITE8_HANDLER( wc90_bgvideoram_w );
74WRITE8_HANDLER( wc90_txvideoram_w );
75VIDEO_UPDATE( wc90 );
76
77
7860static UINT8 *wc90_shared;
7961
8062static READ8_HANDLER( wc90_shared_r )
src/mame/drivers/nyny.c
r3535r3536
6363
6464#include "driver.h"
6565#include "machine/rescap.h"
66#include "deprecat.h"
6766#include "machine/6821pia.h"
6867#include "machine/74123.h"
6968#include "video/mc6845.h"
r3535r3536
205204 *
206205 *************************************/
207206
208static void ic48_1_74123_output_changed(int output)
207static WRITE8_DEVICE_HANDLER(ic48_1_74123_output_changed)
209208{
210   pia_2_ca1_w(Machine, 0, output);
209   pia_2_ca1_w(device->machine, 0, data);
211210}
212211
213212
214static const TTL74123_interface ic48_1_intf =
213static const ttl74123_config ic48_1_config =
215214{
216215   TTL74123_GROUNDED,   /* the hook up type */
217216   RES_K(22),         /* resistor connected to RCext */
r3535r3536
235234   pia_config(1, &pia_1_intf);
236235   pia_config(2, &pia_2_intf);
237236
238   TTL74123_config(0, &ic48_1_intf);
239
240237   /* setup for save states */
241238   state_save_register_global(flipscreen);
242239   state_save_register_global(star_enable);
r3535r3536
255252static MACHINE_RESET( nyny )
256253{
257254   pia_reset();
258   TTL74123_reset(0);
259255}
260256
261257
r3535r3536
397393
398394static MC6845_ON_DE_CHANGED( display_enable_changed )
399395{
400   TTL74123_A_w(0, display_enabled);
396   ttl74123_a_w(devtag_get_device(device->machine, TTL74123, "ic48_1"), 0, display_enabled);
401397}
402398
403399
r3535r3536
689685   MDRV_DEVICE_ADD("crtc", MC6845)
690686   MDRV_DEVICE_CONFIG(mc6845_intf)
691687
688   /* 74LS123 */
689
690   MDRV_DEVICE_ADD("ic48_1", TTL74123)
691   MDRV_DEVICE_CONFIG(ic48_1_config)
692
692693   /* audio hardware */
693694   MDRV_SPEAKER_STANDARD_MONO("mono")
694695
src/mame/drivers/pipeline.c
r3535r3536
210210static WRITE8_DEVICE_HANDLER(protection_w)
211211{
212212   timer_call_after_resynch(NULL, data, protection_deferred_w);
213   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
213   cpu_boost_interleave(device->machine, attotime_zero, ATTOTIME_IN_USEC(100));
214214}
215215
216216static ADDRESS_MAP_START( cpu0_mem, ADDRESS_SPACE_PROGRAM, 8 )
src/mame/drivers/model1.c
r3535r3536
629629#include "machine/eeprom.h"
630630#include "system16.h"
631631#include "video/segaic24.h"
632#include "cpu/m68000/m68k.h"
632#include "cpu/m68000/m68000.h"
633633#include "cpu/mb86233/mb86233.h"
634634#include "sound/multipcm.h"
635635#include "sound/2612intf.h"
r3535r3536
838838
839839static READ16_HANDLER( snd_68k_ready_r )
840840{
841   int sr = cpunum_get_reg(1, M68K_REG_SR);
841   int sr = cpunum_get_reg(1, M68K_SR);
842842
843843   if ((sr & 0x0700) > 0x0100)
844844   {
src/mame/drivers/taito_b.c
r3535r3536
178178#include "sound/2203intf.h"
179179#include "sound/2610intf.h"
180180#include "sound/okim6295.h"
181#include "includes/taito_b.h"
181182
182extern UINT16 *taitob_scroll;
183extern UINT16 *TC0180VCU_ram;
184extern UINT16 *taitob_spriteram;
185extern UINT16 *taitob_pixelram;
186
187VIDEO_START( taitob_color_order0 );
188VIDEO_START( taitob_color_order1 );
189VIDEO_START( taitob_color_order2 );
190VIDEO_START( hitice );
191VIDEO_EOF( taitob );
192
193VIDEO_RESET( hitice );
194
195VIDEO_UPDATE( taitob );
196
197WRITE16_HANDLER( TC0180VCU_word_w );
198READ16_HANDLER ( TC0180VCU_word_r );
199
200READ16_HANDLER( TC0180VCU_framebuffer_word_r );
201WRITE16_HANDLER( TC0180VCU_framebuffer_word_w );
202
203WRITE16_HANDLER( taitob_v_control_w );
204READ16_HANDLER ( taitob_v_control_r );
205
206WRITE16_HANDLER( hitice_pixelram_w );
207WRITE16_HANDLER( hitice_pixel_scroll_w );
208
209183static WRITE8_HANDLER( bankswitch_w )
210184{
211185   memory_set_bank(1, (data - 1) & 3);
src/mame/drivers/suna8.c
r3535r3536
4343#include "sound/3812intf.h"
4444#include "sound/dac.h"
4545#include "sound/samples.h"
46#include "includes/suna8.h"
4647
47extern int suna8_text_dim; /* specifies format of text layer */
48
49extern UINT8 suna8_rombank, suna8_spritebank, suna8_palettebank;
50extern UINT8 suna8_unknown;
51
52/* Functions defined in video: */
53
54WRITE8_HANDLER( suna8_spriteram_w );         // for debug
55WRITE8_HANDLER( suna8_banked_spriteram_w );   // for debug
56
57READ8_HANDLER( suna8_banked_paletteram_r );
58READ8_HANDLER( suna8_banked_spriteram_r );
59
60WRITE8_HANDLER( suna8_banked_paletteram_w );
61WRITE8_HANDLER( brickzn_banked_paletteram_w );
62
63VIDEO_START( suna8_textdim0 );
64VIDEO_START( suna8_textdim8 );
65VIDEO_START( suna8_textdim12 );
66VIDEO_UPDATE( suna8 );
67
68/* Functions defined in audio: */
69
70WRITE8_HANDLER( suna8_play_samples_w );
71WRITE8_HANDLER( suna8_samples_number_w );
72void suna8_sh_start(void);
73
7448/***************************************************************************
7549
7650
src/mame/drivers/cps1.c
r3535r3536
83438343   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x70c010, 0x70c011, 0, 0, sf2mdt_r);
83448344   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x70c018, 0x70c019, 0, 0, sf2mdt_r);
83458345
8346   driver_init_cps1(machine);
8346   DRIVER_INIT_CALL(cps1);
83478347}
83488348
83498349
src/mame/drivers/model2.c
r3535r3536
5353#include "machine/eeprom.h"
5454#include "video/segaic24.h"
5555#include "cpu/i960/i960.h"
56#include "cpu/m68000/m68k.h"
56#include "cpu/m68000/m68000.h"
5757#include "cpu/sharc/sharc.h"
5858#include "cpu/mb86233/mb86233.h"
5959#include "sound/scsp.h"
6060#include "sound/multipcm.h"
6161#include "sound/2612intf.h"
62#include "includes/model2.h"
6263
63extern VIDEO_START(model2);
64extern VIDEO_UPDATE(model2);
65
66extern void model2_3d_set_zclip( UINT8 clip );
67
6864UINT32 *model2_bufferram, *model2_colorxlat;
6965static UINT32 *model2_workram, *model2_backup1, *model2_backup2;
7066UINT32 *model2_textureram0, *model2_textureram1, *model2_lumaram;
r3535r3536
630626/* GEO */
631627
632628UINT32 geo_read_start_address = 0;
633static UINT32 geo_write_start_address = 0;
629UINT32 geo_write_start_address = 0;
634630
635631static WRITE32_HANDLER( geo_ctl1_w )
636632{
r3535r3536
905901
906902static int snd_68k_ready_r(void)
907903{
908   int sr = cpunum_get_reg(1, M68K_REG_SR);
904   int sr = cpunum_get_reg(1, M68K_SR);
909905
910906   if ((sr & 0x0700) > 0x0100)
911907   {
src/mame/drivers/cps2.c
r3535r3536
816816
817817static UINT8  cps2_read8(offs_t address)
818818{
819   return m68k_read_pcrelative_8(address);
819   return m68k_read_pcrelative_8(NULL, address);
820820}
821821
822822static UINT16 cps2_read16(offs_t address)
823823{
824   return m68k_read_pcrelative_16(address);
824   return m68k_read_pcrelative_16(NULL, address);
825825}
826826
827827static UINT32 cps2_read32(offs_t address)
828828{
829   return m68k_read_pcrelative_32(address);
829   return m68k_read_pcrelative_32(NULL, address);
830830}
831831
832832
r3535r3536
19241924   ROM_LOAD16_WORD_SWAP( "tkoj.04", 0x080000, 0x80000, CRC(68655378) SHA1(a2d82996394cc28622e93f6c338f9b78aa798775) )
19251925
19261926   ROM_REGION( 0x1000000, "gfx", 0 )
1927   ROMX_LOAD( "tkoj1_d.simm1",   0x0000000, 0x200000, CRC(6933377d) SHA1(a79e129e5faaadd401379905ac76a24fa616d736) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1928   ROMX_LOAD( "tkoj1_c.simm1",   0x0000001, 0x200000, CRC(7f668950) SHA1(247b2b3fa24afd43b0fe6cfb3df987a38c7385cf) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1929   ROMX_LOAD( "tkoj1_b.simm1",   0x0000002, 0x200000, CRC(cfb68ca9) SHA1(36460724b8df36a4ccf88228d9d5f027714c6628) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1930   ROMX_LOAD( "tkoj1_a.simm1",   0x0000003, 0x200000, CRC(437e21c5) SHA1(2c4ace6fa421c91effab8ab8db931b8451b8e6b1) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1931   ROMX_LOAD( "tkoj3_d.simm3",   0x0000004, 0x200000, CRC(a9e32b57) SHA1(0ddbfefa0cc110e46297ecbfbf4b8bc87ce43c95) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1932   ROMX_LOAD( "tkoj3_c.simm3",   0x0000005, 0x200000, CRC(b7ab9338) SHA1(0bb57640eed167e672b5f40cdff0a7b177ff2507) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1933   ROMX_LOAD( "tkoj3_b.simm3",   0x0000006, 0x200000, CRC(4d3f919a) SHA1(eb7f90415a263f0a2b94d9699d72c1d14b4fdaad) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1934   ROMX_LOAD( "tkoj3_a.simm3",   0x0000007, 0x200000, CRC(cfef17ab) SHA1(1de738c1e537c3df80171e82bc1cc05a25d9cc13) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1927   ROMX_LOAD( "tko-simm.01c",   0x0000000, 0x200000, CRC(6933377d) SHA1(a79e129e5faaadd401379905ac76a24fa616d736) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1928   ROMX_LOAD( "tko-simm.01d",   0x0000001, 0x200000, CRC(7f668950) SHA1(247b2b3fa24afd43b0fe6cfb3df987a38c7385cf) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1929   ROMX_LOAD( "tko-simm.01a",   0x0000002, 0x200000, CRC(cfb68ca9) SHA1(36460724b8df36a4ccf88228d9d5f027714c6628) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1930   ROMX_LOAD( "tko-simm.01b",   0x0000003, 0x200000, CRC(437e21c5) SHA1(2c4ace6fa421c91effab8ab8db931b8451b8e6b1) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1931   ROMX_LOAD( "tko-simm.03c",   0x0000004, 0x200000, CRC(a9e32b57) SHA1(0ddbfefa0cc110e46297ecbfbf4b8bc87ce43c95) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1932   ROMX_LOAD( "tko-simm.03d",   0x0000005, 0x200000, CRC(b7ab9338) SHA1(0bb57640eed167e672b5f40cdff0a7b177ff2507) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1933   ROMX_LOAD( "tko-simm.03a",   0x0000006, 0x200000, CRC(4d3f919a) SHA1(eb7f90415a263f0a2b94d9699d72c1d14b4fdaad) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
1934   ROMX_LOAD( "tko-simm.03b",   0x0000007, 0x200000, CRC(cfef17ab) SHA1(1de738c1e537c3df80171e82bc1cc05a25d9cc13) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
19351935
19361936   ROM_REGION( QSOUND_SIZE, "audio", 0 ) /* 64k for the audio CPU (+banks) */
19371937   ROM_LOAD( "tko.01",   0x00000, 0x08000, CRC(6eda50c2) SHA1(7e67c104094a3ced8b3fdd81f52ee42483b30fc5) )
19381938   ROM_CONTINUE(         0x10000, 0x18000 )
19391939
19401940   ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
1941   ROM_LOAD16_BYTE( "tkoj5_a.simm5",   0x000000, 0x200000, CRC(ab45d509) SHA1(c58cf87d3828dfe0643cf4c58615f3352bd45508) ) // ROM on a simm
1942   ROM_LOAD16_BYTE( "tkoj5_b.simm5",   0x000001, 0x200000, CRC(fa905c3d) SHA1(3eae65b01d50ec4ec4aeff49f434b9b88a50463c) ) // ROM on a simm
1943   /* Same Content, different interleave */
1944//  ROM_LOAD16_WORD_SWAP( "tko-simm.05a",   0x000000, 0x200000, CRC(a275a387) SHA1(32e6aa776058fc8f657f05a6291a8110b381c133) ) // ROM on a simm
1945//  ROM_LOAD16_WORD_SWAP( "tko-simm.05b",   0x200000, 0x200000, CRC(cb686c23) SHA1(b53c180dc6576557ae5598c70c9a42e4eb89e987) ) // ROM on a simm
1941   ROM_LOAD16_BYTE( "tko-simm.05a",   0x000000, 0x200000, CRC(ab45d509) SHA1(c58cf87d3828dfe0643cf4c58615f3352bd45508) ) // ROM on a simm
1942   ROM_LOAD16_BYTE( "tko-simm.05b",   0x000001, 0x200000, CRC(fa905c3d) SHA1(3eae65b01d50ec4ec4aeff49f434b9b88a50463c) ) // ROM on a simm
19461943ROM_END
19471944
19481945ROM_START( csclubj )
r3535r3536
19711968
19721969ROM_START( csclub )
19731970   ROM_REGION( CODE_SIZE, "main", 0 )      /* 68000 code */
1974   ROM_LOAD16_WORD_SWAP( "csc03a", 0x000000, 0x80000, CRC(824082be) SHA1(a44e7e17d73e089b4e7784317f2387d135d01482) )
1975   ROM_LOAD16_WORD_SWAP( "csc04a", 0x080000, 0x80000, CRC(74e6a4fe) SHA1(2a732a6e57088885e77256eb17ddd3ae523db09f) )
1976   ROM_LOAD16_WORD_SWAP( "csc05a", 0x100000, 0x80000, CRC(8ae0df19) SHA1(88e7bf1ee0e18d74748cecd875cb96524dfa01cf) )
1977   ROM_LOAD16_WORD_SWAP( "csc06a", 0x180000, 0x80000, CRC(51f2f0d3) SHA1(067a0bded69767b9f30073012ad62f4608b7610a) )
1978   ROM_LOAD16_WORD_SWAP( "csc07a", 0x200000, 0x80000, CRC(003968fd) SHA1(95f59a29a404a1c1e86d5f43526a80aa97f25621) )
1971   ROM_LOAD16_WORD_SWAP( "csce.03a", 0x000000, 0x80000, CRC(824082be) SHA1(a44e7e17d73e089b4e7784317f2387d135d01482) )
1972   ROM_LOAD16_WORD_SWAP( "csce.04a", 0x080000, 0x80000, CRC(74e6a4fe) SHA1(2a732a6e57088885e77256eb17ddd3ae523db09f) )
1973   ROM_LOAD16_WORD_SWAP( "csce.05a", 0x100000, 0x80000, CRC(8ae0df19) SHA1(88e7bf1ee0e18d74748cecd875cb96524dfa01cf) )
1974   ROM_LOAD16_WORD_SWAP( "csce.06a", 0x180000, 0x80000, CRC(51f2f0d3) SHA1(067a0bded69767b9f30073012ad62f4608b7610a) )
1975   ROM_LOAD16_WORD_SWAP( "csce.07a", 0x200000, 0x80000, CRC(003968fd) SHA1(95f59a29a404a1c1e86d5f43526a80aa97f25621) )
19791976
19801977   ROM_REGION( 0x1000000, "gfx", 0 )
19811978   ROM_FILL(              0x000000, 0x800000, 0 )
1982   ROMX_LOAD( "csc73",  0x800000, 0x080000, CRC(335f07c3) SHA1(44e0385120e2c81fd1072e19b7e3ff05d42be226) , ROM_GROUPWORD | ROM_SKIP(6) )
1983   ROMX_LOAD( "csc74",  0xa00000, 0x080000, CRC(ab215357) SHA1(c2600b5ba62a570f8a32de9c06f93ea8ae6cd854) , ROM_GROUPWORD | ROM_SKIP(6) )
1984   ROMX_LOAD( "csc75",  0xc00000, 0x080000, CRC(a2367381) SHA1(49d562be42c10cdf4e55e3b76c388f0b0121a967) , ROM_GROUPWORD | ROM_SKIP(6) )
1985   ROMX_LOAD( "csc76",  0xe00000, 0x080000, CRC(728aac1f) SHA1(2d04e8803f41af2372fc342fcd8a076c14338198) , ROM_GROUPWORD | ROM_SKIP(6) )
1986   ROMX_LOAD( "csc63",  0x800002, 0x080000, CRC(3711b8ca) SHA1(ff7ba4f73d227212377327f4fcbe8f555ac4b9c9) , ROM_GROUPWORD | ROM_SKIP(6) )
1987   ROMX_LOAD( "csc64",  0xa00002, 0x080000, CRC(828a06d8) SHA1(ce1d147f1d747fcd90d93f7dcca0cdd24c85a971) , ROM_GROUPWORD | ROM_SKIP(6) )
1988   ROMX_LOAD( "csc65",  0xc00002, 0x080000, CRC(86ee4569) SHA1(725d82a1669f6f78fb4ef8756ceac8b444dcbd43) , ROM_GROUPWORD | ROM_SKIP(6) )
1989   ROMX_LOAD( "csc66",  0xe00002, 0x080000, CRC(c24f577f) SHA1(d3b97091e1f0171e087feb9d497c94a48872cd21) , ROM_GROUPWORD | ROM_SKIP(6) )
1990   ROMX_LOAD( "csc83",  0x800004, 0x080000, CRC(0750d12a) SHA1(4c36cba88c58bdbfed923f56a6d489f42a4d0f6e) , ROM_GROUPWORD | ROM_SKIP(6) )
1991   ROMX_LOAD( "csc84",  0xa00004, 0x080000, CRC(90a92f39) SHA1(75bef2440147bac417b48d61ff64b71ed5b9eb67) , ROM_GROUPWORD | ROM_SKIP(6) )
1992   ROMX_LOAD( "csc85",  0xc00004, 0x080000, CRC(d08ab012) SHA1(7f2e71b6bd85c6a3efbd417977261c21f3d6cb7c) , ROM_GROUPWORD | ROM_SKIP(6) )
1993   ROMX_LOAD( "csc86",  0xe00004, 0x080000, CRC(41652583) SHA1(7132647dc9a29ce98866f489140703c5ed3d6051) , ROM_GROUPWORD | ROM_SKIP(6) )
1994   ROMX_LOAD( "csc93",  0x800006, 0x080000, CRC(a756c7f7) SHA1(d0f44f8ded12291d5c79282eac45d088cb365b09) , ROM_GROUPWORD | ROM_SKIP(6) )
1995   ROMX_LOAD( "csc94",  0xa00006, 0x080000, CRC(fb7ccc73) SHA1(763e6fe1baf73341747c74d89df9443561fca4fa) , ROM_GROUPWORD | ROM_SKIP(6) )
1996   ROMX_LOAD( "csc95",  0xc00006, 0x080000, CRC(4d014297) SHA1(df172a3723793b9955ff1f65e76fe5c20fc37b89) , ROM_GROUPWORD | ROM_SKIP(6) )
1997   ROMX_LOAD( "csc96",  0xe00006, 0x080000, CRC(6754b1ef) SHA1(ab5d62056b19999ccecd0eeec7b7c5869ca8fea8) , ROM_GROUPWORD | ROM_SKIP(6) )
1979   ROMX_LOAD( "csc.73",  0x800000, 0x080000, CRC(335f07c3) SHA1(44e0385120e2c81fd1072e19b7e3ff05d42be226) , ROM_GROUPWORD | ROM_SKIP(6) )
1980   ROMX_LOAD( "csc.74",  0xa00000, 0x080000, CRC(ab215357) SHA1(c2600b5ba62a570f8a32de9c06f93ea8ae6cd854) , ROM_GROUPWORD | ROM_SKIP(6) )
1981   ROMX_LOAD( "csc.75",  0xc00000, 0x080000, CRC(a2367381) SHA1(49d562be42c10cdf4e55e3b76c388f0b0121a967) , ROM_GROUPWORD | ROM_SKIP(6) )
1982   ROMX_LOAD( "csc.76",  0xe00000, 0x080000, CRC(728aac1f) SHA1(2d04e8803f41af2372fc342fcd8a076c14338198) , ROM_GROUPWORD | ROM_SKIP(6) )
1983   ROMX_LOAD( "csc.63",  0x800002, 0x080000, CRC(3711b8ca) SHA1(ff7ba4f73d227212377327f4fcbe8f555ac4b9c9) , ROM_GROUPWORD | ROM_SKIP(6) )
1984   ROMX_LOAD( "csc.64",  0xa00002, 0x080000, CRC(828a06d8) SHA1(ce1d147f1d747fcd90d93f7dcca0cdd24c85a971) , ROM_GROUPWORD | ROM_SKIP(6) )
1985   ROMX_LOAD( "csc.65",  0xc00002, 0x080000, CRC(86ee4569) SHA1(725d82a1669f6f78fb4ef8756ceac8b444dcbd43) , ROM_GROUPWORD | ROM_SKIP(6) )
1986   ROMX_LOAD( "csc.66",  0xe00002, 0x080000, CRC(c24f577f) SHA1(d3b97091e1f0171e087feb9d497c94a48872cd21) , ROM_GROUPWORD | ROM_SKIP(6) )
1987   ROMX_LOAD( "csc.83",  0x800004, 0x080000, CRC(0750d12a) SHA1(4c36cba88c58bdbfed923f56a6d489f42a4d0f6e) , ROM_GROUPWORD | ROM_SKIP(6) )
1988   ROMX_LOAD( "csc.84",  0xa00004, 0x080000, CRC(90a92f39) SHA1(75bef2440147bac417b48d61ff64b71ed5b9eb67) , ROM_GROUPWORD | ROM_SKIP(6) )
1989   ROMX_LOAD( "csc.85",  0xc00004, 0x080000, CRC(d08ab012) SHA1(7f2e71b6bd85c6a3efbd417977261c21f3d6cb7c) , ROM_GROUPWORD | ROM_SKIP(6) )
1990   ROMX_LOAD( "csc.86",  0xe00004, 0x080000, CRC(41652583) SHA1(7132647dc9a29ce98866f489140703c5ed3d6051) , ROM_GROUPWORD | ROM_SKIP(6) )
1991   ROMX_LOAD( "csc.93",  0x800006, 0x080000, CRC(a756c7f7) SHA1(d0f44f8ded12291d5c79282eac45d088cb365b09) , ROM_GROUPWORD | ROM_SKIP(6) )
1992   ROMX_LOAD( "csc.94",  0xa00006, 0x080000, CRC(fb7ccc73) SHA1(763e6fe1baf73341747c74d89df9443561fca4fa) , ROM_GROUPWORD | ROM_SKIP(6) )
1993   ROMX_LOAD( "csc.95",  0xc00006, 0x080000, CRC(4d014297) SHA1(df172a3723793b9955ff1f65e76fe5c20fc37b89) , ROM_GROUPWORD | ROM_SKIP(6) )
1994   ROMX_LOAD( "csc.96",  0xe00006, 0x080000, CRC(6754b1ef) SHA1(ab5d62056b19999ccecd0eeec7b7c5869ca8fea8) , ROM_GROUPWORD | ROM_SKIP(6) )
19981995
19991996   ROM_REGION( QSOUND_SIZE, "audio", 0 ) /* 64k for the audio CPU (+banks) */
20001997   ROM_LOAD( "csc.01",   0x00000, 0x08000, CRC(ee162111) SHA1(ce8d4bd32bb10ee8b0274ba6fcef05a583b39d48) )
20011998   ROM_CONTINUE(         0x10000, 0x18000 )
20021999
20032000   ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
2004   ROM_LOAD16_WORD_SWAP( "csc51",   0x000000, 0x080000, CRC(5a52afd5) SHA1(ab873ec556933b75be82ba249357cceb01a7a0bd) )
2005   ROM_LOAD16_WORD_SWAP( "csc52",   0x080000, 0x080000, CRC(1408a811) SHA1(1d31e3cd505245b5ff4d3c55d5fa7017c0f1e168) )
2006   ROM_LOAD16_WORD_SWAP( "csc53",   0x100000, 0x080000, CRC(4fb9f57c) SHA1(093e8e3a03b62783a84fe4ae239e9eb46cbfd71e) )
2007   ROM_LOAD16_WORD_SWAP( "csc54",   0x180000, 0x080000, CRC(9a8f40ec) SHA1(c8db1ecfd6b08e9c83ae53a1d25c1387ab95535c) )
2008   ROM_LOAD16_WORD_SWAP( "csc55",   0x200000, 0x080000, CRC(91529a91) SHA1(183569100ae98e17688e0e25932850e73a41eb88) )
2009   ROM_LOAD16_WORD_SWAP( "csc56",   0x280000, 0x080000, CRC(9a345334) SHA1(330291400a73215c9797457507a86c90ba415247))
2010   ROM_LOAD16_WORD_SWAP( "csc57",   0x300000, 0x080000, CRC(aedc27f2) SHA1(55137f0f22c4823558e6a8ba76011695579a4f1f) )
2011   ROM_LOAD16_WORD_SWAP( "csc58",   0x380000, 0x080000, CRC(2300b7b3) SHA1(f5ecbb45c24f7de1c1aa435870695551d4e343ca) )
2001   ROM_LOAD16_WORD_SWAP( "csc.51",   0x000000, 0x080000, CRC(5a52afd5) SHA1(ab873ec556933b75be82ba249357cceb01a7a0bd) )
2002   ROM_LOAD16_WORD_SWAP( "csc.52",   0x080000, 0x080000, CRC(1408a811) SHA1(1d31e3cd505245b5ff4d3c55d5fa7017c0f1e168) )
2003   ROM_LOAD16_WORD_SWAP( "csc.53",   0x100000, 0x080000, CRC(4fb9f57c) SHA1(093e8e3a03b62783a84fe4ae239e9eb46cbfd71e) )
2004   ROM_LOAD16_WORD_SWAP( "csc.54",   0x180000, 0x080000, CRC(9a8f40ec) SHA1(c8db1ecfd6b08e9c83ae53a1d25c1387ab95535c) )
2005   ROM_LOAD16_WORD_SWAP( "csc.55",   0x200000, 0x080000, CRC(91529a91) SHA1(183569100ae98e17688e0e25932850e73a41eb88) )
2006   ROM_LOAD16_WORD_SWAP( "csc.56",   0x280000, 0x080000, CRC(9a345334) SHA1(330291400a73215c9797457507a86c90ba415247))
2007   ROM_LOAD16_WORD_SWAP( "csc.57",   0x300000, 0x080000, CRC(aedc27f2) SHA1(55137f0f22c4823558e6a8ba76011695579a4f1f) )
2008   ROM_LOAD16_WORD_SWAP( "csc.58",   0x380000, 0x080000, CRC(2300b7b3) SHA1(f5ecbb45c24f7de1c1aa435870695551d4e343ca) )
20122009ROM_END
20132010
20142011
r3535r3536
27322729
27332730ROM_START( dimahoo )
27342731   ROM_REGION( CODE_SIZE, "main", 0 )      /* 68000 code */
2735   ROM_LOAD16_WORD_SWAP( "gdme_03.03", 0x000000, 0x80000, CRC(968fcecd) SHA1(82d6eb6488df48bc7b977fc900c24b29bd6573a9) )
2732   ROM_LOAD16_WORD_SWAP( "gmde.03", 0x000000, 0x80000, CRC(968fcecd) SHA1(82d6eb6488df48bc7b977fc900c24b29bd6573a9) )
27362733   ROM_LOAD16_WORD_SWAP( "gmd.04",  0x080000, 0x80000, CRC(37485567) SHA1(643c41fce6057bcaef0e0bedc62914c33d97eeaf) )
27372734   ROM_LOAD16_WORD_SWAP( "gmd.05",  0x100000, 0x80000, CRC(da269ffb) SHA1(e99b04192030b6006cf67b563f40cea29c1b2e78) )
27382735   ROM_LOAD16_WORD_SWAP( "gmd.06",  0x180000, 0x80000, CRC(55b483c9) SHA1(d47e077312f3c044d3647b79fa9e0581ccff5992) )
r3535r3536
31503147   ROM_REGION(CODE_SIZE, "main", 0 )      /* 68000 code */
31513148   ROM_LOAD16_WORD_SWAP( "ggwu.03", 0x000000, 0x80000, CRC(ac725eb2) SHA1(a4be9fe537cdb47b37478c8397f6effe8a536233) )
31523149   ROM_LOAD16_WORD_SWAP( "ggwu.04", 0x080000, 0x80000, CRC(392f4118) SHA1(3bb0bd9503ef60892d5abd8640af524cf71da848) )
3153   ROM_LOAD16_WORD_SWAP( "ggwu.05", 0x100000, 0x80000, CRC(3239d642) SHA1(2fe3984c46a72aedb30a28e3db5af2612bdf0045) )
3150   ROM_LOAD16_WORD_SWAP( "ggw.05", 0x100000, 0x80000, CRC(3239d642) SHA1(2fe3984c46a72aedb30a28e3db5af2612bdf0045) )
31543151
31553152   ROM_REGION( 0x1000000, "gfx", 0 )
31563153   ROMX_LOAD( "ggw.13m",   0x000000, 0x400000, CRC(105530a4) SHA1(3be06c032985ea6bd3805d73a407bf748385087b) , ROM_GROUPWORD | ROM_SKIP(6) )
r3535r3536
32113208
32123209ROM_START( gwingb )
32133210   ROM_REGION(CODE_SIZE, "main", 0 )      /* 68000 code */
3214   ROM_LOAD16_WORD_SWAP( "ggwb.03a", 0x000000, 0x80000, CRC(a1f8a448) SHA1(a88ed9fea9ec08fda59a1ca9622dfb9f8afdda78) )
3215   ROM_LOAD16_WORD_SWAP( "ggwb.04a", 0x080000, 0x80000, CRC(6a423e76) SHA1(f6ed20f09e852b4fad78ee32617122d5deb98789) )
3216   ROM_LOAD16_WORD_SWAP( "ggwb.05a", 0x100000, 0x80000, CRC(3239d642) SHA1(2fe3984c46a72aedb30a28e3db5af2612bdf0045) )
3211   ROM_LOAD16_WORD_SWAP( "ggwb.03", 0x000000, 0x80000, CRC(a1f8a448) SHA1(a88ed9fea9ec08fda59a1ca9622dfb9f8afdda78) )
3212   ROM_LOAD16_WORD_SWAP( "ggwb.04", 0x080000, 0x80000, CRC(6a423e76) SHA1(f6ed20f09e852b4fad78ee32617122d5deb98789) )
3213   ROM_LOAD16_WORD_SWAP( "ggw.05",  0x100000, 0x80000, CRC(3239d642) SHA1(2fe3984c46a72aedb30a28e3db5af2612bdf0045) )
32173214
32183215   ROM_REGION( 0x1000000, "gfx", 0 )
32193216   ROMX_LOAD( "ggw.13m",   0x000000, 0x400000, CRC(105530a4) SHA1(3be06c032985ea6bd3805d73a407bf748385087b) , ROM_GROUPWORD | ROM_SKIP(6) )
r3535r3536
32863283
32873284ROM_START( jyangoku )
32883285   ROM_REGION(CODE_SIZE, "main", 0 )      /* 68000 code */
3289   ROM_LOAD16_WORD_SWAP( "maj_j03.6a", 0x000000, 0x80000, CRC(4614a3b2) SHA1(f7226006feafaf561046ae7fce18bf62289d41df) )
3286   ROM_LOAD16_WORD_SWAP( "majj.03", 0x000000, 0x80000, CRC(4614a3b2) SHA1(f7226006feafaf561046ae7fce18bf62289d41df) )
32903287
32913288   ROM_REGION( 0x1000000, "gfx", 0 )
3292   ROMX_LOAD( "maj1_d.simm1",   0x0000000, 0x200000, CRC(ba0fe27b) SHA1(60a4fdee8da663777af1e126a1aa6308c9d9a5a9) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3293   ROMX_LOAD( "maj1_c.simm1",   0x0000001, 0x200000, CRC(2cd141bf) SHA1(57ec73ea24d594fc1e4d2d194a3c548a7043666e) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3294   ROMX_LOAD( "maj1_b.simm1",   0x0000002, 0x200000, CRC(e29e4c26) SHA1(51e99536f40481c4c208695354e90fb3fe9416d5) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3295   ROMX_LOAD( "maj1_a.simm1",   0x0000003, 0x200000, CRC(7f68b88a) SHA1(944bf34dc998dffe39b25c3e9fcec17ad421ce81) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3296   ROMX_LOAD( "maj3_d.simm3",   0x0000004, 0x200000, CRC(3aaeb90b) SHA1(d426d5c7ae5ca99321ec1280abdd1fdfe4882829) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3297   ROMX_LOAD( "maj3_c.simm3",   0x0000005, 0x200000, CRC(97894cea) SHA1(a501cd80e6da75409e3381d66bd0a13e021e89f3) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3298   ROMX_LOAD( "maj3_b.simm3",   0x0000006, 0x200000, CRC(ec737d9d) SHA1(cfff42cc24ac011fab2670dec42cab16f4e0d84d) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3299   ROMX_LOAD( "maj3_a.simm3",   0x0000007, 0x200000, CRC(c23b6f22) SHA1(fb3120ea28c67ecb7c4a2b61a64feb62c033ef68) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3289   ROMX_LOAD( "maj-simm.01c",   0x0000000, 0x200000, CRC(ba0fe27b) SHA1(60a4fdee8da663777af1e126a1aa6308c9d9a5a9) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3290   ROMX_LOAD( "maj-simm.01d",   0x0000001, 0x200000, CRC(2cd141bf) SHA1(57ec73ea24d594fc1e4d2d194a3c548a7043666e) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3291   ROMX_LOAD( "maj-simm.01a",   0x0000002, 0x200000, CRC(e29e4c26) SHA1(51e99536f40481c4c208695354e90fb3fe9416d5) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3292   ROMX_LOAD( "maj-simm.01b",   0x0000003, 0x200000, CRC(7f68b88a) SHA1(944bf34dc998dffe39b25c3e9fcec17ad421ce81) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3293   ROMX_LOAD( "maj-simm.03c",   0x0000004, 0x200000, CRC(3aaeb90b) SHA1(d426d5c7ae5ca99321ec1280abdd1fdfe4882829) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3294   ROMX_LOAD( "maj-simm.03d",   0x0000005, 0x200000, CRC(97894cea) SHA1(a501cd80e6da75409e3381d66bd0a13e021e89f3) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3295   ROMX_LOAD( "maj-simm.03a",   0x0000006, 0x200000, CRC(ec737d9d) SHA1(cfff42cc24ac011fab2670dec42cab16f4e0d84d) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
3296   ROMX_LOAD( "maj-simm.03b",   0x0000007, 0x200000, CRC(c23b6f22) SHA1(fb3120ea28c67ecb7c4a2b61a64feb62c033ef68) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
33003297
33013298   ROM_REGION(QSOUND_SIZE, "audio", 0 ) /* 64k for the audio CPU (+banks) */
3302   ROM_LOAD( "maj_01.1a",  0x00000, 0x08000, CRC(1fe8c213) SHA1(e0045566337851d8261ed65d5bea483f09ae96b4) )
3299   ROM_LOAD( "maj.01",  0x00000, 0x08000, CRC(1fe8c213) SHA1(e0045566337851d8261ed65d5bea483f09ae96b4) )
33033300   ROM_CONTINUE(         0x10000, 0x18000 )
33043301
33053302   ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
3306   ROM_LOAD16_BYTE( "maj5_a.simm5",   0x000000, 0x200000, CRC(5ad9ee53) SHA1(acfb7ec137209409c1a439ebc62d8fa3f87e7012) ) // ROM on a simm
3307   ROM_LOAD16_BYTE( "maj5_b.simm5",   0x000001, 0x200000, CRC(efb3dbfb) SHA1(3b32b9890f79805b6a2e1ec63f2cadaca14cf11a) ) // ROM on a simm
3303   ROM_LOAD16_BYTE( "maj-simm.05a",   0x000000, 0x200000, CRC(5ad9ee53) SHA1(acfb7ec137209409c1a439ebc62d8fa3f87e7012) ) // ROM on a simm
3304   ROM_LOAD16_BYTE( "maj-simm.05b",   0x000001, 0x200000, CRC(efb3dbfb) SHA1(3b32b9890f79805b6a2e1ec63f2cadaca14cf11a) ) // ROM on a simm
33083305ROM_END
33093306
33103307ROM_START( megaman2 )
r3535r3536
42894286
42904287ROM_START( mpangu )
42914288   ROM_REGION( CODE_SIZE, "main", 0 )      /* 68000 code */
4292   ROM_LOAD16_WORD_SWAP( "mpn.03", 0x000000, 0x80000, CRC(6e7ed03c) SHA1(3562362d9573252d4d19dbfd0ec7e47e9eaa5f46) ) /* USA version, but has no "u" in label code */
4293   ROM_LOAD16_WORD_SWAP( "mpn.04", 0x080000, 0x80000, CRC(de079131) SHA1(95da2a03cb642963aabfebd8337003961ca4db71) )
4289   ROM_LOAD16_WORD_SWAP( "mpnu.03", 0x000000, 0x80000, CRC(6e7ed03c) SHA1(3562362d9573252d4d19dbfd0ec7e47e9eaa5f46) ) /* USA version, but has no "u" in label code */
4290   ROM_LOAD16_WORD_SWAP( "mpnu.04", 0x080000, 0x80000, CRC(de079131) SHA1(95da2a03cb642963aabfebd8337003961ca4db71) )
42944291
42954292   ROM_REGION( 0x1000000, "gfx", 0 )
42964293   ROM_FILL(              0x000000, 0x800000, 0 )
r3535r3536
54135410   ROM_LOAD16_WORD_SWAP( "szaj.08a", 0x280000, 0x80000, CRC(dc73f2d7) SHA1(09fa10e7d1ff5f0dac87a6cf3d66730e3ab9ad25) )
54145411
54155412   ROM_REGION( 0x1400000, "gfx", 0 )
5416   ROMX_LOAD( "sz2.13m",   0x0000000, 0x400000, CRC(4d1f1f22) SHA1(659fb4305bcf0cbbbbec97ede6e68a8323b13308) , ROM_GROUPWORD | ROM_SKIP(6) )
5417   ROMX_LOAD( "sz2.15m",   0x0000002, 0x400000, CRC(19cea680) SHA1(4cb88963a0fbcef191c8419b6379387c01b4c81e) , ROM_GROUPWORD | ROM_SKIP(6) )
5418   ROMX_LOAD( "sz2.17m",   0x0000004, 0x400000, CRC(e01b4588) SHA1(c2936608fd75ff6cd5fa94c6d6d6f0c77c44a450) , ROM_GROUPWORD | ROM_SKIP(6) )
5419   ROMX_LOAD( "sz2.19m",   0x0000006, 0x400000, CRC(0feeda64) SHA1(f5b350601437bd94b70d97feb23d791df19da6b3) , ROM_GROUPWORD | ROM_SKIP(6) )
5420   ROMX_LOAD( "sz2.14m",   0x1000000, 0x100000, CRC(0560c6aa) SHA1(f2bed3a8efef18052b51a7f0f6a888a18db813a1) , ROM_GROUPWORD | ROM_SKIP(6) )
5421   ROMX_LOAD( "sz2.16m",   0x1000002, 0x100000, CRC(ae940f87) SHA1(39ee26333abbe302ba76dced0196a2e6b3b1d02a) , ROM_GROUPWORD | ROM_SKIP(6) )
5422   ROMX_LOAD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) , ROM_GROUPWORD | ROM_SKIP(6) )
5423   ROMX_LOAD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) , ROM_GROUPWORD | ROM_SKIP(6) )
5413   ROMX_LOAD( "sza.13m",   0x0000000, 0x400000, CRC(4d1f1f22) SHA1(659fb4305bcf0cbbbbec97ede6e68a8323b13308) , ROM_GROUPWORD | ROM_SKIP(6) )
5414   ROMX_LOAD( "sza.15m",   0x0000002, 0x400000, CRC(19cea680) SHA1(4cb88963a0fbcef191c8419b6379387c01b4c81e) , ROM_GROUPWORD | ROM_SKIP(6) )
5415   ROMX_LOAD( "sza.17m",   0x0000004, 0x400000, CRC(e01b4588) SHA1(c2936608fd75ff6cd5fa94c6d6d6f0c77c44a450) , ROM_GROUPWORD | ROM_SKIP(6) )
5416   ROMX_LOAD( "sza.19m",   0x0000006, 0x400000, CRC(0feeda64) SHA1(f5b350601437bd94b70d97feb23d791df19da6b3) , ROM_GROUPWORD | ROM_SKIP(6) )
5417   ROMX_LOAD( "sza.14m",   0x1000000, 0x100000, CRC(0560c6aa) SHA1(f2bed3a8efef18052b51a7f0f6a888a18db813a1) , ROM_GROUPWORD | ROM_SKIP(6) )
5418   ROMX_LOAD( "sza.16m",   0x1000002, 0x100000, CRC(ae940f87) SHA1(39ee26333abbe302ba76dced0196a2e6b3b1d02a) , ROM_GROUPWORD | ROM_SKIP(6) )
5419   ROMX_LOAD( "sza.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) , ROM_GROUPWORD | ROM_SKIP(6) )
5420   ROMX_LOAD( "sza.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) , ROM_GROUPWORD | ROM_SKIP(6) )
54245421
54255422   ROM_REGION( QSOUND_SIZE, "audio", 0 ) /* 64k for the audio CPU (+banks) */
5426   ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
5423   ROM_LOAD( "sza.01",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
54275424   ROM_CONTINUE(         0x10000, 0x18000 )
5428   ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
5425   ROM_LOAD( "sza.02",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
54295426
54305427   ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
5431   ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
5432   ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
5428   ROM_LOAD16_WORD_SWAP( "sza.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
5429   ROM_LOAD16_WORD_SWAP( "sza.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
54335430ROM_END
54345431
54355432ROM_START( sfz2al )
r3535r3536
54425439   ROM_LOAD16_WORD_SWAP( "szaa.08", 0x280000, 0x80000, CRC(6eb6d412) SHA1(c858fec9c1dfea70dfcca629c1c24306f8ae6d81) )
54435440
54445441   ROM_REGION( 0x1400000, "gfx", 0 )
5445   ROMX_LOAD( "sz2.13m",   0x0000000, 0x400000, CRC(4d1f1f22) SHA1(659fb4305bcf0cbbbbec97ede6e68a8323b13308) , ROM_GROUPWORD | ROM_SKIP(6) )
5446   ROMX_LOAD( "sz2.15m",   0x0000002, 0x400000, CRC(19cea680) SHA1(4cb88963a0fbcef191c8419b6379387c01b4c81e) , ROM_GROUPWORD | ROM_SKIP(6) )
5447   ROMX_LOAD( "sz2.17m",   0x0000004, 0x400000, CRC(e01b4588) SHA1(c2936608fd75ff6cd5fa94c6d6d6f0c77c44a450) , ROM_GROUPWORD | ROM_SKIP(6) )
5448   ROMX_LOAD( "sz2.19m",   0x0000006, 0x400000, CRC(0feeda64) SHA1(f5b350601437bd94b70d97feb23d791df19da6b3) , ROM_GROUPWORD | ROM_SKIP(6) )
5449   ROMX_LOAD( "sz2.14m",   0x1000000, 0x100000, CRC(0560c6aa) SHA1(f2bed3a8efef18052b51a7f0f6a888a18db813a1) , ROM_GROUPWORD | ROM_SKIP(6) )
5450   ROMX_LOAD( "sz2.16m",   0x1000002, 0x100000, CRC(ae940f87) SHA1(39ee26333abbe302ba76dced0196a2e6b3b1d02a) , ROM_GROUPWORD | ROM_SKIP(6) )
5451   ROMX_LOAD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) , ROM_GROUPWORD | ROM_SKIP(6) )
5452   ROMX_LOAD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) , ROM_GROUPWORD | ROM_SKIP(6) )
5442   ROMX_LOAD( "sza.13m",   0x0000000, 0x400000, CRC(4d1f1f22) SHA1(659fb4305bcf0cbbbbec97ede6e68a8323b13308) , ROM_GROUPWORD | ROM_SKIP(6) )
5443   ROMX_LOAD( "sza.15m",   0x0000002, 0x400000, CRC(19cea680) SHA1(4cb88963a0fbcef191c8419b6379387c01b4c81e) , ROM_GROUPWORD | ROM_SKIP(6) )
5444   ROMX_LOAD( "sza.17m",   0x0000004, 0x400000, CRC(e01b4588) SHA1(c2936608fd75ff6cd5fa94c6d6d6f0c77c44a450) , ROM_GROUPWORD | ROM_SKIP(6) )
5445   ROMX_LOAD( "sza.19m",   0x0000006, 0x400000, CRC(0feeda64) SHA1(f5b350601437bd94b70d97feb23d791df19da6b3) , ROM_GROUPWORD | ROM_SKIP(6) )
5446   ROMX_LOAD( "sza.14m",   0x1000000, 0x100000, CRC(0560c6aa) SHA1(f2bed3a8efef18052b51a7f0f6a888a18db813a1) , ROM_GROUPWORD | ROM_SKIP(6) )
5447   ROMX_LOAD( "sza.16m",   0x1000002, 0x100000, CRC(ae940f87) SHA1(39ee26333abbe302ba76dced0196a2e6b3b1d02a) , ROM_GROUPWORD | ROM_SKIP(6) )
5448   ROMX_LOAD( "sza.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) , ROM_GROUPWORD | ROM_SKIP(6) )
5449   ROMX_LOAD( "sza.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) , ROM_GROUPWORD | ROM_SKIP(6) )
54535450
54545451   ROM_REGION( QSOUND_SIZE, "audio", 0 ) /* 64k for the audio CPU (+banks) */
5455   ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
5452   ROM_LOAD( "sza.01",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
54565453   ROM_CONTINUE(         0x10000, 0x18000 )
5457   ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
5454   ROM_LOAD( "sza.02",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
54585455
54595456   ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
5460   ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
5461   ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
5457   ROM_LOAD16_WORD_SWAP( "sza.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
5458   ROM_LOAD16_WORD_SWAP( "sza.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
54625459ROM_END
54635460
54645461ROM_START( sfz2alh )
r3535r3536
54715468   ROM_LOAD16_WORD_SWAP( "sza.08",  0x280000, 0x80000, CRC(b65711a9) SHA1(3918f44e1bb189e2a115625b35f477eb91a65f04) )
54725469
54735470   ROM_REGION( 0x1400000, "gfx", 0 )
5474   ROMX_LOAD( "sz2.13m",   0x0000000, 0x400000, CRC(4d1f1f22) SHA1(659fb4305bcf0cbbbbec97ede6e68a8323b13308) , ROM_GROUPWORD | ROM_SKIP(6) )
5475   ROMX_LOAD( "sz2.15m",   0x0000002, 0x400000, CRC(19cea680) SHA1(4cb88963a0fbcef191c8419b6379387c01b4c81e) , ROM_GROUPWORD | ROM_SKIP(6) )
5476   ROMX_LOAD( "sz2.17m",   0x0000004, 0x400000, CRC(e01b4588) SHA1(c2936608fd75ff6cd5fa94c6d6d6f0c77c44a450) , ROM_GROUPWORD | ROM_SKIP(6) )
5477   ROMX_LOAD( "sz2.19m",   0x0000006, 0x400000, CRC(0feeda64) SHA1(f5b350601437bd94b70d97feb23d791df19da6b3) , ROM_GROUPWORD | ROM_SKIP(6) )
5478   ROMX_LOAD( "sz2.14m",   0x1000000, 0x100000, CRC(0560c6aa) SHA1(f2bed3a8efef18052b51a7f0f6a888a18db813a1) , ROM_GROUPWORD | ROM_SKIP(6) )
5479   ROMX_LOAD( "sz2.16m",   0x1000002, 0x100000, CRC(ae940f87) SHA1(39ee26333abbe302ba76dced0196a2e6b3b1d02a) , ROM_GROUPWORD | ROM_SKIP(6) )
5480   ROMX_LOAD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) , ROM_GROUPWORD | ROM_SKIP(6) )
5481   ROMX_LOAD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) , ROM_GROUPWORD | ROM_SKIP(6) )
5471   ROMX_LOAD( "sza.13m",   0x0000000, 0x400000, CRC(4d1f1f22) SHA1(659fb4305bcf0cbbbbec97ede6e68a8323b13308) , ROM_GROUPWORD | ROM_SKIP(6) )
5472   ROMX_LOAD( "sza.15m",   0x0000002, 0x400000, CRC(19cea680) SHA1(4cb88963a0fbcef191c8419b6379387c01b4c81e) , ROM_GROUPWORD | ROM_SKIP(6) )
5473   ROMX_LOAD( "sza.17m",   0x0000004, 0x400000, CRC(e01b4588) SHA1(c2936608fd75ff6cd5fa94c6d6d6f0c77c44a450) , ROM_GROUPWORD | ROM_SKIP(6) )
5474   ROMX_LOAD( "sza.19m",   0x0000006, 0x400000, CRC(0feeda64) SHA1(f5b350601437bd94b70d97feb23d791df19da6b3) , ROM_GROUPWORD | ROM_SKIP(6) )
5475   ROMX_LOAD( "sza.14m",   0x1000000, 0x100000, CRC(0560c6aa) SHA1(f2bed3a8efef18052b51a7f0f6a888a18db813a1) , ROM_GROUPWORD | ROM_SKIP(6) )
5476   ROMX_LOAD( "sza.16m",   0x1000002, 0x100000, CRC(ae940f87) SHA1(39ee26333abbe302ba76dced0196a2e6b3b1d02a) , ROM_GROUPWORD | ROM_SKIP(6) )
5477   ROMX_LOAD( "sza.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) , ROM_GROUPWORD | ROM_SKIP(6) )
5478   ROMX_LOAD( "sza.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) , ROM_GROUPWORD | ROM_SKIP(6) )
54825479
54835480   ROM_REGION( QSOUND_SIZE, "audio", 0 ) /* 64k for the audio CPU (+banks) */
5484   ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
5481   ROM_LOAD( "sza.01",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
54855482   ROM_CONTINUE(         0x10000, 0x18000 )
5486   ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
5483   ROM_LOAD( "sza.02",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
54875484
54885485   ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
5489   ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
5490   ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
5486   ROM_LOAD16_WORD_SWAP( "sza.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
5487   ROM_LOAD16_WORD_SWAP( "sza.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
54915488ROM_END
54925489
54935490ROM_START( sfz2alb )
r3535r3536
55005497   ROM_LOAD16_WORD_SWAP( "sza.08",  0x280000, 0x80000, CRC(b65711a9) SHA1(3918f44e1bb189e2a115625b35f477eb91a65f04) )
55015498
55025499   ROM_REGION( 0x1400000, "gfx", 0 )
5503   ROMX_LOAD( "sz2.13m",   0x0000000, 0x400000, CRC(4d1f1f22) SHA1(659fb4305bcf0cbbbbec97ede6e68a8323b13308) , ROM_GROUPWORD | ROM_SKIP(6) )
5504   ROMX_LOAD( "sz2.15m",   0x0000002, 0x400000, CRC(19cea680) SHA1(4cb88963a0fbcef191c8419b6379387c01b4c81e) , ROM_GROUPWORD | ROM_SKIP(6) )
5505   ROMX_LOAD( "sz2.17m",   0x0000004, 0x400000, CRC(e01b4588) SHA1(c2936608fd75ff6cd5fa94c6d6d6f0c77c44a450) , ROM_GROUPWORD | ROM_SKIP(6) )
5506   ROMX_LOAD( "sz2.19m",   0x0000006, 0x400000, CRC(0feeda64) SHA1(f5b350601437bd94b70d97feb23d791df19da6b3) , ROM_GROUPWORD | ROM_SKIP(6) )
5507   ROMX_LOAD( "sz2.14m",   0x1000000, 0x100000, CRC(0560c6aa) SHA1(f2bed3a8efef18052b51a7f0f6a888a18db813a1) , ROM_GROUPWORD | ROM_SKIP(6) )
5508   ROMX_LOAD( "sz2.16m",   0x1000002, 0x100000, CRC(ae940f87) SHA1(39ee26333abbe302ba76dced0196a2e6b3b1d02a) , ROM_GROUPWORD | ROM_SKIP(6) )
5509   ROMX_LOAD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) , ROM_GROUPWORD | ROM_SKIP(6) )
5510   ROMX_LOAD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) , ROM_GROUPWORD | ROM_SKIP(6) )
5500   ROMX_LOAD( "sza.13m",   0x0000000, 0x400000, CRC(4d1f1f22) SHA1(659fb4305bcf0cbbbbec97ede6e68a8323b13308) , ROM_GROUPWORD | ROM_SKIP(6) )
5501   ROMX_LOAD( "sza.15m",   0x0000002, 0x400000, CRC(19cea680) SHA1(4cb88963a0fbcef191c8419b6379387c01b4c81e) , ROM_GROUPWORD | ROM_SKIP(6) )
5502   ROMX_LOAD( "sza.17m",   0x0000004, 0x400000, CRC(e01b4588) SHA1(c2936608fd75ff6cd5fa94c6d6d6f0c77c44a450) , ROM_GROUPWORD | ROM_SKIP(6) )
5503   ROMX_LOAD( "sza.19m",   0x0000006, 0x400000, CRC(0feeda64) SHA1(f5b350601437bd94b70d97feb23d791df19da6b3) , ROM_GROUPWORD | ROM_SKIP(6) )
5504   ROMX_LOAD( "sza.14m",   0x1000000, 0x100000, CRC(0560c6aa) SHA1(f2bed3a8efef18052b51a7f0f6a888a18db813a1) , ROM_GROUPWORD | ROM_SKIP(6) )
5505   ROMX_LOAD( "sza.16m",   0x1000002, 0x100000, CRC(ae940f87) SHA1(39ee26333abbe302ba76dced0196a2e6b3b1d02a) , ROM_GROUPWORD | ROM_SKIP(6) )
5506   ROMX_LOAD( "sza.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) , ROM_GROUPWORD | ROM_SKIP(6) )
5507   ROMX_LOAD( "sza.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) , ROM_GROUPWORD | ROM_SKIP(6) )
55115508
55125509   ROM_REGION( QSOUND_SIZE, "audio", 0 ) /* 64k for the audio CPU (+banks) */
5513   ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
5510   ROM_LOAD( "sza.01",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
55145511   ROM_CONTINUE(         0x10000, 0x18000 )
5515   ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
5512   ROM_LOAD( "sza.02",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
55165513
55175514   ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
5518   ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
5519   ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
5515   ROM_LOAD16_WORD_SWAP( "sza.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
5516   ROM_LOAD16_WORD_SWAP( "sza.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
55205517ROM_END
55215518
55225519ROM_START( sfa3 )
55235520   ROM_REGION( CODE_SIZE, "main", 0 )      /* 68000 code */
5524   ROM_LOAD16_WORD_SWAP( "sz3e_03c.03", 0x000000, 0x80000, CRC(9762b206) SHA1(fc4561ca990dd11ed2c5203540102078b721db2f) )
5525   ROM_LOAD16_WORD_SWAP( "sz3e_04c.04", 0x080000, 0x80000, CRC(5ad3f721) SHA1(fec11cc5f63593f0181eb28ae85ad916686793eb) )
5521   ROM_LOAD16_WORD_SWAP( "sz3e.03c", 0x000000, 0x80000, CRC(9762b206) SHA1(fc4561ca990dd11ed2c5203540102078b721db2f) )
5522   ROM_LOAD16_WORD_SWAP( "sz3e.04c", 0x080000, 0x80000, CRC(5ad3f721) SHA1(fec11cc5f63593f0181eb28ae85ad916686793eb) )
55265523   ROM_LOAD16_WORD_SWAP( "sz3.05c",  0x100000, 0x80000, CRC(57fd0a40) SHA1(bc2d5f4d57117bbf58b1adb088e00424ef489e92) )
55275524   ROM_LOAD16_WORD_SWAP( "sz3.06c",  0x180000, 0x80000, CRC(f6305f8b) SHA1(3fd1ebdbad96103aca604e950b488e52460a71ec) )
55285525   ROM_LOAD16_WORD_SWAP( "sz3.07c",  0x200000, 0x80000, CRC(6eab0f6f) SHA1(f8d093dda65cf4e8a3000dc1b96355bb03dcb495) )
src/mame/drivers/tiamc1.c
r3535r3536
115115*/
116116
117117#include "driver.h"
118#include "sound/custom.h"
118#include "includes/tiamc1.h"
119119
120/* routines defined in video */
121extern PALETTE_INIT( tiamc1 );
122extern VIDEO_START( tiamc1 );
123extern VIDEO_UPDATE( tiamc1 );
124
125extern WRITE8_HANDLER( tiamc1_palette_w );
126extern WRITE8_HANDLER( tiamc1_videoram_w );
127extern WRITE8_HANDLER( tiamc1_bankswitch_w );
128extern WRITE8_HANDLER( tiamc1_sprite_x_w );
129extern WRITE8_HANDLER( tiamc1_sprite_y_w );
130extern WRITE8_HANDLER( tiamc1_sprite_a_w );
131extern WRITE8_HANDLER( tiamc1_sprite_n_w );
132extern WRITE8_HANDLER( tiamc1_bg_vshift_w );
133extern WRITE8_HANDLER( tiamc1_bg_hshift_w );
134
135extern UINT8 *tiamc1_charram, *tiamc1_tileram;
136extern UINT8 *tiamc1_spriteram_x, *tiamc1_spriteram_y, *tiamc1_spriteram_n,
137   *tiamc1_spriteram_a;
138
139/* routines defined in audio */
140extern void *tiamc1_sh_start(int clock, const custom_sound_interface *config);
141extern WRITE8_HANDLER( tiamc1_timer0_w );
142extern WRITE8_HANDLER( tiamc1_timer1_w );
143extern WRITE8_HANDLER( tiamc1_timer1_gate_w );
144
145120static UINT8 *video_ram;
146121
147122static DRIVER_INIT( tiamc1 )
r3535r3536
346321
347322ROM_END
348323
324ROM_START( koroleva )
325   ROM_REGION( 0x10000, "main", 0 )
326   ROM_LOAD( "04.1g", 0x00000, 0x2000, CRC(C3701225) SHA1(AC059116521B06CB5347741D3EE2778C2E68A74E) )
327   ROM_LOAD( "05.2g", 0x02000, 0x2000, CRC(1B3742CE) SHA1(908AD9EB0E79BAAC53EED195355D0D1BDF6B5A25) )
328   ROM_LOAD( "06.3g", 0x04000, 0x2000, CRC(48074786) SHA1(145749053CD00C8547024C9AFE3AB0FF7D8F5FF9) )
329   ROM_LOAD( "07.4g", 0x06000, 0x2000, CRC(41A4ADB5) SHA1(CDBDF6884307DD0F1FC991E6E1BC4C4FDC351AB1) )
330   ROM_LOAD( "08.5g", 0x08000, 0x2000, CRC(8F379D95) SHA1(0EA70BC14C52B1F4B38B0D14E4249252A2577F2A) )
331   ROM_FILL( 0xa000, 0x2000, 0x00 ) /* 09.6g is unpopulated */
332   ROM_LOAD( "10.7g", 0x0c000, 0x2000, CRC(397F41F8) SHA1(2D07462AFAD39DDA067114CE8D47E64D6A854283) )
333
334   ROM_REGION( 0x8000, "gfx1", 0 )
335   ROM_LOAD( "00.2a", 0x00000, 0x2000, CRC(125C72F0) SHA1(A4991F20E6992C272BC7322922E7BEBE7170F7E7) )
336   ROM_LOAD( "01.3a", 0x02000, 0x2000, CRC(7BDFDD19) SHA1(8B971689050F9D608225226EB5CADBB4050C7D1F) )
337   ROM_LOAD( "02.5a", 0x04000, 0x2000, CRC(97770B0F) SHA1(CF4605E31F8C57A76BFDA6A7EA329058DA8B8C9C) )
338   ROM_LOAD( "03.6a", 0x06000, 0x2000, CRC(9B0A686A) SHA1(F02910DB9F862EC017BB3834C58E96E780FB6322) )
339
340ROM_END
341
349342GAME( 1988, konek, 0, tiamc1, tiamc1, tiamc1, ROT0, "Terminal", "Konek-Gorbunok", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
350343GAME( 1988, sosterm, 0, tiamc1, tiamc1, tiamc1, ROT0, "Terminal", "S.O.S.", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
344GAME( 1988, koroleva, 0, tiamc1, tiamc1, tiamc1, ROT0, "Terminal", "Snezhnaja Koroleva", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
351345
src/mame/drivers/segag80r.c
r3535r3536
304304{
305305   soundlatch_w(device->machine,0,data);
306306   cpunum_set_input_line(device->machine, 1, INPUT_LINE_NMI, PULSE_LINE);
307   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(50));
307   cpu_boost_interleave(device->machine, attotime_zero, ATTOTIME_IN_USEC(50));
308308}
309309
310310
src/mame/drivers/tmnt.c
r3535r3536
7777#include "sound/k054539.h"
7878#include "sound/k007232.h"
7979#include "sound/upd7759.h"
80#include "includes/tmnt.h"
8081
81WRITE16_HANDLER( tmnt_paletteram_word_w );
82WRITE16_HANDLER( tmnt_0a0000_w );
83WRITE16_HANDLER( punkshot_0a0020_w );
84WRITE16_HANDLER( lgtnfght_0a0018_w );
85WRITE16_HANDLER( blswhstl_700300_w );
86READ16_HANDLER( glfgreat_rom_r );
87WRITE16_HANDLER( glfgreat_122000_w );
88WRITE16_HANDLER( ssriders_1c0300_w );
89WRITE16_HANDLER( prmrsocr_122000_w );
90WRITE16_HANDLER( tmnt_priority_w );
91READ16_HANDLER( glfgreat_ball_r );
92READ16_HANDLER( prmrsocr_rom_r );
93VIDEO_START( sunsetbl );
94VIDEO_START( cuebrick );
95VIDEO_START( mia );
96VIDEO_START( tmnt );
97VIDEO_START( punkshot );
98VIDEO_START( lgtnfght );
99VIDEO_START( blswhstl );
100VIDEO_START( glfgreat );
101VIDEO_START( thndrx2 );
102VIDEO_START( prmrsocr );
103VIDEO_UPDATE( mia );
104VIDEO_UPDATE( tmnt );
105VIDEO_UPDATE( punkshot );
106VIDEO_UPDATE( lgtnfght );
107VIDEO_UPDATE( glfgreat );
108VIDEO_UPDATE( tmnt2 );
109VIDEO_UPDATE( thndrx2 );
110VIDEO_EOF( blswhstl );
11182
11283static int tmnt_soundlatch;
11384static int cuebrick_snd_irqlatch, cuebrick_nvram_bank;
src/mame/drivers/psikyo.c
r3535r3536
14071407   ROM_LOAD( "u34.bin",  0x000000, 0x100000, CRC(e6a75bd8) SHA1(1aa84ea54584b6c8b2846194b48bf6d2afa67fee) )
14081408   ROM_LOAD( "u35.bin",  0x100000, 0x100000, CRC(c4ca0164) SHA1(c75422de2e0127cdc23d8c223b674a5bd85b00fb) )
14091409
1410//  ROM_REGION( 0x100000, "ymf", 0 )  /* Samples */
1411   ROM_REGION( 0x100000, "ymf", 0 )   /* Samples */
1410   ROM_REGION( 0x100000, "ym", 0 )   /* Samples */
14121411   ROM_LOAD( "u68.bin",  0x000000, 0x100000, CRC(9a7f6c34) SHA1(c549b209bce1d2c6eeb512db198ad20c3f5fb0ea) )
14131412
14141413   ROM_REGION( 0x040000, "user1", 0 )   /* Sprites LUT */
r3535r3536
14331432   ROM_LOAD( "u34.bin",  0x000000, 0x100000, CRC(e6a75bd8) SHA1(1aa84ea54584b6c8b2846194b48bf6d2afa67fee) )
14341433   ROM_LOAD( "u35.bin",  0x100000, 0x100000, CRC(c4ca0164) SHA1(c75422de2e0127cdc23d8c223b674a5bd85b00fb) )
14351434
1436//  ROM_REGION( 0x100000, "ymf", 0 )  /* Samples */
1437   ROM_REGION( 0x100000, "ymf", 0 )   /* Samples */
1435   ROM_REGION( 0x100000, "ym", 0 )   /* Samples */
14381436   ROM_LOAD( "u68.bin",  0x000000, 0x100000, CRC(9a7f6c34) SHA1(c549b209bce1d2c6eeb512db198ad20c3f5fb0ea) )
14391437
14401438   ROM_REGION( 0x040000, "user1", 0 )   /* Sprites LUT */
r3535r3536
14451443static DRIVER_INIT( sngkace )
14461444{
14471445   {
1448      UINT8 *RAM   =   memory_region(machine, "ymf");
1449      int len            =   memory_region_length(machine, "ymf");
1446      UINT8 *RAM   =   memory_region(machine, "ym");
1447      int len      =   memory_region_length(machine, "ym");
14501448      int i;
14511449
14521450      /* Bit 6&7 of the samples are swapped. Naughty, naughty... */
r3535r3536
16051603   ROM_LOAD( "u14.bin",  0x000000, 0x200000, CRC(282d89c3) SHA1(3b4b17f4a37efa2f7e232488aaba7c77d10c84d2) )
16061604   ROM_LOAD( "u24.bin",  0x200000, 0x200000, CRC(bbe9d3d1) SHA1(9da0b0b993e8271a8119e9c2f602e52325983f79) )
16071605   ROM_LOAD( "u15.bin",  0x400000, 0x200000, CRC(d4d1b07c) SHA1(232109db8f6e137fbc8826f38a96057067cb19dc) )
1608//  ROM_LOAD( "u25.bin",  CRC(00600000) , 0x100000  NOT PRESENT
1606//  ROM_LOAD( "u25.bin",  0x600000, 0x100000  NOT PRESENT
16091607
16101608   ROM_REGION( 0x200000, "gfx2", ROMREGION_DISPOSE )   /* Layers 0 + 1 */
16111609   ROM_LOAD( "u33.bin",  0x000000, 0x200000, CRC(4c8577f1) SHA1(d27043514632954a06667ac63f4a4e4a31870511) )
src/mame/drivers/playmark.c
r3535r3536
4343#include "machine/eeprom.h"
4444#include "cpu/pic16c5x/pic16c5x.h"
4545#include "sound/okim6295.h"
46#include "includes/playmark.h"
4647
4748
4849static UINT16 playmark_snd_command;
r3535r3536
5152static UINT8 playmark_oki_command;
5253
5354
54extern UINT16 *bigtwin_bgvideoram;
55extern UINT16 *wbeachvl_videoram1,*wbeachvl_videoram2,*wbeachvl_videoram3;
56extern UINT16 *wbeachvl_rowscroll;
57
58VIDEO_START( bigtwin );
59VIDEO_START( wbeachvl );
60VIDEO_START( excelsr );
61VIDEO_START( hotmind );
62VIDEO_START( hrdtimes );
63WRITE16_HANDLER( wbeachvl_txvideoram_w );
64WRITE16_HANDLER( wbeachvl_fgvideoram_w );
65WRITE16_HANDLER( wbeachvl_bgvideoram_w );
66WRITE16_HANDLER( hrdtimes_txvideoram_w );
67WRITE16_HANDLER( hrdtimes_fgvideoram_w );
68WRITE16_HANDLER( hrdtimes_bgvideoram_w );
69WRITE16_HANDLER( bigtwin_paletteram_w );
70WRITE16_HANDLER( bigtwin_bgvideoram_w );
71WRITE16_HANDLER( bigtwin_scroll_w );
72WRITE16_HANDLER( wbeachvl_scroll_w );
73WRITE16_HANDLER( excelsr_scroll_w );
74WRITE16_HANDLER( hrdtimes_scroll_w );
75VIDEO_UPDATE( bigtwin );
76VIDEO_UPDATE( wbeachvl );
77VIDEO_UPDATE( excelsr );
78VIDEO_UPDATE( hrdtimes );
79
80
81
8255static WRITE16_HANDLER( coinctrl_w )
8356{
8457   if (ACCESSING_BITS_8_15)
src/mame/drivers/pgm.c
r3535r3536
319319   COMBINE_DATA(&arm7_latch);
320320
321321#ifdef PGMARM7SPEEDHACK
322//  cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
322//  cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(100));
323323   if (data!=0xaa) cpu_spinuntil_trigger(1000);
324324   cpu_trigger(machine, 1002);
325325#else
326   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
326   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(100));
327327   cpu_spinuntil_time(ATTOTIME_IN_CYCLES(100, 0));
328328#endif
329329}
r3535r3536
357357   cpu_spinuntil_trigger(1002);
358358#else
359359   cpunum_set_input_line(machine, 2, ARM7_FIRQ_LINE, PULSE_LINE);
360   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(200));
360   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(200));
361361   cpu_spinuntil_time(ATTOTIME_IN_CYCLES(200, 2)); // give the arm time to respond (just boosting the interleave doesn't help
362362#endif
363363}
r3535r3536
739739      kovsh_lowlatch = data;
740740   }
741741
742//  cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
742//  cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(100));
743743//  cpu_spinuntil_time(ATTOTIME_IN_CYCLES(100, 0));
744744}
745745
746746static READ16_HANDLER( kovsh_68k_protlatch_r )
747747{
748   //cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(200));
748   //cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(200));
749749   cpu_spinuntil_time(ATTOTIME_IN_CYCLES(600, 0));
750750
751751   switch (offset)
src/mame/drivers/gameplan.c
r3535r3536
132132   if (data == 0)
133133   {
134134      device_reset(state->riot);
135      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(10));
135      cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(10));
136136   }
137137}
138138
r3535r3536
172172{
173173   cpunum_set_input_line(device->machine, 1, 0, state);
174174   if (state == ASSERT_LINE)
175      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(10));
175      cpu_boost_interleave(device->machine, attotime_zero, ATTOTIME_IN_USEC(10));
176176}
177177
178178
src/mame/drivers/spiders.c
r3535r3536
189189
190190#include "driver.h"
191191#include "machine/rescap.h"
192#include "deprecat.h"
193192#include "cpu/m6800/m6800.h"
194193#include "cpu/m6809/m6809.h"
195194#include "video/mc6845.h"
r3535r3536
342341 *
343342 *************************************/
344343
345static void ic60_74123_output_changed(int output)
344static WRITE8_DEVICE_HANDLER( ic60_74123_output_changed)
346345{
347   pia_2_ca1_w(Machine, 0, output);
346   pia_2_ca1_w(device->machine, 0, data);
348347}
349348
350349
351static const TTL74123_interface ic60_intf =
350static const ttl74123_config ic60_intf =
352351{
353352   TTL74123_GROUNDED,   /* the hook up type */
354353   RES_K(22),         /* resistor connected to RCext */
r3535r3536
374373   pia_config(3, &pia_3_intf);
375374   pia_config(4, &pia_4_intf);
376375
377   TTL74123_config(0, &ic60_intf);
378
379376   /* setup for save states */
380377   state_save_register_global(flipscreen);
381378   state_save_register_global(gfx_rom_address);
r3535r3536
395392static MACHINE_RESET( spiders )
396393{
397394   pia_reset();
398   TTL74123_reset(0);
399395}
400396
401397
r3535r3536
491487
492488static MC6845_ON_DE_CHANGED( display_enable_changed )
493489{
494   TTL74123_A_w(0, display_enabled);
490   ttl74123_a_w(devtag_get_device(device->machine, TTL74123, "ic60"), 0, display_enabled);
495491}
496492
497493
r3535r3536
710706   MDRV_DEVICE_ADD("crtc", MC6845)
711707   MDRV_DEVICE_CONFIG(mc6845_intf)
712708
709   /* 74LS123 */
710
711   MDRV_DEVICE_ADD("ic60", TTL74123)
712   MDRV_DEVICE_CONFIG(ic60_intf)
713
713714   /* audio hardware */
714715   MDRV_IMPORT_FROM(spiders_audio)
715716
src/mame/drivers/mcatadv.c
r3535r3536
137137
138138#include "driver.h"
139139#include "sound/2610intf.h"
140#include "includes/mcatadv.h"
140141
141VIDEO_UPDATE( mcatadv );
142VIDEO_START( mcatadv );
143VIDEO_EOF( mcatadv );
144VIDEO_UPDATE( nost );
145VIDEO_START( nost );
146
147WRITE16_HANDLER( mcatadv_videoram1_w );
148WRITE16_HANDLER( mcatadv_videoram2_w );
149142UINT16* mcatadv_videoram1, *mcatadv_videoram2;
150143UINT16* mcatadv_scroll, *mcatadv_scroll2;
151144UINT16* mcatadv_vidregs;
src/mame/drivers/jchan.c
r3535r3536
201201#include "driver.h"
202202#include "deprecat.h"
203203#include "sound/ymz280b.h"
204#include "includes/suprnova.h"
204205
205extern UINT32* skns_spc_regs;
206206
207
208207/***************************************************************************
209208
210209                            MCU Code Simulation
r3535r3536
407406      cpunum_set_input_line(machine, 0, 2, HOLD_LINE);
408407}
409408
410
411
412409static VIDEO_START(jchan)
413410{
414411   /* so we can use suprnova.c */
r3535r3536
417414   skns_spc_regs = auto_malloc (0x40);
418415}
419416
420extern void skns_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect );
421417
422
423418static VIDEO_UPDATE(jchan)
424419{
425420   fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
src/mame/drivers/tetrisp2.c
r3535r3536
3737#include "sound/okim6295.h"
3838#include "sound/ymz280b.h"
3939#include "rocknms.lh"
40#include "includes/tetrisp2.h"
4041
4142UINT16 tetrisp2_systemregs[0x10];
4243static UINT16 rocknms_sub_systemregs[0x10];
r3535r3536
4849static emu_timer *rockn_timer_l4;
4950static emu_timer *rockn_timer_sub_l4;
5051
51/* Variables defined in video: */
52
53extern UINT16 *tetrisp2_vram_bg, *tetrisp2_scroll_bg;
54extern UINT16 *tetrisp2_vram_fg, *tetrisp2_scroll_fg;
55extern UINT16 *tetrisp2_vram_rot, *tetrisp2_rotregs;
56
57extern UINT16 *tetrisp2_priority;
58
59extern UINT16 *rocknms_sub_vram_bg, *rocknms_sub_scroll_bg;
60extern UINT16 *rocknms_sub_vram_fg, *rocknms_sub_scroll_fg;
61extern UINT16 *rocknms_sub_vram_rot, *rocknms_sub_rotregs;
62
63extern UINT16 *rocknms_sub_priority;
64
65/* Functions defined in video: */
66
67WRITE16_HANDLER( tetrisp2_palette_w );
68WRITE16_HANDLER( rocknms_sub_palette_w );
69READ16_HANDLER( tetrisp2_priority_r );
70WRITE16_HANDLER( tetrisp2_priority_w );
71WRITE16_HANDLER( rockn_priority_w );
72READ16_HANDLER( rocknms_sub_priority_r );
73WRITE16_HANDLER( rocknms_sub_priority_w );
74READ16_HANDLER( nndmseal_priority_r );
75
76WRITE16_HANDLER( tetrisp2_vram_bg_w );
77WRITE16_HANDLER( tetrisp2_vram_fg_w );
78WRITE16_HANDLER( tetrisp2_vram_rot_w );
79
80WRITE16_HANDLER( rocknms_sub_vram_bg_w );
81WRITE16_HANDLER( rocknms_sub_vram_fg_w );
82WRITE16_HANDLER( rocknms_sub_vram_rot_w );
83
84VIDEO_START( tetrisp2 );
85VIDEO_UPDATE( tetrisp2 );
86
87VIDEO_START( rockntread );
88VIDEO_UPDATE( rockntread );
89
90VIDEO_START( rocknms );
91VIDEO_UPDATE( rocknms );
92
93VIDEO_START( nndmseal );
94
9552/***************************************************************************
9653
9754
src/mame/drivers/drgnmst.c
r3535r3536
3737#include "driver.h"
3838#include "cpu/pic16c5x/pic16c5x.h"
3939#include "sound/okim6295.h"
40#include "includes/drgnmst.h"
4041
4142
4243static UINT16 drgnmst_snd_command;
r3535r3536
5556UINT16 *drgnmst_vidregs2;
5657
5758
58WRITE16_HANDLER( drgnmst_fg_videoram_w );
59WRITE16_HANDLER( drgnmst_bg_videoram_w );
60WRITE16_HANDLER( drgnmst_md_videoram_w );
61VIDEO_START(drgnmst);
62VIDEO_UPDATE(drgnmst);
63
64
6559static WRITE16_HANDLER( drgnmst_coin_w )
6660{
6761   coin_counter_w(0,data & 0x100);
src/mame/drivers/speglsht.c
r3535r3536
115115UINT32 *speglsht_framebuffer;
116116UINT32  speglsht_videoreg;
117117
118extern UINT8 *st0016_charram;
119
120118static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 )
121119   AM_RANGE(0x0000, 0x7fff) AM_ROM
122120   AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1)
src/mame/drivers/rockola.c
r3535r3536
281281#endif
282282
283283
284/* video */
285
286extern UINT8 *rockola_videoram2;
287extern UINT8 *rockola_charram;
288
289WRITE8_HANDLER( rockola_videoram_w );
290WRITE8_HANDLER( rockola_videoram2_w );
291WRITE8_HANDLER( rockola_colorram_w );
292WRITE8_HANDLER( rockola_charram_w );
293WRITE8_HANDLER( rockola_flipscreen_w );
294WRITE8_HANDLER( rockola_scrollx_w );
295WRITE8_HANDLER( rockola_scrolly_w );
296
297PALETTE_INIT( rockola );
298VIDEO_START( rockola );
299VIDEO_UPDATE( rockola );
300
301WRITE8_HANDLER( satansat_charram_w );
302WRITE8_HANDLER( satansat_b002_w );
303WRITE8_HANDLER( satansat_backcolor_w );
304
305PALETTE_INIT( satansat );
306VIDEO_START( satansat );
307
308
309284/* binary counter (1.4MHz update) */
310285static UINT8 sasuke_counter;
311286static emu_timer *sasuke_timer;
src/mame/drivers/scregg.c
r3535r3536
5252#include "driver.h"
5353#include "deprecat.h"
5454#include "sound/ay8910.h"
55#include "includes/btime.h"
5556
5657
57/* from video/btime.c */
58extern UINT8 *btime_videoram;
59extern size_t btime_videoram_size;
60extern UINT8 *btime_colorram;
61
62PALETTE_INIT( btime );
63VIDEO_START( btime );
64VIDEO_UPDATE( eggs );
65
66READ8_HANDLER( btime_mirrorvideoram_r );
67WRITE8_HANDLER( btime_mirrorvideoram_w );
68READ8_HANDLER( btime_mirrorcolorram_r );
69WRITE8_HANDLER( btime_mirrorcolorram_w );
70WRITE8_HANDLER( btime_video_control_w );
71
7258static ADDRESS_MAP_START( dommy_readmem, ADDRESS_SPACE_PROGRAM, 8 )
7359   AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM)
7460   AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM)
src/mame/drivers/aquarium.c
r3535r3536
5252#include "driver.h"
5353#include "sound/2151intf.h"
5454#include "sound/okim6295.h"
55#include "includes/aquarium.h"
5556
5657#define AQUARIUS_HACK   0
5758
r3535r3536
6364UINT16 *aquarium_mid_videoram;
6465UINT16 *aquarium_bak_videoram;
6566
66WRITE16_HANDLER( aquarium_txt_videoram_w );
67WRITE16_HANDLER( aquarium_mid_videoram_w );
68WRITE16_HANDLER( aquarium_bak_videoram_w );
69
70VIDEO_START(aquarium);
71VIDEO_UPDATE(aquarium);
72
7367#if AQUARIUS_HACK
7468static MACHINE_RESET( aquarium )
7569{
src/mame/drivers/yumefuda.c
r3535r3536
1515 panel" is just a dedicated panel for this game;
1616-"Custom RAM" emulation: might be a (weak) protection device or related to the "Back-up RAM NG"
1717 msg that pops up at every start-up.
18-Video registers...are they of a custom hardware or a common device?
18-Video emulation requires a major conversion to the HD46505SP C.R.T. chip (MC6845 clone)
1919
2020============================================================================================
2121Code disassembling
r3535r3536
236236   AM_RANGE(0x8000, 0x9fff) AM_READWRITE(SMH_BANK1, SMH_ROM)
237237   AM_RANGE(0xa7fc, 0xa7fc) AM_WRITE(prot_lock_w)
238238   AM_RANGE(0xa7ff, 0xa7ff) AM_WRITE(eeprom_w)
239   AM_RANGE(0xaf80, 0xafff) AM_READWRITE(custom_ram_r, custom_ram_w) AM_BASE(&cus_ram) /*260d - 2626*/
240   AM_RANGE(0xb000, 0xb07f) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_split1_w) AM_BASE(&paletteram) /*Custom Format*/
241   AM_RANGE(0xb080, 0xb0ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_split2_w) AM_BASE(&paletteram_2) /*Custom Format*/
239   AM_RANGE(0xaf80, 0xafff) AM_READWRITE(custom_ram_r, custom_ram_w) AM_BASE(&cus_ram)
240   AM_RANGE(0xb000, 0xb07f) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_split1_w) AM_BASE(&paletteram)
241   AM_RANGE(0xb080, 0xb0ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_split2_w) AM_BASE(&paletteram_2)
242242   AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(yumefuda_vram_w) AM_BASE(&videoram)
243243   AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(yumefuda_cram_w) AM_BASE(&colorram)
244244   AM_RANGE(0xe000, 0xffff) AM_RAM
r3535r3536
246246
247247static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 )
248248   ADDRESS_MAP_GLOBAL_MASK(0xff)
249   AM_RANGE(0x00, 0x01) AM_WRITE(yumefuda_videoregs_w)
249   AM_RANGE(0x00, 0x01) AM_WRITE(yumefuda_videoregs_w) // HD46505SP video registers
250250   AM_RANGE(0x40, 0x40) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w)
251251   AM_RANGE(0x41, 0x41) AM_WRITE(ay8910_write_port_0_w)
252252   AM_RANGE(0x80, 0x80) AM_WRITE(mux_w)
253253   AM_RANGE(0x81, 0x81) AM_READ(eeprom_r)
254254   AM_RANGE(0x82, 0x82) AM_READ(mux_r)
255   AM_RANGE(0xc0, 0xc0) AM_WRITE(port_c0_w) /*watchdog write?*/
255   AM_RANGE(0xc0, 0xc0) AM_WRITE(port_c0_w) // video timing
256256ADDRESS_MAP_END
257257
258258static MACHINE_RESET( yumefuda )
src/mame/drivers/inufuku.c
r3535r3536
7272#include "cpu/z80/z80.h"
7373#include "machine/eeprom.h"
7474#include "sound/2610intf.h"
75#include "includes/inufuku.h"
7576
7677
77VIDEO_UPDATE( inufuku );
78VIDEO_START( inufuku );
79
8078UINT16 *inufuku_bg_videoram;
8179UINT16 *inufuku_bg_rasterram;
8280UINT16 *inufuku_text_videoram;
r3535r3536
8583size_t inufuku_spriteram1_size;
8684static UINT16 pending_command;
8785
88WRITE16_HANDLER( inufuku_paletteram_w );
89READ16_HANDLER( inufuku_bg_videoram_r );
90WRITE16_HANDLER( inufuku_bg_videoram_w );
91READ16_HANDLER( inufuku_text_videoram_r );
92WRITE16_HANDLER( inufuku_text_videoram_w );
93WRITE16_HANDLER( inufuku_palettereg_w );
94WRITE16_HANDLER( inufuku_scrollreg_w );
9586
96
9787/******************************************************************************
9888
9989    Sound CPU interface
src/mame/drivers/nbmj8891.c
r3535r3536
4848#include "sound/dac.h"
4949#include "sound/ay8910.h"
5050#include "sound/3812intf.h"
51#include "includes/nbmj8891.h"
5152
5253
5354#define SIGNED_DAC   0      // 0:unsigned DAC, 1:signed DAC
r3535r3536
5859#endif
5960
6061
61extern VIDEO_UPDATE( nbmj8891 );
62extern VIDEO_START( nbmj8891_1layer );
63extern VIDEO_START( nbmj8891_2layer );
64
65extern READ8_HANDLER( nbmj8891_palette_type1_r );
66extern WRITE8_HANDLER( nbmj8891_palette_type1_w );
67extern READ8_HANDLER( nbmj8891_palette_type2_r );
68extern WRITE8_HANDLER( nbmj8891_palette_type2_w );
69extern READ8_HANDLER( nbmj8891_palette_type3_r );
70extern WRITE8_HANDLER( nbmj8891_palette_type3_w );
71extern WRITE8_HANDLER( nbmj8891_blitter_w );
72extern WRITE8_HANDLER( nbmj8891_scrolly_w );
73extern WRITE8_HANDLER( nbmj8891_vramsel_w );
74extern WRITE8_HANDLER( nbmj8891_romsel_w );
75extern WRITE8_HANDLER( nbmj8891_clutsel_w );
76extern READ8_HANDLER( nbmj8891_clut_r );
77extern WRITE8_HANDLER( nbmj8891_clut_w );
78extern WRITE8_HANDLER( nbmj8891_taiwanmb_blitter_w );
79extern WRITE8_HANDLER( nbmj8891_taiwanmb_gfxflag_w );
80extern WRITE8_HANDLER( nbmj8891_taiwanmb_gfxdraw_w );
81extern WRITE8_HANDLER( nbmj8891_taiwanmb_mcu_w );
82
83
8462static DRIVER_INIT( gionbana )
8563{
8664   UINT8 *prot = memory_region(machine, "protection");
src/mame/drivers/vball.c
r3535r3536
9393#include "cpu/z80/z80.h"
9494#include "sound/2151intf.h"
9595#include "sound/okim6295.h"
96#include "includes/vball.h"
9697
97/* from video */
98extern UINT8 *vb_attribram;
99extern UINT8 *vb_spriteram;
100extern UINT8 *vb_videoram;
101extern UINT8 *vb_scrolly_lo;
102extern int vb_scrollx_hi;
103extern int vb_scrolly_hi;
104extern int vb_scrollx_lo;
105extern int vball_gfxset;
10698
107VIDEO_START( vb );
108VIDEO_UPDATE( vb );
109extern void vb_bgprombank_w(running_machine *machine, int bank);
110extern void vb_spprombank_w(running_machine *machine, int bank);
111extern WRITE8_HANDLER( vb_attrib_w );
112extern WRITE8_HANDLER( vb_videoram_w );
113extern void vb_mark_all_dirty(void);
114
115INTERRUPT_GEN( vball_interrupt );
116
117/* end of extern code & data */
118
119
120
12199/* bit 0 = bank switch
122100   bit 1 = ?
123101   bit 2 = ?
src/mame/drivers/plygonet.c
r3535r3536
596596   MDRV_CPU_PROGRAM_MAP(main_map, 0)
597597   MDRV_CPU_VBLANK_INT("main", polygonet_interrupt)
598598
599   MDRV_CPU_ADD("dsp", DSP56156, 10000000)      /* xtal is 40.0 MHz */
599   MDRV_CPU_ADD("dsp", DSP56156, 40000000)      /* xtal is 40.0 MHz */
600600   MDRV_CPU_PROGRAM_MAP(dsp_program_map, 0)
601601   MDRV_CPU_DATA_MAP(dsp_data_map, 0)
602602
r3535r3536
641641
642642static INPUT_PORTS_START( polygonet )
643643   PORT_START("IN0")
644   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )   /* Service */
645   PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )   /* Test Switch */
646   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )   /* Coin Mech Switch 1 */
644   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
645   PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
646   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
647647   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON3 )
648   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON4 )   /* SW1 */
649   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON5 )   /* SW2 */
648   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON4 )   /* SW1 (changes player color).  It's mapped on the JAMMA connector and plugs into an external switch mech. */
649   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON5 )   /* SW2 (changes player color).  It's mapped on the JAMMA connector and plugs into an external switch mech. */
650650   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON6 )
651651   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 )
652652
653653   PORT_START("IN1")
654   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 )   /* Joy2 Up */
655   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON9 )   /* Joy2 Down */
656   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON10 )   /* Joy1 Up */
657   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON11 )   /* Joy1 Down */
658   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON12 )   /* Joy1 Fire */
659   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON13 )   /* Joy2 Fire */
660   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON14 )
661   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON15 )
654   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP )   PORT_PLAYER(1)
655   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN )   PORT_PLAYER(1)
656   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP )   PORT_PLAYER(1)
657   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN )   PORT_PLAYER(1)
658   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
659   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
660   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON8 )
661   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON9 )
662662INPUT_PORTS_END
663663
664664static DRIVER_INIT(polygonet)
src/mame/drivers/nemesis.c
r3535r3536
4646#include "sound/k005289.h"
4747#include "sound/k007232.h"
4848#include "sound/k051649.h"
49#include "includes/nemesis.h"
4950
5051static UINT16 *ram;
5152static UINT16 *ram2;
5253
53extern UINT16 *nemesis_videoram1b;
54extern UINT16 *nemesis_videoram1f;
55extern UINT16 *nemesis_videoram2b;
56extern UINT16 *nemesis_videoram2f;
57extern UINT16 *nemesis_characterram;
58extern UINT16 *nemesis_xscroll1,*nemesis_xscroll2, *nemesis_yscroll;
59extern size_t nemesis_characterram_size;
60
61WRITE16_HANDLER( nemesis_videoram1b_word_w );
62WRITE16_HANDLER( nemesis_videoram1f_word_w );
63WRITE16_HANDLER( nemesis_videoram2b_word_w );
64WRITE16_HANDLER( nemesis_videoram2f_word_w );
65WRITE16_HANDLER( nemesis_characterram_word_w );
66VIDEO_UPDATE( nemesis );
67VIDEO_START( nemesis );
68VIDEO_UPDATE( salamand );
69static MACHINE_RESET( nemesis );
70
71WRITE16_HANDLER( nemesis_gfx_flipx_w );
72WRITE16_HANDLER( nemesis_gfx_flipy_w );
73WRITE16_HANDLER( salamander_palette_word_w );
74
75extern UINT16 *nemesis_yscroll1, *nemesis_yscroll2;
76
77WRITE16_HANDLER( nemesis_palette_word_w );
78
7954static int irq_on = 0;
8055static int irq1_on = 0;
8156static int irq2_on = 0;
src/mame/drivers/stv.c
r3535r3536
8686-To enter into an Advanced Test Mode,keep pressed the Test Button (F2) on the start-up.
8787
8888(Main issues)
89-complete the Master/Slave communication.
90-clean up the IC13 rom loading.
9189-Clean-ups and split the various chips(SCU,SMPC)into their respective files.
92-CD block:complete it & add proper CD image support into MAME.
93-the Cart-Dev mode...we need the proper ST-V Cart-Dev bios to be dumped in order to
94 make this work,but probably this will never be done...
95-fix some strange sound cpu memory accesses,there are various issues about this.
90-CD block:complete it.
91-The Cart-Dev mode hangs even with the -dev bios,I would like to see what it does on the real HW.
92-IC13 games on the bios dev doesn't even load the cartridge / crashes the emulation at start-up,
93 rom rearrange needed?
9694-finish the DSP core.
97-Complete the window system in VDP2 (Still in progress).
9895-Add the RS232c interface (serial port),needed by fhboxers.
9996-(PCB owners) check if the clocks documented in the manuals are really right for ST-V.
10097-SCSP to master irq: see if there is a sound cpu mask bit.
r3535r3536
112109  It rotates clockwise IIRC.Also the ST-V logo when the game is in Multi mode rotates too.
113110 -The MIDI communication check fails even on a ST-V board,somebody needs to check if there
114111  is a MIDI port on the real PCB...
112-All games except shienryu: add default eeprom if necessary (1P/3P games for example).
113-Video emulation bugs: check stvvdp2.c file.
115114
116115(per-game issues)
117116-groovef: hangs soon after loaded,caused by two memory addresses in the Work RAM-H range.
118117 Kludged for now to work.
119118-various: find idle skip if possible.
120-suikoenb/shanhigw + others: why do we get 2 credits on startup with sound enabled?
119-suikoenb/shanhigw + others: why do we get 2 credits on startup? Cause should be by a communication with the M68k
121120-colmns97/puyosun/mausuke/cotton2/cottonbm: interrupt issues? we can't check the SCU mask
122121 on SMPC or controls fail
123122-mausuke/bakubaku/grdforce: need to sort out transparency on the colour mapped sprites
124-bakubaku: no sound? Caused by missing irq?
123-bakubaku: sound part is largely incomplete,caused by a tight loop at location PC=1048 of the sound cpu part.
125124-myfairld: Apparently this game gives a black screen (either test mode and in-game mode),but let it wait for about
126125 10 seconds and the game will load everything.This is because of a hellishly slow m68k sub-routine located at 54c2.
127126 Likely to not be a bug but an in-game design issue.
128127-myfairld: Micronet programmers had the "great" idea to *not* use the ST-V input standards,infact
129128 joystick panel is mapped with input_port(10) instead of input_port(2),so for now use
130129 the mahjong panel instead.
131-kiwames: the VDP1 sprites refresh is too slow,causing the "Draw by request" mode to
132 flicker.Moved back to default ATM...
133-pblbeach: Sprites are offset, because it doesn't clear vdp1 local coordinates set by bios,
134 I guess that they are cleared when some vdp1 register is written (kludged for now)
130-danchih: hanafuda panel doesn't work.
135131-decathlt: Is currently using a strange protection DMA abus control,and it uses some sort of RLE
136132 compression/encryption that serves as a gfxdecode.
137-vmahjong: the vdp1 textures are too dark(women).
138-findlove: controls doesn't work?
139-Weird design choices:
140 introdon: has the working button as BUTTON2 and not BUTTON1
141 batmanfr: BUTTON1 isn't used at all.
142-seabass: Player sprite is corrupt/missing during movements,caused
143 by incomplete framebuffer switching.
144-sss: Missing backgrounds during gameplay. <- seems just too dark (night),probably
145 just the positioning isn't correct...
146-elandore: Polygons structures/textures aren't right in gameplay,known as protection
147 for the humans structures,imperfect VDP1 emulation for the dragons.
148-hanagumi: ending screens have corrupt graphics. (*untested*)
133-findlove: controls doesn't work? Playing with the debugger at location $6063720 it makes it get furter,but controls
134 still doesn't work,missing irq?
149135-batmanfr: Missing sound,caused by an extra ADSP chip which is on the cart.The CPU is a
150136 ADSP-2181,and it's the same used by NBA Jam Extreme (ZN game).
151-twcup98: missing Tecmo logo
152137-vfremix: when you play Akira, there is a problem with third match: game doesn't upload all textures
153138 and tiles and doesn't enable display, although gameplay is normal - wait a while to get back
154 to title screen after loosing a match
139 to title screen after losing a match
155140-sokyugrt: gameplay seems to be not smooth, timing?
156-kiwames: hangs on title screen
157141-seabass: crashes in stvcd.c - there is no CD and we report than we have one, and game tries
158142 to read something, however it doesn't do it after nvram is deleted?
159-Here's the list of unmapped read/writes:
160*<all games>
161cpu #0 (PC=0000365C): unmapped program memory dword write to 057FFFFC = 000D0000 & FFFF0000
162cpu #0 (PC=00003654): unmapped program memory dword write to 057FFFFC = 000C0000 & FFFF0000
163*bakubaku:
164cpu #0 (PC=0601022E): unmapped program memory dword write to 02000000 = 00000000 & FFFFFFFF
165cpu #0 (PC=0601023A): unmapped program memory dword write to 02000000 = 00000000 & FFFFFFFF
143-Protection issues:
144 \-ffreveng: boot vectors;
145 \-decathlt: in-game graphics;
146 \-elandore: human textures;
147 \-twcup98: tecmo logo / sprite movements;
148 \-astrass: text layer (kludged for now);
166149
150
167151*/
168152
169153#include "driver.h"
r3535r3536
463447
464448   return_data = smpc_ram[offset];
465449
466   if ((offset == 0x61)) // ?? many games need this or the controls don't work
450   if (offset == 0x61) // ?? many games need this or the controls don't work
467451      return_data = 0x20 ^ 0xff;
468452
469453   if (offset == 0x75)//PDR1 read
r3535r3536
698682            smpc_ram[0x5f]=0x1a;
699683            NMI_reset = 1;
700684            smpc_ram[0x21] = (0x80) | ((NMI_reset & 1) << 6);
701
702685            break;
703686         default:
704687            if(LOG_SMPC) logerror ("cpu #%d (PC=%08X) SMPC: undocumented Command %02x\n", cpu_getactivecpu(), activecpu_get_pc(), data);
r3535r3536
888871
889872static READ32_HANDLER ( stv_io_r32 )
890873{
891   //if(LOG_IOGA) logerror("(PC=%08X): I/O r %08X & %08X\n", activecpu_get_pc(), offset*4, mem_mask);
874//  if(LOG_IOGA) logerror("(PC=%08X): I/O r %08X & %08X\n", activecpu_get_pc(), offset*4, mem_mask);
875//  popmessage("SEL: %02x MUX: %02x %02x %02x %02x %02x",port_sel,mux_data,ioga[1],ioga[2],ioga[3],ioga[5]);
892876
893877   switch(offset)
894878   {
r3535r3536
936920      }
937921      case 1:
938922      if ( strcmp(machine->gamedrv->name,"critcrsh") == 0 )
939      {
940923         return ((input_port_read(machine, "SYSTEM") << 16) & ((input_port_read(machine, "P1") & 1) ? 0xffef0000 : 0xffff0000)) | (ioga[1]);
941      }
942924      else
943      {
944925         return (input_port_read(machine, "SYSTEM") << 16) | (ioga[1]);
945      }
926
946927      case 2:
947928      switch(port_sel)
948929      {
r3535r3536
952933         case 0x10:  return ((ioga[2] & 0xffff) << 16) | 0xffff;
953934         case 0x60:  return 0xffffffff;/**/
954935         default:
955         //popmessage("offs: 2 %02x",port_sel);
956936         return 0xffffffff;
957937      }
958938      break;
r3535r3536
1007987
1008988static WRITE32_HANDLER ( stv_io_w32 )
1009989{
1010   //if(LOG_IOGA) logerror("(PC=%08X): I/O w %08X = %08X & %08X\n", activecpu_get_pc(), offset*4, data, mem_mask);
990//  if(LOG_IOGA) logerror("(PC=%08X): I/O w %08X = %08X & %08X\n", activecpu_get_pc(), offset*4, data, mem_mask);
1011991
1012992   switch(offset)
1013993   {
r3535r3536
20121992static WRITE32_HANDLER( minit_w )
20131993{
20141994   logerror("cpu #%d (PC=%08X) MINIT write = %08x\n",cpu_getactivecpu(), activecpu_get_pc(),data);
2015   cpu_boost_interleave(minit_boost_timeslice, ATTOTIME_IN_USEC(minit_boost));
1995   cpu_boost_interleave(machine, minit_boost_timeslice, ATTOTIME_IN_USEC(minit_boost));
20161996   cpu_trigger(machine, 1000);
20171997   cpunum_set_info_int(1, CPUINFO_INT_SH2_FRT_INPUT, PULSE_LINE);
20181998}
r3535r3536
20202000static WRITE32_HANDLER( sinit_w )
20212001{
20222002   logerror("cpu #%d (PC=%08X) SINIT write = %08x\n",cpu_getactivecpu(), activecpu_get_pc(),data);
2023   cpu_boost_interleave(sinit_boost_timeslice, ATTOTIME_IN_USEC(sinit_boost));
2003   cpu_boost_interleave(machine, sinit_boost_timeslice, ATTOTIME_IN_USEC(sinit_boost));
20242004   cpunum_set_info_int(0, CPUINFO_INT_SH2_FRT_INPUT, PULSE_LINE);
20252005}
20262006
r3535r3536
29522932
29532933   ROM_REGION32_BE( 0x3000000, "user1", 0 ) /* SH2 code */
29542934   ROM_LOAD16_BYTE( "finlarch.13",               0x0000001, 0x0100000, CRC(4505fa9e) SHA1(96c6399146cf9c8f1d27a8fb6a265f937258004a) )
2935   ROM_RELOAD ( 0x0100001, 0x0080000 )
29552936
29562937   ROM_LOAD16_WORD_SWAP( "mpr18257.2",    0x0400000, 0x0400000, CRC(137fdf55) SHA1(07a02fe531b3707e063498f5bc9749bd1b4cadb3) ) // good
29572938   ROM_RELOAD(                            0x1400000, 0x0400000 )
r3535r3536
36843665GAME( 1995, kiwames,   stvbios, stv, stvmp,      stv,          ROT0,   "Athena",                    "Pro Mahjong Kiwame S (J 951020 V1.208)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
36853666GAME( 1997, maruchan,  stvbios, stv, stv,        maruchan,     ROT0,   "Sega / Toyosuisan",             "Maru-Chan de Goo! (J 971216 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
36863667GAME( 1996, mausuke,   stvbios, stv, stv,        mausuke,      ROT0,   "Data East",                 "Mausuke no Ojama the World (J 960314 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
3668GAME( 1998, myfairld,  stvbios, stv, stvmp,      stv,          ROT0,   "Micronet",                    "Virtual Mahjong 2 - My Fair Lady (J 980608 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
36873669GAME( 1998, othellos,  stvbios, stv, stv,        othellos,     ROT0,   "Success",                   "Othello Shiyouyo (J 980423 V1.002)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
36883670GAME( 1995, pblbeach,  stvbios, stv, stv,        pblbeach,     ROT0,   "T&E Soft",                      "Pebble Beach - The Great Shot (JUE 950913 V0.990)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
36893671GAME( 1996, prikura,   stvbios, stv, stv,        prikura,      ROT0,   "Atlus",                     "Princess Clara Daisakusen (J 960910 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
r3535r3536
37093691
37103692/* Almost */
37113693GAME( 1997, vmahjong,  stvbios, stv, stvmp,      stv,          ROT0,   "Micronet",                    "Virtual Mahjong (J 961214 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
3712GAME( 1998, myfairld,  stvbios, stv, stvmp,      stv,          ROT0,   "Micronet",                    "Virtual Mahjong 2 - My Fair Lady (J 980608 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
37133694GAME( 1998, twcup98,   stvbios, stv, stv,        twcup98,      ROT0,   "Tecmo",                       "Tecmo World Cup '98 (JUET 980410 V1.000)", GAME_UNEMULATED_PROTECTION | GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS|GAME_NOT_WORKING ) // player movement
37143695GAME( 1998, stress,    stvbios, stv, stv,        stv,          ROT0,   "Sega",                       "Stress Busters (J 981020 V1.000)", GAME_NOT_WORKING ) // needs printer
37153696
37163697/* Doing Something.. but not enough yet */
37173698GAME( 1998, elandore,  stvbios, stv, stv,        elandore,     ROT0,   "Sai-Mate",                    "Touryuu Densetsu Elan-Doree / Elan Doree - Legend of Dragoon (JUET 980922 V1.006)", GAME_UNEMULATED_PROTECTION | GAME_IMPERFECT_SOUND | GAME_NOT_WORKING )
37183699GAME( 1995, vfremix,   stvbios, stv, stv,        vfremix,      ROT0,   "Sega",                       "Virtua Fighter Remix (JUETBKAL 950428 V1.000)", GAME_IMPERFECT_SOUND | GAME_NOT_WORKING )
3719GAME( 1997, findlove,  stvbios, stv, stv,        stv,          ROT0,   "Daiki / FCF",                   "Find Love (J 971212 V1.000)", GAME_IMPERFECT_SOUND | GAME_NOT_WORKING )
3700GAME( 1997, findlove,  stvbios, stv, stv,        stv,        ROT0,   "Daiki / FCF",                   "Find Love (J 971212 V1.000)", GAME_IMPERFECT_SOUND | GAME_NOT_WORKING )
37203701GAME( 1996, decathlt,  stvbios, stv, stv,        decathlt,     ROT0,   "Sega",                       "Decathlete (JUET 960709 V1.001)", GAME_NO_SOUND | GAME_NOT_WORKING | GAME_UNEMULATED_PROTECTION )
37213702GAME( 1996, decathlo,  decathlt,stv, stv,        decathlt,    ROT0,     "Sega",                       "Decathlete (JUET 960424 V1.000)", GAME_NO_SOUND | GAME_NOT_WORKING | GAME_UNEMULATED_PROTECTION )
37223703
src/mame/drivers/fromanc2.c
r3535r3536
2727#include "machine/eeprom.h"
2828#include "sound/2610intf.h"
2929#include "rendlay.h"
30#include "includes/fromanc2.h"
3031
3132
32VIDEO_UPDATE( fromanc2 );
33VIDEO_START( fromanc2 );
34VIDEO_START( fromancr );
35VIDEO_START( fromanc4 );
36
37READ16_HANDLER( fromanc2_paletteram_0_r );
38READ16_HANDLER( fromanc2_paletteram_1_r );
39WRITE16_HANDLER( fromanc2_paletteram_0_w );
40WRITE16_HANDLER( fromanc2_paletteram_1_w );
41READ16_HANDLER( fromancr_paletteram_0_r );
42READ16_HANDLER( fromancr_paletteram_1_r );
43WRITE16_HANDLER( fromancr_paletteram_0_w );
44WRITE16_HANDLER( fromancr_paletteram_1_w );
45READ16_HANDLER( fromanc4_paletteram_0_r );
46READ16_HANDLER( fromanc4_paletteram_1_r );
47WRITE16_HANDLER( fromanc4_paletteram_0_w );
48WRITE16_HANDLER( fromanc4_paletteram_1_w );
49WRITE16_HANDLER( fromanc2_videoram_0_w );
50WRITE16_HANDLER( fromanc2_videoram_1_w );
51WRITE16_HANDLER( fromanc2_videoram_2_w );
52WRITE16_HANDLER( fromanc2_videoram_3_w );
53WRITE16_HANDLER( fromancr_videoram_0_w );
54WRITE16_HANDLER( fromancr_videoram_1_w );
55WRITE16_HANDLER( fromancr_videoram_2_w );
56WRITE16_HANDLER( fromanc4_videoram_0_w );
57WRITE16_HANDLER( fromanc4_videoram_1_w );
58WRITE16_HANDLER( fromanc4_videoram_2_w );
59WRITE16_HANDLER( fromanc2_gfxreg_0_w );
60WRITE16_HANDLER( fromanc2_gfxreg_1_w );
61WRITE16_HANDLER( fromanc2_gfxreg_2_w );
62WRITE16_HANDLER( fromanc2_gfxreg_3_w );
63WRITE16_HANDLER( fromancr_gfxreg_0_w );
64WRITE16_HANDLER( fromancr_gfxreg_1_w );
65WRITE16_HANDLER( fromanc2_gfxbank_0_w );
66WRITE16_HANDLER( fromanc2_gfxbank_1_w );
67void fromancr_gfxbank_w(int data);
68WRITE16_HANDLER( fromanc4_gfxreg_0_w );
69WRITE16_HANDLER( fromanc4_gfxreg_1_w );
70WRITE16_HANDLER( fromanc4_gfxreg_2_w );
71
72
7333static int fromanc2_portselect;
7434static UINT16 fromanc2_datalatch1;
7535static UINT8 fromanc2_datalatch_2h, fromanc2_datalatch_2l;
src/mame/drivers/flower.c
r3535r3536
7171
7272#include "driver.h"
7373#include "deprecat.h"
74#include "sound/custom.h"
74#include "includes/flower.h"
7575
76WRITE8_HANDLER( flower_textram_w );
77WRITE8_HANDLER( flower_bg0ram_w );
78WRITE8_HANDLER( flower_bg1ram_w );
79WRITE8_HANDLER( flower_flipscreen_w );
80VIDEO_UPDATE( flower );
81VIDEO_START( flower );
82PALETTE_INIT( flower );
83
84WRITE8_HANDLER( flower_sound1_w );
85WRITE8_HANDLER( flower_sound2_w );
86
87extern UINT8 *flower_textram, *flower_bg0ram, *flower_bg1ram, *flower_bg0_scroll, *flower_bg1_scroll;
88extern UINT8 *flower_soundregs1,*flower_soundregs2;
89void *flower_sh_start(int clock, const custom_sound_interface *config);
90
9176static UINT8 *sn_irq_enable;
9277static UINT8 *sn_nmi_enable;
9378
src/mame/drivers/xain.c
r3535r3536
175175   /* so let's resync every time they are changed to avoid deadlocks */
176176   if ((offset == 0x003d || offset == 0x003e)
177177         && xain_sharedram[offset] != data)
178      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(20));
178      cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(20));
179179   xain_sharedram[offset] = data;
180180}
181181
src/mame/drivers/junofrst.c
r3535r3536
9090
9191static int i8039_status;
9292
93WRITE8_HANDLER( tutankhm_sh_irqtrigger_w );
94
95
9693static WRITE8_HANDLER( junofrst_bankselect_w )
9794{
9895   memory_set_bank(1, data & 0x0f);
src/mame/drivers/nbmj8688.c
r3535r3536
3434#include "sound/3812intf.h"
3535#include "rendlay.h"
3636#include "nbmj8688.lh"
37#include "includes/nbmj8688.h"
3738
39
3840#define SIGNED_DAC   0      // 0:unsigned DAC, 1:signed DAC
3941#if SIGNED_DAC
4042#define DAC_0_WRITE   dac_0_signed_data_w
r3535r3536
4345#endif
4446
4547
46extern PALETTE_INIT( mbmj8688_8bit );
47extern PALETTE_INIT( mbmj8688_12bit );
48extern PALETTE_INIT( mbmj8688_16bit );
49extern VIDEO_UPDATE( mbmj8688 );
50extern VIDEO_UPDATE( mbmj8688_LCD );
51extern VIDEO_START( mbmj8688_8bit );
52extern VIDEO_START( mbmj8688_hybrid_12bit );
53extern VIDEO_START( mbmj8688_pure_12bit );
54extern VIDEO_START( mbmj8688_hybrid_16bit );
55extern VIDEO_START( mbmj8688_pure_16bit );
56extern VIDEO_START( mbmj8688_pure_16bit_LCD );
57
58extern WRITE8_HANDLER( nbmj8688_clut_w );
59extern WRITE8_HANDLER( nbmj8688_blitter_w );
60extern WRITE8_HANDLER( mjsikaku_gfxflag2_w );
61extern WRITE8_HANDLER( mjsikaku_gfxflag3_w );
62extern WRITE8_HANDLER( mjsikaku_scrolly_w );
63extern WRITE8_HANDLER( mjsikaku_romsel_w );
64extern WRITE8_HANDLER( secolove_romsel_w );
65extern WRITE8_HANDLER( seiha_romsel_w );
66extern WRITE8_HANDLER( crystalg_romsel_w );
67
68extern WRITE8_HANDLER( nbmj8688_HD61830B_0_instr_w );
69extern WRITE8_HANDLER( nbmj8688_HD61830B_0_data_w );
70extern WRITE8_HANDLER( nbmj8688_HD61830B_1_instr_w );
71extern WRITE8_HANDLER( nbmj8688_HD61830B_1_data_w );
72extern WRITE8_HANDLER( nbmj8688_HD61830B_both_instr_w );
73extern WRITE8_HANDLER( nbmj8688_HD61830B_both_data_w );
74
75
7648static DRIVER_INIT( mjsikaku )
7749{
7850   nb1413m3_type = NB1413M3_MJSIKAKU;
src/mame/drivers/m79amb.c
r3535r3536
4848  8002 Sound Control (According to Manual)
4949  8003 D0=SelfTest LED
5050
51 */
52#include "driver.h"
51*/
5352
54INTERRUPT_GEN( invaders_interrupt );
55void ramtek_sh_update(void);
56
57
58/***************************************************************************
59
60  video.c
61
62  Functions to emulate the video hardware of the machine.
63
64***************************************************************************/
65
6653#include "driver.h"
6754
68
69
7055static UINT8 *ramtek_videoram;
7156static UINT8 *mask;
7257
src/mame/drivers/meritm.c
r3535r3536
850850   memory_configure_bank(1, 0, 8, memory_region(machine, "main"), 0x10000);
851851   meritm_bank = 0xff;
852852   meritm_crt250_switch_banks();
853   machine_start_merit_common(machine);
853   MACHINE_START_CALL(merit_common);
854854   state_save_register_global(meritm_bank);
855855
856856};
857857
858858static MACHINE_START(meritm_crt250_questions)
859859{
860   machine_start_meritm_crt250(machine);
860   MACHINE_START_CALL(meritm_crt250);
861861   state_save_register_global(questions_loword_address);
862862};
863863
r3535r3536
871871   meritm_bank = 0xff;
872872   meritm_psd_a15 = 0;
873873   meritm_switch_banks();
874   machine_start_merit_common(machine);
874   MACHINE_START_CALL(merit_common);
875875   pc16552d_init(0, UART_CLK, NULL, pc16650d_tx_callback);
876876   microtouch_init(meritm_microtouch_tx_callback, meritm_touch_coord_transform);
877877   state_save_register_global(meritm_bank);
src/mame/drivers/nbmj8991.c
r3535r3536
3434#include "sound/ay8910.h"
3535#include "sound/3812intf.h"
3636#include "sound/dac.h"
37#include "includes/nbmj8991.h"
3738
3839
3940#define SIGNED_DAC   0      // 0:unsigned DAC, 1:signed DAC
r3535r3536
4647#endif
4748
4849
49extern VIDEO_UPDATE( nbmj8991_type1 );            // galkoku
50extern VIDEO_UPDATE( nbmj8991_type2 );            // pstadium
51extern VIDEO_START( nbmj8991 );                  // pstadium
52
53extern WRITE8_HANDLER( nbmj8991_palette_type1_w );   // galkoku
54extern WRITE8_HANDLER( nbmj8991_palette_type2_w );   // galkaika
55extern WRITE8_HANDLER( nbmj8991_palette_type3_w );   // pstadium
56extern WRITE8_HANDLER( nbmj8991_blitter_w );
57extern READ8_HANDLER( nbmj8991_clut_r );
58extern WRITE8_HANDLER( nbmj8991_clut_w );
59
60
6150static WRITE8_HANDLER( nbmj8991_soundbank_w )
6251{
6352   if (!(data & 0x80)) soundlatch_clear_w(machine, 0, 0);
src/mame/drivers/tecmosys.c
r3535r3536
184184#include "driver.h"
185185#include "machine/eeprom.h"
186186#include "tecmosys.h"
187#include "cpu/m68000/m68k.h"
187#include "cpu/m68000/m68000.h"
188188#include "sound/okim6295.h"
189189#include "sound/262intf.h"
190190#include "sound/ymz280b.h"
src/mame/drivers/polyplay.c
r3535r3536
8181#include "driver.h"
8282#include "cpu/z80/z80.h"
8383#include "sound/samples.h"
84#include "includes/polyplay.h"
8485
85/* video hardware access */
86extern UINT8 *polyplay_characterram;
87PALETTE_INIT( polyplay );
88VIDEO_UPDATE( polyplay );
89READ8_HANDLER( polyplay_characterram_r );
90WRITE8_HANDLER( polyplay_characterram_w );
9186
9287/* I/O Port handling */
9388static READ8_HANDLER( polyplay_random_read );
9489
9590/* sound handling */
96void polyplay_set_channel1(int active);
97void polyplay_set_channel2(int active);
9891static int prescale1;
9992static int prescale2;
10093static int channel1_active;
10194static int channel1_const;
10295static int channel2_active;
10396static int channel2_const;
104void polyplay_play_channel1(int data);
105void polyplay_play_channel2(int data);
106void polyplay_sh_start(void);
10797
10898/* timer handling */
10999static TIMER_CALLBACK( polyplay_timer_callback );
src/mame/drivers/gotya.c
r3535r3536
3535
3636#include "driver.h"
3737#include "sound/samples.h"
38#include "includes/gotya.h"
3839
3940
40extern UINT8 *gotya_scroll;
41extern UINT8 *gotya_videoram2;
42
43extern WRITE8_HANDLER( gotya_videoram_w );
44extern WRITE8_HANDLER( gotya_colorram_w );
45extern WRITE8_HANDLER( gotya_videoram2_w );
46
47extern PALETTE_INIT( gotya );
48extern VIDEO_START( gotya );
49extern VIDEO_UPDATE( gotya );
50
51extern WRITE8_HANDLER( gotya_video_control_w );
52
53extern WRITE8_HANDLER( gotya_soundlatch_w );
54
55
5641static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
5742   AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
5843   AM_RANGE(0x5000, 0x5fff) AM_READ(SMH_RAM)
src/mame/drivers/m72.c
r3535r3536
113113
114114static TIMER_CALLBACK( synch_callback )
115115{
116   //cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(8000000));
117   cpu_boost_interleave(ATTOTIME_IN_HZ(MASTER_CLOCK/4/12), ATTOTIME_IN_SEC(25));
116   //cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(8000000));
117   cpu_boost_interleave(machine, ATTOTIME_IN_HZ(MASTER_CLOCK/4/12), ATTOTIME_IN_SEC(25));
118118}
119119
120120static MACHINE_RESET( m72 )
src/mame/drivers/r2dtank.c
r3535r3536
3131********************************************************************/
3232
3333#include "driver.h"
34#include "deprecat.h"
3534#include "machine/rescap.h"
3635#include "machine/6821pia.h"
3736#include "machine/74123.h"
r3535r3536
225224 *
226225 *************************************/
227226
228static void ttl74123_output_changed(int output)
227static WRITE8_DEVICE_HANDLER( ttl74123_output_changed )
229228{
230   pia_0_ca1_w(Machine, 0, output);
231   ttl74123_output = output;
229   pia_0_ca1_w(device->machine, 0, data);
230   ttl74123_output = data;
232231}
233232
234233
r3535r3536
238237}
239238
240239
241static const TTL74123_interface ttl74123_intf =
240static const ttl74123_config ttl74123_intf =
242241{
243242   TTL74123_GROUNDED,   /* the hook up type */
244243   RES_K(22),         /* resistor connected to RCext */
r3535r3536
278277   pia_config(0, &pia_main_intf);
279278   pia_config(1, &pia_audio_intf);
280279
281   TTL74123_config(0, &ttl74123_intf);
282
283280   /* setup for save states */
284281   state_save_register_global(flipscreen);
285282   state_save_register_global(ttl74123_output);
r3535r3536
297294static MACHINE_RESET( r2dtank )
298295{
299296   pia_reset();
300   TTL74123_reset(0);
301297}
302298
303299
r3535r3536
383379
384380static MC6845_ON_DE_CHANGED( display_enable_changed )
385381{
386   TTL74123_A_w(0, display_enabled);
382   ttl74123_a_w(devtag_get_device(device->machine, TTL74123, "74123"), 0, display_enabled);
387383}
388384
389385
r3535r3536
556552   MDRV_DEVICE_ADD("crtc", MC6845)
557553   MDRV_DEVICE_CONFIG(mc6845_intf)
558554
555   /* 74LS123 */
556
557   MDRV_DEVICE_ADD("74123", TTL74123)
558   MDRV_DEVICE_CONFIG(ttl74123_intf)
559
559560   /* audio hardware */
560561   MDRV_SPEAKER_STANDARD_MONO("mono")
561562
src/mame/drivers/oneshot.c
r3535r3536
3232#include "driver.h"
3333#include "sound/okim6295.h"
3434#include "sound/3812intf.h"
35#include "includes/oneshot.h"
3536
3637
3738UINT16 *oneshot_sprites;
r3535r3536
4344int gun_x_p1,gun_y_p1,gun_x_p2,gun_y_p2;
4445int gun_x_shift;
4546
46WRITE16_HANDLER( oneshot_bg_videoram_w );
47WRITE16_HANDLER( oneshot_mid_videoram_w );
48WRITE16_HANDLER( oneshot_fg_videoram_w );
49VIDEO_START( oneshot );
50VIDEO_UPDATE( oneshot );
51VIDEO_UPDATE( maddonna );
52
53
5447static READ16_HANDLER( oneshot_in0_word_r )
5548{
5649   int data = input_port_read(machine, "DSW1");
src/mame/drivers/ksys573.c
r3535r3536
259259
260260/* EEPROM handlers */
261261
262static void (*nvram_handler_security_cart_0)( running_machine *machine, mame_file *file, int read_or_write );
263static void (*nvram_handler_security_cart_1)( running_machine *machine, mame_file *file, int read_or_write );
262static nvram_handler_func nvram_handler_security_cart_0;
263static nvram_handler_func nvram_handler_security_cart_1;
264264
265265static NVRAM_HANDLER( konami573 )
266266{
src/mame/drivers/toobin.c
r3535r3536
2222#include "audio/atarijsa.h"
2323#include "toobin.h"
2424
25#define MASTER_CLOCK      XTAL_32MHz
2526
2627
28
2729/*************************************
2830 *
2931 *  Statics
r3535r3536
4244
4345static void update_interrupts(running_machine *machine)
4446{
45   cpunum_set_input_line(machine, 0, 1, atarigen_scanline_int_state ? ASSERT_LINE : CLEAR_LINE);
46   cpunum_set_input_line(machine, 0, 2, atarigen_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
47   cpunum_set_input_line(machine, 0, 3, atarigen_scanline_int_state && atarigen_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
47   cputag_set_input_line(machine, "main", 1, atarigen_scanline_int_state ? ASSERT_LINE : CLEAR_LINE);
48   cputag_set_input_line(machine, "main", 2, atarigen_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
49   cputag_set_input_line(machine, "main", 3, atarigen_scanline_int_state && atarigen_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
4850}
4951
5052
r3535r3536
101103 *
102104 *************************************/
103105
106/* full address map decoded from schematics */
104107static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
108   ADDRESS_MAP_GLOBAL_MASK(0xc7ffff)
105109   AM_RANGE(0x000000, 0x07ffff) AM_ROM
106   AM_RANGE(0xc00000, 0xc09fff) AM_READ(SMH_RAM)
107   AM_RANGE(0xc00000, 0xc07fff) AM_WRITE(atarigen_playfield_large_w) AM_BASE(&atarigen_playfield)
108   AM_RANGE(0xc08000, 0xc097ff) AM_WRITE(atarigen_alpha_w) AM_BASE(&atarigen_alpha)
109   AM_RANGE(0xc09800, 0xc09fff) AM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram)
110   AM_RANGE(0xc10000, 0xc107ff) AM_RAM_WRITE(toobin_paletteram_w) AM_BASE(&paletteram16)
110   AM_RANGE(0xc00000, 0xc07fff) AM_RAM_WRITE(atarigen_playfield_large_w) AM_BASE(&atarigen_playfield)
111   AM_RANGE(0xc08000, 0xc097ff) AM_MIRROR(0x046000) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE(&atarigen_alpha)
112   AM_RANGE(0xc09800, 0xc09fff) AM_MIRROR(0x046000) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram)
113   AM_RANGE(0xc10000, 0xc107ff) AM_MIRROR(0x047800) AM_RAM_WRITE(toobin_paletteram_w) AM_BASE(&paletteram16)
111114   AM_RANGE(0xff6000, 0xff6001) AM_READ(SMH_NOP)      /* who knows? read at controls time */
112   AM_RANGE(0xff8000, 0xff8001) AM_WRITE(watchdog_reset16_w)
113   AM_RANGE(0xff8100, 0xff8101) AM_WRITE(atarigen_sound_w)
114   AM_RANGE(0xff8300, 0xff8301) AM_WRITE(toobin_intensity_w)
115   AM_RANGE(0xff8340, 0xff8341) AM_WRITE(interrupt_scan_w) AM_BASE(&interrupt_scan)
116   AM_RANGE(0xff8380, 0xff8381) AM_WRITE(toobin_slip_w) AM_BASE(&atarimo_0_slipram)
117   AM_RANGE(0xff83c0, 0xff83c1) AM_WRITE(atarigen_scanline_int_ack_w)
118   AM_RANGE(0xff8400, 0xff8401) AM_WRITE(atarigen_sound_reset_w)
119   AM_RANGE(0xff8500, 0xff8501) AM_WRITE(atarigen_eeprom_enable_w)
120   AM_RANGE(0xff8600, 0xff8601) AM_WRITE(toobin_xscroll_w) AM_BASE(&atarigen_xscroll)
121   AM_RANGE(0xff8700, 0xff8701) AM_WRITE(toobin_yscroll_w) AM_BASE(&atarigen_yscroll)
122   AM_RANGE(0xff8800, 0xff8801) AM_READ_PORT("FF8800")
123   AM_RANGE(0xff9000, 0xff9001) AM_READ(special_port1_r)
124   AM_RANGE(0xff9800, 0xff9801) AM_READ(atarigen_sound_r)
125   AM_RANGE(0xffa000, 0xffafff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size)
126   AM_RANGE(0xffc000, 0xffffff) AM_RAM
115   AM_RANGE(0xff8000, 0xff8001) AM_MIRROR(0x4500fe) AM_WRITE(watchdog_reset16_w)
116   AM_RANGE(0xff8100, 0xff8101) AM_MIRROR(0x4500fe) AM_WRITE(atarigen_sound_w)
117   AM_RANGE(0xff8300, 0xff8301) AM_MIRROR(0x45003e) AM_WRITE(toobin_intensity_w)
118   AM_RANGE(0xff8340, 0xff8341) AM_MIRROR(0x45003e) AM_WRITE(interrupt_scan_w) AM_BASE(&interrupt_scan)
119   AM_RANGE(0xff8380, 0xff8381) AM_MIRROR(0x45003e) AM_WRITE(toobin_slip_w) AM_BASE(&atarimo_0_slipram)
120   AM_RANGE(0xff83c0, 0xff83c1) AM_MIRROR(0x45003e) AM_WRITE(atarigen_scanline_int_ack_w)
121   AM_RANGE(0xff8400, 0xff8401) AM_MIRROR(0x4500fe) AM_WRITE(atarigen_sound_reset_w)
122   AM_RANGE(0xff8500, 0xff8501) AM_MIRROR(0x4500fe) AM_WRITE(atarigen_eeprom_enable_w)
123   AM_RANGE(0xff8600, 0xff8601) AM_MIRROR(0x4500fe) AM_WRITE(toobin_xscroll_w) AM_BASE(&atarigen_xscroll)
124   AM_RANGE(0xff8700, 0xff8701) AM_MIRROR(0x4500fe) AM_WRITE(toobin_yscroll_w) AM_BASE(&atarigen_yscroll)
125   AM_RANGE(0xff8800, 0xff8801) AM_MIRROR(0x4507fe) AM_READ_PORT("FF8800")
126   AM_RANGE(0xff9000, 0xff9001) AM_MIRROR(0x4507fe) AM_READ(special_port1_r)
127   AM_RANGE(0xff9800, 0xff9801) AM_MIRROR(0x4507fe) AM_READ(atarigen_sound_r)
128   AM_RANGE(0xffa000, 0xffafff) AM_MIRROR(0x451000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size)
129   AM_RANGE(0xffc000, 0xffffff) AM_MIRROR(0x450000) AM_RAM
127130ADDRESS_MAP_END
128131
129132
r3535r3536
221224static MACHINE_DRIVER_START( toobin )
222225
223226   /* basic machine hardware */
224   MDRV_CPU_ADD("main", M68010, ATARI_CLOCK_32MHz/4)
227   MDRV_CPU_ADD("main", M68010, MASTER_CLOCK/4)
225228   MDRV_CPU_PROGRAM_MAP(main_map,0)
226229
227230   MDRV_MACHINE_RESET(toobin)
228231   MDRV_NVRAM_HANDLER(atarigen)
232   MDRV_WATCHDOG_VBLANK_INIT(8)
229233
230234   /* video hardware */
231235   MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
232236
233237   MDRV_SCREEN_ADD("main", RASTER)
234   MDRV_SCREEN_REFRESH_RATE(60)
235   MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
236   /* the vert size is copied from atarisy2.c.  Needs to be verified */
237   MDRV_SCREEN_SIZE(64*8, 420)
238   MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 48*8-1)
238   MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 640, 0, 512, 416, 0, 384)
239   MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
239240
240241   MDRV_GFXDECODE(toobin)
241242   MDRV_PALETTE_LENGTH(1024)
src/mame/drivers/xmen.c
r3535r3536
2121#include "sound/2151intf.h"
2222#include "sound/k054539.h"
2323#include "rendlay.h"
24#include "includes/xmen.h"
2425
25VIDEO_START( xmen );
26VIDEO_START( xmen6p );
27VIDEO_UPDATE( xmen );
28VIDEO_UPDATE( xmen6p );
29VIDEO_EOF( xmen6p );
30
3126UINT16 xmen_current_frame;
3227
28/* 6p version */
29UINT16*xmen6p_spriteramleft;
30UINT16*xmen6p_spriteramright;
31UINT16*xmen6p_tilemapleft;
32UINT16*xmen6p_tilemapright;
33
3334/***************************************************************************
3435
3536  EEPROM
r3535r3536
188189ADDRESS_MAP_END
189190
190191
191/* 6p version */
192UINT16*xmen6p_spriteramleft;
193UINT16*xmen6p_spriteramright;
194UINT16*xmen6p_tilemapleft;
195UINT16*xmen6p_tilemapright;
196
197192static ADDRESS_MAP_START( 6p_main_map, ADDRESS_SPACE_PROGRAM, 16 )
198193   AM_RANGE(0x000000, 0x03ffff) AM_ROM
199194   AM_RANGE(0x080000, 0x0fffff) AM_ROM
src/mame/drivers/exprraid.c
r3535r3536
295295   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_VBLANK )
296296
297297   PORT_START("DSW0")   /* DSW 0 - 0x1800 */
298   PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
298   PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )           PORT_DIPLOCATION("SW1:1,2")
299299   PORT_DIPSETTING(    0x00, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW0",0x10,PORTCOND_EQUALS,0x10)
300300   PORT_DIPSETTING(    0x03, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW0",0x10,PORTCOND_EQUALS,0x10)
301301   PORT_DIPSETTING(    0x02, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW0",0x10,PORTCOND_EQUALS,0x10)
r3535r3536
304304   PORT_DIPSETTING(    0x02, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW0",0x10,PORTCOND_EQUALS,0x00)
305305   PORT_DIPSETTING(    0x01, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW0",0x10,PORTCOND_EQUALS,0x00)
306306   PORT_DIPSETTING(    0x00, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW0",0x10,PORTCOND_EQUALS,0x00)
307   PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_B ) )
307   PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_B ) )           PORT_DIPLOCATION("SW1:3,4")
308308   PORT_DIPSETTING(    0x00, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW0",0x10,PORTCOND_EQUALS,0x00)
309309   PORT_DIPSETTING(    0x04, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW0",0x10,PORTCOND_EQUALS,0x00)
310310   PORT_DIPSETTING(    0x00, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW0",0x10,PORTCOND_EQUALS,0x10)
r3535r3536
313313   PORT_DIPSETTING(    0x0c, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW0",0x10,PORTCOND_EQUALS,0x00)
314314   PORT_DIPSETTING(    0x08, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW0",0x10,PORTCOND_EQUALS,0x10)
315315   PORT_DIPSETTING(    0x04, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW0",0x10,PORTCOND_EQUALS,0x10)
316   PORT_DIPNAME( 0x10, 0x10, "Coin Mode" )                 /* see notes */
316   PORT_DIPNAME( 0x10, 0x10, "Coin Mode" )                 PORT_DIPLOCATION("SW1:5")     /* see notes */
317317   PORT_DIPSETTING(    0x10, "Mode 1" )
318318   PORT_DIPSETTING(    0x00, "Mode 2" )
319   PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) )
319   PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) )      PORT_DIPLOCATION("SW1:6")
320320   PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
321321   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
322   PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) )
322   PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) )          PORT_DIPLOCATION("SW1:5")
323323   PORT_DIPSETTING(    0x00, DEF_STR( Upright ) )
324324   PORT_DIPSETTING(    0x40, DEF_STR( Cocktail ) )
325   PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
325   PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW1:8" )
326326
327327   PORT_START("IN1")   /* IN 1 - 0x1801 */
328328   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
r3535r3536
345345   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
346346
347347   PORT_START("DSW1")   /* DSW 1 - 0x1803 */
348   PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
348   PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )            PORT_DIPLOCATION("SW2:1,2")
349349   PORT_DIPSETTING(    0x01, "1" )
350350   PORT_DIPSETTING(    0x03, "3" )
351351   PORT_DIPSETTING(    0x02, "5" )
352352   PORT_DIPSETTING(   0x00, DEF_STR( Infinite ) )
353   PORT_DIPNAME( 0x04, 0x04, DEF_STR( Bonus_Life ) )       /* see notes */
353   PORT_DIPNAME( 0x04, 0x04, DEF_STR( Bonus_Life ) )       PORT_DIPLOCATION("SW2:3")     /* see notes */
354354   PORT_DIPSETTING(    0x00, "50k 80k" )
355355   PORT_DIPSETTING(    0x04, "50k only" )
356   PORT_DIPNAME( 0x18, 0x18, DEF_STR( Difficulty ) )       /* see notes */
356   PORT_DIPNAME( 0x18, 0x18, DEF_STR( Difficulty ) )       PORT_DIPLOCATION("SW1:4,5")   /* see notes */
357357   PORT_DIPSETTING(    0x18, DEF_STR( Easy ) )
358358   PORT_DIPSETTING(    0x10, DEF_STR( Normal ) )
359359   PORT_DIPSETTING(    0x08, DEF_STR( Hard ) )
360360   PORT_DIPSETTING(    0x00, DEF_STR( Very_Hard ) )
361   PORT_DIPNAME( 0x20, 0x20, DEF_STR( Demo_Sounds ) )      /* see notes */
361   PORT_DIPNAME( 0x20, 0x20, DEF_STR( Demo_Sounds ) )      PORT_DIPLOCATION("SW2:6")     /* see notes */
362362   PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
363363   PORT_DIPSETTING(    0x20, DEF_STR( On ) )
364   PORT_DIPNAME( 0x40, 0x40, "Force Coinage = 1C/1C" )     /* see notes */
364   PORT_DIPNAME( 0x40, 0x40, "Force Coinage = 1C/1C" )     PORT_DIPLOCATION("SW2:7")     /* see notes */
365365   PORT_DIPSETTING(    0x40, DEF_STR( No ) )
366366   PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
367   PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
367   PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW1:8" )
368368INPUT_PORTS_END
369369
370370
src/mame/drivers/tumbleb.c
r3535r3536
314314#include "sound/2151intf.h"
315315#include "sound/3812intf.h"
316316#include "sound/okim6295.h"
317#include "includes/tumbleb.h"
317318
318319#define TUMBLEP_HACK   0
319320#define FNCYWLD_HACK   0
320321
321VIDEO_START( tumblepb );
322VIDEO_START( fncywld );
323VIDEO_START( jumppop );
324VIDEO_START( sdfight );
325VIDEO_UPDATE( tumblep );
326VIDEO_UPDATE( tumblepb );
327VIDEO_UPDATE( jumpkids );
328VIDEO_UPDATE( fncywld );
329VIDEO_UPDATE( jumppop );
330VIDEO_UPDATE( semicom );
331VIDEO_UPDATE( semicom_altoffsets );
332VIDEO_UPDATE( bcstory );
333VIDEO_UPDATE(semibase );
334VIDEO_START( suprtrio );
335VIDEO_UPDATE( suprtrio );
336VIDEO_START( pangpang );
337VIDEO_UPDATE( pangpang );
338VIDEO_UPDATE( sdfight );
339
340
341
342WRITE16_HANDLER( tumblepb_pf1_data_w );
343WRITE16_HANDLER( tumblepb_pf2_data_w );
344WRITE16_HANDLER( fncywld_pf1_data_w );
345WRITE16_HANDLER( fncywld_pf2_data_w );
346WRITE16_HANDLER( tumblepb_control_0_w );
347322static WRITE16_HANDLER( semicom_soundcmd_w );
348WRITE16_HANDLER( pangpang_pf1_data_w );
349WRITE16_HANDLER( pangpang_pf2_data_w );
350
351extern WRITE16_HANDLER( bcstory_tilebank_w );
352extern WRITE16_HANDLER( suprtrio_tilebank_w );
353extern WRITE16_HANDLER( chokchok_tilebank_w );
354extern WRITE16_HANDLER( wlstar_tilebank_w );
355
356extern UINT16 *tumblepb_pf1_data,*tumblepb_pf2_data;
357323static UINT16* tumblepb_mainram;
358324UINT16* jumppop_control;
359325UINT16* suprtrio_control;
r3535r3536
839805      soundlatch_w(machine,0,data & 0xff);
840806      // needed for Super Trio which reads the sound with polling
841807//      cpu_spinuntil_time(ATTOTIME_IN_USEC(100));
842      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(20));
808      cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(20));
843809
844810   }
845811}
src/mame/drivers/superqix.c
r3535r3536
347347   from_z80 = param;
348348   from_mcu_pending = 0;
349349   cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
350   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(200));
350   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(200));
351351}
352352
353353static TIMER_CALLBACK( delayed_mcu_z80_w )
src/mame/drivers/halleys.c
r3535r3536
158158// Compiler Directives
159159
160160#include "driver.h"
161#include "taitoipt.h"
161162#include "deprecat.h"
162163#include "cpu/m6809/m6809.h"
163164#include "sound/ay8910.h"
r3535r3536
14301431   else
14311432      fillbitmap(bitmap, bgcolor, cliprect);
14321433
1433   if (input_port_read(screen->machine, "FAKE")) copy_scroll_xp(bitmap, render_layer[3], *scrollx0, *scrolly0); // not used???
1434#ifdef MAME_DEBUG
1435   if (input_port_read(screen->machine, "DEBUG")) copy_scroll_xp(bitmap, render_layer[3], *scrollx0, *scrolly0); // not used???
1436#endif
1437
14341438   copy_scroll_xp(bitmap, render_layer[2], *scrollx1, *scrolly1);
14351439   copy_fixed_2b (bitmap, render_layer[1]);
14361440   copy_fixed_xp (bitmap, render_layer[0]);
r3535r3536
15921596static READ8_HANDLER( coin_lockout_r )
15931597{
15941598   // This is a hack, but it lets you coin up when COIN1 or COIN2 are signaled.
1595   // See NMI for the twisted logic that is involved in handling coin input.
1599   // See NMI for the twisted logic that is involved in handling coin input :
1600   //   0x8599 : 'benberob'
1601   //   0x83e2 : 'halleys', 'halleysc', 'halleycj'
1602   //   0x83df : 'halley87'
15961603   int inp = input_port_read(machine, "IN0");
1597   int result = 0x01; // dual coin slots
1604   int result = ((input_port_read(machine, "DSW4")) & 0x20) >> 5;
15981605
15991606   if (inp & 0x80) result |= 0x02;
16001607   if (inp & 0x40) result |= 0x04;
r3535r3536
16271634   AM_RANGE(0xff92, 0xff92) AM_READ_PORT("IN2")   // player 2
16281635   AM_RANGE(0xff93, 0xff93) AM_READ_PORT("IN3")   // unused?
16291636   AM_RANGE(0xff94, 0xff94) AM_READ(coin_lockout_r)
1630   AM_RANGE(0xff95, 0xff95) AM_READ_PORT("DSW1")      // dipswitch 4
1631   AM_RANGE(0xff96, 0xff96) AM_READ_PORT("DSW2")      // dipswitch 3
1632   AM_RANGE(0xff97, 0xff97) AM_READ_PORT("DSW3")      // dipswitch 2
1633   AM_RANGE(0xff00, 0xffbf) AM_READ(SMH_RAM)         // I/O read fall-through
1637   AM_RANGE(0xff95, 0xff95) AM_READ_PORT("DSW1")   // dipswitch 4
1638   AM_RANGE(0xff96, 0xff96) AM_READ_PORT("DSW2")   // dipswitch 3
1639   AM_RANGE(0xff97, 0xff97) AM_READ_PORT("DSW3")   // dipswitch 2
1640   AM_RANGE(0xff00, 0xffbf) AM_READ(SMH_RAM)      // I/O read fall-through
16341641
1635   AM_RANGE(0xffc0, 0xffdf) AM_READ(SMH_RAM)        // palette read
1642   AM_RANGE(0xffc0, 0xffdf) AM_READ(SMH_RAM)      // palette read
16361643   AM_RANGE(0xffe0, 0xffff) AM_READ(vector_r)
16371644ADDRESS_MAP_END
16381645
16391646
16401647static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
16411648   AM_RANGE(0x0000, 0x0fff) AM_WRITE(blitter_w) AM_BASE(&blitter_ram) AM_SIZE(&blitter_ramsize)
1642   AM_RANGE(0x1f00, 0x1fff) AM_WRITE(bgtile_w)       // background tiles?(Ben Bero Beh only)
1649   AM_RANGE(0x1f00, 0x1fff) AM_WRITE(bgtile_w)      // background tiles?(Ben Bero Beh only)
16431650   AM_RANGE(0x1000, 0xefff) AM_WRITE(SMH_ROM)
1644   AM_RANGE(0xf000, 0xfeff) AM_WRITE(SMH_RAM)        // work ram
1651   AM_RANGE(0xf000, 0xfeff) AM_WRITE(SMH_RAM)      // work ram
16451652
16461653   AM_RANGE(0xff8a, 0xff8a) AM_WRITE(soundcommand_w)
16471654   AM_RANGE(0xff9c, 0xff9c) AM_WRITE(firq_ack_w)
1648   AM_RANGE(0xff00, 0xffbf) AM_WRITE(SMH_RAM) AM_BASE(&io_ram) AM_SIZE(&io_ramsize) // I/O write fall-through
1655   AM_RANGE(0xff00, 0xffbf) AM_WRITE(SMH_RAM) AM_BASE(&io_ram) AM_SIZE(&io_ramsize)   // I/O write fall-through
16491656
16501657   AM_RANGE(0xffc0, 0xffdf) AM_WRITE(halleys_paletteram_IIRRGGBB_w) AM_BASE(&paletteram)
16511658   AM_RANGE(0xffe0, 0xffff) AM_WRITE(SMH_ROM)
r3535r3536
16591666   AM_RANGE(0x4803, 0x4803) AM_READ(ay8910_read_port_2_r)
16601667   AM_RANGE(0x4805, 0x4805) AM_READ(ay8910_read_port_3_r)
16611668   AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r)
1662   AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM) // space for diagnostic ROM
1669   AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM)      // space for diagnostic ROM
16631670ADDRESS_MAP_END
16641671
16651672
r3535r3536
16781685
16791686//**************************************************************************
16801687// Port Maps
1681/*
1682    Halley's Comet
1683    Taito/Coin-it 1986
16841688
1685    Coin mechs system can be optioned by setting dip sw 1 position 6 on
1686    for single coin selector. Position 6 off for twin coin selector.
1687
1688    Dip sw 2 is not used and all contacts should be set off.
1689*/
1690
1691static INPUT_PORTS_START( halleys )
1692   PORT_START("DSW1")   /* 0xff95 */
1693   PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
1694   PORT_DIPSETTING(    0x00, DEF_STR( Upright ) )
1695   PORT_DIPSETTING(    0x01, DEF_STR( Cocktail ) )
1696   PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) )
1697   PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
1698   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
1699   PORT_DIPNAME( 0x04, 0x04, "Test Mode" )
1700   PORT_DIPSETTING(    0x04, DEF_STR( No ) )
1701   PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
1702   PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) )
1703   PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
1704   PORT_DIPSETTING(    0x08, DEF_STR( On ) )
1705   PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) )
1706   PORT_DIPSETTING(    0x10, DEF_STR( 2C_1C ) )
1707   PORT_DIPSETTING(    0x30, DEF_STR( 1C_1C ) )
1708   PORT_DIPSETTING(    0x00, DEF_STR( 2C_3C ) )
1709   PORT_DIPSETTING(    0x20, DEF_STR( 1C_2C ) )
1710   PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) )
1711   PORT_DIPSETTING(    0x40, DEF_STR( 2C_1C ) )
1712   PORT_DIPSETTING(    0xc0, DEF_STR( 1C_1C ) )
1713   PORT_DIPSETTING(    0x00, DEF_STR( 2C_3C ) )
1714   PORT_DIPSETTING(    0x80, DEF_STR( 1C_2C ) )
1715
1716   PORT_START("DSW2")   /* 0xff96 */
1717   PORT_DIPNAME( 0x03, 0x01, DEF_STR( Difficulty ) )
1718   PORT_DIPSETTING(    0x02, DEF_STR( Easiest ) )
1719   PORT_DIPSETTING(    0x03, DEF_STR( Easy ) )
1720   PORT_DIPSETTING(    0x01, DEF_STR( Normal ) )
1721   PORT_DIPSETTING(    0x00, DEF_STR( Hard ) )
1722   PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Bonus_Life ) )
1723   PORT_DIPSETTING(    0x0c, "20k/60k/680k" )
1724   PORT_DIPSETTING(    0x08, "20k/80k/840k" )
1725   PORT_DIPSETTING(    0x04, "20k/100k/920k" )
1726   PORT_DIPSETTING(    0x00, "10k/50k/560k" )
1727   PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) )
1728   PORT_DIPSETTING(    0x20, "2" )
1729   PORT_DIPSETTING(    0x30, "3" )
1730   PORT_DIPSETTING(    0x10, "4" )
1731   PORT_DIPSETTING(    0x00, "4 (no bonus ships)" )
1732   PORT_DIPNAME( 0x40, 0x40, "Record Data" )
1733   PORT_DIPSETTING(    0x40, DEF_STR( No ) )
1734   PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
1735   PORT_DIPNAME( 0x80, 0x80, "Unknown(2-8)" )
1736   PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
1737   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
1738
1739   PORT_START("DSW3")   /* 0xff97 */
1740   PORT_DIPNAME( 0x01, 0x01, "Unknown(3-1)" )
1741   PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
1742   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
1743   PORT_DIPNAME( 0x02, 0x02, DEF_STR( Free_Play ) )
1744   PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
1745   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
1746   PORT_DIPNAME( 0x1c, 0x1c, "Start Round" )
1747   PORT_DIPSETTING( 0x1c, "1" )
1748   PORT_DIPSETTING( 0x18, "4" )
1749   PORT_DIPSETTING( 0x14, "7" )
1750   PORT_DIPSETTING( 0x10, "10" )
1751   PORT_DIPSETTING( 0x0c, "13" )
1752   PORT_DIPSETTING( 0x08, "16" )
1753   PORT_DIPSETTING( 0x04, "19" )
1754   PORT_DIPSETTING( 0x00, "22" )
1755   PORT_DIPNAME( 0x20, 0x20, "Unknown(3-6)" )
1756   PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
1757   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
1758   PORT_DIPNAME( 0x40, 0x40, "Invincibility (Cheat)")
1759   PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
1760   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
1761   PORT_DIPNAME( 0x80, 0x80, "Unknown(3-8)" )
1762   PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
1763   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
1764
1765   PORT_START("IN0")   /* 0xff90 */
1766   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
1767   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
1768   PORT_BIT( 0x04, IP_ACTIVE_LOW,  IPT_START1 )
1769   PORT_BIT( 0x08, IP_ACTIVE_LOW,  IPT_START2 )
1770   PORT_BIT( 0x10, IP_ACTIVE_LOW,  IPT_TILT )
1771   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(12)
1772   PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
1773   PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
1774
1775   PORT_START("IN1")   /* 0xff91 */
1776   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
1777   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
1778   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
1779   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
1780   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
1781   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
1782   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Hyperspace")
1783   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Fire")
1784
1785   PORT_START("IN2")   /* 0xff92 */
1786   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
1787   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
1788   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
1789   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
1790   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
1791   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
1792   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Hyperspace")
1793   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Fire")
1794
1795   PORT_START("IN3")   /* 0xff93 */
1796
1797   PORT_START("FAKE")   /* just to be safe */
1798   PORT_DIPNAME( 0x01, 0x00, "Show Unused Layer" )
1799   PORT_DIPSETTING(    0x00, DEF_STR( No ) )
1800   PORT_DIPSETTING(    0x01, DEF_STR( Yes ) )
1801INPUT_PORTS_END
1802
1803
18041689static INPUT_PORTS_START( benberob )
18051690   PORT_START("DSW1")   /* 0xff95 */
1806   PORT_DIPNAME( 0x03, 0x01, DEF_STR( Bonus_Life ) )
1807   PORT_DIPSETTING(    0x02, "Every 100K" )
1808   PORT_DIPSETTING(    0x00, "100K & Every 200K" )
1809   PORT_DIPSETTING(    0x01, "150K & Every 300K" )
1810   PORT_DIPSETTING(    0x03, "100K, 200K & 300K Only" )
1691   PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) )       /* code at 0xb00e */
1692   PORT_DIPSETTING(    0x02, "Every 100k" )
1693   PORT_DIPSETTING(    0x03, "100k 300k 200k+" )
1694   PORT_DIPSETTING(    0x00, "100k 200k" )
1695   PORT_DIPSETTING(    0x01, "150k 300k" )
18111696   PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) )
18121697   PORT_DIPSETTING(    0x04, DEF_STR( No ) )
18131698   PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
18141699   PORT_DIPNAME( 0x18, 0x08, DEF_STR( Lives ) )
1815   PORT_DIPSETTING(    0x00, "Infinite (Cheat)")
18161700   PORT_DIPSETTING(    0x08, "3" )
18171701   PORT_DIPSETTING(    0x10, "4" )
18181702   PORT_DIPSETTING(    0x18, "5" )
1819   PORT_DIPNAME( 0x20, 0x20, "Unknown(1-6)" )
1820   PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
1821   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
1822   PORT_DIPNAME( 0x40, 0x40, DEF_STR( Flip_Screen ) )
1703   PORT_DIPSETTING(    0x00, "Infinite (Cheat)" )
1704   PORT_DIPUNKNOWN( 0x20, IP_ACTIVE_LOW )
1705   PORT_DIPNAME( 0x40, 0x40, DEF_STR( Flip_Screen ) )      /* TO DO : confirm OFF/ON when screen flipping emulated */
18231706   PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
18241707   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
1825   PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) )
1826   PORT_DIPSETTING(    0x00, DEF_STR( Upright ) )
1827   PORT_DIPSETTING(    0x80, DEF_STR( Cocktail ) )
1708   PORT_DIPNAME( 0x80, 0x80, DEF_STR( Cabinet ) )
1709   PORT_DIPSETTING(    0x80, DEF_STR( Upright ) )
1710   PORT_DIPSETTING(    0x00, DEF_STR( Cocktail ) )
18281711
18291712   PORT_START("DSW2")   /* 0xff96 */
18301713   PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
r3535r3536
18631746   PORT_DIPSETTING(    0x70, DEF_STR( 1C_8C ) )
18641747
18651748   PORT_START("DSW3")   /* 0xff97 */
1866   PORT_DIPNAME( 0x01, 0x01, "Starting Round" )
1867   PORT_DIPSETTING(    0x01, "1st Round" )
1868   PORT_DIPSETTING(    0x00, "2nd Round" )
1749   PORT_DIPNAME( 0x01, 0x01, DEF_STR( Difficulty ) )
1750   PORT_DIPSETTING(    0x01, DEF_STR( Easy ) )
1751   PORT_DIPSETTING(    0x00, DEF_STR( Hard ) )
18691752   PORT_DIPNAME( 0x02, 0x00, "Use Both Buttons" )
18701753   PORT_DIPSETTING(    0x02, DEF_STR( No ) )
18711754   PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
1872   PORT_DIPNAME( 0x0c, 0x08, "Bonus Countdown Time" )
1873   PORT_DIPSETTING(    0x00, "1:15" )   /* Fastest countdown */
1874   PORT_DIPSETTING(    0x04, "1:30" )
1875   PORT_DIPSETTING(    0x08, "1:45" )
1876   PORT_DIPSETTING(    0x0c, "2:00" )   /* Slowest countdown */
1877   PORT_DIPNAME( 0x10, 0x00, "Show Coinage" )
1755   PORT_DIPNAME( 0x0c, 0x0c, "Timer Speed" )               /* table at 0xb10e */
1756   PORT_DIPSETTING(    0x0c, "Slowest" )
1757   PORT_DIPSETTING(    0x08, "Slow" )
1758   PORT_DIPSETTING(    0x04, "Fast" )
1759   PORT_DIPSETTING(    0x00, "Fastest" )
1760   PORT_DIPNAME( 0x10, 0x10, "Show Coinage" )
18781761   PORT_DIPSETTING(    0x00, DEF_STR( No ) )
18791762   PORT_DIPSETTING(    0x10, DEF_STR( Yes ) )
18801763   PORT_DIPNAME( 0x20, 0x20, "Show Year" )
18811764   PORT_DIPSETTING(    0x00, DEF_STR( No ) )
18821765   PORT_DIPSETTING(    0x20, DEF_STR( Yes ) )
1883   PORT_DIPNAME( 0x40, 0x40, "No Hit (Cheat)")
1766   PORT_DIPNAME( 0x40, 0x40, "No Hit (Cheat)" )
18841767   PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
18851768   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
18861769   PORT_DIPNAME( 0x80, 0x80, "Maximum Credits" )
18871770   PORT_DIPSETTING(    0x80, "9" )
18881771   PORT_DIPSETTING(    0x00, "16" )
18891772
1773   PORT_START("DSW4")   /* 0xff94 - read by coin_lockout_r */
1774   PORT_DIPUNUSED( 0x01, IP_ACTIVE_LOW )
1775   PORT_DIPUNUSED( 0x02, IP_ACTIVE_LOW )
1776   PORT_DIPUNUSED( 0x04, IP_ACTIVE_LOW )
1777   PORT_DIPUNUSED( 0x08, IP_ACTIVE_LOW )
1778   PORT_DIPUNUSED( 0x10, IP_ACTIVE_LOW )
1779   PORT_DIPNAME( 0x20, 0x20, "Coin Slots" )
1780   PORT_DIPSETTING(    0x00, "1" )
1781   PORT_DIPSETTING(    0x20, "2" )
1782   PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )
1783   PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
1784
18901785   PORT_START("IN0")   /* 0xff90 */
18911786   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
18921787   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
18931788   PORT_BIT( 0x04, IP_ACTIVE_LOW,  IPT_START1 )
18941789   PORT_BIT( 0x08, IP_ACTIVE_LOW,  IPT_START2 )
18951790   PORT_BIT( 0x10, IP_ACTIVE_LOW,  IPT_TILT )
1896   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(12)
1791   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(12)
18971792   PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
18981793   PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
18991794
19001795   PORT_START("IN1")   /* 0xff91 */
1901   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
1796   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
19021797   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
1903   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
1904   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
1798   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )  PORT_8WAY
1799   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )    PORT_8WAY
19051800   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
19061801   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
1907   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Jump")
1908   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Extinguisher")
1802   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
1803   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
19091804
19101805   PORT_START("IN2")   /* 0xff92 */
1911   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
1912   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
1913   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
1914   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
1806   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )  PORT_8WAY PORT_COCKTAIL
1807   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
1808   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )  PORT_8WAY PORT_COCKTAIL
1809   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )    PORT_8WAY PORT_COCKTAIL
19151810   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
19161811   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
1917   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Jump")
1918   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Extinguisher")
1812   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
1813   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
19191814
19201815   PORT_START("IN3")   /* 0xff93 */
19211816INPUT_PORTS_END
19221817
19231818
1819static INPUT_PORTS_START( halleys )
1820   PORT_START("DSW1")   /* 0xff95 */
1821   TAITO_MACHINE_COCKTAIL_LOC(SW4)
1822   TAITO_COINAGE_JAPAN_OLD_LOC(SW4)
1823
1824   PORT_START("DSW2")   /* 0xff96 */
1825   TAITO_DIFFICULTY_LOC(SW3)
1826   PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )       PORT_DIPLOCATION("SW3:3,4")   /* index of tables at 0x1a2f or 0x19b5 */
1827   PORT_DIPSETTING(    0x00, "100k 600k 500k+" )           /* last bonus life at 5600k : max. 12 bonus lives */
1828   PORT_DIPSETTING(    0x0c, "200k 800k 600k+" )           /* last bonus life at 6800k : max. 12 bonus lives */
1829   PORT_DIPSETTING(    0x08, "200k 1000k 800k+" )          /* last bonus life at 9000k : max. 12 bonus lives */
1830   PORT_DIPSETTING(    0x04, "200k 1200k 1000k+" )         /* last bonus life at 9200k : max. 10 bonus lives */
1831   PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) )            PORT_DIPLOCATION("SW3:5,6")
1832   PORT_DIPSETTING(    0x20, "2" )
1833   PORT_DIPSETTING(    0x30, "3" )
1834   PORT_DIPSETTING(    0x10, "4" )
1835   PORT_DIPSETTING(    0x00, "4 (No Points Bonus Lives)" ) /* code at 0xa509 or 0xa502 - 3 in the US manual */
1836   PORT_DIPNAME( 0x40, 0x40, "Operation Data Recorder" )   PORT_DIPLOCATION("SW3:7")     /* from the US manual - what is this ? */
1837   PORT_DIPSETTING(    0x40, "Not fixed" )
1838   PORT_DIPSETTING(    0x00, "When fixed" )
1839   PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW3:8" )
1840
1841   /* From US manual : "DIP SW 2 is not used and all contacts should be set off."
1842       However, they enable debug features if you press START1 during the boot sequence. */
1843   PORT_START("DSW3")   /* 0xff97 */
1844   PORT_DIPUNUSED_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW2:1" )
1845   PORT_DIPNAME( 0x02, 0x02, "Free Play (Cheat)" )         PORT_DIPLOCATION("SW2:2")
1846   PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
1847   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
1848   PORT_DIPNAME( 0x1c, 0x1c, "Start Area (Cheat)" )        PORT_DIPLOCATION("SW2:3,4,5")
1849   PORT_DIPSETTING( 0x1c, "1 (Earth)" )
1850   PORT_DIPSETTING( 0x18, "4 (Venus)" )
1851   PORT_DIPSETTING( 0x14, "7 (Mercury)" )
1852   PORT_DIPSETTING( 0x10, "10 (Sun)" )
1853   PORT_DIPSETTING( 0x0c, "13 (Pluto)" )                   /* spelled "Plato" */
1854   PORT_DIPSETTING( 0x08, "16 (Neptune)" )
1855   PORT_DIPSETTING( 0x04, "19 (Uranus)" )
1856   PORT_DIPSETTING( 0x00, "22 (Saturn)" )
1857   PORT_DIPUNUSED_DIPLOC( 0x20, IP_ACTIVE_LOW, "SW2:6" )
1858   PORT_DIPNAME( 0x40, 0x40, "Invincibility (Cheat)")      PORT_DIPLOCATION("SW2:7")
1859   PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
1860   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
1861   PORT_DIPNAME( 0x80, 0x80, "Infinite Lives (Cheat)" )    PORT_DIPLOCATION("SW2:8")
1862   PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
1863   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
1864
1865   /* From US manual : "Coin mechs system can be optioned by setting DIP SW 1.
1866       Position 6 on for single coin selector.  Position 6 off for twin coin selector." */
1867   PORT_START("DSW4")   /* 0xff94 - read by coin_lockout_r */
1868   PORT_DIPUNUSED_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:1" )
1869   PORT_DIPUNUSED_DIPLOC( 0x02, IP_ACTIVE_LOW, "SW1:2" )
1870   PORT_DIPUNUSED_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW1:3" )
1871   PORT_DIPUNUSED_DIPLOC( 0x08, IP_ACTIVE_LOW, "SW1:4" )
1872   PORT_DIPUNUSED_DIPLOC( 0x10, IP_ACTIVE_LOW, "SW1:5" )
1873   PORT_DIPNAME( 0x20, 0x20, "Coin Slots" )                PORT_DIPLOCATION("SW1:6")
1874   PORT_DIPSETTING(    0x00, "1" )
1875   PORT_DIPSETTING(    0x20, "2" )
1876   PORT_DIPUNUSED_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW1:7" )
1877   PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW1:8" )
1878
1879   PORT_START("IN0")   /* 0xff90 */
1880   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
1881   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
1882   PORT_BIT( 0x04, IP_ACTIVE_LOW,  IPT_START1 )
1883   PORT_BIT( 0x08, IP_ACTIVE_LOW,  IPT_START2 )
1884   PORT_BIT( 0x10, IP_ACTIVE_LOW,  IPT_TILT )
1885   PORT_BIT( 0x20, IP_ACTIVE_LOW,  IPT_SERVICE1 ) PORT_IMPULSE(12)
1886   PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
1887   PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
1888
1889   PORT_START("IN1")   /* 0xff91 */
1890   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )  PORT_8WAY
1891   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
1892   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )  PORT_8WAY
1893   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )    PORT_8WAY
1894   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
1895   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
1896   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
1897   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
1898
1899   PORT_START("IN2")   /* 0xff92 */
1900   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )  PORT_8WAY PORT_COCKTAIL
1901   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
1902   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )  PORT_8WAY PORT_COCKTAIL
1903   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )    PORT_8WAY PORT_COCKTAIL
1904   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
1905   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
1906   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
1907   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
1908
1909   PORT_START("IN3")   /* 0xff93 */
1910
1911#ifdef MAME_DEBUG
1912   PORT_START("DEBUG")   /* just to be safe */
1913   PORT_DIPNAME( 0x01, 0x00, "Show Unused Layer" )
1914   PORT_DIPSETTING(    0x00, DEF_STR( No ) )
1915   PORT_DIPSETTING(    0x01, DEF_STR( Yes ) )
1916#endif
1917INPUT_PORTS_END
1918
1919
19241920//**************************************************************************
19251921// Machine Definitions and Initializations
19261922
r3535r3536
22562252//**************************************************************************
22572253// Game Definitions
22582254
2259GAME( 1984, benberob, 0,       benberob, benberob, benberob,  ROT0,  "Taito", "Ben Bero Beh (Japan)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_COLORS )
2255GAME( 1984, benberob, 0,       benberob, benberob, benberob,  ROT0,  "Taito", "Ben Bero Beh (Japan)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_COLORS | GAME_NO_COCKTAIL )
22602256GAME( 1986, halleys,  0,       halleys,  halleys,  halleys,   ROT90, "Taito America Corporation (Coin-It license)", "Halley's Comet (US)", GAME_IMPERFECT_GRAPHICS | GAME_NO_COCKTAIL )
22612257GAME( 1986, halleysc, halleys, halleys,  halleys,  halleys,   ROT90, "Taito Corporation", "Halley's Comet (Japan, Newer)", GAME_IMPERFECT_GRAPHICS | GAME_NO_COCKTAIL )
22622258GAME( 1986, halleycj, halleys, halleys,  halleys,  halleys,   ROT90, "Taito Corporation", "Halley's Comet (Japan, Older)", GAME_IMPERFECT_GRAPHICS | GAME_NO_COCKTAIL )
src/mame/drivers/gomoku.c
r3535r3536
2222#include "driver.h"
2323#include "cpu/z80/z80.h"
2424#include "sound/custom.h"
25#include "includes/gomoku.h"
2526
2627
27extern PALETTE_INIT( gomoku );
28extern VIDEO_START( gomoku );
29extern VIDEO_UPDATE( gomoku );
30
31extern WRITE8_HANDLER( gomoku_videoram_w );
32extern WRITE8_HANDLER( gomoku_colorram_w );
33extern WRITE8_HANDLER( gomoku_bgram_w );
34extern WRITE8_HANDLER( gomoku_flipscreen_w );
35extern WRITE8_HANDLER( gomoku_bg_dispsw_w );
36
37extern UINT8 *gomoku_videoram;
38extern UINT8 *gomoku_colorram;
39extern UINT8 *gomoku_bgram;
40
41extern UINT8 *gomoku_soundregs1;
42extern UINT8 *gomoku_soundregs2;
43extern WRITE8_HANDLER( gomoku_sound1_w );
44extern WRITE8_HANDLER( gomoku_sound2_w );
45
46extern void *gomoku_sh_start(int clock, const custom_sound_interface *config);
47
4828/* input ports are rotated 90 degrees */
4929static READ8_HANDLER( input_port_r )
5030{
src/mame/drivers/peplus.c
r3535r3536
161161#include "sound/ay8910.h"
162162#include "cpu/mcs51/mcs51.h"
163163#include "machine/i2cmem.h"
164#include "video/mc6845.h"
164165
165166#include "peplus.lh"
166167#include "pe_schip.lh"
r3535r3536
169170#include "pe_keno.lh"
170171#include "pe_slots.lh"
171172
173#define MASTER_CLOCK       XTAL_20MHz
174#define CPU_CLOCK         ((MASTER_CLOCK)/2)      /* divided by 2 - 7474 */
175#define MC6845_CLOCK      ((MASTER_CLOCK)/8/3)
172176
173177static UINT16 autohold_addr; /* address to patch in program RAM to enable autohold feature */
174178
r3535r3536
208212#define CMOS_NVRAM_SIZE     0x2000
209213#define eeprom_NVRAM_SIZE   0x200 // 4k Bit
210214
215static const mc6845_interface mc6845_intf =
216{
217   "main",               /* screen we are acting on */
218   MC6845_CLOCK,         /* the clock (pin 21) of the chip */
219   8,                  /* number of pixels per video memory address */
220   NULL,               /* before pixel update callback */
221   NULL,               /* row update callback */
222   NULL,               /* after pixel update callback */
223   NULL,               /* callback for display state changes */
224   NULL,               /* HSYNC callback */
225   NULL               /* VSYNC callback */
226};
211227
212228/*****************
213229* NVRAM Handlers *
r3535r3536
273289    The current CRTC6845 driver does not support these
274290    additional registers (R18, R19, R31)
275291*/
276static WRITE8_HANDLER( peplus_crtc_mode_w )
292static WRITE8_DEVICE_HANDLER( peplus_crtc_mode_w )
277293{
278294   /* Mode Control - Register 8 */
279295   /* Sets CRT to Transparent Memory Addressing Mode */
280296}
281297
282static WRITE8_HANDLER( peplus_crtc_register_w )
298static WRITE8_DEVICE_HANDLER( peplus_crtc_register_w )
283299{
284300    vid_register = data;
301    mc6845_address_w(device, offset, data);
285302}
286303
287static WRITE8_HANDLER( peplus_crtc_address_w )
304static WRITE8_DEVICE_HANDLER( peplus_crtc_address_w )
288305{
289306   switch(vid_register) {
290307      case 0x12:  /* Update Address High */
r3535r3536
294311         vid_low = data;
295312         break;
296313   }
314    mc6845_register_w(device, offset, data);
297315}
298316
299static WRITE8_HANDLER( peplus_crtc_display_w )
317static WRITE8_DEVICE_HANDLER( peplus_crtc_display_w )
300318{
301319   UINT16 vid_address = (vid_high<<8) | vid_low;
302320
r3535r3536
411429* Read Handlers *
412430****************/
413431
414static READ8_HANDLER( peplus_crtc_display_r )
432static READ8_DEVICE_HANDLER( peplus_crtc_display_r )
415433{
416434   UINT16 vid_address = ((vid_high<<8) | vid_low) + 1;
417435    vid_high = (vid_address>>8) & 0x3f;
r3535r3536
420438    return 0x00;
421439}
422440
423static READ8_HANDLER( peplus_crtc_lpen1_r )
441static READ8_DEVICE_HANDLER( peplus_crtc_lpen1_r )
424442{
425    return 0x40;
443   return mc6845_status_r(device, offset);
444   //return 0x40;
426445}
427446
428static READ8_HANDLER( peplus_crtc_lpen2_r )
447static READ8_DEVICE_HANDLER( peplus_crtc_lpen2_r )
429448{
430449    UINT8 ret_val = 0x00;
431    UINT8 x_val = input_port_read_safe(machine, "TOUCH_X",0x00);
432    UINT8 y_val = (0x19 - input_port_read_safe(machine, "TOUCH_Y",0x00));
450    UINT8 x_val = input_port_read_safe(device->machine, "TOUCH_X",0x00);
451    UINT8 y_val = (0x19 - input_port_read_safe(device->machine, "TOUCH_Y",0x00));
433452    UINT16 t_val = y_val * 0x28 + (x_val+1);
434453
435454   switch(vid_register) {
r3535r3536
439458      case 0x11:  /* Light Pen Address Low */
440459         ret_val = t_val & 0xff;
441460         break;
461      default:
462         ret_val = mc6845_register_r(device, offset);
442463   }
443464
444465    return ret_val;
r3535r3536
709730   AM_RANGE(0x0000, 0x1fff) AM_READWRITE(peplus_cmos_r, peplus_cmos_w) AM_BASE(&cmos_ram)
710731
711732   // CRT Controller
712   AM_RANGE(0x2008, 0x2008) AM_WRITE(peplus_crtc_mode_w)
713   AM_RANGE(0x2080, 0x2080) AM_READ(peplus_crtc_lpen1_r) AM_WRITE(peplus_crtc_register_w)
714   AM_RANGE(0x2081, 0x2081) AM_READ(peplus_crtc_lpen2_r) AM_WRITE(peplus_crtc_address_w)
715   AM_RANGE(0x2083, 0x2083) AM_READ(peplus_crtc_display_r) AM_WRITE(peplus_crtc_display_w)
733   AM_RANGE(0x2008, 0x2008) AM_DEVWRITE(MC6845, "crtc", peplus_crtc_mode_w)
734   AM_RANGE(0x2080, 0x2080) AM_DEVREADWRITE(MC6845, "crtc", peplus_crtc_lpen1_r, peplus_crtc_register_w)
735   AM_RANGE(0x2081, 0x2081) AM_DEVREADWRITE(MC6845, "crtc", peplus_crtc_lpen2_r, peplus_crtc_address_w)
736   AM_RANGE(0x2083, 0x2083) AM_DEVREADWRITE(MC6845, "crtc", peplus_crtc_display_r, peplus_crtc_display_w)
716737
717738    // Superboard Data
718739   AM_RANGE(0x3000, 0x3fff) AM_READWRITE(peplus_s3000_r, peplus_s3000_w) AM_BASE(&s3000_ram)
r3535r3536
9961017
9971018static MACHINE_DRIVER_START( peplus )
9981019   // basic machine hardware
999   MDRV_CPU_ADD("main", I8052, 3686400*2)
1020   MDRV_CPU_ADD("main", I80C32, CPU_CLOCK)
10001021   MDRV_CPU_PROGRAM_MAP(peplus_map, 0)
10011022   //MDRV_CPU_DATA_MAP(peplus_datamap, 0)
10021023   MDRV_CPU_IO_MAP(peplus_iomap, 0)
r3535r3536
10081029   // video hardware
10091030
10101031   MDRV_SCREEN_ADD("main", RASTER)
1011   MDRV_SCREEN_REFRESH_RATE(60)
1032   MDRV_SCREEN_REFRESH_RATE(30)
10121033   MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
10131034   MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
10141035   MDRV_SCREEN_SIZE((52+1)*8, (31+1)*8)
r3535r3536
10171038   MDRV_GFXDECODE(peplus)
10181039   MDRV_PALETTE_LENGTH(16*16)
10191040
1041   MDRV_DEVICE_ADD("crtc", MC6845)
1042   MDRV_DEVICE_CONFIG(mc6845_intf)
1043
10201044   MDRV_PALETTE_INIT(peplus)
10211045   MDRV_VIDEO_START(peplus)
10221046   MDRV_VIDEO_UPDATE(peplus)
src/mame/drivers/segas24.c
r3535r3536
333333
334334#include "driver.h"
335335#include "deprecat.h"
336#include "cpu/m68000/m68k.h"
336#include "cpu/m68000/m68000.h"
337337#include "segas24.h"
338338#include "system16.h"
339339#include "video/segaic24.h"
src/mame/drivers/segas16a.c
r3535r3536
437437    */
438438   cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
439439   cpunum_set_input_line(machine, 2, 0, (data & 0x02) ? CLEAR_LINE : ASSERT_LINE);
440   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
440   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(100));
441441}
442442
443443
src/mame/drivers/neogeo.c
r3535r3536
559559      audio_cpu_assert_nmi(machine);
560560
561561      /* boost the interleave to let the audio CPU read the command */
562      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(50));
562      cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(50));
563563
564564      if (LOG_CPU_COMM) logerror("MAIN CPU PC %06x: audio_command_w %04x - %04x\n", activecpu_get_pc(), data, mem_mask);
565565   }
src/mame/drivers/stvinit.c
r3535r3536
792792
793793static READ32_HANDLER( astrass_hack_r )
794794{
795   if(activecpu_get_pc()==0x60011b8) return 0x00000000;
795   /*PC reads at 0x60011ba if -debug is active?*/
796   if(activecpu_get_pc()==0x60011b8 || activecpu_get_pc() == 0x60011ba) return 0x00000000;
796797
797798   return stv_workram_h[0x000770/4];
798799}
r3535r3536
812813   cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, FIRST_SPEEDUP_SLOT+1);
813814   cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x605b9da);
814815
815   memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x6000770, 0x6000773, 0, 0, astrass_hack_r );
816   memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x06000770, 0x06000773, 0, 0, astrass_hack_r );
816817
817818   memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0608e4d8, 0x0608e4db, 0, 0, astrass_speedup_r );
818819
src/mame/drivers/gyruss.c
r3535r3536
237237   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )  PORT_2WAY PORT_COCKTAIL
238238   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
239239   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )   /* 2p shoot 2 - unused */
240   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
240241   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
241242
242243   PORT_START("DSW1")   /* 8P Dip Switch */
243   PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) )
244   PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )           PORT_DIPLOCATION("SW1:1,2,3,4")
245   PORT_DIPSETTING(    0x02, DEF_STR( 4C_1C ) )
246   PORT_DIPSETTING(    0x05, DEF_STR( 3C_1C ) )
247   PORT_DIPSETTING(    0x08, DEF_STR( 2C_1C ) )
248   PORT_DIPSETTING(    0x04, DEF_STR( 3C_2C ) )
249   PORT_DIPSETTING(    0x01, DEF_STR( 4C_3C ) )
250   PORT_DIPSETTING(    0x0f, DEF_STR( 1C_1C ) )
251   PORT_DIPSETTING(    0x03, DEF_STR( 3C_4C ) )
252   PORT_DIPSETTING(    0x07, DEF_STR( 2C_3C ) )
253   PORT_DIPSETTING(    0x0e, DEF_STR( 1C_2C ) )
254   PORT_DIPSETTING(    0x06, DEF_STR( 2C_5C ) )
255   PORT_DIPSETTING(    0x0d, DEF_STR( 1C_3C ) )
256   PORT_DIPSETTING(    0x0c, DEF_STR( 1C_4C ) )
257   PORT_DIPSETTING(    0x0b, DEF_STR( 1C_5C ) )
258   PORT_DIPSETTING(    0x0a, DEF_STR( 1C_6C ) )
259   PORT_DIPSETTING(    0x09, DEF_STR( 1C_7C ) )
260   PORT_DIPSETTING(    0x00, DEF_STR( Free_Play ) )
261   PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) )           PORT_DIPLOCATION("SW1:5,6,7,8")
244262   PORT_DIPSETTING(    0x20, DEF_STR( 4C_1C ) )
245263   PORT_DIPSETTING(    0x50, DEF_STR( 3C_1C ) )
246264   PORT_DIPSETTING(    0x80, DEF_STR( 2C_1C ) )
r3535r3536
257275   PORT_DIPSETTING(    0xa0, DEF_STR( 1C_6C ) )
258276   PORT_DIPSETTING(    0x90, DEF_STR( 1C_7C ) )
259277   PORT_DIPSETTING(    0x00, DEF_STR( Free_Play ) )
260   PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
261   PORT_DIPSETTING(    0x02, DEF_STR( 4C_1C ) )
262   PORT_DIPSETTING(    0x05, DEF_STR( 3C_1C ) )
263   PORT_DIPSETTING(    0x08, DEF_STR( 2C_1C ) )
264   PORT_DIPSETTING(    0x04, DEF_STR( 3C_2C ) )
265   PORT_DIPSETTING(    0x01, DEF_STR( 4C_3C ) )
266   PORT_DIPSETTING(    0x0f, DEF_STR( 1C_1C ) )
267   PORT_DIPSETTING(    0x03, DEF_STR( 3C_4C ) )
268   PORT_DIPSETTING(    0x07, DEF_STR( 2C_3C ) )
269   PORT_DIPSETTING(    0x0e, DEF_STR( 1C_2C ) )
270   PORT_DIPSETTING(    0x06, DEF_STR( 2C_5C ) )
271   PORT_DIPSETTING(    0x0d, DEF_STR( 1C_3C ) )
272   PORT_DIPSETTING(    0x0c, DEF_STR( 1C_4C ) )
273   PORT_DIPSETTING(    0x0b, DEF_STR( 1C_5C ) )
274   PORT_DIPSETTING(    0x0a, DEF_STR( 1C_6C ) )
275   PORT_DIPSETTING(    0x09, DEF_STR( 1C_7C ) )
276   PORT_DIPSETTING(    0x00, DEF_STR( Free_Play ) )
277278
278279   PORT_START("DSW2")   /* 8P Dip Switch */
279   PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
280   PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )            PORT_DIPLOCATION("SW2:1,2")
280281   PORT_DIPSETTING(    0x03, "3" )
281282   PORT_DIPSETTING(    0x02, "4" )
282283   PORT_DIPSETTING(    0x01, "5" )
283284   PORT_DIPSETTING(    0x00, "255 (Cheat)")
284   PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) )
285   PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) )          PORT_DIPLOCATION("SW2:3")
285286   PORT_DIPSETTING(    0x00, DEF_STR( Upright ) )
286287   PORT_DIPSETTING(    0x04, DEF_STR( Cocktail ) )
287   PORT_DIPNAME( 0x08, 0x08, DEF_STR( Bonus_Life ) )       /* tables at 0x1653 (15 bytes) or 0x4bf3 (13 bytes) */
288   PORT_DIPNAME( 0x08, 0x08, DEF_STR( Bonus_Life ) )       PORT_DIPLOCATION("SW2:4")     /* tables at 0x1653 (15 bytes) or 0x4bf3 (13 bytes) */
288289   PORT_DIPSETTING(    0x08, "30k 90k 60k+" )              /* last bonus life at 810k : max. 14 bonus lives */
289290   PORT_DIPSETTING(    0x00, "40k 110k 70k+" )             /* last bonus life at 810k : max. 12 bonus lives */
290   PORT_DIPNAME( 0x70, 0x30, DEF_STR( Difficulty ) )
291   PORT_DIPNAME( 0x70, 0x30, DEF_STR( Difficulty ) )       PORT_DIPLOCATION("SW2:5,6,7")
291292   PORT_DIPSETTING(    0x70, "1 (Easiest)" )
292293   PORT_DIPSETTING(    0x60, "2" )
293294   PORT_DIPSETTING(    0x50, "3" )
r3535r3536
296297   PORT_DIPSETTING(    0x20, "6" )
297298   PORT_DIPSETTING(    0x10, "7" )
298299   PORT_DIPSETTING(    0x00, "8 (Hardest)" )
299   PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) )
300   PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) )      PORT_DIPLOCATION("SW2:8")
300301   PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
301302   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
302303
303304   PORT_START("DSW3")   /* 1P Dip Switch */
304   PORT_DIPNAME( 0x01, 0x00, "Demo Music" )
305   PORT_DIPNAME( 0x01, 0x00, "Demo Music" )                PORT_DIPLOCATION("SW3:1")
305306   PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
306307   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
307308INPUT_PORTS_END
r3535r3536
310311   PORT_INCLUDE( gyruss )
311312
312313   PORT_MODIFY("DSW2")
313   PORT_DIPNAME( 0x08, 0x00, DEF_STR( Bonus_Life ) )       /* tables at 0x1653 (15 bytes) or 0x4bf3 (13 bytes) */
314   PORT_DIPNAME( 0x08, 0x00, DEF_STR( Bonus_Life ) )       PORT_DIPLOCATION("SW2:3")     /* tables at 0x1653 (15 bytes) or 0x4bf3 (13 bytes) */
314315   PORT_DIPSETTING(    0x08, "50k 120k 70k+" )             /* last bonus life at 960k : max. 14 bonus lives */
315316   PORT_DIPSETTING(    0x00, "60k 140k 80k+" )             /* last bonus life at 940k : max. 12 bonus lives */
316   PORT_DIPNAME( 0x70, 0x20, DEF_STR( Difficulty ) )       /* "Difficult" default setting according to Centuri manual */
317   PORT_DIPNAME( 0x70, 0x20, DEF_STR( Difficulty ) )       PORT_DIPLOCATION("SW2:5,6,7") /* "Difficult" default setting according to Centuri manual */
317318   PORT_DIPSETTING(    0x70, "1 (Easiest)" )
318319   PORT_DIPSETTING(    0x60, "2" )
319320   PORT_DIPSETTING(    0x50, "3" )
src/mame/drivers/fuukifg2.c
r3535r3536
8484      soundlatch_w(machine,0,data & 0xff);
8585      cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
8686//      cpu_spinuntil_time(ATTOTIME_IN_USEC(50));   // Allow the other CPU to reply
87      cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(50)); // Fixes glitching in rasters
87      cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_USEC(50)); // Fixes glitching in rasters
8888   }
8989}
9090
src/mame/drivers/taotaido.c
r3535r3536
6565
6666#include "driver.h"
6767#include "sound/2610intf.h"
68#include "includes/taotaido.h"
6869
6970#define TAOTAIDO_SHOW_ALL_INPUTS   0
7071
71UINT16 *taotaido_spriteram;
72UINT16 *taotaido_spriteram2;
73UINT16 *taotaido_scrollram;
74UINT16 *taotaido_bgram;
75
76WRITE16_HANDLER( taotaido_sprite_character_bank_select_w );
77WRITE16_HANDLER( taotaido_tileregs_w );
78WRITE16_HANDLER( taotaido_bgvideoram_w );
79VIDEO_START( taotaido );
80VIDEO_UPDATE( taotaido );
81VIDEO_EOF( taotaido );
82
8372static int pending_command;
8473
8574static READ16_HANDLER( pending_command_r )
src/mame/drivers/fortecar.c
r3535r3536
22
33/*
44
5TODO:
6-eeprom
7-bankswitch
8-inputs
9-missing color proms?
10
11-----------------------------------------------------
12
513Forte Card (POKER GAME)
614
715CPU  SGS Z8400AB1 (Z80ACPU)
r3535r3536
1523
1624*/
1725
26#include "driver.h"
27#include "machine/eeprom.h"
28#include "sound/ay8910.h"
29#include "machine/8255ppi.h"
1830
31static UINT8 *fortecar_ram;
32static int bank;
1933
34static WRITE8_HANDLER( fortecar_videoregs_w )
35{
36   static UINT8 address;
2037
21#include "driver.h"
38   if(offset == 0)
39      address = data;
40   else
41   {
42      switch(address)
43      {
44         default:
45            logerror("Video Register %02x called with %02x data\n",address,data);
46      }
47   }
48}
2249
23static UINT8 *fortecar_ram;
50static WRITE8_DEVICE_HANDLER( ppi0_portc_w )
51{
52   eeprom_write_bit(data & 0x04);
53   eeprom_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
54   eeprom_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE);
55}
2456
57static READ8_DEVICE_HANDLER( ppi0_portc_r )
58{
59//  popmessage("%04x",activecpu_get_pc());
60   return (~(eeprom_read_bit()<<1) & 2);
61}
2562
26static ADDRESS_MAP_START( fortecar_map, ADDRESS_SPACE_PROGRAM, 8 )
27   AM_RANGE(0x0000, 0xc7ff) AM_READ(SMH_ROM)
28   AM_RANGE(0xd000, 0xd1ff) AM_RAM
63static READ8_DEVICE_HANDLER( ppi0_porta_r )
64{
65   return input_port_read(device->machine, "DSW1");
66}
2967
30   AM_RANGE(0xd800, 0xffff) AM_RAM AM_BASE(&fortecar_ram)
31ADDRESS_MAP_END
68static READ8_DEVICE_HANDLER( ppi0_portb_r )
69{
70   return input_port_read(device->machine, "IN2");
71}
3272
33#ifdef UNUSED_FUNCTION
34READ8_HANDLER( fortecar_read62 )
73static const ppi8255_interface ppi0intf =
3574{
36   return mame_rand(machine);
75   ppi0_porta_r,   ppi0_portb_r,   ppi0_portc_r,
76   NULL,         NULL,         ppi0_portc_w
77};
78
79static WRITE8_HANDLER( rom_bank_w )
80{
81   int new_bank = (data&0xff)>>0;
82
83   if(bank!=new_bank) {
84      UINT8 *ROM = memory_region(machine, "main");
85      UINT32 bankaddress;
86
87      bank = new_bank;
88      bankaddress = 0x10000 + 0x40 * bank;
89      memory_set_bankptr(1, &ROM[bankaddress]);
90   }
3791}
38#endif
3992
93static WRITE8_HANDLER( ayporta_w )
94{
95}
96
97static WRITE8_HANDLER( ayportb_w )
98{
99}
100
101static const ay8910_interface ay8910_config =
102{
103   AY8910_LEGACY_OUTPUT,
104   AY8910_DEFAULT_LOADS,
105   NULL,
106   NULL,
107   ayporta_w,
108   ayportb_w
109};
110
111static ADDRESS_MAP_START( fortecar_map, ADDRESS_SPACE_PROGRAM, 8 )
112   AM_RANGE(0x0000, 0xbfff) AM_ROM
113   AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(SMH_BANK1, SMH_ROM) //bank
114   AM_RANGE(0xd000, 0xd7ff) AM_RAM
115   AM_RANGE(0xd800, 0xffff) AM_RAM AM_BASE(&fortecar_ram)
116ADDRESS_MAP_END
117
40118static ADDRESS_MAP_START( fortecar_ports, ADDRESS_SPACE_IO, 8 )
41119   ADDRESS_MAP_GLOBAL_MASK(0xff)
42   AM_RANGE(0x40, 0x40) AM_WRITE(SMH_NOP)
43   AM_RANGE(0x41, 0x41) AM_WRITE(SMH_NOP)
44//  AM_RANGE(0x62, 0x62) AM_READ(fortecar_read62) // nvram eeprom?
120   AM_RANGE(0x20, 0x21) AM_WRITE(fortecar_videoregs_w) // MC6845?
121   AM_RANGE(0x40, 0x40) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w)
122   AM_RANGE(0x41, 0x41) AM_WRITE(ay8910_write_port_0_w)
123   AM_RANGE(0x60, 0x62) AM_DEVREADWRITE(PPI8255, "fcppi0", ppi8255_r, ppi8255_w)//M5L8255AP
124   AM_RANGE(0x81, 0x81) AM_WRITE(rom_bank_w) //completely wrong,might not be there...
125    AM_RANGE(0xa0, 0xa0) AM_READ_PORT("IN0") //written too,multiplexer?
126    AM_RANGE(0xa1, 0xa1) AM_READ_PORT("IN1")
45127ADDRESS_MAP_END
46128
47129
48130static INPUT_PORTS_START( fortecar )
49131   PORT_START("IN0")   /* 8bit */
50   PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
132   PORT_DIPNAME( 0x01, 0x01, "IN0" )
51133   PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
52134   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
53135   PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
r3535r3536
73155   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
74156
75157   PORT_START("IN1")   /* 8bit */
76   PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
158   PORT_DIPNAME( 0x01, 0x01, "IN1" )
77159   PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
78160   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
79161   PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
r3535r3536
97179   PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
98180   PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
99181   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
182
183   PORT_START("IN2")   /* 8bit */
184   PORT_DIPNAME( 0x01, 0x01, "IN2" )
185   PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
186   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
187   PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
188   PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
189   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
190   PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
191   PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
192   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
193   PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
194   PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
195   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
196   PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
197   PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
198   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
199   PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
200   PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
201   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
202   PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
203   PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
204   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
205   PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
206   PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
207   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
208
209   PORT_START("DSW1")   /* 8bit */
210   PORT_DIPNAME( 0x01, 0x01, "DSW1" )
211   PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
212   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
213   PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
214   PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
215   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
216   PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
217   PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
218   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
219   PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
220   PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
221   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
222   PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
223   PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
224   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
225   PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
226   PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
227   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
228   PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
229   PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
230   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
231   PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
232   PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
233   PORT_DIPSETTING(    0x00, DEF_STR( On ) )
100234INPUT_PORTS_END
101235
102236static const gfx_layout tiles8x8_layout =
r3535r3536
122256{
123257   int x,y,count;
124258   count = 0;
125   fillbitmap(bitmap,0,cliprect);
126   for (y=0;y<32;y++)
259
260   for (y=0;y<0x1e;y++)
127261   {
128      for(x=0;x<64;x++)
262      for(x=0;x<0x4b;x++)
129263      {
130         int tile;
264         int tile,color;
131265
132         tile = fortecar_ram[0x800+(count*4)+1];
266         tile = fortecar_ram[(count*4)+1] | (fortecar_ram[(count*4)+2]<<8);
267         color = fortecar_ram[(count*4)+3];
133268
134         drawgfx(bitmap,screen->machine->gfx[0],tile,0,0,0,x*8,y*8,cliprect,TRANSPARENCY_PEN,0);
269         drawgfx(bitmap,screen->machine->gfx[0],tile,color,0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0);
135270         count++;
136271
137272      }
r3535r3536
139274   return 0;
140275}
141276
277static MACHINE_RESET(fortecar)
278{
279   bank = -1;
280}
142281
143282static MACHINE_DRIVER_START( fortecar )
144283   /* basic machine hardware */
145   MDRV_CPU_ADD("main", Z80,8000000)       /* ? MHz */
284   MDRV_CPU_ADD("main", Z80,6000000)       /* ? MHz */
146285   MDRV_CPU_PROGRAM_MAP(fortecar_map,0)
147286   MDRV_CPU_IO_MAP(fortecar_ports,0)
148
149287   MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
150288
151289   /* video hardware */
r3535r3536
153291   MDRV_SCREEN_REFRESH_RATE(60)
154292   MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
155293   MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
156   MDRV_SCREEN_SIZE(512, 256)
157   MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
294   MDRV_SCREEN_SIZE(640, 256)
295   MDRV_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1)
158296
297   MDRV_MACHINE_RESET(fortecar)
298   MDRV_NVRAM_HANDLER(93C46) //GOLDSTAR GM76C256ALL-70
299
300   MDRV_PPI8255_ADD("fcppi0", ppi0intf)
301
159302   MDRV_GFXDECODE(fortecar)
160303   MDRV_PALETTE_LENGTH(0x100)
161304
162305   MDRV_VIDEO_START(fortecar)
163306   MDRV_VIDEO_UPDATE(fortecar)
307
308   MDRV_SPEAKER_STANDARD_MONO("mono")
309
310   MDRV_SOUND_ADD("ay", AY8910, 1500000)
311   MDRV_SOUND_CONFIG(ay8910_config)
312   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
164313MACHINE_DRIVER_END
165314
166315ROM_START( fortecar )
167   ROM_REGION( 0x10000, "main", 0 )
168   ROM_LOAD( "fortecar.u7", 0x00000, 0x10000, CRC(2a4b3429) SHA1(8fa630dac949e758678a1a36b05b3412abe8ae16)  )
316   ROM_REGION( 0x14000, "main", 0 )
317   ROM_LOAD( "fortecar.u7", 0x00000, 0x0c000, CRC(2a4b3429) SHA1(8fa630dac949e758678a1a36b05b3412abe8ae16)  )
318   ROM_CONTINUE(          0x10000, 0x04000 )
169319
170320   ROM_REGION( 0x30000, "gfx1", 0 )
171321   ROM_LOAD( "fortecar.u38", 0x00000, 0x10000, CRC(c2090690) SHA1(f0aa8935b90a2ab6043555ece69f926372246648) )
r3535r3536
173323   ROM_LOAD( "fortecar.u40", 0x20000, 0x10000, CRC(9693bb83) SHA1(e3e3bc750c89a1edd1072ce3890b2ce498dec633) )
174324ROM_END
175325
326static DRIVER_INIT( fortecar )
327{
328}
176329
177GAME( 19??, fortecar, 0, fortecar, fortecar, 0, ROT0, "unknown", "Forte Card",GAME_NO_SOUND|GAME_NOT_WORKING )
330GAME( 19??, fortecar, 0, fortecar, fortecar, fortecar, ROT0, "Fortex LTD", "Forte Card",GAME_NOT_WORKING | GAME_WRONG_COLORS)
src/mame/drivers/twin16.c
r3535r3536
5858#include "sound/2151intf.h"
5959#include "sound/k007232.h"
6060#include "sound/upd7759.h"
61#include "includes/twin16.h"
6162
62extern WRITE16_HANDLER( twin16_videoram2_w );
63extern WRITE16_HANDLER( twin16_paletteram_word_w );
64extern WRITE16_HANDLER( fround_gfx_bank_w );
65extern WRITE16_HANDLER( twin16_video_register_w );
66
67extern VIDEO_START( twin16 );
68extern VIDEO_START( fround );
69extern VIDEO_UPDATE( twin16 );
70extern VIDEO_EOF( twin16 );
71
72
73extern void twin16_spriteram_process( void );
74
7563UINT16 twin16_custom_video;
7664UINT16 *twin16_gfx_rom;
7765UINT16 *twin16_sprite_gfx_ram;
src/mame/drivers/dooyong.c
r3535r3536
5454#include "sound/2203intf.h"
5555#include "sound/2151intf.h"
5656#include "sound/okim6295.h"
57#include "includes/dooyong.h"
5758
5859
59extern UINT8 *dooyong_txvideoram;
60
61WRITE8_HANDLER( dooyong_bgscroll8_w );
62WRITE8_HANDLER( dooyong_bg2scroll8_w );
63WRITE8_HANDLER( dooyong_fgscroll8_w );
64WRITE8_HANDLER( dooyong_fg2scroll8_w );
65
66WRITE16_HANDLER( dooyong_bgscroll16_w );
67WRITE16_HANDLER( dooyong_bg2scroll16_w );
68WRITE16_HANDLER( dooyong_fgscroll16_w );
69WRITE16_HANDLER( dooyong_fg2scroll16_w );
70
71WRITE8_HANDLER( dooyong_txvideoram8_w );
72
73WRITE8_HANDLER( lastday_ctrl_w );
74WRITE8_HANDLER( pollux_ctrl_w );
75WRITE8_HANDLER( primella_ctrl_w );
76WRITE8_HANDLER( flytiger_ctrl_w );
77WRITE16_HANDLER( rshark_ctrl_w );
78
79VIDEO_UPDATE( lastday );
80VIDEO_UPDATE( gulfstrm );
81VIDEO_UPDATE( pollux );
82VIDEO_UPDATE( bluehawk );
83VIDEO_UPDATE( flytiger );
84VIDEO_UPDATE( primella );
85VIDEO_UPDATE( rshark );
86VIDEO_UPDATE( popbingo );
87
88VIDEO_START( lastday );
89VIDEO_START( gulfstrm );
90VIDEO_START( pollux );
91VIDEO_START( bluehawk );
92VIDEO_START( flytiger );
93VIDEO_START( primella );
94VIDEO_START( rshark );
95VIDEO_START( popbingo );
96
97VIDEO_EOF( dooyong );
98VIDEO_EOF( rshark );
99
100
10160static WRITE8_HANDLER( lastday_bankswitch_w )
10261{
10362   memory_set_bank(1, data & 0x07);
src/mame/drivers/dec8.c
r3535r3536
4343#include "sound/2203intf.h"
4444#include "sound/3812intf.h"
4545#include "sound/msm5205.h"
46#include "includes/dec8.h"
4647
47PALETTE_INIT( ghostb );
48VIDEO_UPDATE( cobracom );
49VIDEO_UPDATE( ghostb );
50VIDEO_UPDATE( srdarwin );
51VIDEO_UPDATE( gondo );
52VIDEO_UPDATE( garyoret );
53VIDEO_UPDATE( lastmiss );
54VIDEO_UPDATE( shackled );
55VIDEO_UPDATE( oscar );
56VIDEO_START( cobracom );
57VIDEO_START( oscar );
58VIDEO_START( ghostb );
59VIDEO_START( lastmiss );
60VIDEO_START( shackled );
61VIDEO_START( srdarwin );
62VIDEO_START( gondo );
63VIDEO_START( garyoret );
64
65WRITE8_HANDLER( dec8_bac06_0_w );
66WRITE8_HANDLER( dec8_bac06_1_w );
67WRITE8_HANDLER( dec8_pf0_data_w );
68WRITE8_HANDLER( dec8_pf1_data_w );
69READ8_HANDLER( dec8_pf0_data_r );
70READ8_HANDLER( dec8_pf1_data_r );
71WRITE8_HANDLER( srdarwin_videoram_w );
72WRITE8_HANDLER( dec8_scroll1_w );
73WRITE8_HANDLER( dec8_scroll2_w );
74WRITE8_HANDLER( srdarwin_control_w );
75WRITE8_HANDLER( gondo_scroll_w );
76WRITE8_HANDLER( shackled_control_w );
77WRITE8_HANDLER( lastmiss_control_w );
78WRITE8_HANDLER( lastmiss_scrollx_w );
79WRITE8_HANDLER( lastmiss_scrolly_w );
80WRITE8_HANDLER( dec8_bac06_0_w );
81WRITE8_HANDLER( dec8_bac06_1_w );
82WRITE8_HANDLER( dec8_videoram_w );
83
84/******************************************************************************/
85
86extern UINT8 *dec8_pf0_data,*dec8_pf1_data,*dec8_row;
87
8848static int nmi_enable,int_enable;
8949static int i8751_return, i8751_value;
9050static int msm5205next;
r3535r3536
14251385   PORT_DIPSETTING(    0x80, DEF_STR( Yes ) )
14261386INPUT_PORTS_END
14271387
1428static INPUT_PORTS_START( oscarj0 )
1388static INPUT_PORTS_START( oscaru )
14291389   PORT_START("IN0")
14301390   PLAYER1_JOYSTICK
14311391   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
r3535r3536
29992959
30002960ROM_START( oscar )
30012961   ROM_REGION( 0x20000, "main", 0 )
3002   ROM_LOAD( "ed10", 0x08000, 0x08000, CRC(f9b0d4d4) SHA1(dc2aba978ba96f365027c7be5714728d5d7fb802) )
2962   ROM_LOAD( "du10", 0x08000, 0x08000, CRC(120040d8) SHA1(22d5f84f3ca724cbf39dfc4790f2175ba4945aaf) )
30032963   ROM_LOAD( "ed09", 0x10000, 0x10000, CRC(e2d4bba9) SHA1(99f0310debe51f4bcd00b5fdaedc1caf2eeccdeb) )
30042964
30052965   ROM_REGION( 0x10000, "sub", 0 )   /* CPU 2, 1st 16k is empty */
3006   ROM_LOAD( "ed11", 0x0000, 0x10000, CRC(10e5d919) SHA1(13bc3497cb4aaa6dd272853819212ad63656f8a7) )
2966   ROM_LOAD( "du11", 0x0000, 0x10000, CRC(ff45c440) SHA1(4769944bcfebcdcba7ed7d5133d4d9f98890d75c) )
30072967
30082968   ROM_REGION( 2*0x10000, "audio", 0 )   /* 64K for sound CPU + 64k for decrypted opcodes */
3009   ROM_LOAD( "ed12", 0x8000, 0x8000, CRC(432031c5) SHA1(af2deea48b98eb0f9e85a4fb1486021f999f9abd) )
2969   ROM_LOAD( "ed12", 0x8000, 0x8000, CRC(432031c5) SHA1(af2deea48b98eb0f9e85a4fb1486021f999f9abd) )
30102970
30112971   ROM_REGION( 0x1000, "cpu3", 0 )   /* ID8751H MCU */
30122972   ROM_LOAD( "id8751h.mcu", 0x0000, 0x1000, NO_DUMP )
r3535r3536
30252985   ROM_LOAD( "ed03", 0x20000, 0x10000, CRC(4fc4fb0f) SHA1(0906762a3adbffe765e072255262fedaa78bdb2a) )
30262986   ROM_LOAD( "ed00", 0x40000, 0x10000, CRC(ac201f2d) SHA1(77f13eb6a1a44444ca9b25363031451b0d68c988) )
30272987   ROM_LOAD( "ed02", 0x60000, 0x10000, CRC(7ddc5651) SHA1(f5ec5245cf3d9d4d9c1df6a8128c24565e331317) )
3028
3029   ROM_REGION( 512, "proms", 0 )
3030   ROM_LOAD( "du-13.bin", 0x00000,  0x200,  CRC(bea1f87e) SHA1(f5215992e4b53c9cd4c7e0b20ff5cfdce3ab6d02) )   /* Priority (Not yet used) */
30312988ROM_END
30322989
3033ROM_START( oscarj0 )
2990ROM_START( oscaru )
30342991   ROM_REGION( 0x20000, "main", 0 )
3035   ROM_LOAD( "du10", 0x08000, 0x08000, CRC(120040d8) SHA1(22d5f84f3ca724cbf39dfc4790f2175ba4945aaf) )
2992   ROM_LOAD( "ed10", 0x08000, 0x08000, CRC(f9b0d4d4) SHA1(dc2aba978ba96f365027c7be5714728d5d7fb802) )
30362993   ROM_LOAD( "ed09", 0x10000, 0x10000, CRC(e2d4bba9) SHA1(99f0310debe51f4bcd00b5fdaedc1caf2eeccdeb) )
30372994
30382995   ROM_REGION( 0x10000, "sub", 0 )   /* CPU 2, 1st 16k is empty */
3039   ROM_LOAD( "du11", 0x0000, 0x10000, CRC(ff45c440) SHA1(4769944bcfebcdcba7ed7d5133d4d9f98890d75c) )
2996   ROM_LOAD( "ed11", 0x0000, 0x10000, CRC(10e5d919) SHA1(13bc3497cb4aaa6dd272853819212ad63656f8a7) )
30402997
30412998   ROM_REGION( 2*0x10000, "audio", 0 )   /* 64K for sound CPU + 64k for decrypted opcodes */
3042   ROM_LOAD( "ed12", 0x8000, 0x8000, CRC(432031c5) SHA1(af2deea48b98eb0f9e85a4fb1486021f999f9abd) )
2999   ROM_LOAD( "ed12", 0x8000, 0x8000, CRC(432031c5) SHA1(af2deea48b98eb0f9e85a4fb1486021f999f9abd) )
30433000
30443001   ROM_REGION( 0x1000, "cpu3", 0 )   /* ID8751H MCU */
30453002   ROM_LOAD( "id8751h.mcu", 0x0000, 0x1000, NO_DUMP )
r3535r3536
30583015   ROM_LOAD( "ed03", 0x20000, 0x10000, CRC(4fc4fb0f) SHA1(0906762a3adbffe765e072255262fedaa78bdb2a) )
30593016   ROM_LOAD( "ed00", 0x40000, 0x10000, CRC(ac201f2d) SHA1(77f13eb6a1a44444ca9b25363031451b0d68c988) )
30603017   ROM_LOAD( "ed02", 0x60000, 0x10000, CRC(7ddc5651) SHA1(f5ec5245cf3d9d4d9c1df6a8128c24565e331317) )
3018
3019   ROM_REGION( 512, "proms", 0 )
3020   ROM_LOAD( "du-13.bin", 0x00000,  0x200,  CRC(bea1f87e) SHA1(f5215992e4b53c9cd4c7e0b20ff5cfdce3ab6d02) )   /* Priority (Not yet used) */
30613021ROM_END
30623022
30633023ROM_START( oscarj1 )
r3535r3536
30933053   ROM_LOAD( "du-13.bin", 0x00000,  0x200,  CRC(bea1f87e) SHA1(f5215992e4b53c9cd4c7e0b20ff5cfdce3ab6d02) )   /* Priority (Not yet used) */
30943054ROM_END
30953055
3096ROM_START( oscarj )
3056ROM_START( oscarj2 )
30973057   ROM_REGION( 0x20000, "main", 0 )
30983058   ROM_LOAD( "oscr10-2.bin", 0x08000, 0x08000, CRC(114e898d) SHA1(1072ccabe6d53c50cdfa1e27d5d848ecdd6559cc) ) /* DU10-2 */
30993059   ROM_LOAD( "ed09", 0x10000, 0x10000, CRC(e2d4bba9) SHA1(99f0310debe51f4bcd00b5fdaedc1caf2eeccdeb) )
r3535r3536
35273487GAME( 1987, srdarwnj, srdarwin, srdarwin, srdarwin, deco222, ROT270, "Data East Corporation", "Super Real Darwin (Japan)", 0 )
35283488GAME( 1987, gondo,    0,        gondo,    gondo,    0,       ROT270, "Data East USA", "Gondomania (US)", 0 )
35293489GAME( 1987, makyosen, gondo,    gondo,    gondo,    0,       ROT270, "Data East Corporation", "Makyou Senshi (Japan)", 0 )
3530GAME( 1988, oscar,    0,        oscar,    oscar,    deco222, ROT0,   "Data East USA", "Psycho-Nics Oscar (US)", 0 )
3531GAME( 1987, oscarj,   oscar,    oscar,    oscar,    deco222, ROT0,   "Data East Corporation", "Psycho-Nics Oscar (Japan revision 2)", 0 )
3532GAME( 1987, oscarj1,  oscar,    oscar,    oscar,    deco222, ROT0,   "Data East Corporation", "Psycho-Nics Oscar (Japan revision 1)", 0 )
3533GAME( 1987, oscarj0,  oscar,    oscar,    oscarj0,  deco222, ROT0,   "Data East Corporation", "Psycho-Nics Oscar (Japan revision 0)", 0 )
3490GAME( 1988, oscar,    0,        oscar,    oscar,    deco222, ROT0,   "Data East Corporation", "Psycho-Nics Oscar (World revision 0)", 0 )
3491GAME( 1987, oscaru,   oscar,    oscar,    oscaru,   deco222, ROT0,   "Data East USA", "Psycho-Nics Oscar (US)", 0 )
3492GAME( 1987, oscarj1,  oscar,    oscar,    oscaru,   deco222, ROT0,   "Data East Corporation", "Psycho-Nics Oscar (Japan revision 1)", 0 )
3493GAME( 1987, oscarj2,  oscar,    oscar,    oscaru,   deco222, ROT0,   "Data East Corporation", "Psycho-Nics Oscar (Japan revision 2)", 0 )
35343494GAME( 1986, lastmisn, 0,        lastmiss, lastmisn, 0,       ROT270, "Data East USA", "Last Mission (US revision 6)", 0 )
35353495GAME( 1986, lastmsno, lastmisn, lastmiss, lastmisn, 0,       ROT270, "Data East USA", "Last Mission (US revision 5)", 0 )
35363496GAME( 1986, lastmsnj, lastmisn, lastmiss, lastmsnj, 0,       ROT270, "Data East Corporation", "Last Mission (Japan)", 0 )
src/mame/drivers/changela.c
r3535r3536
1313#include "cpu/z80/z80.h"
1414#include "cpu/m6805/m6805.h"
1515#include "sound/ay8910.h"
16#include "includes/changela.h"
1617
1718
18VIDEO_START( changela );
19VIDEO_UPDATE( changela );
20
21WRITE8_HANDLER( changela_colors_w );
22WRITE8_HANDLER( changela_mem_device_select_w );
23WRITE8_HANDLER( changela_mem_device_w );
24READ8_HANDLER( changela_mem_device_r );
25WRITE8_HANDLER( changela_slope_rom_addr_hi_w );
26WRITE8_HANDLER( changela_slope_rom_addr_lo_w );
27
28
2919static UINT8 portA_in,portA_out,ddrA;
3020static UINT8 portB_out,ddrB;
3121static UINT8 portC_in,portC_out,ddrC;
src/mame/drivers/crimfght.c
r3535r3536
243243   PORT_DIPSETTING(    0x01, "3" )
244244   PORT_DIPSETTING(    0x00, "4" )
245245
246   PORT_MODIFY("P1")
247   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
248   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
249
250   PORT_MODIFY("P2")
251   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
252   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
253
246254   PORT_MODIFY("P3")
247255   PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
248256
src/mame/drivers/wrally.c
r3535r3536
9696
9797#include "driver.h"
9898#include "cpu/m68000/m68000.h"
99#include "cpu/ds5002fp/ds5002fp.h"
99#include "cpu/mcs51/mcs51.h"
100100#include "sound/okim6295.h"
101101#include "includes/wrally.h"
102102
r3535r3536
127127{
128128   UINT8 *shareram = (UINT8 *)wrally_shareram;
129129
130   return shareram[BYTE_XOR_LE(offset)];
130   return shareram[BYTE_XOR_LE(offset) ^ 1];
131131}
132132
133133static WRITE8_HANDLER( dallas_share_w )
134134{
135135   UINT8 *shareram = (UINT8 *)wrally_shareram;
136136
137   shareram[BYTE_XOR_LE(offset)] = data;
137   shareram[BYTE_XOR_LE(offset) ^ 1] = data;
138138}
139139
140140static ADDRESS_MAP_START( dallas_rom, ADDRESS_SPACE_PROGRAM, 8 )
141141   AM_RANGE(0x0000, 0x7fff) AM_ROM                           /* Code in NVRAM */
142142ADDRESS_MAP_END
143143
144static ADDRESS_MAP_START( dallas_ram, ADDRESS_SPACE_DATA, 8 )
144static ADDRESS_MAP_START( dallas_ram, ADDRESS_SPACE_IO, 8 )
145145   AM_RANGE(0x0000, 0xffff) AM_READWRITE(dallas_share_r, dallas_share_w)   AM_MASK(0x3fff)      /* Shared RAM with the main CPU */
146146ADDRESS_MAP_END
147147
r3535r3536
254254   MDRV_CPU_ADD("mcu", DS5002FP, XTAL_24MHz/2)   /* verified on pcb */
255255   MDRV_CPU_CONFIG(dallas_config)
256256   MDRV_CPU_PROGRAM_MAP(dallas_rom, 0)
257   MDRV_CPU_DATA_MAP(dallas_ram, 0)
257   MDRV_CPU_IO_MAP(dallas_ram, 0)
258258
259259   MDRV_INTERLEAVE(640)               /* heavy sync */
260   MDRV_MACHINE_RESET(wrally)
261260
262261   /* video hardware */
263262   MDRV_SCREEN_ADD("main", RASTER)
r3535r3536
363362ROM_END
364363
365364
366GAME( 1993, wrally,  0,      wrally, wrally, wrally, ROT0, "Gaelco", "World Rally (set 1)", 0 ) /* Dallas DS5002FP power failure shows as: "Tension  baja " */
367GAME( 1993, wrallya, wrally, wrally, wrally, wrally, ROT0, "Gaelco", "World Rally (set 2)", 0 ) /* Dallas DS5002FP power failure shows as: "Power  Failure" */
368GAME( 1993, wrallyb, wrally, wrally, wrally, wrally, ROT0, "Gaelco (Atari license)", "World Rally (US, 930217)", 0 )
365GAME( 1993, wrally,  0,      wrally, wrally, 0, ROT0, "Gaelco", "World Rally (set 1)", 0 ) /* Dallas DS5002FP power failure shows as: "Tension  baja " */
366GAME( 1993, wrallya, wrally, wrally, wrally, 0, ROT0, "Gaelco", "World Rally (set 2)", 0 ) /* Dallas DS5002FP power failure shows as: "Power  Failure" */
367GAME( 1993, wrallyb, wrally, wrally, wrally, 0, ROT0, "Gaelco (Atari license)", "World Rally (US, 930217)", 0 )
src/mame/drivers/segas18.c
r3535r3536
190190
191191static TIMER_CALLBACK( boost_interleave )
192192{
193   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_MSEC(10));
193   cpu_boost_interleave(machine, attotime_zero, ATTOTIME_IN_MSEC(10));
194194}
195195
196196
src/mame/drivers/nmk16.c
r3535r3536
160160#include "machine/nmk004.h"
161161#include "machine/nmk112.h"
162162#include "cpu/pic16c5x/pic16c5x.h"
163#include "includes/nmk16.h"
163164
164165
165166/**********************************************************
r3535r3536
200201   }
201202}
202203
203extern UINT16 *nmk_bgvideoram,*nmk_fgvideoram,*nmk_txvideoram;
204extern UINT16 *gunnail_scrollram, *gunnail_scrollramy;
205204
206READ16_HANDLER( nmk_bgvideoram_r );
207WRITE16_HANDLER( nmk_bgvideoram_w );
208READ16_HANDLER( nmk_fgvideoram_r );
209WRITE16_HANDLER( nmk_fgvideoram_w );
210READ16_HANDLER( nmk_txvideoram_r );
211WRITE16_HANDLER( nmk_txvideoram_w );
212WRITE16_HANDLER( nmk_scroll_w );
213WRITE16_HANDLER( nmk_scroll_2_w );
214WRITE16_HANDLER( nmk_scroll_3_w );
215WRITE16_HANDLER( nmk_flipscreen_w );
216WRITE16_HANDLER( nmk_tilebank_w );
217WRITE16_HANDLER( bioship_scroll_w );
218WRITE16_HANDLER( bioship_bank_w );
219WRITE16_HANDLER( mustang_scroll_w );
220WRITE16_HANDLER( bioshipbg_scroll_w );
221WRITE16_HANDLER( vandyke_scroll_w );
222WRITE16_HANDLER( manybloc_scroll_w );
223205
224VIDEO_START( macross );
225VIDEO_UPDATE( manybloc );
226VIDEO_START( gunnail );
227VIDEO_START( macross2 );
228VIDEO_START( tdragon2 );
229VIDEO_START( bjtwin );
230VIDEO_START( bioship );
231VIDEO_START( strahl );
232VIDEO_UPDATE( bioship );
233VIDEO_UPDATE( strahl );
234VIDEO_UPDATE( macross );
235VIDEO_UPDATE( gunnail );
236VIDEO_UPDATE( bjtwin );
237VIDEO_UPDATE( tharrier );
238VIDEO_UPDATE( hachamf );
239VIDEO_UPDATE( tdragon );
240VIDEO_EOF( nmk );
241VIDEO_EOF( strahl );
242
243/* Variables defined in video: */
244
245extern UINT16 *afega_vram_0, *afega_scroll_0;
246extern UINT16 *afega_vram_1, *afega_scroll_1;
247
248/* Functions defined in video: */
249
250WRITE16_HANDLER( afega_vram_0_w );
251WRITE16_HANDLER( afega_vram_1_w );
252//WRITE16_HANDLER( afega_palette_w );
253
254VIDEO_START( afega );
255VIDEO_START( grdnstrm );
256VIDEO_START( firehawk );
257VIDEO_UPDATE( afega );
258VIDEO_UPDATE( redhawkb );
259VIDEO_UPDATE(redhawki );
260VIDEO_UPDATE( bubl2000 );
261VIDEO_UPDATE( firehawk );
262
263
264
265206static MACHINE_RESET( nmk16 )
266207{
267208   NMK112_init(0, "oki1", "oki2");
src/mame/drivers/m10.c
r3535r3536
9090
9191    From http://www.crazykong.com/tech/IremBoardList.txt
9292
93    skychut:        M-11
93    skychut:        M-11 (?)
9494    andromed:       N/A
9595    ipminvad:       N/A
9696    spacbeam:       not listed
r3535r3536
111111
112112***************************************************************************/
113113#include "driver.h"
114#include "machine/rescap.h"
114115#include "sound/samples.h"
116#include "machine/74123.h"
115117#include "m10.h"
116118
117119
r3535r3536
121123 *
122124 *************************************/
123125
124#define DEBUG      (0)
126#define DEBUG      (1)
125127
128static WRITE8_DEVICE_HANDLER(ic8j1_output_changed)
129{
130   printf("ic8j1: %d %d\n", data, video_screen_get_vpos(device->machine->primary_screen));
131   cpunum_set_input_line(device->machine, 0, 0, !data ? CLEAR_LINE : ASSERT_LINE);
132}
133
134static WRITE8_DEVICE_HANDLER(ic8j2_output_changed)
135{
136   /* written from /Q to A with slight delight */
137   printf("ic8j2: %d\n", data);
138   ttl74123_a_w(device, 0, data);
139   ttl74123_a_w(devtag_get_device(device->machine, TTL74123, "ic8j1"), 0, data);
140}
141
142static const ttl74123_config ic8j1_intf =
143{
144   /* completely illegible */
145   TTL74123_NOT_GROUNDED_DIODE,   /* the hook up type */
146   RES_K(1),         /* resistor connected to RCext */
147   CAP_U(1),      /* capacitor connected to Cext and RCext */
148   1,               /* A pin - driven by the CRTC */
149   1,               /* B pin - pulled high */
150   1,               /* Clear pin - pulled high */
151   ic8j1_output_changed
152};
153
154static const ttl74123_config ic8j2_intf =
155{
156   TTL74123_NOT_GROUNDED_DIODE,   /* the hook up type */
157   /* 10k + 20k variable resistor */
158   RES_K(22),         /* resistor connected to RCext */
159   CAP_U(2.2),      /* capacitor connected to Cext and RCext */
160   1,               /* A pin - driven by the CRTC */
161   1,               /* B pin - pulled high */
162   1,               /* Clear pin - pulled high */
163   ic8j2_output_changed
164};
165
126166/*************************************
127167 *
128168 *  Initialization
r3535r3536
420460static READ8_HANDLER( m10_a700_r )
421461{
422462      //printf("rd:%d\n",video_screen_get_vpos(machine->primary_screen));
423   cpunum_set_input_line(machine, 0, 0, CLEAR_LINE);
463   printf("clear\n");
464   ttl74123_clear_w(devtag_get_device(machine, TTL74123, "ic8j1"), 0, 0);
465   ttl74123_clear_w(devtag_get_device(machine, TTL74123, "ic8j1"), 0, 1);
424466   return 0x00;
425467}
426468
427469static READ8_HANDLER( m11_a700_r )
428470{
429471      //printf("rd:%d\n",video_screen_get_vpos(machine->primary_screen));
472   //cpunum_set_input_line(machine, 0, 0, CLEAR_LINE);
473   printf("clear\n");
474   ttl74123_clear_w(devtag_get_device(machine, TTL74123, "ic8j1"), 0, 0);
475   ttl74123_clear_w(devtag_get_device(machine, TTL74123, "ic8j1"), 0, 1);
430476   return 0x00;
431477}
432478
r3535r3536
460506
461507}
462508
509#if 0
463510static INTERRUPT_GEN( m11_interrupt )
464511{
465512   cpunum_set_input_line(machine, 0, 0, ASSERT_LINE);
466   timer_set(video_screen_get_time_until_pos(machine->primary_screen, IREMM10_VBEND, 0), NULL, -1,interrupt_callback);
513   //timer_set(video_screen_get_time_until_pos(machine->primary_screen, IREMM10_VBEND, 0), NULL, -1,interrupt_callback);
467514}
468515
469516static INTERRUPT_GEN( m10_interrupt )
470517{
471518   cpunum_set_input_line(machine, 0, 0, ASSERT_LINE);
472519}
520#endif
473521
474522static INTERRUPT_GEN( m15_interrupt )
475523{
r3535r3536
769817
770818   MDRV_MACHINE_RESET(irem)
771819
772   MDRV_CPU_VBLANK_INT("main", m10_interrupt)
820   //MDRV_CPU_VBLANK_INT("main", m10_interrupt)
773821
774822   /* video hardware */
775823   MDRV_SCREEN_ADD("main", RASTER)
r3535r3536
783831   MDRV_VIDEO_START(m10)
784832   MDRV_VIDEO_UPDATE(m10)
785833
834   /* 74LS123 */
835
836   MDRV_DEVICE_ADD("ic8j1", TTL74123)
837   MDRV_DEVICE_CONFIG(ic8j1_intf)
838   MDRV_DEVICE_ADD("ic8j2", TTL74123)
839   MDRV_DEVICE_CONFIG(ic8j2_intf)
840
786841   /* sound hardware */
787842   MDRV_SPEAKER_STANDARD_MONO("mono")
788843
r3535r3536
798853
799854   /* basic machine hardware */
800855   MDRV_IMPORT_FROM(m10)
801   MDRV_CPU_REPLACE("main", M6502,IREMM10_CPU_CLOCK / 2)
856   MDRV_CPU_REPLACE("main", M6502,IREMM10_CPU_CLOCK)
802857   //MDRV_CPU_MODIFY("main")
803858   MDRV_CPU_PROGRAM_MAP(m11_main,0)
804   MDRV_CPU_VBLANK_INT("main", m11_interrupt)
859   //MDRV_CPU_VBLANK_INT("main", m11_interrupt)
805860
806861   /* sound hardware */
807862MACHINE_DRIVER_END
src/emu/debug/debugcmd.c
r3535r3536
247247   /* ask all the CPUs if they would like to register functions or symbols */
248248   for (cpunum = 0; cpunum < cpu_gettotalcpu(); cpunum++)
249249   {
250      void (*setup_commands)(void);
251      setup_commands = cpunum_get_info_fct(cpunum, CPUINFO_PTR_DEBUG_SETUP_COMMANDS);
252      if (setup_commands)
253         setup_commands();
250      cpu_debug_init_func debug_init;
251      debug_init = cpunum_get_info_fct(cpunum, CPUINFO_PTR_DEBUG_INIT);
252      if (debug_init != NULL)
253         (*debug_init)();
254254   }
255255
256256   add_exit_callback(machine, debug_command_exit);
src/emu/cpu/m6805/m6805.c
r3535r3536
5757   UINT8   cc;          /* Condition codes */
5858
5959   UINT16   pending_interrupts; /* MB */
60   int    (*irq_callback)(int irqline);
60   cpu_irq_callback irq_callback;
61   const device_config *device;
6162   int    irq_state[9];      /* KW Additional lines for HD63705 */
6263   int      nmi_state;
6364} m6805_Regs;
r3535r3536
292293         PUSHBYTE(m6805.cc);
293294         SEI;
294295         if (m6805.irq_callback)
295            (*m6805.irq_callback)(0);
296            (*m6805.irq_callback)(m6805.device, 0);
296297
297298         if ((m6805.pending_interrupts & (1<<M68705_IRQ_LINE)) != 0 )
298299         {
r3535r3536
329330        SEI;
330331      /* no vectors supported, just do the callback to clear irq_state if needed */
331332      if (m6805.irq_callback)
332         (*m6805.irq_callback)(0);
333         (*m6805.irq_callback)(m6805.device, 0);
333334
334335      RM16( 0x1ffc, &pPC);
335336      change_pc(PC);
r3535r3536
357358        SEI;
358359      /* no vectors supported, just do the callback to clear irq_state if needed */
359360      if (m6805.irq_callback)
360         (*m6805.irq_callback)(0);
361         (*m6805.irq_callback)(m6805.device, 0);
361362
362363
363364#if (HAS_HD63705)
r3535r3536
440441   state_save_register_item_array(type, index, m6805.irq_state);
441442}
442443
443static void m6805_init(int index, int clock, const void *config, int (*irqcallback)(int))
444static CPU_INIT( m6805 )
444445{
445446   state_register("m6805", index);
446447   m6805.irq_callback = irqcallback;
448   m6805.device = device;
447449}
448450
449static void m6805_reset(void)
451static CPU_RESET( m6805 )
450452{
451   int (*save_irqcallback)(int) = m6805.irq_callback;
453   cpu_irq_callback save_irqcallback = m6805.irq_callback;
454   const device_config *save_device = m6805.device;
452455   memset(&m6805, 0, sizeof(m6805));
453456   m6805.irq_callback = save_irqcallback;
457   m6805.device = save_device;
454458   /* Force CPU sub-type and relevant masks */
455459   m6805.subtype   = SUBTYPE_M6805;
456460   SP_MASK = 0x07f;
r3535r3536
463467   change_pc(PC);
464468}
465469
466static void m6805_exit(void)
470static CPU_EXIT( m6805 )
467471{
468472   /* nothing to do */
469473}
r3535r3536
471475/****************************************************************************
472476 * Get all registers in given buffer
473477 ****************************************************************************/
474static void m6805_get_context(void *dst)
478static CPU_GET_CONTEXT( m6805 )
475479{
476480   if( dst )
477481      *(m6805_Regs*)dst = m6805;
r3535r3536
481485/****************************************************************************
482486 * Set all registers to given values
483487 ****************************************************************************/
484static void m6805_set_context(void *src)
488static CPU_SET_CONTEXT( m6805 )
485489{
486490   if( src )
487491   {
r3535r3536
506510
507511
508512/* execute instructions on this CPU until icount expires */
509static int m6805_execute(int cycles)
513static CPU_EXECUTE( m6805 )
510514{
511515   UINT8 ireg;
512516   m6805_ICount = cycles;
r3535r3536
804808 * M68705 section
805809 ****************************************************************************/
806810#if (HAS_M68705)
807static void m68705_init(int index, int clock, const void *config, int (*irqcallback)(int))
811static CPU_INIT( m68705 )
808812{
809813   state_register("m68705", index);
810814   m6805.irq_callback = irqcallback;
815   m6805.device = device;
811816}
812817
813static void m68705_reset(void)
818static CPU_RESET( m68705 )
814819{
815   m6805_reset();
820   CPU_RESET_CALL(m6805);
816821   /* Overide default 6805 type */
817822   m6805.subtype = SUBTYPE_M68705;
818823   RM16( 0xfffe, &m6805.pc );
r3535r3536
831836 * HD63705 section
832837 ****************************************************************************/
833838#if (HAS_HD63705)
834static void hd63705_init(int index, int clock, const void *config, int (*irqcallback)(int))
839static CPU_INIT( hd63705 )
835840{
836841   state_register("hd63705", index);
837842   m6805.irq_callback = irqcallback;
843   m6805.device = device;
838844}
839845
840static void hd63705_reset(void)
846static CPU_RESET( hd63705 )
841847{
842   m6805_reset();
848   CPU_RESET_CALL(m6805);
843849
844850   /* Overide default 6805 types */
845851   m6805.subtype   = SUBTYPE_HD63705;
r3535r3536
874880 * Generic set_info
875881 **************************************************************************/
876882
877static void m6805_set_info(UINT32 state, cpuinfo *info)
883static CPU_SET_INFO( m6805 )
878884{
879885   switch (state)
880886   {
r3535r3536
897903 * Generic get_info
898904 **************************************************************************/
899905
900void m6805_get_info(UINT32 state, cpuinfo *info)
906CPU_GET_INFO( m6805 )
901907{
902908   switch (state)
903909   {
r3535r3536
936942      case CPUINFO_INT_REGISTER + M6805_CC:         info->i = CC;                     break;
937943
938944      /* --- the following bits of info are returned as pointers to data or functions --- */
939      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m6805_set_info;         break;
940      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = m6805_get_context;   break;
941      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = m6805_set_context;   break;
942      case CPUINFO_PTR_INIT:                     info->init = m6805_init;            break;
943      case CPUINFO_PTR_RESET:                     info->reset = m6805_reset;            break;
944      case CPUINFO_PTR_EXIT:                     info->exit = m6805_exit;            break;
945      case CPUINFO_PTR_EXECUTE:                  info->execute = m6805_execute;         break;
945      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m6805);         break;
946      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(m6805);   break;
947      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(m6805);   break;
948      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m6805);            break;
949      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m6805);            break;
950      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(m6805);            break;
951      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m6805);         break;
946952      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
947      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m6805_dasm;         break;
953      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m6805);         break;
948954      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m6805_ICount;         break;
949955
950956      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
979985/**************************************************************************
980986 * CPU-specific set_info
981987 **************************************************************************/
982static void m68705_set_info(UINT32 state, cpuinfo *info)
988static CPU_SET_INFO( m68705 )
983989{
984990   switch(state)
985991   {
986992      /* --- the following bits of info are set as 64-bit signed integers --- */
987993      case CPUINFO_INT_INPUT_STATE + M68705_INT_TIMER:   m68705_set_irq_line(M68705_INT_TIMER, info->i); break;
988994
989      default:                              m6805_set_info(state,info);            break;
995      default:                              CPU_SET_INFO_CALL(m6805);            break;
990996   }
991997}
992998
993void m68705_get_info(UINT32 state, cpuinfo *info)
999CPU_GET_INFO( m68705 )
9941000{
9951001   switch (state)
9961002   {
r3535r3536
9981004      case CPUINFO_INT_INPUT_STATE + M68705_INT_TIMER:   info->i = m6805.irq_state[M68705_INT_TIMER]; break;
9991005
10001006      /* --- the following bits of info are returned as pointers to data or functions --- */
1001      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m68705_set_info;      break;
1002      case CPUINFO_PTR_INIT:                     info->init = m68705_init;            break;
1003      case CPUINFO_PTR_RESET:                     info->reset = m68705_reset;            break;
1007      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m68705);      break;
1008      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m68705);            break;
1009      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m68705);            break;
10041010
10051011      /* --- the following bits of info are returned as NULL-terminated strings --- */
10061012      case CPUINFO_STR_NAME:                     strcpy(info->s, "M68705");            break;
10071013
1008      default:                              m6805_get_info(state, info);         break;
1014      default:                              CPU_GET_INFO_CALL(m6805);            break;
10091015   }
10101016}
10111017#endif
r3535r3536
10161022 * CPU-specific set_info
10171023 **************************************************************************/
10181024
1019static void hd63705_set_info(UINT32 state, cpuinfo *info)
1025static CPU_SET_INFO( hd63705 )
10201026{
10211027   switch (state)
10221028   {
r3535r3536
10311037      case CPUINFO_INT_INPUT_STATE + HD63705_INT_ADCONV:   hd63705_set_irq_line(HD63705_INT_ADCONV, info->i); break;
10321038      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:      hd63705_set_irq_line(INPUT_LINE_NMI, info->i); break;
10331039
1034      default:                                 m6805_set_info(state, info);      break;
1040      default:                                 CPU_SET_INFO_CALL(m6805);            break;
10351041   }
10361042}
10371043
1038void hd63705_get_info(UINT32 state, cpuinfo *info)
1044CPU_GET_INFO( hd63705 )
10391045{
10401046   switch (state)
10411047   {
r3535r3536
10531059      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16;               break;
10541060
10551061      /* --- the following bits of info are returned as pointers to data or functions --- */
1056      case CPUINFO_PTR_SET_INFO:                  info->setinfo = hd63705_set_info;      break;
1057      case CPUINFO_PTR_INIT:                     info->init = hd63705_init;            break;
1058      case CPUINFO_PTR_RESET:                     info->reset = hd63705_reset;         break;
1062      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(hd63705);      break;
1063      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(hd63705);            break;
1064      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(hd63705);         break;
10591065
10601066      /* --- the following bits of info are returned as NULL-terminated strings --- */
10611067      case CPUINFO_STR_NAME:                     strcpy(info->s, "HD63705");            break;
10621068      case CPUINFO_STR_CORE_VERSION:               strcpy(info->s, "1.0");               break;
10631069      case CPUINFO_STR_CORE_CREDITS:               strcpy(info->s, "Keith Wilkins, Juergen Buchmueller"); break;
10641070
1065      default:                              m6805_get_info(state, info);         break;
1071      default:                              CPU_GET_INFO_CALL(m6805);            break;
10661072   }
10671073}
10681074#endif
src/emu/cpu/m6805/m6805.h
r3535r3536
1111
1212#define M6805_IRQ_LINE      0
1313
14extern void m6805_get_info(UINT32 state, cpuinfo *info);
14extern CPU_GET_INFO( m6805 );
1515
1616/****************************************************************************
1717 * 68705 section
r3535r3536
2828#define M68705_IRQ_LINE            M6805_IRQ_LINE
2929#define M68705_INT_TIMER         0x01
3030
31extern void m68705_get_info(UINT32 state, cpuinfo *info);
31extern CPU_GET_INFO( m68705 );
3232#endif
3333
3434/****************************************************************************
r3535r3536
5757#define   HD63705_INT_ADCONV         0x07
5858#define HD63705_INT_NMI            0x08
5959
60extern void hd63705_get_info(UINT32 state, cpuinfo *info);
60extern CPU_GET_INFO( hd63705 );
6161#endif
6262
6363/****************************************************************************/
r3535r3536
8484/****************************************************************************/
8585#define M6805_RDOP_ARG(Addr) ((unsigned)cpu_readop_arg(Addr))
8686
87offs_t m6805_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
87CPU_DISASSEMBLE( m6805 );
8888
8989#endif /* __M6805_H__ */
src/emu/cpu/m6805/6805dasm.c
r3535r3536
157157};
158158#endif
159159
160offs_t m6805_dasm(char *buf, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
160CPU_DISASSEMBLE( m6805 )
161161{
162162    int code, bit;
163163   UINT16 ea;
r3535r3536
170170   else if (disasm[code][0] == rts || disasm[code][0] == rti)
171171      flags = DASMFLAG_STEP_OUT;
172172
173   buf += sprintf(buf, "%-6s", op_name_str[disasm[code][0]]);
173   buffer += sprintf(buffer, "%-6s", op_name_str[disasm[code][0]]);
174174
175175   switch( disasm[code][1] )
176176   {
177177   case _btr:   /* bit test and relative branch */
178178      bit = (code >> 1) & 7;
179      sprintf (buf, "%d,$%02X,$%03X", bit, opram[1], pc + 3 + (INT8)opram[2]);
179      sprintf (buffer, "%d,$%02X,$%03X", bit, opram[1], pc + 3 + (INT8)opram[2]);
180180      return 3 | flags | DASMFLAG_SUPPORTED;
181181   case _bit:   /* bit test */
182182      bit = (code >> 1) & 7;
183      sprintf (buf, "%d,$%03X", bit, opram[1]);
183      sprintf (buffer, "%d,$%03X", bit, opram[1]);
184184      return 2 | flags | DASMFLAG_SUPPORTED;
185185   case _rel:   /* relative */
186      sprintf (buf, "$%03X", pc + 2 + (INT8)opram[1]);
186      sprintf (buffer, "$%03X", pc + 2 + (INT8)opram[1]);
187187      return 2 | flags | DASMFLAG_SUPPORTED;
188188   case _imm:   /* immediate */
189      sprintf (buf, "#$%02X", opram[1]);
189      sprintf (buffer, "#$%02X", opram[1]);
190190      return 2 | flags | DASMFLAG_SUPPORTED;
191191   case _dir:   /* direct (zero page address) */
192        sprintf (buf, "$%02X", opram[1]);
192        sprintf (buffer, "$%02X", opram[1]);
193193      return 2 | flags | DASMFLAG_SUPPORTED;
194194   case _ext:   /* extended (16 bit address) */
195195      ea = (opram[1] << 8) + opram[2];
196      sprintf (buf, "$%04X", ea);
196      sprintf (buffer, "$%04X", ea);
197197      return 3 | flags | DASMFLAG_SUPPORTED;
198198   case _idx:   /* indexed */
199      sprintf (buf, "(x)");
199      sprintf (buffer, "(x)");
200200      return 1 | flags | DASMFLAG_SUPPORTED;
201201   case _ix1:   /* indexed + byte (zero page) */
202      sprintf (buf, "(x+$%02X)", opram[1]);
202      sprintf (buffer, "(x+$%02X)", opram[1]);
203203      return 2 | flags | DASMFLAG_SUPPORTED;
204204   case _ix2:   /* indexed + word (16 bit address) */
205205      ea = (opram[1] << 8) + opram[2];
206      sprintf (buf, "(x+$%04X)", ea);
206      sprintf (buffer, "(x+$%04X)", ea);
207207      return 3 | flags | DASMFLAG_SUPPORTED;
208208    default:    /* implicit */
209209      return 1 | flags | DASMFLAG_SUPPORTED;
src/emu/cpu/v30mz/v30mz.c
r3535r3536
7676   UINT32   irq_state;
7777   UINT8   no_interrupt;
7878
79   int     (*irq_callback)(int irqline);
79   cpu_irq_callback irq_callback;
80   const device_config *device;
8081} nec_Regs;
8182
8283/***************************************************************************/
r3535r3536
106107
107108/***************************************************************************/
108109
109static void nec_reset (void)
110static CPU_RESET( nec )
110111{
111112    unsigned int i,j,c;
112113    static const BREGS reg_name[8]={ AL, CL, DL, BL, AH, CH, DH, BH };
113    int (*save_irqcallback)(int);
114   cpu_irq_callback save_irqcallback;
115   const device_config *save_device;
114116
115117   save_irqcallback = I.irq_callback;
118   save_device = I.device;
116119   memset( &I, 0, sizeof(I) );
117120   I.irq_callback = save_irqcallback;
121   I.device = save_device;
118122
119123   I.sregs[CS] = 0xffff;
120124
r3535r3536
143147    }
144148}
145149
146static void nec_exit (void)
150static CPU_EXIT( nec )
147151{
148152
149153}
r3535r3536
158162
159163   if (int_num == -1)
160164   {
161      int_num = (*I.irq_callback)(0);
165      int_num = (*I.irq_callback)(I.device, 0);
162166
163167      I.irq_state = CLEAR_LINE;
164168      I.pending_irq &= ~INT_IRQ;
r3535r3536
875879
876880/*****************************************************************************/
877881
878static void nec_get_context(void *dst)
882static CPU_GET_CONTEXT( nec )
879883{
880884   if( dst )
881885      *(nec_Regs*)dst = I;
882886}
883887
884static void nec_set_context(void *src)
888static CPU_SET_CONTEXT( nec )
885889{
886890   if( src )
887891   {
r3535r3536
917921   }
918922}
919923
920static offs_t nec_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
924static CPU_DISASSEMBLE( nec )
921925{
922926   return necv_dasm_one(buffer, pc, oprom);
923927}
924928
925static void nec_init(int index, int clock, const void *config, int (*irqcallback)(int), int type)
929static void nec_init(const device_config *device, int index, int clock, const void *config, cpu_irq_callback irqcallback, int type)
926930{
927931   static const char *const names[]={"V20","V30","V33","V30MZ"};
928932
r3535r3536
946950   state_save_register_item(names[type], index, I.ParityVal);
947951
948952   I.irq_callback = irqcallback;
953   I.device = device;
949954}
950955
951static void v30mz_init(int index, int clock, const void *config, int (*irqcallback)(int)) { nec_init(index, clock, config, irqcallback, 3); }
952static int v30mz_execute(int cycles)
956static CPU_INIT( v30mz ) { nec_init(device, index, clock, config, irqcallback, 3); }
957static CPU_EXECUTE( v30mz )
953958{
954959   nec_ICount=cycles;
955960   chip_type=V30MZ;
r3535r3536
980985 * Generic set_info
981986 **************************************************************************/
982987
983static void nec_set_info(UINT32 state, cpuinfo *info)
988static CPU_SET_INFO( nec )
984989{
985990   switch (state)
986991   {
r3535r3536
10351040 * Generic get_info
10361041 **************************************************************************/
10371042
1038void v30mz_get_info(UINT32 state, cpuinfo *info)
1043CPU_GET_INFO( v30mz )
10391044{
10401045   int flags;
10411046
r3535r3536
10891094      case CPUINFO_INT_REGISTER + NEC_PENDING:      info->i = I.pending_irq;            break;
10901095
10911096      /* --- the following bits of info are returned as pointers to data or functions --- */
1092      case CPUINFO_PTR_SET_INFO:                  info->setinfo = nec_set_info;         break;
1093      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = nec_get_context;      break;
1094      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = nec_set_context;      break;
1095      case CPUINFO_PTR_RESET:                     info->reset = nec_reset;            break;
1096      case CPUINFO_PTR_EXIT:                     info->exit = nec_exit;               break;
1097      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(nec);         break;
1098      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(nec);      break;
1099      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(nec);      break;
1100      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(nec);            break;
1101      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(nec);               break;
10971102      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1098      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = nec_dasm;         break;
1103      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(nec);         break;
10991104      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &nec_ICount;            break;
11001105
11011106      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
11431148        case CPUINFO_STR_REGISTER + NEC_VECTOR:         sprintf(info->s = cpuintrf_temp_str(), "V:%02X", I.int_vector); break;
11441149
11451150   /* --- the following bits of info are returned as pointers to data or functions --- */
1146   case CPUINFO_PTR_INIT:      info->init = v30mz_init;
1151   case CPUINFO_PTR_INIT:      info->init = CPU_INIT_NAME(v30mz);
11471152               break;
1148   case CPUINFO_PTR_EXECUTE:   info->execute = v30mz_execute;
1153   case CPUINFO_PTR_EXECUTE:   info->execute = CPU_EXECUTE_NAME(v30mz);
11491154               break;
11501155
11511156   /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/v30mz/necintrf.h
r3535r3536
1313};
1414
1515/* Public functions */
16extern void v30mz_get_info(UINT32 state, cpuinfo *info);
16extern CPU_GET_INFO( v30mz );
1717
1818#endif /* __NECINTRF_H__ */
src/emu/cpu/lh5801/lh5801.c
r3535r3536
9090 ***************************************************************/
9191#include "5801tbl.c"
9292
93static void lh5801_init(int cpu, int clock, const void *config, int (*irqcallback)(int))
93static CPU_INIT( lh5801 )
9494{
9595   memset(&lh5801, 0, sizeof(lh5801));
9696   lh5801.config = (const lh5801_cpu_core *) config;
9797}
9898
99static void lh5801_reset(void)
99static CPU_RESET( lh5801 )
100100{
101101   P = (program_read_byte(0xfffe)<<8) | program_read_byte(0xffff);
102102
r3535r3536
105105   lh5801.idle=0;
106106}
107107
108static void lh5801_get_context (void *dst)
108static CPU_GET_CONTEXT( lh5801 )
109109{
110110   if( dst )
111111      *(LH5801_Regs*)dst = lh5801;
112112}
113113
114static void lh5801_set_context (void *src)
114static CPU_SET_CONTEXT( lh5801 )
115115{
116116   if( src )
117117   {
r3535r3536
120120   }
121121}
122122
123static int lh5801_execute(int cycles)
123static CPU_EXECUTE( lh5801 )
124124{
125125   lh5801_icount = cycles;
126126
r3535r3536
153153 * Generic set_info
154154 **************************************************************************/
155155
156static void lh5801_set_info(UINT32 state, cpuinfo *info)
156static CPU_SET_INFO( lh5801 )
157157{
158158   switch (state)
159159   {
r3535r3536
182182 * Generic get_info
183183 **************************************************************************/
184184
185void lh5801_get_info(UINT32 state, cpuinfo *info)
185CPU_GET_INFO( lh5801 )
186186{
187187   switch (state)
188188   {
r3535r3536
228228      case CPUINFO_INT_REGISTER + LH5801_DP:         info->i = lh5801.dp;               break;
229229
230230      /* --- the following bits of info are returned as pointers to data or functions --- */
231      case CPUINFO_PTR_SET_INFO:                  info->setinfo = lh5801_set_info;      break;
232      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = lh5801_get_context;   break;
233      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = lh5801_set_context;   break;
234      case CPUINFO_PTR_INIT:                     info->init = lh5801_init;            break;
235      case CPUINFO_PTR_RESET:                     info->reset = lh5801_reset;            break;
231      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(lh5801);      break;
232      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(lh5801);   break;
233      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(lh5801);   break;
234      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(lh5801);            break;
235      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(lh5801);            break;
236236      case CPUINFO_PTR_EXIT:                     info->exit = NULL;                  break;
237      case CPUINFO_PTR_EXECUTE:                  info->execute = lh5801_execute;         break;
237      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(lh5801);         break;
238238      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
239      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = lh5801_dasm;      break;
239      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(lh5801);      break;
240240      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &lh5801_icount;         break;
241241
242242      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/lh5801/5801dasm.c
r3535r3536
650650   { ILL2 }
651651};
652652
653offs_t lh5801_dasm(char *dst, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
653CPU_DISASSEMBLE( lh5801 )
654654{
655655   int pos = 0;
656656   int oper;
r3535r3536
667667   }
668668   switch (entry->ins) {
669669   case ILL:
670      sprintf(dst,"%s %.2x", InsNames[entry->ins], oper);break;
670      sprintf(buffer,"%s %.2x", InsNames[entry->ins], oper);break;
671671   case ILL2:
672      sprintf(dst,"%s fd%.2x", InsNames[entry->ins], oper);break;
672      sprintf(buffer,"%s fd%.2x", InsNames[entry->ins], oper);break;
673673   default:
674674      switch(entry->adr) {
675675      case Imp:
676         sprintf(dst,"%s", InsNames[entry->ins]);break;
676         sprintf(buffer,"%s", InsNames[entry->ins]);break;
677677      case Reg:
678         sprintf(dst,"%s %s", InsNames[entry->ins],RegNames[entry->reg]);break;
678         sprintf(buffer,"%s %s", InsNames[entry->ins],RegNames[entry->reg]);break;
679679      case RegImm:
680         sprintf(dst,"%s %s,%.2x", InsNames[entry->ins],
680         sprintf(buffer,"%s %s,%.2x", InsNames[entry->ins],
681681               RegNames[entry->reg], oprom[pos++]);
682682         break;
683683      case RegImm16:
684684         absolut=oprom[pos++]<<8;
685685         absolut|=oprom[pos++];
686         sprintf(dst,"%s %s,%.4x", InsNames[entry->ins],RegNames[entry->reg],absolut );
686         sprintf(buffer,"%s %s,%.4x", InsNames[entry->ins],RegNames[entry->reg],absolut );
687687         break;
688688      case Vec:
689         sprintf(dst,"%s (ff%.2x)", InsNames[entry->ins],oprom[pos++]);break;
689         sprintf(buffer,"%s (ff%.2x)", InsNames[entry->ins],oprom[pos++]);break;
690690      case Vej:
691         sprintf(dst,"%s (ff%.2x)", InsNames[entry->ins], oper);break;
691         sprintf(buffer,"%s (ff%.2x)", InsNames[entry->ins], oper);break;
692692      case Imm:
693         sprintf(dst,"%s %.2x", InsNames[entry->ins],oprom[pos++]);break;
693         sprintf(buffer,"%s %.2x", InsNames[entry->ins],oprom[pos++]);break;
694694      case Imm16:
695695         absolut=oprom[pos++]<<8;
696696         absolut|=oprom[pos++];
697         sprintf(dst,"%s %.4x", InsNames[entry->ins],absolut );break;
697         sprintf(buffer,"%s %.4x", InsNames[entry->ins],absolut );break;
698698      case RelP:
699699         temp=oprom[pos++];
700         sprintf(dst,"%s %.4x", InsNames[entry->ins],pc+pos+temp );break;
700         sprintf(buffer,"%s %.4x", InsNames[entry->ins],pc+pos+temp );break;
701701      case RelM:
702702         temp=oprom[pos++];
703         sprintf(dst,"%s %.4x", InsNames[entry->ins],pc+pos-temp );break;
703         sprintf(buffer,"%s %.4x", InsNames[entry->ins],pc+pos-temp );break;
704704      case Abs:
705705         absolut=oprom[pos++]<<8;
706706         absolut|=oprom[pos++];
707         sprintf(dst,"%s (%.4x)", InsNames[entry->ins],absolut );break;
707         sprintf(buffer,"%s (%.4x)", InsNames[entry->ins],absolut );break;
708708      case ME1Abs:
709709         absolut=oprom[pos++]<<8;
710710         absolut|=oprom[pos++];
711         sprintf(dst,"%s #(%.4x)", InsNames[entry->ins],absolut );break;
711         sprintf(buffer,"%s #(%.4x)", InsNames[entry->ins],absolut );break;
712712      case AbsImm:
713713         absolut=oprom[pos++]<<8;
714714         absolut|=oprom[pos++];
715         sprintf(dst,"%s (%.4x),%.2x", InsNames[entry->ins],absolut,
715         sprintf(buffer,"%s (%.4x),%.2x", InsNames[entry->ins],absolut,
716716               oprom[pos++]);break;
717717      case ME1AbsImm:
718718         absolut=oprom[pos++]<<8;
719719         absolut|=oprom[pos++];
720         sprintf(dst,"%s #(%.4x),%.2x", InsNames[entry->ins],absolut,
720         sprintf(buffer,"%s #(%.4x),%.2x", InsNames[entry->ins],absolut,
721721               oprom[pos++]);break;
722722      case ME0:
723         sprintf(dst,"%s (%s)", InsNames[entry->ins],RegNames[entry->reg] );break;
723         sprintf(buffer,"%s (%s)", InsNames[entry->ins],RegNames[entry->reg] );break;
724724      case ME0Imm:
725         sprintf(dst,"%s (%s),%.2x", InsNames[entry->ins],RegNames[entry->reg],oprom[pos++] );
725         sprintf(buffer,"%s (%s),%.2x", InsNames[entry->ins],RegNames[entry->reg],oprom[pos++] );
726726         break;
727727      case ME1:
728         sprintf(dst,"%s #(%s)", InsNames[entry->ins],RegNames[entry->reg] );break;
728         sprintf(buffer,"%s #(%s)", InsNames[entry->ins],RegNames[entry->reg] );break;
729729      case ME1Imm:
730         sprintf(dst,"%s #(%s),%.2x", InsNames[entry->ins],RegNames[entry->reg],oprom[pos++] );
730         sprintf(buffer,"%s #(%s),%.2x", InsNames[entry->ins],RegNames[entry->reg],oprom[pos++] );
731731         break;
732732      }
733733   }
src/emu/cpu/lh5801/lh5801.h
r3535r3536
7575#define LH5801_INT_NONE 0
7676#define LH5801_IRQ 1
7777
78void lh5801_get_info(UINT32 state, cpuinfo *info);
79extern offs_t lh5801_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
78CPU_GET_INFO( lh5801 );
79extern CPU_DISASSEMBLE( lh5801 );
8080
8181#endif /* __LH5801_H__ */
src/emu/cpu/m6809/m6809.c
r3535r3536
8383
8484#define LOG(x)   do { if (VERBOSE) logerror x; } while (0)
8585
86extern offs_t m6809_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
86extern CPU_DISASSEMBLE( m6809 );
8787
8888
8989INLINE void fetch_effective_address( void );
r3535r3536
101101   UINT8   ireg;      /* First opcode */
102102   UINT8   irq_state[2];
103103    int     extra_cycles; /* cycles used up by interrupts */
104    int     (*irq_callback)(int irqline);
104   cpu_irq_callback irq_callback;
105   const device_config *device;
105106    UINT8   int_state;  /* SYNC and CWAI flags */
106107    UINT8   nmi_state;
107108} m6809_Regs;
r3535r3536
178179      CC |= CC_IF | CC_II;         /* inhibit FIRQ and IRQ */      \
179180      PCD=RM16(0xfff6);                                    \
180181      CHANGE_PC;                                          \
181      (void)(*m6809.irq_callback)(M6809_FIRQ_LINE);               \
182      (void)(*m6809.irq_callback)(m6809.device, M6809_FIRQ_LINE);      \
182183   }                                                   \
183184   else                                                \
184185   if( m6809.irq_state[M6809_IRQ_LINE]!=CLEAR_LINE && !(CC & CC_II) )   \
r3535r3536
206207      CC |= CC_II;               /* inhibit IRQ */            \
207208      PCD=RM16(0xfff8);                                    \
208209      CHANGE_PC;                                          \
209      (void)(*m6809.irq_callback)(M6809_IRQ_LINE);               \
210      (void)(*m6809.irq_callback)(m6809.device, M6809_IRQ_LINE);      \
210211   }
211212
212213/* public globals */
r3535r3536
395396/****************************************************************************
396397 * Get all registers in given buffer
397398 ****************************************************************************/
398static void m6809_get_context(void *dst)
399static CPU_GET_CONTEXT( m6809 )
399400{
400401   if( dst )
401402      *(m6809_Regs*)dst = m6809;
r3535r3536
404405/****************************************************************************
405406 * Set all registers to given values
406407 ****************************************************************************/
407static void m6809_set_context(void *src)
408static CPU_SET_CONTEXT( m6809 )
408409{
409410   if( src )
410411      m6809 = *(m6809_Regs*)src;
r3535r3536
417418/****************************************************************************/
418419/* Reset registers to their initial values                                  */
419420/****************************************************************************/
420static void m6809_init(int index, int clock, const void *config, int (*irqcallback)(int))
421static CPU_INIT( m6809 )
421422{
422423   state_save_register_item("m6809", index, PC);
423424   state_save_register_item("m6809", index, PPC);
r3535r3536
433434   state_save_register_item("m6809", index, m6809.nmi_state);
434435
435436   m6809.irq_callback = irqcallback;
437   m6809.device = device;
436438}
437439
438static void m6809_reset(void)
440static CPU_RESET( m6809 )
439441{
440442   m6809.int_state = 0;
441443   m6809.nmi_state = CLEAR_LINE;
r3535r3536
451453   CHANGE_PC;
452454}
453455
454static void m6809_exit(void)
456static CPU_EXIT( m6809 )
455457{
456458   /* nothing to do ? */
457459}
r3535r3536
512514#include "6809ops.c"
513515
514516/* execute instructions on this CPU until icount expires */
515static int m6809_execute(int cycles)   /* NS 970908 */
517static CPU_EXECUTE( m6809 )   /* NS 970908 */
516518{
517519    m6809_ICount = cycles - m6809.extra_cycles;
518520   m6809.extra_cycles = 0;
r3535r3536
10931095 * Generic set_info
10941096 **************************************************************************/
10951097
1096static void m6809_set_info(UINT32 state, cpuinfo *info)
1098static CPU_SET_INFO( m6809 )
10971099{
10981100   switch (state)
10991101   {
r3535r3536
11221124 * Generic get_info
11231125 **************************************************************************/
11241126
1125void m6809_get_info(UINT32 state, cpuinfo *info)
1127CPU_GET_INFO( m6809 )
11261128{
11271129   switch (state)
11281130   {
r3535r3536
11671169      case CPUINFO_INT_REGISTER + M6809_DP:         info->i = DP;                     break;
11681170
11691171      /* --- the following bits of info are returned as pointers to data or functions --- */
1170      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m6809_set_info;         break;
1171      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = m6809_get_context;   break;
1172      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = m6809_set_context;   break;
1173      case CPUINFO_PTR_INIT:                     info->init = m6809_init;            break;
1174      case CPUINFO_PTR_RESET:                     info->reset = m6809_reset;            break;
1175      case CPUINFO_PTR_EXIT:                     info->exit = m6809_exit;            break;
1176      case CPUINFO_PTR_EXECUTE:                  info->execute = m6809_execute;         break;
1172      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m6809);         break;
1173      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(m6809);   break;
1174      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(m6809);   break;
1175      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m6809);            break;
1176      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m6809);            break;
1177      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(m6809);            break;
1178      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m6809);         break;
11771179      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1178      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m6809_dasm;         break;
1180      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m6809);         break;
11791181      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m6809_ICount;         break;
11801182
11811183      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
12141216 * CPU-specific set_info
12151217 **************************************************************************/
12161218
1217void m6809e_get_info(UINT32 state, cpuinfo *info)
1219CPU_GET_INFO( m6809e )
12181220{
12191221   switch (state)
12201222   {
r3535r3536
12251227      /* --- the following bits of info are returned as NULL-terminated strings --- */
12261228      case CPUINFO_STR_NAME:                     strcpy(info->s, "M6809E");            break;
12271229
1228      default:                              m6809_get_info(state, info);         break;
1230      default:                              CPU_GET_INFO_CALL(m6809);            break;
12291231   }
12301232}
src/emu/cpu/m6809/m6809.h
r3535r3536
1616#define M6809_IRQ_LINE   0   /* IRQ line number */
1717#define M6809_FIRQ_LINE 1   /* FIRQ line number */
1818
19void m6809_get_info(UINT32 state, cpuinfo *info);
20void m6809e_get_info(UINT32 state, cpuinfo *info);
19CPU_GET_INFO( m6809 );
20CPU_GET_INFO( m6809e );
2121
2222/****************************************************************************/
2323/* Read a byte from given memory location                                   */
src/emu/cpu/m6809/6809dasm.c
r3535r3536
362362   "A", "B", "CC", "DP", "inv", "inv", "inv", "inv"
363363};
364364
365offs_t m6809_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
365CPU_DISASSEMBLE( m6809 )
366366{
367367   UINT8 opcode, mode, pb, pbm, reg;
368368   const UINT8 *operandarray;
src/emu/cpu/h83002/h8disasm.c
r3535r3536
2020static const char *const reg_names16[16]   =   {"R0", "R1", "R2", "R3", "R4", "R5", "R6", "R7", "E0", "E1", "E2", "E3", "E4", "E5", "E6", "E7"};
2121static const char *const reg_names8[16]      =   {"R0H", "R1H", "R2H", "R3H", "R4H", "R5H", "R6H", "R7H","R0L", "R1L", "R2L", "R3L", "R4L", "R5L", "R6L", "R7L"};
2222
23static UINT32 h8disasm_0(UINT32 address, UINT32 opcode, char *output, const UINT8 *oprom);
24static UINT32 h8disasm_1(UINT32 address, UINT32 opcode, char *output, const UINT8 *oprom);
25static UINT32 h8disasm_5(UINT32 address, UINT32 opcode, char *output, const UINT8 *oprom);
26static UINT32 h8disasm_6(UINT32 address, UINT32 opcode, char *output, const UINT8 *oprom);
27static UINT32 h8disasm_7(UINT32 address, UINT32 opcode, char *output, const UINT8 *oprom);
23static UINT32 h8disasm_0(UINT32 pc, UINT32 opcode, char *buffer, const UINT8 *oprom);
24static UINT32 h8disasm_1(UINT32 pc, UINT32 opcode, char *buffer, const UINT8 *oprom);
25static UINT32 h8disasm_5(UINT32 pc, UINT32 opcode, char *buffer, const UINT8 *oprom);
26static UINT32 h8disasm_6(UINT32 pc, UINT32 opcode, char *buffer, const UINT8 *oprom);
27static UINT32 h8disasm_7(UINT32 pc, UINT32 opcode, char *buffer, const UINT8 *oprom);
2828
2929#define h8_mem_read16(x) ((oprom[x] << 8) | oprom[(x) + 1])
3030#define h8_mem_read32(x) ((oprom[x] << 24) | (oprom[(x) + 1] << 16) | (oprom[(x) + 2] << 8) | oprom[(x) + 3])
3131
32offs_t h8_disasm(char *output, offs_t address, const UINT8 *oprom, const UINT8 *opram)
32CPU_DISASSEMBLE( h8 )
3333{
3434   UINT32 size = 0;
3535   UINT16 opcode;
r3535r3536
3939   switch((opcode>>12) & 0xf)
4040   {
4141   case 0x0:
42      size = h8disasm_0(address, opcode, output, oprom);
42      size = h8disasm_0(pc, opcode, buffer, oprom);
4343      break;
4444   case 0x1:
45      size = h8disasm_1(address, opcode, output, oprom);
45      size = h8disasm_1(pc, opcode, buffer, oprom);
4646      break;
4747      // mov.b @xx:8, Rd (abs)
4848   case 0x2:
49      sprintf(output, "%4.4x mov.b @%8.8x, %s", opcode, 0xffff00 | (opcode & 0xff), reg_names8[(opcode>>8) & 0xf]);
49      sprintf(buffer, "%4.4x mov.b @%8.8x, %s", opcode, 0xffff00 | (opcode & 0xff), reg_names8[(opcode>>8) & 0xf]);
5050      size = 2;
5151      break;
5252      // mov.b Rs, @xx:8 (abs)
5353   case 0x3:
54      sprintf(output, "%4.4x mov.b %s, @%8.8x", opcode, reg_names8[(opcode>>8) & 0xf], 0xfffff00 | (opcode & 0xff));
54      sprintf(buffer, "%4.4x mov.b %s, @%8.8x", opcode, reg_names8[(opcode>>8) & 0xf], 0xfffff00 | (opcode & 0xff));
5555      size = 2;
5656      break;
5757      // bcc @xx:8
5858   case 0x4:
59      address += 2;
60      sprintf(output, "%4.4x %s %8.8x", opcode, branch_instr[(opcode >> 8) & 0xf], address + (INT8)(opcode &0xff));
59      pc += 2;
60      sprintf(buffer, "%4.4x %s %8.8x", opcode, branch_instr[(opcode >> 8) & 0xf], pc + (INT8)(opcode &0xff));
6161      size = 2;
6262      break;
6363      // group 5
6464   case 0x5:
65      size = h8disasm_5(address, opcode, output, oprom);
65      size = h8disasm_5(pc, opcode, buffer, oprom);
6666      break;
6767   case 0x6:
68      size = h8disasm_6(address, opcode, output, oprom);
68      size = h8disasm_6(pc, opcode, buffer, oprom);
6969      break;
7070   case 0x7:
71      size = h8disasm_7(address, opcode, output, oprom);
71      size = h8disasm_7(pc, opcode, buffer, oprom);
7272      break;
7373   case 0x8:
7474      // add.b #xx:8, Rd
75      sprintf(output, "%4.4x add.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
75      sprintf(buffer, "%4.4x add.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
7676      size = 2;
7777      break;
7878   case 0x9:
7979      // addx.b #xx:8, Rd
80      sprintf(output, "%4.4x addx.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
80      sprintf(buffer, "%4.4x addx.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
8181      size = 2;
8282      break;
8383   case 0xa:
8484      // cmp.b #xx:8, Rd
85      sprintf(output, "%4.4x cmp.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
85      sprintf(buffer, "%4.4x cmp.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
8686      size = 2;
8787      break;
8888   case 0xb:
8989      // subx.b #xx:8, Rd
90      sprintf(output, "%4.4x subx.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
90      sprintf(buffer, "%4.4x subx.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
9191      size = 2;
9292      break;
9393   case 0xc:
9494      // or.b #xx:8, Rd
95      sprintf(output, "%4.4x or.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
95      sprintf(buffer, "%4.4x or.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
9696      size = 2;
9797      break;
9898   case 0xd:
9999      // xor.b #xx:8, Rd
100      sprintf(output, "%4.4x xor.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
100      sprintf(buffer, "%4.4x xor.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
101101      size = 2;
102102      break;
103103   case 0xe:
104104      // and.b #xx:8, Rd
105      sprintf(output, "%4.4x and.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
105      sprintf(buffer, "%4.4x and.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
106106      size = 2;
107107      break;
108108      // mov.b #xx:8, Rd
109109   case 0xf:
110      sprintf(output, "%4.4x mov.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
110      sprintf(buffer, "%4.4x mov.b #%2.2x, %s", opcode, opcode & 0xff, reg_names8[(opcode>>8) & 0xf]);
111111      size = 2;
112112      break;
113113   default:
114      sprintf(output, "%4.4x", opcode);
114      sprintf(buffer, "%4.4x", opcode);
115115      size = 2;
116116      break;
117117   }
r3535r3536
119119   return size | DASMFLAG_SUPPORTED;
120120}
121121
122static UINT32 h8disasm_0(UINT32 address, UINT32 opcode, char *output, const UINT8 *oprom)
122static UINT32 h8disasm_0(UINT32 pc, UINT32 opcode, char *buffer, const UINT8 *oprom)
123123{
124124   UINT32 size = 2;
125125   UINT16 data16;
r3535r3536
131131   {
132132      // nop
133133   case 0:
134      sprintf(output, "%4.4x nop", opcode);
134      sprintf(buffer, "%4.4x nop", opcode);
135135      size = 2;
136136      break;
137137   case 0x1:
138138      // 010x  where x should always be 0!
139139      if((opcode & 0xf) != 0)
140140      {
141         sprintf(output, "%4.4x default", opcode);
141         sprintf(buffer, "%4.4x default", opcode);
142142         break;
143143      }
144144      switch((opcode>>4) & 0xf)
r3535r3536
152152            // mov.l @rx, rx
153153            if((data16 & 0x80) == 0x80)
154154            {
155               sprintf(output, "%4.4x mov.l %s, @%s", opcode, reg_names32[data16&7], reg_names32[(data16>>4)&7]);
155               sprintf(buffer, "%4.4x mov.l %s, @%s", opcode, reg_names32[data16&7], reg_names32[(data16>>4)&7]);
156156            }
157157            else
158158            {
159               sprintf(output, "%4.4x mov.l @%s, %s", opcode, reg_names32[(data16>>4)&7], reg_names32[data16&7]);
159               sprintf(buffer, "%4.4x mov.l @%s, %s", opcode, reg_names32[(data16>>4)&7], reg_names32[data16&7]);
160160            }
161161            size = 4;
162162            break;
r3535r3536
177177            }
178178            if((data16 & 0x80) == 0x80)
179179            {
180               sprintf(output, "%4.4x %x mov.l %s, @%x", opcode, data16, reg_names32[data16&7], sdata32);
180               sprintf(buffer, "%4.4x %x mov.l %s, @%x", opcode, data16, reg_names32[data16&7], sdata32);
181181            }
182182            else
183183            {
184               sprintf(output, "%4.4x %x mov.l @%x, %s", opcode, data16, sdata32, reg_names32[data16&7]);
184               sprintf(buffer, "%4.4x %x mov.l @%x, %s", opcode, data16, sdata32, reg_names32[data16&7]);
185185            }
186186            break;
187187         case 0x6d:
188188            // mov.l @(Ers+), rd
189189            if((data16 & 0x80) == 0x80)
190190            {
191               sprintf(output, "%4.4x mov.l %s, @-%s", opcode, reg_names32[data16 & 0x7], reg_names32[(data16>>4)&7]);
191               sprintf(buffer, "%4.4x mov.l %s, @-%s", opcode, reg_names32[data16 & 0x7], reg_names32[(data16>>4)&7]);
192192            }
193193            else
194194            {
195               sprintf(output, "%4.4x mov.l @%s+, %s", opcode, reg_names32[(data16>>4)&7], reg_names32[data16 & 0x7]);
195               sprintf(buffer, "%4.4x mov.l @%s+, %s", opcode, reg_names32[(data16>>4)&7], reg_names32[data16 & 0x7]);
196196            }
197197            size = 4;
198198            break;
r3535r3536
201201            sdata16=h8_mem_read16(4);
202202            if((data16 & 0x80) == 0x80)
203203            {
204               sprintf(output, "%4.4x mov.l %s,@(%x, %s)", opcode, reg_names32[data16 &0x7], sdata16, reg_names32[(data16>>4)&7]);
204               sprintf(buffer, "%4.4x mov.l %s,@(%x, %s)", opcode, reg_names32[data16 &0x7], sdata16, reg_names32[(data16>>4)&7]);
205205            }
206206            else
207207            {
208               sprintf(output, "%4.4x mov.l @(%x, %s), %s", opcode, sdata16, reg_names32[(data16>>4)&7], reg_names32[data16 &0x7]);
208               sprintf(buffer, "%4.4x mov.l @(%x, %s), %s", opcode, sdata16, reg_names32[(data16>>4)&7], reg_names32[data16 &0x7]);
209209            }
210210            size = 6;
211211            break;
r3535r3536
216216            sdata32 = h8_mem_read32(6) & 0xffffff;
217217            if ( (data16 & 0x80) && ((ext16 & ~7) == 0x6ba0) )
218218            {
219               sprintf(output, "%4.4x mov.l %s,@(%x, %s)", opcode, reg_names32[ext16&7], sdata32, reg_names32[(data16>>4)&7]);
219               sprintf(buffer, "%4.4x mov.l %s,@(%x, %s)", opcode, reg_names32[ext16&7], sdata32, reg_names32[(data16>>4)&7]);
220220            }
221221            else if ( (!(data16 & 0x80)) && ((ext16 & ~7) == 0x6b20) )
222222            {
223               sprintf(output, "%4.4x mov.l @(%x, %s), %s", opcode, sdata32, reg_names32[(data16>>4)&7], reg_names32[ext16&7]);
223               sprintf(buffer, "%4.4x mov.l @(%x, %s), %s", opcode, sdata32, reg_names32[(data16>>4)&7], reg_names32[ext16&7]);
224224            }
225225            else
226226            {
227               sprintf(output, "%4.4x ? %x", opcode, data16);
227               sprintf(buffer, "%4.4x ? %x", opcode, data16);
228228            }
229229            break;
230230
231231         default:
232            sprintf(output, "%4.4x ? %x", opcode, data16);
232            sprintf(buffer, "%4.4x ? %x", opcode, data16);
233233            break;
234234         }
235235         break;
r3535r3536
238238         break;
239239         // sleep
240240      case 0x8:
241         sprintf(output, "%4.4x sleep", opcode);
241         sprintf(buffer, "%4.4x sleep", opcode);
242242         size = 2;
243243         break;
244244         // mulxs
r3535r3536
255255         switch((data16>>8)&0xff)
256256         {
257257         case 0x64:   // or.l ERs, ERd
258            sprintf(output, "%4.4x or.l %s, %s", opcode, reg_names32[(data16>>4) & 0x7], reg_names32[data16 & 0x7]);
258            sprintf(buffer, "%4.4x or.l %s, %s", opcode, reg_names32[(data16>>4) & 0x7], reg_names32[data16 & 0x7]);
259259            break;
260260         case 0x65:   // xor.l ERs, ERd
261            sprintf(output, "%4.4x xor.l %s, %s", opcode, reg_names32[(data16>>4) & 0x7], reg_names32[data16 & 0x7]);
261            sprintf(buffer, "%4.4x xor.l %s, %s", opcode, reg_names32[(data16>>4) & 0x7], reg_names32[data16 & 0x7]);
262262            break;
263263         case 0x66:   // and.l ERs, ERd
264            sprintf(output, "%4.4x and.l %s, %s", opcode, reg_names32[(data16>>4) & 0x7], reg_names32[data16 & 0x7]);
264            sprintf(buffer, "%4.4x and.l %s, %s", opcode, reg_names32[(data16>>4) & 0x7], reg_names32[data16 & 0x7]);
265265            break;
266266         default:
267            sprintf(output, "%4.4x default", opcode);
267            sprintf(buffer, "%4.4x default", opcode);
268268            break;
269269         }
270270         break;
271271      default:
272         sprintf(output, "%4.4x default", opcode);
272         sprintf(buffer, "%4.4x default", opcode);
273273         break;
274274      }
275275      break;
r3535r3536
277277   case 0x2:
278278      if(((opcode>>4) & 0xf) == 0)
279279      {
280         sprintf(output, "%4.4x stc ccr, %s", opcode, reg_names8[opcode & 0xf]);
280         sprintf(buffer, "%4.4x stc ccr, %s", opcode, reg_names8[opcode & 0xf]);
281281      }
282282      else
283283      {
284         sprintf(output, "%4.4x default", opcode);
284         sprintf(buffer, "%4.4x default", opcode);
285285      }
286286      size = 2;
287287      break;
r3535r3536
289289   case 0x3:
290290      if(((opcode>>4) & 0xf) == 0)
291291      {
292         sprintf(output, "%4.4x ldc %s, ccr", opcode, reg_names8[opcode & 0xf]);
292         sprintf(buffer, "%4.4x ldc %s, ccr", opcode, reg_names8[opcode & 0xf]);
293293      }
294294      else
295295      {
296         sprintf(output, "%4.4x default", opcode);
296         sprintf(buffer, "%4.4x default", opcode);
297297      }
298298      size = 2;
299299      break;
300300      // orc
301301   case 0x4:
302      sprintf(output, "%4.4x orc #%2.2x, ccr", opcode, opcode & 0xff);
302      sprintf(buffer, "%4.4x orc #%2.2x, ccr", opcode, opcode & 0xff);
303303      size = 2;
304304      break;
305305      // xorc
306306   case 0x5:
307      sprintf(output, "%4.4x xorc #%2.2x, ccr", opcode, opcode & 0xff);
307      sprintf(buffer, "%4.4x xorc #%2.2x, ccr", opcode, opcode & 0xff);
308308      size = 2;
309309      break;
310310      // andc
311311   case 0x6:
312      sprintf(output, "%4.4x andc #%2.2x, ccr", opcode, opcode & 0xff);
312      sprintf(buffer, "%4.4x andc #%2.2x, ccr", opcode, opcode & 0xff);
313313      size = 2;
314314      break;
315315      // ldc
316316   case 0x7:
317      sprintf(output, "%4.4x ldc #%2.2x, ccr", opcode, opcode & 0xff);
317      sprintf(buffer, "%4.4x ldc #%2.2x, ccr", opcode, opcode & 0xff);
318318      size = 2;
319319      break;
320320      // add.b rx, ry
321321   case 0x8:
322      sprintf(output, "%4.4x add.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
322      sprintf(buffer, "%4.4x add.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
323323      size = 2;
324324      break;
325325      // add.w rx, ry
326326   case 0x9:
327      sprintf(output, "%4.4x add.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
327      sprintf(buffer, "%4.4x add.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
328328      size = 2;
329329      break;
330330      // inc.b rx
r3535r3536
333333      {
334334         if(opcode & 0x8)
335335         {
336            sprintf(output, "%4.4x illegal", opcode);
336            sprintf(buffer, "%4.4x illegal", opcode);
337337         }
338338         else
339339         {
340            sprintf(output, "%4.4x add.l %s, %s", opcode, reg_names32[(opcode>>4) & 7], reg_names32[opcode & 7]);
340            sprintf(buffer, "%4.4x add.l %s, %s", opcode, reg_names32[(opcode>>4) & 7], reg_names32[opcode & 7]);
341341         }
342342      }
343343      else
344344      {
345345         if(opcode & 0xf0)
346346         {
347            sprintf(output, "%4.4x illegal", opcode);
347            sprintf(buffer, "%4.4x illegal", opcode);
348348         }
349349         else
350350         {
351            sprintf(output, "%4.4x inc.b %s", opcode, reg_names8[(opcode & 0xf)]);
351            sprintf(buffer, "%4.4x inc.b %s", opcode, reg_names8[(opcode & 0xf)]);
352352         }
353353      }
354354      size = 2;
r3535r3536
358358      switch((opcode>>4)& 0xf)
359359      {
360360      case 0:
361         sprintf(output, "%4.4x adds.l #1, %s", opcode, reg_names32[opcode & 0x7]);
361         sprintf(buffer, "%4.4x adds.l #1, %s", opcode, reg_names32[opcode & 0x7]);
362362         break;
363363      case 5:
364         sprintf(output, "%4.4x inc.w #1, %s", opcode, reg_names16[opcode & 0xf]);
364         sprintf(buffer, "%4.4x inc.w #1, %s", opcode, reg_names16[opcode & 0xf]);
365365         break;
366366      case 7:
367         sprintf(output, "%4.4x inc.l #1, %s", opcode, reg_names32[opcode & 0x7]);
367         sprintf(buffer, "%4.4x inc.l #1, %s", opcode, reg_names32[opcode & 0x7]);
368368         break;
369369      case 8:
370         sprintf(output, "%4.4x adds.l #2, %s", opcode, reg_names32[opcode & 0x7]);
370         sprintf(buffer, "%4.4x adds.l #2, %s", opcode, reg_names32[opcode & 0x7]);
371371         break;
372372      case 9:
373         sprintf(output, "%4.4x adds.l #4, %s", opcode, reg_names32[opcode & 0x7]);
373         sprintf(buffer, "%4.4x adds.l #4, %s", opcode, reg_names32[opcode & 0x7]);
374374         break;
375375      case 0xd:
376         sprintf(output, "%4.4x inc.w #2, %s", opcode, reg_names16[opcode & 0xf]);
376         sprintf(buffer, "%4.4x inc.w #2, %s", opcode, reg_names16[opcode & 0xf]);
377377         break;
378378      case 0xf:
379         sprintf(output, "%4.4x inc.l #2, %s", opcode, reg_names32[opcode & 0x7]);
379         sprintf(buffer, "%4.4x inc.l #2, %s", opcode, reg_names32[opcode & 0x7]);
380380         break;
381381      default:
382         sprintf(output, "%4.4x illegal", opcode);
382         sprintf(buffer, "%4.4x illegal", opcode);
383383         break;
384384      }
385385      size = 2;
386386      break;
387387      // mov.b rx, ry
388388   case 0xc:
389      sprintf(output, "%4.4x mov.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
389      sprintf(buffer, "%4.4x mov.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
390390      size = 2;
391391      break;
392392      // mov.w rx, ry
393393   case 0xd:
394      sprintf(output, "%4.4x mov.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
394      sprintf(buffer, "%4.4x mov.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
395395      size = 2;
396396      break;
397397      // addx.b rx, ry
398398   case 0xe:
399      sprintf(output, "%4.4x addx.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
399      sprintf(buffer, "%4.4x addx.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
400400      size = 2;
401401      break;
402402   case 0xf:
r3535r3536
404404      {
405405         if(opcode & 8)
406406         {
407            sprintf(output, "%4.4x illegal", opcode);
407            sprintf(buffer, "%4.4x illegal", opcode);
408408         }
409409         else
410410         {
411            sprintf(output, "%4.4x mov.l %s, %s", opcode, reg_names32[(opcode>>4) & 0x7], reg_names32[opcode & 0x7]);
411            sprintf(buffer, "%4.4x mov.l %s, %s", opcode, reg_names32[(opcode>>4) & 0x7], reg_names32[opcode & 0x7]);
412412         }
413413      }
414414      else
415415      {
416416         if((opcode & 0xf0) !=0)
417417         {
418            sprintf(output, "%4.4x illegal", opcode);
418            sprintf(buffer, "%4.4x illegal", opcode);
419419         }
420420         else
421421         {
422            sprintf(output, "%4.4x daa.b %s", opcode, reg_names8[opcode & 0xf]);
422            sprintf(buffer, "%4.4x daa.b %s", opcode, reg_names8[opcode & 0xf]);
423423         }
424424      }
425425      size = 2;
426426      break;
427427   default:
428      sprintf(output, "%4.4x default", opcode);
428      sprintf(buffer, "%4.4x default", opcode);
429429      break;
430430   }
431431   return size;
432432}
433433
434static UINT32 h8disasm_1(UINT32 address, UINT32 opcode, char *output, const UINT8 *oprom)
434static UINT32 h8disasm_1(UINT32 pc, UINT32 opcode, char *buffer, const UINT8 *oprom)
435435{
436436   UINT32 size = 2; //, mode8;
437437   switch((opcode>>8)&0xf)
r3535r3536
441441      {
442442         // shll.b Rx
443443      case 0x0:
444         sprintf(output, "%4.4x shll.b %s", opcode, reg_names8[opcode & 0xf]);
444         sprintf(buffer, "%4.4x shll.b %s", opcode, reg_names8[opcode & 0xf]);
445445         size = 2;
446446         break;
447447         // shll.w Rx
448448      case 0x1:
449         sprintf(output, "%4.4x shll.w %s", opcode, reg_names16[opcode & 0xf]);
449         sprintf(buffer, "%4.4x shll.w %s", opcode, reg_names16[opcode & 0xf]);
450450         size = 2;
451451         break;
452452         // shll.l Rx
453453      case 0x3:
454         sprintf(output, "%4.4x shll.l %s", opcode, reg_names32[opcode & 7]);
454         sprintf(buffer, "%4.4x shll.l %s", opcode, reg_names32[opcode & 7]);
455455         size = 2;
456456         break;
457457         // shal.b Rx
458458      case 0x8:
459         sprintf(output, "%4.4x shal.b %s", opcode, reg_names8[opcode & 0xf]);
459         sprintf(buffer, "%4.4x shal.b %s", opcode, reg_names8[opcode & 0xf]);
460460         size = 2;
461461         break;
462462         // shal.w Rx
463463      case 0x9:
464         sprintf(output, "%4.4x shal.w %s", opcode, reg_names16[opcode & 0xf]);
464         sprintf(buffer, "%4.4x shal.w %s", opcode, reg_names16[opcode & 0xf]);
465465         size = 2;
466466         break;
467467         // shal.l Rx
468468      case 0xb:
469         sprintf(output, "%4.4x shal.l %s", opcode, reg_names32[opcode & 7]);
469         sprintf(buffer, "%4.4x shal.l %s", opcode, reg_names32[opcode & 7]);
470470         size = 2;
471471         break;
472472      default:
473         sprintf(output, "%4.4x default", opcode);
473         sprintf(buffer, "%4.4x default", opcode);
474474         size = 2;
475475         break;
476476      }
r3535r3536
481481      {
482482         // shlr.b rx
483483      case 0x0:
484         sprintf(output, "%4.4x shlr.b %s", opcode, reg_names8[opcode & 0xf]);
484         sprintf(buffer, "%4.4x shlr.b %s", opcode, reg_names8[opcode & 0xf]);
485485         size = 2;
486486         break;
487487         // shlr.w rx
488488      case 0x1:
489         sprintf(output, "%4.4x shlr.w %s", opcode, reg_names16[opcode & 0xf]);
489         sprintf(buffer, "%4.4x shlr.w %s", opcode, reg_names16[opcode & 0xf]);
490490         size = 2;
491491         break;
492492         // shlr.l rx
493493      case 0x3:
494         sprintf(output, "%4.4x shlr.l %s", opcode, reg_names32[opcode & 7]);
494         sprintf(buffer, "%4.4x shlr.l %s", opcode, reg_names32[opcode & 7]);
495495         size = 2;
496496         break;
497497         // shar.b rx
498498      case 0x8:
499         sprintf(output, "%4.4x shar.b %s", opcode, reg_names8[opcode & 0xf]);
499         sprintf(buffer, "%4.4x shar.b %s", opcode, reg_names8[opcode & 0xf]);
500500         size = 2;
501501         break;
502502         // shar.w rx
503503      case 0x9:
504         sprintf(output, "%4.4x shar.w %s", opcode, reg_names16[opcode & 0xf]);
504         sprintf(buffer, "%4.4x shar.w %s", opcode, reg_names16[opcode & 0xf]);
505505         size = 2;
506506         break;
507507         // shar.l rx
508508      case 0xb:
509         sprintf(output, "%4.4x shar.l %s", opcode, reg_names32[opcode & 7]);
509         sprintf(buffer, "%4.4x shar.l %s", opcode, reg_names32[opcode & 7]);
510510         size = 2;
511511         break;
512512      default:
513         sprintf(output, "%4.4x illegal ", opcode);
513         sprintf(buffer, "%4.4x illegal ", opcode);
514514         size = 2;
515515         break;
516516      }
r3535r3536
520520      {
521521         // rotxl.b Rx
522522      case 0x0:
523         sprintf(output, "%4.4x rotxl.b %s", opcode, reg_names8[opcode & 0xf]);
523         sprintf(buffer, "%4.4x rotxl.b %s", opcode, reg_names8[opcode & 0xf]);
524524         size = 2;
525525         break;
526526         // rotxl.w Rx
527527      case 0x1:
528         sprintf(output, "%4.4x rotxl.w %s", opcode, reg_names16[opcode & 0xf]);
528         sprintf(buffer, "%4.4x rotxl.w %s", opcode, reg_names16[opcode & 0xf]);
529529         size = 2;
530530         break;
531531         // rotxl.l Rx
532532      case 0x3:
533         sprintf(output, "%4.4x rotxl.l %s", opcode, reg_names32[opcode & 7]);
533         sprintf(buffer, "%4.4x rotxl.l %s", opcode, reg_names32[opcode & 7]);
534534         size = 2;
535535         break;
536536         // rotl.b Rx
537537      case 0x8:
538         sprintf(output, "%4.4x rotl.b %s", opcode, reg_names8[opcode & 0xf]);
538         sprintf(buffer, "%4.4x rotl.b %s", opcode, reg_names8[opcode & 0xf]);
539539         size = 2;
540540         break;
541541         // rotl.w Rx
542542      case 0x9:
543         sprintf(output, "%4.4x rotl.w %s", opcode, reg_names16[opcode & 0xf]);
543         sprintf(buffer, "%4.4x rotl.w %s", opcode, reg_names16[opcode & 0xf]);
544544         size = 2;
545545         break;
546546         // rotl.l Rx
547547      case 0xb:
548         sprintf(output, "%4.4x rotl.l %s", opcode, reg_names32[opcode & 7]);
548         sprintf(buffer, "%4.4x rotl.l %s", opcode, reg_names32[opcode & 7]);
549549         size = 2;
550550         break;
551551      default:
552         sprintf(output, "%4.4x  ? ", opcode);
552         sprintf(buffer, "%4.4x  ? ", opcode);
553553         size = 2;
554554         break;
555555      }
r3535r3536
559559      {
560560         // rotxr.b Rx
561561      case 0x0:
562         sprintf(output, "%4.4x rotxr.b %s", opcode, reg_names8[opcode & 0xf]);
562         sprintf(buffer, "%4.4x rotxr.b %s", opcode, reg_names8[opcode & 0xf]);
563563         size = 2;
564564         break;
565565         // rotxr.w Rx
566566      case 0x1:
567         sprintf(output, "%4.4x rotxr.w %s", opcode, reg_names16[opcode & 0xf]);
567         sprintf(buffer, "%4.4x rotxr.w %s", opcode, reg_names16[opcode & 0xf]);
568568         size = 2;
569569         break;
570570         // rotxr.l Rx
571571      case 0x3:
572         sprintf(output, "%4.4x rotxr.l %s", opcode, reg_names32[opcode & 7]);
572         sprintf(buffer, "%4.4x rotxr.l %s", opcode, reg_names32[opcode & 7]);
573573         size = 2;
574574         break;
575575         // rotr.b Rx
576576      case 0x8:
577         sprintf(output, "%4.4x rotr.b %s", opcode, reg_names8[opcode & 0xf]);
577         sprintf(buffer, "%4.4x rotr.b %s", opcode, reg_names8[opcode & 0xf]);
578578         size = 2;
579579         break;
580580         // rotr.w Rx
581581      case 0x9:
582         sprintf(output, "%4.4x rotr.w %s", opcode, reg_names16[opcode & 0xf]);
582         sprintf(buffer, "%4.4x rotr.w %s", opcode, reg_names16[opcode & 0xf]);
583583         size = 2;
584584         break;
585585         // rotr.l Rx
586586      case 0xb:
587         sprintf(output, "%4.4x rotr.l %s", opcode, reg_names32[opcode & 7]);
587         sprintf(buffer, "%4.4x rotr.l %s", opcode, reg_names32[opcode & 7]);
588588         size = 2;
589589         break;
590590      default:
591         sprintf(output, "%4.4x  ? ", opcode);
591         sprintf(buffer, "%4.4x  ? ", opcode);
592592         size = 2;
593593         break;
594594      }
595595      break;
596596      // or.b rs, rd
597597   case 0x4:
598      sprintf(output, "%4.4x or.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
598      sprintf(buffer, "%4.4x or.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
599599      size = 2;
600600      break;
601601      // xor.b rs, rd
602602   case 0x5:
603      sprintf(output, "%4.4x xor.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
603      sprintf(buffer, "%4.4x xor.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
604604      size = 2;
605605      break;
606606      // and.b rs, rd
607607   case 0x6:
608      sprintf(output, "%4.4x and.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
608      sprintf(buffer, "%4.4x and.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
609609      size = 2;
610610      break;
611611      // not
r3535r3536
614614      {
615615         // not.b Rx
616616      case 0x0:
617         sprintf(output, "%4.4x not.b %s", opcode, reg_names8[opcode & 0xf]);
617         sprintf(buffer, "%4.4x not.b %s", opcode, reg_names8[opcode & 0xf]);
618618         size = 2;
619619         break;
620620         // not.w Rx
621621      case 0x1:
622         sprintf(output, "%4.4x not.w %s", opcode, reg_names16[opcode & 0xf]);
622         sprintf(buffer, "%4.4x not.w %s", opcode, reg_names16[opcode & 0xf]);
623623         size = 2;
624624         break;
625625         // not.l Rx
626626      case 0x3:
627         sprintf(output, "%4.4x not.l %s", opcode, reg_names32[opcode & 7]);
627         sprintf(buffer, "%4.4x not.l %s", opcode, reg_names32[opcode & 7]);
628628         size = 2;
629629         break;
630630         // extu.b Rx
631631      case 0x4:
632         sprintf(output, "%4.4x extu.b %s", opcode, reg_names8[opcode & 0xf]);
632         sprintf(buffer, "%4.4x extu.b %s", opcode, reg_names8[opcode & 0xf]);
633633         size = 2;
634634         break;
635635         // extu.w Rx
636636      case 0x5:
637         sprintf(output, "%4.4x extu.w %s", opcode, reg_names16[opcode & 0xf]);
637         sprintf(buffer, "%4.4x extu.w %s", opcode, reg_names16[opcode & 0xf]);
638638         size = 2;
639639         break;
640640         // extu.l Rx
641641      case 0x7:
642         sprintf(output, "%4.4x extu.l %s", opcode, reg_names32[opcode & 7]);
642         sprintf(buffer, "%4.4x extu.l %s", opcode, reg_names32[opcode & 7]);
643643         size = 2;
644644         break;
645645         // neg.b Rx
646646      case 0x8:
647         sprintf(output, "%4.4x neg.b %s", opcode, reg_names8[opcode & 0xf]);
647         sprintf(buffer, "%4.4x neg.b %s", opcode, reg_names8[opcode & 0xf]);
648648         size = 2;
649649         break;
650650         // neg.w Rx
651651      case 0x9:
652         sprintf(output, "%4.4x neg.w %s", opcode, reg_names16[opcode & 0xf]);
652         sprintf(buffer, "%4.4x neg.w %s", opcode, reg_names16[opcode & 0xf]);
653653         size = 2;
654654         break;
655655         // neg.l Rx
656656      case 0xb:
657         sprintf(output, "%4.4x neg.l %s", opcode, reg_names32[opcode & 7]);
657         sprintf(buffer, "%4.4x neg.l %s", opcode, reg_names32[opcode & 7]);
658658         size = 2;
659659         break;
660660         // exts.b Rx
661661      case 0xc:
662         sprintf(output, "%4.4x exts.b %s", opcode, reg_names8[opcode & 0xf]);
662         sprintf(buffer, "%4.4x exts.b %s", opcode, reg_names8[opcode & 0xf]);
663663         size = 2;
664664         break;
665665         // exts.w Rx
666666      case 0xd:
667         sprintf(output, "%4.4x exts.w %s", opcode, reg_names16[opcode & 0xf]);
667         sprintf(buffer, "%4.4x exts.w %s", opcode, reg_names16[opcode & 0xf]);
668668         size = 2;
669669         break;
670670         // exts.l Rx
671671      case 0xf:
672         sprintf(output, "%4.4x exts.l %s", opcode, reg_names32[opcode & 7]);
672         sprintf(buffer, "%4.4x exts.l %s", opcode, reg_names32[opcode & 7]);
673673         size = 2;
674674         break;
675675      default:
676         sprintf(output, "%4.4x  default ", opcode);
676         sprintf(buffer, "%4.4x  default ", opcode);
677677         size = 2;
678678         break;
679679      }
680680      break;
681681      // sub.b rs, rd
682682   case 0x8:
683      sprintf(output, "%4.4x sub.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
683      sprintf(buffer, "%4.4x sub.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
684684      size = 2;
685685      break;
686686      // sub.w rs, rd
687687   case 0x9:
688      sprintf(output, "%4.4x sub.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
688      sprintf(buffer, "%4.4x sub.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
689689      size = 2;
690690      break;
691691      // sub.b rx
r3535r3536
694694      {
695695         if(opcode & 0x8)
696696         {
697            sprintf(output, "%4.4x illegal", opcode);
697            sprintf(buffer, "%4.4x illegal", opcode);
698698         }
699699         else
700700         {
701            sprintf(output, "%4.4x sub.l %s, %s", opcode, reg_names32[(opcode>>4) & 7], reg_names32[opcode & 7]);
701            sprintf(buffer, "%4.4x sub.l %s, %s", opcode, reg_names32[(opcode>>4) & 7], reg_names32[opcode & 7]);
702702         }
703703      }
704704      else
705705      {
706706         if(opcode & 0xf0)
707707         {
708            sprintf(output, "%4.4x illegal", opcode);
708            sprintf(buffer, "%4.4x illegal", opcode);
709709         }
710710         else
711711         {
712            sprintf(output, "%4.4x dec.b %s", opcode, reg_names8[(opcode & 0xf)]);
712            sprintf(buffer, "%4.4x dec.b %s", opcode, reg_names8[(opcode & 0xf)]);
713713         }
714714      }
715715      size = 2;
r3535r3536
719719      switch((opcode>>4)& 0xf)
720720      {
721721      case 0:
722         sprintf(output, "%4.4x subs.l #1, %s", opcode, reg_names32[opcode & 0x7]);
722         sprintf(buffer, "%4.4x subs.l #1, %s", opcode, reg_names32[opcode & 0x7]);
723723         break;
724724      case 5:
725         sprintf(output, "%4.4x dec.w #1, %s", opcode, reg_names16[opcode & 0xf]);
725         sprintf(buffer, "%4.4x dec.w #1, %s", opcode, reg_names16[opcode & 0xf]);
726726         break;
727727      case 7:
728         sprintf(output, "%4.4x dec.l #1, %s", opcode, reg_names32[opcode & 0x7]);
728         sprintf(buffer, "%4.4x dec.l #1, %s", opcode, reg_names32[opcode & 0x7]);
729729         break;
730730      case 8:
731         sprintf(output, "%4.4x subs.l #2, %s", opcode, reg_names32[opcode & 0x7]);
731         sprintf(buffer, "%4.4x subs.l #2, %s", opcode, reg_names32[opcode & 0x7]);
732732         break;
733733      case 9:
734         sprintf(output, "%4.4x subs.l #4, %s", opcode, reg_names32[opcode & 0x7]);
734         sprintf(buffer, "%4.4x subs.l #4, %s", opcode, reg_names32[opcode & 0x7]);
735735         break;
736736      case 0xd:
737         sprintf(output, "%4.4x dec.w #2, %s", opcode, reg_names16[opcode & 0xf]);
737         sprintf(buffer, "%4.4x dec.w #2, %s", opcode, reg_names16[opcode & 0xf]);
738738         break;
739739      case 0xf:
740         sprintf(output, "%4.4x dec.l #2, %s", opcode, reg_names32[opcode & 0x7]);
740         sprintf(buffer, "%4.4x dec.l #2, %s", opcode, reg_names32[opcode & 0x7]);
741741         break;
742742      default:
743         sprintf(output, "%4.4x ?", opcode);
743         sprintf(buffer, "%4.4x ?", opcode);
744744         break;
745745      }
746746      size = 2;
747747      break;
748748      // cmp.b rs, rd
749749   case 0xc:
750      sprintf(output, "%4.4x cmp.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
750      sprintf(buffer, "%4.4x cmp.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
751751      size = 2;
752752      break;
753753      // cmp.w rx, ry
754754   case 0xd:
755      sprintf(output, "%4.4x cmp.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
755      sprintf(buffer, "%4.4x cmp.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
756756      size = 2;
757757      break;
758758      // subx.b rx, ry
759759   case 0xe:
760      sprintf(output, "%4.4x subx.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
760      sprintf(buffer, "%4.4x subx.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
761761      size = 2;
762762      break;
763763   case 0xf:
r3535r3536
765765      {
766766         if(opcode & 8)
767767         {
768            sprintf(output, "%4.4x illegal", opcode);
768            sprintf(buffer, "%4.4x illegal", opcode);
769769         }
770770         else
771771         {
772            sprintf(output, "%4.4x cmp.l %s, %s", opcode, reg_names32[(opcode>>4) & 0x7], reg_names32[opcode & 0x7]);
772            sprintf(buffer, "%4.4x cmp.l %s, %s", opcode, reg_names32[(opcode>>4) & 0x7], reg_names32[opcode & 0x7]);
773773         }
774774      }
775775      else
776776      {
777777         if((opcode & 0xf0) !=0)
778778         {
779            sprintf(output, "%4.4x illegal", opcode);
779            sprintf(buffer, "%4.4x illegal", opcode);
780780         }
781781         else
782782         {
783            sprintf(output, "%4.4x das.b %s", opcode, reg_names8[opcode & 0xf]);
783            sprintf(buffer, "%4.4x das.b %s", opcode, reg_names8[opcode & 0xf]);
784784         }
785785      }
786786      size = 2;
787787      break;
788788   default:
789      sprintf(output, "%4.4x default", opcode);
789      sprintf(buffer, "%4.4x default", opcode);
790790      break;
791791   }
792792
793793   return size;
794794}
795795
796static UINT32 h8disasm_5(UINT32 address, UINT32 opcode, char *output, const UINT8 *oprom)
796static UINT32 h8disasm_5(UINT32 pc, UINT32 opcode, char *buffer, const UINT8 *oprom)
797797{
798798   UINT32 size = 2;
799799   UINT32 data32;
r3535r3536
803803   {
804804      // mulxu.b
805805   case 0x0:
806      sprintf(output, "%4.4x mulxu.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
806      sprintf(buffer, "%4.4x mulxu.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
807807      size = 2;
808808      break;
809809      // divxu.b
810810   case 0x1:
811      sprintf(output, "%4.4x divxu.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
811      sprintf(buffer, "%4.4x divxu.b %s, %s", opcode, reg_names8[(opcode>>4) & 0xf], reg_names8[opcode & 0xf]);
812812      size = 2;
813813      break;
814814      // mulxu.w
815815   case 0x2:
816      sprintf(output, "%4.4x mulxu.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names32[opcode & 7]);
816      sprintf(buffer, "%4.4x mulxu.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names32[opcode & 7]);
817817      size = 2;
818818      break;
819819      // divxu.w
820820   case 0x3:
821      sprintf(output, "%4.4x divxu.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names32[opcode & 7]);
821      sprintf(buffer, "%4.4x divxu.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names32[opcode & 7]);
822822      size = 2;
823823      break;
824824      // rts
825825   case 0x4:
826826      if(opcode == 0x5470)
827827      {
828         sprintf(output, "%4.4x rts", opcode);
828         sprintf(buffer, "%4.4x rts", opcode);
829829      }
830830      else
831831      {
832         sprintf(output, "%4.4x default", opcode);
832         sprintf(buffer, "%4.4x default", opcode);
833833      }
834834         size = 2 | DASMFLAG_STEP_OUT;
835835      break;
836836      // bsr 8
837837   case 0x5:
838      sprintf(output, "%4.4x bsr %x", opcode, address+2 + ((INT8)opcode& 0xff));
838      sprintf(buffer, "%4.4x bsr %x", opcode, pc+2 + ((INT8)opcode& 0xff));
839839      size = 2 | DASMFLAG_STEP_OVER;
840840      break;
841841      // rte
842842   case 0x6:
843843      if(opcode == 0x5670)
844844      {
845         sprintf(output, "%4.4x rte", opcode);
845         sprintf(buffer, "%4.4x rte", opcode);
846846      }
847847      else
848848      {
849         sprintf(output, "%4.4x default", opcode);
849         sprintf(buffer, "%4.4x default", opcode);
850850      }
851851      size = 2 | DASMFLAG_STEP_OUT;
852852      break;
r3535r3536
854854   case 0x7:
855855      if(opcode & 0xcf)
856856      {
857         sprintf(output, "%4.4x illegal", opcode);
857         sprintf(buffer, "%4.4x illegal", opcode);
858858      }
859859      else
860860      {
861         sprintf(output, "%4.4x trapa #%x", opcode, (opcode >> 4) & 3);
861         sprintf(buffer, "%4.4x trapa #%x", opcode, (opcode >> 4) & 3);
862862      }
863863      size = 2 | DASMFLAG_STEP_OVER;
864864      break;
r3535r3536
866866   case 0x8:
867867      if(opcode & 0xf)
868868      {
869         sprintf(output, "%4.4x illegal", opcode);
869         sprintf(buffer, "%4.4x illegal", opcode);
870870         size = 2;
871871      }
872872      else
873873      {
874874         data16 = h8_mem_read16(2);
875         address += 4;
876         sprintf(output, "%4.4x %s %8.8x", opcode, branch_instr[(opcode >> 4) & 0xf], address + (INT16)(data16));
875         pc += 4;
876         sprintf(buffer, "%4.4x %s %8.8x", opcode, branch_instr[(opcode >> 4) & 0xf], pc + (INT16)(data16));
877877         size = 4;
878878      }
879879      break;
880880      // jmp @erd
881881   case 0x9:
882      sprintf(output, "%4.4x jmp @%s", opcode, reg_names32[(opcode>>4) &7]);
882      sprintf(buffer, "%4.4x jmp @%s", opcode, reg_names32[(opcode>>4) &7]);
883883      size = 2;
884884      break;
885885      // jmp @aa:24
886886   case 0xa:
887887      data32=h8_mem_read32(0);
888      sprintf(output, "%4.4x jmp %8.8x", opcode, (data32& 0xffffff));
888      sprintf(buffer, "%4.4x jmp %8.8x", opcode, (data32& 0xffffff));
889889      size = 4;
890890      break;
891891      // jmp @aa:8
892892   case 0xb:
893      sprintf(output, "%4.4x jmp %8.8x", opcode, (opcode & 0xff));
893      sprintf(buffer, "%4.4x jmp %8.8x", opcode, (opcode & 0xff));
894894      size = 2;
895895      break;
896896      // bsr @aa:16
897897   case 0xc:
898898      if(opcode & 0xff)
899899      {
900         sprintf(output, "%4.4x illegal", opcode);
900         sprintf(buffer, "%4.4x illegal", opcode);
901901         size = 2;
902902      }
903903      else
904904      {
905905         data16=h8_mem_read16(2);
906         sprintf(output, "%4.4x bsr %8.8x", opcode, data16+address+4);
906         sprintf(buffer, "%4.4x bsr %8.8x", opcode, data16+pc+4);
907907         size = 4 | DASMFLAG_STEP_OVER;
908908      }
909909      break;
910910      // jsr @erd
911911   case 0xd:
912      sprintf(output, "%4.4x jsr @%s", opcode, reg_names32[(opcode>>4) &7]);
912      sprintf(buffer, "%4.4x jsr @%s", opcode, reg_names32[(opcode>>4) &7]);
913913      size = 2 | DASMFLAG_STEP_OVER;
914914      break;
915915      // jsr @aa:24
916916   case 0xe:
917917      data32=h8_mem_read32(0);
918      sprintf(output, "%4.4x jsr %8.8x", opcode, (data32& 0xffffff));
918      sprintf(buffer, "%4.4x jsr %8.8x", opcode, (data32& 0xffffff));
919919      size = 4 | DASMFLAG_STEP_OVER;
920920      break;
921921      // jsr @aa:8
922922   case 0xf:
923      sprintf(output, "%4.4x jsr %8.8x", opcode, (opcode & 0xff));
923      sprintf(buffer, "%4.4x jsr %8.8x", opcode, (opcode & 0xff));
924924      size = 2 | DASMFLAG_STEP_OVER;
925925      break;
926926   default:
927      sprintf(output, "%4.4x default", opcode);
927      sprintf(buffer, "%4.4x default", opcode);
928928      break;
929929   }
930930   return size;
931931}
932932
933static UINT32 h8disasm_6(UINT32 address, UINT32 opcode, char *output, const UINT8 *oprom)
933static UINT32 h8disasm_6(UINT32 pc, UINT32 opcode, char *buffer, const UINT8 *oprom)
934934{
935935   UINT32 size = 2;
936936   UINT32 data32;
r3535r3536
941941   case 0:case 1:case 2:case 3:
942942      if(((opcode>>4)&0x8) == 0)
943943      {
944         sprintf(output, "%4.4x %s.b %s, %s", opcode, bit_instr[(opcode>>8)&7], reg_names8[(opcode>>4)&0xf], reg_names8[(opcode & 0xf)]);
944         sprintf(buffer, "%4.4x %s.b %s, %s", opcode, bit_instr[(opcode>>8)&7], reg_names8[(opcode>>4)&0xf], reg_names8[(opcode & 0xf)]);
945945      }
946946      else
947947      {
948         sprintf(output, "%4.4x %s.b %s, %s", opcode, bit_instr2[(opcode>>8)&7], reg_names8[(opcode>>4)&0xf], reg_names8[(opcode & 0xf)]);
948         sprintf(buffer, "%4.4x %s.b %s, %s", opcode, bit_instr2[(opcode>>8)&7], reg_names8[(opcode>>4)&0xf], reg_names8[(opcode & 0xf)]);
949949      }
950950      size = 2;
951951      break;
952952      // or.w rs, rd
953953   case 0x4:
954      sprintf(output, "%4.4x or.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
954      sprintf(buffer, "%4.4x or.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
955955      size = 2;
956956      break;
957957      // xor.w rs, rd
958958   case 0x5:
959      sprintf(output, "%4.4x xor.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
959      sprintf(buffer, "%4.4x xor.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
960960      size = 2;
961961      break;
962962      // and.w rs, rd
963963   case 0x6:
964      sprintf(output, "%4.4x and.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
964      sprintf(buffer, "%4.4x and.w %s, %s", opcode, reg_names16[(opcode>>4) & 0xf], reg_names16[opcode & 0xf]);
965965      size = 2;
966966      break;
967967      // bst/bist #imm, rd
968968   case 0x7:
969969      if(opcode & 0x80)
970970      {
971         sprintf(output, "%4.4x bist.b #%1.1x, %s", opcode, (opcode>>4)&7, reg_names8[(opcode & 0xf)]);
971         sprintf(buffer, "%4.4x bist.b #%1.1x, %s", opcode, (opcode>>4)&7, reg_names8[(opcode & 0xf)]);
972972      }
973973      else
974974      {
975         sprintf(output, "%4.4x bst.b #%1.1x, %s", opcode, (opcode>>4)&7, reg_names8[(opcode & 0xf)]);
975         sprintf(buffer, "%4.4x bst.b #%1.1x, %s", opcode, (opcode>>4)&7, reg_names8[(opcode & 0xf)]);
976976      }
977977      size = 2;
978978      break;
979979   case 0x8:
980980      if(opcode & 0x80)
981981      {
982         sprintf(output, "%4.4x mov.b %s, @%s", opcode, reg_names8[opcode & 0xf], reg_names32[(opcode >> 4) & 7]);
982         sprintf(buffer, "%4.4x mov.b %s, @%s", opcode, reg_names8[opcode & 0xf], reg_names32[(opcode >> 4) & 7]);
983983         size = 2;
984984      }
985985      else
986986      {
987         sprintf(output, "%4.4x mov.b @%s, %s", opcode, reg_names32[(opcode >> 4) & 7], reg_names8[opcode & 0xf]);
987         sprintf(buffer, "%4.4x mov.b @%s, %s", opcode, reg_names32[(opcode >> 4) & 7], reg_names8[opcode & 0xf]);
988988         size = 2;
989989      }
990990      break;
991991   case 0x9:
992992      if(opcode & 0x80)
993993      {
994         sprintf(output, "%4.4x mov.w %s, @%s", opcode, reg_names16[opcode & 0xf], reg_names32[(opcode >> 4) & 7]);
994         sprintf(buffer, "%4.4x mov.w %s, @%s", opcode, reg_names16[opcode & 0xf], reg_names32[(opcode >> 4) & 7]);
995995         size = 2;
996996      }
997997      else
998998      {
999         sprintf(output, "%4.4x mov.w @%s, %s", opcode, reg_names32[(opcode >> 4) & 7], reg_names16[opcode & 0xf]);
999         sprintf(buffer, "%4.4x mov.w @%s, %s", opcode, reg_names32[(opcode >> 4) & 7], reg_names16[opcode & 0xf]);
10001000         size = 2;
10011001      }
10021002      break;
r3535r3536
10061006      {
10071007      case 0x0:
10081008         data16=h8_mem_read16(2);
1009         sprintf(output, "%4.4x mov.b @%x, %s", opcode, data16, reg_names8[opcode & 0xf]);
1009         sprintf(buffer, "%4.4x mov.b @%x, %s", opcode, data16, reg_names8[opcode & 0xf]);
10101010         size = 4;
10111011         break;
10121012      case 0x2:
10131013         data32=h8_mem_read32(2);
1014         sprintf(output, "%4.4x mov.b @%8.8x, %s", opcode, data32, reg_names8[opcode & 0xf]);
1014         sprintf(buffer, "%4.4x mov.b @%8.8x, %s", opcode, data32, reg_names8[opcode & 0xf]);
10151015         size = 6;
10161016         break;
10171017      case 0x8:
10181018         data16=h8_mem_read16(2);
1019         sprintf(output, "%4.4x mov.b %s, @%8.8x", opcode, reg_names8[opcode & 0xf], data16);
1019         sprintf(buffer, "%4.4x mov.b %s, @%8.8x", opcode, reg_names8[opcode & 0xf], data16);
10201020         size = 4;
10211021         break;
10221022      case 0xa:
10231023         data32=h8_mem_read32(2);
1024         sprintf(output, "%4.4x mov.b %s, @%8.8x", opcode, reg_names8[opcode & 0xf], data32);
1024         sprintf(buffer, "%4.4x mov.b %s, @%8.8x", opcode, reg_names8[opcode & 0xf], data32);
10251025         size = 6;
10261026         break;
10271027      default:
1028         sprintf(output, "%4.4x 0x6a ? ", opcode);
1028         sprintf(buffer, "%4.4x 0x6a ? ", opcode);
10291029         size = 2;
10301030         break;
10311031      }
r3535r3536
10361036      {
10371037      case 0x0:
10381038         data16=h8_mem_read16(2);
1039         sprintf(output, "%4.4x mov.w @%8.8x, %s", opcode, data16, reg_names16[opcode & 0xf]);
1039         sprintf(buffer, "%4.4x mov.w @%8.8x, %s", opcode, data16, reg_names16[opcode & 0xf]);
10401040         size = 4;
10411041         break;
10421042      case 0x2:
10431043         data32=h8_mem_read32(2);
1044         sprintf(output, "%4.4x mov.w @%8.8x, %s", opcode, data32, reg_names16[opcode & 0xf]);
1044         sprintf(buffer, "%4.4x mov.w @%8.8x, %s", opcode, data32, reg_names16[opcode & 0xf]);
10451045         size = 6;
10461046         break;
10471047      case 0x8:
10481048         data16=h8_mem_read16(2);
1049         sprintf(output, "%4.4x mov.w %s, @%8.8x", opcode, reg_names16[opcode & 0xf], data16);
1049         sprintf(buffer, "%4.4x mov.w %s, @%8.8x", opcode, reg_names16[opcode & 0xf], data16);
10501050         size = 4;
10511051         break;
10521052      case 0xa:
10531053         data32=h8_mem_read32(2);
1054         sprintf(output, "%4.4x mov.w %s, @%8.8x", opcode, reg_names16[opcode & 0xf], data32);
1054         sprintf(buffer, "%4.4x mov.w %s, @%8.8x", opcode, reg_names16[opcode & 0xf], data32);
10551055         size = 6;
10561056         break;
10571057      default:
1058         sprintf(output, "%4.4x 0x6b ? ", opcode);
1058         sprintf(buffer, "%4.4x 0x6b ? ", opcode);
10591059         size = 2;
10601060         break;
10611061      }
r3535r3536
10641064      // mov.b @erx+,rx / mov.b @-erx, rx
10651065      if(opcode & 0x80)
10661066      {
1067         sprintf(output, "%4.4x mov.b %s, @(-%s)", opcode, reg_names8[opcode &0xf], reg_names32[(opcode>>4)&7]);
1067         sprintf(buffer, "%4.4x mov.b %s, @(-%s)", opcode, reg_names8[opcode &0xf], reg_names32[(opcode>>4)&7]);
10681068      }
10691069      else
10701070      {
1071         sprintf(output, "%4.4x mov.b @(%s+), %s", opcode, reg_names32[(opcode>>4)&7], reg_names8[opcode &0xf]);
1071         sprintf(buffer, "%4.4x mov.b @(%s+), %s", opcode, reg_names32[(opcode>>4)&7], reg_names8[opcode &0xf]);
10721072      }
10731073      size = 2;
10741074      break;
r3535r3536
10761076      // mov.w @ers+, rd / mov.w rs, @-erd
10771077      if(opcode & 0x80)
10781078      {
1079         sprintf(output, "%4.4x mov.w %s, @-%s", opcode, reg_names16[opcode&0xf], reg_names32[(opcode>>4)&7]);
1079         sprintf(buffer, "%4.4x mov.w %s, @-%s", opcode, reg_names16[opcode&0xf], reg_names32[(opcode>>4)&7]);
10801080      }
10811081      else
10821082      {
1083         sprintf(output, "%4.4x mov.w @%s+, %s", opcode, reg_names32[(opcode>>4)&7], reg_names16[opcode & 0xf]);
1083         sprintf(buffer, "%4.4x mov.w @%s+, %s", opcode, reg_names32[(opcode>>4)&7], reg_names16[opcode & 0xf]);
10841084      }
10851085      size = 2;
10861086      break;
r3535r3536
10891089      data16=h8_mem_read16(2);
10901090      if(opcode & 0x80)
10911091      {
1092         sprintf(output, "%4.4x mov.b %s,@(%x, %s)", opcode, reg_names8[opcode &0xf], data16, reg_names32[(opcode>>4)&7]);
1092         sprintf(buffer, "%4.4x mov.b %s,@(%x, %s)", opcode, reg_names8[opcode &0xf], data16, reg_names32[(opcode>>4)&7]);
10931093      }
10941094      else
10951095      {
1096         sprintf(output, "%4.4x mov.b @(%x, %s), %s", opcode, data16, reg_names32[(opcode>>4)&7], reg_names8[opcode &0xf]);
1096         sprintf(buffer, "%4.4x mov.b @(%x, %s), %s", opcode, data16, reg_names32[(opcode>>4)&7], reg_names8[opcode &0xf]);
10971097      }
10981098      size = 4;
10991099      break;
r3535r3536
11021102      data16=h8_mem_read16(2);
11031103      if(opcode & 0x80)
11041104      {
1105         sprintf(output, "%4.4x mov.w %s,@(%x, %s)", opcode, reg_names16[opcode &0xf], data16, reg_names32[(opcode>>4)&7]);
1105         sprintf(buffer, "%4.4x mov.w %s,@(%x, %s)", opcode, reg_names16[opcode &0xf], data16, reg_names32[(opcode>>4)&7]);
11061106      }
11071107      else
11081108      {
1109         sprintf(output, "%4.4x mov.w @(%x, %s), %s", opcode, data16, reg_names32[(opcode>>4)&7], reg_names16[opcode &0xf]);
1109         sprintf(buffer, "%4.4x mov.w @(%x, %s), %s", opcode, data16, reg_names32[(opcode>>4)&7], reg_names16[opcode &0xf]);
11101110      }
11111111      size = 4;
11121112      break;
11131113   default:
1114      sprintf(output, "%4.4x default", opcode);
1114      sprintf(buffer, "%4.4x default", opcode);
11151115      break;
11161116   }
11171117   return size;
11181118}
11191119
1120static UINT32 h8disasm_7(UINT32 address, UINT32 opcode, char *output, const UINT8 *oprom)
1120static UINT32 h8disasm_7(UINT32 pc, UINT32 opcode, char *buffer, const UINT8 *oprom)
11211121{
11221122   UINT32 size = 2;
11231123   UINT32 data32;
r3535r3536
11281128   case 0:case 1:case 2:case 3:case 4:case 5:case 6:case 7:
11291129      if(((opcode>>4)&0x8) == 0)
11301130      {
1131         sprintf(output, "%4.4x %s.b #%1.1x, %s", opcode, bit_instr[(opcode>>8)&7], (opcode>>4)&7, reg_names8[(opcode & 0xf)]);
1131         sprintf(buffer, "%4.4x %s.b #%1.1x, %s", opcode, bit_instr[(opcode>>8)&7], (opcode>>4)&7, reg_names8[(opcode & 0xf)]);
11321132      }
11331133      else
11341134      {
1135         sprintf(output, "%4.4x %s.b #%1.1x, %s", opcode, bit_instr2[(opcode>>8)&7], (opcode>>4)&7, reg_names8[(opcode & 0xf)]);
1135         sprintf(buffer, "%4.4x %s.b #%1.1x, %s", opcode, bit_instr2[(opcode>>8)&7], (opcode>>4)&7, reg_names8[(opcode & 0xf)]);
11361136      }
11371137      size = 2;
11381138      break;
r3535r3536
11431143      {
11441144         if(((data16>>4) & 0xf) == 0xa)
11451145         {
1146            sprintf(output, "%4.4x mov.b %s, @(%x, %s)", opcode, reg_names8[(data16 & 0xf)], data32, reg_names32[(opcode>>4)&7]);
1146            sprintf(buffer, "%4.4x mov.b %s, @(%x, %s)", opcode, reg_names8[(data16 & 0xf)], data32, reg_names32[(opcode>>4)&7]);
11471147         }
11481148         else
11491149         {
1150            sprintf(output, "%4.4x mov.b @(%x, %s), %s", opcode, data32, reg_names32[(opcode>>4) & 7], reg_names8[(data16 & 0xf)]);
1150            sprintf(buffer, "%4.4x mov.b @(%x, %s), %s", opcode, data32, reg_names32[(opcode>>4) & 7], reg_names8[(data16 & 0xf)]);
11511151         }
11521152      }
11531153      else
11541154      {
11551155         if(((data16>>4) & 0xf) == 0xa)
11561156         {
1157            sprintf(output, "%4.4x mov.w %s, @(%x, %s)", opcode, reg_names16[(data16 & 0xf)], data32, reg_names32[(opcode>>4)&7]);
1157            sprintf(buffer, "%4.4x mov.w %s, @(%x, %s)", opcode, reg_names16[(data16 & 0xf)], data32, reg_names32[(opcode>>4)&7]);
11581158         }
11591159         else
11601160         {
1161            sprintf(output, "%4.4x mov.w @(%x, %s), %s", opcode, data32, reg_names32[(opcode>>4) & 7], reg_names16[(data16 & 0xf)]);
1161            sprintf(buffer, "%4.4x mov.w @(%x, %s), %s", opcode, data32, reg_names32[(opcode>>4) & 7], reg_names16[(data16 & 0xf)]);
11621162         }
11631163      }
11641164      size = 8;
r3535r3536
11671167   case 0x9:
11681168      if( ((opcode>>4) & 0xf) > 0x6)
11691169      {
1170         sprintf(output, "%4.4x illegal", opcode);
1170         sprintf(buffer, "%4.4x illegal", opcode);
11711171         size = 2;
11721172      }
11731173      else
11741174      {
11751175         data16 = h8_mem_read16(2);
1176         sprintf(output, "%4.4x %s.w #%x, %s", opcode, imm32l_instr[(opcode>>4)&7], data16, reg_names16[opcode&0xf]);
1176         sprintf(buffer, "%4.4x %s.w #%x, %s", opcode, imm32l_instr[(opcode>>4)&7], data16, reg_names16[opcode&0xf]);
11771177         size = 4;
11781178      }
11791179      break;
r3535r3536
11811181   case 0xa:
11821182      if( (((opcode>>4) & 0xf) > 0x6) || (opcode & 0x8))
11831183      {
1184         sprintf(output, "%4.4x illegal", opcode);
1184         sprintf(buffer, "%4.4x illegal", opcode);
11851185         size = 2;
11861186      }
11871187      else
11881188      {
11891189         data32 = h8_mem_read32(2);
1190         sprintf(output, "%4.4x %s.l #%x, %s", opcode, imm32l_instr[(opcode>>4)&7], data32, reg_names32[opcode&0x7]);
1190         sprintf(buffer, "%4.4x %s.l #%x, %s", opcode, imm32l_instr[(opcode>>4)&7], data32, reg_names32[opcode&0x7]);
11911191         size = 6;
11921192      }
11931193      break;
r3535r3536
11961196      switch (opcode & 0x00ff)
11971197      {
11981198         case 0x5c:
1199         sprintf(output, "%4.4x eepmov.b", opcode);
1199         sprintf(buffer, "%4.4x eepmov.b", opcode);
12001200         break;
12011201         case 0xd4:
1202         sprintf(output, "%4.4x eepmov.w", opcode);
1202         sprintf(buffer, "%4.4x eepmov.w", opcode);
12031203         break;
12041204         default:
1205         sprintf(output, "%4.4x eepmov UNK!", opcode);
1205         sprintf(buffer, "%4.4x eepmov UNK!", opcode);
12061206         break;
12071207      }
12081208      size = 4;
r3535r3536
12191219         case 0x62:
12201220            if (((opcode & 0x8f)!=0)||((data16 & 0x0f)!=0))
12211221            {
1222               sprintf(output, "%4.4x default", opcode);
1222               sprintf(buffer, "%4.4x default", opcode);
12231223               break;
12241224            }
1225            sprintf(output, "%4.4x %s.b %s, @%s", opcode, bit_instr[(data16>>8)&7], reg_names16[(data16>>4)&0xf], reg_names32[(opcode>>4) & 0x7]);
1225            sprintf(buffer, "%4.4x %s.b %s, @%s", opcode, bit_instr[(data16>>8)&7], reg_names16[(data16>>4)&0xf], reg_names32[(opcode>>4) & 0x7]);
12261226            break;
12271227
12281228         case 0x67:   // bst/bist.b #xx:3, @erd
12291229            if (((opcode & 0x8f)!=0)||((data16 & 0x0f)!=0))
12301230            {
1231               sprintf(output, "%4.4x default", opcode);
1231               sprintf(buffer, "%4.4x default", opcode);
12321232               break;
12331233            }
12341234            if ((data16 & 0x80)!=0)
1235               sprintf(output, "%4.4x bist.b #%1.1x, @%s", opcode, (data16>>4)&7, reg_names32[(opcode>>4) & 0x7]);
1235               sprintf(buffer, "%4.4x bist.b #%1.1x, @%s", opcode, (data16>>4)&7, reg_names32[(opcode>>4) & 0x7]);
12361236            else
1237               sprintf(output, "%4.4x bst.b #%1.1x, @%s", opcode, (data16>>4)&7, reg_names32[(opcode>>4) & 0x7]);
1237               sprintf(buffer, "%4.4x bst.b #%1.1x, @%s", opcode, (data16>>4)&7, reg_names32[(opcode>>4) & 0x7]);
12381238            break;
12391239
12401240         case 0x70:   // bset/bnot/bclr.b #xx:3, @erd
r3535r3536
12421242         case 0x72:
12431243            if (((opcode & 0x8f)!=0)||((data16 & 0x8f)!=0))
12441244            {
1245               sprintf(output, "%4.4x default", opcode);
1245               sprintf(buffer, "%4.4x default", opcode);
12461246               break;
12471247            }
1248            sprintf(output, "%4.4x %s.b #%1.1x, @%s", opcode, bit_instr[(data16>>8)&7], (data16>>4)&7, reg_names32[(opcode>>4) & 0x7]);
1248            sprintf(buffer, "%4.4x %s.b #%1.1x, @%s", opcode, bit_instr[(data16>>8)&7], (data16>>4)&7, reg_names32[(opcode>>4) & 0x7]);
12491249            break;
12501250      }
12511251      break;
r3535r3536
12551255      data16 = h8_mem_read16(2);
12561256      if(((data16>>4)&0x8) == 0)
12571257      {
1258         sprintf(output, "%4.4x %4.4x %s.b #%1.1x, @%x", opcode, data16, bit_instr[(data16>>8)&7], (data16>>4)&7, 0xffffff00 + (opcode & 0xff));
1258         sprintf(buffer, "%4.4x %4.4x %s.b #%1.1x, @%x", opcode, data16, bit_instr[(data16>>8)&7], (data16>>4)&7, 0xffffff00 + (opcode & 0xff));
12591259      }
12601260      else
12611261      {
1262         sprintf(output, "%4.4x %4.4x %s.b #%1.1x, @%x", opcode, data16, bit_instr2[(data16>>8)&7], (data16>>4)&7, 0xffffff00 + (opcode & 0xff));
1262         sprintf(buffer, "%4.4x %4.4x %s.b #%1.1x, @%x", opcode, data16, bit_instr2[(data16>>8)&7], (data16>>4)&7, 0xffffff00 + (opcode & 0xff));
12631263      }
12641264      size = 4;
12651265      break;
12661266   default:
1267      sprintf(output, "%4.4x default", opcode);
1267      sprintf(buffer, "%4.4x default", opcode);
12681268      break;
12691269   }
12701270   return size;
src/emu/cpu/h83002/h83002.c
r3535r3536
181181
182182/* implementation */
183183
184extern offs_t h8_disasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
184extern CPU_DISASSEMBLE( h8 );
185185
186186void h8_3002_InterruptRequest(UINT8 source)
187187{
r3535r3536
319319   h8_set_ccr(h8.ccr);
320320}
321321
322static void h8_init(int index, int clock, const void *config, int (*irqcallback)(int))
322static CPU_INIT( h8 )
323323{
324324   memset(&h8, 0, sizeof(h8));
325325   h8.h8iflag = 1;
326326
327327   h8.irq_cb = irqcallback;
328   h8.device = device;
328329
329330   state_save_register_item("H8/3002", index, h8.h8err);
330331   state_save_register_item_array("H8/3002", index, h8.regs);
r3535r3536
343344   h8_itu_init();
344345}
345346
346static void h8_3007_init(int index, int clock, const void *config, int (*irqcallback)(int))
347static CPU_INIT( h8_3007 )
347348{
348   h8_init(index, clock, config, irqcallback);
349   CPU_INIT_CALL(h8);
349350   h8_3007_itu_init();
350351}
351352
352static void h8_reset(void)
353static CPU_RESET( h8 )
353354{
354355   h8.h8err = 0;
355356   h8.pc = h8_mem_read32(0) & 0xffffff;
r3535r3536
453454      // external IRQs
454455      if (source >= 12 && source <= 17)
455456      {
456         (*h8.irq_cb)(source - 12 + H8_IRQ0);
457         (*h8.irq_cb)(h8.device, source - 12 + H8_IRQ0);
457458      }
458459
459460      if (source != 0xff)
r3535r3536
461462   }
462463}
463464
464static int h8_execute(int cycles)
465static CPU_EXECUTE( h8 )
465466{
466467   UINT16 opcode=0;
467468
r3535r3536
38943895
38953896// MAME interface stuff
38963897
3897static void h8_get_context(void *context)
3898static CPU_GET_CONTEXT( h8 )
38983899{
3899   *(h83002_state *)context = h8;
3900   *(h83002_state *)dst = h8;
39003901}
39013902
3902static void h8_set_context(void *context)
3903static CPU_SET_CONTEXT( h8 )
39033904{
3904   h8 = *(h83002_state *)context;
3905   h8 = *(h83002_state *)src;
39053906}
39063907
3907static void h8_set_info(UINT32 state, cpuinfo *info)
3908static CPU_SET_INFO( h8 )
39083909{
39093910   switch(state) {
39103911   case CPUINFO_INT_PC:                  h8.pc = info->i; change_pc(h8.pc);            break;
r3535r3536
40634064ADDRESS_MAP_END
40644065
40654066
4066void h8_3002_get_info(UINT32 state, cpuinfo *info)
4067CPU_GET_INFO( h8_3002 )
40674068{
40684069   switch(state) {
40694070   // Interface functions and variables
4070   case CPUINFO_PTR_SET_INFO:               info->setinfo     = h8_set_info;            break;
4071   case CPUINFO_PTR_GET_CONTEXT:            info->getcontext  = h8_get_context;            break;
4072   case CPUINFO_PTR_SET_CONTEXT:            info->setcontext= h8_set_context;            break;
4073   case CPUINFO_PTR_INIT:                  info->init        = h8_init;               break;
4074   case CPUINFO_PTR_RESET:                  info->reset       = h8_reset;               break;
4071   case CPUINFO_PTR_SET_INFO:               info->setinfo     = CPU_SET_INFO_NAME(h8);      break;
4072   case CPUINFO_PTR_GET_CONTEXT:            info->getcontext  = CPU_GET_CONTEXT_NAME(h8);   break;
4073   case CPUINFO_PTR_SET_CONTEXT:            info->setcontext  = CPU_SET_CONTEXT_NAME(h8);   break;
4074   case CPUINFO_PTR_INIT:                  info->init        = CPU_INIT_NAME(h8);         break;
4075   case CPUINFO_PTR_RESET:                  info->reset       = CPU_RESET_NAME(h8);         break;
40754076   case CPUINFO_PTR_EXIT:                  info->exit        = 0;                     break;
4076   case CPUINFO_PTR_EXECUTE:               info->execute     = h8_execute;               break;
4077   case CPUINFO_PTR_EXECUTE:               info->execute     = CPU_EXECUTE_NAME(h8);      break;
40774078   case CPUINFO_PTR_BURN:                  info->burn        = 0;                     break;
4078   case CPUINFO_PTR_DISASSEMBLE:            info->disassemble = h8_disasm;               break;
4079   case CPUINFO_PTR_DISASSEMBLE:            info->disassemble = CPU_DISASSEMBLE_NAME(h8);   break;
40794080   case CPUINFO_PTR_INSTRUCTION_COUNTER:      info->icount      = &h8_cyccnt;               break;
40804081   case CPUINFO_INT_CONTEXT_SIZE:            info->i           = sizeof(h83002_state);      break;
40814082   case CPUINFO_INT_MIN_INSTRUCTION_BYTES:      info->i           = 2;                     break;
r3535r3536
40934094   case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:      info->i = 0;                  break;
40944095
40954096      // Internal maps
4096   case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = address_map_h8_3002_internal_map; break;
4097   case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(h8_3002_internal_map); break;
40974098   case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map16 = NULL;   break;
40984099   case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO:      info->internal_map16 = NULL;   break;
40994100
r3535r3536
41384139   }
41394140}
41404141
4141void h8_3044_get_info(UINT32 state, cpuinfo *info)
4142CPU_GET_INFO( h8_3044 )
41424143{
41434144   switch (state)
41444145   {
4145      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = address_map_h8_3044_internal_map;  break;
4146      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(h8_3044_internal_map);  break;
41464147      case CPUINFO_STR_NAME:            strcpy(info->s, "H8/3044");    break;
41474148      default:
4148         h8_3002_get_info(state,info);
4149         CPU_GET_INFO_CALL(h8_3002);
41494150   }
41504151}
41514152
4152void h8_3007_get_info(UINT32 state, cpuinfo *info)
4153CPU_GET_INFO( h8_3007 )
41534154{
41544155   switch (state)
41554156   {
41564157      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = address_map_h8_3007_internal_map;  break;
4157      case CPUINFO_PTR_INIT:            info->init = h8_3007_init;      break;
4158      case CPUINFO_PTR_INIT:            info->init = CPU_INIT_NAME(h8_3007);      break;
41584159      case CPUINFO_STR_NAME:            strcpy(info->s, "H8/3007");      break;
41594160      default:
4160         h8_3002_get_info(state,info);
4161         CPU_GET_INFO_CALL(h8_3002);
41614162   }
41624163}
src/emu/cpu/h83002/h8priv.h
r3535r3536
2222   UINT8  h8nflag, h8vflag, h8cflag, h8zflag, h8iflag, h8hflag;
2323   UINT8  h8uflag, h8uiflag;
2424
25   int (*irq_cb)(int);
25   cpu_irq_callback irq_cb;
26   const device_config *device;
2627
2728   // H8/3002 onboard peripherals stuff
2829
src/emu/cpu/h83002/h83002.h
r3535r3536
7373   H8_SERIAL_B
7474};
7575
76void h8_3002_get_info(UINT32 state, cpuinfo *info);
76CPU_GET_INFO( h8_3002 );
7777
7878void h8_3002_InterruptRequest(UINT8 source);
7979
src/emu/cpu/m68000/m68000.h
r3535r3536
55
66#include "cpuintrf.h"
77
8/* There are 7 levels of interrupt to the 68K.
9 * A transition from < 7 to 7 will cause a non-maskable interrupt (NMI).
10 */
11#define M68K_IRQ_NONE 0
12#define M68K_IRQ_1    1
13#define M68K_IRQ_2    2
14#define M68K_IRQ_3    3
15#define M68K_IRQ_4    4
16#define M68K_IRQ_5    5
17#define M68K_IRQ_6    6
18#define M68K_IRQ_7    7
19
20
21/* Special interrupt acknowledge values.
22 * Use these as special returns from the interrupt acknowledge callback
23 * (specified later in this header).
24 */
25
26/* Causes an interrupt autovector (0x18 + interrupt level) to be taken.
27 * This happens in a real 68K if VPA or AVEC is asserted during an interrupt
28 * acknowledge cycle instead of DTACK.
29 */
30#define M68K_INT_ACK_AUTOVECTOR    0xffffffff
31
32/* Causes the spurious interrupt vector (0x18) to be taken
33 * This happens in a real 68K if BERR is asserted during the interrupt
34 * acknowledge cycle (i.e. no devices responded to the acknowledge).
35 */
36#define M68K_INT_ACK_SPURIOUS      0xfffffffe
37
838enum
939{
1040   /* NOTE: M68K_SP fetches the current SP, be it USP, ISP, or MSP */
r3535r3536
2252   CPUINFO_PTR_M68K_TAS_CALLBACK
2353};
2454
25extern int m68k_ICount;
26
2755/* Redirect memory calls */
2856
2957typedef struct _m68k_memory_interface m68k_memory_interface;
r3535r3536
74102#define MC68000_INT_ACK_AUTOVECTOR    -1
75103#define MC68000_INT_ACK_SPURIOUS      -2
76104
77void m68000_get_info(UINT32 state, cpuinfo *info);
105CPU_GET_INFO( m68000 );
78106extern void m68000_memory_interface_set(int Entry,void * memory_routine);
79107
80108/****************************************************************************
r3535r3536
91119#define MC68008_INT_ACK_AUTOVECTOR      MC68000_INT_ACK_AUTOVECTOR
92120#define MC68008_INT_ACK_SPURIOUS      MC68000_INT_ACK_SPURIOUS
93121
94void m68008_get_info(UINT32 state, cpuinfo *info);
122CPU_GET_INFO( m68008 );
95123#endif
96124
97125/****************************************************************************
r3535r3536
108136#define MC68010_INT_ACK_AUTOVECTOR      MC68000_INT_ACK_AUTOVECTOR
109137#define MC68010_INT_ACK_SPURIOUS      MC68000_INT_ACK_SPURIOUS
110138
111void m68010_get_info(UINT32 state, cpuinfo *info);
139CPU_GET_INFO( m68010 );
112140#endif
113141
114142/****************************************************************************
r3535r3536
125153#define MC68EC020_INT_ACK_AUTOVECTOR   MC68000_INT_ACK_AUTOVECTOR
126154#define MC68EC020_INT_ACK_SPURIOUS      MC68000_INT_ACK_SPURIOUS
127155
128void m68ec020_get_info(UINT32 state, cpuinfo *info);
156CPU_GET_INFO( m68ec020 );
129157#endif
130158
131159/****************************************************************************
r3535r3536
142170#define MC68020_INT_ACK_AUTOVECTOR      MC68000_INT_ACK_AUTOVECTOR
143171#define MC68020_INT_ACK_SPURIOUS      MC68000_INT_ACK_SPURIOUS
144172
145void m68020_get_info(UINT32 state, cpuinfo *info);
173CPU_GET_INFO( m68020 );
146174#endif
147175
148176/****************************************************************************
r3535r3536
159187#define MC68040_INT_ACK_AUTOVECTOR      MC68000_INT_ACK_AUTOVECTOR
160188#define MC68040_INT_ACK_SPURIOUS      MC68000_INT_ACK_SPURIOUS
161189
162void m68040_get_info(UINT32 state, cpuinfo *info);
190CPU_GET_INFO( m68040 );
163191#endif
164192
165193// C Core header
src/emu/cpu/m68000/m68kconf.h
r3535r3536
1/* ======================================================================== */
2/* ========================= LICENSING & COPYRIGHT ======================== */
3/* ======================================================================== */
4/*
5 *                                  MUSASHI
6 *                                Version 3.32
7 *
8 * A portable Motorola M680x0 processor emulation engine.
9 * Copyright Karl Stenerud.  All rights reserved.
10 *
11 * This code may be freely used for non-commercial purposes as long as this
12 * copyright notice remains unaltered in the source code and any binary files
13 * containing this code in compiled form.
14 *
15 * All other licensing terms must be negotiated with the author
16 * (Karl Stenerud).
17 *
18 * The latest version of this code can be obtained at:
19 * http://kstenerud.cjb.net
20 */
21
22
23#pragma once
24
25#ifndef __M68KCONF_H__
26#define __M68KCONF_H__
27
28
29/* Configuration switches.
30 * Use OPT_SPECIFY_HANDLER for configuration options that allow callbacks.
31 * OPT_SPECIFY_HANDLER causes the core to link directly to the function
32 * or macro you specify, rather than using callback functions whose pointer
33 * must be passed in using m68k_set_xxx_callback().
34 */
35#define OPT_OFF             0
36#define OPT_ON              1
37#define OPT_SPECIFY_HANDLER 2
38
39
40/* ======================================================================== */
41/* ============================== MAME STUFF ============================== */
42/* ======================================================================== */
43
44/* If you're compiling this for MAME, only change M68K_COMPILE_FOR_MAME
45 * to OPT_ON and use m68kmame.h to configure the 68k core.
46 */
47#ifndef M68K_COMPILE_FOR_MAME
48#define M68K_COMPILE_FOR_MAME      OPT_ON
49#endif /* M68K_COMPILE_FOR_MAME */
50
51
52#if M68K_COMPILE_FOR_MAME == OPT_OFF
53
54
55/* ======================================================================== */
56/* ============================= CONFIGURATION ============================ */
57/* ======================================================================== */
58
59/* Turn ON if you want to use the following M68K variants */
60#define M68K_EMULATE_008            OPT_ON
61#define M68K_EMULATE_010            OPT_ON
62#define M68K_EMULATE_EC020          OPT_ON
63#define M68K_EMULATE_020            OPT_ON
64#define M68K_EMULATE_040            OPT_ON
65
66
67/* If ON, the CPU will call m68k_read_immediate_xx() for immediate addressing
68 * and m68k_read_pcrelative_xx() for PC-relative addressing.
69 * If off, all read requests from the CPU will be redirected to m68k_read_xx()
70 */
71#define M68K_SEPARATE_READS         OPT_OFF
72
73/* If ON, the CPU will call m68k_write_32_pd() when it executes move.l with a
74 * predecrement destination EA mode instead of m68k_write_32().
75 * To simulate real 68k behavior, m68k_write_32_pd() must first write the high
76 * word to [address+2], and then write the low word to [address].
77 */
78#define M68K_SIMULATE_PD_WRITES     OPT_OFF
79
80/* If ON, CPU will call the interrupt acknowledge callback when it services an
81 * interrupt.
82 * If off, all interrupts will be autovectored and all interrupt requests will
83 * auto-clear when the interrupt is serviced.
84 */
85#define M68K_EMULATE_INT_ACK        OPT_OFF
86#define M68K_INT_ACK_CALLBACK(A)    your_int_ack_handler_function(A)
87
88
89/* If ON, CPU will call the breakpoint acknowledge callback when it encounters
90 * a breakpoint instruction and it is running a 68010+.
91 */
92#define M68K_EMULATE_BKPT_ACK       OPT_OFF
93#define M68K_BKPT_ACK_CALLBACK()    your_bkpt_ack_handler_function()
94
95
96/* If ON, the CPU will monitor the trace flags and take trace exceptions
97 */
98#define M68K_EMULATE_TRACE          OPT_OFF
99
100
101/* If ON, CPU will call the output reset callback when it encounters a reset
102 * instruction.
103 */
104#define M68K_EMULATE_RESET          OPT_OFF
105#define M68K_RESET_CALLBACK()       your_reset_handler_function()
106
107
108/* If ON, CPU will call the callback when it encounters a cmpi.l #v, dn
109 * instruction.
110 */
111#define M68K_CMPILD_HAS_CALLBACK     OPT_OFF
112#define M68K_CMPILD_CALLBACK(v,r)    your_cmpild_handler_function(v,r)
113
114
115/* If ON, CPU will call the callback when it encounters a rte
116 * instruction.
117 */
118#define M68K_RTE_HAS_CALLBACK       OPT_OFF
119#define M68K_RTE_CALLBACK()         your_rte_handler_function()
120
121/* If ON, CPU will call the callback when it encounters a tas
122 * instruction.
123 */
124#define M68K_TAS_HAS_CALLBACK       OPT_OFF
125#define M68K_TAS_CALLBACK()         your_tas_handler_function()
126
127
128/* If ON, CPU will call the set fc callback on every memory access to
129 * differentiate between user/supervisor, program/data access like a real
130 * 68000 would.  This should be enabled and the callback should be set if you
131 * want to properly emulate the m68010 or higher. (moves uses function codes
132 * to read/write data from different address spaces)
133 */
134#define M68K_EMULATE_FC             OPT_OFF
135#define M68K_SET_FC_CALLBACK(A)     your_set_fc_handler_function(A)
136
137
138/* If ON, CPU will call the pc changed callback when it changes the PC by a
139 * large value.  This allows host programs to be nicer when it comes to
140 * fetching immediate data and instructions on a banked memory system.
141 */
142#define M68K_MONITOR_PC             OPT_OFF
143#define M68K_SET_PC_CALLBACK(A)     your_pc_changed_handler_function(A)
144
145
146/* If ON, CPU will call the instruction hook callback before every
147 * instruction.
148 */
149#define M68K_INSTRUCTION_HOOK       OPT_OFF
150#define M68K_INSTRUCTION_CALLBACK() your_instruction_hook_function()
151
152
153/* If ON, the CPU will emulate the 4-byte prefetch queue of a real 68000 */
154#define M68K_EMULATE_PREFETCH       OPT_OFF
155
156
157/* If ON, the CPU will generate address error exceptions if it tries to
158 * access a word or longword at an odd address.
159 * NOTE: This is only emulated properly for 68000 mode.
160 */
161#define M68K_EMULATE_ADDRESS_ERROR  OPT_OFF
162
163
164/* Turn ON to enable logging of illegal instruction calls.
165 * M68K_LOG_FILEHANDLE must be #defined to a stdio file stream.
166 * Turn on M68K_LOG_1010_1111 to log all 1010 and 1111 calls.
167 */
168#define M68K_LOG_ENABLE             OPT_OFF
169#define M68K_LOG_1010_1111          OPT_OFF
170#define M68K_LOG_FILEHANDLE         some_file_handle
171
172
173/* ----------------------------- COMPATIBILITY ---------------------------- */
174
175/* The following options set optimizations that violate the current ANSI
176 * standard, but will be compliant under the forthcoming C9X standard.
177 */
178
179
180/* If ON, the enulation core will use 64-bit integers to speed up some
181 * operations.
182*/
183#define M68K_USE_64_BIT  OPT_OFF
184
185
186/* Set to your compiler's static inline keyword to enable it, or
187 * set it to blank to disable it.
188 * If you define INLINE in the makefile, it will override this value.
189 * NOTE: not enabling inline functions will SEVERELY slow down emulation.
190 */
191#ifndef INLINE
192#define INLINE static __inline__
193#endif /* INLINE */
194
195#endif /* M68K_COMPILE_FOR_MAME */
196
197
198/* ======================================================================== */
199/* ============================== END OF FILE ============================= */
200/* ======================================================================== */
201
202#endif /* __M68KCONF_H__ */
src/emu/cpu/m68000/m68kfpu.c
r3535r3536
99#define DOUBLE_EXPONENT               U64(0x7ff0000000000000)
1010#define DOUBLE_MANTISSA               U64(0x000fffffffffffff)
1111
12INLINE void SET_CONDITION_CODES(fp_reg reg)
12INLINE void SET_CONDITION_CODES(m68ki_cpu_core *m68k, fp_reg reg)
1313{
1414   REG_FPSR &= ~(FPCC_N|FPCC_Z|FPCC_I|FPCC_NAN);
1515
r3535r3536
3838   }
3939}
4040
41INLINE int TEST_CONDITION(int condition)
41INLINE int TEST_CONDITION(m68ki_cpu_core *m68k, int condition)
4242{
4343   int n = (REG_FPSR & FPCC_N) != 0;
4444   int z = (REG_FPSR & FPCC_Z) != 0;
r3535r3536
6565   return r;
6666}
6767
68static UINT8 READ_EA_8(int ea)
68static UINT8 READ_EA_8(m68ki_cpu_core *m68k, int ea)
6969{
7070   int mode = (ea >> 3) & 0x7;
7171   int reg = (ea & 0x7);
r3535r3536
7878      }
7979      case 5:      // (d16, An)
8080      {
81         UINT32 ea = EA_AY_DI_8();
82         return m68ki_read_8(ea);
81         UINT32 ea = EA_AY_DI_8(m68k);
82         return m68ki_read_8(m68k, ea);
8383      }
8484      case 6:      // (An) + (Xn) + d8
8585      {
86         UINT32 ea = EA_AY_IX_8();
87         return m68ki_read_8(ea);
86         UINT32 ea = EA_AY_IX_8(m68k);
87         return m68ki_read_8(m68k, ea);
8888      }
8989      case 7:
9090      {
r3535r3536
9292         {
9393            case 1:      // (xxx).L
9494            {
95               UINT32 d1 = OPER_I_16();
96               UINT32 d2 = OPER_I_16();
95               UINT32 d1 = OPER_I_16(m68k);
96               UINT32 d2 = OPER_I_16(m68k);
9797               UINT32 ea = (d1 << 16) | d2;
98               return m68ki_read_8(ea);
98               return m68ki_read_8(m68k, ea);
9999            }
100100            case 4:      // #<data>
101101            {
102               return  OPER_I_8();
102               return  OPER_I_8(m68k);
103103            }
104104            default:   fatalerror("MC68040: READ_EA_8: unhandled mode %d, reg %d at %08X\n", mode, reg, REG_PC);
105105         }
r3535r3536
111111   return 0;
112112}
113113
114static UINT16 READ_EA_16(int ea)
114static UINT16 READ_EA_16(m68ki_cpu_core *m68k, int ea)
115115{
116116   int mode = (ea >> 3) & 0x7;
117117   int reg = (ea & 0x7);
r3535r3536
125125      case 2:      // (An)
126126      {
127127         UINT32 ea = REG_A[reg];
128         return m68ki_read_16(ea);
128         return m68ki_read_16(m68k, ea);
129129      }
130130      case 5:      // (d16, An)
131131      {
132         UINT32 ea = EA_AY_DI_16();
133         return m68ki_read_16(ea);
132         UINT32 ea = EA_AY_DI_16(m68k);
133         return m68ki_read_16(m68k, ea);
134134      }
135135      case 6:      // (An) + (Xn) + d8
136136      {
137         UINT32 ea = EA_AY_IX_16();
138         return m68ki_read_16(ea);
137         UINT32 ea = EA_AY_IX_16(m68k);
138         return m68ki_read_16(m68k, ea);
139139      }
140140      case 7:
141141      {
r3535r3536
143143         {
144144            case 1:      // (xxx).L
145145            {
146               UINT32 d1 = OPER_I_16();
147               UINT32 d2 = OPER_I_16();
146               UINT32 d1 = OPER_I_16(m68k);
147               UINT32 d2 = OPER_I_16(m68k);
148148               UINT32 ea = (d1 << 16) | d2;
149               return m68ki_read_16(ea);
149               return m68ki_read_16(m68k, ea);
150150            }
151151            case 4:      // #<data>
152152            {
153               return OPER_I_16();
153               return OPER_I_16(m68k);
154154            }
155155
156156            default:   fatalerror("MC68040: READ_EA_16: unhandled mode %d, reg %d at %08X\n", mode, reg, REG_PC);
r3535r3536
163163   return 0;
164164}
165165
166static UINT32 READ_EA_32(int ea)
166static UINT32 READ_EA_32(m68ki_cpu_core *m68k, int ea)
167167{
168168   int mode = (ea >> 3) & 0x7;
169169   int reg = (ea & 0x7);
r3535r3536
177177      case 2:      // (An)
178178      {
179179         UINT32 ea = REG_A[reg];
180         return m68ki_read_32(ea);
180         return m68ki_read_32(m68k, ea);
181181      }
182182      case 3:      // (An)+
183183      {
184         UINT32 ea = EA_AY_PI_32();
185         return m68ki_read_32(ea);
184         UINT32 ea = EA_AY_PI_32(m68k);
185         return m68ki_read_32(m68k, ea);
186186      }
187187      case 5:      // (d16, An)
188188      {
189         UINT32 ea = EA_AY_DI_32();
190         return m68ki_read_32(ea);
189         UINT32 ea = EA_AY_DI_32(m68k);
190         return m68ki_read_32(m68k, ea);
191191      }
192192      case 6:      // (An) + (Xn) + d8
193193      {
194         UINT32 ea = EA_AY_IX_32();
195         return m68ki_read_32(ea);
194         UINT32 ea = EA_AY_IX_32(m68k);
195         return m68ki_read_32(m68k, ea);
196196      }
197197      case 7:
198198      {
r3535r3536
200200         {
201201            case 1:      // (xxx).L
202202            {
203               UINT32 d1 = OPER_I_16();
204               UINT32 d2 = OPER_I_16();
203               UINT32 d1 = OPER_I_16(m68k);
204               UINT32 d2 = OPER_I_16(m68k);
205205               UINT32 ea = (d1 << 16) | d2;
206               return m68ki_read_32(ea);
206               return m68ki_read_32(m68k, ea);
207207            }
208208            case 2:      // (d16, PC)
209209            {
210               UINT32 ea = EA_PCDI_32();
211               return m68ki_read_32(ea);
210               UINT32 ea = EA_PCDI_32(m68k);
211               return m68ki_read_32(m68k, ea);
212212            }
213213            case 4:      // #<data>
214214            {
215               return  OPER_I_32();
215               return  OPER_I_32(m68k);
216216            }
217217            default:   fatalerror("MC68040: READ_EA_32: unhandled mode %d, reg %d at %08X\n", mode, reg, REG_PC);
218218         }
r3535r3536
223223   return 0;
224224}
225225
226static void WRITE_EA_32(int ea, UINT32 data)
226static void WRITE_EA_32(m68ki_cpu_core *m68k, int ea, UINT32 data)
227227{
228228   int mode = (ea >> 3) & 0x7;
229229   int reg = (ea & 0x7);
r3535r3536
238238      case 2:      // (An)
239239      {
240240         UINT32 ea = REG_A[reg];
241         m68ki_write_32(ea, data);
241         m68ki_write_32(m68k, ea, data);
242242         break;
243243      }
244244      case 3:      // (An)+
245245      {
246         UINT32 ea = EA_AY_PI_32();
247         m68ki_write_32(ea, data);
246         UINT32 ea = EA_AY_PI_32(m68k);
247         m68ki_write_32(m68k, ea, data);
248248         break;
249249      }
250250      case 4:      // -(An)
251251      {
252         UINT32 ea = EA_AY_PD_32();
253         m68ki_write_32(ea, data);
252         UINT32 ea = EA_AY_PD_32(m68k);
253         m68ki_write_32(m68k, ea, data);
254254         break;
255255      }
256256      case 5:      // (d16, An)
257257      {
258         UINT32 ea = EA_AY_DI_32();
259         m68ki_write_32(ea, data);
258         UINT32 ea = EA_AY_DI_32(m68k);
259         m68ki_write_32(m68k, ea, data);
260260         break;
261261      }
262262      case 6:      // (An) + (Xn) + d8
263263      {
264         UINT32 ea = EA_AY_IX_32();
265         m68ki_write_32(ea, data);
264         UINT32 ea = EA_AY_IX_32(m68k);
265         m68ki_write_32(m68k, ea, data);
266266         break;
267267      }
268268      case 7:
r3535r3536
271271         {
272272            case 1:      // (xxx).L
273273            {
274               UINT32 d1 = OPER_I_16();
275               UINT32 d2 = OPER_I_16();
274               UINT32 d1 = OPER_I_16(m68k);
275               UINT32 d2 = OPER_I_16(m68k);
276276               UINT32 ea = (d1 << 16) | d2;
277               m68ki_write_32(ea, data);
277               m68ki_write_32(m68k, ea, data);
278278               break;
279279            }
280280            case 2:      // (d16, PC)
281281            {
282               UINT32 ea = EA_PCDI_32();
283               m68ki_write_32(ea, data);
282               UINT32 ea = EA_PCDI_32(m68k);
283               m68ki_write_32(m68k, ea, data);
284284               break;
285285            }
286286            default:   fatalerror("MC68040: WRITE_EA_32: unhandled mode %d, reg %d at %08X\n", mode, reg, REG_PC);
r3535r3536
291291   }
292292}
293293
294static UINT64 READ_EA_64(int ea)
294static UINT64 READ_EA_64(m68ki_cpu_core *m68k, int ea)
295295{
296296   int mode = (ea >> 3) & 0x7;
297297   int reg = (ea & 0x7);
r3535r3536
302302      case 2:      // (An)
303303      {
304304         UINT32 ea = REG_A[reg];
305         h1 = m68ki_read_32(ea+0);
306         h2 = m68ki_read_32(ea+4);
305         h1 = m68ki_read_32(m68k, ea+0);
306         h2 = m68ki_read_32(m68k, ea+4);
307307         return  (UINT64)(h1) << 32 | (UINT64)(h2);
308308      }
309309      case 3:      // (An)+
310310      {
311311         UINT32 ea = REG_A[reg];
312312         REG_A[reg] += 8;
313         h1 = m68ki_read_32(ea+0);
314         h2 = m68ki_read_32(ea+4);
313         h1 = m68ki_read_32(m68k, ea+0);
314         h2 = m68ki_read_32(m68k, ea+4);
315315         return  (UINT64)(h1) << 32 | (UINT64)(h2);
316316      }
317317      case 5:      // (d16, An)
318318      {
319         UINT32 ea = EA_AY_DI_32();
320         h1 = m68ki_read_32(ea+0);
321         h2 = m68ki_read_32(ea+4);
319         UINT32 ea = EA_AY_DI_32(m68k);
320         h1 = m68ki_read_32(m68k, ea+0);
321         h2 = m68ki_read_32(m68k, ea+4);
322322         return  (UINT64)(h1) << 32 | (UINT64)(h2);
323323      }
324324      case 7:
r3535r3536
327327         {
328328            case 4:      // #<data>
329329            {
330               h1 = OPER_I_32();
331               h2 = OPER_I_32();
330               h1 = OPER_I_32(m68k);
331               h2 = OPER_I_32(m68k);
332332               return  (UINT64)(h1) << 32 | (UINT64)(h2);
333333            }
334334            case 2:      // (d16, PC)
335335            {
336               UINT32 ea = EA_PCDI_32();
337               h1 = m68ki_read_32(ea+0);
338               h2 = m68ki_read_32(ea+4);
336               UINT32 ea = EA_PCDI_32(m68k);
337               h1 = m68ki_read_32(m68k, ea+0);
338               h2 = m68ki_read_32(m68k, ea+4);
339339               return  (UINT64)(h1) << 32 | (UINT64)(h2);
340340            }
341341            default:   fatalerror("MC68040: READ_EA_64: unhandled mode %d, reg %d at %08X\n", mode, reg, REG_PC);
r3535r3536
348348   return 0;
349349}
350350
351static void WRITE_EA_64(int ea, UINT64 data)
351static void WRITE_EA_64(m68ki_cpu_core *m68k, int ea, UINT64 data)
352352{
353353   int mode = (ea >> 3) & 0x7;
354354   int reg = (ea & 0x7);
r3535r3536
358358      case 2:      // (An)
359359      {
360360         UINT32 ea = REG_A[reg];
361         m68ki_write_32(ea, (UINT32)(data >> 32));
362         m68ki_write_32(ea, (UINT32)(data));
361         m68ki_write_32(m68k, ea, (UINT32)(data >> 32));
362         m68ki_write_32(m68k, ea, (UINT32)(data));
363363         break;
364364      }
365365      case 4:      // -(An)
r3535r3536
367367         UINT32 ea;
368368         REG_A[reg] -= 8;
369369         ea = REG_A[reg];
370         m68ki_write_32(ea+0, (UINT32)(data >> 32));
371         m68ki_write_32(ea+4, (UINT32)(data));
370         m68ki_write_32(m68k, ea+0, (UINT32)(data >> 32));
371         m68ki_write_32(m68k, ea+4, (UINT32)(data));
372372         break;
373373      }
374374      case 5:      // (d16, An)
375375      {
376         UINT32 ea = EA_AY_DI_32();
377         m68ki_write_32(ea+0, (UINT32)(data >> 32));
378         m68ki_write_32(ea+4, (UINT32)(data));
376         UINT32 ea = EA_AY_DI_32(m68k);
377         m68ki_write_32(m68k, ea+0, (UINT32)(data >> 32));
378         m68ki_write_32(m68k, ea+4, (UINT32)(data));
379379         break;
380380      }
381381      default:   fatalerror("MC68040: WRITE_EA_64: unhandled mode %d, reg %d, data %08X%08X at %08X\n", mode, reg, (UINT32)(data >> 32), (UINT32)(data), REG_PC);
382382   }
383383}
384384
385static fp_reg READ_EA_FPE(int ea)
385static fp_reg READ_EA_FPE(m68ki_cpu_core *m68k, int ea)
386386{
387387   fp_reg r;
388388   int mode = (ea >> 3) & 0x7;
r3535r3536
397397         UINT32 d1,d2,d3;
398398         UINT32 ea = REG_A[reg];
399399         REG_A[reg] += 12;
400         d1 = m68ki_read_32(ea+0);
401         d2 = m68ki_read_32(ea+4);
402         d3 = m68ki_read_32(ea+8);
400         d1 = m68ki_read_32(m68k, ea+0);
401         d2 = m68ki_read_32(m68k, ea+4);
402         d3 = m68ki_read_32(m68k, ea+8);
403403         r.i = (UINT64)(d1) << 32 | (UINT64)(d2);
404404         break;
405405      }
r3535r3536
409409   return r;
410410}
411411
412static void WRITE_EA_FPE(int ea, fp_reg fpr)
412static void WRITE_EA_FPE(m68ki_cpu_core *m68k, int ea, fp_reg fpr)
413413{
414414   int mode = (ea >> 3) & 0x7;
415415   int reg = (ea & 0x7);
r3535r3536
423423         UINT32 ea;
424424         REG_A[reg] -= 12;
425425         ea = REG_A[reg];
426         m68ki_write_32(ea+0, (UINT32)(fpr.i >> 32));
427         m68ki_write_32(ea+4, (UINT32)(fpr.i));
428         m68ki_write_32(ea+8, 0);
426         m68ki_write_32(m68k, ea+0, (UINT32)(fpr.i >> 32));
427         m68ki_write_32(m68k, ea+4, (UINT32)(fpr.i));
428         m68ki_write_32(m68k, ea+8, 0);
429429         break;
430430      }
431431      default:   fatalerror("MC68040: WRITE_EA_FPE: unhandled mode %d, reg %d, data %f at %08X\n", mode, reg, fpr.f, REG_PC);
r3535r3536
433433}
434434
435435
436static void fpgen_rm_reg(UINT16 w2)
436static void fpgen_rm_reg(m68ki_cpu_core *m68k, UINT16 w2)
437437{
438   int ea = REG_IR & 0x3f;
438   int ea = m68k->ir & 0x3f;
439439   int rm = (w2 >> 14) & 0x1;
440440   int src = (w2 >> 10) & 0x7;
441441   int dst = (w2 >>  7) & 0x7;
r3535r3536
448448      {
449449         case 0:      // Long-Word Integer
450450         {
451            INT32 d = READ_EA_32(ea);
451            INT32 d = READ_EA_32(m68k, ea);
452452            source = (double)(d);
453453            break;
454454         }
455455         case 1:      // Single-precision Real
456456         {
457            UINT32 d = READ_EA_32(ea);
457            UINT32 d = READ_EA_32(m68k, ea);
458458            source = (double)(*(float*)&d);
459459            break;
460460         }
r3535r3536
470470         }
471471         case 4:      // Word Integer
472472         {
473            INT16 d = READ_EA_16(ea);
473            INT16 d = READ_EA_16(m68k, ea);
474474            source = (double)(d);
475475            break;
476476         }
477477         case 5:      // Double-precision Real
478478         {
479            UINT64 d = READ_EA_64(ea);
479            UINT64 d = READ_EA_64(m68k, ea);
480480            source = *(double*)&d;
481481            break;
482482         }
483483         case 6:      // Byte Integer
484484         {
485            INT8 d = READ_EA_8(ea);
485            INT8 d = READ_EA_8(m68k, ea);
486486            source = (double)(d);
487487            break;
488488         }
r3535r3536
499499      case 0x00:      // FMOVE
500500      {
501501         REG_FP[dst].f = source;
502         USE_CYCLES(4);
502         USE_CYCLES(m68k, 4);
503503         break;
504504      }
505505      case 0x04:      // FSQRT
506506      {
507507         REG_FP[dst].f = sqrt(source);
508         SET_CONDITION_CODES(REG_FP[dst]);
509         USE_CYCLES(109);
508         SET_CONDITION_CODES(m68k, REG_FP[dst]);
509         USE_CYCLES(m68k, 109);
510510         break;
511511      }
512512      case 0x18:      // FABS
513513      {
514514         REG_FP[dst].f = fabs(source);
515         SET_CONDITION_CODES(REG_FP[dst]);
516         USE_CYCLES(3);
515         SET_CONDITION_CODES(m68k, REG_FP[dst]);
516         USE_CYCLES(m68k, 3);
517517         break;
518518      }
519519      case 0x1a:      // FNEG
520520      {
521521         REG_FP[dst].f = -source;
522         SET_CONDITION_CODES(REG_FP[dst]);
523         USE_CYCLES(3);
522         SET_CONDITION_CODES(m68k, REG_FP[dst]);
523         USE_CYCLES(m68k, 3);
524524         break;
525525      }
526526      case 0x20:      // FDIV
527527      {
528528         REG_FP[dst].f /= source;
529         USE_CYCLES(43);
529         USE_CYCLES(m68k, 43);
530530         break;
531531      }
532532      case 0x22:      // FADD
533533      {
534534         REG_FP[dst].f += source;
535         SET_CONDITION_CODES(REG_FP[dst]);
536         USE_CYCLES(9);
535         SET_CONDITION_CODES(m68k, REG_FP[dst]);
536         USE_CYCLES(m68k, 9);
537537         break;
538538      }
539539      case 0x23:      // FMUL
540540      {
541541         REG_FP[dst].f *= source;
542         SET_CONDITION_CODES(REG_FP[dst]);
543         USE_CYCLES(11);
542         SET_CONDITION_CODES(m68k, REG_FP[dst]);
543         USE_CYCLES(m68k, 11);
544544         break;
545545      }
546546      case 0x28:      // FSUB
547547      {
548548         REG_FP[dst].f -= source;
549         SET_CONDITION_CODES(REG_FP[dst]);
550         USE_CYCLES(9);
549         SET_CONDITION_CODES(m68k, REG_FP[dst]);
550         USE_CYCLES(m68k, 9);
551551         break;
552552      }
553553      case 0x38:      // FCMP
554554      {
555555         fp_reg res;
556556         res.f = REG_FP[dst].f - source;
557         SET_CONDITION_CODES(res);
558         USE_CYCLES(7);
557         SET_CONDITION_CODES(m68k, res);
558         USE_CYCLES(m68k, 7);
559559         break;
560560      }
561561      case 0x3a:      // FTST
562562      {
563563         fp_reg res;
564564         res.f = source;
565         SET_CONDITION_CODES(res);
566         USE_CYCLES(7);
565         SET_CONDITION_CODES(m68k, res);
566         USE_CYCLES(m68k, 7);
567567         break;
568568      }
569569
r3535r3536
571571   }
572572}
573573
574static void fmove_reg_mem(UINT16 w2)
574static void fmove_reg_mem(m68ki_cpu_core *m68k, UINT16 w2)
575575{
576   int ea = REG_IR & 0x3f;
576   int ea = m68k->ir & 0x3f;
577577   int src = (w2 >>  7) & 0x7;
578578   int dst = (w2 >> 10) & 0x7;
579579   //int kfactor = w2 & 0x7f;
r3535r3536
583583      case 0:      // Long-Word Integer
584584      {
585585         INT32 d = (INT32)(REG_FP[src].f);
586         WRITE_EA_32(ea, d);
586         WRITE_EA_32(m68k, ea, d);
587587         break;
588588      }
589589      case 1:      // Single-precision Real
590590      {
591591         float f = (float)(REG_FP[src].f);
592592         UINT32 d = *(UINT32 *)&f;
593         WRITE_EA_32(ea, d);
593         WRITE_EA_32(m68k, ea, d);
594594         break;
595595      }
596596      case 2:      // Extended-precision Real
r3535r3536
611611      case 5:      // Double-precision Real
612612      {
613613         UINT64 d = REG_FP[src].i;
614         WRITE_EA_64(ea, d);
614         WRITE_EA_64(m68k, ea, d);
615615         break;
616616      }
617617      case 6:      // Byte Integer
r3535r3536
626626      }
627627   }
628628
629   USE_CYCLES(12);
629   USE_CYCLES(m68k, 12);
630630}
631631
632static void fmove_fpcr(UINT16 w2)
632static void fmove_fpcr(m68ki_cpu_core *m68k, UINT16 w2)
633633{
634   int ea = REG_IR & 0x3f;
634   int ea = m68k->ir & 0x3f;
635635   int dir = (w2 >> 13) & 0x1;
636636   int reg = (w2 >> 10) & 0x7;
637637
r3535r3536
639639   {
640640      switch (reg)
641641      {
642         case 1:      WRITE_EA_32(ea, REG_FPIAR); break;
643         case 2:      WRITE_EA_32(ea, REG_FPSR); break;
644         case 4:      WRITE_EA_32(ea, REG_FPCR); break;
642         case 1:      WRITE_EA_32(m68k, ea, REG_FPIAR); break;
643         case 2:      WRITE_EA_32(m68k, ea, REG_FPSR); break;
644         case 4:      WRITE_EA_32(m68k, ea, REG_FPCR); break;
645645         default:   fatalerror("fmove_fpcr: unknown reg %d, dir %d\n", reg, dir);
646646      }
647647   }
r3535r3536
649649   {
650650      switch (reg)
651651      {
652         case 1:      REG_FPIAR = READ_EA_32(ea); break;
653         case 2:      REG_FPSR = READ_EA_32(ea); break;
654         case 4:      REG_FPCR = READ_EA_32(ea); break;
652         case 1:      REG_FPIAR = READ_EA_32(m68k, ea); break;
653         case 2:      REG_FPSR = READ_EA_32(m68k, ea); break;
654         case 4:      REG_FPCR = READ_EA_32(m68k, ea); break;
655655         default:   fatalerror("fmove_fpcr: unknown reg %d, dir %d\n", reg, dir);
656656      }
657657   }
658658
659   USE_CYCLES(10);
659   USE_CYCLES(m68k, 10);
660660}
661661
662static void fmovem(UINT16 w2)
662static void fmovem(m68ki_cpu_core *m68k, UINT16 w2)
663663{
664664   int i;
665   int ea = REG_IR & 0x3f;
665   int ea = m68k->ir & 0x3f;
666666   int dir = (w2 >> 13) & 0x1;
667667   int mode = (w2 >> 11) & 0x3;
668668   int reglist = w2 & 0xff;
r3535r3536
677677            {
678678               if (reglist & (1 << i))
679679               {
680                  WRITE_EA_FPE(ea, REG_FP[i]);
681                  USE_CYCLES(2);
680                  WRITE_EA_FPE(m68k, ea, REG_FP[i]);
681                  USE_CYCLES(m68k, 2);
682682               }
683683            }
684684            break;
r3535r3536
697697            {
698698               if (reglist & (1 << i))
699699               {
700                  REG_FP[7-i] = READ_EA_FPE(ea);
701                  USE_CYCLES(2);
700                  REG_FP[7-i] = READ_EA_FPE(m68k, ea);
701                  USE_CYCLES(m68k, 2);
702702               }
703703            }
704704            break;
r3535r3536
709709   }
710710}
711711
712static void fbcc16(void)
712static void fbcc16(m68ki_cpu_core *m68k)
713713{
714714   INT32 offset;
715   int condition = REG_IR & 0x3f;
715   int condition = m68k->ir & 0x3f;
716716
717   offset = (INT16)(OPER_I_16());
717   offset = (INT16)(OPER_I_16(m68k));
718718
719719   // TODO: condition and jump!!!
720   if (TEST_CONDITION(condition))
720   if (TEST_CONDITION(m68k, condition))
721721   {
722722      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
723      m68ki_branch_16(offset-2);
723      m68ki_branch_16(m68k, offset-2);
724724   }
725725
726   USE_CYCLES(7);
726   USE_CYCLES(m68k, 7);
727727}
728728
729static void fbcc32(void)
729static void fbcc32(m68ki_cpu_core *m68k)
730730{
731731   INT32 offset;
732   int condition = REG_IR & 0x3f;
732   int condition = m68k->ir & 0x3f;
733733
734   offset = OPER_I_32();
734   offset = OPER_I_32(m68k);
735735
736736   // TODO: condition and jump!!!
737   if (TEST_CONDITION(condition))
737   if (TEST_CONDITION(m68k, condition))
738738   {
739739      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
740      m68ki_branch_32(offset-4);
740      m68ki_branch_32(m68k, offset-4);
741741   }
742742
743   USE_CYCLES(7);
743   USE_CYCLES(m68k, 7);
744744}
745745
746746
747void m68040_fpu_op0(void)
747void m68040_fpu_op0(m68ki_cpu_core *m68k)
748748{
749   switch ((REG_IR >> 6) & 0x3)
749   switch ((m68k->ir >> 6) & 0x3)
750750   {
751751      case 0:
752752      {
753         UINT16 w2 = OPER_I_16();
753         UINT16 w2 = OPER_I_16(m68k);
754754         switch ((w2 >> 13) & 0x7)
755755         {
756756            case 0x0:   // FPU ALU FP, FP
757757            case 0x2:   // FPU ALU ea, FP
758758            {
759               fpgen_rm_reg(w2);
759               fpgen_rm_reg(m68k, w2);
760760               break;
761761            }
762762
763763            case 0x3:   // FMOVE FP, ea
764764            {
765               fmove_reg_mem(w2);
765               fmove_reg_mem(m68k, w2);
766766               break;
767767            }
768768
769769            case 0x4:   // FMOVE ea, FPCR
770770            case 0x5:   // FMOVE FPCR, ea
771771            {
772               fmove_fpcr(w2);
772               fmove_fpcr(m68k, w2);
773773               break;
774774            }
775775
776776            case 0x6:   // FMOVEM ea, list
777777            case 0x7:   // FMOVEM list, ea
778778            {
779               fmovem(w2);
779               fmovem(m68k, w2);
780780               break;
781781            }
782782
r3535r3536
787787
788788      case 2:      // FBcc disp16
789789      {
790         fbcc16();
790         fbcc16(m68k);
791791         break;
792792      }
793793      case 3:      // FBcc disp32
794794      {
795         fbcc32();
795         fbcc32(m68k);
796796         break;
797797      }
798798
799      default:   fatalerror("m68040_fpu_op0: unimplemented main op %d\n", (REG_IR >> 6)   & 0x3);
799      default:   fatalerror("m68040_fpu_op0: unimplemented main op %d\n", (m68k->ir >> 6)   & 0x3);
800800   }
801801}
802802
803void m68040_fpu_op1(void)
803void m68040_fpu_op1(m68ki_cpu_core *m68k)
804804{
805   int ea = REG_IR & 0x3f;
805   int ea = m68k->ir & 0x3f;
806806
807   switch ((REG_IR >> 6) & 0x3)
807   switch ((m68k->ir >> 6) & 0x3)
808808   {
809809      case 0:      // FSAVE <ea>
810810      {
811         WRITE_EA_32(ea, 0x00000000);
811         WRITE_EA_32(m68k, ea, 0x00000000);
812812         // TODO: correct state frame
813813         break;
814814      }
815815
816816      case 1:      // FRESTORE <ea>
817817      {
818         READ_EA_32(ea);
818         READ_EA_32(m68k, ea);
819819         // TODO: correct state frame
820820         break;
821821      }
822822
823      default:   fatalerror("m68040_fpu_op1: unimplemented op %d at %08X\n", (REG_IR >> 6) & 0x3, REG_PC-2);
823      default:   fatalerror("m68040_fpu_op1: unimplemented op %d at %08X\n", (m68k->ir >> 6) & 0x3, REG_PC-2);
824824   }
825825}
826826
src/emu/cpu/m68000/m68kcpu.h
r3535r3536
2626#ifndef __M68KCPU_H__
2727#define __M68KCPU_H__
2828
29typedef struct _m68ki_cpu_core m68ki_cpu_core;
30
31#include "devintrf.h"
2932#include "m68k.h"
3033#include <limits.h>
31
32#if M68K_EMULATE_ADDRESS_ERROR
3334#include <setjmp.h>
34#endif /* M68K_EMULATE_ADDRESS_ERROR */
3535
3636/* ======================================================================== */
3737/* ==================== ARCHITECTURE-DEPENDANT DEFINES ==================== */
3838/* ======================================================================== */
3939
4040/* Check for > 32bit sizes */
41#if UINT_MAX > 0xffffffff
42   #define M68K_INT_GT_32_BIT  1
43#else
44   #define M68K_INT_GT_32_BIT  0
45#endif
41#define M68K_INT_GT_32_BIT  0
4642
47/* Data types used in this emulation core */
48#undef sint8
49#undef sint16
50#undef sint32
51#undef sint64
52#undef uint8
53#undef uint16
54#undef uint32
55#undef uint64
56#undef sint
57#undef uint
43#define MAKE_INT_8(A) (INT8)(A)
44#define MAKE_INT_16(A) (INT16)(A)
45#define MAKE_INT_32(A) (INT32)(A)
5846
59#define sint8  signed   char         /* ASG: changed from char to signed char */
60#define sint16 signed   short
61#define sint32 signed   int         /* AWJ: changed from long to int */
62#define uint8  unsigned char
63#define uint16 unsigned short
64#define uint32 unsigned int         /* AWJ: changed from long to int */
6547
66/* signed and unsigned int must be at least 32 bits wide */
67#define sint   signed   int
68#define uint   unsigned int
69
70
71#if M68K_USE_64_BIT
72#define sint64 signed   long long
73#define uint64 unsigned long long
74#else
75#define sint64 sint32
76#define uint64 uint32
77#endif /* M68K_USE_64_BIT */
78
79
80
81/* Allow for architectures that don't have 8-bit sizes */
82#if UCHAR_MAX == 0xff
83   #define MAKE_INT_8(A) (sint8)(A)
84#else
85   #undef  sint8
86   #define sint8  signed   int
87   #undef  uint8
88   #define uint8  unsigned int
89   INLINE sint MAKE_INT_8(uint value)
90   {
91      return (value & 0x80) ? value | ~0xff : value & 0xff;
92   }
93#endif /* UCHAR_MAX == 0xff */
94
95
96/* Allow for architectures that don't have 16-bit sizes */
97#if USHRT_MAX == 0xffff
98   #define MAKE_INT_16(A) (sint16)(A)
99#else
100   #undef  sint16
101   #define sint16 signed   int
102   #undef  uint16
103   #define uint16 unsigned int
104   INLINE sint MAKE_INT_16(uint value)
105   {
106      return (value & 0x8000) ? value | ~0xffff : value & 0xffff;
107   }
108#endif /* USHRT_MAX == 0xffff */
109
110
111/* Allow for architectures that don't have 32-bit sizes */
112#if UINT_MAX == 0xffffffff
113   #define MAKE_INT_32(A) (sint32)(A)
114#else
115   #undef  sint32
116   #define sint32  signed   int
117   #undef  uint32
118   #define uint32  unsigned int
119   INLINE sint MAKE_INT_32(uint value)
120   {
121      return (value & 0x80000000) ? value | ~0xffffffff : value & 0xffffffff;
122   }
123#endif /* UINT_MAX == 0xffffffff */
124
125
126
127
12848/* ======================================================================== */
12949/* ============================ GENERAL DEFINES =========================== */
13050/* ======================================================================== */
r3535r3536
17494#define RUN_MODE_NORMAL          0
17595#define RUN_MODE_BERR_AERR_RESET 1
17696
177#ifndef NULL
178#define NULL ((void*)0)
179#endif
18097
18198/* ======================================================================== */
18299/* ================================ MACROS ================================ */
r3535r3536
251168#endif /* M68K_INT_GT_32_BIT || M68K_USE_64_BIT */
252169
253170/* Simulate address lines of 68k family */
254#define ADDRESS_68K(A) ((A)&CPU_ADDRESS_MASK)
171#define ADDRESS_68K(M, A) ((A) & (M)->address_mask)
255172
256173
257174/* Shift & Rotate Macros. */
r3535r3536
297214/* ------------------------------ CPU Access ------------------------------ */
298215
299216/* Access the CPU registers */
300#define CPU_TYPE         m68ki_cpu.cpu_type
217#define REG_DA           m68k->dar /* easy access to data and address regs */
218#define REG_D            m68k->dar
219#define REG_A            (m68k->dar+8)
220#define REG_PPC        m68k->ppc
221#define REG_PC           m68k->pc
222#define REG_SP_BASE      m68k->sp
223#define REG_USP          m68k->sp[0]
224#define REG_ISP          m68k->sp[4]
225#define REG_MSP          m68k->sp[6]
226#define REG_SP           m68k->dar[15]
301227
302#define REG_DA           m68ki_cpu.dar /* easy access to data and address regs */
303#define REG_D            m68ki_cpu.dar
304#define REG_A            (m68ki_cpu.dar+8)
305#define REG_PPC        m68ki_cpu.ppc
306#define REG_PC           m68ki_cpu.pc
307#define REG_SP_BASE      m68ki_cpu.sp
308#define REG_USP          m68ki_cpu.sp[0]
309#define REG_ISP          m68ki_cpu.sp[4]
310#define REG_MSP          m68ki_cpu.sp[6]
311#define REG_SP           m68ki_cpu.dar[15]
312#define REG_VBR          m68ki_cpu.vbr
313#define REG_SFC          m68ki_cpu.sfc
314#define REG_DFC          m68ki_cpu.dfc
315#define REG_CACR         m68ki_cpu.cacr
316#define REG_CAAR         m68ki_cpu.caar
317#define REG_IR           m68ki_cpu.ir
228#define REG_FP           m68k->fpr
229#define REG_FPCR         m68k->fpcr
230#define REG_FPSR         m68k->fpsr
231#define REG_FPIAR        m68k->fpiar
318232
319#define REG_FP           m68ki_cpu.fpr
320#define REG_FPCR         m68ki_cpu.fpcr
321#define REG_FPSR         m68ki_cpu.fpsr
322#define REG_FPIAR        m68ki_cpu.fpiar
323233
324#define FLAG_T1          m68ki_cpu.t1_flag
325#define FLAG_T0          m68ki_cpu.t0_flag
326#define FLAG_S           m68ki_cpu.s_flag
327#define FLAG_M           m68ki_cpu.m_flag
328#define FLAG_X           m68ki_cpu.x_flag
329#define FLAG_N           m68ki_cpu.n_flag
330#define FLAG_Z           m68ki_cpu.not_z_flag
331#define FLAG_V           m68ki_cpu.v_flag
332#define FLAG_C           m68ki_cpu.c_flag
333#define FLAG_INT_MASK    m68ki_cpu.int_mask
334
335#define CPU_INT_LEVEL    m68ki_cpu.int_level /* ASG: changed from CPU_INTS_PENDING */
336#define CPU_STOPPED      m68ki_cpu.stopped
337#define CPU_PREF_ADDR    m68ki_cpu.pref_addr
338#define CPU_PREF_DATA    m68ki_cpu.pref_data
339#define CPU_ADDRESS_MASK m68ki_cpu.address_mask
340#define CPU_SR_MASK      m68ki_cpu.sr_mask
341#define CPU_INSTR_MODE   m68ki_cpu.instr_mode
342#define CPU_RUN_MODE     m68ki_cpu.run_mode
343
344#define CYC_INSTRUCTION  m68ki_cpu.cyc_instruction
345#define CYC_EXCEPTION    m68ki_cpu.cyc_exception
346#define CYC_BCC_NOTAKE_B m68ki_cpu.cyc_bcc_notake_b
347#define CYC_BCC_NOTAKE_W m68ki_cpu.cyc_bcc_notake_w
348#define CYC_DBCC_F_NOEXP m68ki_cpu.cyc_dbcc_f_noexp
349#define CYC_DBCC_F_EXP   m68ki_cpu.cyc_dbcc_f_exp
350#define CYC_SCC_R_TRUE   m68ki_cpu.cyc_scc_r_true
351#define CYC_MOVEM_W      m68ki_cpu.cyc_movem_w
352#define CYC_MOVEM_L      m68ki_cpu.cyc_movem_l
353#define CYC_SHIFT        m68ki_cpu.cyc_shift
354#define CYC_RESET        m68ki_cpu.cyc_reset
355
356
357#define CALLBACK_INT_ACK      m68ki_cpu.int_ack_callback
358#define CALLBACK_BKPT_ACK     m68ki_cpu.bkpt_ack_callback
359#define CALLBACK_RESET_INSTR  m68ki_cpu.reset_instr_callback
360#define CALLBACK_CMPILD_INSTR m68ki_cpu.cmpild_instr_callback
361#define CALLBACK_RTE_INSTR    m68ki_cpu.rte_instr_callback
362#define CALLBACK_TAS_INSTR    m68ki_cpu.tas_instr_callback
363#define CALLBACK_PC_CHANGED   m68ki_cpu.pc_changed_callback
364#define CALLBACK_SET_FC       m68ki_cpu.set_fc_callback
365#define CALLBACK_INSTR_HOOK   m68ki_cpu.instr_hook_callback
366
367
368
369234/* ----------------------------- Configuration ---------------------------- */
370235
371236/* These defines are dependant on the configuration defines in m68kconf.h */
372237
373238/* Disable certain comparisons if we're not using all CPU types */
374#if M68K_EMULATE_040
239#if HAS_M68040
375240   #define CPU_TYPE_IS_040_PLUS(A)    ((A) & CPU_TYPE_040)
376241   #define CPU_TYPE_IS_040_LESS(A)    1
377242#else
r3535r3536
379244   #define CPU_TYPE_IS_040_LESS(A)    1
380245#endif
381246
382#if M68K_EMULATE_020
247#if HAS_M68020
383248   #define CPU_TYPE_IS_020_PLUS(A)    ((A) & (CPU_TYPE_020 | CPU_TYPE_040))
384249   #define CPU_TYPE_IS_020_LESS(A)    1
385250#else
r3535r3536
387252   #define CPU_TYPE_IS_020_LESS(A)    1
388253#endif
389254
390#if M68K_EMULATE_EC020
255#if HAS_M68EC020
391256   #define CPU_TYPE_IS_EC020_PLUS(A)  ((A) & (CPU_TYPE_EC020 | CPU_TYPE_020 | CPU_TYPE_040))
392257   #define CPU_TYPE_IS_EC020_LESS(A)  ((A) & (CPU_TYPE_000 | CPU_TYPE_008 | CPU_TYPE_010 | CPU_TYPE_EC020))
393258#else
r3535r3536
395260   #define CPU_TYPE_IS_EC020_LESS(A)  CPU_TYPE_IS_020_LESS(A)
396261#endif
397262
398#if M68K_EMULATE_010
263#if HAS_M68010
399264   #define CPU_TYPE_IS_010(A)         ((A) == CPU_TYPE_010)
400265   #define CPU_TYPE_IS_010_PLUS(A)    ((A) & (CPU_TYPE_010 | CPU_TYPE_EC020 | CPU_TYPE_020 | CPU_TYPE_040))
401266   #define CPU_TYPE_IS_010_LESS(A)    ((A) & (CPU_TYPE_000 | CPU_TYPE_008 | CPU_TYPE_010))
r3535r3536
405270   #define CPU_TYPE_IS_010_LESS(A)    CPU_TYPE_IS_EC020_LESS(A)
406271#endif
407272
408#if M68K_EMULATE_020 || M68K_EMULATE_EC020
273#if HAS_M68020 || HAS_M68EC020
409274   #define CPU_TYPE_IS_020_VARIANT(A) ((A) & (CPU_TYPE_EC020 | CPU_TYPE_020))
410275#else
411276   #define CPU_TYPE_IS_020_VARIANT(A) 0
412277#endif
413278
414#if M68K_EMULATE_040 || M68K_EMULATE_020 || M68K_EMULATE_EC020 || M68K_EMULATE_010
279#if HAS_M68040 || HAS_M68020 || HAS_M68EC020 || HAS_M68010
415280   #define CPU_TYPE_IS_000(A)         ((A) == CPU_TYPE_000 || (A) == CPU_TYPE_008)
416281#else
417282   #define CPU_TYPE_IS_000(A)         1
r3535r3536
419284
420285
421286#if !M68K_SEPARATE_READS
422#define m68k_read_immediate_16(A) m68ki_read_program_16(A)
423#define m68k_read_immediate_32(A) m68ki_read_program_32(A)
287#define m68k_read_immediate_16(M, A) m68ki_read_program_16(M, A)
288#define m68k_read_immediate_32(M, A) m68ki_read_program_32(M, A)
424289
425#define m68k_read_pcrelative_8(A) m68ki_read_program_8(A)
426#define m68k_read_pcrelative_16(A) m68ki_read_program_16(A)
427#define m68k_read_pcrelative_32(A) m68ki_read_program_32(A)
290#define m68k_read_pcrelative_8(M, A) m68ki_read_program_8(M, A)
291#define m68k_read_pcrelative_16(M, A) m68ki_read_program_16(M, A)
292#define m68k_read_pcrelative_32(M, A) m68ki_read_program_32(M, A)
428293#endif /* M68K_SEPARATE_READS */
429294
430295
431/* Enable or disable callback functions */
432#if M68K_EMULATE_INT_ACK
433   #if M68K_EMULATE_INT_ACK == OPT_SPECIFY_HANDLER
434      #define m68ki_int_ack(A) M68K_INT_ACK_CALLBACK(A)
435   #else
436      #define m68ki_int_ack(A) CALLBACK_INT_ACK(A)
437   #endif
438#else
439   /* Default action is to used autovector mode, which is most common */
440   #define m68ki_int_ack(A) M68K_INT_ACK_AUTOVECTOR
441#endif /* M68K_EMULATE_INT_ACK */
442
443#if M68K_EMULATE_BKPT_ACK
444   #if M68K_EMULATE_BKPT_ACK == OPT_SPECIFY_HANDLER
445      #define m68ki_bkpt_ack(A) M68K_BKPT_ACK_CALLBACK(A)
446   #else
447      #define m68ki_bkpt_ack(A) CALLBACK_BKPT_ACK(A)
448   #endif
449#else
450   #define m68ki_bkpt_ack(A)
451#endif /* M68K_EMULATE_BKPT_ACK */
452
453#if M68K_EMULATE_RESET
454   #if M68K_EMULATE_RESET == OPT_SPECIFY_HANDLER
455      #define m68ki_output_reset() M68K_RESET_CALLBACK()
456   #else
457      #define m68ki_output_reset() CALLBACK_RESET_INSTR()
458   #endif
459#else
460   #define m68ki_output_reset()
461#endif /* M68K_EMULATE_RESET */
462
463#if M68K_CMPILD_HAS_CALLBACK
464   #if M68K_CMPILD_HAS_CALLBACK == OPT_SPECIFY_HANDLER
465      #define m68ki_cmpild_callback(v,r) M68K_CMPILD_CALLBACK(v,r)
466   #else
467      #define m68ki_cmpild_callback(v,r) CALLBACK_CMPILD_INSTR(v,r)
468   #endif
469#else
470   #define m68ki_cmpild_callback(v,r)
471#endif /* M68K_CMPILD_HAS_CALLBACK */
472
473#if M68K_RTE_HAS_CALLBACK
474   #if M68K_RTE_HAS_CALLBACK == OPT_SPECIFY_HANDLER
475      #define m68ki_rte_callback() M68K_RTE_CALLBACK()
476   #else
477      #define m68ki_rte_callback() CALLBACK_RTE_INSTR()
478   #endif
479#else
480   #define m68ki_rte_callback()
481#endif /* M68K_RTE_HAS_CALLBACK */
482
483#if M68K_TAS_HAS_CALLBACK
484   #if M68K_TAS_HAS_CALLBACK == OPT_SPECIFY_HANDLER
485      #define m68ki_tas_callback() M68K_TAS_CALLBACK()
486   #else
487      #define m68ki_tas_callback() CALLBACK_TAS_INSTR()
488   #endif
489#else
490   #define m68ki_tas_callback()
491#endif /* M68K_TAS_HAS_CALLBACK */
492
493
494#if M68K_INSTRUCTION_HOOK
495   #if M68K_INSTRUCTION_HOOK == OPT_SPECIFY_HANDLER
496      #define m68ki_instr_hook(pc) M68K_INSTRUCTION_CALLBACK(pc)
497   #else
498      #define m68ki_instr_hook(pc) CALLBACK_INSTR_HOOK(pc)
499   #endif
500#else
501   #define m68ki_instr_hook()
502#endif /* M68K_INSTRUCTION_HOOK */
503
504#if M68K_MONITOR_PC
505   #if M68K_MONITOR_PC == OPT_SPECIFY_HANDLER
506      #define m68ki_pc_changed(A) M68K_SET_PC_CALLBACK(ADDRESS_68K(A))
507   #else
508      #define m68ki_pc_changed(A) CALLBACK_PC_CHANGED(ADDRESS_68K(A))
509   #endif
510#else
511   #define m68ki_pc_changed(A)
512#endif /* M68K_MONITOR_PC */
513
514
515296/* Enable or disable function code emulation */
516297#if M68K_EMULATE_FC
517298   #if M68K_EMULATE_FC == OPT_SPECIFY_HANDLER
518299      #define m68ki_set_fc(A) M68K_SET_FC_CALLBACK(A)
519300   #else
520      #define m68ki_set_fc(A) CALLBACK_SET_FC(A)
301      #define m68ki_set_fc(A) m68k->set_fc_callback(A)
521302   #endif
522   #define m68ki_use_data_space() m68ki_address_space = FUNCTION_CODE_USER_DATA
523   #define m68ki_use_program_space() m68ki_address_space = FUNCTION_CODE_USER_PROGRAM
524   #define m68ki_get_address_space() m68ki_address_space
303   #define m68ki_use_data_space(M) (M)->address_space = FUNCTION_CODE_USER_DATA
304   #define m68ki_use_program_space(M) (M)->address_space = FUNCTION_CODE_USER_PROGRAM
305   #define m68ki_get_address_space(M) (M)->address_space
525306#else
526307   #define m68ki_set_fc(A)
527   #define m68ki_use_data_space()
528   #define m68ki_use_program_space()
529   #define m68ki_get_address_space() FUNCTION_CODE_USER_DATA
308   #define m68ki_use_data_space(M)
309   #define m68ki_use_program_space(M)
310   #define m68ki_get_address_space(M) FUNCTION_CODE_USER_DATA
530311#endif /* M68K_EMULATE_FC */
531312
532313
533314/* Enable or disable trace emulation */
534315#if M68K_EMULATE_TRACE
535316   /* Initiates trace checking before each instruction (t1) */
536   #define m68ki_trace_t1() m68ki_tracing = FLAG_T1
317   #define m68ki_trace_t1() m68ki_tracing = m68k->t1_flag
537318   /* adds t0 to trace checking if we encounter change of flow */
538   #define m68ki_trace_t0() m68ki_tracing |= FLAG_T0
319   #define m68ki_trace_t0() m68ki_tracing |= m68k->t0_flag
539320   /* Clear all tracing */
540321   #define m68ki_clear_trace() m68ki_tracing = 0
541322   /* Cause a trace exception if we are tracing */
542   #define m68ki_exception_if_trace() if(m68ki_tracing) m68ki_exception_trace()
323   #define m68ki_exception_if_trace() if(m68ki_tracing) m68ki_exception_trace(m68k)
543324#else
544325   #define m68ki_trace_t1()
545326   #define m68ki_trace_t0()
r3535r3536
550331
551332
552333/* Address error */
553#if M68K_EMULATE_ADDRESS_ERROR
554   #include <setjmp.h>
555   extern jmp_buf m68ki_aerr_trap;
556
557   #define m68ki_set_address_error_trap() \
558      if(setjmp(m68ki_aerr_trap) != 0) \
334#define m68ki_set_address_error_trap(m68k) \
335   if(setjmp(m68k->aerr_trap) != 0) \
336   { \
337      m68ki_exception_address_error(m68k); \
338      if(m68k->stopped) \
559339      { \
560         m68ki_exception_address_error(); \
561         if(CPU_STOPPED) \
562         { \
563            SET_CYCLES(0); \
564            return m68ki_initial_cycles; \
565         } \
566      }
340         SET_CYCLES(m68k, 0); \
341         return m68k->initial_cycles; \
342      } \
343   }
567344
568   #define m68ki_check_address_error(ADDR, WRITE_MODE, FC) \
569      if((ADDR)&1) \
570      { \
571         m68ki_aerr_address = ADDR; \
572         m68ki_aerr_write_mode = WRITE_MODE; \
573         m68ki_aerr_fc = FC; \
574         longjmp(m68ki_aerr_trap, 1); \
575      }
345#define m68ki_check_address_error(m68k, ADDR, WRITE_MODE, FC) \
346   if((ADDR)&1) \
347   { \
348      m68k->aerr_address = ADDR; \
349      m68k->aerr_write_mode = WRITE_MODE; \
350      m68k->aerr_fc = FC; \
351      longjmp(m68k->aerr_trap, 1); \
352   }
576353
577   #define m68ki_check_address_error_010_less(ADDR, WRITE_MODE, FC) \
578      if (CPU_TYPE_IS_010_LESS(CPU_TYPE)) \
579      { \
580         m68ki_check_address_error(ADDR, WRITE_MODE, FC) \
581      }
582#else
583   #define m68ki_set_address_error_trap()
584   #define m68ki_check_address_error(ADDR, WRITE_MODE, FC)
585   #define m68ki_check_address_error_010_less(ADDR, WRITE_MODE, FC)
586#endif /* M68K_ADDRESS_ERROR */
587
588354/* Logging */
589355#if M68K_LOG_ENABLE
590356   #include <stdio.h>
r3535r3536
612378 * where XXX is register X and YYY is register Y
613379 */
614380/* Data Register Isolation */
615#define DX (REG_D[(REG_IR >> 9) & 7])
616#define DY (REG_D[REG_IR & 7])
381#define DX (REG_D[(m68k->ir >> 9) & 7])
382#define DY (REG_D[m68k->ir & 7])
617383/* Address Register Isolation */
618#define AX (REG_A[(REG_IR >> 9) & 7])
619#define AY (REG_A[REG_IR & 7])
384#define AX (REG_A[(m68k->ir >> 9) & 7])
385#define AY (REG_A[m68k->ir & 7])
620386
621387
622388/* Effective Address Calculations */
623#define EA_AY_AI_8()   AY                                    /* address register indirect */
624#define EA_AY_AI_16()  EA_AY_AI_8()
625#define EA_AY_AI_32()  EA_AY_AI_8()
626#define EA_AY_PI_8()   (AY++)                                /* postincrement (size = byte) */
627#define EA_AY_PI_16()  ((AY+=2)-2)                           /* postincrement (size = word) */
628#define EA_AY_PI_32()  ((AY+=4)-4)                           /* postincrement (size = long) */
629#define EA_AY_PD_8()   (--AY)                                /* predecrement (size = byte) */
630#define EA_AY_PD_16()  (AY-=2)                               /* predecrement (size = word) */
631#define EA_AY_PD_32()  (AY-=4)                               /* predecrement (size = long) */
632#define EA_AY_DI_8()   (AY+MAKE_INT_16(m68ki_read_imm_16())) /* displacement */
633#define EA_AY_DI_16()  EA_AY_DI_8()
634#define EA_AY_DI_32()  EA_AY_DI_8()
635#define EA_AY_IX_8()   m68ki_get_ea_ix(AY)                   /* indirect + index */
636#define EA_AY_IX_16()  EA_AY_IX_8()
637#define EA_AY_IX_32()  EA_AY_IX_8()
389#define EA_AY_AI_8(m68k)   AY                                    /* address register indirect */
390#define EA_AY_AI_16(m68k)  EA_AY_AI_8(m68k)
391#define EA_AY_AI_32(m68k)  EA_AY_AI_8(m68k)
392#define EA_AY_PI_8(m68k)   (AY++)                                /* postincrement (size = byte) */
393#define EA_AY_PI_16(m68k)  ((AY+=2)-2)                           /* postincrement (size = word) */
394#define EA_AY_PI_32(m68k)  ((AY+=4)-4)                           /* postincrement (size = long) */
395#define EA_AY_PD_8(m68k)   (--AY)                                /* predecrement (size = byte) */
396#define EA_AY_PD_16(m68k)  (AY-=2)                               /* predecrement (size = word) */
397#define EA_AY_PD_32(m68k)  (AY-=4)                               /* predecrement (size = long) */
398#define EA_AY_DI_8(m68k)   (AY+MAKE_INT_16(m68ki_read_imm_16(m68k))) /* displacement */
399#define EA_AY_DI_16(m68k)  EA_AY_DI_8(m68k)
400#define EA_AY_DI_32(m68k)  EA_AY_DI_8(m68k)
401#define EA_AY_IX_8(m68k)   m68ki_get_ea_ix(m68k, AY)                   /* indirect + index */
402#define EA_AY_IX_16(m68k)  EA_AY_IX_8(m68k)
403#define EA_AY_IX_32(m68k)  EA_AY_IX_8(m68k)
638404
639#define EA_AX_AI_8()   AX
640#define EA_AX_AI_16()  EA_AX_AI_8()
641#define EA_AX_AI_32()  EA_AX_AI_8()
642#define EA_AX_PI_8()   (AX++)
643#define EA_AX_PI_16()  ((AX+=2)-2)
644#define EA_AX_PI_32()  ((AX+=4)-4)
645#define EA_AX_PD_8()   (--AX)
646#define EA_AX_PD_16()  (AX-=2)
647#define EA_AX_PD_32()  (AX-=4)
648#define EA_AX_DI_8()   (AX+MAKE_INT_16(m68ki_read_imm_16()))
649#define EA_AX_DI_16()  EA_AX_DI_8()
650#define EA_AX_DI_32()  EA_AX_DI_8()
651#define EA_AX_IX_8()   m68ki_get_ea_ix(AX)
652#define EA_AX_IX_16()  EA_AX_IX_8()
653#define EA_AX_IX_32()  EA_AX_IX_8()
405#define EA_AX_AI_8(m68k)   AX
406#define EA_AX_AI_16(m68k)  EA_AX_AI_8(m68k)
407#define EA_AX_AI_32(m68k)  EA_AX_AI_8(m68k)
408#define EA_AX_PI_8(m68k)   (AX++)
409#define EA_AX_PI_16(m68k)  ((AX+=2)-2)
410#define EA_AX_PI_32(m68k)  ((AX+=4)-4)
411#define EA_AX_PD_8(m68k)   (--AX)
412#define EA_AX_PD_16(m68k)  (AX-=2)
413#define EA_AX_PD_32(m68k)  (AX-=4)
414#define EA_AX_DI_8(m68k)   (AX+MAKE_INT_16(m68ki_read_imm_16(m68k)))
415#define EA_AX_DI_16(m68k)  EA_AX_DI_8(m68k)
416#define EA_AX_DI_32(m68k)  EA_AX_DI_8(m68k)
417#define EA_AX_IX_8(m68k)   m68ki_get_ea_ix(m68k, AX)
418#define EA_AX_IX_16(m68k)  EA_AX_IX_8(m68k)
419#define EA_AX_IX_32(m68k)  EA_AX_IX_8(m68k)
654420
655#define EA_A7_PI_8()   ((REG_A[7]+=2)-2)
656#define EA_A7_PD_8()   (REG_A[7]-=2)
421#define EA_A7_PI_8(m68k)   ((REG_A[7]+=2)-2)
422#define EA_A7_PD_8(m68k)   (REG_A[7]-=2)
657423
658#define EA_AW_8()      MAKE_INT_16(m68ki_read_imm_16())      /* absolute word */
659#define EA_AW_16()     EA_AW_8()
660#define EA_AW_32()     EA_AW_8()
661#define EA_AL_8()      m68ki_read_imm_32()                   /* absolute long */
662#define EA_AL_16()     EA_AL_8()
663#define EA_AL_32()     EA_AL_8()
664#define EA_PCDI_8()    m68ki_get_ea_pcdi()                   /* pc indirect + displacement */
665#define EA_PCDI_16()   EA_PCDI_8()
666#define EA_PCDI_32()   EA_PCDI_8()
667#define EA_PCIX_8()    m68ki_get_ea_pcix()                   /* pc indirect + index */
668#define EA_PCIX_16()   EA_PCIX_8()
669#define EA_PCIX_32()   EA_PCIX_8()
424#define EA_AW_8(m68k)      MAKE_INT_16(m68ki_read_imm_16(m68k))      /* absolute word */
425#define EA_AW_16(m68k)     EA_AW_8(m68k)
426#define EA_AW_32(m68k)     EA_AW_8(m68k)
427#define EA_AL_8(m68k)      m68ki_read_imm_32(m68k)                   /* absolute long */
428#define EA_AL_16(m68k)     EA_AL_8(m68k)
429#define EA_AL_32(m68k)     EA_AL_8(m68k)
430#define EA_PCDI_8(m68k)    m68ki_get_ea_pcdi(m68k)                   /* pc indirect + displacement */
431#define EA_PCDI_16(m68k)   EA_PCDI_8(m68k)
432#define EA_PCDI_32(m68k)   EA_PCDI_8(m68k)
433#define EA_PCIX_8(m68k)    m68ki_get_ea_pcix(m68k)                   /* pc indirect + index */
434#define EA_PCIX_16(m68k)   EA_PCIX_8(m68k)
435#define EA_PCIX_32(m68k)   EA_PCIX_8(m68k)
670436
671437
672#define OPER_I_8()     m68ki_read_imm_8()
673#define OPER_I_16()    m68ki_read_imm_16()
674#define OPER_I_32()    m68ki_read_imm_32()
438#define OPER_I_8(m68k)     m68ki_read_imm_8(m68k)
439#define OPER_I_16(m68k)    m68ki_read_imm_16(m68k)
440#define OPER_I_32(m68k)    m68ki_read_imm_32(m68k)
675441
676442
677443
r3535r3536
725491#define MFLAG_CLEAR 0
726492
727493/* Turn flag values into 1 or 0 */
728#define XFLAG_AS_1() ((FLAG_X>>8)&1)
729#define NFLAG_AS_1() ((FLAG_N>>7)&1)
730#define VFLAG_AS_1() ((FLAG_V>>7)&1)
731#define ZFLAG_AS_1() (!FLAG_Z)
732#define CFLAG_AS_1() ((FLAG_C>>8)&1)
494#define XFLAG_AS_1(M) (((M)->x_flag>>8)&1)
495#define NFLAG_AS_1(M) (((M)->n_flag>>7)&1)
496#define VFLAG_AS_1(M) (((M)->v_flag>>7)&1)
497#define ZFLAG_AS_1(M) (!(M)->not_z_flag)
498#define CFLAG_AS_1(M) (((M)->c_flag>>8)&1)
733499
734500
735501/* Conditions */
736#define COND_CS() (FLAG_C&0x100)
737#define COND_CC() (!COND_CS())
738#define COND_VS() (FLAG_V&0x80)
739#define COND_VC() (!COND_VS())
740#define COND_NE() FLAG_Z
741#define COND_EQ() (!COND_NE())
742#define COND_MI() (FLAG_N&0x80)
743#define COND_PL() (!COND_MI())
744#define COND_LT() ((FLAG_N^FLAG_V)&0x80)
745#define COND_GE() (!COND_LT())
746#define COND_HI() (COND_CC() && COND_NE())
747#define COND_LS() (COND_CS() || COND_EQ())
748#define COND_GT() (COND_GE() && COND_NE())
749#define COND_LE() (COND_LT() || COND_EQ())
502#define COND_CS(M) ((M)->c_flag&0x100)
503#define COND_CC(M) (!COND_CS(M))
504#define COND_VS(M) ((M)->v_flag&0x80)
505#define COND_VC(M) (!COND_VS(M))
506#define COND_NE(M) (M)->not_z_flag
507#define COND_EQ(M) (!COND_NE(M))
508#define COND_MI(M) ((M)->n_flag&0x80)
509#define COND_PL(M) (!COND_MI(M))
510#define COND_LT(M) (((M)->n_flag^(M)->v_flag)&0x80)
511#define COND_GE(M) (!COND_LT(M))
512#define COND_HI(M) (COND_CC(M) && COND_NE(M))
513#define COND_LS(M) (COND_CS(M) || COND_EQ(M))
514#define COND_GT(M) (COND_GE(M) && COND_NE(M))
515#define COND_LE(M) (COND_LT(M) || COND_EQ(M))
750516
751517/* Reversed conditions */
752#define COND_NOT_CS() COND_CC()
753#define COND_NOT_CC() COND_CS()
754#define COND_NOT_VS() COND_VC()
755#define COND_NOT_VC() COND_VS()
756#define COND_NOT_NE() COND_EQ()
757#define COND_NOT_EQ() COND_NE()
758#define COND_NOT_MI() COND_PL()
759#define COND_NOT_PL() COND_MI()
760#define COND_NOT_LT() COND_GE()
761#define COND_NOT_GE() COND_LT()
762#define COND_NOT_HI() COND_LS()
763#define COND_NOT_LS() COND_HI()
764#define COND_NOT_GT() COND_LE()
765#define COND_NOT_LE() COND_GT()
518#define COND_NOT_CS(M) COND_CC(M)
519#define COND_NOT_CC(M) COND_CS(M)
520#define COND_NOT_VS(M) COND_VC(M)
521#define COND_NOT_VC(M) COND_VS(M)
522#define COND_NOT_NE(M) COND_EQ(M)
523#define COND_NOT_EQ(M) COND_NE(M)
524#define COND_NOT_MI(M) COND_PL(M)
525#define COND_NOT_PL(M) COND_MI(M)
526#define COND_NOT_LT(M) COND_GE(M)
527#define COND_NOT_GE(M) COND_LT(M)
528#define COND_NOT_HI(M) COND_LS(M)
529#define COND_NOT_LS(M) COND_HI(M)
530#define COND_NOT_GT(M) COND_LE(M)
531#define COND_NOT_LE(M) COND_GT(M)
766532
767533/* Not real conditions, but here for convenience */
768#define COND_XS() (FLAG_X&0x100)
769#define COND_XC() (!COND_XS)
534#define COND_XS(M) ((M)->x_flag&0x100)
535#define COND_XC(M) (!COND_XS)
770536
771537
772538/* Get the condition code register */
773#define m68ki_get_ccr() ((COND_XS() >> 4) | \
774                   (COND_MI() >> 4) | \
775                   (COND_EQ() << 2) | \
776                   (COND_VS() >> 6) | \
777                   (COND_CS() >> 8))
539#define m68ki_get_ccr(M)    ((COND_XS(M) >> 4) | \
540                       (COND_MI(M) >> 4) | \
541                       (COND_EQ(M) << 2) | \
542                       (COND_VS(M) >> 6) | \
543                       (COND_CS(M) >> 8))
778544
779545/* Get the status register */
780#define m68ki_get_sr() ( FLAG_T1              | \
781                   FLAG_T0              | \
782                  (FLAG_S        << 11) | \
783                  (FLAG_M        << 11) | \
784                   FLAG_INT_MASK        | \
785                   m68ki_get_ccr())
546#define m68ki_get_sr(M)    ((M)->t1_flag         | \
547                       (M)->t0_flag         | \
548                      ((M)->s_flag   << 11) | \
549                      ((M)->m_flag   << 11) | \
550                       (M)->int_mask        | \
551                       m68ki_get_ccr(M))
786552
787553
788554
789555/* ---------------------------- Cycle Counting ---------------------------- */
790556
791#define ADD_CYCLES(A)    m68ki_remaining_cycles += (A)
792#define USE_CYCLES(A)    m68ki_remaining_cycles -= (A)
793#define SET_CYCLES(A)    m68ki_remaining_cycles = A
794#define GET_CYCLES()     m68ki_remaining_cycles
795#define USE_ALL_CYCLES() m68ki_remaining_cycles = 0
557#define ADD_CYCLES(M, A)         (M)->remaining_cycles += (A)
558#define USE_CYCLES(M, A)         (M)->remaining_cycles -= (A)
559#define SET_CYCLES(M, A)         (M)->remaining_cycles = A
560#define GET_CYCLES(M)            (M)->remaining_cycles
561#define USE_ALL_CYCLES(M)          (M)->remaining_cycles = 0
796562
797563
798564
799565/* ----------------------------- Read / Write ----------------------------- */
800566
801567/* Read from the current address space */
802#define m68ki_read_8(A)  m68ki_read_8_fc (A, FLAG_S | m68ki_get_address_space())
803#define m68ki_read_16(A) m68ki_read_16_fc(A, FLAG_S | m68ki_get_address_space())
804#define m68ki_read_32(A) m68ki_read_32_fc(A, FLAG_S | m68ki_get_address_space())
568#define m68ki_read_8(M, A)         m68ki_read_8_fc (M, A, m68k->s_flag | m68ki_get_address_space(M))
569#define m68ki_read_16(M, A)         m68ki_read_16_fc(M, A, m68k->s_flag | m68ki_get_address_space(M))
570#define m68ki_read_32(M, A)         m68ki_read_32_fc(M, A, m68k->s_flag | m68ki_get_address_space(M))
805571
806572/* Write to the current data space */
807#define m68ki_write_8(A, V)  m68ki_write_8_fc (A, FLAG_S | FUNCTION_CODE_USER_DATA, V)
808#define m68ki_write_16(A, V) m68ki_write_16_fc(A, FLAG_S | FUNCTION_CODE_USER_DATA, V)
809#define m68ki_write_32(A, V) m68ki_write_32_fc(A, FLAG_S | FUNCTION_CODE_USER_DATA, V)
573#define m68ki_write_8(M, A, V)      m68ki_write_8_fc (M, A, m68k->s_flag | FUNCTION_CODE_USER_DATA, V)
574#define m68ki_write_16(M, A, V)      m68ki_write_16_fc(M, A, m68k->s_flag | FUNCTION_CODE_USER_DATA, V)
575#define m68ki_write_32(M, A, V)      m68ki_write_32_fc(M, A, m68k->s_flag | FUNCTION_CODE_USER_DATA, V)
576#define m68ki_write_32_pd(M, A, V)   m68ki_write_32_pd_fc(M, A, m68k->s_flag | FUNCTION_CODE_USER_DATA, V)
810577
811#if M68K_SIMULATE_PD_WRITES
812#define m68ki_write_32_pd(A, V) m68ki_write_32_pd_fc(A, FLAG_S | FUNCTION_CODE_USER_DATA, V)
813#else
814#define m68ki_write_32_pd(A, V) m68ki_write_32_fc(A, FLAG_S | FUNCTION_CODE_USER_DATA, V)
815#endif
816
817578/* map read immediate 8 to read immediate 16 */
818#define m68ki_read_imm_8() MASK_OUT_ABOVE_8(m68ki_read_imm_16())
579#define m68ki_read_imm_8(M)         MASK_OUT_ABOVE_8(m68ki_read_imm_16(M))
819580
820581/* Map PC-relative reads */
821#define m68ki_read_pcrel_8(A) m68k_read_pcrelative_8(A)
822#define m68ki_read_pcrel_16(A) m68k_read_pcrelative_16(A)
823#define m68ki_read_pcrel_32(A) m68k_read_pcrelative_32(A)
582#define m68ki_read_pcrel_8(M, A)    m68k_read_pcrelative_8(M, A)
583#define m68ki_read_pcrel_16(M, A)    m68k_read_pcrelative_16(M, A)
584#define m68ki_read_pcrel_32(M, A)    m68k_read_pcrelative_32(M, A)
824585
825586/* Read from the program space */
826#define m68ki_read_program_8(A)    m68ki_read_8_fc(A, FLAG_S | FUNCTION_CODE_USER_PROGRAM)
827#define m68ki_read_program_16(A)    m68ki_read_16_fc(A, FLAG_S | FUNCTION_CODE_USER_PROGRAM)
828#define m68ki_read_program_32(A)    m68ki_read_32_fc(A, FLAG_S | FUNCTION_CODE_USER_PROGRAM)
587#define m68ki_read_program_8(M, A)    m68ki_read_8_fc(M, A, m68k->s_flag | FUNCTION_CODE_USER_PROGRAM)
588#define m68ki_read_program_16(M, A) m68ki_read_16_fc(M, A, m68k->s_flag | FUNCTION_CODE_USER_PROGRAM)
589#define m68ki_read_program_32(M, A) m68ki_read_32_fc(M, A, m68k->s_flag | FUNCTION_CODE_USER_PROGRAM)
829590
830591/* Read from the data space */
831#define m68ki_read_data_8(A)    m68ki_read_8_fc(A, FLAG_S | FUNCTION_CODE_USER_DATA)
832#define m68ki_read_data_16(A)    m68ki_read_16_fc(A, FLAG_S | FUNCTION_CODE_USER_DATA)
833#define m68ki_read_data_32(A)    m68ki_read_32_fc(A, FLAG_S | FUNCTION_CODE_USER_DATA)
592#define m68ki_read_data_8(M, A)    m68ki_read_8_fc(M, A, m68k->s_flag | FUNCTION_CODE_USER_DATA)
593#define m68ki_read_data_16(M, A)    m68ki_read_16_fc(M, A, m68k->s_flag | FUNCTION_CODE_USER_DATA)
594#define m68ki_read_data_32(M, A)    m68ki_read_32_fc(M, A, m68k->s_flag | FUNCTION_CODE_USER_DATA)
834595
835596
836597
r3535r3536
846607};
847608
848609
849typedef struct _m68ki_cpu_core m68ki_cpu_core;
850610struct _m68ki_cpu_core
851611{
852   uint cpu_type;     /* CPU Type: 68000, 68008, 68010, 68EC020, or 68020 */
853   uint dar[16];      /* Data and Address Registers */
854   uint ppc;         /* Previous program counter */
855   uint pc;           /* Program Counter */
856   uint sp[7];        /* User, Interrupt, and Master Stack Pointers */
857   uint vbr;          /* Vector Base Register (m68010+) */
858   uint sfc;          /* Source Function Code Register (m68010+) */
859   uint dfc;          /* Destination Function Code Register (m68010+) */
860   uint cacr;         /* Cache Control Register (m68020, unemulated) */
861   uint caar;         /* Cache Address Register (m68020, unemulated) */
862   uint ir;           /* Instruction Register */
612   UINT32 cpu_type;     /* CPU Type: 68000, 68008, 68010, 68EC020, or 68020 */
613   UINT32 dar[16];      /* Data and Address Registers */
614   UINT32 ppc;         /* Previous program counter */
615   UINT32 pc;           /* Program Counter */
616   UINT32 sp[7];        /* User, Interrupt, and Master Stack Pointers */
617   UINT32 vbr;          /* Vector Base Register (m68010+) */
618   UINT32 sfc;          /* Source Function Code Register (m68010+) */
619   UINT32 dfc;          /* Destination Function Code Register (m68010+) */
620   UINT32 cacr;         /* Cache Control Register (m68020, unemulated) */
621   UINT32 caar;         /* Cache Address Register (m68020, unemulated) */
622   UINT32 ir;           /* Instruction Register */
863623    fp_reg fpr[8];     /* FPU Data Register (m68040) */
864   uint fpiar;        /* FPU Instruction Address Register (m68040) */
865   uint fpsr;         /* FPU Status Register (m68040) */
866   uint fpcr;         /* FPU Control Register (m68040) */
867   uint t1_flag;      /* Trace 1 */
868   uint t0_flag;      /* Trace 0 */
869   uint s_flag;       /* Supervisor */
870   uint m_flag;       /* Master/Interrupt state */
871   uint x_flag;       /* Extend */
872   uint n_flag;       /* Negative */
873   uint not_z_flag;   /* Zero, inverted for speedups */
874   uint v_flag;       /* Overflow */
875   uint c_flag;       /* Carry */
876   uint int_mask;     /* I0-I2 */
877   uint int_level;    /* State of interrupt pins IPL0-IPL2 -- ASG: changed from ints_pending */
878   uint stopped;      /* Stopped state */
879   uint pref_addr;    /* Last prefetch address */
880   uint pref_data;    /* Data in the prefetch queue */
881   uint address_mask; /* Available address pins */
882   uint sr_mask;      /* Implemented status register bits */
883   uint instr_mode;   /* Stores whether we are in instruction mode or group 0/1 exception mode */
884   uint run_mode;     /* Stores whether we are processing a reset, bus error, address error, or something else */
624   UINT32 fpiar;        /* FPU Instruction Address Register (m68040) */
625   UINT32 fpsr;         /* FPU Status Register (m68040) */
626   UINT32 fpcr;         /* FPU Control Register (m68040) */
627   UINT32 t1_flag;      /* Trace 1 */
628   UINT32 t0_flag;      /* Trace 0 */
629   UINT32 s_flag;       /* Supervisor */
630   UINT32 m_flag;       /* Master/Interrupt state */
631   UINT32 x_flag;       /* Extend */
632   UINT32 n_flag;       /* Negative */
633   UINT32 not_z_flag;   /* Zero, inverted for speedups */
634   UINT32 v_flag;       /* Overflow */
635   UINT32 c_flag;       /* Carry */
636   UINT32 int_mask;     /* I0-I2 */
637   UINT32 int_level;    /* State of interrupt pins IPL0-IPL2 -- ASG: changed from ints_pending */
638   UINT32 stopped;      /* Stopped state */
639   UINT32 pref_addr;    /* Last prefetch address */
640   UINT32 pref_data;    /* Data in the prefetch queue */
641   UINT32 address_mask; /* Available address pins */
642   UINT32 sr_mask;      /* Implemented status register bits */
643   UINT32 instr_mode;   /* Stores whether we are in instruction mode or group 0/1 exception mode */
644   UINT32 run_mode;     /* Stores whether we are processing a reset, bus error, address error, or something else */
885645
886646   /* Clocks required for instructions / exceptions */
887   uint cyc_bcc_notake_b;
888   uint cyc_bcc_notake_w;
889   uint cyc_dbcc_f_noexp;
890   uint cyc_dbcc_f_exp;
891   uint cyc_scc_r_true;
892   uint cyc_movem_w;
893   uint cyc_movem_l;
894   uint cyc_shift;
895   uint cyc_reset;
647   UINT32 cyc_bcc_notake_b;
648   UINT32 cyc_bcc_notake_w;
649   UINT32 cyc_dbcc_f_noexp;
650   UINT32 cyc_dbcc_f_exp;
651   UINT32 cyc_scc_r_true;
652   UINT32 cyc_movem_w;
653   UINT32 cyc_movem_l;
654   UINT32 cyc_shift;
655   UINT32 cyc_reset;
896656
657   int  initial_cycles;
658   int  remaining_cycles;                     /* Number of clocks remaining */
659   UINT32 tracing;
660   UINT32 address_space;
661
662   jmp_buf aerr_trap;
663   UINT32    aerr_address;
664   UINT32    aerr_write_mode;
665   UINT32    aerr_fc;
666
897667   /* Virtual IRQ lines state */
898   uint virq_state;
899   uint nmi_pending;
668   UINT32 virq_state;
669   UINT32 nmi_pending;
900670
901   const uint8* cyc_instruction;
902   const uint8* cyc_exception;
671   const UINT8* cyc_instruction;
672   const UINT8* cyc_exception;
903673
904674   /* Callbacks to host */
905   int  (*int_ack_callback)(int int_line);           /* Interrupt Acknowledge */
675   int  (*int_ack_callback)(void *param, int int_line);/* Interrupt Acknowledge */
676   void *int_ack_param;
906677   void (*bkpt_ack_callback)(unsigned int data);     /* Breakpoint Acknowledge */
907678   void (*reset_instr_callback)(void);               /* Called when a RESET instruction is encountered */
908679   void (*cmpild_instr_callback)(unsigned int, int); /* Called when a CMPI.L #v, Dn instruction is encountered */
r3535r3536
915686};
916687
917688
918extern m68ki_cpu_core m68ki_cpu;
919extern sint           m68ki_remaining_cycles;
920extern uint           m68ki_tracing;
921extern const uint8    m68ki_shift_8_table[];
922extern const uint16   m68ki_shift_16_table[];
923extern const uint     m68ki_shift_32_table[];
924extern const uint8    m68ki_exception_cycle_table[][256];
925extern uint           m68ki_address_space;
926extern const uint8    m68ki_ea_idx_cycle_table[];
689extern const UINT8    m68ki_shift_8_table[];
690extern const UINT16   m68ki_shift_16_table[];
691extern const UINT32     m68ki_shift_32_table[];
692extern const UINT8    m68ki_exception_cycle_table[][256];
693extern const UINT8    m68ki_ea_idx_cycle_table[];
927694
928extern uint           m68ki_aerr_address;
929extern uint           m68ki_aerr_write_mode;
930extern uint           m68ki_aerr_fc;
931
932695/* Read data immediately after the program counter */
933INLINE uint m68ki_read_imm_16(void);
934INLINE uint m68ki_read_imm_32(void);
696INLINE UINT32 m68ki_read_imm_16(m68ki_cpu_core *m68k);
697INLINE UINT32 m68ki_read_imm_32(m68ki_cpu_core *m68k);
935698
936699/* Read data with specific function code */
937INLINE uint m68ki_read_8_fc  (uint address, uint fc);
938INLINE uint m68ki_read_16_fc (uint address, uint fc);
939INLINE uint m68ki_read_32_fc (uint address, uint fc);
700INLINE UINT32 m68ki_read_8_fc  (m68ki_cpu_core *m68k, UINT32 address, UINT32 fc);
701INLINE UINT32 m68ki_read_16_fc (m68ki_cpu_core *m68k, UINT32 address, UINT32 fc);
702INLINE UINT32 m68ki_read_32_fc (m68ki_cpu_core *m68k, UINT32 address, UINT32 fc);
940703
941704/* Write data with specific function code */
942INLINE void m68ki_write_8_fc (uint address, uint fc, uint value);
943INLINE void m68ki_write_16_fc(uint address, uint fc, uint value);
944INLINE void m68ki_write_32_fc(uint address, uint fc, uint value);
945#if M68K_SIMULATE_PD_WRITES
946INLINE void m68ki_write_32_pd_fc(uint address, uint fc, uint value);
947#endif /* M68K_SIMULATE_PD_WRITES */
705INLINE void m68ki_write_8_fc (m68ki_cpu_core *m68k, UINT32 address, UINT32 fc, UINT32 value);
706INLINE void m68ki_write_16_fc(m68ki_cpu_core *m68k, UINT32 address, UINT32 fc, UINT32 value);
707INLINE void m68ki_write_32_fc(m68ki_cpu_core *m68k, UINT32 address, UINT32 fc, UINT32 value);
708INLINE void m68ki_write_32_pd_fc(m68ki_cpu_core *m68k, UINT32 address, UINT32 fc, UINT32 value);
948709
949710/* Indexed and PC-relative ea fetching */
950INLINE uint m68ki_get_ea_pcdi(void);
951INLINE uint m68ki_get_ea_pcix(void);
952INLINE uint m68ki_get_ea_ix(uint An);
711INLINE UINT32 m68ki_get_ea_pcdi(m68ki_cpu_core *m68k);
712INLINE UINT32 m68ki_get_ea_pcix(m68ki_cpu_core *m68k);
713INLINE UINT32 m68ki_get_ea_ix(m68ki_cpu_core *m68k, UINT32 An);
953714
954715/* Operand fetching */
955INLINE uint OPER_AY_AI_8(void);
956INLINE uint OPER_AY_AI_16(void);
957INLINE uint OPER_AY_AI_32(void);
958INLINE uint OPER_AY_PI_8(void);
959INLINE uint OPER_AY_PI_16(void);
960INLINE uint OPER_AY_PI_32(void);
961INLINE uint OPER_AY_PD_8(void);
962INLINE uint OPER_AY_PD_16(void);
963INLINE uint OPER_AY_PD_32(void);
964INLINE uint OPER_AY_DI_8(void);
965INLINE uint OPER_AY_DI_16(void);
966INLINE uint OPER_AY_DI_32(void);
967INLINE uint OPER_AY_IX_8(void);
968INLINE uint OPER_AY_IX_16(void);
969INLINE uint OPER_AY_IX_32(void);
716INLINE UINT32 OPER_AY_AI_8(m68ki_cpu_core *m68k);
717INLINE UINT32 OPER_AY_AI_16(m68ki_cpu_core *m68k);
718INLINE UINT32 OPER_AY_AI_32(m68ki_cpu_core *m68k);
719INLINE UINT32 OPER_AY_PI_8(m68ki_cpu_core *m68k);
720INLINE UINT32 OPER_AY_PI_16(m68ki_cpu_core *m68k);
721INLINE UINT32 OPER_AY_PI_32(m68ki_cpu_core *m68k);
722INLINE UINT32 OPER_AY_PD_8(m68ki_cpu_core *m68k);
723INLINE UINT32 OPER_AY_PD_16(m68ki_cpu_core *m68k);
724INLINE UINT32 OPER_AY_PD_32(m68ki_cpu_core *m68k);
725INLINE UINT32 OPER_AY_DI_8(m68ki_cpu_core *m68k);
726INLINE UINT32 OPER_AY_DI_16(m68ki_cpu_core *m68k);
727INLINE UINT32 OPER_AY_DI_32(m68ki_cpu_core *m68k);
728INLINE UINT32 OPER_AY_IX_8(m68ki_cpu_core *m68k);
729INLINE UINT32 OPER_AY_IX_16(m68ki_cpu_core *m68k);
730INLINE UINT32 OPER_AY_IX_32(m68ki_cpu_core *m68k);
970731
971INLINE uint OPER_AX_AI_8(void);
972INLINE uint OPER_AX_AI_16(void);
973INLINE uint OPER_AX_AI_32(void);
974INLINE uint OPER_AX_PI_8(void);
975INLINE uint OPER_AX_PI_16(void);
976INLINE uint OPER_AX_PI_32(void);
977INLINE uint OPER_AX_PD_8(void);
978INLINE uint OPER_AX_PD_16(void);
979INLINE uint OPER_AX_PD_32(void);
980INLINE uint OPER_AX_DI_8(void);
981INLINE uint OPER_AX_DI_16(void);
982INLINE uint OPER_AX_DI_32(void);
983INLINE uint OPER_AX_IX_8(void);
984INLINE uint OPER_AX_IX_16(void);
985INLINE uint OPER_AX_IX_32(void);
732INLINE UINT32 OPER_AX_AI_8(m68ki_cpu_core *m68k);
733INLINE UINT32 OPER_AX_AI_16(m68ki_cpu_core *m68k);
734INLINE UINT32 OPER_AX_AI_32(m68ki_cpu_core *m68k);
735INLINE UINT32 OPER_AX_PI_8(m68ki_cpu_core *m68k);
736INLINE UINT32 OPER_AX_PI_16(m68ki_cpu_core *m68k);
737INLINE UINT32 OPER_AX_PI_32(m68ki_cpu_core *m68k);
738INLINE UINT32 OPER_AX_PD_8(m68ki_cpu_core *m68k);
739INLINE UINT32 OPER_AX_PD_16(m68ki_cpu_core *m68k);
740INLINE UINT32 OPER_AX_PD_32(m68ki_cpu_core *m68k);
741INLINE UINT32 OPER_AX_DI_8(m68ki_cpu_core *m68k);
742INLINE UINT32 OPER_AX_DI_16(m68ki_cpu_core *m68k);
743INLINE UINT32 OPER_AX_DI_32(m68ki_cpu_core *m68k);
744INLINE UINT32 OPER_AX_IX_8(m68ki_cpu_core *m68k);
745INLINE UINT32 OPER_AX_IX_16(m68ki_cpu_core *m68k);
746INLINE UINT32 OPER_AX_IX_32(m68ki_cpu_core *m68k);
986747
987INLINE uint OPER_A7_PI_8(void);
988INLINE uint OPER_A7_PD_8(void);
748INLINE UINT32 OPER_A7_PI_8(m68ki_cpu_core *m68k);
749INLINE UINT32 OPER_A7_PD_8(m68ki_cpu_core *m68k);
989750
990INLINE uint OPER_AW_8(void);
991INLINE uint OPER_AW_16(void);
992INLINE uint OPER_AW_32(void);
993INLINE uint OPER_AL_8(void);
994INLINE uint OPER_AL_16(void);
995INLINE uint OPER_AL_32(void);
996INLINE uint OPER_PCDI_8(void);
997INLINE uint OPER_PCDI_16(void);
998INLINE uint OPER_PCDI_32(void);
999INLINE uint OPER_PCIX_8(void);
1000INLINE uint OPER_PCIX_16(void);
1001INLINE uint OPER_PCIX_32(void);
751INLINE UINT32 OPER_AW_8(m68ki_cpu_core *m68k);
752INLINE UINT32 OPER_AW_16(m68ki_cpu_core *m68k);
753INLINE UINT32 OPER_AW_32(m68ki_cpu_core *m68k);
754INLINE UINT32 OPER_AL_8(m68ki_cpu_core *m68k);
755INLINE UINT32 OPER_AL_16(m68ki_cpu_core *m68k);
756INLINE UINT32 OPER_AL_32(m68ki_cpu_core *m68k);
757INLINE UINT32 OPER_PCDI_8(m68ki_cpu_core *m68k);
758INLINE UINT32 OPER_PCDI_16(m68ki_cpu_core *m68k);
759INLINE UINT32 OPER_PCDI_32(m68ki_cpu_core *m68k);
760INLINE UINT32 OPER_PCIX_8(m68ki_cpu_core *m68k);
761INLINE UINT32 OPER_PCIX_16(m68ki_cpu_core *m68k);
762INLINE UINT32 OPER_PCIX_32(m68ki_cpu_core *m68k);
1002763
1003764/* Stack operations */
1004INLINE void m68ki_push_16(uint value);
1005INLINE void m68ki_push_32(uint value);
1006INLINE uint m68ki_pull_16(void);
1007INLINE uint m68ki_pull_32(void);
765INLINE void m68ki_push_16(m68ki_cpu_core *m68k, UINT32 value);
766INLINE void m68ki_push_32(m68ki_cpu_core *m68k, UINT32 value);
767INLINE UINT32 m68ki_pull_16(m68ki_cpu_core *m68k);
768INLINE UINT32 m68ki_pull_32(m68ki_cpu_core *m68k);
1008769
1009770/* Program flow operations */
1010INLINE void m68ki_jump(uint new_pc);
1011INLINE void m68ki_jump_vector(uint vector);
1012INLINE void m68ki_branch_8(uint offset);
1013INLINE void m68ki_branch_16(uint offset);
1014INLINE void m68ki_branch_32(uint offset);
771INLINE void m68ki_jump(m68ki_cpu_core *m68k, UINT32 new_pc);
772INLINE void m68ki_jump_vector(m68ki_cpu_core *m68k, UINT32 vector);
773INLINE void m68ki_branch_8(m68ki_cpu_core *m68k, UINT32 offset);
774INLINE void m68ki_branch_16(m68ki_cpu_core *m68k, UINT32 offset);
775INLINE void m68ki_branch_32(m68ki_cpu_core *m68k, UINT32 offset);
1015776
1016777/* Status register operations. */
1017INLINE void m68ki_set_s_flag(uint value);            /* Only bit 2 of value should be set (i.e. 4 or 0) */
1018INLINE void m68ki_set_sm_flag(uint value);           /* only bits 1 and 2 of value should be set */
1019INLINE void m68ki_set_ccr(uint value);               /* set the condition code register */
1020INLINE void m68ki_set_sr(uint value);                /* set the status register */
1021INLINE void m68ki_set_sr_noint(uint value);          /* set the status register */
778INLINE void m68ki_set_s_flag(m68ki_cpu_core *m68k, UINT32 value);            /* Only bit 2 of value should be set (i.e. 4 or 0) */
779INLINE void m68ki_set_sm_flag(m68ki_cpu_core *m68k, UINT32 value);           /* only bits 1 and 2 of value should be set */
780INLINE void m68ki_set_ccr(m68ki_cpu_core *m68k, UINT32 value);               /* set the condition code register */
781INLINE void m68ki_set_sr(m68ki_cpu_core *m68k, UINT32 value);                /* set the status register */
782INLINE void m68ki_set_sr_noint(m68ki_cpu_core *m68k, UINT32 value);          /* set the status register */
1022783
1023784/* Exception processing */
1024INLINE uint m68ki_init_exception(void);              /* Initial exception processing */
785INLINE UINT32 m68ki_init_exception(m68ki_cpu_core *m68k);              /* Initial exception processing */
1025786
1026INLINE void m68ki_stack_frame_3word(uint pc, uint sr); /* Stack various frame types */
1027INLINE void m68ki_stack_frame_buserr(uint sr);
787INLINE void m68ki_stack_frame_3word(m68ki_cpu_core *m68k, UINT32 pc, UINT32 sr); /* Stack various frame types */
788INLINE void m68ki_stack_frame_buserr(m68ki_cpu_core *m68k, UINT32 sr);
1028789
1029INLINE void m68ki_stack_frame_0000(uint pc, uint sr, uint vector);
1030INLINE void m68ki_stack_frame_0001(uint pc, uint sr, uint vector);
1031INLINE void m68ki_stack_frame_0010(uint sr, uint vector);
1032INLINE void m68ki_stack_frame_1000(uint pc, uint sr, uint vector);
1033INLINE void m68ki_stack_frame_1010(uint sr, uint vector, uint pc);
1034INLINE void m68ki_stack_frame_1011(uint sr, uint vector, uint pc);
790INLINE void m68ki_stack_frame_0000(m68ki_cpu_core *m68k, UINT32 pc, UINT32 sr, UINT32 vector);
791INLINE void m68ki_stack_frame_0001(m68ki_cpu_core *m68k, UINT32 pc, UINT32 sr, UINT32 vector);
792INLINE void m68ki_stack_frame_0010(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector);
793INLINE void m68ki_stack_frame_1000(m68ki_cpu_core *m68k, UINT32 pc, UINT32 sr, UINT32 vector);
794INLINE void m68ki_stack_frame_1010(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector, UINT32 pc);
795INLINE void m68ki_stack_frame_1011(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector, UINT32 pc);
1035796
1036INLINE void m68ki_exception_trap(uint vector);
1037INLINE void m68ki_exception_trapN(uint vector);
1038INLINE void m68ki_exception_trace(void);
1039INLINE void m68ki_exception_privilege_violation(void);
1040INLINE void m68ki_exception_1010(void);
1041INLINE void m68ki_exception_1111(void);
1042INLINE void m68ki_exception_illegal(void);
1043INLINE void m68ki_exception_format_error(void);
1044INLINE void m68ki_exception_address_error(void);
1045INLINE void m68ki_exception_interrupt(uint int_level);
1046INLINE void m68ki_check_interrupts(void);            /* ASG: check for interrupts */
797INLINE void m68ki_exception_trap(m68ki_cpu_core *m68k, UINT32 vector);
798INLINE void m68ki_exception_trapN(m68ki_cpu_core *m68k, UINT32 vector);
799INLINE void m68ki_exception_trace(m68ki_cpu_core *m68k);
800INLINE void m68ki_exception_privilege_violation(m68ki_cpu_core *m68k);
801INLINE void m68ki_exception_1010(m68ki_cpu_core *m68k);
802INLINE void m68ki_exception_1111(m68ki_cpu_core *m68k);
803INLINE void m68ki_exception_illegal(m68ki_cpu_core *m68k);
804INLINE void m68ki_exception_format_error(m68ki_cpu_core *m68k);
805INLINE void m68ki_exception_address_error(m68ki_cpu_core *m68k);
806INLINE void m68ki_exception_interrupt(m68ki_cpu_core *m68k, UINT32 int_level);
807INLINE void m68ki_check_interrupts(m68ki_cpu_core *m68k);            /* ASG: check for interrupts */
1047808
1048809/* quick disassembly (used for logging) */
1049810char* m68ki_disassemble_quick(unsigned int pc, unsigned int cpu_type);
r3535r3536
1059820/* Handles all immediate reads, does address error check, function code setting,
1060821 * and prefetching if they are enabled in m68kconf.h
1061822 */
1062INLINE uint m68ki_read_imm_16(void)
823INLINE UINT32 m68ki_read_imm_16(m68ki_cpu_core *m68k)
1063824{
1064   m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
1065   m68ki_check_address_error(REG_PC, MODE_READ, FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
1066#if M68K_EMULATE_PREFETCH
1067{
1068   uint result;
1069   if(REG_PC != CPU_PREF_ADDR)
825   UINT32 result;
826
827   m68ki_set_fc(m68k->s_flag | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
828   m68ki_check_address_error(m68k, REG_PC, MODE_READ, m68k->s_flag | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
829
830   if(REG_PC != m68k->pref_addr)
1070831   {
1071      CPU_PREF_ADDR = REG_PC;
1072      CPU_PREF_DATA = m68k_read_immediate_16(ADDRESS_68K(CPU_PREF_ADDR));
832      m68k->pref_addr = REG_PC;
833      m68k->pref_data = m68k_read_immediate_16(m68k, ADDRESS_68K(m68k, m68k->pref_addr));
1073834   }
1074   result = MASK_OUT_ABOVE_16(CPU_PREF_DATA);
835   result = MASK_OUT_ABOVE_16(m68k->pref_data);
1075836   REG_PC += 2;
1076   CPU_PREF_ADDR = REG_PC;
1077   CPU_PREF_DATA = m68k_read_immediate_16(ADDRESS_68K(CPU_PREF_ADDR));
837   m68k->pref_addr = REG_PC;
838   m68k->pref_data = m68k_read_immediate_16(m68k, ADDRESS_68K(m68k, m68k->pref_addr));
1078839   return result;
1079840}
1080#else
1081   REG_PC += 2;
1082   return m68k_read_immediate_16(ADDRESS_68K(REG_PC-2));
1083#endif /* M68K_EMULATE_PREFETCH */
1084}
1085INLINE uint m68ki_read_imm_32(void)
841
842INLINE UINT32 m68ki_read_imm_32(m68ki_cpu_core *m68k)
1086843{
1087#if M68K_EMULATE_PREFETCH
1088   uint temp_val;
844   UINT32 temp_val;
1089845
1090   m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
1091   m68ki_check_address_error(REG_PC, MODE_READ, FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
846   m68ki_set_fc(m68k->s_flag | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
847   m68ki_check_address_error(m68k, REG_PC, MODE_READ, m68k->s_flag | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
1092848
1093   if(REG_PC != CPU_PREF_ADDR)
849   if(REG_PC != m68k->pref_addr)
1094850   {
1095      CPU_PREF_ADDR = REG_PC;
1096      CPU_PREF_DATA = m68k_read_immediate_16(ADDRESS_68K(CPU_PREF_ADDR));
851      m68k->pref_addr = REG_PC;
852      m68k->pref_data = m68k_read_immediate_16(m68k, ADDRESS_68K(m68k, m68k->pref_addr));
1097853   }
1098   temp_val = MASK_OUT_ABOVE_16(CPU_PREF_DATA);
854   temp_val = MASK_OUT_ABOVE_16(m68k->pref_data);
1099855   REG_PC += 2;
1100   CPU_PREF_ADDR = REG_PC;
1101   CPU_PREF_DATA = m68k_read_immediate_16(ADDRESS_68K(CPU_PREF_ADDR));
856   m68k->pref_addr = REG_PC;
857   m68k->pref_data = m68k_read_immediate_16(m68k, ADDRESS_68K(m68k, m68k->pref_addr));
1102858
1103   temp_val = MASK_OUT_ABOVE_32((temp_val << 16) | MASK_OUT_ABOVE_16(CPU_PREF_DATA));
859   temp_val = MASK_OUT_ABOVE_32((temp_val << 16) | MASK_OUT_ABOVE_16(m68k->pref_data));
1104860   REG_PC += 2;
1105   CPU_PREF_ADDR = REG_PC;
1106   CPU_PREF_DATA = m68k_read_immediate_16(ADDRESS_68K(CPU_PREF_ADDR));
861   m68k->pref_addr = REG_PC;
862   m68k->pref_data = m68k_read_immediate_16(m68k, ADDRESS_68K(m68k, m68k->pref_addr));
1107863
1108864   return temp_val;
1109#else
1110   m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
1111   m68ki_check_address_error(REG_PC, MODE_READ, FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
1112   REG_PC += 4;
1113   return m68k_read_immediate_32(ADDRESS_68K(REG_PC-4));
1114#endif /* M68K_EMULATE_PREFETCH */
1115865}
1116866
1117867
r3535r3536
1124874 * These functions will also check for address error and set the function
1125875 * code if they are enabled in m68kconf.h.
1126876 */
1127INLINE uint m68ki_read_8_fc(uint address, uint fc)
877INLINE UINT32 m68ki_read_8_fc(m68ki_cpu_core *m68k, UINT32 address, UINT32 fc)
1128878{
1129879   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
1130   return m68k_read_memory_8(ADDRESS_68K(address));
880   return m68k_read_memory_8(m68k, ADDRESS_68K(m68k, address));
1131881}
1132INLINE uint m68ki_read_16_fc(uint address, uint fc)
882INLINE UINT32 m68ki_read_16_fc(m68ki_cpu_core *m68k, UINT32 address, UINT32 fc)
1133883{
1134884   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
1135   m68ki_check_address_error_010_less(address, MODE_READ, fc); /* auto-disable (see m68kcpu.h) */
1136   return m68k_read_memory_16(ADDRESS_68K(address));
885   if (CPU_TYPE_IS_010_LESS(m68k->cpu_type))
886   {
887      m68ki_check_address_error(m68k, address, MODE_READ, fc);
888   }
889   return m68k_read_memory_16(m68k, ADDRESS_68K(m68k, address));
1137890}
1138INLINE uint m68ki_read_32_fc(uint address, uint fc)
891INLINE UINT32 m68ki_read_32_fc(m68ki_cpu_core *m68k, UINT32 address, UINT32 fc)
1139892{
1140893   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
1141   m68ki_check_address_error_010_less(address, MODE_READ, fc); /* auto-disable (see m68kcpu.h) */
1142   return m68k_read_memory_32(ADDRESS_68K(address));
894   if (CPU_TYPE_IS_010_LESS(m68k->cpu_type))
895   {
896      m68ki_check_address_error(m68k, address, MODE_READ, fc);
897   }
898   return m68k_read_memory_32(m68k, ADDRESS_68K(m68k, address));
1143899}
1144900
1145INLINE void m68ki_write_8_fc(uint address, uint fc, uint value)
901INLINE void m68ki_write_8_fc(m68ki_cpu_core *m68k, UINT32 address, UINT32 fc, UINT32 value)
1146902{
1147903   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
1148   m68k_write_memory_8(ADDRESS_68K(address), value);
904   m68k_write_memory_8(m68k, ADDRESS_68K(m68k, address), value);
1149905}
1150INLINE void m68ki_write_16_fc(uint address, uint fc, uint value)
906INLINE void m68ki_write_16_fc(m68ki_cpu_core *m68k, UINT32 address, UINT32 fc, UINT32 value)
1151907{
1152908   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
1153   m68ki_check_address_error_010_less(address, MODE_WRITE, fc); /* auto-disable (see m68kcpu.h) */
1154   m68k_write_memory_16(ADDRESS_68K(address), value);
909   if (CPU_TYPE_IS_010_LESS(m68k->cpu_type))
910   {
911      m68ki_check_address_error(m68k, address, MODE_WRITE, fc);
912   }
913   m68k_write_memory_16(m68k, ADDRESS_68K(m68k, address), value);
1155914}
1156INLINE void m68ki_write_32_fc(uint address, uint fc, uint value)
915INLINE void m68ki_write_32_fc(m68ki_cpu_core *m68k, UINT32 address, UINT32 fc, UINT32 value)
1157916{
1158917   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
1159   m68ki_check_address_error_010_less(address, MODE_WRITE, fc); /* auto-disable (see m68kcpu.h) */
1160   m68k_write_memory_32(ADDRESS_68K(address), value);
918   if (CPU_TYPE_IS_010_LESS(m68k->cpu_type))
919   {
920      m68ki_check_address_error(m68k, address, MODE_WRITE, fc);
921   }
922   m68k_write_memory_32(m68k, ADDRESS_68K(m68k, address), value);
1161923}
1162924
1163#if M68K_SIMULATE_PD_WRITES
1164INLINE void m68ki_write_32_pd_fc(uint address, uint fc, uint value)
925INLINE void m68ki_write_32_pd_fc(m68ki_cpu_core *m68k, UINT32 address, UINT32 fc, UINT32 value)
1165926{
1166927   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
1167   m68ki_check_address_error_010_less(address, MODE_WRITE, fc); /* auto-disable (see m68kcpu.h) */
1168   m68k_write_memory_32_pd(ADDRESS_68K(address), value);
928   if (CPU_TYPE_IS_010_LESS(m68k->cpu_type))
929   {
930      m68ki_check_address_error(m68k, address, MODE_WRITE, fc);
931   }
932   m68k_write_memory_32_pd(m68k, ADDRESS_68K(m68k, address), value);
1169933}
1170#endif
1171934
1172935
1173936/* --------------------- Effective Address Calculation -------------------- */
r3535r3536
1175938/* The program counter relative addressing modes cause operands to be
1176939 * retrieved from program space, not data space.
1177940 */
1178INLINE uint m68ki_get_ea_pcdi(void)
941INLINE UINT32 m68ki_get_ea_pcdi(m68ki_cpu_core *m68k)
1179942{
1180   uint old_pc = REG_PC;
1181   m68ki_use_program_space(); /* auto-disable */
1182   return old_pc + MAKE_INT_16(m68ki_read_imm_16());
943   UINT32 old_pc = REG_PC;
944   m68ki_use_program_space(m68k); /* auto-disable */
945   return old_pc + MAKE_INT_16(m68ki_read_imm_16(m68k));
1183946}
1184947
1185948
1186INLINE uint m68ki_get_ea_pcix(void)
949INLINE UINT32 m68ki_get_ea_pcix(m68ki_cpu_core *m68k)
1187950{
1188   m68ki_use_program_space(); /* auto-disable */
1189   return m68ki_get_ea_ix(REG_PC);
951   m68ki_use_program_space(m68k); /* auto-disable */
952   return m68ki_get_ea_ix(m68k, REG_PC);
1190953}
1191954
1192955/* Indexed addressing modes are encoded as follows:
r3535r3536
1231994 * 1  011  mem indir with long outer
1232995 * 1  100-111  reserved
1233996 */
1234INLINE uint m68ki_get_ea_ix(uint An)
997INLINE UINT32 m68ki_get_ea_ix(m68ki_cpu_core *m68k, UINT32 An)
1235998{
1236999   /* An = base register */
1237   uint extension = m68ki_read_imm_16();
1238   uint Xn = 0;                        /* Index register */
1239   uint bd = 0;                        /* Base Displacement */
1240   uint od = 0;                        /* Outer Displacement */
1000   UINT32 extension = m68ki_read_imm_16(m68k);
1001   UINT32 Xn = 0;                        /* Index register */
1002   UINT32 bd = 0;                        /* Base Displacement */
1003   UINT32 od = 0;                        /* Outer Displacement */
12411004
1242   if(CPU_TYPE_IS_010_LESS(CPU_TYPE))
1005   if(CPU_TYPE_IS_010_LESS(m68k->cpu_type))
12431006   {
12441007      /* Calculate index */
12451008      Xn = REG_DA[extension>>12];     /* Xn */
r3535r3536
12581021      if(!BIT_B(extension))           /* W/L */
12591022         Xn = MAKE_INT_16(Xn);
12601023      /* Add scale if proper CPU type */
1261      if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
1024      if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
12621025         Xn <<= (extension>>9) & 3;  /* SCALE */
12631026
12641027      /* Add base register and displacement and return */
r3535r3536
12671030
12681031   /* Full extension format */
12691032
1270   USE_CYCLES(m68ki_ea_idx_cycle_table[extension&0x3f]);
1033   USE_CYCLES(m68k, m68ki_ea_idx_cycle_table[extension&0x3f]);
12711034
12721035   /* Check if base register is present */
12731036   if(BIT_7(extension))                /* BS */
r3535r3536
12841047
12851048   /* Check if base displacement is present */
12861049   if(BIT_5(extension))                /* BD SIZE */
1287      bd = BIT_4(extension) ? m68ki_read_imm_32() : MAKE_INT_16(m68ki_read_imm_16());
1050      bd = BIT_4(extension) ? m68ki_read_imm_32(m68k) : MAKE_INT_16(m68ki_read_imm_16(m68k));
12881051
12891052   /* If no indirect action, we are done */
12901053   if(!(extension&7))                  /* No Memory Indirect */
r3535r3536
12921055
12931056   /* Check if outer displacement is present */
12941057   if(BIT_1(extension))                /* I/IS:  od */
1295      od = BIT_0(extension) ? m68ki_read_imm_32() : MAKE_INT_16(m68ki_read_imm_16());
1058      od = BIT_0(extension) ? m68ki_read_imm_32(m68k) : MAKE_INT_16(m68ki_read_imm_16(m68k));
12961059
12971060   /* Postindex */
12981061   if(BIT_2(extension))                /* I/IS:  0 = preindex, 1 = postindex */
1299      return m68ki_read_32(An + bd) + Xn + od;
1062      return m68ki_read_32(m68k, An + bd) + Xn + od;
13001063
13011064   /* Preindex */
1302   return m68ki_read_32(An + bd + Xn) + od;
1065   return m68ki_read_32(m68k, An + bd + Xn) + od;
13031066}
13041067
13051068
13061069/* Fetch operands */
1307INLINE uint OPER_AY_AI_8(void)  {uint ea = EA_AY_AI_8();  return m68ki_read_8(ea); }
1308INLINE uint OPER_AY_AI_16(void) {uint ea = EA_AY_AI_16(); return m68ki_read_16(ea);}
1309INLINE uint OPER_AY_AI_32(void) {uint ea = EA_AY_AI_32(); return m68ki_read_32(ea);}
1310INLINE uint OPER_AY_PI_8(void)  {uint ea = EA_AY_PI_8();  return m68ki_read_8(ea); }
1311INLINE uint OPER_AY_PI_16(void) {uint ea = EA_AY_PI_16(); return m68ki_read_16(ea);}
1312INLINE uint OPER_AY_PI_32(void) {uint ea = EA_AY_PI_32(); return m68ki_read_32(ea);}
1313INLINE uint OPER_AY_PD_8(void)  {uint ea = EA_AY_PD_8();  return m68ki_read_8(ea); }
1314INLINE uint OPER_AY_PD_16(void) {uint ea = EA_AY_PD_16(); return m68ki_read_16(ea);}
1315INLINE uint OPER_AY_PD_32(void) {uint ea = EA_AY_PD_32(); return m68ki_read_32(ea);}
1316INLINE uint OPER_AY_DI_8(void)  {uint ea = EA_AY_DI_8();  return m68ki_read_8(ea); }
1317INLINE uint OPER_AY_DI_16(void) {uint ea = EA_AY_DI_16(); return m68ki_read_16(ea);}
1318INLINE uint OPER_AY_DI_32(void) {uint ea = EA_AY_DI_32(); return m68ki_read_32(ea);}
1319INLINE uint OPER_AY_IX_8(void)  {uint ea = EA_AY_IX_8();  return m68ki_read_8(ea); }
1320INLINE uint OPER_AY_IX_16(void) {uint ea = EA_AY_IX_16(); return m68ki_read_16(ea);}
1321INLINE uint OPER_AY_IX_32(void) {uint ea = EA_AY_IX_32(); return m68ki_read_32(ea);}
1070INLINE UINT32 OPER_AY_AI_8(m68ki_cpu_core *m68k)  {UINT32 ea = EA_AY_AI_8(m68k);  return m68ki_read_8(m68k, ea); }
1071INLINE UINT32 OPER_AY_AI_16(m68ki_cpu_core *m68k) {UINT32 ea = EA_AY_AI_16(m68k); return m68ki_read_16(m68k, ea);}
1072INLINE UINT32 OPER_AY_AI_32(m68ki_cpu_core *m68k) {UINT32 ea = EA_AY_AI_32(m68k); return m68ki_read_32(m68k, ea);}
1073INLINE UINT32 OPER_AY_PI_8(m68ki_cpu_core *m68k)  {UINT32 ea = EA_AY_PI_8(m68k);  return m68ki_read_8(m68k, ea); }
1074INLINE UINT32 OPER_AY_PI_16(m68ki_cpu_core *m68k) {UINT32 ea = EA_AY_PI_16(m68k); return m68ki_read_16(m68k, ea);}
1075INLINE UINT32 OPER_AY_PI_32(m68ki_cpu_core *m68k) {UINT32 ea = EA_AY_PI_32(m68k); return m68ki_read_32(m68k, ea);}
1076INLINE UINT32 OPER_AY_PD_8(m68ki_cpu_core *m68k)  {UINT32 ea = EA_AY_PD_8(m68k);  return m68ki_read_8(m68k, ea); }
1077INLINE UINT32 OPER_AY_PD_16(m68ki_cpu_core *m68k) {UINT32 ea = EA_AY_PD_16(m68k); return m68ki_read_16(m68k, ea);}
1078INLINE UINT32 OPER_AY_PD_32(m68ki_cpu_core *m68k) {UINT32 ea = EA_AY_PD_32(m68k); return m68ki_read_32(m68k, ea);}
1079INLINE UINT32 OPER_AY_DI_8(m68ki_cpu_core *m68k)  {UINT32 ea = EA_AY_DI_8(m68k);  return m68ki_read_8(m68k, ea); }
1080INLINE UINT32 OPER_AY_DI_16(m68ki_cpu_core *m68k) {UINT32 ea = EA_AY_DI_16(m68k); return m68ki_read_16(m68k, ea);}
1081INLINE UINT32 OPER_AY_DI_32(m68ki_cpu_core *m68k) {UINT32 ea = EA_AY_DI_32(m68k); return m68ki_read_32(m68k, ea);}
1082INLINE UINT32 OPER_AY_IX_8(m68ki_cpu_core *m68k)  {UINT32 ea = EA_AY_IX_8(m68k);  return m68ki_read_8(m68k, ea); }
1083INLINE UINT32 OPER_AY_IX_16(m68ki_cpu_core *m68k) {UINT32 ea = EA_AY_IX_16(m68k); return m68ki_read_16(m68k, ea);}
1084INLINE UINT32 OPER_AY_IX_32(m68ki_cpu_core *m68k) {UINT32 ea = EA_AY_IX_32(m68k); return m68ki_read_32(m68k, ea);}
13221085
1323INLINE uint OPER_AX_AI_8(void)  {uint ea = EA_AX_AI_8();  return m68ki_read_8(ea); }
1324INLINE uint OPER_AX_AI_16(void) {uint ea = EA_AX_AI_16(); return m68ki_read_16(ea);}
1325INLINE uint OPER_AX_AI_32(void) {uint ea = EA_AX_AI_32(); return m68ki_read_32(ea);}
1326INLINE uint OPER_AX_PI_8(void)  {uint ea = EA_AX_PI_8();  return m68ki_read_8(ea); }
1327INLINE uint OPER_AX_PI_16(void) {uint ea = EA_AX_PI_16(); return m68ki_read_16(ea);}
1328INLINE uint OPER_AX_PI_32(void) {uint ea = EA_AX_PI_32(); return m68ki_read_32(ea);}
1329INLINE uint OPER_AX_PD_8(void)  {uint ea = EA_AX_PD_8();  return m68ki_read_8(ea); }
1330INLINE uint OPER_AX_PD_16(void) {uint ea = EA_AX_PD_16(); return m68ki_read_16(ea);}
1331INLINE uint OPER_AX_PD_32(void) {uint ea = EA_AX_PD_32(); return m68ki_read_32(ea);}
1332INLINE uint OPER_AX_DI_8(void)  {uint ea = EA_AX_DI_8();  return m68ki_read_8(ea); }
1333INLINE uint OPER_AX_DI_16(void) {uint ea = EA_AX_DI_16(); return m68ki_read_16(ea);}
1334INLINE uint OPER_AX_DI_32(void) {uint ea = EA_AX_DI_32(); return m68ki_read_32(ea);}
1335INLINE uint OPER_AX_IX_8(void)  {uint ea = EA_AX_IX_8();  return m68ki_read_8(ea); }
1336INLINE uint OPER_AX_IX_16(void) {uint ea = EA_AX_IX_16(); return m68ki_read_16(ea);}
1337INLINE uint OPER_AX_IX_32(void) {uint ea = EA_AX_IX_32(); return m68ki_read_32(ea);}
1086INLINE UINT32 OPER_AX_AI_8(m68ki_cpu_core *m68k)  {UINT32 ea = EA_AX_AI_8(m68k);  return m68ki_read_8(m68k, ea); }
1087INLINE UINT32 OPER_AX_AI_16(m68ki_cpu_core *m68k) {UINT32 ea = EA_AX_AI_16(m68k); return m68ki_read_16(m68k, ea);}
1088INLINE UINT32 OPER_AX_AI_32(m68ki_cpu_core *m68k) {UINT32 ea = EA_AX_AI_32(m68k); return m68ki_read_32(m68k, ea);}
1089INLINE UINT32 OPER_AX_PI_8(m68ki_cpu_core *m68k)  {UINT32 ea = EA_AX_PI_8(m68k);  return m68ki_read_8(m68k, ea); }
1090INLINE UINT32 OPER_AX_PI_16(m68ki_cpu_core *m68k) {UINT32 ea = EA_AX_PI_16(m68k); return m68ki_read_16(m68k, ea);}
1091INLINE UINT32 OPER_AX_PI_32(m68ki_cpu_core *m68k) {UINT32 ea = EA_AX_PI_32(m68k); return m68ki_read_32(m68k, ea);}
1092INLINE UINT32 OPER_AX_PD_8(m68ki_cpu_core *m68k)  {UINT32 ea = EA_AX_PD_8(m68k);  return m68ki_read_8(m68k, ea); }
1093INLINE UINT32 OPER_AX_PD_16(m68ki_cpu_core *m68k) {UINT32 ea = EA_AX_PD_16(m68k); return m68ki_read_16(m68k, ea);}
1094INLINE UINT32 OPER_AX_PD_32(m68ki_cpu_core *m68k) {UINT32 ea = EA_AX_PD_32(m68k); return m68ki_read_32(m68k, ea);}
1095INLINE UINT32 OPER_AX_DI_8(m68ki_cpu_core *m68k)  {UINT32 ea = EA_AX_DI_8(m68k);  return m68ki_read_8(m68k, ea); }
1096INLINE UINT32 OPER_AX_DI_16(m68ki_cpu_core *m68k) {UINT32 ea = EA_AX_DI_16(m68k); return m68ki_read_16(m68k, ea);}
1097INLINE UINT32 OPER_AX_DI_32(m68ki_cpu_core *m68k) {UINT32 ea = EA_AX_DI_32(m68k); return m68ki_read_32(m68k, ea);}
1098INLINE UINT32 OPER_AX_IX_8(m68ki_cpu_core *m68k)  {UINT32 ea = EA_AX_IX_8(m68k);  return m68ki_read_8(m68k, ea); }
1099INLINE UINT32 OPER_AX_IX_16(m68ki_cpu_core *m68k) {UINT32 ea = EA_AX_IX_16(m68k); return m68ki_read_16(m68k, ea);}
1100INLINE UINT32 OPER_AX_IX_32(m68ki_cpu_core *m68k) {UINT32 ea = EA_AX_IX_32(m68k); return m68ki_read_32(m68k, ea);}
13381101
1339INLINE uint OPER_A7_PI_8(void)  {uint ea = EA_A7_PI_8();  return m68ki_read_8(ea); }
1340INLINE uint OPER_A7_PD_8(void)  {uint ea = EA_A7_PD_8();  return m68ki_read_8(ea); }
1102INLINE UINT32 OPER_A7_PI_8(m68ki_cpu_core *m68k)  {UINT32 ea = EA_A7_PI_8(m68k);  return m68ki_read_8(m68k, ea); }
1103INLINE UINT32 OPER_A7_PD_8(m68ki_cpu_core *m68k)  {UINT32 ea = EA_A7_PD_8(m68k);  return m68ki_read_8(m68k, ea); }
13411104
1342INLINE uint OPER_AW_8(void)     {uint ea = EA_AW_8();     return m68ki_read_8(ea); }
1343INLINE uint OPER_AW_16(void)    {uint ea = EA_AW_16();    return m68ki_read_16(ea);}
1344INLINE uint OPER_AW_32(void)    {uint ea = EA_AW_32();    return m68ki_read_32(ea);}
1345INLINE uint OPER_AL_8(void)     {uint ea = EA_AL_8();     return m68ki_read_8(ea); }
1346INLINE uint OPER_AL_16(void)    {uint ea = EA_AL_16();    return m68ki_read_16(ea);}
1347INLINE uint OPER_AL_32(void)    {uint ea = EA_AL_32();    return m68ki_read_32(ea);}
1348INLINE uint OPER_PCDI_8(void)   {uint ea = EA_PCDI_8();   return m68ki_read_pcrel_8(ea); }
1349INLINE uint OPER_PCDI_16(void)  {uint ea = EA_PCDI_16();  return m68ki_read_pcrel_16(ea);}
1350INLINE uint OPER_PCDI_32(void)  {uint ea = EA_PCDI_32();  return m68ki_read_pcrel_32(ea);}
1351INLINE uint OPER_PCIX_8(void)   {uint ea = EA_PCIX_8();   return m68ki_read_pcrel_8(ea); }
1352INLINE uint OPER_PCIX_16(void)  {uint ea = EA_PCIX_16();  return m68ki_read_pcrel_16(ea);}
1353INLINE uint OPER_PCIX_32(void)  {uint ea = EA_PCIX_32();  return m68ki_read_pcrel_32(ea);}
1105INLINE UINT32 OPER_AW_8(m68ki_cpu_core *m68k)     {UINT32 ea = EA_AW_8(m68k);     return m68ki_read_8(m68k, ea); }
1106INLINE UINT32 OPER_AW_16(m68ki_cpu_core *m68k)    {UINT32 ea = EA_AW_16(m68k);    return m68ki_read_16(m68k, ea);}
1107INLINE UINT32 OPER_AW_32(m68ki_cpu_core *m68k)    {UINT32 ea = EA_AW_32(m68k);    return m68ki_read_32(m68k, ea);}
1108INLINE UINT32 OPER_AL_8(m68ki_cpu_core *m68k)     {UINT32 ea = EA_AL_8(m68k);     return m68ki_read_8(m68k, ea); }
1109INLINE UINT32 OPER_AL_16(m68ki_cpu_core *m68k)    {UINT32 ea = EA_AL_16(m68k);    return m68ki_read_16(m68k, ea);}
1110INLINE UINT32 OPER_AL_32(m68ki_cpu_core *m68k)    {UINT32 ea = EA_AL_32(m68k);    return m68ki_read_32(m68k, ea);}
1111INLINE UINT32 OPER_PCDI_8(m68ki_cpu_core *m68k)   {UINT32 ea = EA_PCDI_8(m68k);   return m68ki_read_pcrel_8(m68k, ea); }
1112INLINE UINT32 OPER_PCDI_16(m68ki_cpu_core *m68k)  {UINT32 ea = EA_PCDI_16(m68k);  return m68ki_read_pcrel_16(m68k, ea);}
1113INLINE UINT32 OPER_PCDI_32(m68ki_cpu_core *m68k)  {UINT32 ea = EA_PCDI_32(m68k);  return m68ki_read_pcrel_32(m68k, ea);}
1114INLINE UINT32 OPER_PCIX_8(m68ki_cpu_core *m68k)   {UINT32 ea = EA_PCIX_8(m68k);   return m68ki_read_pcrel_8(m68k, ea); }
1115INLINE UINT32 OPER_PCIX_16(m68ki_cpu_core *m68k)  {UINT32 ea = EA_PCIX_16(m68k);  return m68ki_read_pcrel_16(m68k, ea);}
1116INLINE UINT32 OPER_PCIX_32(m68ki_cpu_core *m68k)  {UINT32 ea = EA_PCIX_32(m68k);  return m68ki_read_pcrel_32(m68k, ea);}
13541117
13551118
13561119
13571120/* ---------------------------- Stack Functions --------------------------- */
13581121
13591122/* Push/pull data from the stack */
1360INLINE void m68ki_push_16(uint value)
1123INLINE void m68ki_push_16(m68ki_cpu_core *m68k, UINT32 value)
13611124{
13621125   REG_SP = MASK_OUT_ABOVE_32(REG_SP - 2);
1363   m68ki_write_16(REG_SP, value);
1126   m68ki_write_16(m68k, REG_SP, value);
13641127}
13651128
1366INLINE void m68ki_push_32(uint value)
1129INLINE void m68ki_push_32(m68ki_cpu_core *m68k, UINT32 value)
13671130{
13681131   REG_SP = MASK_OUT_ABOVE_32(REG_SP - 4);
1369   m68ki_write_32(REG_SP, value);
1132   m68ki_write_32(m68k, REG_SP, value);
13701133}
13711134
1372INLINE uint m68ki_pull_16(void)
1135INLINE UINT32 m68ki_pull_16(m68ki_cpu_core *m68k)
13731136{
13741137   REG_SP = MASK_OUT_ABOVE_32(REG_SP + 2);
1375   return m68ki_read_16(REG_SP-2);
1138   return m68ki_read_16(m68k, REG_SP-2);
13761139}
13771140
1378INLINE uint m68ki_pull_32(void)
1141INLINE UINT32 m68ki_pull_32(m68ki_cpu_core *m68k)
13791142{
13801143   REG_SP = MASK_OUT_ABOVE_32(REG_SP + 4);
1381   return m68ki_read_32(REG_SP-4);
1144   return m68ki_read_32(m68k, REG_SP-4);
13821145}
13831146
13841147
13851148/* Increment/decrement the stack as if doing a push/pull but
13861149 * don't do any memory access.
13871150 */
1388INLINE void m68ki_fake_push_16(void)
1151INLINE void m68ki_fake_push_16(m68ki_cpu_core *m68k)
13891152{
13901153   REG_SP = MASK_OUT_ABOVE_32(REG_SP - 2);
13911154}
13921155
1393INLINE void m68ki_fake_push_32(void)
1156INLINE void m68ki_fake_push_32(m68ki_cpu_core *m68k)
13941157{
13951158   REG_SP = MASK_OUT_ABOVE_32(REG_SP - 4);
13961159}
13971160
1398INLINE void m68ki_fake_pull_16(void)
1161INLINE void m68ki_fake_pull_16(m68ki_cpu_core *m68k)
13991162{
14001163   REG_SP = MASK_OUT_ABOVE_32(REG_SP + 2);
14011164}
14021165
1403INLINE void m68ki_fake_pull_32(void)
1166INLINE void m68ki_fake_pull_32(m68ki_cpu_core *m68k)
14041167{
14051168   REG_SP = MASK_OUT_ABOVE_32(REG_SP + 4);
14061169}
r3535r3536
14121175 * These functions will also call the pc_changed callback if it was enabled
14131176 * in m68kconf.h.
14141177 */
1415INLINE void m68ki_jump(uint new_pc)
1178INLINE void m68ki_jump(m68ki_cpu_core *m68k, UINT32 new_pc)
14161179{
14171180   REG_PC = new_pc;
1418   m68ki_pc_changed(REG_PC);
1181   change_pc(ADDRESS_68K(m68k, REG_PC));
14191182}
14201183
1421INLINE void m68ki_jump_vector(uint vector)
1184INLINE void m68ki_jump_vector(m68ki_cpu_core *m68k, UINT32 vector)
14221185{
1423   REG_PC = (vector<<2) + REG_VBR;
1424   REG_PC = m68ki_read_data_32(REG_PC);
1425   m68ki_pc_changed(REG_PC);
1186   REG_PC = (vector<<2) + m68k->vbr;
1187   REG_PC = m68ki_read_data_32(m68k, REG_PC);
1188   change_pc(ADDRESS_68K(m68k, REG_PC));
14261189}
14271190
14281191
r3535r3536
14311194 * So far I've found no problems with not calling pc_changed for 8 or 16
14321195 * bit branches.
14331196 */
1434INLINE void m68ki_branch_8(uint offset)
1197INLINE void m68ki_branch_8(m68ki_cpu_core *m68k, UINT32 offset)
14351198{
14361199   REG_PC += MAKE_INT_8(offset);
14371200}
14381201
1439INLINE void m68ki_branch_16(uint offset)
1202INLINE void m68ki_branch_16(m68ki_cpu_core *m68k, UINT32 offset)
14401203{
14411204   REG_PC += MAKE_INT_16(offset);
14421205}
14431206
1444INLINE void m68ki_branch_32(uint offset)
1207INLINE void m68ki_branch_32(m68ki_cpu_core *m68k, UINT32 offset)
14451208{
14461209   REG_PC += offset;
1447   m68ki_pc_changed(REG_PC);
1210   change_pc(ADDRESS_68K(m68k, REG_PC));
14481211}
14491212
14501213
r3535r3536
14541217/* Set the S flag and change the active stack pointer.
14551218 * Note that value MUST be 4 or 0.
14561219 */
1457INLINE void m68ki_set_s_flag(uint value)
1220INLINE void m68ki_set_s_flag(m68ki_cpu_core *m68k, UINT32 value)
14581221{
14591222   /* Backup the old stack pointer */
1460   REG_SP_BASE[FLAG_S | ((FLAG_S>>1) & FLAG_M)] = REG_SP;
1223   REG_SP_BASE[m68k->s_flag | ((m68k->s_flag>>1) & m68k->m_flag)] = REG_SP;
14611224   /* Set the S flag */
1462   FLAG_S = value;
1225   m68k->s_flag = value;
14631226   /* Set the new stack pointer */
1464   REG_SP = REG_SP_BASE[FLAG_S | ((FLAG_S>>1) & FLAG_M)];
1227   REG_SP = REG_SP_BASE[m68k->s_flag | ((m68k->s_flag>>1) & m68k->m_flag)];
14651228}
14661229
14671230/* Set the S and M flags and change the active stack pointer.
14681231 * Note that value MUST be 0, 2, 4, or 6 (bit2 = S, bit1 = M).
14691232 */
1470INLINE void m68ki_set_sm_flag(uint value)
1233INLINE void m68ki_set_sm_flag(m68ki_cpu_core *m68k, UINT32 value)
14711234{
14721235   /* Backup the old stack pointer */
1473   REG_SP_BASE[FLAG_S | ((FLAG_S>>1) & FLAG_M)] = REG_SP;
1236   REG_SP_BASE[m68k->s_flag | ((m68k->s_flag>>1) & m68k->m_flag)] = REG_SP;
14741237   /* Set the S and M flags */
1475   FLAG_S = value & SFLAG_SET;
1476   FLAG_M = value & MFLAG_SET;
1238   m68k->s_flag = value & SFLAG_SET;
1239   m68k->m_flag = value & MFLAG_SET;
14771240   /* Set the new stack pointer */
1478   REG_SP = REG_SP_BASE[FLAG_S | ((FLAG_S>>1) & FLAG_M)];
1241   REG_SP = REG_SP_BASE[m68k->s_flag | ((m68k->s_flag>>1) & m68k->m_flag)];
14791242}
14801243
14811244/* Set the S and M flags.  Don't touch the stack pointer. */
1482INLINE void m68ki_set_sm_flag_nosp(uint value)
1245INLINE void m68ki_set_sm_flag_nosp(m68ki_cpu_core *m68k, UINT32 value)
14831246{
14841247   /* Set the S and M flags */
1485   FLAG_S = value & SFLAG_SET;
1486   FLAG_M = value & MFLAG_SET;
1248   m68k->s_flag = value & SFLAG_SET;
1249   m68k->m_flag = value & MFLAG_SET;
14871250}
14881251
14891252
14901253/* Set the condition code register */
1491INLINE void m68ki_set_ccr(uint value)
1254INLINE void m68ki_set_ccr(m68ki_cpu_core *m68k, UINT32 value)
14921255{
1493   FLAG_X = BIT_4(value)  << 4;
1494   FLAG_N = BIT_3(value)  << 4;
1495   FLAG_Z = !BIT_2(value);
1496   FLAG_V = BIT_1(value)  << 6;
1497   FLAG_C = BIT_0(value)  << 8;
1256   m68k->x_flag = BIT_4(value)  << 4;
1257   m68k->n_flag = BIT_3(value)  << 4;
1258   m68k->not_z_flag = !BIT_2(value);
1259   m68k->v_flag = BIT_1(value)  << 6;
1260   m68k->c_flag = BIT_0(value)  << 8;
14981261}
14991262
15001263/* Set the status register but don't check for interrupts */
1501INLINE void m68ki_set_sr_noint(uint value)
1264INLINE void m68ki_set_sr_noint(m68ki_cpu_core *m68k, UINT32 value)
15021265{
15031266   /* Mask out the "unimplemented" bits */
1504   value &= CPU_SR_MASK;
1267   value &= m68k->sr_mask;
15051268
15061269   /* Now set the status register */
1507   FLAG_T1 = BIT_F(value);
1508   FLAG_T0 = BIT_E(value);
1509   FLAG_INT_MASK = value & 0x0700;
1510   m68ki_set_ccr(value);
1511   m68ki_set_sm_flag((value >> 11) & 6);
1270   m68k->t1_flag = BIT_F(value);
1271   m68k->t0_flag = BIT_E(value);
1272   m68k->int_mask = value & 0x0700;
1273   m68ki_set_ccr(m68k, value);
1274   m68ki_set_sm_flag(m68k, (value >> 11) & 6);
15121275}
15131276
15141277/* Set the status register but don't check for interrupts nor
15151278 * change the stack pointer
15161279 */
1517INLINE void m68ki_set_sr_noint_nosp(uint value)
1280INLINE void m68ki_set_sr_noint_nosp(m68ki_cpu_core *m68k, UINT32 value)
15181281{
15191282   /* Mask out the "unimplemented" bits */
1520   value &= CPU_SR_MASK;
1283   value &= m68k->sr_mask;
15211284
15221285   /* Now set the status register */
1523   FLAG_T1 = BIT_F(value);
1524   FLAG_T0 = BIT_E(value);
1525   FLAG_INT_MASK = value & 0x0700;
1526   m68ki_set_ccr(value);
1527   m68ki_set_sm_flag_nosp((value >> 11) & 6);
1286   m68k->t1_flag = BIT_F(value);
1287   m68k->t0_flag = BIT_E(value);
1288   m68k->int_mask = value & 0x0700;
1289   m68ki_set_ccr(m68k, value);
1290   m68ki_set_sm_flag_nosp(m68k, (value >> 11) & 6);
15281291}
15291292
15301293/* Set the status register and check for interrupts */
1531INLINE void m68ki_set_sr(uint value)
1294INLINE void m68ki_set_sr(m68ki_cpu_core *m68k, UINT32 value)
15321295{
1533   m68ki_set_sr_noint(value);
1534   m68ki_check_interrupts();
1296   m68ki_set_sr_noint(m68k, value);
1297   m68ki_check_interrupts(m68k);
15351298}
15361299
15371300
15381301/* ------------------------- Exception Processing ------------------------- */
15391302
15401303/* Initiate exception processing */
1541INLINE uint m68ki_init_exception(void)
1304INLINE UINT32 m68ki_init_exception(m68ki_cpu_core *m68k)
15421305{
15431306   /* Save the old status register */
1544   uint sr = m68ki_get_sr();
1307   UINT32 sr = m68ki_get_sr(m68k);
15451308
15461309   /* Turn off trace flag, clear pending traces */
1547   FLAG_T1 = FLAG_T0 = 0;
1310   m68k->t1_flag = m68k->t0_flag = 0;
15481311   m68ki_clear_trace();
15491312   /* Enter supervisor mode */
1550   m68ki_set_s_flag(SFLAG_SET);
1313   m68ki_set_s_flag(m68k, SFLAG_SET);
15511314
15521315   return sr;
15531316}
15541317
15551318/* 3 word stack frame (68000 only) */
1556INLINE void m68ki_stack_frame_3word(uint pc, uint sr)
1319INLINE void m68ki_stack_frame_3word(m68ki_cpu_core *m68k, UINT32 pc, UINT32 sr)
15571320{
1558   m68ki_push_32(pc);
1559   m68ki_push_16(sr);
1321   m68ki_push_32(m68k, pc);
1322   m68ki_push_16(m68k, sr);
15601323}
15611324
15621325/* Format 0 stack frame.
15631326 * This is the standard stack frame for 68010+.
15641327 */
1565INLINE void m68ki_stack_frame_0000(uint pc, uint sr, uint vector)
1328INLINE void m68ki_stack_frame_0000(m68ki_cpu_core *m68k, UINT32 pc, UINT32 sr, UINT32 vector)
15661329{
15671330   /* Stack a 3-word frame if we are 68000 */
1568   if(CPU_TYPE == CPU_TYPE_000 || CPU_TYPE == CPU_TYPE_008)
1331   if(m68k->cpu_type == CPU_TYPE_000 || m68k->cpu_type == CPU_TYPE_008)
15691332   {
1570      m68ki_stack_frame_3word(pc, sr);
1333      m68ki_stack_frame_3word(m68k, pc, sr);
15711334      return;
15721335   }
1573   m68ki_push_16(vector<<2);
1574   m68ki_push_32(pc);
1575   m68ki_push_16(sr);
1336   m68ki_push_16(m68k, vector<<2);
1337   m68ki_push_32(m68k, pc);
1338   m68ki_push_16(m68k, sr);
15761339}
15771340
15781341/* Format 1 stack frame (68020).
15791342 * For 68020, this is the 4 word throwaway frame.
15801343 */
1581INLINE void m68ki_stack_frame_0001(uint pc, uint sr, uint vector)
1344INLINE void m68ki_stack_frame_0001(m68ki_cpu_core *m68k, UINT32 pc, UINT32 sr, UINT32 vector)
15821345{
1583   m68ki_push_16(0x1000 | (vector<<2));
1584   m68ki_push_32(pc);
1585   m68ki_push_16(sr);
1346   m68ki_push_16(m68k, 0x1000 | (vector<<2));
1347   m68ki_push_32(m68k, pc);
1348   m68ki_push_16(m68k, sr);
15861349}
15871350
15881351/* Format 2 stack frame.
15891352 * This is used only by 68020 for trap exceptions.
15901353 */
1591INLINE void m68ki_stack_frame_0010(uint sr, uint vector)
1354INLINE void m68ki_stack_frame_0010(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector)
15921355{
1593   m68ki_push_32(REG_PPC);
1594   m68ki_push_16(0x2000 | (vector<<2));
1595   m68ki_push_32(REG_PC);
1596   m68ki_push_16(sr);
1356   m68ki_push_32(m68k, REG_PPC);
1357   m68ki_push_16(m68k, 0x2000 | (vector<<2));
1358   m68ki_push_32(m68k, REG_PC);
1359   m68ki_push_16(m68k, sr);
15971360}
15981361
15991362
16001363/* Bus error stack frame (68000 only).
16011364 */
1602INLINE void m68ki_stack_frame_buserr(uint sr)
1365INLINE void m68ki_stack_frame_buserr(m68ki_cpu_core *m68k, UINT32 sr)
16031366{
1604   m68ki_push_32(REG_PC);
1605   m68ki_push_16(sr);
1606   m68ki_push_16(REG_IR);
1607   m68ki_push_32(m68ki_aerr_address);   /* access address */
1367   m68ki_push_32(m68k, REG_PC);
1368   m68ki_push_16(m68k, sr);
1369   m68ki_push_16(m68k, m68k->ir);
1370   m68ki_push_32(m68k, m68k->aerr_address);   /* access address */
16081371   /* 0 0 0 0 0 0 0 0 0 0 0 R/W I/N FC
16091372     * R/W  0 = write, 1 = read
16101373     * I/N  0 = instruction, 1 = not
16111374     * FC   3-bit function code
16121375     */
1613   m68ki_push_16(m68ki_aerr_write_mode | CPU_INSTR_MODE | m68ki_aerr_fc);
1376   m68ki_push_16(m68k, m68k->aerr_write_mode | m68k->instr_mode | m68k->aerr_fc);
16141377}
16151378
16161379/* Format 8 stack frame (68010).
16171380 * 68010 only.  This is the 29 word bus/address error frame.
16181381 */
1619void m68ki_stack_frame_1000(uint pc, uint sr, uint vector)
1382void m68ki_stack_frame_1000(m68ki_cpu_core *m68k, UINT32 pc, UINT32 sr, UINT32 vector)
16201383{
16211384   /* VERSION
16221385     * NUMBER
16231386     * INTERNAL INFORMATION, 16 WORDS
16241387     */
1625   m68ki_fake_push_32();
1626   m68ki_fake_push_32();
1627   m68ki_fake_push_32();
1628   m68ki_fake_push_32();
1629   m68ki_fake_push_32();
1630   m68ki_fake_push_32();
1631   m68ki_fake_push_32();
1632   m68ki_fake_push_32();
1388   m68ki_fake_push_32(m68k);
1389   m68ki_fake_push_32(m68k);
1390   m68ki_fake_push_32(m68k);
1391   m68ki_fake_push_32(m68k);
1392   m68ki_fake_push_32(m68k);
1393   m68ki_fake_push_32(m68k);
1394   m68ki_fake_push_32(m68k);
1395   m68ki_fake_push_32(m68k);
16331396
16341397   /* INSTRUCTION INPUT BUFFER */
1635   m68ki_push_16(0);
1398   m68ki_push_16(m68k, 0);
16361399
16371400   /* UNUSED, RESERVED (not written) */
1638   m68ki_fake_push_16();
1401   m68ki_fake_push_16(m68k);
16391402
16401403   /* DATA INPUT BUFFER */
1641   m68ki_push_16(0);
1404   m68ki_push_16(m68k, 0);
16421405
16431406   /* UNUSED, RESERVED (not written) */
1644   m68ki_fake_push_16();
1407   m68ki_fake_push_16(m68k);
16451408
16461409   /* DATA OUTPUT BUFFER */
1647   m68ki_push_16(0);
1410   m68ki_push_16(m68k, 0);
16481411
16491412   /* UNUSED, RESERVED (not written) */
1650   m68ki_fake_push_16();
1413   m68ki_fake_push_16(m68k);
16511414
16521415   /* FAULT ADDRESS */
1653   m68ki_push_32(0);
1416   m68ki_push_32(m68k, 0);
16541417
16551418   /* SPECIAL STATUS WORD */
1656   m68ki_push_16(0);
1419   m68ki_push_16(m68k, 0);
16571420
16581421   /* 1000, VECTOR OFFSET */
1659   m68ki_push_16(0x8000 | (vector<<2));
1422   m68ki_push_16(m68k, 0x8000 | (vector<<2));
16601423
16611424   /* PROGRAM COUNTER */
1662   m68ki_push_32(pc);
1425   m68ki_push_32(m68k, pc);
16631426
16641427   /* STATUS REGISTER */
1665   m68ki_push_16(sr);
1428   m68ki_push_16(m68k, sr);
16661429}
16671430
16681431/* Format A stack frame (short bus fault).
r3535r3536
16701433 * if the error happens at an instruction boundary.
16711434 * PC stacked is address of next instruction.
16721435 */
1673void m68ki_stack_frame_1010(uint sr, uint vector, uint pc)
1436void m68ki_stack_frame_1010(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector, UINT32 pc)
16741437{
16751438   /* INTERNAL REGISTER */
1676   m68ki_push_16(0);
1439   m68ki_push_16(m68k, 0);
16771440
16781441   /* INTERNAL REGISTER */
1679   m68ki_push_16(0);
1442   m68ki_push_16(m68k, 0);
16801443
16811444   /* DATA OUTPUT BUFFER (2 words) */
1682   m68ki_push_32(0);
1445   m68ki_push_32(m68k, 0);
16831446
16841447   /* INTERNAL REGISTER */
1685   m68ki_push_16(0);
1448   m68ki_push_16(m68k, 0);
16861449
16871450   /* INTERNAL REGISTER */
1688   m68ki_push_16(0);
1451   m68ki_push_16(m68k, 0);
16891452
16901453   /* DATA CYCLE FAULT ADDRESS (2 words) */
1691   m68ki_push_32(0);
1454   m68ki_push_32(m68k, 0);
16921455
16931456   /* INSTRUCTION PIPE STAGE B */
1694   m68ki_push_16(0);
1457   m68ki_push_16(m68k, 0);
16951458
16961459   /* INSTRUCTION PIPE STAGE C */
1697   m68ki_push_16(0);
1460   m68ki_push_16(m68k, 0);
16981461
16991462   /* SPECIAL STATUS REGISTER */
1700   m68ki_push_16(0);
1463   m68ki_push_16(m68k, 0);
17011464
17021465   /* INTERNAL REGISTER */
1703   m68ki_push_16(0);
1466   m68ki_push_16(m68k, 0);
17041467
17051468   /* 1010, VECTOR OFFSET */
1706   m68ki_push_16(0xa000 | (vector<<2));
1469   m68ki_push_16(m68k, 0xa000 | (vector<<2));
17071470
17081471   /* PROGRAM COUNTER */
1709   m68ki_push_32(pc);
1472   m68ki_push_32(m68k, pc);
17101473
17111474   /* STATUS REGISTER */
1712   m68ki_push_16(sr);
1475   m68ki_push_16(m68k, sr);
17131476}
17141477
17151478/* Format B stack frame (long bus fault).
r3535r3536
17171480 * if the error happens during instruction execution.
17181481 * PC stacked is address of instruction in progress.
17191482 */
1720void m68ki_stack_frame_1011(uint sr, uint vector, uint pc)
1483void m68ki_stack_frame_1011(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector, UINT32 pc)
17211484{
17221485   /* INTERNAL REGISTERS (18 words) */
1723   m68ki_push_32(0);
1724   m68ki_push_32(0);
1725   m68ki_push_32(0);
1726   m68ki_push_32(0);
1727   m68ki_push_32(0);
1728   m68ki_push_32(0);
1729   m68ki_push_32(0);
1730   m68ki_push_32(0);
1731   m68ki_push_32(0);
1486   m68ki_push_32(m68k, 0);
1487   m68ki_push_32(m68k, 0);
1488   m68ki_push_32(m68k, 0);
1489   m68ki_push_32(m68k, 0);
1490   m68ki_push_32(m68k, 0);
1491   m68ki_push_32(m68k, 0);
1492   m68ki_push_32(m68k, 0);
1493   m68ki_push_32(m68k, 0);
1494   m68ki_push_32(m68k, 0);
17321495
17331496   /* VERSION# (4 bits), INTERNAL INFORMATION */
1734   m68ki_push_16(0);
1497   m68ki_push_16(m68k, 0);
17351498
17361499   /* INTERNAL REGISTERS (3 words) */
1737   m68ki_push_32(0);
1738   m68ki_push_16(0);
1500   m68ki_push_32(m68k, 0);
1501   m68ki_push_16(m68k, 0);
17391502
17401503   /* DATA INTPUT BUFFER (2 words) */
1741   m68ki_push_32(0);
1504   m68ki_push_32(m68k, 0);
17421505
17431506   /* INTERNAL REGISTERS (2 words) */
1744   m68ki_push_32(0);
1507   m68ki_push_32(m68k, 0);
17451508
17461509   /* STAGE B ADDRESS (2 words) */
1747   m68ki_push_32(0);
1510   m68ki_push_32(m68k, 0);
17481511
17491512   /* INTERNAL REGISTER (4 words) */
1750   m68ki_push_32(0);
1751   m68ki_push_32(0);
1513   m68ki_push_32(m68k, 0);
1514   m68ki_push_32(m68k, 0);
17521515
17531516   /* DATA OUTPUT BUFFER (2 words) */
1754   m68ki_push_32(0);
1517   m68ki_push_32(m68k, 0);
17551518
17561519   /* INTERNAL REGISTER */
1757   m68ki_push_16(0);
1520   m68ki_push_16(m68k, 0);
17581521
17591522   /* INTERNAL REGISTER */
1760   m68ki_push_16(0);
1523   m68ki_push_16(m68k, 0);
17611524
17621525   /* DATA CYCLE FAULT ADDRESS (2 words) */
1763   m68ki_push_32(0);
1526   m68ki_push_32(m68k, 0);
17641527
17651528   /* INSTRUCTION PIPE STAGE B */
1766   m68ki_push_16(0);
1529   m68ki_push_16(m68k, 0);
17671530
17681531   /* INSTRUCTION PIPE STAGE C */
1769   m68ki_push_16(0);
1532   m68ki_push_16(m68k, 0);
17701533
17711534   /* SPECIAL STATUS REGISTER */
1772   m68ki_push_16(0);
1535   m68ki_push_16(m68k, 0);
17731536
17741537   /* INTERNAL REGISTER */
1775   m68ki_push_16(0);
1538   m68ki_push_16(m68k, 0);
17761539
17771540   /* 1011, VECTOR OFFSET */
1778   m68ki_push_16(0xb000 | (vector<<2));
1541   m68ki_push_16(m68k, 0xb000 | (vector<<2));
17791542
17801543   /* PROGRAM COUNTER */
1781   m68ki_push_32(pc);
1544   m68ki_push_32(m68k, pc);
17821545
17831546   /* STATUS REGISTER */
1784   m68ki_push_16(sr);
1547   m68ki_push_16(m68k, sr);
17851548}
17861549
17871550
17881551/* Used for Group 2 exceptions.
17891552 * These stack a type 2 frame on the 020.
17901553 */
1791INLINE void m68ki_exception_trap(uint vector)
1554INLINE void m68ki_exception_trap(m68ki_cpu_core *m68k, UINT32 vector)
17921555{
1793   uint sr = m68ki_init_exception();
1556   UINT32 sr = m68ki_init_exception(m68k);
17941557
1795   if(CPU_TYPE_IS_010_LESS(CPU_TYPE))
1796      m68ki_stack_frame_0000(REG_PC, sr, vector);
1558   if(CPU_TYPE_IS_010_LESS(m68k->cpu_type))
1559      m68ki_stack_frame_0000(m68k, REG_PC, sr, vector);
17971560   else
1798      m68ki_stack_frame_0010(sr, vector);
1561      m68ki_stack_frame_0010(m68k, sr, vector);
17991562
1800   m68ki_jump_vector(vector);
1563   m68ki_jump_vector(m68k, vector);
18011564
18021565   /* Use up some clock cycles */
1803   USE_CYCLES(CYC_EXCEPTION[vector]);
1566   USE_CYCLES(m68k, m68k->cyc_exception[vector]);
18041567}
18051568
18061569/* Trap#n stacks a 0 frame but behaves like group2 otherwise */
1807INLINE void m68ki_exception_trapN(uint vector)
1570INLINE void m68ki_exception_trapN(m68ki_cpu_core *m68k, UINT32 vector)
18081571{
1809   uint sr = m68ki_init_exception();
1810   m68ki_stack_frame_0000(REG_PC, sr, vector);
1811   m68ki_jump_vector(vector);
1572   UINT32 sr = m68ki_init_exception(m68k);
1573   m68ki_stack_frame_0000(m68k, REG_PC, sr, vector);
1574   m68ki_jump_vector(m68k, vector);
18121575
18131576   /* Use up some clock cycles */
1814   USE_CYCLES(CYC_EXCEPTION[vector]);
1577   USE_CYCLES(m68k, m68k->cyc_exception[vector]);
18151578}
18161579
18171580/* Exception for trace mode */
1818INLINE void m68ki_exception_trace(void)
1581INLINE void m68ki_exception_trace(m68ki_cpu_core *m68k)
18191582{
1820   uint sr = m68ki_init_exception();
1583   UINT32 sr = m68ki_init_exception(m68k);
18211584
1822   if(CPU_TYPE_IS_010_LESS(CPU_TYPE))
1585   if(CPU_TYPE_IS_010_LESS(m68k->cpu_type))
18231586   {
1824      #if M68K_EMULATE_ADDRESS_ERROR == OPT_ON
1825      if(CPU_TYPE_IS_000(CPU_TYPE))
1587      if(CPU_TYPE_IS_000(m68k->cpu_type))
18261588      {
1827         CPU_INSTR_MODE = INSTRUCTION_NO;
1589         m68k->instr_mode = INSTRUCTION_NO;
18281590      }
1829      #endif /* M68K_EMULATE_ADDRESS_ERROR */
1830      m68ki_stack_frame_0000(REG_PC, sr, EXCEPTION_TRACE);
1591      m68ki_stack_frame_0000(m68k, REG_PC, sr, EXCEPTION_TRACE);
18311592   }
18321593   else
1833      m68ki_stack_frame_0010(sr, EXCEPTION_TRACE);
1594      m68ki_stack_frame_0010(m68k, sr, EXCEPTION_TRACE);
18341595
1835   m68ki_jump_vector(EXCEPTION_TRACE);
1596   m68ki_jump_vector(m68k, EXCEPTION_TRACE);
18361597
18371598   /* Trace nullifies a STOP instruction */
1838   CPU_STOPPED &= ~STOP_LEVEL_STOP;
1599   m68k->stopped &= ~STOP_LEVEL_STOP;
18391600
18401601   /* Use up some clock cycles */
1841   USE_CYCLES(CYC_EXCEPTION[EXCEPTION_TRACE]);
1602   USE_CYCLES(m68k, m68k->cyc_exception[EXCEPTION_TRACE]);
18421603}
18431604
18441605/* Exception for privilege violation */
1845INLINE void m68ki_exception_privilege_violation(void)
1606INLINE void m68ki_exception_privilege_violation(m68ki_cpu_core *m68k)
18461607{
1847   uint sr = m68ki_init_exception();
1608   UINT32 sr = m68ki_init_exception(m68k);
18481609
1849   #if M68K_EMULATE_ADDRESS_ERROR == OPT_ON
1850   if(CPU_TYPE_IS_000(CPU_TYPE))
1610   if(CPU_TYPE_IS_000(m68k->cpu_type))
18511611   {
1852      CPU_INSTR_MODE = INSTRUCTION_NO;
1612      m68k->instr_mode = INSTRUCTION_NO;
18531613   }
1854   #endif /* M68K_EMULATE_ADDRESS_ERROR */
18551614
1856   m68ki_stack_frame_0000(REG_PPC, sr, EXCEPTION_PRIVILEGE_VIOLATION);
1857   m68ki_jump_vector(EXCEPTION_PRIVILEGE_VIOLATION);
1615   m68ki_stack_frame_0000(m68k, REG_PPC, sr, EXCEPTION_PRIVILEGE_VIOLATION);
1616   m68ki_jump_vector(m68k, EXCEPTION_PRIVILEGE_VIOLATION);
18581617
18591618   /* Use up some clock cycles and undo the instruction's cycles */
1860   USE_CYCLES(CYC_EXCEPTION[EXCEPTION_PRIVILEGE_VIOLATION] - CYC_INSTRUCTION[REG_IR]);
1619   USE_CYCLES(m68k, m68k->cyc_exception[EXCEPTION_PRIVILEGE_VIOLATION] - m68k->cyc_instruction[m68k->ir]);
18611620}
18621621
18631622/* Exception for A-Line instructions */
1864INLINE void m68ki_exception_1010(void)
1623INLINE void m68ki_exception_1010(m68ki_cpu_core *m68k)
18651624{
1866   uint sr;
1625   UINT32 sr;
18671626#if M68K_LOG_1010_1111 == OPT_ON
18681627   M68K_DO_LOG_EMU((M68K_LOG_FILEHANDLE "%s at %08x: called 1010 instruction %04x (%s)\n",
1869                m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PPC), REG_IR,
1870                m68ki_disassemble_quick(ADDRESS_68K(REG_PPC))));
1628                m68ki_cpu_names[m68k->cpu_type], ADDRESS_68K(m68k, REG_PPC), m68k->ir,
1629                m68ki_disassemble_quick(ADDRESS_68K(m68k, REG_PPC))));
18711630#endif
18721631
1873   sr = m68ki_init_exception();
1874   m68ki_stack_frame_0000(REG_PPC, sr, EXCEPTION_1010);
1875   m68ki_jump_vector(EXCEPTION_1010);
1632   sr = m68ki_init_exception(m68k);
1633   m68ki_stack_frame_0000(m68k, REG_PPC, sr, EXCEPTION_1010);
1634   m68ki_jump_vector(m68k, EXCEPTION_1010);
18761635
18771636   /* Use up some clock cycles and undo the instruction's cycles */
1878   USE_CYCLES(CYC_EXCEPTION[EXCEPTION_1010] - CYC_INSTRUCTION[REG_IR]);
1637   USE_CYCLES(m68k, m68k->cyc_exception[EXCEPTION_1010] - m68k->cyc_instruction[m68k->ir]);
18791638}
18801639
18811640/* Exception for F-Line instructions */
1882INLINE void m68ki_exception_1111(void)
1641INLINE void m68ki_exception_1111(m68ki_cpu_core *m68k)
18831642{
1884   uint sr;
1643   UINT32 sr;
18851644
18861645#if M68K_LOG_1010_1111 == OPT_ON
18871646   M68K_DO_LOG_EMU((M68K_LOG_FILEHANDLE "%s at %08x: called 1111 instruction %04x (%s)\n",
1888                m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PPC), REG_IR,
1889                m68ki_disassemble_quick(ADDRESS_68K(REG_PPC))));
1647                m68ki_cpu_names[m68k->cpu_type], ADDRESS_68K(m68k, REG_PPC), m68k->ir,
1648                m68ki_disassemble_quick(ADDRESS_68K(m68k, REG_PPC))));
18901649#endif
18911650
1892   sr = m68ki_init_exception();
1893   m68ki_stack_frame_0000(REG_PPC, sr, EXCEPTION_1111);
1894   m68ki_jump_vector(EXCEPTION_1111);
1651   sr = m68ki_init_exception(m68k);
1652   m68ki_stack_frame_0000(m68k, REG_PPC, sr, EXCEPTION_1111);
1653   m68ki_jump_vector(m68k, EXCEPTION_1111);
18951654
18961655   /* Use up some clock cycles and undo the instruction's cycles */
1897   USE_CYCLES(CYC_EXCEPTION[EXCEPTION_1111] - CYC_INSTRUCTION[REG_IR]);
1656   USE_CYCLES(m68k, m68k->cyc_exception[EXCEPTION_1111] - m68k->cyc_instruction[m68k->ir]);
18981657}
18991658
19001659/* Exception for illegal instructions */
1901INLINE void m68ki_exception_illegal(void)
1660INLINE void m68ki_exception_illegal(m68ki_cpu_core *m68k)
19021661{
1903   uint sr;
1662   UINT32 sr;
19041663
19051664   M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: illegal instruction %04x (%s)\n",
1906             m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PPC), REG_IR,
1907             m68ki_disassemble_quick(ADDRESS_68K(REG_PPC))));
1665             m68ki_cpu_names[m68k->cpu_type], ADDRESS_68K(m68k, REG_PPC), m68k->ir,
1666             m68ki_disassemble_quick(ADDRESS_68K(m68k, REG_PPC))));
19081667
1909   sr = m68ki_init_exception();
1668   sr = m68ki_init_exception(m68k);
19101669
1911   #if M68K_EMULATE_ADDRESS_ERROR == OPT_ON
1912   if(CPU_TYPE_IS_000(CPU_TYPE))
1670   if(CPU_TYPE_IS_000(m68k->cpu_type))
19131671   {
1914      CPU_INSTR_MODE = INSTRUCTION_NO;
1672      m68k->instr_mode = INSTRUCTION_NO;
19151673   }
1916   #endif /* M68K_EMULATE_ADDRESS_ERROR */
19171674
1918   m68ki_stack_frame_0000(REG_PPC, sr, EXCEPTION_ILLEGAL_INSTRUCTION);
1919   m68ki_jump_vector(EXCEPTION_ILLEGAL_INSTRUCTION);
1675   m68ki_stack_frame_0000(m68k, REG_PPC, sr, EXCEPTION_ILLEGAL_INSTRUCTION);
1676   m68ki_jump_vector(m68k, EXCEPTION_ILLEGAL_INSTRUCTION);
19201677
19211678   /* Use up some clock cycles and undo the instruction's cycles */
1922   USE_CYCLES(CYC_EXCEPTION[EXCEPTION_ILLEGAL_INSTRUCTION] - CYC_INSTRUCTION[REG_IR]);
1679   USE_CYCLES(m68k, m68k->cyc_exception[EXCEPTION_ILLEGAL_INSTRUCTION] - m68k->cyc_instruction[m68k->ir]);
19231680}
19241681
19251682/* Exception for format errror in RTE */
1926INLINE void m68ki_exception_format_error(void)
1683INLINE void m68ki_exception_format_error(m68ki_cpu_core *m68k)
19271684{
1928   uint sr = m68ki_init_exception();
1929   m68ki_stack_frame_0000(REG_PC, sr, EXCEPTION_FORMAT_ERROR);
1930   m68ki_jump_vector(EXCEPTION_FORMAT_ERROR);
1685   UINT32 sr = m68ki_init_exception(m68k);
1686   m68ki_stack_frame_0000(m68k, REG_PC, sr, EXCEPTION_FORMAT_ERROR);
1687   m68ki_jump_vector(m68k, EXCEPTION_FORMAT_ERROR);
19311688
19321689   /* Use up some clock cycles and undo the instruction's cycles */
1933   USE_CYCLES(CYC_EXCEPTION[EXCEPTION_FORMAT_ERROR] - CYC_INSTRUCTION[REG_IR]);
1690   USE_CYCLES(m68k, m68k->cyc_exception[EXCEPTION_FORMAT_ERROR] - m68k->cyc_instruction[m68k->ir]);
19341691}
19351692
19361693/* Exception for address error */
1937INLINE void m68ki_exception_address_error(void)
1694INLINE void m68ki_exception_address_error(m68ki_cpu_core *m68k)
19381695{
1939   uint sr = m68ki_init_exception();
1696   UINT32 sr = m68ki_init_exception(m68k);
19401697
19411698   /* If we were processing a bus error, address error, or reset,
19421699     * this is a catastrophic failure.
19431700     * Halt the CPU
19441701     */
1945   if(CPU_RUN_MODE == RUN_MODE_BERR_AERR_RESET)
1702   if(m68k->run_mode == RUN_MODE_BERR_AERR_RESET)
19461703   {
1947      m68k_read_memory_8(0x00ffff01);
1948      CPU_STOPPED = STOP_LEVEL_HALT;
1704      m68k_read_memory_8(m68k, 0x00ffff01);
1705      m68k->stopped = STOP_LEVEL_HALT;
19491706      return;
19501707   }
1951   CPU_RUN_MODE = RUN_MODE_BERR_AERR_RESET;
1708   m68k->run_mode = RUN_MODE_BERR_AERR_RESET;
19521709
19531710   /* Note: This is implemented for 68000 only! */
1954   m68ki_stack_frame_buserr(sr);
1711   m68ki_stack_frame_buserr(m68k, sr);
19551712
1956   m68ki_jump_vector(EXCEPTION_ADDRESS_ERROR);
1713   m68ki_jump_vector(m68k, EXCEPTION_ADDRESS_ERROR);
19571714
19581715   /* Use up some clock cycles and undo the instruction's cycles */
1959   USE_CYCLES(CYC_EXCEPTION[EXCEPTION_ADDRESS_ERROR] - CYC_INSTRUCTION[REG_IR]);
1716   USE_CYCLES(m68k, m68k->cyc_exception[EXCEPTION_ADDRESS_ERROR] - m68k->cyc_instruction[m68k->ir]);
19601717}
19611718
19621719
19631720/* Service an interrupt request and start exception processing */
1964void m68ki_exception_interrupt(uint int_level)
1721void m68ki_exception_interrupt(m68ki_cpu_core *m68k, UINT32 int_level)
19651722{
1966   uint vector;
1967   uint sr;
1968   uint new_pc;
1723   UINT32 vector;
1724   UINT32 sr;
1725   UINT32 new_pc;
19691726
1970   #if M68K_EMULATE_ADDRESS_ERROR == OPT_ON
1971   if(CPU_TYPE_IS_000(CPU_TYPE))
1727   if(CPU_TYPE_IS_000(m68k->cpu_type))
19721728   {
1973      CPU_INSTR_MODE = INSTRUCTION_NO;
1729      m68k->instr_mode = INSTRUCTION_NO;
19741730   }
1975   #endif /* M68K_EMULATE_ADDRESS_ERROR */
19761731
19771732   /* Turn off the stopped state */
1978   CPU_STOPPED &= ~STOP_LEVEL_STOP;
1733   m68k->stopped &= ~STOP_LEVEL_STOP;
19791734
19801735   /* If we are halted, don't do anything */
1981   if(CPU_STOPPED)
1736   if(m68k->stopped)
19821737      return;
19831738
19841739   /* Acknowledge the interrupt */
1985   vector = m68ki_int_ack(int_level);
1740   vector = (*m68k->int_ack_callback)(m68k->int_ack_param, int_level);
19861741
19871742   /* Get the interrupt vector */
19881743   if(vector == M68K_INT_ACK_AUTOVECTOR)
r3535r3536
19941749   else if(vector > 255)
19951750   {
19961751      M68K_DO_LOG_EMU((M68K_LOG_FILEHANDLE "%s at %08x: Interrupt acknowledge returned invalid vector $%x\n",
1997             m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC), vector));
1752             m68ki_cpu_names[m68k->cpu_type], ADDRESS_68K(m68k, REG_PC), vector));
19981753      return;
19991754   }
20001755
20011756   /* Start exception processing */
2002   sr = m68ki_init_exception();
1757   sr = m68ki_init_exception(m68k);
20031758
20041759   /* Set the interrupt mask to the level of the one being serviced */
2005   FLAG_INT_MASK = int_level<<8;
1760   m68k->int_mask = int_level<<8;
20061761
20071762   /* Get the new PC */
2008   new_pc = m68ki_read_data_32((vector<<2) + REG_VBR);
1763   new_pc = m68ki_read_data_32(m68k, (vector<<2) + m68k->vbr);
20091764
20101765   /* If vector is uninitialized, call the uninitialized interrupt vector */
20111766   if(new_pc == 0)
2012      new_pc = m68ki_read_data_32((EXCEPTION_UNINITIALIZED_INTERRUPT<<2) + REG_VBR);
1767      new_pc = m68ki_read_data_32(m68k, (EXCEPTION_UNINITIALIZED_INTERRUPT<<2) + m68k->vbr);
20131768
20141769   /* Generate a stack frame */
2015   m68ki_stack_frame_0000(REG_PC, sr, vector);
2016   if(FLAG_M && CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
1770   m68ki_stack_frame_0000(m68k, REG_PC, sr, vector);
1771   if(m68k->m_flag && CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
20171772   {
20181773      /* Create throwaway frame */
2019      m68ki_set_sm_flag(FLAG_S);   /* clear M */
1774      m68ki_set_sm_flag(m68k, m68k->s_flag);   /* clear M */
20201775      sr |= 0x2000; /* Same as SR in master stack frame except S is forced high */
2021      m68ki_stack_frame_0001(REG_PC, sr, vector);
1776      m68ki_stack_frame_0001(m68k, REG_PC, sr, vector);
20221777   }
20231778
2024   m68ki_jump(new_pc);
1779   m68ki_jump(m68k, new_pc);
20251780
20261781   /* Defer cycle counting until later */
2027   USE_CYCLES(CYC_EXCEPTION[vector]);
2028
2029#if !M68K_EMULATE_INT_ACK
2030   /* Automatically clear IRQ if we are not using an acknowledge scheme */
2031   CPU_INT_LEVEL = 0;
2032#endif /* M68K_EMULATE_INT_ACK */
1782   USE_CYCLES(m68k, m68k->cyc_exception[vector]);
20331783}
20341784
20351785
20361786/* ASG: Check for interrupts */
2037INLINE void m68ki_check_interrupts(void)
1787INLINE void m68ki_check_interrupts(m68ki_cpu_core *m68k)
20381788{
2039   if(m68ki_cpu.nmi_pending)
1789   if(m68k->nmi_pending)
20401790   {
2041      m68ki_cpu.nmi_pending = FALSE;
2042      m68ki_exception_interrupt(7);
1791      m68k->nmi_pending = FALSE;
1792      m68ki_exception_interrupt(m68k, 7);
20431793   }
2044   else if(CPU_INT_LEVEL > FLAG_INT_MASK)
2045      m68ki_exception_interrupt(CPU_INT_LEVEL>>8);
1794   else if(m68k->int_level > m68k->int_mask)
1795      m68ki_exception_interrupt(m68k, m68k->int_level>>8);
20461796}
20471797
20481798
src/emu/cpu/m68000/m68kmake.c
r3535r3536
781781/* Write the name of an opcode handler function */
782782void write_function_name(FILE* filep, char* base_name)
783783{
784   fprintf(filep, "static void %s(void)\n", base_name);
784   fprintf(filep, "static void %s(m68ki_cpu_core *m68k)\n", base_name);
785785}
786786
787787void add_opcode_output_table_entry(opcode_struct* op, char* name)
r3535r3536
870870   /* Add any replace strings needed */
871871   if(ea_mode != EA_MODE_NONE)
872872   {
873      sprintf(str, "EA_%s_8()", g_ea_info_table[ea_mode].ea_add);
873      sprintf(str, "EA_%s_8(m68k)", g_ea_info_table[ea_mode].ea_add);
874874      add_replace_string(replace, ID_OPHANDLER_EA_AY_8, str);
875      sprintf(str, "EA_%s_16()", g_ea_info_table[ea_mode].ea_add);
875      sprintf(str, "EA_%s_16(m68k)", g_ea_info_table[ea_mode].ea_add);
876876      add_replace_string(replace, ID_OPHANDLER_EA_AY_16, str);
877      sprintf(str, "EA_%s_32()", g_ea_info_table[ea_mode].ea_add);
877      sprintf(str, "EA_%s_32(m68k)", g_ea_info_table[ea_mode].ea_add);
878878      add_replace_string(replace, ID_OPHANDLER_EA_AY_32, str);
879      sprintf(str, "OPER_%s_8()", g_ea_info_table[ea_mode].ea_add);
879      sprintf(str, "OPER_%s_8(m68k)", g_ea_info_table[ea_mode].ea_add);
880880      add_replace_string(replace, ID_OPHANDLER_OPER_AY_8, str);
881      sprintf(str, "OPER_%s_16()", g_ea_info_table[ea_mode].ea_add);
881      sprintf(str, "OPER_%s_16(m68k)", g_ea_info_table[ea_mode].ea_add);
882882      add_replace_string(replace, ID_OPHANDLER_OPER_AY_16, str);
883      sprintf(str, "OPER_%s_32()", g_ea_info_table[ea_mode].ea_add);
883      sprintf(str, "OPER_%s_32(m68k)", g_ea_info_table[ea_mode].ea_add);
884884      add_replace_string(replace, ID_OPHANDLER_OPER_AY_32, str);
885885   }
886886
r3535r3536
962962   for(i=2;i<16;i++)
963963   {
964964      /* Add replace strings for this condition code */
965      sprintf(repl, "COND_%s()", g_cc_table[i][1]);
966      sprintf(replnot, "COND_NOT_%s()", g_cc_table[i][1]);
965      sprintf(repl, "COND_%s(m68k)", g_cc_table[i][1]);
966      sprintf(replnot, "COND_NOT_%s(m68k)", g_cc_table[i][1]);
967967
968968      add_replace_string(replace, ID_OPHANDLER_CC, repl);
969969      add_replace_string(replace, ID_OPHANDLER_NOT_CC, replnot);
src/emu/cpu/m68000/m68kmame.c
r3535r3536
11#include <stdio.h>
22#include <stdlib.h>
3#include "m68k.h"
3#include "m68kcpu.h"
44#include "m68000.h"
55
66/* global access */
77
8static void *token;
9
810m68k_memory_interface m68k_memory_intf;
911offs_t m68k_encrypted_opcode_start[MAX_CPU];
1012offs_t m68k_encrypted_opcode_end[MAX_CPU];
r3535r3536
138140};
139141
140142
141static void set_irq_line(int irqline, int state)
143static void set_irq_line(m68ki_cpu_core *m68k, int irqline, int state)
142144{
143145   if (irqline == INPUT_LINE_NMI)
144146      irqline = 7;
145147
146   m68k_set_virq(irqline, state == ASSERT_LINE ? 1 : 0);
148   m68k_set_virq(m68k, irqline, state == ASSERT_LINE ? 1 : 0);
147149}
148150
149151
r3535r3536
151153 * 68000 section
152154 ****************************************************************************/
153155
154static void m68000_init(int index, int clock, const void *config, int (*irqcallback)(int))
156static CPU_INIT( m68000 )
155157{
156   m68k_init();
157   m68k_set_cpu_type(M68K_CPU_TYPE_68000);
158   m68ki_cpu_core *m68k = device->token;
159   token = device->token;   // temporary
160   m68k_init(m68k);
161   m68k_set_cpu_type(m68k, M68K_CPU_TYPE_68000);
158162   m68k_memory_intf = interface_d16;
159   m68k_state_register("m68000", index);
160   m68k_set_int_ack_callback(irqcallback);
163   m68k_state_register(m68k, "m68000", index);
164   m68k_set_int_ack_callback(m68k, (void *)device, (int (*)(void *param, int int_level)) irqcallback);
161165}
162166
163static void m68000_reset(void)
167static CPU_RESET( m68000 )
164168{
165   m68k_pulse_reset();
169   m68k_pulse_reset(device->token);
166170}
167171
168static void m68000_exit(void)
172static CPU_EXIT( m68000 )
169173{
170174   /* nothing to do */
171175}
172176
173static int m68000_execute(int cycles)
177static CPU_EXECUTE( m68000 )
174178{
175   return m68k_execute(cycles);
179   return m68k_execute(device->token, cycles);
176180}
177181
178static void m68000_get_context(void *dst)
182static CPU_GET_CONTEXT( m68000 )
179183{
180   m68k_get_context(dst);
181184}
182185
183static void m68000_set_context(void *src)
186static CPU_SET_CONTEXT( m68000 )
184187{
185188   if (m68k_memory_intf.read8 != program_read_byte_16be)
186189      m68k_memory_intf = interface_d16;
187   m68k_set_context(src);
190   token = src;
188191}
189192
190static offs_t m68000_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
193static CPU_DISASSEMBLE( m68000 )
191194{
192   M68K_SET_PC_CALLBACK(pc);
193195   return m68k_disassemble_raw(buffer, pc, oprom, opram, M68K_CPU_TYPE_68000);
194196}
195197
r3535r3536
198200 ****************************************************************************/
199201#if HAS_M68008
200202
201static void m68008_init(int index, int clock, const void *config, int (*irqcallback)(int))
203static CPU_INIT( m68008 )
202204{
203   m68k_init();
204   m68k_set_cpu_type(M68K_CPU_TYPE_68008);
205   m68ki_cpu_core *m68k = device->token;
206   token = device->token;   // temporary
207   m68k_init(m68k);
208   m68k_set_cpu_type(m68k, M68K_CPU_TYPE_68008);
205209   m68k_memory_intf = interface_d8;
206   m68k_state_register("m68008", index);
207   m68k_set_int_ack_callback(irqcallback);
210   m68k_state_register(m68k, "m68008", index);
211   m68k_set_int_ack_callback(m68k, (void *)device, (int (*)(void *param, int int_level)) irqcallback);
208212}
209213
210static void m68008_reset(void)
214static CPU_RESET( m68008 )
211215{
212   m68k_pulse_reset();
216   m68k_pulse_reset(device->token);
213217}
214218
215static void m68008_exit(void)
219static CPU_EXIT( m68008 )
216220{
217221   /* nothing to do */
218222}
219223
220static int m68008_execute(int cycles)
224static CPU_EXECUTE( m68008 )
221225{
222   return m68k_execute(cycles);
226   return m68k_execute(device->token, cycles);
223227}
224228
225static void m68008_get_context(void *dst)
229static CPU_GET_CONTEXT( m68008 )
226230{
227   m68k_get_context(dst);
228231}
229232
230static void m68008_set_context(void *src)
233static CPU_SET_CONTEXT( m68008 )
231234{
232235   if (m68k_memory_intf.read8 != program_read_byte_8be)
233236      m68k_memory_intf = interface_d8;
234   m68k_set_context(src);
237   token = src;
235238}
236239
237static offs_t m68008_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
240static CPU_DISASSEMBLE( m68008 )
238241{
239   M68K_SET_PC_CALLBACK(pc);
240242   return m68k_disassemble_raw(buffer, pc, oprom, opram, M68K_CPU_TYPE_68008);
241243}
242244
r3535r3536
247249 ****************************************************************************/
248250#if HAS_M68010
249251
250static void m68010_init(int index, int clock, const void *config, int (*irqcallback)(int))
252static CPU_INIT( m68010 )
251253{
252   m68k_init();
253   m68k_set_cpu_type(M68K_CPU_TYPE_68010);
254   m68ki_cpu_core *m68k = device->token;
255   token = device->token;   // temporary
256   m68k_init(m68k);
257   m68k_set_cpu_type(m68k, M68K_CPU_TYPE_68010);
254258   m68k_memory_intf = interface_d16;
255   m68k_state_register("m68010", index);
256   m68k_set_int_ack_callback(irqcallback);
259   m68k_state_register(m68k, "m68010", index);
260   m68k_set_int_ack_callback(m68k, (void *)device, (int (*)(void *param, int int_level)) irqcallback);
257261}
258262
259static offs_t m68010_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
263static CPU_DISASSEMBLE( m68010 )
260264{
261   M68K_SET_PC_CALLBACK(pc);
262265   return m68k_disassemble_raw(buffer, pc, oprom, opram, M68K_CPU_TYPE_68010);
263266}
264267
r3535r3536
268271 * M68020 section
269272 ****************************************************************************/
270273
271static void m68020_init(int index, int clock, const void *config, int (*irqcallback)(int))
274static CPU_INIT( m68020 )
272275{
273   m68k_init();
274   m68k_set_cpu_type(M68K_CPU_TYPE_68020);
276   m68ki_cpu_core *m68k = device->token;
277   token = device->token;   // temporary
278   m68k_init(m68k);
279   m68k_set_cpu_type(m68k, M68K_CPU_TYPE_68020);
275280   m68k_memory_intf = interface_d32;
276   m68k_state_register("m68020", index);
277   m68k_set_int_ack_callback(irqcallback);
281   m68k_state_register(m68k, "m68020", index);
282   m68k_set_int_ack_callback(m68k, (void *)device, (int (*)(void *param, int int_level)) irqcallback);
278283}
279284
280static void m68020_reset(void)
285static CPU_RESET( m68020 )
281286{
282   m68k_pulse_reset();
287   m68k_pulse_reset(device->token);
283288}
284289
285static void m68020_exit(void)
290static CPU_EXIT( m68020 )
286291{
287292   /* nothing to do */
288293}
289294
290static int m68020_execute(int cycles)
295static CPU_EXECUTE( m68020 )
291296{
292   return m68k_execute(cycles);
297   return m68k_execute(device->token, cycles);
293298}
294299
295static void m68020_get_context(void *dst)
300static CPU_GET_CONTEXT( m68020 )
296301{
297   m68k_get_context(dst);
298302}
299303
300static void m68020_set_context(void *src)
304static CPU_SET_CONTEXT( m68020 )
301305{
302306   if (m68k_memory_intf.read8 != program_read_byte_32be)
303307      m68k_memory_intf = interface_d32;
304   m68k_set_context(src);
308   token = src;
305309}
306310
307static offs_t m68020_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
311static CPU_DISASSEMBLE( m68020 )
308312{
309   M68K_SET_PC_CALLBACK(pc);
310313   return m68k_disassemble_raw(buffer, pc, oprom, opram, M68K_CPU_TYPE_68020);
311314}
312315
r3535r3536
316319 ****************************************************************************/
317320#if HAS_M68EC020
318321
319static void m68ec020_init(int index, int clock, const void *config, int (*irqcallback)(int))
322static CPU_INIT( m68ec020 )
320323{
321   m68k_init();
322   m68k_set_cpu_type(M68K_CPU_TYPE_68EC020);
324   m68ki_cpu_core *m68k = device->token;
325   token = device->token;   // temporary
326   m68k_init(m68k);
327   m68k_set_cpu_type(m68k, M68K_CPU_TYPE_68EC020);
323328   m68k_memory_intf = interface_d32;
324   m68k_state_register("m68ec020", index);
325   m68k_set_int_ack_callback(irqcallback);
329   m68k_state_register(m68k, "m68ec020", index);
330   m68k_set_int_ack_callback(m68k, (void *)device, (int (*)(void *param, int int_level)) irqcallback);
326331}
327332
328static offs_t m68ec020_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
333static CPU_DISASSEMBLE( m68ec020 )
329334{
330   M68K_SET_PC_CALLBACK(pc);
331335   return m68k_disassemble_raw(buffer, pc, oprom, opram, M68K_CPU_TYPE_68EC020);
332336}
333337
r3535r3536
338342 ****************************************************************************/
339343#if HAS_M68040
340344
341static void m68040_init(int index, int clock, const void *config, int (*irqcallback)(int))
345static CPU_INIT( m68040 )
342346{
343   m68k_init();
344   m68k_set_cpu_type(M68K_CPU_TYPE_68040);
347   m68ki_cpu_core *m68k = device->token;
348   token = device->token;   // temporary
349   m68k_init(m68k);
350   m68k_set_cpu_type(m68k, M68K_CPU_TYPE_68040);
345351   m68k_memory_intf = interface_d32;
346   m68k_state_register("m68040", index);
347   m68k_set_int_ack_callback(irqcallback);
352   m68k_state_register(m68k, "m68040", index);
353   m68k_set_int_ack_callback(m68k, (void *)device, (int (*)(void *param, int int_level)) irqcallback);
348354}
349355
350static void m68040_reset(void)
356static CPU_RESET( m68040 )
351357{
352   m68k_pulse_reset();
358   m68k_pulse_reset(device->token);
353359}
354360
355static void m68040_exit(void)
361static CPU_EXIT( m68040 )
356362{
357363   /* nothing to do */
358364}
359365
360static int m68040_execute(int cycles)
366static CPU_EXECUTE( m68040 )
361367{
362   return m68k_execute(cycles);
368   return m68k_execute(device->token, cycles);
363369}
364370
365static void m68040_get_context(void *dst)
371static CPU_GET_CONTEXT( m68040 )
366372{
367   m68k_get_context(dst);
368373}
369374
370static void m68040_set_context(void *src)
375static CPU_SET_CONTEXT( m68040 )
371376{
372377   if (m68k_memory_intf.read8 != program_read_byte_32be)
373378      m68k_memory_intf = interface_d32;
374   m68k_set_context(src);
379   token = src;
375380}
376381
377static offs_t m68040_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
382static CPU_DISASSEMBLE( m68040 )
378383{
379   M68K_SET_PC_CALLBACK(pc);
380384   return m68k_disassemble_raw(buffer, pc, oprom, opram, M68K_CPU_TYPE_68040);
381385}
382386
r3535r3536
386390 * Generic set_info
387391 **************************************************************************/
388392
389static void m68000_set_info(UINT32 state, cpuinfo *info)
393static CPU_SET_INFO( m68000 )
390394{
395   m68ki_cpu_core *m68k = token;
391396   switch (state)
392397   {
393398      /* --- the following bits of info are set as 64-bit signed integers --- */
394      case CPUINFO_INT_INPUT_STATE + 0:         set_irq_line(0, info->i);               break;
395      case CPUINFO_INT_INPUT_STATE + 1:         set_irq_line(1, info->i);               break;
396      case CPUINFO_INT_INPUT_STATE + 2:         set_irq_line(2, info->i);               break;
397      case CPUINFO_INT_INPUT_STATE + 3:         set_irq_line(3, info->i);               break;
398      case CPUINFO_INT_INPUT_STATE + 4:         set_irq_line(4, info->i);               break;
399      case CPUINFO_INT_INPUT_STATE + 5:         set_irq_line(5, info->i);               break;
400      case CPUINFO_INT_INPUT_STATE + 6:         set_irq_line(6, info->i);               break;
401      case CPUINFO_INT_INPUT_STATE + 7:         set_irq_line(7, info->i);               break;
399      case CPUINFO_INT_INPUT_STATE + 0:         set_irq_line(m68k, 0, info->i);               break;
400      case CPUINFO_INT_INPUT_STATE + 1:         set_irq_line(m68k, 1, info->i);               break;
401      case CPUINFO_INT_INPUT_STATE + 2:         set_irq_line(m68k, 2, info->i);               break;
402      case CPUINFO_INT_INPUT_STATE + 3:         set_irq_line(m68k, 3, info->i);               break;
403      case CPUINFO_INT_INPUT_STATE + 4:         set_irq_line(m68k, 4, info->i);               break;
404      case CPUINFO_INT_INPUT_STATE + 5:         set_irq_line(m68k, 5, info->i);               break;
405      case CPUINFO_INT_INPUT_STATE + 6:         set_irq_line(m68k, 6, info->i);               break;
406      case CPUINFO_INT_INPUT_STATE + 7:         set_irq_line(m68k, 7, info->i);               break;
402407
403      case CPUINFO_INT_PC:                    m68k_set_reg(M68K_REG_PC, info->i&0x00ffffff); break;
404      case CPUINFO_INT_REGISTER + M68K_PC:        m68k_set_reg(M68K_REG_PC, info->i);         break;
408      case CPUINFO_INT_PC:                    m68k_set_reg(m68k, M68K_REG_PC, info->i&0x00ffffff); break;
409      case CPUINFO_INT_REGISTER + M68K_PC:        m68k_set_reg(m68k, M68K_REG_PC, info->i);         break;
405410      case CPUINFO_INT_SP:
406      case CPUINFO_INT_REGISTER + M68K_SP:        m68k_set_reg(M68K_REG_SP, info->i);         break;
407      case CPUINFO_INT_REGISTER + M68K_ISP:       m68k_set_reg(M68K_REG_ISP, info->i);      break;
408      case CPUINFO_INT_REGISTER + M68K_USP:       m68k_set_reg(M68K_REG_USP, info->i);      break;
409      case CPUINFO_INT_REGISTER + M68K_SR:        m68k_set_reg(M68K_REG_SR, info->i);         break;
410      case CPUINFO_INT_REGISTER + M68K_D0:        m68k_set_reg(M68K_REG_D0, info->i);         break;
411      case CPUINFO_INT_REGISTER + M68K_D1:        m68k_set_reg(M68K_REG_D1, info->i);         break;
412      case CPUINFO_INT_REGISTER + M68K_D2:        m68k_set_reg(M68K_REG_D2, info->i);         break;
413      case CPUINFO_INT_REGISTER + M68K_D3:        m68k_set_reg(M68K_REG_D3, info->i);         break;
414      case CPUINFO_INT_REGISTER + M68K_D4:        m68k_set_reg(M68K_REG_D4, info->i);         break;
415      case CPUINFO_INT_REGISTER + M68K_D5:        m68k_set_reg(M68K_REG_D5, info->i);         break;
416      case CPUINFO_INT_REGISTER + M68K_D6:        m68k_set_reg(M68K_REG_D6, info->i);         break;
417      case CPUINFO_INT_REGISTER + M68K_D7:        m68k_set_reg(M68K_REG_D7, info->i);         break;
418      case CPUINFO_INT_REGISTER + M68K_A0:        m68k_set_reg(M68K_REG_A0, info->i);         break;
419      case CPUINFO_INT_REGISTER + M68K_A1:        m68k_set_reg(M68K_REG_A1, info->i);         break;
420      case CPUINFO_INT_REGISTER + M68K_A2:        m68k_set_reg(M68K_REG_A2, info->i);         break;
421      case CPUINFO_INT_REGISTER + M68K_A3:        m68k_set_reg(M68K_REG_A3, info->i);         break;
422      case CPUINFO_INT_REGISTER + M68K_A4:        m68k_set_reg(M68K_REG_A4, info->i);         break;
423      case CPUINFO_INT_REGISTER + M68K_A5:        m68k_set_reg(M68K_REG_A5, info->i);         break;
424      case CPUINFO_INT_REGISTER + M68K_A6:        m68k_set_reg(M68K_REG_A6, info->i);         break;
425      case CPUINFO_INT_REGISTER + M68K_A7:        m68k_set_reg(M68K_REG_A7, info->i);         break;
426      case CPUINFO_INT_REGISTER + M68K_PREF_ADDR:   m68k_set_reg(M68K_REG_PREF_ADDR, info->i);   break;
411      case CPUINFO_INT_REGISTER + M68K_SP:        m68k_set_reg(m68k, M68K_REG_SP, info->i);         break;
412      case CPUINFO_INT_REGISTER + M68K_ISP:       m68k_set_reg(m68k, M68K_REG_ISP, info->i);      break;
413      case CPUINFO_INT_REGISTER + M68K_USP:       m68k_set_reg(m68k, M68K_REG_USP, info->i);      break;
414      case CPUINFO_INT_REGISTER + M68K_SR:        m68k_set_reg(m68k, M68K_REG_SR, info->i);         break;
415      case CPUINFO_INT_REGISTER + M68K_D0:        m68k_set_reg(m68k, M68K_REG_D0, info->i);         break;
416      case CPUINFO_INT_REGISTER + M68K_D1:        m68k_set_reg(m68k, M68K_REG_D1, info->i);         break;
417      case CPUINFO_INT_REGISTER + M68K_D2:        m68k_set_reg(m68k, M68K_REG_D2, info->i);         break;
418      case CPUINFO_INT_REGISTER + M68K_D3:        m68k_set_reg(m68k, M68K_REG_D3, info->i);         break;
419      case CPUINFO_INT_REGISTER + M68K_D4:        m68k_set_reg(m68k, M68K_REG_D4, info->i);         break;
420      case CPUINFO_INT_REGISTER + M68K_D5:        m68k_set_reg(m68k, M68K_REG_D5, info->i);         break;
421      case CPUINFO_INT_REGISTER + M68K_D6:        m68k_set_reg(m68k, M68K_REG_D6, info->i);         break;
422      case CPUINFO_INT_REGISTER + M68K_D7:        m68k_set_reg(m68k, M68K_REG_D7, info->i);         break;
423      case CPUINFO_INT_REGISTER + M68K_A0:        m68k_set_reg(m68k, M68K_REG_A0, info->i);         break;
424      case CPUINFO_INT_REGISTER + M68K_A1:        m68k_set_reg(m68k, M68K_REG_A1, info->i);         break;
425      case CPUINFO_INT_REGISTER + M68K_A2:        m68k_set_reg(m68k, M68K_REG_A2, info->i);         break;
426      case CPUINFO_INT_REGISTER + M68K_A3:        m68k_set_reg(m68k, M68K_REG_A3, info->i);         break;
427      case CPUINFO_INT_REGISTER + M68K_A4:        m68k_set_reg(m68k, M68K_REG_A4, info->i);         break;
428      case CPUINFO_INT_REGISTER + M68K_A5:        m68k_set_reg(m68k, M68K_REG_A5, info->i);         break;
429      case CPUINFO_INT_REGISTER + M68K_A6:        m68k_set_reg(m68k, M68K_REG_A6, info->i);         break;
430      case CPUINFO_INT_REGISTER + M68K_A7:        m68k_set_reg(m68k, M68K_REG_A7, info->i);         break;
431      case CPUINFO_INT_REGISTER + M68K_PREF_ADDR:   m68k_set_reg(m68k, M68K_REG_PREF_ADDR, info->i);   break;
427432
428433      /* --- the following bits of info are set as pointers to data or functions --- */
429      case CPUINFO_PTR_M68K_RESET_CALLBACK:      m68k_set_reset_instr_callback(info->f);      break;
430      case CPUINFO_PTR_M68K_CMPILD_CALLBACK:      m68k_set_cmpild_instr_callback((void (*)(unsigned int,int))(info->f)); break;
431      case CPUINFO_PTR_M68K_RTE_CALLBACK:         m68k_set_rte_instr_callback(info->f);      break;
432      case CPUINFO_PTR_M68K_TAS_CALLBACK:         m68k_set_tas_instr_callback((int (*)(void))(info->f)); break;
434      case CPUINFO_PTR_M68K_RESET_CALLBACK:      m68k_set_reset_instr_callback(m68k, info->f);      break;
435      case CPUINFO_PTR_M68K_CMPILD_CALLBACK:      m68k_set_cmpild_instr_callback(m68k, (void (*)(unsigned int,int))(info->f)); break;
436      case CPUINFO_PTR_M68K_RTE_CALLBACK:         m68k_set_rte_instr_callback(m68k, info->f);      break;
437      case CPUINFO_PTR_M68K_TAS_CALLBACK:         m68k_set_tas_instr_callback(m68k, (int (*)(void))(info->f)); break;
433438   }
434439}
435440
r3535r3536
437442 * Generic get_info
438443 **************************************************************************/
439444
440void m68000_get_info(UINT32 state, cpuinfo *info)
445CPU_GET_INFO( m68000 )
441446{
447   m68ki_cpu_core *m68k = token;
442448   int sr;
443449
444450   switch (state)
445451   {
446452      /* --- the following bits of info are returned as 64-bit signed integers --- */
447      case CPUINFO_INT_CONTEXT_SIZE:               info->i = m68k_get_context(NULL);      break;
453      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(m68ki_cpu_core);      break;
448454      case CPUINFO_INT_INPUT_LINES:               info->i = 8;                     break;
449455      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:         info->i = -1;                     break;
450456      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
r3535r3536
466472      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = 0;               break;
467473
468474      case CPUINFO_INT_INPUT_STATE + 0:            info->i = 0;  /* there is no level 0 */   break;
469      case CPUINFO_INT_INPUT_STATE + 1:            info->i = m68k_get_virq(1);            break;
470      case CPUINFO_INT_INPUT_STATE + 2:            info->i = m68k_get_virq(2);            break;
471      case CPUINFO_INT_INPUT_STATE + 3:            info->i = m68k_get_virq(3);            break;
472      case CPUINFO_INT_INPUT_STATE + 4:            info->i = m68k_get_virq(4);            break;
473      case CPUINFO_INT_INPUT_STATE + 5:            info->i = m68k_get_virq(5);            break;
474      case CPUINFO_INT_INPUT_STATE + 6:            info->i = m68k_get_virq(6);            break;
475      case CPUINFO_INT_INPUT_STATE + 7:            info->i = m68k_get_virq(7);            break;
475      case CPUINFO_INT_INPUT_STATE + 1:            info->i = m68k_get_virq(m68k, 1);            break;
476      case CPUINFO_INT_INPUT_STATE + 2:            info->i = m68k_get_virq(m68k, 2);            break;
477      case CPUINFO_INT_INPUT_STATE + 3:            info->i = m68k_get_virq(m68k, 3);            break;
478      case CPUINFO_INT_INPUT_STATE + 4:            info->i = m68k_get_virq(m68k, 4);            break;
479      case CPUINFO_INT_INPUT_STATE + 5:            info->i = m68k_get_virq(m68k, 5);            break;
480      case CPUINFO_INT_INPUT_STATE + 6:            info->i = m68k_get_virq(m68k, 6);            break;
481      case CPUINFO_INT_INPUT_STATE + 7:            info->i = m68k_get_virq(m68k, 7);            break;
476482
477      case CPUINFO_INT_PREVIOUSPC:               info->i = m68k_get_reg(NULL, M68K_REG_PPC); break;
483      case CPUINFO_INT_PREVIOUSPC:               info->i = m68k_get_reg(m68k, M68K_REG_PPC); break;
478484
479      case CPUINFO_INT_PC:                     info->i = m68k_get_reg(NULL, M68K_REG_PC)&0x00ffffff; break;
480      case CPUINFO_INT_REGISTER + M68K_PC:         info->i = m68k_get_reg(NULL, M68K_REG_PC); break;
485      case CPUINFO_INT_PC:                     info->i = m68k_get_reg(m68k, M68K_REG_PC)&0x00ffffff; break;
486      case CPUINFO_INT_REGISTER + M68K_PC:         info->i = m68k_get_reg(m68k, M68K_REG_PC); break;
481487      case CPUINFO_INT_SP:
482      case CPUINFO_INT_REGISTER + M68K_SP:         info->i = m68k_get_reg(NULL, M68K_REG_SP); break;
483      case CPUINFO_INT_REGISTER + M68K_ISP:         info->i = m68k_get_reg(NULL, M68K_REG_ISP); break;
484      case CPUINFO_INT_REGISTER + M68K_USP:         info->i = m68k_get_reg(NULL, M68K_REG_USP); break;
485      case CPUINFO_INT_REGISTER + M68K_SR:         info->i = m68k_get_reg(NULL, M68K_REG_SR); break;
486      case CPUINFO_INT_REGISTER + M68K_D0:         info->i = m68k_get_reg(NULL, M68K_REG_D0); break;
487      case CPUINFO_INT_REGISTER + M68K_D1:         info->i = m68k_get_reg(NULL, M68K_REG_D1); break;
488      case CPUINFO_INT_REGISTER + M68K_D2:         info->i = m68k_get_reg(NULL, M68K_REG_D2); break;
489      case CPUINFO_INT_REGISTER + M68K_D3:         info->i = m68k_get_reg(NULL, M68K_REG_D3); break;
490      case CPUINFO_INT_REGISTER + M68K_D4:         info->i = m68k_get_reg(NULL, M68K_REG_D4); break;
491      case CPUINFO_INT_REGISTER + M68K_D5:         info->i = m68k_get_reg(NULL, M68K_REG_D5); break;
492      case CPUINFO_INT_REGISTER + M68K_D6:         info->i = m68k_get_reg(NULL, M68K_REG_D6); break;
493      case CPUINFO_INT_REGISTER + M68K_D7:         info->i = m68k_get_reg(NULL, M68K_REG_D7); break;
494      case CPUINFO_INT_REGISTER + M68K_A0:         info->i = m68k_get_reg(NULL, M68K_REG_A0); break;
495      case CPUINFO_INT_REGISTER + M68K_A1:         info->i = m68k_get_reg(NULL, M68K_REG_A1); break;
496      case CPUINFO_INT_REGISTER + M68K_A2:         info->i = m68k_get_reg(NULL, M68K_REG_A2); break;
497      case CPUINFO_INT_REGISTER + M68K_A3:         info->i = m68k_get_reg(NULL, M68K_REG_A3); break;
498      case CPUINFO_INT_REGISTER + M68K_A4:         info->i = m68k_get_reg(NULL, M68K_REG_A4); break;
499      case CPUINFO_INT_REGISTER + M68K_A5:         info->i = m68k_get_reg(NULL, M68K_REG_A5); break;
500      case CPUINFO_INT_REGISTER + M68K_A6:         info->i = m68k_get_reg(NULL, M68K_REG_A6); break;
501      case CPUINFO_INT_REGISTER + M68K_A7:         info->i = m68k_get_reg(NULL, M68K_REG_A7); break;
502      case CPUINFO_INT_REGISTER + M68K_PREF_ADDR:      info->i = m68k_get_reg(NULL, M68K_REG_PREF_ADDR); break;
503      case CPUINFO_INT_REGISTER + M68K_PREF_DATA:      info->i = m68k_get_reg(NULL, M68K_REG_PREF_DATA); break;
488      case CPUINFO_INT_REGISTER + M68K_SP:         info->i = m68k_get_reg(m68k, M68K_REG_SP); break;
489      case CPUINFO_INT_REGISTER + M68K_ISP:         info->i = m68k_get_reg(m68k, M68K_REG_ISP); break;
490      case CPUINFO_INT_REGISTER + M68K_USP:         info->i = m68k_get_reg(m68k, M68K_REG_USP); break;
491      case CPUINFO_INT_REGISTER + M68K_SR:         info->i = m68k_get_reg(m68k, M68K_REG_SR); break;
492      case CPUINFO_INT_REGISTER + M68K_D0:         info->i = m68k_get_reg(m68k, M68K_REG_D0); break;
493      case CPUINFO_INT_REGISTER + M68K_D1:         info->i = m68k_get_reg(m68k, M68K_REG_D1); break;
494      case CPUINFO_INT_REGISTER + M68K_D2:         info->i = m68k_get_reg(m68k, M68K_REG_D2); break;
495      case CPUINFO_INT_REGISTER + M68K_D3:         info->i = m68k_get_reg(m68k, M68K_REG_D3); break;
496      case CPUINFO_INT_REGISTER + M68K_D4:         info->i = m68k_get_reg(m68k, M68K_REG_D4); break;
497      case CPUINFO_INT_REGISTER + M68K_D5:         info->i = m68k_get_reg(m68k, M68K_REG_D5); break;
498      case CPUINFO_INT_REGISTER + M68K_D6:         info->i = m68k_get_reg(m68k, M68K_REG_D6); break;
499      case CPUINFO_INT_REGISTER + M68K_D7:         info->i = m68k_get_reg(m68k, M68K_REG_D7); break;
500      case CPUINFO_INT_REGISTER + M68K_A0:         info->i = m68k_get_reg(m68k, M68K_REG_A0); break;
501      case CPUINFO_INT_REGISTER + M68K_A1:         info->i = m68k_get_reg(m68k, M68K_REG_A1); break;
502      case CPUINFO_INT_REGISTER + M68K_A2:         info->i = m68k_get_reg(m68k, M68K_REG_A2); break;
503      case CPUINFO_INT_REGISTER + M68K_A3:         info->i = m68k_get_reg(m68k, M68K_REG_A3); break;
504      case CPUINFO_INT_REGISTER + M68K_A4:         info->i = m68k_get_reg(m68k, M68K_REG_A4); break;
505      case CPUINFO_INT_REGISTER + M68K_A5:         info->i = m68k_get_reg(m68k, M68K_REG_A5); break;
506      case CPUINFO_INT_REGISTER + M68K_A6:         info->i = m68k_get_reg(m68k, M68K_REG_A6); break;
507      case CPUINFO_INT_REGISTER + M68K_A7:         info->i = m68k_get_reg(m68k, M68K_REG_A7); break;
508      case CPUINFO_INT_REGISTER + M68K_PREF_ADDR:      info->i = m68k_get_reg(m68k, M68K_REG_PREF_ADDR); break;
509      case CPUINFO_INT_REGISTER + M68K_PREF_DATA:      info->i = m68k_get_reg(m68k, M68K_REG_PREF_DATA); break;
504510
505511      /* --- the following bits of info are returned as pointers to data or functions --- */
506      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m68000_set_info;      break;
507      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = m68000_get_context;   break;
508      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = m68000_set_context;   break;
509      case CPUINFO_PTR_INIT:                     info->init = m68000_init;            break;
510      case CPUINFO_PTR_RESET:                     info->reset = m68000_reset;            break;
511      case CPUINFO_PTR_EXIT:                     info->exit = m68000_exit;            break;
512      case CPUINFO_PTR_EXECUTE:                  info->execute = m68000_execute;         break;
512      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m68000);      break;
513      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(m68000);   break;
514      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(m68000);   break;
515      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m68000);            break;
516      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m68000);            break;
517      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(m68000);            break;
518      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m68000);         break;
513519      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
514      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m68000_dasm;      break;
515      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m68k_ICount;         break;
520      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m68000);      break;
521      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m68k->remaining_cycles;   break;
516522
517523      /* --- the following bits of info are returned as NULL-terminated strings --- */
518524      case CPUINFO_STR_NAME:                     strcpy(info->s, "68000");            break;
r3535r3536
522528      case CPUINFO_STR_CORE_CREDITS:               strcpy(info->s, "Copyright Karl Stenerud. All rights reserved. (2.1 fixes HJB)"); break;
523529
524530      case CPUINFO_STR_FLAGS:
525         sr = m68k_get_reg(NULL, M68K_REG_SR);
531         sr = m68k_get_reg(m68k, M68K_REG_SR);
526532         sprintf(info->s, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
527533            sr & 0x8000 ? 'T':'.',
528534            sr & 0x4000 ? '?':'.',
r3535r3536
542548            sr & 0x0001 ? 'C':'.');
543549         break;
544550
545      case CPUINFO_STR_REGISTER + M68K_PC:         sprintf(info->s, "PC :%08X", m68k_get_reg(NULL, M68K_REG_PC)); break;
546      case CPUINFO_STR_REGISTER + M68K_SR:           sprintf(info->s, "SR :%04X", m68k_get_reg(NULL, M68K_REG_SR)); break;
547      case CPUINFO_STR_REGISTER + M68K_SP:           sprintf(info->s, "SP :%08X", m68k_get_reg(NULL, M68K_REG_SP)); break;
548      case CPUINFO_STR_REGISTER + M68K_ISP:          sprintf(info->s, "ISP:%08X", m68k_get_reg(NULL, M68K_REG_ISP)); break;
549      case CPUINFO_STR_REGISTER + M68K_USP:          sprintf(info->s, "USP:%08X", m68k_get_reg(NULL, M68K_REG_USP)); break;
550      case CPUINFO_STR_REGISTER + M68K_D0:         sprintf(info->s, "D0 :%08X", m68k_get_reg(NULL, M68K_REG_D0)); break;
551      case CPUINFO_STR_REGISTER + M68K_D1:         sprintf(info->s, "D1 :%08X", m68k_get_reg(NULL, M68K_REG_D1)); break;
552      case CPUINFO_STR_REGISTER + M68K_D2:         sprintf(info->s, "D2 :%08X", m68k_get_reg(NULL, M68K_REG_D2)); break;
553      case CPUINFO_STR_REGISTER + M68K_D3:         sprintf(info->s, "D3 :%08X", m68k_get_reg(NULL, M68K_REG_D3)); break;
554      case CPUINFO_STR_REGISTER + M68K_D4:         sprintf(info->s, "D4 :%08X", m68k_get_reg(NULL, M68K_REG_D4)); break;
555      case CPUINFO_STR_REGISTER + M68K_D5:         sprintf(info->s, "D5 :%08X", m68k_get_reg(NULL, M68K_REG_D5)); break;
556      case CPUINFO_STR_REGISTER + M68K_D6:         sprintf(info->s, "D6 :%08X", m68k_get_reg(NULL, M68K_REG_D6)); break;
557      case CPUINFO_STR_REGISTER + M68K_D7:         sprintf(info->s, "D7 :%08X", m68k_get_reg(NULL, M68K_REG_D7)); break;
558      case CPUINFO_STR_REGISTER + M68K_A0:         sprintf(info->s, "A0 :%08X", m68k_get_reg(NULL, M68K_REG_A0)); break;
559      case CPUINFO_STR_REGISTER + M68K_A1:         sprintf(info->s, "A1 :%08X", m68k_get_reg(NULL, M68K_REG_A1)); break;
560      case CPUINFO_STR_REGISTER + M68K_A2:         sprintf(info->s, "A2 :%08X", m68k_get_reg(NULL, M68K_REG_A2)); break;
561      case CPUINFO_STR_REGISTER + M68K_A3:         sprintf(info->s, "A3 :%08X", m68k_get_reg(NULL, M68K_REG_A3)); break;
562      case CPUINFO_STR_REGISTER + M68K_A4:         sprintf(info->s, "A4 :%08X", m68k_get_reg(NULL, M68K_REG_A4)); break;
563      case CPUINFO_STR_REGISTER + M68K_A5:         sprintf(info->s, "A5 :%08X", m68k_get_reg(NULL, M68K_REG_A5)); break;
564      case CPUINFO_STR_REGISTER + M68K_A6:         sprintf(info->s, "A6 :%08X", m68k_get_reg(NULL, M68K_REG_A6)); break;
565      case CPUINFO_STR_REGISTER + M68K_A7:         sprintf(info->s, "A7 :%08X", m68k_get_reg(NULL, M68K_REG_A7)); break;
566      case CPUINFO_STR_REGISTER + M68K_PREF_ADDR:      sprintf(info->s, "PAR:%08X", m68k_get_reg(NULL, M68K_REG_PREF_ADDR)); break;
567      case CPUINFO_STR_REGISTER + M68K_PREF_DATA:      sprintf(info->s, "PDA:%08X", m68k_get_reg(NULL, M68K_REG_PREF_DATA)); break;
551      case CPUINFO_STR_REGISTER + M68K_PC:         sprintf(info->s, "PC :%08X", m68k_get_reg(m68k, M68K_REG_PC)); break;
552      case CPUINFO_STR_REGISTER + M68K_SR:           sprintf(info->s, "SR :%04X", m68k_get_reg(m68k, M68K_REG_SR)); break;
553      case CPUINFO_STR_REGISTER + M68K_SP:           sprintf(info->s, "SP :%08X", m68k_get_reg(m68k, M68K_REG_SP)); break;
554      case CPUINFO_STR_REGISTER + M68K_ISP:          sprintf(info->s, "ISP:%08X", m68k_get_reg(m68k, M68K_REG_ISP)); break;
555      case CPUINFO_STR_REGISTER + M68K_USP:          sprintf(info->s, "USP:%08X", m68k_get_reg(m68k, M68K_REG_USP)); break;
556      case CPUINFO_STR_REGISTER + M68K_D0:         sprintf(info->s, "D0 :%08X", m68k_get_reg(m68k, M68K_REG_D0)); break;
557      case CPUINFO_STR_REGISTER + M68K_D1:         sprintf(info->s, "D1 :%08X", m68k_get_reg(m68k, M68K_REG_D1)); break;
558      case CPUINFO_STR_REGISTER + M68K_D2:         sprintf(info->s, "D2 :%08X", m68k_get_reg(m68k, M68K_REG_D2)); break;
559      case CPUINFO_STR_REGISTER + M68K_D3:         sprintf(info->s, "D3 :%08X", m68k_get_reg(m68k, M68K_REG_D3)); break;
560      case CPUINFO_STR_REGISTER + M68K_D4:         sprintf(info->s, "D4 :%08X", m68k_get_reg(m68k, M68K_REG_D4)); break;
561      case CPUINFO_STR_REGISTER + M68K_D5:         sprintf(info->s, "D5 :%08X", m68k_get_reg(m68k, M68K_REG_D5)); break;
562      case CPUINFO_STR_REGISTER + M68K_D6:         sprintf(info->s, "D6 :%08X", m68k_get_reg(m68k, M68K_REG_D6)); break;
563      case CPUINFO_STR_REGISTER + M68K_D7:         sprintf(info->s, "D7 :%08X", m68k_get_reg(m68k, M68K_REG_D7)); break;
564      case CPUINFO_STR_REGISTER + M68K_A0:         sprintf(info->s, "A0 :%08X", m68k_get_reg(m68k, M68K_REG_A0)); break;
565      case CPUINFO_STR_REGISTER + M68K_A1:         sprintf(info->s, "A1 :%08X", m68k_get_reg(m68k, M68K_REG_A1)); break;
566      case CPUINFO_STR_REGISTER + M68K_A2:         sprintf(info->s, "A2 :%08X", m68k_get_reg(m68k, M68K_REG_A2)); break;
567      case CPUINFO_STR_REGISTER + M68K_A3:         sprintf(info->s, "A3 :%08X", m68k_get_reg(m68k, M68K_REG_A3)); break;
568      case CPUINFO_STR_REGISTER + M68K_A4:         sprintf(info->s, "A4 :%08X", m68k_get_reg(m68k, M68K_REG_A4)); break;
569      case CPUINFO_STR_REGISTER + M68K_A5:         sprintf(info->s, "A5 :%08X", m68k_get_reg(m68k, M68K_REG_A5)); break;
570      case CPUINFO_STR_REGISTER + M68K_A6:         sprintf(info->s, "A6 :%08X", m68k_get_reg(m68k, M68K_REG_A6)); break;
571      case CPUINFO_STR_REGISTER + M68K_A7:         sprintf(info->s, "A7 :%08X", m68k_get_reg(m68k, M68K_REG_A7)); break;
572      case CPUINFO_STR_REGISTER + M68K_PREF_ADDR:      sprintf(info->s, "PAR:%08X", m68k_get_reg(m68k, M68K_REG_PREF_ADDR)); break;
573      case CPUINFO_STR_REGISTER + M68K_PREF_DATA:      sprintf(info->s, "PDA:%08X", m68k_get_reg(m68k, M68K_REG_PREF_DATA)); break;
568574   }
569575}
570576
571577#if HAS_M68008
572578
573static void m68008_set_info(UINT32 state, cpuinfo *info)
579static CPU_SET_INFO( m68008 )
574580{
581   m68ki_cpu_core *m68k = token;
575582   switch (state)
576583   {
577584      /* --- the following bits of info are set as 64-bit signed integers --- */
578      case CPUINFO_INT_INPUT_STATE + 0:         set_irq_line(0, info->i);               break;
579      case CPUINFO_INT_INPUT_STATE + 1:         set_irq_line(1, info->i);               break;
580      case CPUINFO_INT_INPUT_STATE + 2:         set_irq_line(2, info->i);               break;
581      case CPUINFO_INT_INPUT_STATE + 3:         set_irq_line(3, info->i);               break;
582      case CPUINFO_INT_INPUT_STATE + 4:         set_irq_line(4, info->i);               break;
583      case CPUINFO_INT_INPUT_STATE + 5:         set_irq_line(5, info->i);               break;
584      case CPUINFO_INT_INPUT_STATE + 6:         set_irq_line(6, info->i);               break;
585      case CPUINFO_INT_INPUT_STATE + 7:         set_irq_line(7, info->i);               break;
585      case CPUINFO_INT_INPUT_STATE + 0:         set_irq_line(m68k, 0, info->i);               break;
586      case CPUINFO_INT_INPUT_STATE + 1:         set_irq_line(m68k, 1, info->i);               break;
587      case CPUINFO_INT_INPUT_STATE + 2:         set_irq_line(m68k, 2, info->i);               break;
588      case CPUINFO_INT_INPUT_STATE + 3:         set_irq_line(m68k, 3, info->i);               break;
589      case CPUINFO_INT_INPUT_STATE + 4:         set_irq_line(m68k, 4, info->i);               break;
590      case CPUINFO_INT_INPUT_STATE + 5:         set_irq_line(m68k, 5, info->i);               break;
591      case CPUINFO_INT_INPUT_STATE + 6:         set_irq_line(m68k, 6, info->i);               break;
592      case CPUINFO_INT_INPUT_STATE + 7:         set_irq_line(m68k, 7, info->i);               break;
586593
587      case CPUINFO_INT_PC:                    m68k_set_reg(M68K_REG_PC, info->i&0x00ffffff); break;
588      case CPUINFO_INT_REGISTER + M68K_PC:        m68k_set_reg(M68K_REG_PC, info->i);         break;
594      case CPUINFO_INT_PC:                    m68k_set_reg(m68k, M68K_REG_PC, info->i&0x00ffffff); break;
595      case CPUINFO_INT_REGISTER + M68K_PC:        m68k_set_reg(m68k, M68K_REG_PC, info->i);         break;
589596      case CPUINFO_INT_SP:
590      case CPUINFO_INT_REGISTER + M68K_SP:        m68k_set_reg(M68K_REG_SP, info->i);         break;
591      case CPUINFO_INT_REGISTER + M68K_ISP:       m68k_set_reg(M68K_REG_ISP, info->i);      break;
592      case CPUINFO_INT_REGISTER + M68K_USP:       m68k_set_reg(M68K_REG_USP, info->i);      break;
593      case CPUINFO_INT_REGISTER + M68K_SR:        m68k_set_reg(M68K_REG_SR, info->i);         break;
594      case CPUINFO_INT_REGISTER + M68K_D0:        m68k_set_reg(M68K_REG_D0, info->i);         break;
595      case CPUINFO_INT_REGISTER + M68K_D1:        m68k_set_reg(M68K_REG_D1, info->i);         break;
596      case CPUINFO_INT_REGISTER + M68K_D2:        m68k_set_reg(M68K_REG_D2, info->i);         break;
597      case CPUINFO_INT_REGISTER + M68K_D3:        m68k_set_reg(M68K_REG_D3, info->i);         break;
598      case CPUINFO_INT_REGISTER + M68K_D4:        m68k_set_reg(M68K_REG_D4, info->i);         break;
599      case CPUINFO_INT_REGISTER + M68K_D5:        m68k_set_reg(M68K_REG_D5, info->i);         break;
600      case CPUINFO_INT_REGISTER + M68K_D6:        m68k_set_reg(M68K_REG_D6, info->i);         break;
601      case CPUINFO_INT_REGISTER + M68K_D7:        m68k_set_reg(M68K_REG_D7, info->i);         break;
602      case CPUINFO_INT_REGISTER + M68K_A0:        m68k_set_reg(M68K_REG_A0, info->i);         break;
603      case CPUINFO_INT_REGISTER + M68K_A1:        m68k_set_reg(M68K_REG_A1, info->i);         break;
604      case CPUINFO_INT_REGISTER + M68K_A2:        m68k_set_reg(M68K_REG_A2, info->i);         break;
605      case CPUINFO_INT_REGISTER + M68K_A3:        m68k_set_reg(M68K_REG_A3, info->i);         break;
606      case CPUINFO_INT_REGISTER + M68K_A4:        m68k_set_reg(M68K_REG_A4, info->i);         break;
607      case CPUINFO_INT_REGISTER + M68K_A5:        m68k_set_reg(M68K_REG_A5, info->i);         break;
608      case CPUINFO_INT_REGISTER + M68K_A6:        m68k_set_reg(M68K_REG_A6, info->i);         break;
609      case CPUINFO_INT_REGISTER + M68K_A7:        m68k_set_reg(M68K_REG_A7, info->i);         break;
597      case CPUINFO_INT_REGISTER + M68K_SP:        m68k_set_reg(m68k, M68K_REG_SP, info->i);         break;
598      case CPUINFO_INT_REGISTER + M68K_ISP:       m68k_set_reg(m68k, M68K_REG_ISP, info->i);      break;
599      case CPUINFO_INT_REGISTER + M68K_USP:       m68k_set_reg(m68k, M68K_REG_USP, info->i);      break;
600      case CPUINFO_INT_REGISTER + M68K_SR:        m68k_set_reg(m68k, M68K_REG_SR, info->i);         break;
601      case CPUINFO_INT_REGISTER + M68K_D0:        m68k_set_reg(m68k, M68K_REG_D0, info->i);         break;
602      case CPUINFO_INT_REGISTER + M68K_D1:        m68k_set_reg(m68k, M68K_REG_D1, info->i);         break;
603      case CPUINFO_INT_REGISTER + M68K_D2:        m68k_set_reg(m68k, M68K_REG_D2, info->i);         break;
604      case CPUINFO_INT_REGISTER + M68K_D3:        m68k_set_reg(m68k, M68K_REG_D3, info->i);         break;
605      case CPUINFO_INT_REGISTER + M68K_D4:        m68k_set_reg(m68k, M68K_REG_D4, info->i);         break;
606      case CPUINFO_INT_REGISTER + M68K_D5:        m68k_set_reg(m68k, M68K_REG_D5, info->i);         break;
607      case CPUINFO_INT_REGISTER + M68K_D6:        m68k_set_reg(m68k, M68K_REG_D6, info->i);         break;
608      case CPUINFO_INT_REGISTER + M68K_D7:        m68k_set_reg(m68k, M68K_REG_D7, info->i);         break;
609      case CPUINFO_INT_REGISTER + M68K_A0:        m68k_set_reg(m68k, M68K_REG_A0, info->i);         break;
610      case CPUINFO_INT_REGISTER + M68K_A1:        m68k_set_reg(m68k, M68K_REG_A1, info->i);         break;
611      case CPUINFO_INT_REGISTER + M68K_A2:        m68k_set_reg(m68k, M68K_REG_A2, info->i);         break;
612      case CPUINFO_INT_REGISTER + M68K_A3:        m68k_set_reg(m68k, M68K_REG_A3, info->i);         break;
613      case CPUINFO_INT_REGISTER + M68K_A4:        m68k_set_reg(m68k, M68K_REG_A4, info->i);         break;
614      case CPUINFO_INT_REGISTER + M68K_A5:        m68k_set_reg(m68k, M68K_REG_A5, info->i);         break;
615      case CPUINFO_INT_REGISTER + M68K_A6:        m68k_set_reg(m68k, M68K_REG_A6, info->i);         break;
616      case CPUINFO_INT_REGISTER + M68K_A7:        m68k_set_reg(m68k, M68K_REG_A7, info->i);         break;
610617
611618      /* --- the following bits of info are set as pointers to data or functions --- */
612      case CPUINFO_PTR_M68K_RESET_CALLBACK:      m68k_set_reset_instr_callback(info->f);      break;
613      case CPUINFO_PTR_M68K_CMPILD_CALLBACK:      m68k_set_cmpild_instr_callback((void (*)(unsigned int,int))(info->f)); break;
614      case CPUINFO_PTR_M68K_RTE_CALLBACK:         m68k_set_rte_instr_callback(info->f);      break;
619      case CPUINFO_PTR_M68K_RESET_CALLBACK:      m68k_set_reset_instr_callback(m68k, info->f);      break;
620      case CPUINFO_PTR_M68K_CMPILD_CALLBACK:      m68k_set_cmpild_instr_callback(m68k, (void (*)(unsigned int,int))(info->f)); break;
621      case CPUINFO_PTR_M68K_RTE_CALLBACK:         m68k_set_rte_instr_callback(m68k, info->f);      break;
615622   }
616623}
617624
618void m68008_get_info(UINT32 state, cpuinfo *info)
625CPU_GET_INFO( m68008 )
619626{
627   m68ki_cpu_core *m68k = token;
620628   int sr;
621629
622630   switch (state)
623631   {
624632      /* --- the following bits of info are returned as 64-bit signed integers --- */
625      case CPUINFO_INT_CONTEXT_SIZE:               info->i = m68k_get_context(NULL);      break;
633      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(m68ki_cpu_core);      break;
626634      case CPUINFO_INT_INPUT_LINES:               info->i = 8;                     break;
627635      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:         info->i = -1;                     break;
628636      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
r3535r3536
644652      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = 0;               break;
645653
646654      case CPUINFO_INT_INPUT_STATE + 0:            info->i = 0;  /* there is no level 0 */   break;
647      case CPUINFO_INT_INPUT_STATE + 1:            info->i = m68k_get_virq(1);            break;
648      case CPUINFO_INT_INPUT_STATE + 2:            info->i = m68k_get_virq(2);            break;
649      case CPUINFO_INT_INPUT_STATE + 3:            info->i = m68k_get_virq(3);            break;
650      case CPUINFO_INT_INPUT_STATE + 4:            info->i = m68k_get_virq(4);            break;
651      case CPUINFO_INT_INPUT_STATE + 5:            info->i = m68k_get_virq(5);            break;
652      case CPUINFO_INT_INPUT_STATE + 6:            info->i = m68k_get_virq(6);            break;
653      case CPUINFO_INT_INPUT_STATE + 7:            info->i = m68k_get_virq(7);            break;
655      case CPUINFO_INT_INPUT_STATE + 1:            info->i = m68k_get_virq(m68k, 1);            break;
656      case CPUINFO_INT_INPUT_STATE + 2:            info->i = m68k_get_virq(m68k, 2);            break;
657      case CPUINFO_INT_INPUT_STATE + 3:            info->i = m68k_get_virq(m68k, 3);            break;
658      case CPUINFO_INT_INPUT_STATE + 4:            info->i = m68k_get_virq(m68k, 4);            break;
659      case CPUINFO_INT_INPUT_STATE + 5:            info->i = m68k_get_virq(m68k, 5);            break;
660      case CPUINFO_INT_INPUT_STATE + 6:            info->i = m68k_get_virq(m68k, 6);            break;
661      case CPUINFO_INT_INPUT_STATE + 7:            info->i = m68k_get_virq(m68k, 7);            break;
654662
655      case CPUINFO_INT_PREVIOUSPC:               info->i = m68k_get_reg(NULL, M68K_REG_PPC); break;
663      case CPUINFO_INT_PREVIOUSPC:               info->i = m68k_get_reg(m68k, M68K_REG_PPC); break;
656664
657      case CPUINFO_INT_PC:                     info->i = m68k_get_reg(NULL, M68K_REG_PC)&0x00ffffff; break;
658      case CPUINFO_INT_REGISTER + M68K_PC:         info->i = m68k_get_reg(NULL, M68K_REG_PC); break;
665      case CPUINFO_INT_PC:                     info->i = m68k_get_reg(m68k, M68K_REG_PC)&0x00ffffff; break;
666      case CPUINFO_INT_REGISTER + M68K_PC:         info->i = m68k_get_reg(m68k, M68K_REG_PC); break;
659667      case CPUINFO_INT_SP:
660      case CPUINFO_INT_REGISTER + M68K_SP:         info->i = m68k_get_reg(NULL, M68K_REG_SP); break;
661      case CPUINFO_INT_REGISTER + M68K_ISP:         info->i = m68k_get_reg(NULL, M68K_REG_ISP); break;
662      case CPUINFO_INT_REGISTER + M68K_USP:         info->i = m68k_get_reg(NULL, M68K_REG_USP); break;
663      case CPUINFO_INT_REGISTER + M68K_SR:         info->i = m68k_get_reg(NULL, M68K_REG_SR); break;
664      case CPUINFO_INT_REGISTER + M68K_D0:         info->i = m68k_get_reg(NULL, M68K_REG_D0); break;
665      case CPUINFO_INT_REGISTER + M68K_D1:         info->i = m68k_get_reg(NULL, M68K_REG_D1); break;
666      case CPUINFO_INT_REGISTER + M68K_D2:         info->i = m68k_get_reg(NULL, M68K_REG_D2); break;
667      case CPUINFO_INT_REGISTER + M68K_D3:         info->i = m68k_get_reg(NULL, M68K_REG_D3); break;
668      case CPUINFO_INT_REGISTER + M68K_D4:         info->i = m68k_get_reg(NULL, M68K_REG_D4); break;
669      case CPUINFO_INT_REGISTER + M68K_D5:         info->i = m68k_get_reg(NULL, M68K_REG_D5); break;
670      case CPUINFO_INT_REGISTER + M68K_D6:         info->i = m68k_get_reg(NULL, M68K_REG_D6); break;
671      case CPUINFO_INT_REGISTER + M68K_D7:         info->i = m68k_get_reg(NULL, M68K_REG_D7); break;
672      case CPUINFO_INT_REGISTER + M68K_A0:         info->i = m68k_get_reg(NULL, M68K_REG_A0); break;
673      case CPUINFO_INT_REGISTER + M68K_A1:         info->i = m68k_get_reg(NULL, M68K_REG_A1); break;
674      case CPUINFO_INT_REGISTER + M68K_A2:         info->i = m68k_get_reg(NULL, M68K_REG_A2); break;
675      case CPUINFO_INT_REGISTER + M68K_A3:         info->i = m68k_get_reg(NULL, M68K_REG_A3); break;
676      case CPUINFO_INT_REGISTER + M68K_A4:         info->i = m68k_get_reg(NULL, M68K_REG_A4); break;
677      case CPUINFO_INT_REGISTER + M68K_A5:         info->i = m68k_get_reg(NULL, M68K_REG_A5); break;
678      case CPUINFO_INT_REGISTER + M68K_A6:         info->i = m68k_get_reg(NULL, M68K_REG_A6); break;
679      case CPUINFO_INT_REGISTER + M68K_A7:         info->i = m68k_get_reg(NULL, M68K_REG_A7); break;
680      case CPUINFO_INT_REGISTER + M68K_PREF_ADDR:      info->i = m68k_get_reg(NULL, M68K_REG_PREF_ADDR); break;
681      case CPUINFO_INT_REGISTER + M68K_PREF_DATA:      info->i = m68k_get_reg(NULL, M68K_REG_PREF_DATA); break;
668      case CPUINFO_INT_REGISTER + M68K_SP:         info->i = m68k_get_reg(m68k, M68K_REG_SP); break;
669      case CPUINFO_INT_REGISTER + M68K_ISP:         info->i = m68k_get_reg(m68k, M68K_REG_ISP); break;
670      case CPUINFO_INT_REGISTER + M68K_USP:         info->i = m68k_get_reg(m68k, M68K_REG_USP); break;
671      case CPUINFO_INT_REGISTER + M68K_SR:         info->i = m68k_get_reg(m68k, M68K_REG_SR); break;
672      case CPUINFO_INT_REGISTER + M68K_D0:         info->i = m68k_get_reg(m68k, M68K_REG_D0); break;
673      case CPUINFO_INT_REGISTER + M68K_D1:         info->i = m68k_get_reg(m68k, M68K_REG_D1); break;
674      case CPUINFO_INT_REGISTER + M68K_D2:         info->i = m68k_get_reg(m68k, M68K_REG_D2); break;
675      case CPUINFO_INT_REGISTER + M68K_D3:         info->i = m68k_get_reg(m68k, M68K_REG_D3); break;
676      case CPUINFO_INT_REGISTER + M68K_D4:         info->i = m68k_get_reg(m68k, M68K_REG_D4); break;
677      case CPUINFO_INT_REGISTER + M68K_D5:         info->i = m68k_get_reg(m68k, M68K_REG_D5); break;
678      case CPUINFO_INT_REGISTER + M68K_D6:         info->i = m68k_get_reg(m68k, M68K_REG_D6); break;
679      case CPUINFO_INT_REGISTER + M68K_D7:         info->i = m68k_get_reg(m68k, M68K_REG_D7); break;
680      case CPUINFO_INT_REGISTER + M68K_A0:         info->i = m68k_get_reg(m68k, M68K_REG_A0); break;
681      case CPUINFO_INT_REGISTER + M68K_A1:         info->i = m68k_get_reg(m68k, M68K_REG_A1); break;
682      case CPUINFO_INT_REGISTER + M68K_A2:         info->i = m68k_get_reg(m68k, M68K_REG_A2); break;
683      case CPUINFO_INT_REGISTER + M68K_A3:         info->i = m68k_get_reg(m68k, M68K_REG_A3); break;
684      case CPUINFO_INT_REGISTER + M68K_A4:         info->i = m68k_get_reg(m68k, M68K_REG_A4); break;
685      case CPUINFO_INT_REGISTER + M68K_A5:         info->i = m68k_get_reg(m68k, M68K_REG_A5); break;
686      case CPUINFO_INT_REGISTER + M68K_A6:         info->i = m68k_get_reg(m68k, M68K_REG_A6); break;
687      case CPUINFO_INT_REGISTER + M68K_A7:         info->i = m68k_get_reg(m68k, M68K_REG_A7); break;
688      case CPUINFO_INT_REGISTER + M68K_PREF_ADDR:      info->i = m68k_get_reg(m68k, M68K_REG_PREF_ADDR); break;
689      case CPUINFO_INT_REGISTER + M68K_PREF_DATA:      info->i = m68k_get_reg(m68k, M68K_REG_PREF_DATA); break;
682690
683691      /* --- the following bits of info are returned as pointers to data or functions --- */
684      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m68008_set_info;      break;
685      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = m68008_get_context;   break;
686      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = m68008_set_context;   break;
687      case CPUINFO_PTR_INIT:                     info->init = m68008_init;            break;
688      case CPUINFO_PTR_RESET:                     info->reset = m68008_reset;            break;
689      case CPUINFO_PTR_EXIT:                     info->exit = m68008_exit;            break;
690      case CPUINFO_PTR_EXECUTE:                  info->execute = m68008_execute;         break;
692      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m68008);      break;
693      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(m68008);   break;
694      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(m68008);   break;
695      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m68008);            break;
696      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m68008);            break;
697      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(m68008);            break;
698      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m68008);         break;
691699      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
692      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m68008_dasm;      break;
693      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m68k_ICount;         break;
700      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m68008);      break;
701      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m68k->remaining_cycles;   break;
694702
695703      /* --- the following bits of info are returned as NULL-terminated strings --- */
696704      case CPUINFO_STR_NAME:                     strcpy(info->s, "68008");            break;
r3535r3536
700708      case CPUINFO_STR_CORE_CREDITS:               strcpy(info->s, "Copyright Karl Stenerud. All rights reserved. (2.1 fixes HJB)"); break;
701709
702710      case CPUINFO_STR_FLAGS:
703         sr = m68k_get_reg(NULL, M68K_REG_SR);
711         sr = m68k_get_reg(m68k, M68K_REG_SR);
704712         sprintf(info->s, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
705713            sr & 0x8000 ? 'T':'.',
706714            sr & 0x4000 ? '?':'.',
r3535r3536
720728            sr & 0x0001 ? 'C':'.');
721729         break;
722730
723      case CPUINFO_STR_REGISTER + M68K_PC:         sprintf(info->s, "PC :%08X", m68k_get_reg(NULL, M68K_REG_PC)); break;
724      case CPUINFO_STR_REGISTER + M68K_SR:           sprintf(info->s, "SR :%04X", m68k_get_reg(NULL, M68K_REG_SR)); break;
725      case CPUINFO_STR_REGISTER + M68K_SP:           sprintf(info->s, "SP :%08X", m68k_get_reg(NULL, M68K_REG_SP)); break;
726      case CPUINFO_STR_REGISTER + M68K_ISP:          sprintf(info->s, "ISP:%08X", m68k_get_reg(NULL, M68K_REG_ISP)); break;
727      case CPUINFO_STR_REGISTER + M68K_USP:          sprintf(info->s, "USP:%08X", m68k_get_reg(NULL, M68K_REG_USP)); break;
728      case CPUINFO_STR_REGISTER + M68K_D0:         sprintf(info->s, "D0 :%08X", m68k_get_reg(NULL, M68K_REG_D0)); break;
729      case CPUINFO_STR_REGISTER + M68K_D1:         sprintf(info->s, "D1 :%08X", m68k_get_reg(NULL, M68K_REG_D1)); break;
730      case CPUINFO_STR_REGISTER + M68K_D2:         sprintf(info->s, "D2 :%08X", m68k_get_reg(NULL, M68K_REG_D2)); break;
731      case CPUINFO_STR_REGISTER + M68K_D3:         sprintf(info->s, "D3 :%08X", m68k_get_reg(NULL, M68K_REG_D3)); break;
732      case CPUINFO_STR_REGISTER + M68K_D4:         sprintf(info->s, "D4 :%08X", m68k_get_reg(NULL, M68K_REG_D4)); break;
733      case CPUINFO_STR_REGISTER + M68K_D5:         sprintf(info->s, "D5 :%08X", m68k_get_reg(NULL, M68K_REG_D5)); break;
734      case CPUINFO_STR_REGISTER + M68K_D6:         sprintf(info->s, "D6 :%08X", m68k_get_reg(NULL, M68K_REG_D6)); break;
735      case CPUINFO_STR_REGISTER + M68K_D7:         sprintf(info->s, "D7 :%08X", m68k_get_reg(NULL, M68K_REG_D7)); break;
736      case CPUINFO_STR_REGISTER + M68K_A0:         sprintf(info->s, "A0 :%08X", m68k_get_reg(NULL, M68K_REG_A0)); break;
737      case CPUINFO_STR_REGISTER + M68K_A1:         sprintf(info->s, "A1 :%08X", m68k_get_reg(NULL, M68K_REG_A1)); break;
738      case CPUINFO_STR_REGISTER + M68K_A2:         sprintf(info->s, "A2 :%08X", m68k_get_reg(NULL, M68K_REG_A2)); break;
739      case CPUINFO_STR_REGISTER + M68K_A3:         sprintf(info->s, "A3 :%08X", m68k_get_reg(NULL, M68K_REG_A3)); break;
740      case CPUINFO_STR_REGISTER + M68K_A4:         sprintf(info->s, "A4 :%08X", m68k_get_reg(NULL, M68K_REG_A4)); break;
741      case CPUINFO_STR_REGISTER + M68K_A5:         sprintf(info->s, "A5 :%08X", m68k_get_reg(NULL, M68K_REG_A5)); break;
742      case CPUINFO_STR_REGISTER + M68K_A6:         sprintf(info->s, "A6 :%08X", m68k_get_reg(NULL, M68K_REG_A6)); break;
743      case CPUINFO_STR_REGISTER + M68K_A7:         sprintf(info->s, "A7 :%08X", m68k_get_reg(NULL, M68K_REG_A7)); break;
744      case CPUINFO_STR_REGISTER + M68K_PREF_ADDR:      sprintf(info->s, "PAR:%08X", m68k_get_reg(NULL, M68K_REG_PREF_ADDR)); break;
745      case CPUINFO_STR_REGISTER + M68K_PREF_DATA:      sprintf(info->s, "PDA:%08X", m68k_get_reg(NULL, M68K_REG_PREF_DATA)); break;
731      case CPUINFO_STR_REGISTER + M68K_PC:         sprintf(info->s, "PC :%08X", m68k_get_reg(m68k, M68K_REG_PC)); break;
732      case CPUINFO_STR_REGISTER + M68K_SR:           sprintf(info->s, "SR :%04X", m68k_get_reg(m68k, M68K_REG_SR)); break;
733      case CPUINFO_STR_REGISTER + M68K_SP:           sprintf(info->s, "SP :%08X", m68k_get_reg(m68k, M68K_REG_SP)); break;
734      case CPUINFO_STR_REGISTER + M68K_ISP:          sprintf(info->s, "ISP:%08X", m68k_get_reg(m68k, M68K_REG_ISP)); break;
735      case CPUINFO_STR_REGISTER + M68K_USP:          sprintf(info->s, "USP:%08X", m68k_get_reg(m68k, M68K_REG_USP)); break;
736      case CPUINFO_STR_REGISTER + M68K_D0:         sprintf(info->s, "D0 :%08X", m68k_get_reg(m68k, M68K_REG_D0)); break;
737      case CPUINFO_STR_REGISTER + M68K_D1:         sprintf(info->s, "D1 :%08X", m68k_get_reg(m68k, M68K_REG_D1)); break;
738      case CPUINFO_STR_REGISTER + M68K_D2:         sprintf(info->s, "D2 :%08X", m68k_get_reg(m68k, M68K_REG_D2)); break;
739      case CPUINFO_STR_REGISTER + M68K_D3:         sprintf(info->s, "D3 :%08X", m68k_get_reg(m68k, M68K_REG_D3)); break;
740      case CPUINFO_STR_REGISTER + M68K_D4:         sprintf(info->s, "D4 :%08X", m68k_get_reg(m68k, M68K_REG_D4)); break;
741      case CPUINFO_STR_REGISTER + M68K_D5:         sprintf(info->s, "D5 :%08X", m68k_get_reg(m68k, M68K_REG_D5)); break;
742      case CPUINFO_STR_REGISTER + M68K_D6:         sprintf(info->s, "D6 :%08X", m68k_get_reg(m68k, M68K_REG_D6)); break;
743      case CPUINFO_STR_REGISTER + M68K_D7:         sprintf(info->s, "D7 :%08X", m68k_get_reg(m68k, M68K_REG_D7)); break;
744      case CPUINFO_STR_REGISTER + M68K_A0:         sprintf(info->s, "A0 :%08X", m68k_get_reg(m68k, M68K_REG_A0)); break;
745      case CPUINFO_STR_REGISTER + M68K_A1:         sprintf(info->s, "A1 :%08X", m68k_get_reg(m68k, M68K_REG_A1)); break;
746      case CPUINFO_STR_REGISTER + M68K_A2:         sprintf(info->s, "A2 :%08X", m68k_get_reg(m68k, M68K_REG_A2)); break;
747      case CPUINFO_STR_REGISTER + M68K_A3:         sprintf(info->s, "A3 :%08X", m68k_get_reg(m68k, M68K_REG_A3)); break;
748      case CPUINFO_STR_REGISTER + M68K_A4:         sprintf(info->s, "A4 :%08X", m68k_get_reg(m68k, M68K_REG_A4)); break;
749      case CPUINFO_STR_REGISTER + M68K_A5:         sprintf(info->s, "A5 :%08X", m68k_get_reg(m68k, M68K_REG_A5)); break;
750      case CPUINFO_STR_REGISTER + M68K_A6:         sprintf(info->s, "A6 :%08X", m68k_get_reg(m68k, M68K_REG_A6)); break;
751      case CPUINFO_STR_REGISTER + M68K_A7:         sprintf(info->s, "A7 :%08X", m68k_get_reg(m68k, M68K_REG_A7)); break;
752      case CPUINFO_STR_REGISTER + M68K_PREF_ADDR:      sprintf(info->s, "PAR:%08X", m68k_get_reg(m68k, M68K_REG_PREF_ADDR)); break;
753      case CPUINFO_STR_REGISTER + M68K_PREF_DATA:      sprintf(info->s, "PDA:%08X", m68k_get_reg(m68k, M68K_REG_PREF_DATA)); break;
746754   }
747755}
748756
r3535r3536
753761 **************************************************************************/
754762#if HAS_M68010
755763
756static void m68010_set_info(UINT32 state, cpuinfo *info)
764static CPU_SET_INFO( m68010 )
757765{
766   m68ki_cpu_core *m68k = token;
758767   switch (state)
759768   {
760769      /* --- the following bits of info are set as 64-bit signed integers --- */
761      case CPUINFO_INT_REGISTER + M68K_VBR:           m68k_set_reg(M68K_REG_VBR, info->i);   break;
762      case CPUINFO_INT_REGISTER + M68K_SFC:           m68k_set_reg(M68K_REG_SFC, info->i);   break;
763      case CPUINFO_INT_REGISTER + M68K_DFC:           m68k_set_reg(M68K_REG_DFC, info->i);   break;
770      case CPUINFO_INT_REGISTER + M68K_VBR:           m68k_set_reg(m68k, M68K_REG_VBR, info->i);   break;
771      case CPUINFO_INT_REGISTER + M68K_SFC:           m68k_set_reg(m68k, M68K_REG_SFC, info->i);   break;
772      case CPUINFO_INT_REGISTER + M68K_DFC:           m68k_set_reg(m68k, M68K_REG_DFC, info->i);   break;
764773
765      default:                              m68000_set_info(state, info);         break;
774      default:                              CPU_SET_INFO_CALL(m68000);               break;
766775   }
767776}
768777
769void m68010_get_info(UINT32 state, cpuinfo *info)
778CPU_GET_INFO( m68010 )
770779{
780   m68ki_cpu_core *m68k = token;
771781   switch (state)
772782   {
773783      /* --- the following bits of info are returned as 64-bit signed integers --- */
774      case CPUINFO_INT_REGISTER + M68K_VBR:           info->i = m68k_get_reg(NULL, M68K_REG_VBR); break;
775      case CPUINFO_INT_REGISTER + M68K_SFC:           info->i = m68k_get_reg(NULL, M68K_REG_SFC); break;
776      case CPUINFO_INT_REGISTER + M68K_DFC:           info->i = m68k_get_reg(NULL, M68K_REG_DFC); break;
784      case CPUINFO_INT_REGISTER + M68K_VBR:           info->i = m68k_get_reg(m68k, M68K_REG_VBR); break;
785      case CPUINFO_INT_REGISTER + M68K_SFC:           info->i = m68k_get_reg(m68k, M68K_REG_SFC); break;
786      case CPUINFO_INT_REGISTER + M68K_DFC:           info->i = m68k_get_reg(m68k, M68K_REG_DFC); break;
777787
778788      /* --- the following bits of info are returned as pointers to data or functions --- */
779      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m68010_set_info;      break;
780      case CPUINFO_PTR_INIT:                     info->init = m68010_init;            break;
781      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m68010_dasm;      break;
789      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m68010);      break;
790      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m68010);            break;
791      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m68010);      break;
782792
783793      /* --- the following bits of info are returned as NULL-terminated strings --- */
784794      case CPUINFO_STR_NAME:                     strcpy(info->s, "68010");            break;
785      case CPUINFO_STR_REGISTER + M68K_SFC:         sprintf(info->s, "SFC:%X",   m68k_get_reg(NULL, M68K_REG_SFC)); break;
786      case CPUINFO_STR_REGISTER + M68K_DFC:         sprintf(info->s, "DFC:%X",   m68k_get_reg(NULL, M68K_REG_DFC)); break;
787      case CPUINFO_STR_REGISTER + M68K_VBR:         sprintf(info->s, "VBR:%08X", m68k_get_reg(NULL, M68K_REG_VBR)); break;
795      case CPUINFO_STR_REGISTER + M68K_SFC:         sprintf(info->s, "SFC:%X",   m68k_get_reg(m68k, M68K_REG_SFC)); break;
796      case CPUINFO_STR_REGISTER + M68K_DFC:         sprintf(info->s, "DFC:%X",   m68k_get_reg(m68k, M68K_REG_DFC)); break;
797      case CPUINFO_STR_REGISTER + M68K_VBR:         sprintf(info->s, "VBR:%08X", m68k_get_reg(m68k, M68K_REG_VBR)); break;
788798
789      default:                              m68000_get_info(state, info);         break;
799      default:                              CPU_GET_INFO_CALL(m68000);               break;
790800   }
791801}
792802
r3535r3536
796806 * CPU-specific set_info
797807 **************************************************************************/
798808
799static void m68020_set_info(UINT32 state, cpuinfo *info)
809static CPU_SET_INFO( m68020 )
800810{
811   m68ki_cpu_core *m68k = token;
801812   switch (state)
802813   {
803814      /* --- the following bits of info are set as 64-bit signed integers --- */
804      case CPUINFO_INT_INPUT_STATE + 0:         set_irq_line(0, info->i);               break;
805      case CPUINFO_INT_INPUT_STATE + 1:         set_irq_line(1, info->i);               break;
806      case CPUINFO_INT_INPUT_STATE + 2:         set_irq_line(2, info->i);               break;
807      case CPUINFO_INT_INPUT_STATE + 3:         set_irq_line(3, info->i);               break;
808      case CPUINFO_INT_INPUT_STATE + 4:         set_irq_line(4, info->i);               break;
809      case CPUINFO_INT_INPUT_STATE + 5:         set_irq_line(5, info->i);               break;
810      case CPUINFO_INT_INPUT_STATE + 6:         set_irq_line(6, info->i);               break;
811      case CPUINFO_INT_INPUT_STATE + 7:         set_irq_line(7, info->i);               break;
815      case CPUINFO_INT_INPUT_STATE + 0:         set_irq_line(m68k, 0, info->i);               break;
816      case CPUINFO_INT_INPUT_STATE + 1:         set_irq_line(m68k, 1, info->i);               break;
817      case CPUINFO_INT_INPUT_STATE + 2:         set_irq_line(m68k, 2, info->i);               break;
818      case CPUINFO_INT_INPUT_STATE + 3:         set_irq_line(m68k, 3, info->i);               break;
819      case CPUINFO_INT_INPUT_STATE + 4:         set_irq_line(m68k, 4, info->i);               break;
820      case CPUINFO_INT_INPUT_STATE + 5:         set_irq_line(m68k, 5, info->i);               break;
821      case CPUINFO_INT_INPUT_STATE + 6:         set_irq_line(m68k, 6, info->i);               break;
822      case CPUINFO_INT_INPUT_STATE + 7:         set_irq_line(m68k, 7, info->i);               break;
812823
813      case CPUINFO_INT_PC:                    m68k_set_reg(M68K_REG_PC, info->i);         break;
814      case CPUINFO_INT_REGISTER + M68K_PC:        m68k_set_reg(M68K_REG_PC, info->i);         break;
824      case CPUINFO_INT_PC:                    m68k_set_reg(m68k, M68K_REG_PC, info->i);         break;
825      case CPUINFO_INT_REGISTER + M68K_PC:        m68k_set_reg(m68k, M68K_REG_PC, info->i);         break;
815826      case CPUINFO_INT_SP:
816      case CPUINFO_INT_REGISTER + M68K_SP:        m68k_set_reg(M68K_REG_SP, info->i);         break;
817      case CPUINFO_INT_REGISTER + M68K_ISP:       m68k_set_reg(M68K_REG_ISP, info->i);      break;
818      case CPUINFO_INT_REGISTER + M68K_USP:       m68k_set_reg(M68K_REG_USP, info->i);      break;
819      case CPUINFO_INT_REGISTER + M68K_SR:        m68k_set_reg(M68K_REG_SR, info->i);         break;
820      case CPUINFO_INT_REGISTER + M68K_D0:        m68k_set_reg(M68K_REG_D0, info->i);         break;
821      case CPUINFO_INT_REGISTER + M68K_D1:        m68k_set_reg(M68K_REG_D1, info->i);         break;
822      case CPUINFO_INT_REGISTER + M68K_D2:        m68k_set_reg(M68K_REG_D2, info->i);         break;
823      case CPUINFO_INT_REGISTER + M68K_D3:        m68k_set_reg(M68K_REG_D3, info->i);         break;
824      case CPUINFO_INT_REGISTER + M68K_D4:        m68k_set_reg(M68K_REG_D4, info->i);         break;
825      case CPUINFO_INT_REGISTER + M68K_D5:        m68k_set_reg(M68K_REG_D5, info->i);         break;
826      case CPUINFO_INT_REGISTER + M68K_D6:        m68k_set_reg(M68K_REG_D6, info->i);         break;
827      case CPUINFO_INT_REGISTER + M68K_D7:        m68k_set_reg(M68K_REG_D7, info->i);         break;
828      case CPUINFO_INT_REGISTER + M68K_A0:        m68k_set_reg(M68K_REG_A0, info->i);         break;
829      case CPUINFO_INT_REGISTER + M68K_A1:        m68k_set_reg(M68K_REG_A1, info->i);         break;
830      case CPUINFO_INT_REGISTER + M68K_A2:        m68k_set_reg(M68K_REG_A2, info->i);         break;
831      case CPUINFO_INT_REGISTER + M68K_A3:        m68k_set_reg(M68K_REG_A3, info->i);         break;
832      case CPUINFO_INT_REGISTER + M68K_A4:        m68k_set_reg(M68K_REG_A4, info->i);         break;
833      case CPUINFO_INT_REGISTER + M68K_A5:        m68k_set_reg(M68K_REG_A5, info->i);         break;
834      case CPUINFO_INT_REGISTER + M68K_A6:        m68k_set_reg(M68K_REG_A6, info->i);         break;
835      case CPUINFO_INT_REGISTER + M68K_A7:        m68k_set_reg(M68K_REG_A7, info->i);         break;
836      case CPUINFO_INT_REGISTER + M68K_MSP:      m68k_set_reg(M68K_REG_MSP, info->i);      break; /* 68020+ */
837      case CPUINFO_INT_REGISTER + M68K_CACR:      m68k_set_reg(M68K_REG_CACR, info->i);      break; /* 68020+ */
838      case CPUINFO_INT_REGISTER + M68K_CAAR:      m68k_set_reg(M68K_REG_CAAR, info->i);      break; /* 68020+ */
839      case CPUINFO_INT_REGISTER + M68K_VBR:      m68k_set_reg(M68K_REG_VBR, info->i);      break; /* 68010+ */
840      case CPUINFO_INT_REGISTER + M68K_SFC:      m68k_set_reg(M68K_REG_SFC, info->i);      break; /* 68010+ */
841      case CPUINFO_INT_REGISTER + M68K_DFC:      m68k_set_reg(M68K_REG_DFC, info->i);      break; /* 68010+ */
827      case CPUINFO_INT_REGISTER + M68K_SP:        m68k_set_reg(m68k, M68K_REG_SP, info->i);         break;
828      case CPUINFO_INT_REGISTER + M68K_ISP:       m68k_set_reg(m68k, M68K_REG_ISP, info->i);      break;
829      case CPUINFO_INT_REGISTER + M68K_USP:       m68k_set_reg(m68k, M68K_REG_USP, info->i);      break;
830      case CPUINFO_INT_REGISTER + M68K_SR:        m68k_set_reg(m68k, M68K_REG_SR, info->i);         break;
831      case CPUINFO_INT_REGISTER + M68K_D0:        m68k_set_reg(m68k, M68K_REG_D0, info->i);         break;
832      case CPUINFO_INT_REGISTER + M68K_D1:        m68k_set_reg(m68k, M68K_REG_D1, info->i);         break;
833      case CPUINFO_INT_REGISTER + M68K_D2:        m68k_set_reg(m68k, M68K_REG_D2, info->i);         break;
834      case CPUINFO_INT_REGISTER + M68K_D3:        m68k_set_reg(m68k, M68K_REG_D3, info->i);         break;
835      case CPUINFO_INT_REGISTER + M68K_D4:        m68k_set_reg(m68k, M68K_REG_D4, info->i);         break;
836      case CPUINFO_INT_REGISTER + M68K_D5:        m68k_set_reg(m68k, M68K_REG_D5, info->i);         break;
837      case CPUINFO_INT_REGISTER + M68K_D6:        m68k_set_reg(m68k, M68K_REG_D6, info->i);         break;
838      case CPUINFO_INT_REGISTER + M68K_D7:        m68k_set_reg(m68k, M68K_REG_D7, info->i);         break;
839      case CPUINFO_INT_REGISTER + M68K_A0:        m68k_set_reg(m68k, M68K_REG_A0, info->i);         break;
840      case CPUINFO_INT_REGISTER + M68K_A1:        m68k_set_reg(m68k, M68K_REG_A1, info->i);         break;
841      case CPUINFO_INT_REGISTER + M68K_A2:        m68k_set_reg(m68k, M68K_REG_A2, info->i);         break;
842      case CPUINFO_INT_REGISTER + M68K_A3:        m68k_set_reg(m68k, M68K_REG_A3, info->i);         break;
843      case CPUINFO_INT_REGISTER + M68K_A4:        m68k_set_reg(m68k, M68K_REG_A4, info->i);         break;
844      case CPUINFO_INT_REGISTER + M68K_A5:        m68k_set_reg(m68k, M68K_REG_A5, info->i);         break;
845      case CPUINFO_INT_REGISTER + M68K_A6:        m68k_set_reg(m68k, M68K_REG_A6, info->i);         break;
846      case CPUINFO_INT_REGISTER + M68K_A7:        m68k_set_reg(m68k, M68K_REG_A7, info->i);         break;
847      case CPUINFO_INT_REGISTER + M68K_MSP:      m68k_set_reg(m68k, M68K_REG_MSP, info->i);      break; /* 68020+ */
848      case CPUINFO_INT_REGISTER + M68K_CACR:      m68k_set_reg(m68k, M68K_REG_CACR, info->i);      break; /* 68020+ */
849      case CPUINFO_INT_REGISTER + M68K_CAAR:      m68k_set_reg(m68k, M68K_REG_CAAR, info->i);      break; /* 68020+ */
850      case CPUINFO_INT_REGISTER + M68K_VBR:      m68k_set_reg(m68k, M68K_REG_VBR, info->i);      break; /* 68010+ */
851      case CPUINFO_INT_REGISTER + M68K_SFC:      m68k_set_reg(m68k, M68K_REG_SFC, info->i);      break; /* 68010+ */
852      case CPUINFO_INT_REGISTER + M68K_DFC:      m68k_set_reg(m68k, M68K_REG_DFC, info->i);      break; /* 68010+ */
842853
843854      /* --- the following bits of info are set as pointers to data or functions --- */
844      case CPUINFO_PTR_M68K_RESET_CALLBACK:      m68k_set_reset_instr_callback(info->f);      break;
845      case CPUINFO_PTR_M68K_CMPILD_CALLBACK:      m68k_set_cmpild_instr_callback((void (*)(unsigned int,int))(info->f)); break;
846      case CPUINFO_PTR_M68K_RTE_CALLBACK:         m68k_set_rte_instr_callback(info->f);      break;
855      case CPUINFO_PTR_M68K_RESET_CALLBACK:      m68k_set_reset_instr_callback(m68k, info->f);      break;
856      case CPUINFO_PTR_M68K_CMPILD_CALLBACK:      m68k_set_cmpild_instr_callback(m68k, (void (*)(unsigned int,int))(info->f)); break;
857      case CPUINFO_PTR_M68K_RTE_CALLBACK:         m68k_set_rte_instr_callback(m68k, info->f);      break;
847858   }
848859}
849860
850void m68020_get_info(UINT32 state, cpuinfo *info)
861CPU_GET_INFO( m68020 )
851862{
863   m68ki_cpu_core *m68k = token;
852864   int sr;
853865
854866   switch (state)
855867   {
856868      /* --- the following bits of info are returned as 64-bit signed integers --- */
857      case CPUINFO_INT_CONTEXT_SIZE:               info->i = m68k_get_context(NULL);      break;
869      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(m68ki_cpu_core);      break;
858870      case CPUINFO_INT_INPUT_LINES:               info->i = 8;                     break;
859871      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:         info->i = -1;                     break;
860872      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
r3535r3536
862874      case CPUINFO_INT_CLOCK_DIVIDER:               info->i = 1;                     break;
863875      case CPUINFO_INT_MIN_INSTRUCTION_BYTES:         info->i = 2;                     break;
864876      case CPUINFO_INT_MAX_INSTRUCTION_BYTES:         info->i = 20;                     break;
865      case CPUINFO_INT_MIN_CYCLES:               info->i = 4;                     break;
877      case CPUINFO_INT_MIN_CYCLES:               info->i = 2;                     break;
866878      case CPUINFO_INT_MAX_CYCLES:               info->i = 158;                     break;
867879
868880      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 32;               break;
r3535r3536
876888      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = 0;               break;
877889
878890      case CPUINFO_INT_INPUT_STATE + 0:            info->i = 0;  /* there is no level 0 */   break;
879      case CPUINFO_INT_INPUT_STATE + 1:            info->i = m68k_get_virq(1);            break;
880      case CPUINFO_INT_INPUT_STATE + 2:            info->i = m68k_get_virq(2);            break;
881      case CPUINFO_INT_INPUT_STATE + 3:            info->i = m68k_get_virq(3);            break;
882      case CPUINFO_INT_INPUT_STATE + 4:            info->i = m68k_get_virq(4);            break;
883      case CPUINFO_INT_INPUT_STATE + 5:            info->i = m68k_get_virq(5);            break;
884      case CPUINFO_INT_INPUT_STATE + 6:            info->i = m68k_get_virq(6);            break;
885      case CPUINFO_INT_INPUT_STATE + 7:            info->i = m68k_get_virq(7);            break;
891      case CPUINFO_INT_INPUT_STATE + 1:            info->i = m68k_get_virq(m68k, 1);            break;
892      case CPUINFO_INT_INPUT_STATE + 2:            info->i = m68k_get_virq(m68k, 2);            break;
893      case CPUINFO_INT_INPUT_STATE + 3:            info->i = m68k_get_virq(m68k, 3);            break;
894      case CPUINFO_INT_INPUT_STATE + 4:            info->i = m68k_get_virq(m68k, 4);            break;
895      case CPUINFO_INT_INPUT_STATE + 5:            info->i = m68k_get_virq(m68k, 5);            break;
896      case CPUINFO_INT_INPUT_STATE + 6:            info->i = m68k_get_virq(m68k, 6);            break;
897      case CPUINFO_INT_INPUT_STATE + 7:            info->i = m68k_get_virq(m68k, 7);            break;
886898
887      case CPUINFO_INT_PREVIOUSPC:               info->i = m68k_get_reg(NULL, M68K_REG_PPC); break;
899      case CPUINFO_INT_PREVIOUSPC:               info->i = m68k_get_reg(m68k, M68K_REG_PPC); break;
888900
889      case CPUINFO_INT_PC:                     info->i = m68k_get_reg(NULL, M68K_REG_PC); break;
890      case CPUINFO_INT_REGISTER + M68K_PC:         info->i = m68k_get_reg(NULL, M68K_REG_PC); break;
901      case CPUINFO_INT_PC:                     info->i = m68k_get_reg(m68k, M68K_REG_PC); break;
902      case CPUINFO_INT_REGISTER + M68K_PC:         info->i = m68k_get_reg(m68k, M68K_REG_PC); break;
891903      case CPUINFO_INT_SP:
892      case CPUINFO_INT_REGISTER + M68K_SP:         info->i = m68k_get_reg(NULL, M68K_REG_SP); break;
893      case CPUINFO_INT_REGISTER + M68K_ISP:         info->i = m68k_get_reg(NULL, M68K_REG_ISP); break;
894      case CPUINFO_INT_REGISTER + M68K_USP:         info->i = m68k_get_reg(NULL, M68K_REG_USP); break;
895      case CPUINFO_INT_REGISTER + M68K_SR:         info->i = m68k_get_reg(NULL, M68K_REG_SR); break;
896      case CPUINFO_INT_REGISTER + M68K_D0:         info->i = m68k_get_reg(NULL, M68K_REG_D0); break;
897      case CPUINFO_INT_REGISTER + M68K_D1:         info->i = m68k_get_reg(NULL, M68K_REG_D1); break;
898      case CPUINFO_INT_REGISTER + M68K_D2:         info->i = m68k_get_reg(NULL, M68K_REG_D2); break;
899      case CPUINFO_INT_REGISTER + M68K_D3:         info->i = m68k_get_reg(NULL, M68K_REG_D3); break;
900      case CPUINFO_INT_REGISTER + M68K_D4:         info->i = m68k_get_reg(NULL, M68K_REG_D4); break;
901      case CPUINFO_INT_REGISTER + M68K_D5:         info->i = m68k_get_reg(NULL, M68K_REG_D5); break;
902      case CPUINFO_INT_REGISTER + M68K_D6:         info->i = m68k_get_reg(NULL, M68K_REG_D6); break;
903      case CPUINFO_INT_REGISTER + M68K_D7:         info->i = m68k_get_reg(NULL, M68K_REG_D7); break;
904      case CPUINFO_INT_REGISTER + M68K_A0:         info->i = m68k_get_reg(NULL, M68K_REG_A0); break;
905      case CPUINFO_INT_REGISTER + M68K_A1:         info->i = m68k_get_reg(NULL, M68K_REG_A1); break;
906      case CPUINFO_INT_REGISTER + M68K_A2:         info->i = m68k_get_reg(NULL, M68K_REG_A2); break;
907      case CPUINFO_INT_REGISTER + M68K_A3:         info->i = m68k_get_reg(NULL, M68K_REG_A3); break;
908      case CPUINFO_INT_REGISTER + M68K_A4:         info->i = m68k_get_reg(NULL, M68K_REG_A4); break;
909      case CPUINFO_INT_REGISTER + M68K_A5:         info->i = m68k_get_reg(NULL, M68K_REG_A5); break;
910      case CPUINFO_INT_REGISTER + M68K_A6:         info->i = m68k_get_reg(NULL, M68K_REG_A6); break;
911      case CPUINFO_INT_REGISTER + M68K_A7:         info->i = m68k_get_reg(NULL, M68K_REG_A7); break;
912      case CPUINFO_INT_REGISTER + M68K_PREF_ADDR:      info->i = m68k_get_reg(NULL, M68K_REG_PREF_ADDR); break;
913      case CPUINFO_INT_REGISTER + M68K_PREF_DATA:      info->i = m68k_get_reg(NULL, M68K_REG_PREF_DATA); break;
914      case CPUINFO_INT_REGISTER + M68K_MSP:         info->i = m68k_get_reg(NULL, M68K_REG_MSP); /* 68020+ */ break;
915      case CPUINFO_INT_REGISTER + M68K_CACR:          info->i = m68k_get_reg(NULL, M68K_REG_CACR); /* 68020+ */ break;
916      case CPUINFO_INT_REGISTER + M68K_CAAR:          info->i = m68k_get_reg(NULL, M68K_REG_CAAR); /* 68020+ */ break;
917      case CPUINFO_INT_REGISTER + M68K_VBR:         info->i = m68k_get_reg(NULL, M68K_REG_VBR); /* 68010+ */ break;
918      case CPUINFO_INT_REGISTER + M68K_SFC:         info->i = m68k_get_reg(NULL, M68K_REG_SFC); /* 68010" */ break;
919      case CPUINFO_INT_REGISTER + M68K_DFC:         info->i = m68k_get_reg(NULL, M68K_REG_DFC); /* 68010+ */ break;
904      case CPUINFO_INT_REGISTER + M68K_SP:         info->i = m68k_get_reg(m68k, M68K_REG_SP); break;
905      case CPUINFO_INT_REGISTER + M68K_ISP:         info->i = m68k_get_reg(m68k, M68K_REG_ISP); break;
906      case CPUINFO_INT_REGISTER + M68K_USP:         info->i = m68k_get_reg(m68k, M68K_REG_USP); break;
907      case CPUINFO_INT_REGISTER + M68K_SR:         info->i = m68k_get_reg(m68k, M68K_REG_SR); break;
908      case CPUINFO_INT_REGISTER + M68K_D0:         info->i = m68k_get_reg(m68k, M68K_REG_D0); break;
909      case CPUINFO_INT_REGISTER + M68K_D1:         info->i = m68k_get_reg(m68k, M68K_REG_D1); break;
910      case CPUINFO_INT_REGISTER + M68K_D2:         info->i = m68k_get_reg(m68k, M68K_REG_D2); break;
911      case CPUINFO_INT_REGISTER + M68K_D3:         info->i = m68k_get_reg(m68k, M68K_REG_D3); break;
912      case CPUINFO_INT_REGISTER + M68K_D4:         info->i = m68k_get_reg(m68k, M68K_REG_D4); break;
913      case CPUINFO_INT_REGISTER + M68K_D5:         info->i = m68k_get_reg(m68k, M68K_REG_D5); break;
914      case CPUINFO_INT_REGISTER + M68K_D6:         info->i = m68k_get_reg(m68k, M68K_REG_D6); break;
915      case CPUINFO_INT_REGISTER + M68K_D7:         info->i = m68k_get_reg(m68k, M68K_REG_D7); break;
916      case CPUINFO_INT_REGISTER + M68K_A0:         info->i = m68k_get_reg(m68k, M68K_REG_A0); break;
917      case CPUINFO_INT_REGISTER + M68K_A1:         info->i = m68k_get_reg(m68k, M68K_REG_A1); break;
918      case CPUINFO_INT_REGISTER + M68K_A2:         info->i = m68k_get_reg(m68k, M68K_REG_A2); break;
919      case CPUINFO_INT_REGISTER + M68K_A3:         info->i = m68k_get_reg(m68k, M68K_REG_A3); break;
920      case CPUINFO_INT_REGISTER + M68K_A4:         info->i = m68k_get_reg(m68k, M68K_REG_A4); break;
921      case CPUINFO_INT_REGISTER + M68K_A5:         info->i = m68k_get_reg(m68k, M68K_REG_A5); break;
922      case CPUINFO_INT_REGISTER + M68K_A6:         info->i = m68k_get_reg(m68k, M68K_REG_A6); break;
923      case CPUINFO_INT_REGISTER + M68K_A7:         info->i = m68k_get_reg(m68k, M68K_REG_A7); break;
924      case CPUINFO_INT_REGISTER + M68K_PREF_ADDR:      info->i = m68k_get_reg(m68k, M68K_REG_PREF_ADDR); break;
925      case CPUINFO_INT_REGISTER + M68K_PREF_DATA:      info->i = m68k_get_reg(m68k, M68K_REG_PREF_DATA); break;
926      case CPUINFO_INT_REGISTER + M68K_MSP:         info->i = m68k_get_reg(m68k, M68K_REG_MSP); /* 68020+ */ break;
927      case CPUINFO_INT_REGISTER + M68K_CACR:          info->i = m68k_get_reg(m68k, M68K_REG_CACR); /* 68020+ */ break;
928      case CPUINFO_INT_REGISTER + M68K_CAAR:          info->i = m68k_get_reg(m68k, M68K_REG_CAAR); /* 68020+ */ break;
929      case CPUINFO_INT_REGISTER + M68K_VBR:         info->i = m68k_get_reg(m68k, M68K_REG_VBR); /* 68010+ */ break;
930      case CPUINFO_INT_REGISTER + M68K_SFC:         info->i = m68k_get_reg(m68k, M68K_REG_SFC); /* 68010" */ break;
931      case CPUINFO_INT_REGISTER + M68K_DFC:         info->i = m68k_get_reg(m68k, M68K_REG_DFC); /* 68010+ */ break;
920932
921933      /* --- the following bits of info are returned as pointers to data or functions --- */
922      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m68020_set_info;      break;
923      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = m68020_get_context;   break;
924      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = m68020_set_context;   break;
925      case CPUINFO_PTR_INIT:                     info->init = m68020_init;            break;
926      case CPUINFO_PTR_RESET:                     info->reset = m68020_reset;            break;
927      case CPUINFO_PTR_EXIT:                     info->exit = m68020_exit;            break;
928      case CPUINFO_PTR_EXECUTE:                  info->execute = m68020_execute;         break;
934      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m68020);      break;
935      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(m68020);   break;
936      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(m68020);   break;
937      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m68020);            break;
938      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m68020);            break;
939      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(m68020);            break;
940      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m68020);         break;
929941      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
930      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m68020_dasm;      break;
931      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m68k_ICount;         break;
942      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m68020);      break;
943      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m68k->remaining_cycles;   break;
932944
933945      /* --- the following bits of info are returned as NULL-terminated strings --- */
934946      case CPUINFO_STR_NAME:                     strcpy(info->s, "68020");            break;
r3535r3536
938950      case CPUINFO_STR_CORE_CREDITS:               strcpy(info->s, "Copyright Karl Stenerud. All rights reserved. (2.1 fixes HJB)"); break;
939951
940952      case CPUINFO_STR_FLAGS:
941         sr = m68k_get_reg(NULL, M68K_REG_SR);
953         sr = m68k_get_reg(m68k, M68K_REG_SR);
942954         sprintf(info->s, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
943955            sr & 0x8000 ? 'T':'.',
944956            sr & 0x4000 ? 't':'.',
r3535r3536
958970            sr & 0x0001 ? 'C':'.');
959971         break;
960972
961      case CPUINFO_STR_REGISTER + M68K_PC:         sprintf(info->s, "PC :%08X", m68k_get_reg(NULL, M68K_REG_PC)); break;
962      case CPUINFO_STR_REGISTER + M68K_SR:           sprintf(info->s, "SR :%04X", m68k_get_reg(NULL, M68K_REG_SR)); break;
963      case CPUINFO_STR_REGISTER + M68K_SP:           sprintf(info->s, "SP :%08X", m68k_get_reg(NULL, M68K_REG_SP)); break;
964      case CPUINFO_STR_REGISTER + M68K_ISP:          sprintf(info->s, "ISP:%08X", m68k_get_reg(NULL, M68K_REG_ISP)); break;
965      case CPUINFO_STR_REGISTER + M68K_USP:          sprintf(info->s, "USP:%08X", m68k_get_reg(NULL, M68K_REG_USP)); break;
966      case CPUINFO_STR_REGISTER + M68K_D0:         sprintf(info->s, "D0 :%08X", m68k_get_reg(NULL, M68K_REG_D0)); break;
967      case CPUINFO_STR_REGISTER + M68K_D1:         sprintf(info->s, "D1 :%08X", m68k_get_reg(NULL, M68K_REG_D1)); break;
968      case CPUINFO_STR_REGISTER + M68K_D2:         sprintf(info->s, "D2 :%08X", m68k_get_reg(NULL, M68K_REG_D2)); break;
969      case CPUINFO_STR_REGISTER + M68K_D3:         sprintf(info->s, "D3 :%08X", m68k_get_reg(NULL, M68K_REG_D3)); break;
970      case CPUINFO_STR_REGISTER + M68K_D4:         sprintf(info->s, "D4 :%08X", m68k_get_reg(NULL, M68K_REG_D4)); break;
971      case CPUINFO_STR_REGISTER + M68K_D5:         sprintf(info->s, "D5 :%08X", m68k_get_reg(NULL, M68K_REG_D5)); break;
972      case CPUINFO_STR_REGISTER + M68K_D6:         sprintf(info->s, "D6 :%08X", m68k_get_reg(NULL, M68K_REG_D6)); break;
973      case CPUINFO_STR_REGISTER + M68K_D7:         sprintf(info->s, "D7 :%08X", m68k_get_reg(NULL, M68K_REG_D7)); break;
974      case CPUINFO_STR_REGISTER + M68K_A0:         sprintf(info->s, "A0 :%08X", m68k_get_reg(NULL, M68K_REG_A0)); break;
975      case CPUINFO_STR_REGISTER + M68K_A1:         sprintf(info->s, "A1 :%08X", m68k_get_reg(NULL, M68K_REG_A1)); break;
976      case CPUINFO_STR_REGISTER + M68K_A2:         sprintf(info->s, "A2 :%08X", m68k_get_reg(NULL, M68K_REG_A2)); break;
977      case CPUINFO_STR_REGISTER + M68K_A3:         sprintf(info->s, "A3 :%08X", m68k_get_reg(NULL, M68K_REG_A3)); break;
978      case CPUINFO_STR_REGISTER + M68K_A4:         sprintf(info->s, "A4 :%08X", m68k_get_reg(NULL, M68K_REG_A4)); break;
979      case CPUINFO_STR_REGISTER + M68K_A5:         sprintf(info->s, "A5 :%08X", m68k_get_reg(NULL, M68K_REG_A5)); break;
980      case CPUINFO_STR_REGISTER + M68K_A6:         sprintf(info->s, "A6 :%08X", m68k_get_reg(NULL, M68K_REG_A6)); break;
981      case CPUINFO_STR_REGISTER + M68K_A7:         sprintf(info->s, "A7 :%08X", m68k_get_reg(NULL, M68K_REG_A7)); break;
982      case CPUINFO_STR_REGISTER + M68K_PREF_ADDR:      sprintf(info->s, "PAR:%08X", m68k_get_reg(NULL, M68K_REG_PREF_ADDR)); break;
983      case CPUINFO_STR_REGISTER + M68K_PREF_DATA:      sprintf(info->s, "PDA:%08X", m68k_get_reg(NULL, M68K_REG_PREF_DATA)); break;
984      case CPUINFO_STR_REGISTER + M68K_MSP:         sprintf(info->s, "MSP:%08X", m68k_get_reg(NULL, M68K_REG_MSP)); break;
985      case CPUINFO_STR_REGISTER + M68K_CACR:         sprintf(info->s, "CCR:%08X", m68k_get_reg(NULL, M68K_REG_CACR)); break;
986      case CPUINFO_STR_REGISTER + M68K_CAAR:         sprintf(info->s, "CAR:%08X", m68k_get_reg(NULL, M68K_REG_CAAR)); break;
987      case CPUINFO_STR_REGISTER + M68K_SFC:         sprintf(info->s, "SFC:%X",   m68k_get_reg(NULL, M68K_REG_SFC)); break;
988      case CPUINFO_STR_REGISTER + M68K_DFC:         sprintf(info->s, "DFC:%X",   m68k_get_reg(NULL, M68K_REG_DFC)); break;
989      case CPUINFO_STR_REGISTER + M68K_VBR:         sprintf(info->s, "VBR:%08X", m68k_get_reg(NULL, M68K_REG_VBR)); break;
973      case CPUINFO_STR_REGISTER + M68K_PC:         sprintf(info->s, "PC :%08X", m68k_get_reg(m68k, M68K_REG_PC)); break;
974      case CPUINFO_STR_REGISTER + M68K_SR:           sprintf(info->s, "SR :%04X", m68k_get_reg(m68k, M68K_REG_SR)); break;
975      case CPUINFO_STR_REGISTER + M68K_SP:           sprintf(info->s, "SP :%08X", m68k_get_reg(m68k, M68K_REG_SP)); break;
976      case CPUINFO_STR_REGISTER + M68K_ISP:          sprintf(info->s, "ISP:%08X", m68k_get_reg(m68k, M68K_REG_ISP)); break;
977      case CPUINFO_STR_REGISTER + M68K_USP:          sprintf(info->s, "USP:%08X", m68k_get_reg(m68k, M68K_REG_USP)); break;
978      case CPUINFO_STR_REGISTER + M68K_D0:         sprintf(info->s, "D0 :%08X", m68k_get_reg(m68k, M68K_REG_D0)); break;
979      case CPUINFO_STR_REGISTER + M68K_D1:         sprintf(info->s, "D1 :%08X", m68k_get_reg(m68k, M68K_REG_D1)); break;
980      case CPUINFO_STR_REGISTER + M68K_D2:         sprintf(info->s, "D2 :%08X", m68k_get_reg(m68k, M68K_REG_D2)); break;
981      case CPUINFO_STR_REGISTER + M68K_D3:         sprintf(info->s, "D3 :%08X", m68k_get_reg(m68k, M68K_REG_D3)); break;
982      case CPUINFO_STR_REGISTER + M68K_D4:         sprintf(info->s, "D4 :%08X", m68k_get_reg(m68k, M68K_REG_D4)); break;
983      case CPUINFO_STR_REGISTER + M68K_D5:         sprintf(info->s, "D5 :%08X", m68k_get_reg(m68k, M68K_REG_D5)); break;
984      case CPUINFO_STR_REGISTER + M68K_D6:         sprintf(info->s, "D6 :%08X", m68k_get_reg(m68k, M68K_REG_D6)); break;
985      case CPUINFO_STR_REGISTER + M68K_D7:         sprintf(info->s, "D7 :%08X", m68k_get_reg(m68k, M68K_REG_D7)); break;
986      case CPUINFO_STR_REGISTER + M68K_A0:         sprintf(info->s, "A0 :%08X", m68k_get_reg(m68k, M68K_REG_A0)); break;
987      case CPUINFO_STR_REGISTER + M68K_A1:         sprintf(info->s, "A1 :%08X", m68k_get_reg(m68k, M68K_REG_A1)); break;
988      case CPUINFO_STR_REGISTER + M68K_A2:         sprintf(info->s, "A2 :%08X", m68k_get_reg(m68k, M68K_REG_A2)); break;
989      case CPUINFO_STR_REGISTER + M68K_A3:         sprintf(info->s, "A3 :%08X", m68k_get_reg(m68k, M68K_REG_A3)); break;
990      case CPUINFO_STR_REGISTER + M68K_A4:         sprintf(info->s, "A4 :%08X", m68k_get_reg(m68k, M68K_REG_A4)); break;
991      case CPUINFO_STR_REGISTER + M68K_A5:         sprintf(info->s, "A5 :%08X", m68k_get_reg(m68k, M68K_REG_A5)); break;
992      case CPUINFO_STR_REGISTER + M68K_A6:         sprintf(info->s, "A6 :%08X", m68k_get_reg(m68k, M68K_REG_A6)); break;
993      case CPUINFO_STR_REGISTER + M68K_A7:         sprintf(info->s, "A7 :%08X", m68k_get_reg(m68k, M68K_REG_A7)); break;
994      case CPUINFO_STR_REGISTER + M68K_PREF_ADDR:      sprintf(info->s, "PAR:%08X", m68k_get_reg(m68k, M68K_REG_PREF_ADDR)); break;
995      case CPUINFO_STR_REGISTER + M68K_PREF_DATA:      sprintf(info->s, "PDA:%08X", m68k_get_reg(m68k, M68K_REG_PREF_DATA)); break;
996      case CPUINFO_STR_REGISTER + M68K_MSP:         sprintf(info->s, "MSP:%08X", m68k_get_reg(m68k, M68K_REG_MSP)); break;
997      case CPUINFO_STR_REGISTER + M68K_CACR:         sprintf(info->s, "CCR:%08X", m68k_get_reg(m68k, M68K_REG_CACR)); break;
998      case CPUINFO_STR_REGISTER + M68K_CAAR:         sprintf(info->s, "CAR:%08X", m68k_get_reg(m68k, M68K_REG_CAAR)); break;
999      case CPUINFO_STR_REGISTER + M68K_SFC:         sprintf(info->s, "SFC:%X",   m68k_get_reg(m68k, M68K_REG_SFC)); break;
1000      case CPUINFO_STR_REGISTER + M68K_DFC:         sprintf(info->s, "DFC:%X",   m68k_get_reg(m68k, M68K_REG_DFC)); break;
1001      case CPUINFO_STR_REGISTER + M68K_VBR:         sprintf(info->s, "VBR:%08X", m68k_get_reg(m68k, M68K_REG_VBR)); break;
9901002   }
9911003}
9921004
r3535r3536
9961008 **************************************************************************/
9971009#if HAS_M68EC020
9981010
999static void m68ec020_set_info(UINT32 state, cpuinfo *info)
1011static CPU_SET_INFO( m68ec020 )
10001012{
1013   m68ki_cpu_core *m68k = token;
10011014   switch (state)
10021015   {
10031016      /* --- the following bits of info are set as 64-bit signed integers --- */
1004      case CPUINFO_INT_PC:                       m68k_set_reg(M68K_REG_PC, info->i&0x00ffffff); break;
1017      case CPUINFO_INT_PC:                       m68k_set_reg(m68k, M68K_REG_PC, info->i&0x00ffffff); break;
10051018
1006      default:                              m68020_set_info(state, info);         break;
1019      default:                              CPU_SET_INFO_CALL(m68020);               break;
10071020   }
10081021}
10091022
1010void m68ec020_get_info(UINT32 state, cpuinfo *info)
1023CPU_GET_INFO( m68ec020 )
10111024{
1025   m68ki_cpu_core *m68k = token;
10121026   switch (state)
10131027   {
10141028      /* --- the following bits of info are returned as 64-bit signed integers --- */
10151029      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24;               break;
1016      case CPUINFO_INT_REGISTER + REG_PC:            info->i = m68k_get_reg(NULL, M68K_REG_PC)&0x00ffffff; break;
1030      case CPUINFO_INT_PC:                     info->i = m68k_get_reg(m68k, M68K_REG_PC)&0x00ffffff; break;
10171031
10181032      /* --- the following bits of info are returned as pointers to data or functions --- */
1019      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m68ec020_set_info;      break;
1020      case CPUINFO_PTR_INIT:                     info->init = m68ec020_init;            break;
1021      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m68ec020_dasm;      break;
1033      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m68ec020);      break;
1034      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m68ec020);            break;
1035      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m68ec020);      break;
10221036
10231037      /* --- the following bits of info are returned as NULL-terminated strings --- */
10241038      case CPUINFO_STR_NAME:                     strcpy(info->s, "68EC020");            break;
10251039
1026      default:                              m68020_get_info(state, info);         break;
1040      default:                              CPU_GET_INFO_CALL(m68020);               break;
10271041   }
10281042}
10291043
r3535r3536
10341048 **************************************************************************/
10351049
10361050#if HAS_M68040
1037static void m68040_set_info(UINT32 state, cpuinfo *info)
1051static CPU_SET_INFO( m68040 )
10381052{
1053   m68ki_cpu_core *m68k = token;
10391054   switch (state)
10401055   {
10411056      /* --- the following bits of info are set as 64-bit signed integers --- */
1042      case CPUINFO_INT_INPUT_STATE + 0:         set_irq_line(0, info->i);               break;
1043      case CPUINFO_INT_INPUT_STATE + 1:         set_irq_line(1, info->i);               break;
1044      case CPUINFO_INT_INPUT_STATE + 2:         set_irq_line(2, info->i);               break;
1045      case CPUINFO_INT_INPUT_STATE + 3:         set_irq_line(3, info->i);               break;
1046      case CPUINFO_INT_INPUT_STATE + 4:         set_irq_line(4, info->i);               break;
1047      case CPUINFO_INT_INPUT_STATE + 5:         set_irq_line(5, info->i);               break;
1048      case CPUINFO_INT_INPUT_STATE + 6:         set_irq_line(6, info->i);               break;
1049      case CPUINFO_INT_INPUT_STATE + 7:         set_irq_line(7, info->i);               break;
1057      case CPUINFO_INT_INPUT_STATE + 0:         set_irq_line(m68k, 0, info->i);               break;
1058      case CPUINFO_INT_INPUT_STATE + 1:         set_irq_line(m68k, 1, info->i);               break;
1059      case CPUINFO_INT_INPUT_STATE + 2:         set_irq_line(m68k, 2, info->i);               break;
1060      case CPUINFO_INT_INPUT_STATE + 3:         set_irq_line(m68k, 3, info->i);               break;
1061      case CPUINFO_INT_INPUT_STATE + 4:         set_irq_line(m68k, 4, info->i);               break;
1062      case CPUINFO_INT_INPUT_STATE + 5:         set_irq_line(m68k, 5, info->i);               break;
1063      case CPUINFO_INT_INPUT_STATE + 6:         set_irq_line(m68k, 6, info->i);               break;
1064      case CPUINFO_INT_INPUT_STATE + 7:         set_irq_line(m68k, 7, info->i);               break;
10501065
1051      case CPUINFO_INT_PC:                    m68k_set_reg(M68K_REG_PC, info->i);         break;
1052      case CPUINFO_INT_REGISTER + M68K_PC:        m68k_set_reg(M68K_REG_PC, info->i);         break;
1066      case CPUINFO_INT_PC:                    m68k_set_reg(m68k, M68K_REG_PC, info->i);         break;
1067      case CPUINFO_INT_REGISTER + M68K_PC:        m68k_set_reg(m68k, M68K_REG_PC, info->i);         break;
10531068      case CPUINFO_INT_SP:
1054      case CPUINFO_INT_REGISTER + M68K_SP:        m68k_set_reg(M68K_REG_SP, info->i);         break;
1055      case CPUINFO_INT_REGISTER + M68K_ISP:       m68k_set_reg(M68K_REG_ISP, info->i);      break;
1056      case CPUINFO_INT_REGISTER + M68K_USP:       m68k_set_reg(M68K_REG_USP, info->i);      break;
1057      case CPUINFO_INT_REGISTER + M68K_SR:        m68k_set_reg(M68K_REG_SR, info->i);         break;
1058      case CPUINFO_INT_REGISTER + M68K_D0:        m68k_set_reg(M68K_REG_D0, info->i);         break;
1059      case CPUINFO_INT_REGISTER + M68K_D1:        m68k_set_reg(M68K_REG_D1, info->i);         break;
1060      case CPUINFO_INT_REGISTER + M68K_D2:        m68k_set_reg(M68K_REG_D2, info->i);         break;
1061      case CPUINFO_INT_REGISTER + M68K_D3:        m68k_set_reg(M68K_REG_D3, info->i);         break;
1062      case CPUINFO_INT_REGISTER + M68K_D4:        m68k_set_reg(M68K_REG_D4, info->i);         break;
1063      case CPUINFO_INT_REGISTER + M68K_D5:        m68k_set_reg(M68K_REG_D5, info->i);         break;
1064      case CPUINFO_INT_REGISTER + M68K_D6:        m68k_set_reg(M68K_REG_D6, info->i);         break;
1065      case CPUINFO_INT_REGISTER + M68K_D7:        m68k_set_reg(M68K_REG_D7, info->i);         break;
1066      case CPUINFO_INT_REGISTER + M68K_A0:        m68k_set_reg(M68K_REG_A0, info->i);         break;
1067      case CPUINFO_INT_REGISTER + M68K_A1:        m68k_set_reg(M68K_REG_A1, info->i);         break;
1068      case CPUINFO_INT_REGISTER + M68K_A2:        m68k_set_reg(M68K_REG_A2, info->i);         break;
1069      case CPUINFO_INT_REGISTER + M68K_A3:        m68k_set_reg(M68K_REG_A3, info->i);         break;
1070      case CPUINFO_INT_REGISTER + M68K_A4:        m68k_set_reg(M68K_REG_A4, info->i);         break;
1071      case CPUINFO_INT_REGISTER + M68K_A5:        m68k_set_reg(M68K_REG_A5, info->i);         break;
1072      case CPUINFO_INT_REGISTER + M68K_A6:        m68k_set_reg(M68K_REG_A6, info->i);         break;
1073      case CPUINFO_INT_REGISTER + M68K_A7:        m68k_set_reg(M68K_REG_A7, info->i);         break;
1074      case CPUINFO_INT_REGISTER + M68K_MSP:      m68k_set_reg(M68K_REG_MSP, info->i);      break; /* 68020+ */
1075      case CPUINFO_INT_REGISTER + M68K_CACR:      m68k_set_reg(M68K_REG_CACR, info->i);      break; /* 68020+ */
1076      case CPUINFO_INT_REGISTER + M68K_CAAR:      m68k_set_reg(M68K_REG_CAAR, info->i);      break; /* 68020+ */
1077      case CPUINFO_INT_REGISTER + M68K_VBR:      m68k_set_reg(M68K_REG_VBR, info->i);      break; /* 68010+ */
1078      case CPUINFO_INT_REGISTER + M68K_SFC:      m68k_set_reg(M68K_REG_SFC, info->i);      break; /* 68010+ */
1079      case CPUINFO_INT_REGISTER + M68K_DFC:      m68k_set_reg(M68K_REG_DFC, info->i);      break; /* 68010+ */
1069      case CPUINFO_INT_REGISTER + M68K_SP:        m68k_set_reg(m68k, M68K_REG_SP, info->i);         break;
1070      case CPUINFO_INT_REGISTER + M68K_ISP:       m68k_set_reg(m68k, M68K_REG_ISP, info->i);      break;
1071      case CPUINFO_INT_REGISTER + M68K_USP:       m68k_set_reg(m68k, M68K_REG_USP, info->i);      break;
1072      case CPUINFO_INT_REGISTER + M68K_SR:        m68k_set_reg(m68k, M68K_REG_SR, info->i);         break;
1073      case CPUINFO_INT_REGISTER + M68K_D0:        m68k_set_reg(m68k, M68K_REG_D0, info->i);         break;
1074      case CPUINFO_INT_REGISTER + M68K_D1:        m68k_set_reg(m68k, M68K_REG_D1, info->i);         break;
1075      case CPUINFO_INT_REGISTER + M68K_D2:        m68k_set_reg(m68k, M68K_REG_D2, info->i);         break;
1076      case CPUINFO_INT_REGISTER + M68K_D3:        m68k_set_reg(m68k, M68K_REG_D3, info->i);         break;
1077      case CPUINFO_INT_REGISTER + M68K_D4:        m68k_set_reg(m68k, M68K_REG_D4, info->i);         break;
1078      case CPUINFO_INT_REGISTER + M68K_D5:        m68k_set_reg(m68k, M68K_REG_D5, info->i);         break;
1079      case CPUINFO_INT_REGISTER + M68K_D6:        m68k_set_reg(m68k, M68K_REG_D6, info->i);         break;
1080      case CPUINFO_INT_REGISTER + M68K_D7:        m68k_set_reg(m68k, M68K_REG_D7, info->i);         break;
1081      case CPUINFO_INT_REGISTER + M68K_A0:        m68k_set_reg(m68k, M68K_REG_A0, info->i);         break;
1082      case CPUINFO_INT_REGISTER + M68K_A1:        m68k_set_reg(m68k, M68K_REG_A1, info->i);         break;
1083      case CPUINFO_INT_REGISTER + M68K_A2:        m68k_set_reg(m68k, M68K_REG_A2, info->i);         break;
1084      case CPUINFO_INT_REGISTER + M68K_A3:        m68k_set_reg(m68k, M68K_REG_A3, info->i);         break;
1085      case CPUINFO_INT_REGISTER + M68K_A4:        m68k_set_reg(m68k, M68K_REG_A4, info->i);         break;
1086      case CPUINFO_INT_REGISTER + M68K_A5:        m68k_set_reg(m68k, M68K_REG_A5, info->i);         break;
1087      case CPUINFO_INT_REGISTER + M68K_A6:        m68k_set_reg(m68k, M68K_REG_A6, info->i);         break;
1088      case CPUINFO_INT_REGISTER + M68K_A7:        m68k_set_reg(m68k, M68K_REG_A7, info->i);         break;
1089      case CPUINFO_INT_REGISTER + M68K_MSP:      m68k_set_reg(m68k, M68K_REG_MSP, info->i);      break; /* 68020+ */
1090      case CPUINFO_INT_REGISTER + M68K_CACR:      m68k_set_reg(m68k, M68K_REG_CACR, info->i);      break; /* 68020+ */
1091      case CPUINFO_INT_REGISTER + M68K_CAAR:      m68k_set_reg(m68k, M68K_REG_CAAR, info->i);      break; /* 68020+ */
1092      case CPUINFO_INT_REGISTER + M68K_VBR:      m68k_set_reg(m68k, M68K_REG_VBR, info->i);      break; /* 68010+ */
1093      case CPUINFO_INT_REGISTER + M68K_SFC:      m68k_set_reg(m68k, M68K_REG_SFC, info->i);      break; /* 68010+ */
1094      case CPUINFO_INT_REGISTER + M68K_DFC:      m68k_set_reg(m68k, M68K_REG_DFC, info->i);      break; /* 68010+ */
10801095
10811096      /* --- the following bits of info are set as pointers to data or functions --- */
1082      case CPUINFO_PTR_M68K_RESET_CALLBACK:      m68k_set_reset_instr_callback(info->f);      break;
1083      case CPUINFO_PTR_M68K_CMPILD_CALLBACK:      m68k_set_cmpild_instr_callback((void (*)(unsigned int,int))(info->f)); break;
1084      case CPUINFO_PTR_M68K_RTE_CALLBACK:         m68k_set_rte_instr_callback(info->f);      break;
1097      case CPUINFO_PTR_M68K_RESET_CALLBACK:      m68k_set_reset_instr_callback(m68k, info->f);      break;
1098      case CPUINFO_PTR_M68K_CMPILD_CALLBACK:      m68k_set_cmpild_instr_callback(m68k, (void (*)(unsigned int,int))(info->f)); break;
1099      case CPUINFO_PTR_M68K_RTE_CALLBACK:         m68k_set_rte_instr_callback(m68k, info->f);      break;
10851100   }
10861101}
10871102
1088void m68040_get_info(UINT32 state, cpuinfo *info)
1103CPU_GET_INFO( m68040 )
10891104{
1105   m68ki_cpu_core *m68k = token;
10901106   int sr;
10911107
10921108   switch (state)
10931109   {
10941110      /* --- the following bits of info are returned as 64-bit signed integers --- */
1095      case CPUINFO_INT_CONTEXT_SIZE:               info->i = m68k_get_context(NULL);      break;
1111      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(m68ki_cpu_core);      break;
10961112      case CPUINFO_INT_INPUT_LINES:               info->i = 8;                     break;
10971113      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:         info->i = -1;                     break;
10981114      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
r3535r3536
11001116      case CPUINFO_INT_CLOCK_DIVIDER:               info->i = 1;                     break;
11011117      case CPUINFO_INT_MIN_INSTRUCTION_BYTES:         info->i = 2;                     break;
11021118      case CPUINFO_INT_MAX_INSTRUCTION_BYTES:         info->i = 20;                     break;
1103      case CPUINFO_INT_MIN_CYCLES:               info->i = 4;                     break;
1119      case CPUINFO_INT_MIN_CYCLES:               info->i = 2;                     break;
11041120      case CPUINFO_INT_MAX_CYCLES:               info->i = 158;                     break;
11051121
11061122      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 32;               break;
r3535r3536
11141130      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = 0;               break;
11151131
11161132      case CPUINFO_INT_INPUT_STATE + 0:            info->i = 0;  /* there is no level 0 */   break;
1117      case CPUINFO_INT_INPUT_STATE + 1:            info->i = m68k_get_virq(1);            break;
1118      case CPUINFO_INT_INPUT_STATE + 2:            info->i = m68k_get_virq(2);            break;
1119      case CPUINFO_INT_INPUT_STATE + 3:            info->i = m68k_get_virq(3);            break;
1120      case CPUINFO_INT_INPUT_STATE + 4:            info->i = m68k_get_virq(4);            break;
1121      case CPUINFO_INT_INPUT_STATE + 5:            info->i = m68k_get_virq(5);            break;
1122      case CPUINFO_INT_INPUT_STATE + 6:            info->i = m68k_get_virq(6);            break;
1123      case CPUINFO_INT_INPUT_STATE + 7:            info->i = m68k_get_virq(7);            break;
1133      case CPUINFO_INT_INPUT_STATE + 1:            info->i = m68k_get_virq(m68k, 1);            break;
1134      case CPUINFO_INT_INPUT_STATE + 2:            info->i = m68k_get_virq(m68k, 2);            break;
1135      case CPUINFO_INT_INPUT_STATE + 3:            info->i = m68k_get_virq(m68k, 3);            break;
1136      case CPUINFO_INT_INPUT_STATE + 4:            info->i = m68k_get_virq(m68k, 4);            break;
1137      case CPUINFO_INT_INPUT_STATE + 5:            info->i = m68k_get_virq(m68k, 5);            break;
1138      case CPUINFO_INT_INPUT_STATE + 6:            info->i = m68k_get_virq(m68k, 6);            break;
1139      case CPUINFO_INT_INPUT_STATE + 7:            info->i = m68k_get_virq(m68k, 7);            break;
11241140
1125      case CPUINFO_INT_PREVIOUSPC:               info->i = m68k_get_reg(NULL, M68K_REG_PPC); break;
1141      case CPUINFO_INT_PREVIOUSPC:               info->i = m68k_get_reg(m68k, M68K_REG_PPC); break;
11261142
1127      case CPUINFO_INT_PC:                     info->i = m68k_get_reg(NULL, M68K_REG_PC); break;
1128      case CPUINFO_INT_REGISTER + M68K_PC:         info->i = m68k_get_reg(NULL, M68K_REG_PC); break;
1143      case CPUINFO_INT_PC:                     info->i = m68k_get_reg(m68k, M68K_REG_PC); break;
1144      case CPUINFO_INT_REGISTER + M68K_PC:         info->i = m68k_get_reg(m68k, M68K_REG_PC); break;
11291145      case CPUINFO_INT_SP:
1130      case CPUINFO_INT_REGISTER + M68K_SP:         info->i = m68k_get_reg(NULL, M68K_REG_SP); break;
1131      case CPUINFO_INT_REGISTER + M68K_ISP:         info->i = m68k_get_reg(NULL, M68K_REG_ISP); break;
1132      case CPUINFO_INT_REGISTER + M68K_USP:         info->i = m68k_get_reg(NULL, M68K_REG_USP); break;
1133      case CPUINFO_INT_REGISTER + M68K_SR:         info->i = m68k_get_reg(NULL, M68K_REG_SR); break;
1134      case CPUINFO_INT_REGISTER + M68K_D0:         info->i = m68k_get_reg(NULL, M68K_REG_D0); break;
1135      case CPUINFO_INT_REGISTER + M68K_D1:         info->i = m68k_get_reg(NULL, M68K_REG_D1); break;
1136      case CPUINFO_INT_REGISTER + M68K_D2:         info->i = m68k_get_reg(NULL, M68K_REG_D2); break;
1137      case CPUINFO_INT_REGISTER + M68K_D3:         info->i = m68k_get_reg(NULL, M68K_REG_D3); break;
1138      case CPUINFO_INT_REGISTER + M68K_D4:         info->i = m68k_get_reg(NULL, M68K_REG_D4); break;
1139      case CPUINFO_INT_REGISTER + M68K_D5:         info->i = m68k_get_reg(NULL, M68K_REG_D5); break;
1140      case CPUINFO_INT_REGISTER + M68K_D6:         info->i = m68k_get_reg(NULL, M68K_REG_D6); break;
1141      case CPUINFO_INT_REGISTER + M68K_D7:         info->i = m68k_get_reg(NULL, M68K_REG_D7); break;
1142      case CPUINFO_INT_REGISTER + M68K_A0:         info->i = m68k_get_reg(NULL, M68K_REG_A0); break;
1143      case CPUINFO_INT_REGISTER + M68K_A1:         info->i = m68k_get_reg(NULL, M68K_REG_A1); break;
1144      case CPUINFO_INT_REGISTER + M68K_A2:         info->i = m68k_get_reg(NULL, M68K_REG_A2); break;
1145      case CPUINFO_INT_REGISTER + M68K_A3:         info->i = m68k_get_reg(NULL, M68K_REG_A3); break;
1146      case CPUINFO_INT_REGISTER + M68K_A4:         info->i = m68k_get_reg(NULL, M68K_REG_A4); break;
1147      case CPUINFO_INT_REGISTER + M68K_A5:         info->i = m68k_get_reg(NULL, M68K_REG_A5); break;
1148      case CPUINFO_INT_REGISTER + M68K_A6:         info->i = m68k_get_reg(NULL, M68K_REG_A6); break;
1149      case CPUINFO_INT_REGISTER + M68K_A7:         info->i = m68k_get_reg(NULL, M68K_REG_A7); break;
1150      case CPUINFO_INT_REGISTER + M68K_PREF_ADDR:      info->i = m68k_get_reg(NULL, M68K_REG_PREF_ADDR); break;
1151      case CPUINFO_INT_REGISTER + M68K_PREF_DATA:      info->i = m68k_get_reg(NULL, M68K_REG_PREF_DATA); break;
1152      case CPUINFO_INT_REGISTER + M68K_MSP:         info->i = m68k_get_reg(NULL, M68K_REG_MSP); /* 68020+ */ break;
1153      case CPUINFO_INT_REGISTER + M68K_CACR:          info->i = m68k_get_reg(NULL, M68K_REG_CACR); /* 68020+ */ break;
1154      case CPUINFO_INT_REGISTER + M68K_CAAR:          info->i = m68k_get_reg(NULL, M68K_REG_CAAR); /* 68020+ */ break;
1155      case CPUINFO_INT_REGISTER + M68K_VBR:         info->i = m68k_get_reg(NULL, M68K_REG_VBR); /* 68010+ */ break;
1156      case CPUINFO_INT_REGISTER + M68K_SFC:         info->i = m68k_get_reg(NULL, M68K_REG_SFC); /* 68010" */ break;
1157      case CPUINFO_INT_REGISTER + M68K_DFC:         info->i = m68k_get_reg(NULL, M68K_REG_DFC); /* 68010+ */ break;
1146      case CPUINFO_INT_REGISTER + M68K_SP:         info->i = m68k_get_reg(m68k, M68K_REG_SP); break;
1147      case CPUINFO_INT_REGISTER + M68K_ISP:         info->i = m68k_get_reg(m68k, M68K_REG_ISP); break;
1148      case CPUINFO_INT_REGISTER + M68K_USP:         info->i = m68k_get_reg(m68k, M68K_REG_USP); break;
1149      case CPUINFO_INT_REGISTER + M68K_SR:         info->i = m68k_get_reg(m68k, M68K_REG_SR); break;
1150      case CPUINFO_INT_REGISTER + M68K_D0:         info->i = m68k_get_reg(m68k, M68K_REG_D0); break;
1151      case CPUINFO_INT_REGISTER + M68K_D1:         info->i = m68k_get_reg(m68k, M68K_REG_D1); break;
1152      case CPUINFO_INT_REGISTER + M68K_D2:         info->i = m68k_get_reg(m68k, M68K_REG_D2); break;
1153      case CPUINFO_INT_REGISTER + M68K_D3:         info->i = m68k_get_reg(m68k, M68K_REG_D3); break;
1154      case CPUINFO_INT_REGISTER + M68K_D4:         info->i = m68k_get_reg(m68k, M68K_REG_D4); break;
1155      case CPUINFO_INT_REGISTER + M68K_D5:         info->i = m68k_get_reg(m68k, M68K_REG_D5); break;
1156      case CPUINFO_INT_REGISTER + M68K_D6:         info->i = m68k_get_reg(m68k, M68K_REG_D6); break;
1157      case CPUINFO_INT_REGISTER + M68K_D7:         info->i = m68k_get_reg(m68k, M68K_REG_D7); break;
1158      case CPUINFO_INT_REGISTER + M68K_A0:         info->i = m68k_get_reg(m68k, M68K_REG_A0); break;
1159      case CPUINFO_INT_REGISTER + M68K_A1:         info->i = m68k_get_reg(m68k, M68K_REG_A1); break;
1160      case CPUINFO_INT_REGISTER + M68K_A2:         info->i = m68k_get_reg(m68k, M68K_REG_A2); break;
1161      case CPUINFO_INT_REGISTER + M68K_A3:         info->i = m68k_get_reg(m68k, M68K_REG_A3); break;
1162      case CPUINFO_INT_REGISTER + M68K_A4:         info->i = m68k_get_reg(m68k, M68K_REG_A4); break;
1163      case CPUINFO_INT_REGISTER + M68K_A5:         info->i = m68k_get_reg(m68k, M68K_REG_A5); break;
1164      case CPUINFO_INT_REGISTER + M68K_A6:         info->i = m68k_get_reg(m68k, M68K_REG_A6); break;
1165      case CPUINFO_INT_REGISTER + M68K_A7:         info->i = m68k_get_reg(m68k, M68K_REG_A7); break;
1166      case CPUINFO_INT_REGISTER + M68K_PREF_ADDR:      info->i = m68k_get_reg(m68k, M68K_REG_PREF_ADDR); break;
1167      case CPUINFO_INT_REGISTER + M68K_PREF_DATA:      info->i = m68k_get_reg(m68k, M68K_REG_PREF_DATA); break;
1168      case CPUINFO_INT_REGISTER + M68K_MSP:         info->i = m68k_get_reg(m68k, M68K_REG_MSP); /* 68020+ */ break;
1169      case CPUINFO_INT_REGISTER + M68K_CACR:          info->i = m68k_get_reg(m68k, M68K_REG_CACR); /* 68020+ */ break;
1170      case CPUINFO_INT_REGISTER + M68K_CAAR:          info->i = m68k_get_reg(m68k, M68K_REG_CAAR); /* 68020+ */ break;
1171      case CPUINFO_INT_REGISTER + M68K_VBR:         info->i = m68k_get_reg(m68k, M68K_REG_VBR); /* 68010+ */ break;
1172      case CPUINFO_INT_REGISTER + M68K_SFC:         info->i = m68k_get_reg(m68k, M68K_REG_SFC); /* 68010" */ break;
1173      case CPUINFO_INT_REGISTER + M68K_DFC:         info->i = m68k_get_reg(m68k, M68K_REG_DFC); /* 68010+ */ break;
11581174
11591175      /* --- the following bits of info are returned as pointers to data or functions --- */
1160      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m68040_set_info;      break;
1161      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = m68040_get_context;   break;
1162      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = m68040_set_context;   break;
1163      case CPUINFO_PTR_INIT:                     info->init = m68040_init;            break;
1164      case CPUINFO_PTR_RESET:                     info->reset = m68040_reset;            break;
1165      case CPUINFO_PTR_EXIT:                     info->exit = m68040_exit;            break;
1166      case CPUINFO_PTR_EXECUTE:                  info->execute = m68040_execute;         break;
1176      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m68040);      break;
1177      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(m68040);   break;
1178      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(m68040);   break;
1179      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m68040);            break;
1180      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m68040);            break;
1181      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(m68040);            break;
1182      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m68040);         break;
11671183      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1168      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m68040_dasm;      break;
1169      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m68k_ICount;         break;
1184      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m68040);      break;
1185      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m68k->remaining_cycles;   break;
11701186
11711187      /* --- the following bits of info are returned as NULL-terminated strings --- */
11721188      case CPUINFO_STR_NAME:                     strcpy(info->s, "68040");            break;
r3535r3536
11761192      case CPUINFO_STR_CORE_CREDITS:               strcpy(info->s, "Copyright Karl Stenerud. All rights reserved. (2.1 fixes HJB)"); break;
11771193
11781194      case CPUINFO_STR_FLAGS:
1179         sr = m68k_get_reg(NULL, M68K_REG_SR);
1195         sr = m68k_get_reg(m68k, M68K_REG_SR);
11801196         sprintf(info->s, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
11811197            sr & 0x8000 ? 'T':'.',
11821198            sr & 0x4000 ? 't':'.',
r3535r3536
11961212            sr & 0x0001 ? 'C':'.');
11971213         break;
11981214
1199      case CPUINFO_STR_REGISTER + M68K_PC:         sprintf(info->s, "PC :%08X", m68k_get_reg(NULL, M68K_REG_PC)); break;
1200      case CPUINFO_STR_REGISTER + M68K_SR:           sprintf(info->s, "SR :%04X", m68k_get_reg(NULL, M68K_REG_SR)); break;
1201      case CPUINFO_STR_REGISTER + M68K_SP:           sprintf(info->s, "SP :%08X", m68k_get_reg(NULL, M68K_REG_SP)); break;
1202      case CPUINFO_STR_REGISTER + M68K_ISP:          sprintf(info->s, "ISP:%08X", m68k_get_reg(NULL, M68K_REG_ISP)); break;
1203      case CPUINFO_STR_REGISTER + M68K_USP:          sprintf(info->s, "USP:%08X", m68k_get_reg(NULL, M68K_REG_USP)); break;
1204      case CPUINFO_STR_REGISTER + M68K_D0:         sprintf(info->s, "D0 :%08X", m68k_get_reg(NULL, M68K_REG_D0)); break;
1205      case CPUINFO_STR_REGISTER + M68K_D1:         sprintf(info->s, "D1 :%08X", m68k_get_reg(NULL, M68K_REG_D1)); break;
1206      case CPUINFO_STR_REGISTER + M68K_D2:         sprintf(info->s, "D2 :%08X", m68k_get_reg(NULL, M68K_REG_D2)); break;
1207      case CPUINFO_STR_REGISTER + M68K_D3:         sprintf(info->s, "D3 :%08X", m68k_get_reg(NULL, M68K_REG_D3)); break;
1208      case CPUINFO_STR_REGISTER + M68K_D4:         sprintf(info->s, "D4 :%08X", m68k_get_reg(NULL, M68K_REG_D4)); break;
1209      case CPUINFO_STR_REGISTER + M68K_D5:         sprintf(info->s, "D5 :%08X", m68k_get_reg(NULL, M68K_REG_D5)); break;
1210      case CPUINFO_STR_REGISTER + M68K_D6:         sprintf(info->s, "D6 :%08X", m68k_get_reg(NULL, M68K_REG_D6)); break;
1211      case CPUINFO_STR_REGISTER + M68K_D7:         sprintf(info->s, "D7 :%08X", m68k_get_reg(NULL, M68K_REG_D7)); break;
1212      case CPUINFO_STR_REGISTER + M68K_A0:         sprintf(info->s, "A0 :%08X", m68k_get_reg(NULL, M68K_REG_A0)); break;
1213      case CPUINFO_STR_REGISTER + M68K_A1:         sprintf(info->s, "A1 :%08X", m68k_get_reg(NULL, M68K_REG_A1)); break;
1214      case CPUINFO_STR_REGISTER + M68K_A2:         sprintf(info->s, "A2 :%08X", m68k_get_reg(NULL, M68K_REG_A2)); break;
1215      case CPUINFO_STR_REGISTER + M68K_A3:         sprintf(info->s, "A3 :%08X", m68k_get_reg(NULL, M68K_REG_A3)); break;
1216      case CPUINFO_STR_REGISTER + M68K_A4:         sprintf(info->s, "A4 :%08X", m68k_get_reg(NULL, M68K_REG_A4)); break;
1217      case CPUINFO_STR_REGISTER + M68K_A5:         sprintf(info->s, "A5 :%08X", m68k_get_reg(NULL, M68K_REG_A5)); break;
1218      case CPUINFO_STR_REGISTER + M68K_A6:         sprintf(info->s, "A6 :%08X", m68k_get_reg(NULL, M68K_REG_A6)); break;
1219      case CPUINFO_STR_REGISTER + M68K_A7:         sprintf(info->s, "A7 :%08X", m68k_get_reg(NULL, M68K_REG_A7)); break;
1220      case CPUINFO_STR_REGISTER + M68K_PREF_ADDR:      sprintf(info->s, "PAR:%08X", m68k_get_reg(NULL, M68K_REG_PREF_ADDR)); break;
1221      case CPUINFO_STR_REGISTER + M68K_PREF_DATA:      sprintf(info->s, "PDA:%08X", m68k_get_reg(NULL, M68K_REG_PREF_DATA)); break;
1222      case CPUINFO_STR_REGISTER + M68K_MSP:         sprintf(info->s, "MSP:%08X", m68k_get_reg(NULL, M68K_REG_MSP)); break;
1223      case CPUINFO_STR_REGISTER + M68K_CACR:         sprintf(info->s, "CCR:%08X", m68k_get_reg(NULL, M68K_REG_CACR)); break;
1224      case CPUINFO_STR_REGISTER + M68K_CAAR:         sprintf(info->s, "CAR:%08X", m68k_get_reg(NULL, M68K_REG_CAAR)); break;
1225      case CPUINFO_STR_REGISTER + M68K_SFC:         sprintf(info->s, "SFC:%X",   m68k_get_reg(NULL, M68K_REG_SFC)); break;
1226      case CPUINFO_STR_REGISTER + M68K_DFC:         sprintf(info->s, "DFC:%X",   m68k_get_reg(NULL, M68K_REG_DFC)); break;
1227      case CPUINFO_STR_REGISTER + M68K_VBR:         sprintf(info->s, "VBR:%08X", m68k_get_reg(NULL, M68K_REG_VBR)); break;
1215      case CPUINFO_STR_REGISTER + M68K_PC:         sprintf(info->s, "PC :%08X", m68k_get_reg(m68k, M68K_REG_PC)); break;
1216      case CPUINFO_STR_REGISTER + M68K_SR:           sprintf(info->s, "SR :%04X", m68k_get_reg(m68k, M68K_REG_SR)); break;
1217      case CPUINFO_STR_REGISTER + M68K_SP:           sprintf(info->s, "SP :%08X", m68k_get_reg(m68k, M68K_REG_SP)); break;
1218      case CPUINFO_STR_REGISTER + M68K_ISP:          sprintf(info->s, "ISP:%08X", m68k_get_reg(m68k, M68K_REG_ISP)); break;
1219      case CPUINFO_STR_REGISTER + M68K_USP:          sprintf(info->s, "USP:%08X", m68k_get_reg(m68k, M68K_REG_USP)); break;
1220      case CPUINFO_STR_REGISTER + M68K_D0:         sprintf(info->s, "D0 :%08X", m68k_get_reg(m68k, M68K_REG_D0)); break;
1221      case CPUINFO_STR_REGISTER + M68K_D1:         sprintf(info->s, "D1 :%08X", m68k_get_reg(m68k, M68K_REG_D1)); break;
1222      case CPUINFO_STR_REGISTER + M68K_D2:         sprintf(info->s, "D2 :%08X", m68k_get_reg(m68k, M68K_REG_D2)); break;
1223      case CPUINFO_STR_REGISTER + M68K_D3:         sprintf(info->s, "D3 :%08X", m68k_get_reg(m68k, M68K_REG_D3)); break;
1224      case CPUINFO_STR_REGISTER + M68K_D4:         sprintf(info->s, "D4 :%08X", m68k_get_reg(m68k, M68K_REG_D4)); break;
1225      case CPUINFO_STR_REGISTER + M68K_D5:         sprintf(info->s, "D5 :%08X", m68k_get_reg(m68k, M68K_REG_D5)); break;
1226      case CPUINFO_STR_REGISTER + M68K_D6:         sprintf(info->s, "D6 :%08X", m68k_get_reg(m68k, M68K_REG_D6)); break;
1227      case CPUINFO_STR_REGISTER + M68K_D7:         sprintf(info->s, "D7 :%08X", m68k_get_reg(m68k, M68K_REG_D7)); break;
1228      case CPUINFO_STR_REGISTER + M68K_A0:         sprintf(info->s, "A0 :%08X", m68k_get_reg(m68k, M68K_REG_A0)); break;
1229      case CPUINFO_STR_REGISTER + M68K_A1:         sprintf(info->s, "A1 :%08X", m68k_get_reg(m68k, M68K_REG_A1)); break;
1230      case CPUINFO_STR_REGISTER + M68K_A2:         sprintf(info->s, "A2 :%08X", m68k_get_reg(m68k, M68K_REG_A2)); break;
1231      case CPUINFO_STR_REGISTER + M68K_A3:         sprintf(info->s, "A3 :%08X", m68k_get_reg(m68k, M68K_REG_A3)); break;
1232      case CPUINFO_STR_REGISTER + M68K_A4:         sprintf(info->s, "A4 :%08X", m68k_get_reg(m68k, M68K_REG_A4)); break;
1233      case CPUINFO_STR_REGISTER + M68K_A5:         sprintf(info->s, "A5 :%08X", m68k_get_reg(m68k, M68K_REG_A5)); break;
1234      case CPUINFO_STR_REGISTER + M68K_A6:         sprintf(info->s, "A6 :%08X", m68k_get_reg(m68k, M68K_REG_A6)); break;
1235      case CPUINFO_STR_REGISTER + M68K_A7:         sprintf(info->s, "A7 :%08X", m68k_get_reg(m68k, M68K_REG_A7)); break;
1236      case CPUINFO_STR_REGISTER + M68K_PREF_ADDR:      sprintf(info->s, "PAR:%08X", m68k_get_reg(m68k, M68K_REG_PREF_ADDR)); break;
1237      case CPUINFO_STR_REGISTER + M68K_PREF_DATA:      sprintf(info->s, "PDA:%08X", m68k_get_reg(m68k, M68K_REG_PREF_DATA)); break;
1238      case CPUINFO_STR_REGISTER + M68K_MSP:         sprintf(info->s, "MSP:%08X", m68k_get_reg(m68k, M68K_REG_MSP)); break;
1239      case CPUINFO_STR_REGISTER + M68K_CACR:         sprintf(info->s, "CCR:%08X", m68k_get_reg(m68k, M68K_REG_CACR)); break;
1240      case CPUINFO_STR_REGISTER + M68K_CAAR:         sprintf(info->s, "CAR:%08X", m68k_get_reg(m68k, M68K_REG_CAAR)); break;
1241      case CPUINFO_STR_REGISTER + M68K_SFC:         sprintf(info->s, "SFC:%X",   m68k_get_reg(m68k, M68K_REG_SFC)); break;
1242      case CPUINFO_STR_REGISTER + M68K_DFC:         sprintf(info->s, "DFC:%X",   m68k_get_reg(m68k, M68K_REG_DFC)); break;
1243      case CPUINFO_STR_REGISTER + M68K_VBR:         sprintf(info->s, "VBR:%08X", m68k_get_reg(m68k, M68K_REG_VBR)); break;
12281244   }
12291245}
12301246
src/emu/cpu/m68000/m68k.h
r3535r3536
2525 */
2626
2727/* ======================================================================== */
28/* ============================= CONFIGURATION ============================ */
29/* ======================================================================== */
30
31/* Import the configuration for this build */
32#include "m68kconf.h"
33
34
35/* ======================================================================== */
3628/* ============================ GENERAL DEFINES =========================== */
3729
3830/* ======================================================================== */
3931
40/* There are 7 levels of interrupt to the 68K.
41 * A transition from < 7 to 7 will cause a non-maskable interrupt (NMI).
42 */
43#define M68K_IRQ_NONE 0
44#define M68K_IRQ_1    1
45#define M68K_IRQ_2    2
46#define M68K_IRQ_3    3
47#define M68K_IRQ_4    4
48#define M68K_IRQ_5    5
49#define M68K_IRQ_6    6
50#define M68K_IRQ_7    7
51
52
53/* Special interrupt acknowledge values.
54 * Use these as special returns from the interrupt acknowledge callback
55 * (specified later in this header).
56 */
57
58/* Causes an interrupt autovector (0x18 + interrupt level) to be taken.
59 * This happens in a real 68K if VPA or AVEC is asserted during an interrupt
60 * acknowledge cycle instead of DTACK.
61 */
62#define M68K_INT_ACK_AUTOVECTOR    0xffffffff
63
64/* Causes the spurious interrupt vector (0x18) to be taken
65 * This happens in a real 68K if BERR is asserted during the interrupt
66 * acknowledge cycle (i.e. no devices responded to the acknowledge).
67 */
68#define M68K_INT_ACK_SPURIOUS      0xfffffffe
69
70
7132/* CPU types for use in m68k_set_cpu_type() */
7233enum
7334{
r3535r3536
154115 */
155116
156117/* Read from anywhere */
157unsigned int  m68k_read_memory_8(unsigned int address);
158unsigned int  m68k_read_memory_16(unsigned int address);
159unsigned int  m68k_read_memory_32(unsigned int address);
118unsigned int  m68k_read_memory_8(m68ki_cpu_core *m68k, unsigned int address);
119unsigned int  m68k_read_memory_16(m68ki_cpu_core *m68k, unsigned int address);
120unsigned int  m68k_read_memory_32(m68ki_cpu_core *m68k, unsigned int address);
160121
161122/* Read data immediately following the PC */
162unsigned int  m68k_read_immediate_16(unsigned int address);
163unsigned int  m68k_read_immediate_32(unsigned int address);
123unsigned int  m68k_read_immediate_16(m68ki_cpu_core *m68k, unsigned int address);
124unsigned int  m68k_read_immediate_32(m68ki_cpu_core *m68k, unsigned int address);
164125
165126/* Read data relative to the PC */
166unsigned int  m68k_read_pcrelative_8(unsigned int address);
167unsigned int  m68k_read_pcrelative_16(unsigned int address);
168unsigned int  m68k_read_pcrelative_32(unsigned int address);
127unsigned int  m68k_read_pcrelative_8(m68ki_cpu_core *m68k, unsigned int address);
128unsigned int  m68k_read_pcrelative_16(m68ki_cpu_core *m68k, unsigned int address);
129unsigned int  m68k_read_pcrelative_32(m68ki_cpu_core *m68k, unsigned int address);
169130
170131/* Memory access for the disassembler */
171132unsigned int m68k_read_disassembler_8  (unsigned int address);
r3535r3536
173134unsigned int m68k_read_disassembler_32 (unsigned int address);
174135
175136/* Write to anywhere */
176void m68k_write_memory_8(unsigned int address, unsigned int value);
177void m68k_write_memory_16(unsigned int address, unsigned int value);
178void m68k_write_memory_32(unsigned int address, unsigned int value);
137void m68k_write_memory_8(m68ki_cpu_core *m68k, unsigned int address, unsigned int value);
138void m68k_write_memory_16(m68ki_cpu_core *m68k, unsigned int address, unsigned int value);
139void m68k_write_memory_32(m68ki_cpu_core *m68k, unsigned int address, unsigned int value);
179140
180141/* Special call to simulate undocumented 68k behavior when move.l with a
181142 * predecrement destination mode is executed.
182143 * To simulate real 68k behavior, first write the high word to
183144 * [address+2], and then write the low word to [address].
184 *
185 * Enable this functionality with M68K_SIMULATE_PD_WRITES in m68kconf.h.
186145 */
187void m68k_write_memory_32_pd(unsigned int address, unsigned int value);
146void m68k_write_memory_32_pd(m68ki_cpu_core *m68k, unsigned int address, unsigned int value);
188147
189148
190149
r3535r3536
201160 */
202161
203162/* Set the callback for an interrupt acknowledge.
204 * You must enable M68K_EMULATE_INT_ACK in m68kconf.h.
205163 * The CPU will call the callback with the interrupt level being acknowledged.
206164 * The host program must return either a vector from 0x02-0xff, or one of the
207165 * special interrupt acknowledge values specified earlier in this header.
r3535r3536
210168 * services the interrupt.
211169 * Default behavior: return M68K_INT_ACK_AUTOVECTOR.
212170 */
213void m68k_set_int_ack_callback(int  (*callback)(int int_level));
171void m68k_set_int_ack_callback(m68ki_cpu_core *m68k, void *param, int  (*callback)(void *param, int int_level));
214172
215173
216174/* Set the callback for a breakpoint acknowledge (68010+).
217 * You must enable M68K_EMULATE_BKPT_ACK in m68kconf.h.
218175 * The CPU will call the callback with whatever was in the data field of the
219176 * BKPT instruction for 68020+, or 0 for 68010.
220177 * Default behavior: do nothing.
221178 */
222void m68k_set_bkpt_ack_callback(void (*callback)(unsigned int data));
179void m68k_set_bkpt_ack_callback(m68ki_cpu_core *m68k, void (*callback)(unsigned int data));
223180
224181
225182/* Set the callback for the RESET instruction.
226 * You must enable M68K_EMULATE_RESET in m68kconf.h.
227183 * The CPU calls this callback every time it encounters a RESET instruction.
228184 * Default behavior: do nothing.
229185 */
230void m68k_set_reset_instr_callback(void  (*callback)(void));
186void m68k_set_reset_instr_callback(m68ki_cpu_core *m68k, void  (*callback)(void));
231187
232188
233189/* Set the callback for the CMPI.L #v, Dn instruction.
234 * You must enable M68K_CMPILD_HAS_CALLBACK in m68kconf.h.
235190 * The CPU calls this callback every time it encounters a CMPI.L #v, Dn instruction.
236191 * Default behavior: do nothing.
237192 */
238void m68k_set_cmpild_instr_callback(void  (*callback)(unsigned int val, int reg));
193void m68k_set_cmpild_instr_callback(m68ki_cpu_core *m68k, void  (*callback)(unsigned int val, int reg));
239194
240195
241196/* Set the callback for the RTE instruction.
242 * You must enable M68K_RTE_HAS_CALLBACK in m68kconf.h.
243197 * The CPU calls this callback every time it encounters a RTE instruction.
244198 * Default behavior: do nothing.
245199 */
246void m68k_set_rte_instr_callback(void  (*callback)(void));
200void m68k_set_rte_instr_callback(m68ki_cpu_core *m68k, void  (*callback)(void));
247201
248202/* Set the callback for the TAS instruction.
249 * You must enable M68K_TAS_HAS_CALLBACK in m68kconf.h.
250203 * The CPU calls this callback every time it encounters a TAS instruction.
251204 * Default behavior: return 1, allow writeback.
252205 */
253void m68k_set_tas_instr_callback(int  (*callback)(void));
206void m68k_set_tas_instr_callback(m68ki_cpu_core *m68k, int  (*callback)(void));
254207
255208
256209
257/* Set the callback for informing of a large PC change.
258 * You must enable M68K_MONITOR_PC in m68kconf.h.
259 * The CPU calls this callback with the new PC value every time the PC changes
260 * by a large value (currently set for changes by longwords).
261 * Default behavior: do nothing.
262 */
263void m68k_set_pc_changed_callback(void  (*callback)(unsigned int new_pc));
264
265
266210/* Set the callback for CPU function code changes.
267211 * You must enable M68K_EMULATE_FC in m68kconf.h.
268212 * The CPU calls this callback with the function code before every memory
r3535r3536
270214 * access it is (supervisor/user, program/data and such).
271215 * Default behavior: do nothing.
272216 */
273void m68k_set_fc_callback(void  (*callback)(unsigned int new_fc));
217void m68k_set_fc_callback(m68ki_cpu_core *m68k, void  (*callback)(unsigned int new_fc));
274218
275219
276/* Set a callback for the instruction cycle of the CPU.
277 * You must enable M68K_INSTRUCTION_HOOK in m68kconf.h.
278 * The CPU calls this callback just before fetching the opcode in the
279 * instruction cycle.
280 * Default behavior: do nothing.
281 */
282void m68k_set_instr_hook_callback(void  (*callback)(unsigned int pc));
283220
284
285
286221/* ======================================================================== */
287222/* ====================== FUNCTIONS TO ACCESS THE CPU ===================== */
288223/* ======================================================================== */
r3535r3536
291226 * Currently supported types are: M68K_CPU_TYPE_68000, M68K_CPU_TYPE_68008,
292227 * M68K_CPU_TYPE_68010, M68K_CPU_TYPE_EC020, and M68K_CPU_TYPE_68020.
293228 */
294void m68k_set_cpu_type(unsigned int cpu_type);
229void m68k_set_cpu_type(m68ki_cpu_core *m68k, unsigned int cpu_type);
295230
296231/* Do whatever initialisations the core requires.  Should be called
297232 * at least once at init time.
298233 */
299void m68k_init(void);
234void m68k_init(m68ki_cpu_core *m68k);
300235
301236/* Pulse the RESET pin on the CPU.
302237 * You *MUST* reset the CPU at least once to initialize the emulation
r3535r3536
304239 *       the CPU for the first time, the CPU will be set to
305240 *       M68K_CPU_TYPE_68000.
306241 */
307void m68k_pulse_reset(void);
242void m68k_pulse_reset(m68ki_cpu_core *m68k);
308243
309244/* execute num_cycles worth of instructions.  returns number of cycles used */
310int m68k_execute(int num_cycles);
245int m68k_execute(m68ki_cpu_core *m68k, int num_cycles);
311246
312247/* These functions let you read/write/modify the number of cycles left to run
313248 * while m68k_execute() is running.
314249 * These are useful if the 68k accesses a memory-mapped port on another device
315250 * that requires immediate processing by another CPU.
316251 */
317int m68k_cycles_run(void);              /* Number of cycles run so far */
318int m68k_cycles_remaining(void);        /* Number of cycles left */
319void m68k_modify_timeslice(int cycles); /* Modify cycles left */
320void m68k_end_timeslice(void);          /* End timeslice now */
252int m68k_cycles_run(m68ki_cpu_core *m68k);              /* Number of cycles run so far */
253int m68k_cycles_remaining(m68ki_cpu_core *m68k);        /* Number of cycles left */
254void m68k_modify_timeslice(m68ki_cpu_core *m68k, int cycles); /* Modify cycles left */
255void m68k_end_timeslice(m68ki_cpu_core *m68k);          /* End timeslice now */
321256
322257/* Set the IPL0-IPL2 pins on the CPU (IRQ).
323258 * A transition from < 7 to 7 will cause a non-maskable interrupt (NMI).
324259 * Setting IRQ to 0 will clear an interrupt request.
325260 */
326void m68k_set_irq(unsigned int int_level);
261void m68k_set_irq(m68ki_cpu_core *m68k, unsigned int int_level);
327262
328263/* Set the virtual irq lines, where the highest level
329264 * active line is automatically selected.  If you use this function,
330265 * do not use m68k_set_irq.
331266 */
332void m68k_set_virq(unsigned int level, unsigned int active);
333unsigned int m68k_get_virq(unsigned int level);
267void m68k_set_virq(m68ki_cpu_core *m68k, unsigned int level, unsigned int active);
268unsigned int m68k_get_virq(m68ki_cpu_core *m68k, unsigned int level);
334269
335270/* Halt the CPU as if you pulsed the HALT pin. */
336void m68k_pulse_halt(void);
271void m68k_pulse_halt(m68ki_cpu_core *m68k);
337272
338273
339274/* Context switching to allow multiple CPUs */
r3535r3536
348283void m68k_set_context(void* dst);
349284
350285/* Register the CPU state information */
351void m68k_state_register(const char *type, int index);
286void m68k_state_register(m68ki_cpu_core *m68k, const char *type, int index);
352287
353288
354289/* Peek at the internals of a CPU context.  This can either be a context
355290 * retrieved using m68k_get_context() or the currently running context.
356291 * If context is NULL, the currently running CPU context will be used.
357292 */
358unsigned int m68k_get_reg(void* context, m68k_register_t reg);
293unsigned int m68k_get_reg(m68ki_cpu_core *m68k, m68k_register_t regnum);
359294
360295/* Poke values into the internals of the currently running CPU context */
361void m68k_set_reg(m68k_register_t reg, unsigned int value);
296void m68k_set_reg(m68ki_cpu_core *m68k, m68k_register_t reg, unsigned int value);
362297
363298/* Check if an instruction is valid for the specified CPU type */
364299unsigned int m68k_is_valid_instruction(unsigned int instruction, unsigned int cpu_type);
r3535r3536
378313/* ============================== MAME STUFF ============================== */
379314/* ======================================================================== */
380315
381#if M68K_COMPILE_FOR_MAME == OPT_ON
382316#include "m68kmame.h"
383#endif /* M68K_COMPILE_FOR_MAME */
384317
385318
386319/* ======================================================================== */
src/emu/cpu/m68000/m68kdasm.c
r3535r3536
2828#include <stdlib.h>
2929#include <stdio.h>
3030#include <string.h>
31
32#define m68ki_cpu_core void
3133#include "m68k.h"
3234
3335#ifndef DECL_SPEC
r3535r3536
3941/* ======================================================================== */
4042
4143/* unsigned int and int must be at least 32 bits wide */
42#undef uint
43#define uint unsigned int
44#undef UINT32
45#define UINT32 unsigned int
4446
4547/* Bit Isolation Functions */
4648#define BIT_0(A)  ((A) & 0x00000001)
r3535r3536
123125
124126
125127/* Opcode flags */
126#if M68K_COMPILE_FOR_MAME == OPT_ON
127128#define SET_OPCODE_FLAGS(x)   g_opcode_type = x;
128129#define COMBINE_OPCODE_FLAGS(x) ((x) | g_opcode_type | DASMFLAG_SUPPORTED)
129#else
130#define SET_OPCODE_FLAGS(x)
131#define COMBINE_OPCODE_FLAGS(X) (x)
132#endif
133130
134131
135132/* ======================================================================== */
r3535r3536
137134/* ======================================================================== */
138135
139136/* Read data at the PC and increment PC */
140uint  read_imm_8(void);
141uint  read_imm_16(void);
142uint  read_imm_32(void);
137UINT32  read_imm_8(void);
138UINT32  read_imm_16(void);
139UINT32  read_imm_32(void);
143140
144141/* Read data at the PC but don't imcrement the PC */
145uint  peek_imm_8(void);
146uint  peek_imm_16(void);
147uint  peek_imm_32(void);
142UINT32  peek_imm_8(void);
143UINT32  peek_imm_16(void);
144UINT32  peek_imm_32(void);
148145
149146/* make signed integers 100% portably */
150147static int make_int_8(int value);
151148static int make_int_16(int value);
152149
153150/* make a string of a hex value */
154static char* make_signed_hex_str_8(uint val);
155static char* make_signed_hex_str_16(uint val);
156static char* make_signed_hex_str_32(uint val);
151static char* make_signed_hex_str_8(UINT32 val);
152static char* make_signed_hex_str_16(UINT32 val);
153static char* make_signed_hex_str_32(UINT32 val);
157154
158155/* make string of ea mode */
159static char* get_ea_mode_str(uint instruction, uint size);
156static char* get_ea_mode_str(UINT32 instruction, UINT32 size);
160157
161char* get_ea_mode_str_8(uint instruction);
162char* get_ea_mode_str_16(uint instruction);
163char* get_ea_mode_str_32(uint instruction);
158char* get_ea_mode_str_8(UINT32 instruction);
159char* get_ea_mode_str_16(UINT32 instruction);
160char* get_ea_mode_str_32(UINT32 instruction);
164161
165162/* make string of immediate value */
166static char* get_imm_str_s(uint size);
167static char* get_imm_str_u(uint size);
163static char* get_imm_str_s(UINT32 size);
164static char* get_imm_str_u(UINT32 size);
168165
169166char* get_imm_str_s8(void);
170167char* get_imm_str_s16(void);
r3535r3536
172169
173170/* Stuff to build the opcode handler jump table */
174171static void  build_opcode_table(void);
175static int   valid_ea(uint opcode, uint mask);
172static int   valid_ea(UINT32 opcode, UINT32 mask);
176173static int DECL_SPEC compare_nof_true_bits(const void *aptr, const void *bptr);
177174
178175/* used to build opcode handler jump table */
179176typedef struct
180177{
181178   void (*opcode_handler)(void); /* handler function */
182   uint mask;                    /* mask on opcode */
183   uint match;                   /* what to match after masking */
184   uint ea_mask;                 /* what ea modes are allowed */
179   UINT32 mask;                    /* mask on opcode */
180   UINT32 match;                   /* what to match after masking */
181   UINT32 ea_mask;                 /* what ea modes are allowed */
185182} opcode_struct;
186183
187184
r3535r3536
200197
201198static char g_dasm_str[100]; /* string to hold disassembly */
202199static char g_helper_str[100]; /* string to hold helpful info */
203static uint g_cpu_pc;        /* program counter */
204static uint g_cpu_ir;        /* instruction register */
205static uint g_cpu_type;
206static uint g_opcode_type;
200static UINT32 g_cpu_pc;        /* program counter */
201static UINT32 g_cpu_ir;        /* instruction register */
202static UINT32 g_cpu_type;
203static UINT32 g_opcode_type;
207204static const unsigned char* g_rawop;
208static uint g_rawbasepc;
205static UINT32 g_rawbasepc;
209206
210207/* used by ops like asr, ror, addq, etc */
211static const uint g_3bit_qdata_table[8] = {8, 1, 2, 3, 4, 5, 6, 7};
208static const UINT32 g_3bit_qdata_table[8] = {8, 1, 2, 3, 4, 5, 6, 7};
212209
213static const uint g_5bit_data_table[32] =
210static const UINT32 g_5bit_data_table[32] =
214211{
215212   32,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
216213   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
r3535r3536
245242      return;                        \
246243   }
247244
248static uint dasm_read_imm_8(uint advance)
245static UINT32 dasm_read_imm_8(UINT32 advance)
249246{
250   uint result;
251   if (g_rawop)
247   UINT32 result;
248//  if (g_rawop)
252249      result = g_rawop[g_cpu_pc + 1 - g_rawbasepc];
253   else
254      result = m68k_read_disassembler_16(g_cpu_pc & g_address_mask) & 0xff;
250//  else
251//      result = m68k_read_disassembler_16(g_cpu_pc & g_address_mask) & 0xff;
255252   g_cpu_pc += advance;
256253   return result;
257254}
258255
259static uint dasm_read_imm_16(uint advance)
256static UINT32 dasm_read_imm_16(UINT32 advance)
260257{
261   uint result;
262   if (g_rawop)
258   UINT32 result;
259//  if (g_rawop)
263260      result = (g_rawop[g_cpu_pc + 0 - g_rawbasepc] << 8) |
264261                g_rawop[g_cpu_pc + 1 - g_rawbasepc];
265   else
266      result = m68k_read_disassembler_16(g_cpu_pc & g_address_mask) & 0xff;
262//  else
263//      result = m68k_read_disassembler_16(g_cpu_pc & g_address_mask) & 0xff;
267264   g_cpu_pc += advance;
268265   return result;
269266}
270267
271static uint dasm_read_imm_32(uint advance)
268static UINT32 dasm_read_imm_32(UINT32 advance)
272269{
273   uint result;
274   if (g_rawop)
270   UINT32 result;
271//  if (g_rawop)
275272      result = (g_rawop[g_cpu_pc + 0 - g_rawbasepc] << 24) |
276273               (g_rawop[g_cpu_pc + 1 - g_rawbasepc] << 16) |
277274               (g_rawop[g_cpu_pc + 2 - g_rawbasepc] << 8) |
278275                g_rawop[g_cpu_pc + 3 - g_rawbasepc];
279   else
280      result = m68k_read_disassembler_32(g_cpu_pc & g_address_mask) & 0xff;
276//  else
277//      result = m68k_read_disassembler_32(g_cpu_pc & g_address_mask) & 0xff;
281278   g_cpu_pc += advance;
282279   return result;
283280}
r3535r3536
317314
318315
319316/* Get string representation of hex values */
320static char* make_signed_hex_str_8(uint val)
317static char* make_signed_hex_str_8(UINT32 val)
321318{
322319   static char str[20];
323320
r3535r3536
333330   return str;
334331}
335332
336static char* make_signed_hex_str_16(uint val)
333static char* make_signed_hex_str_16(UINT32 val)
337334{
338335   static char str[20];
339336
r3535r3536
349346   return str;
350347}
351348
352static char* make_signed_hex_str_32(uint val)
349static char* make_signed_hex_str_32(UINT32 val)
353350{
354351   static char str[20];
355352
r3535r3536
367364
368365
369366/* make string of immediate value */
370static char* get_imm_str_s(uint size)
367static char* get_imm_str_s(UINT32 size)
371368{
372369   static char str[15];
373370   if(size == 0)
r3535r3536
379376   return str;
380377}
381378
382static char* get_imm_str_u(uint size)
379static char* get_imm_str_u(UINT32 size)
383380{
384381   static char str[15];
385382   if(size == 0)
r3535r3536
392389}
393390
394391/* Make string of effective address mode */
395static char* get_ea_mode_str(uint instruction, uint size)
392static char* get_ea_mode_str(UINT32 instruction, UINT32 size)
396393{
397394   static char b1[64];
398395   static char b2[64];
399396   static char* mode = b2;
400   uint extension;
401   uint base;
402   uint outer;
397   UINT32 extension;
398   UINT32 base;
399   UINT32 outer;
403400   char base_reg[4];
404401   char index_reg[8];
405   uint preindex;
406   uint postindex;
407   uint comma = 0;
408   uint temp_value;
402   UINT32 preindex;
403   UINT32 postindex;
404   UINT32 comma = 0;
405   UINT32 temp_value;
409406   char invalid_mode = 0;
410407
411408   /* Switch buffers so we don't clobber on a double-call to this function */
r3535r3536
948945
949946static void d68000_bcc_8(void)
950947{
951   uint temp_pc = g_cpu_pc;
948   UINT32 temp_pc = g_cpu_pc;
952949   sprintf(g_dasm_str, "b%-2s     $%x", g_cc[(g_cpu_ir>>8)&0xf], temp_pc + make_int_8(g_cpu_ir));
953950}
954951
955952static void d68000_bcc_16(void)
956953{
957   uint temp_pc = g_cpu_pc;
954   UINT32 temp_pc = g_cpu_pc;
958955   sprintf(g_dasm_str, "b%-2s     $%x", g_cc[(g_cpu_ir>>8)&0xf], temp_pc + make_int_16(read_imm_16()));
959956}
960957
961958static void d68020_bcc_32(void)
962959{
963   uint temp_pc = g_cpu_pc;
960   UINT32 temp_pc = g_cpu_pc;
964961   LIMIT_CPU_TYPES(M68020_PLUS);
965962   sprintf(g_dasm_str, "b%-2s     $%x; (2+)", g_cc[(g_cpu_ir>>8)&0xf], temp_pc + read_imm_32());
966963}
r3535r3536
995992
996993static void d68020_bfchg(void)
997994{
998   uint extension;
995   UINT32 extension;
999996   char offset[3];
1000997   char width[3];
1001998
r3535r3536
10161013
10171014static void d68020_bfclr(void)
10181015{
1019   uint extension;
1016   UINT32 extension;
10201017   char offset[3];
10211018   char width[3];
10221019
r3535r3536
10371034
10381035static void d68020_bfexts(void)
10391036{
1040   uint extension;
1037   UINT32 extension;
10411038   char offset[3];
10421039   char width[3];
10431040
r3535r3536
10581055
10591056static void d68020_bfextu(void)
10601057{
1061   uint extension;
1058   UINT32 extension;
10621059   char offset[3];
10631060   char width[3];
10641061
r3535r3536
10791076
10801077static void d68020_bfffo(void)
10811078{
1082   uint extension;
1079   UINT32 extension;
10831080   char offset[3];
10841081   char width[3];
10851082
r3535r3536
11001097
11011098static void d68020_bfins(void)
11021099{
1103   uint extension;
1100   UINT32 extension;
11041101   char offset[3];
11051102   char width[3];
11061103
r3535r3536
11211118
11221119static void d68020_bfset(void)
11231120{
1124   uint extension;
1121   UINT32 extension;
11251122   char offset[3];
11261123   char width[3];
11271124
r3535r3536
11421139
11431140static void d68020_bftst(void)
11441141{
1145   uint extension;
1142   UINT32 extension;
11461143   char offset[3];
11471144   char width[3];
11481145
r3535r3536
11631160
11641161static void d68000_bra_8(void)
11651162{
1166   uint temp_pc = g_cpu_pc;
1163   UINT32 temp_pc = g_cpu_pc;
11671164   sprintf(g_dasm_str, "bra     $%x", temp_pc + make_int_8(g_cpu_ir));
11681165}
11691166
11701167static void d68000_bra_16(void)
11711168{
1172   uint temp_pc = g_cpu_pc;
1169   UINT32 temp_pc = g_cpu_pc;
11731170   sprintf(g_dasm_str, "bra     $%x", temp_pc + make_int_16(read_imm_16()));
11741171}
11751172
11761173static void d68020_bra_32(void)
11771174{
1178   uint temp_pc = g_cpu_pc;
1175   UINT32 temp_pc = g_cpu_pc;
11791176   LIMIT_CPU_TYPES(M68020_PLUS);
11801177   sprintf(g_dasm_str, "bra     $%x; (2+)", temp_pc + read_imm_32());
11811178}
r3535r3536
11931190
11941191static void d68000_bsr_8(void)
11951192{
1196   uint temp_pc = g_cpu_pc;
1193   UINT32 temp_pc = g_cpu_pc;
11971194   sprintf(g_dasm_str, "bsr     $%x", temp_pc + make_int_8(g_cpu_ir));
11981195   SET_OPCODE_FLAGS(DASMFLAG_STEP_OVER);
11991196}
12001197
12011198static void d68000_bsr_16(void)
12021199{
1203   uint temp_pc = g_cpu_pc;
1200   UINT32 temp_pc = g_cpu_pc;
12041201   sprintf(g_dasm_str, "bsr     $%x", temp_pc + make_int_16(read_imm_16()));
12051202   SET_OPCODE_FLAGS(DASMFLAG_STEP_OVER);
12061203}
12071204
12081205static void d68020_bsr_32(void)
12091206{
1210   uint temp_pc = g_cpu_pc;
1207   UINT32 temp_pc = g_cpu_pc;
12111208   LIMIT_CPU_TYPES(M68020_PLUS);
12121209   sprintf(g_dasm_str, "bsr     $%x; (2+)", temp_pc + read_imm_32());
12131210   SET_OPCODE_FLAGS(DASMFLAG_STEP_OVER);
r3535r3536
12351232
12361233static void d68020_cas_8(void)
12371234{
1238   uint extension;
1235   UINT32 extension;
12391236   LIMIT_CPU_TYPES(M68020_PLUS);
12401237   extension = read_imm_16();
12411238   sprintf(g_dasm_str, "cas.b   D%d, D%d, %s; (2+)", extension&7, (extension>>8)&7, get_ea_mode_str_8(g_cpu_ir));
r3535r3536
12431240
12441241static void d68020_cas_16(void)
12451242{
1246   uint extension;
1243   UINT32 extension;
12471244   LIMIT_CPU_TYPES(M68020_PLUS);
12481245   extension = read_imm_16();
12491246   sprintf(g_dasm_str, "cas.w   D%d, D%d, %s; (2+)", extension&7, (extension>>8)&7, get_ea_mode_str_16(g_cpu_ir));
r3535r3536
12511248
12521249static void d68020_cas_32(void)
12531250{
1254   uint extension;
1251   UINT32 extension;
12551252   LIMIT_CPU_TYPES(M68020_PLUS);
12561253   extension = read_imm_16();
12571254   sprintf(g_dasm_str, "cas.l   D%d, D%d, %s; (2+)", extension&7, (extension>>8)&7, get_ea_mode_str_32(g_cpu_ir));
r3535r3536
12651262 DARn2  0 0 0  Du2  0 0 0  Dc2
12661263*/
12671264
1268   uint extension;
1265   UINT32 extension;
12691266   LIMIT_CPU_TYPES(M68020_PLUS);
12701267   extension = read_imm_32();
12711268   sprintf(g_dasm_str, "cas2.w  D%d:D%d:D%d:D%d, (%c%d):(%c%d); (2+)",
r3535r3536
12761273
12771274static void d68020_cas2_32(void)
12781275{
1279   uint extension;
1276   UINT32 extension;
12801277   LIMIT_CPU_TYPES(M68020_PLUS);
12811278   extension = read_imm_32();
12821279   sprintf(g_dasm_str, "cas2.l  D%d:D%d:D%d:D%d, (%c%d):(%c%d); (2+)",
r3535r3536
13001297
13011298static void d68020_chk2_cmp2_8(void)
13021299{
1303   uint extension;
1300   UINT32 extension;
13041301   LIMIT_CPU_TYPES(M68020_PLUS);
13051302   extension = read_imm_16();
13061303   sprintf(g_dasm_str, "%s.b  %s, %c%d; (2+)", BIT_B(extension) ? "chk2" : "cmp2", get_ea_mode_str_8(g_cpu_ir), BIT_F(extension) ? 'A' : 'D', (extension>>12)&7);
r3535r3536
13081305
13091306static void d68020_chk2_cmp2_16(void)
13101307{
1311   uint extension;
1308   UINT32 extension;
13121309   LIMIT_CPU_TYPES(M68020_PLUS);
13131310   extension = read_imm_16();
13141311   sprintf(g_dasm_str, "%s.w  %s, %c%d; (2+)", BIT_B(extension) ? "chk2" : "cmp2", get_ea_mode_str_16(g_cpu_ir), BIT_F(extension) ? 'A' : 'D', (extension>>12)&7);
r3535r3536
13161313
13171314static void d68020_chk2_cmp2_32(void)
13181315{
1319   uint extension;
1316   UINT32 extension;
13201317   LIMIT_CPU_TYPES(M68020_PLUS);
13211318   extension = read_imm_16();
13221319   sprintf(g_dasm_str, "%s.l  %s, %c%d; (2+)", BIT_B(extension) ? "chk2" : "cmp2", get_ea_mode_str_32(g_cpu_ir), BIT_F(extension) ? 'A' : 'D', (extension>>12)&7);
r3535r3536
14671464
14681465static void d68020_cpbcc_16(void)
14691466{
1470   uint extension;
1471   uint new_pc = g_cpu_pc;
1467   UINT32 extension;
1468   UINT32 new_pc = g_cpu_pc;
14721469   LIMIT_CPU_TYPES(M68020_PLUS);
14731470   extension = read_imm_16();
14741471   new_pc += make_int_16(read_imm_16());
r3535r3536
14771474
14781475static void d68020_cpbcc_32(void)
14791476{
1480   uint extension;
1481   uint new_pc = g_cpu_pc;
1477   UINT32 extension;
1478   UINT32 new_pc = g_cpu_pc;
14821479   LIMIT_CPU_TYPES(M68020_PLUS);
14831480   extension = read_imm_16();
14841481   new_pc += read_imm_32();
r3535r3536
14871484
14881485static void d68020_cpdbcc(void)
14891486{
1490   uint extension1;
1491   uint extension2;
1492   uint new_pc = g_cpu_pc;
1487   UINT32 extension1;
1488   UINT32 extension2;
1489   UINT32 new_pc = g_cpu_pc;
14931490   LIMIT_CPU_TYPES(M68020_PLUS);
14941491   extension1 = read_imm_16();
14951492   extension2 = read_imm_16();
r3535r3536
15171514
15181515static void d68020_cpscc(void)
15191516{
1520   uint extension1;
1521   uint extension2;
1517   UINT32 extension1;
1518   UINT32 extension2;
15221519   LIMIT_CPU_TYPES(M68020_PLUS);
15231520   extension1 = read_imm_16();
15241521   extension2 = read_imm_16();
r3535r3536
15271524
15281525static void d68020_cptrapcc_0(void)
15291526{
1530   uint extension1;
1531   uint extension2;
1527   UINT32 extension1;
1528   UINT32 extension2;
15321529   LIMIT_CPU_TYPES(M68020_PLUS);
15331530   extension1 = read_imm_16();
15341531   extension2 = read_imm_16();
r3535r3536
15371534
15381535static void d68020_cptrapcc_16(void)
15391536{
1540   uint extension1;
1541   uint extension2;
1537   UINT32 extension1;
1538   UINT32 extension2;
15421539   LIMIT_CPU_TYPES(M68020_PLUS);
15431540   extension1 = read_imm_16();
15441541   extension2 = read_imm_16();
r3535r3536
15471544
15481545static void d68020_cptrapcc_32(void)
15491546{
1550   uint extension1;
1551   uint extension2;
1547   UINT32 extension1;
1548   UINT32 extension2;
15521549   LIMIT_CPU_TYPES(M68020_PLUS);
15531550   extension1 = read_imm_16();
15541551   extension2 = read_imm_16();
r3535r3536
15771574
15781575static void d68000_dbra(void)
15791576{
1580   uint temp_pc = g_cpu_pc;
1577   UINT32 temp_pc = g_cpu_pc;
15811578   sprintf(g_dasm_str, "dbra    D%d, $%x", g_cpu_ir & 7, temp_pc + make_int_16(read_imm_16()));
15821579   SET_OPCODE_FLAGS(DASMFLAG_STEP_OVER);
15831580}
15841581
15851582static void d68000_dbcc(void)
15861583{
1587   uint temp_pc = g_cpu_pc;
1584   UINT32 temp_pc = g_cpu_pc;
15881585   sprintf(g_dasm_str, "db%-2s    D%d, $%x", g_cc[(g_cpu_ir>>8)&0xf], g_cpu_ir & 7, temp_pc + make_int_16(read_imm_16()));
15891586   SET_OPCODE_FLAGS(DASMFLAG_STEP_OVER);
15901587}
r3535r3536
16011598
16021599static void d68020_divl(void)
16031600{
1604   uint extension;
1601   UINT32 extension;
16051602   LIMIT_CPU_TYPES(M68020_PLUS);
16061603   extension = read_imm_16();
16071604
r3535r3536
16951692   };
16961693
16971694   char mnemonic[40];
1698   uint w2, src, dst_reg;
1695   UINT32 w2, src, dst_reg;
16991696   LIMIT_CPU_TYPES(M68040_PLUS);
17001697   w2 = read_imm_16();
17011698
r3535r3536
19631960
19641961static void d68010_movec(void)
19651962{
1966   uint extension;
1963   UINT32 extension;
19671964   const char* reg_name;
19681965   const char* processor;
19691966   LIMIT_CPU_TYPES(M68010_PLUS);
r3535r3536
20482045
20492046static void d68000_movem_pd_16(void)
20502047{
2051   uint data = read_imm_16();
2048   UINT32 data = read_imm_16();
20522049   char buffer[40];
2053   uint first;
2054   uint run_length;
2055   uint i;
2050   UINT32 first;
2051   UINT32 run_length;
2052   UINT32 i;
20562053
20572054   buffer[0] = 0;
20582055   for(i=0;i<8;i++)
r3535r3536
20962093
20972094static void d68000_movem_pd_32(void)
20982095{
2099   uint data = read_imm_16();
2096   UINT32 data = read_imm_16();
21002097   char buffer[40];
2101   uint first;
2102   uint run_length;
2103   uint i;
2098   UINT32 first;
2099   UINT32 run_length;
2100   UINT32 i;
21042101
21052102   buffer[0] = 0;
21062103   for(i=0;i<8;i++)
r3535r3536
21442141
21452142static void d68000_movem_er_16(void)
21462143{
2147   uint data = read_imm_16();
2144   UINT32 data = read_imm_16();
21482145   char buffer[40];
2149   uint first;
2150   uint run_length;
2151   uint i;
2146   UINT32 first;
2147   UINT32 run_length;
2148   UINT32 i;
21522149
21532150   buffer[0] = 0;
21542151   for(i=0;i<8;i++)
r3535r3536
21922189
21932190static void d68000_movem_er_32(void)
21942191{
2195   uint data = read_imm_16();
2192   UINT32 data = read_imm_16();
21962193   char buffer[40];
2197   uint first;
2198   uint run_length;
2199   uint i;
2194   UINT32 first;
2195   UINT32 run_length;
2196   UINT32 i;
22002197
22012198   buffer[0] = 0;
22022199   for(i=0;i<8;i++)
r3535r3536
22402237
22412238static void d68000_movem_re_16(void)
22422239{
2243   uint data = read_imm_16();
2240   UINT32 data = read_imm_16();
22442241   char buffer[40];
2245   uint first;
2246   uint run_length;
2247   uint i;
2242   UINT32 first;
2243   UINT32 run_length;
2244   UINT32 i;
22482245
22492246   buffer[0] = 0;
22502247   for(i=0;i<8;i++)
r3535r3536
22882285
22892286static void d68000_movem_re_32(void)
22902287{
2291   uint data = read_imm_16();
2288   UINT32 data = read_imm_16();
22922289   char buffer[40];
2293   uint first;
2294   uint run_length;
2295   uint i;
2290   UINT32 first;
2291   UINT32 run_length;
2292   UINT32 i;
22962293
22972294   buffer[0] = 0;
22982295   for(i=0;i<8;i++)
r3535r3536
23562353
23572354static void d68010_moves_8(void)
23582355{
2359   uint extension;
2356   UINT32 extension;
23602357   LIMIT_CPU_TYPES(M68010_PLUS);
23612358   extension = read_imm_16();
23622359   if(BIT_B(extension))
r3535r3536
23672364
23682365static void d68010_moves_16(void)
23692366{
2370   uint extension;
2367   UINT32 extension;
23712368   LIMIT_CPU_TYPES(M68010_PLUS);
23722369   extension = read_imm_16();
23732370   if(BIT_B(extension))
r3535r3536
23782375
23792376static void d68010_moves_32(void)
23802377{
2381   uint extension;
2378   UINT32 extension;
23822379   LIMIT_CPU_TYPES(M68010_PLUS);
23832380   extension = read_imm_16();
23842381   if(BIT_B(extension))
r3535r3536
24342431
24352432static void d68020_mull(void)
24362433{
2437   uint extension;
2434   UINT32 extension;
24382435   LIMIT_CPU_TYPES(M68020_PLUS);
24392436   extension = read_imm_16();
24402437
r3535r3536
33573354};
33583355
33593356/* Check if opcode is using a valid ea mode */
3360static int valid_ea(uint opcode, uint mask)
3357static int valid_ea(UINT32 opcode, UINT32 mask)
33613358{
33623359   if(mask == 0)
33633360      return 1;
r3535r3536
34033400/* Used by qsort */
34043401static int DECL_SPEC compare_nof_true_bits(const void *aptr, const void *bptr)
34053402{
3406   uint a = ((const opcode_struct*)aptr)->mask;
3407   uint b = ((const opcode_struct*)bptr)->mask;
3403   UINT32 a = ((const opcode_struct*)aptr)->mask;
3404   UINT32 b = ((const opcode_struct*)bptr)->mask;
34083405
34093406   a = ((a & 0xAAAA) >> 1) + (a & 0x5555);
34103407   a = ((a & 0xCCCC) >> 2) + (a & 0x3333);
r3535r3536
34223419/* build the opcode handler jump table */
34233420static void build_opcode_table(void)
34243421{
3425   uint i;
3426   uint opcode;
3422   UINT32 i;
3423   UINT32 opcode;
34273424   opcode_struct* ostruct;
34283425   opcode_struct opcode_info[ARRAY_LENGTH(g_opcode_info)];
34293426
src/emu/cpu/m68000/m68kmame.h
r3535r3536
1111#include "deprecat.h"
1212#include "m68000.h"
1313
14#ifndef __M68KCPU_H__
15#define m68ki_cpu_core void
16#endif
17
18#define OPT_ON 1
19#define OPT_OFF 0
20
1421/* Configuration switches (see m68kconf.h for explanation) */
1522#define M68K_SEPARATE_READS         OPT_ON
1623
17#define M68K_SIMULATE_PD_WRITES     OPT_ON
18
19#define M68K_EMULATE_INT_ACK        OPT_ON
20#define M68K_INT_ACK_CALLBACK(A)
21
22#define M68K_EMULATE_BKPT_ACK       OPT_OFF
23#define M68K_BKPT_ACK_CALLBACK()
24
2524#define M68K_EMULATE_TRACE          OPT_OFF
2625
27#define M68K_EMULATE_RESET          OPT_ON
28#define M68K_RESET_CALLBACK()
29
30#define M68K_CMPILD_HAS_CALLBACK     OPT_ON
31#define M68K_CMPILD_CALLBACK()
32
33#define M68K_RTE_HAS_CALLBACK       OPT_ON
34#define M68K_RTE_CALLBACK()
35
36#define M68K_TAS_HAS_CALLBACK       OPT_ON
37#define M68K_TAS_CALLBACK()
38
3926#define M68K_EMULATE_FC             OPT_OFF
4027#define M68K_SET_FC_CALLBACK(A)
4128
42#define M68K_MONITOR_PC             OPT_SPECIFY_HANDLER
43#define M68K_SET_PC_CALLBACK(A)     change_pc(A)
44
45#define M68K_INSTRUCTION_HOOK       OPT_SPECIFY_HANDLER
46#define M68K_INSTRUCTION_CALLBACK(A) debugger_instruction_hook(Machine, A)
47
48#define M68K_EMULATE_PREFETCH       OPT_ON
49
5029#define M68K_LOG_ENABLE             OPT_OFF
5130#define M68K_LOG_1010_1111          OPT_OFF
5231#define M68K_LOG_FILEHANDLE         errorlog
5332
54#define M68K_EMULATE_ADDRESS_ERROR  OPT_ON
55
5633#define M68K_USE_64_BIT             OPT_OFF
5734
5835
59#define m68ki_remaining_cycles m68k_ICount
60
61
6236extern m68k_memory_interface m68k_memory_intf;
6337extern offs_t m68k_encrypted_opcode_start[MAX_CPU];
6438extern offs_t m68k_encrypted_opcode_end[MAX_CPU];
6539
66#define m68k_read_memory_8(address)          (*m68k_memory_intf.read8)(address)
67#define m68k_read_memory_16(address)         (*m68k_memory_intf.read16)(address)
68#define m68k_read_memory_32(address)         (*m68k_memory_intf.read32)(address)
40#define m68k_read_memory_8(M, A)            (*m68k_memory_intf.read8)(A)
41#define m68k_read_memory_16(M, A)            (*m68k_memory_intf.read16)(A)
42#define m68k_read_memory_32(M, A)            (*m68k_memory_intf.read32)(A)
6943
70#define m68k_read_immediate_16(address)      (*m68k_memory_intf.readimm16)(address)
71#define m68k_read_immediate_32(address)      m68kx_read_immediate_32(address)
72#define m68k_read_pcrelative_8(address)      m68kx_read_pcrelative_8(address)
73#define m68k_read_pcrelative_16(address)     m68kx_read_pcrelative_16(address)
74#define m68k_read_pcrelative_32(address)     m68kx_read_pcrelative_32(address)
44#define m68k_read_immediate_16(M, A)         (*m68k_memory_intf.readimm16)(A)
45#define m68k_read_immediate_32(M, A)         m68kx_read_immediate_32(M, A)
46#define m68k_read_pcrelative_8(M, A)         m68kx_read_pcrelative_8(M, A)
47#define m68k_read_pcrelative_16(M, A)         m68kx_read_pcrelative_16(M, A)
48#define m68k_read_pcrelative_32(M, A)         m68kx_read_pcrelative_32(M, A)
7549
76#define m68k_read_disassembler_16(address)   m68k_read_immediate_16(address)
77#define m68k_read_disassembler_32(address)   m68kx_read_immediate_32(address)
50#define m68k_read_disassembler_16(M, A)         m68k_read_immediate_16(M, A)
51#define m68k_read_disassembler_32(M, A)         m68kx_read_immediate_32(M, A)
7852
79#define m68k_write_memory_8(address, value)  (*m68k_memory_intf.write8)(address, value)
80#define m68k_write_memory_16(address, value) (*m68k_memory_intf.write16)(address, value)
81#define m68k_write_memory_32(address, value) (*m68k_memory_intf.write32)(address, value)
82#define m68k_write_memory_32_pd(address, value) m68kx_write_memory_32_pd(address, value)
53#define m68k_write_memory_8(M, A, V)         (*m68k_memory_intf.write8)(A, V)
54#define m68k_write_memory_16(M, A, V)         (*m68k_memory_intf.write16)(A, V)
55#define m68k_write_memory_32(M, A, V)         (*m68k_memory_intf.write32)(A, V)
56#define m68k_write_memory_32_pd(M, A, V)      m68kx_write_memory_32_pd(M, A, V)
8357
8458
85INLINE unsigned int m68k_read_immediate_32(unsigned int address);
86INLINE unsigned int m68k_read_pcrelative_8(unsigned int address);
87INLINE unsigned int m68k_read_pcrelative_16(unsigned int address);
88INLINE unsigned int m68k_read_pcrelative_32(unsigned int address);
89INLINE void m68k_write_memory_32_pd(unsigned int address, unsigned int value);
59INLINE unsigned int m68k_read_immediate_32(m68ki_cpu_core *m68k, unsigned int address);
60INLINE unsigned int m68k_read_pcrelative_8(m68ki_cpu_core *m68k, unsigned int address);
61INLINE unsigned int m68k_read_pcrelative_16(m68ki_cpu_core *m68k, unsigned int address);
62INLINE unsigned int m68k_read_pcrelative_32(m68ki_cpu_core *m68k, unsigned int address);
63INLINE void m68k_write_memory_32_pd(m68ki_cpu_core *m68k, unsigned int address, unsigned int value);
9064
9165
92INLINE unsigned int m68kx_read_immediate_32(unsigned int address)
66INLINE unsigned int m68kx_read_immediate_32(m68ki_cpu_core *m68k, unsigned int address)
9367{
94   return ((m68k_read_immediate_16(address) << 16) | m68k_read_immediate_16((address)+2));
68   return ((m68k_read_immediate_16(m68k, address) << 16) | m68k_read_immediate_16(m68k, (address)+2));
9569}
9670
97INLINE unsigned int m68kx_read_pcrelative_8(unsigned int address)
71INLINE unsigned int m68kx_read_pcrelative_8(m68ki_cpu_core *m68k, unsigned int address)
9872{
9973   if (address >= m68k_encrypted_opcode_start[cpu_getactivecpu()] &&
10074         address < m68k_encrypted_opcode_end[cpu_getactivecpu()])
101      return ((m68k_read_immediate_16(address&~1)>>(8*(1-(address & 1))))&0xff);
75      return ((m68k_read_immediate_16(m68k, address&~1)>>(8*(1-(address & 1))))&0xff);
10276   else
103      return m68k_read_memory_8(address);
77      return m68k_read_memory_8(m68k, address);
10478}
10579
106INLINE unsigned int m68kx_read_pcrelative_16(unsigned int address)
80INLINE unsigned int m68kx_read_pcrelative_16(m68ki_cpu_core *m68k, unsigned int address)
10781{
10882   if (address >= m68k_encrypted_opcode_start[cpu_getactivecpu()] &&
10983         address < m68k_encrypted_opcode_end[cpu_getactivecpu()])
110      return m68k_read_immediate_16(address);
84      return m68k_read_immediate_16(m68k, address);
11185   else
112      return m68k_read_memory_16(address);
86      return m68k_read_memory_16(m68k, address);
11387}
11488
115INLINE unsigned int m68kx_read_pcrelative_32(unsigned int address)
89INLINE unsigned int m68kx_read_pcrelative_32(m68ki_cpu_core *m68k, unsigned int address)
11690{
11791   if (address >= m68k_encrypted_opcode_start[cpu_getactivecpu()] &&
11892         address < m68k_encrypted_opcode_end[cpu_getactivecpu()])
119      return m68k_read_immediate_32(address);
93      return m68k_read_immediate_32(m68k, address);
12094   else
121      return m68k_read_memory_32(address);
95      return m68k_read_memory_32(m68k, address);
12296}
12397
12498
r3535r3536
127101 * A real 68k first writes the high word to [address+2], and then writes the
128102 * low word to [address].
129103 */
130INLINE void m68kx_write_memory_32_pd(unsigned int address, unsigned int value)
104INLINE void m68kx_write_memory_32_pd(m68ki_cpu_core *m68k, unsigned int address, unsigned int value)
131105{
132106   (*m68k_memory_intf.write16)(address+2, value>>16);
133107   (*m68k_memory_intf.write16)(address, value&0xffff);
r3535r3536
137111void m68k_set_encrypted_opcode_range(int cpunum, offs_t start, offs_t end);
138112
139113
140/* M68K Variants */
141#if HAS_M68008
142#define M68K_EMULATE_008            OPT_ON
143#else
144#define M68K_EMULATE_008            OPT_OFF
145#endif
146
147#if HAS_M68010
148#define M68K_EMULATE_010            OPT_ON
149#else
150#define M68K_EMULATE_010            OPT_OFF
151#endif
152
153#undef  M68K_EMULATE_010
154#define M68K_EMULATE_010            OPT_ON
155
156#if HAS_M68EC020
157#define M68K_EMULATE_EC020          OPT_ON
158#else
159#define M68K_EMULATE_EC020          OPT_OFF
160#endif
161
162#if HAS_M68020
163#define M68K_EMULATE_020            OPT_ON
164#else
165#define M68K_EMULATE_020            OPT_OFF
166#endif
167
168#if HAS_M68040
169#define M68K_EMULATE_040         OPT_ON
170#else
171#define M68K_EMULATE_040         OPT_OFF
172#endif
173
174114/* ======================================================================== */
175115/* ============================== END OF FILE ============================= */
176116/* ======================================================================== */
src/emu/cpu/m68000/m68k_in.c
r3535r3536
104104/* Build the opcode handler table */
105105void m68ki_build_opcode_table(void);
106106
107extern void (*m68ki_instruction_jump_table[0x10000])(void); /* opcode handler jump table */
107extern void (*m68ki_instruction_jump_table[0x10000])(m68ki_cpu_core *m68k); /* opcode handler jump table */
108108extern unsigned char m68ki_cycles[][0x10000];
109109
110110
r3535r3536
127127
128128#define NUM_CPU_TYPES 4
129129
130void  (*m68ki_instruction_jump_table[0x10000])(void); /* opcode handler jump table */
130void  (*m68ki_instruction_jump_table[0x10000])(m68ki_cpu_core *m68k); /* opcode handler jump table */
131131unsigned char m68ki_cycles[NUM_CPU_TYPES][0x10000]; /* Cycles used by CPU type */
132132
133133/* This is used to generate the opcode handler jump table */
134134typedef struct
135135{
136   void (*opcode_handler)(void);        /* handler function */
136   void (*opcode_handler)(m68ki_cpu_core *m68k);        /* handler function */
137137   unsigned int  mask;                  /* mask on opcode */
138138   unsigned int  match;                 /* what to match after masking */
139139   unsigned char cycles[NUM_CPU_TYPES]; /* cycles each cpu type takes */
r3535r3536
259259M68KMAKE_OPCODE_HANDLER_HEADER
260260
261261#include "m68kcpu.h"
262extern void m68040_fpu_op0(void);
263extern void m68040_fpu_op1(void);
262extern void m68040_fpu_op0(m68ki_cpu_core *m68k);
263extern void m68040_fpu_op1(m68ki_cpu_core *m68k);
264264
265265/* ======================================================================== */
266266/* ========================= INSTRUCTION HANDLERS ========================= */
r3535r3536
879879
880880M68KMAKE_OP(1010, 0, ., .)
881881{
882   m68ki_exception_1010();
882   m68ki_exception_1010(m68k);
883883}
884884
885885
886886M68KMAKE_OP(1111, 0, ., .)
887887{
888   m68ki_exception_1111();
888   m68ki_exception_1111(m68k);
889889}
890890
891891
892892M68KMAKE_OP(040fpu0, 32, ., .)
893893{
894   if(CPU_TYPE_IS_040_PLUS(CPU_TYPE))
894   if(CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
895895   {
896      m68040_fpu_op0();
896      m68040_fpu_op0(m68k);
897897      return;
898898   }
899   m68ki_exception_1111();
899   m68ki_exception_1111(m68k);
900900}
901901
902902
903903M68KMAKE_OP(040fpu1, 32, ., .)
904904{
905   if(CPU_TYPE_IS_040_PLUS(CPU_TYPE))
905   if(CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
906906   {
907      m68040_fpu_op1();
907      m68040_fpu_op1(m68k);
908908      return;
909909   }
910   m68ki_exception_1111();
910   m68ki_exception_1111(m68k);
911911}
912912
913913
914914
915915M68KMAKE_OP(abcd, 8, rr, .)
916916{
917   uint* r_dst = &DX;
918   uint src = DY;
919   uint dst = *r_dst;
920   uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
917   UINT32* r_dst = &DX;
918   UINT32 src = DY;
919   UINT32 dst = *r_dst;
920   UINT32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(m68k);
921921
922   FLAG_V = ~res; /* Undefined V behavior */
922   m68k->v_flag = ~res; /* Undefined V behavior */
923923
924924   if(res > 9)
925925      res += 6;
926926   res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
927   FLAG_X = FLAG_C = (res > 0x99) << 8;
928   if(FLAG_C)
927   m68k->x_flag = m68k->c_flag = (res > 0x99) << 8;
928   if(m68k->c_flag)
929929      res -= 0xa0;
930930
931   FLAG_V &= res; /* Undefined V behavior part II */
932   FLAG_N = NFLAG_8(res); /* Undefined N behavior */
931   m68k->v_flag &= res; /* Undefined V behavior part II */
932   m68k->n_flag = NFLAG_8(res); /* Undefined N behavior */
933933
934934   res = MASK_OUT_ABOVE_8(res);
935   FLAG_Z |= res;
935   m68k->not_z_flag |= res;
936936
937937   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
938938}
r3535r3536
940940
941941M68KMAKE_OP(abcd, 8, mm, ax7)
942942{
943   uint src = OPER_AY_PD_8();
944   uint ea  = EA_A7_PD_8();
945   uint dst = m68ki_read_8(ea);
946   uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
943   UINT32 src = OPER_AY_PD_8(m68k);
944   UINT32 ea  = EA_A7_PD_8(m68k);
945   UINT32 dst = m68ki_read_8(m68k, ea);
946   UINT32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(m68k);
947947
948   FLAG_V = ~res; /* Undefined V behavior */
948   m68k->v_flag = ~res; /* Undefined V behavior */
949949
950950   if(res > 9)
951951      res += 6;
952952   res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
953   FLAG_X = FLAG_C = (res > 0x99) << 8;
954   if(FLAG_C)
953   m68k->x_flag = m68k->c_flag = (res > 0x99) << 8;
954   if(m68k->c_flag)
955955      res -= 0xa0;
956956
957   FLAG_V &= res; /* Undefined V behavior part II */
958   FLAG_N = NFLAG_8(res); /* Undefined N behavior */
957   m68k->v_flag &= res; /* Undefined V behavior part II */
958   m68k->n_flag = NFLAG_8(res); /* Undefined N behavior */
959959
960960   res = MASK_OUT_ABOVE_8(res);
961   FLAG_Z |= res;
961   m68k->not_z_flag |= res;
962962
963   m68ki_write_8(ea, res);
963   m68ki_write_8(m68k, ea, res);
964964}
965965
966966
967967M68KMAKE_OP(abcd, 8, mm, ay7)
968968{
969   uint src = OPER_A7_PD_8();
970   uint ea  = EA_AX_PD_8();
971   uint dst = m68ki_read_8(ea);
972   uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
969   UINT32 src = OPER_A7_PD_8(m68k);
970   UINT32 ea  = EA_AX_PD_8(m68k);
971   UINT32 dst = m68ki_read_8(m68k, ea);
972   UINT32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(m68k);
973973
974   FLAG_V = ~res; /* Undefined V behavior */
974   m68k->v_flag = ~res; /* Undefined V behavior */
975975
976976   if(res > 9)
977977      res += 6;
978978   res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
979   FLAG_X = FLAG_C = (res > 0x99) << 8;
980   if(FLAG_C)
979   m68k->x_flag = m68k->c_flag = (res > 0x99) << 8;
980   if(m68k->c_flag)
981981      res -= 0xa0;
982982
983   FLAG_V &= res; /* Undefined V behavior part II */
984   FLAG_N = NFLAG_8(res); /* Undefined N behavior */
983   m68k->v_flag &= res; /* Undefined V behavior part II */
984   m68k->n_flag = NFLAG_8(res); /* Undefined N behavior */
985985
986986   res = MASK_OUT_ABOVE_8(res);
987   FLAG_Z |= res;
987   m68k->not_z_flag |= res;
988988
989   m68ki_write_8(ea, res);
989   m68ki_write_8(m68k, ea, res);
990990}
991991
992992
993993M68KMAKE_OP(abcd, 8, mm, axy7)
994994{
995   uint src = OPER_A7_PD_8();
996   uint ea  = EA_A7_PD_8();
997   uint dst = m68ki_read_8(ea);
998   uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
995   UINT32 src = OPER_A7_PD_8(m68k);
996   UINT32 ea  = EA_A7_PD_8(m68k);
997   UINT32 dst = m68ki_read_8(m68k, ea);
998   UINT32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(m68k);
999999
1000   FLAG_V = ~res; /* Undefined V behavior */
1000   m68k->v_flag = ~res; /* Undefined V behavior */
10011001
10021002   if(res > 9)
10031003      res += 6;
10041004   res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
1005   FLAG_X = FLAG_C = (res > 0x99) << 8;
1006   if(FLAG_C)
1005   m68k->x_flag = m68k->c_flag = (res > 0x99) << 8;
1006   if(m68k->c_flag)
10071007      res -= 0xa0;
10081008
1009   FLAG_V &= res; /* Undefined V behavior part II */
1010   FLAG_N = NFLAG_8(res); /* Undefined N behavior */
1009   m68k->v_flag &= res; /* Undefined V behavior part II */
1010   m68k->n_flag = NFLAG_8(res); /* Undefined N behavior */
10111011
10121012   res = MASK_OUT_ABOVE_8(res);
1013   FLAG_Z |= res;
1013   m68k->not_z_flag |= res;
10141014
1015   m68ki_write_8(ea, res);
1015   m68ki_write_8(m68k, ea, res);
10161016}
10171017
10181018
10191019M68KMAKE_OP(abcd, 8, mm, .)
10201020{
1021   uint src = OPER_AY_PD_8();
1022   uint ea  = EA_AX_PD_8();
1023   uint dst = m68ki_read_8(ea);
1024   uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
1021   UINT32 src = OPER_AY_PD_8(m68k);
1022   UINT32 ea  = EA_AX_PD_8(m68k);
1023   UINT32 dst = m68ki_read_8(m68k, ea);
1024   UINT32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(m68k);
10251025
1026   FLAG_V = ~res; /* Undefined V behavior */
1026   m68k->v_flag = ~res; /* Undefined V behavior */
10271027
10281028   if(res > 9)
10291029      res += 6;
10301030   res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
1031   FLAG_X = FLAG_C = (res > 0x99) << 8;
1032   if(FLAG_C)
1031   m68k->x_flag = m68k->c_flag = (res > 0x99) << 8;
1032   if(m68k->c_flag)
10331033      res -= 0xa0;
10341034
1035   FLAG_V &= res; /* Undefined V behavior part II */
1036   FLAG_N = NFLAG_8(res); /* Undefined N behavior */
1035   m68k->v_flag &= res; /* Undefined V behavior part II */
1036   m68k->n_flag = NFLAG_8(res); /* Undefined N behavior */
10371037
10381038   res = MASK_OUT_ABOVE_8(res);
1039   FLAG_Z |= res;
1039   m68k->not_z_flag |= res;
10401040
1041   m68ki_write_8(ea, res);
1041   m68ki_write_8(m68k, ea, res);
10421042}
10431043
10441044
10451045M68KMAKE_OP(add, 8, er, d)
10461046{
1047   uint* r_dst = &DX;
1048   uint src = MASK_OUT_ABOVE_8(DY);
1049   uint dst = MASK_OUT_ABOVE_8(*r_dst);
1050   uint res = src + dst;
1047   UINT32* r_dst = &DX;
1048   UINT32 src = MASK_OUT_ABOVE_8(DY);
1049   UINT32 dst = MASK_OUT_ABOVE_8(*r_dst);
1050   UINT32 res = src + dst;
10511051
1052   FLAG_N = NFLAG_8(res);
1053   FLAG_V = VFLAG_ADD_8(src, dst, res);
1054   FLAG_X = FLAG_C = CFLAG_8(res);
1055   FLAG_Z = MASK_OUT_ABOVE_8(res);
1052   m68k->n_flag = NFLAG_8(res);
1053   m68k->v_flag = VFLAG_ADD_8(src, dst, res);
1054   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
1055   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
10561056
1057   *r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
1057   *r_dst = MASK_OUT_BELOW_8(*r_dst) | m68k->not_z_flag;
10581058}
10591059
10601060
10611061M68KMAKE_OP(add, 8, er, .)
10621062{
1063   uint* r_dst = &DX;
1064   uint src = M68KMAKE_GET_OPER_AY_8;
1065   uint dst = MASK_OUT_ABOVE_8(*r_dst);
1066   uint res = src + dst;
1063   UINT32* r_dst = &DX;
1064   UINT32 src = M68KMAKE_GET_OPER_AY_8;
1065   UINT32 dst = MASK_OUT_ABOVE_8(*r_dst);
1066   UINT32 res = src + dst;
10671067
1068   FLAG_N = NFLAG_8(res);
1069   FLAG_V = VFLAG_ADD_8(src, dst, res);
1070   FLAG_X = FLAG_C = CFLAG_8(res);
1071   FLAG_Z = MASK_OUT_ABOVE_8(res);
1068   m68k->n_flag = NFLAG_8(res);
1069   m68k->v_flag = VFLAG_ADD_8(src, dst, res);
1070   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
1071   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
10721072
1073   *r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
1073   *r_dst = MASK_OUT_BELOW_8(*r_dst) | m68k->not_z_flag;
10741074}
10751075
10761076
10771077M68KMAKE_OP(add, 16, er, d)
10781078{
1079   uint* r_dst = &DX;
1080   uint src = MASK_OUT_ABOVE_16(DY);
1081   uint dst = MASK_OUT_ABOVE_16(*r_dst);
1082   uint res = src + dst;
1079   UINT32* r_dst = &DX;
1080   UINT32 src = MASK_OUT_ABOVE_16(DY);
1081   UINT32 dst = MASK_OUT_ABOVE_16(*r_dst);
1082   UINT32 res = src + dst;
10831083
1084   FLAG_N = NFLAG_16(res);
1085   FLAG_V = VFLAG_ADD_16(src, dst, res);
1086   FLAG_X = FLAG_C = CFLAG_16(res);
1087   FLAG_Z = MASK_OUT_ABOVE_16(res);
1084   m68k->n_flag = NFLAG_16(res);
1085   m68k->v_flag = VFLAG_ADD_16(src, dst, res);
1086   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
1087   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
10881088
1089   *r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
1089   *r_dst = MASK_OUT_BELOW_16(*r_dst) | m68k->not_z_flag;
10901090}
10911091
10921092
10931093M68KMAKE_OP(add, 16, er, a)
10941094{
1095   uint* r_dst = &DX;
1096   uint src = MASK_OUT_ABOVE_16(AY);
1097   uint dst = MASK_OUT_ABOVE_16(*r_dst);
1098   uint res = src + dst;
1095   UINT32* r_dst = &DX;
1096   UINT32 src = MASK_OUT_ABOVE_16(AY);
1097   UINT32 dst = MASK_OUT_ABOVE_16(*r_dst);
1098   UINT32 res = src + dst;
10991099
1100   FLAG_N = NFLAG_16(res);
1101   FLAG_V = VFLAG_ADD_16(src, dst, res);
1102   FLAG_X = FLAG_C = CFLAG_16(res);
1103   FLAG_Z = MASK_OUT_ABOVE_16(res);
1100   m68k->n_flag = NFLAG_16(res);
1101   m68k->v_flag = VFLAG_ADD_16(src, dst, res);
1102   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
1103   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
11041104
1105   *r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
1105   *r_dst = MASK_OUT_BELOW_16(*r_dst) | m68k->not_z_flag;
11061106}
11071107
11081108
11091109M68KMAKE_OP(add, 16, er, .)
11101110{
1111   uint* r_dst = &DX;
1112   uint src = M68KMAKE_GET_OPER_AY_16;
1113   uint dst = MASK_OUT_ABOVE_16(*r_dst);
1114   uint res = src + dst;
1111   UINT32* r_dst = &DX;
1112   UINT32 src = M68KMAKE_GET_OPER_AY_16;
1113   UINT32 dst = MASK_OUT_ABOVE_16(*r_dst);
1114   UINT32 res = src + dst;
11151115
1116   FLAG_N = NFLAG_16(res);
1117   FLAG_V = VFLAG_ADD_16(src, dst, res);
1118   FLAG_X = FLAG_C = CFLAG_16(res);
1119   FLAG_Z = MASK_OUT_ABOVE_16(res);
1116   m68k->n_flag = NFLAG_16(res);
1117   m68k->v_flag = VFLAG_ADD_16(src, dst, res);
1118   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
1119   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
11201120
1121   *r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
1121   *r_dst = MASK_OUT_BELOW_16(*r_dst) | m68k->not_z_flag;
11221122}
11231123
11241124
11251125M68KMAKE_OP(add, 32, er, d)
11261126{
1127   uint* r_dst = &DX;
1128   uint src = DY;
1129   uint dst = *r_dst;
1130   uint res = src + dst;
1127   UINT32* r_dst = &DX;
1128   UINT32 src = DY;
1129   UINT32 dst = *r_dst;
1130   UINT32 res = src + dst;
11311131
1132   FLAG_N = NFLAG_32(res);
1133   FLAG_V = VFLAG_ADD_32(src, dst, res);
1134   FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
1135   FLAG_Z = MASK_OUT_ABOVE_32(res);
1132   m68k->n_flag = NFLAG_32(res);
1133   m68k->v_flag = VFLAG_ADD_32(src, dst, res);
1134   m68k->x_flag = m68k->c_flag = CFLAG_ADD_32(src, dst, res);
1135   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
11361136
1137   *r_dst = FLAG_Z;
1137   *r_dst = m68k->not_z_flag;
11381138}
11391139
11401140
11411141M68KMAKE_OP(add, 32, er, a)
11421142{
1143   uint* r_dst = &DX;
1144   uint src = AY;
1145   uint dst = *r_dst;
1146   uint res = src + dst;
1143   UINT32* r_dst = &DX;
1144   UINT32 src = AY;
1145   UINT32 dst = *r_dst;
1146   UINT32 res = src + dst;
11471147
1148   FLAG_N = NFLAG_32(res);
1149   FLAG_V = VFLAG_ADD_32(src, dst, res);
1150   FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
1151   FLAG_Z = MASK_OUT_ABOVE_32(res);
1148   m68k->n_flag = NFLAG_32(res);
1149   m68k->v_flag = VFLAG_ADD_32(src, dst, res);
1150   m68k->x_flag = m68k->c_flag = CFLAG_ADD_32(src, dst, res);
1151   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
11521152
1153   *r_dst = FLAG_Z;
1153   *r_dst = m68k->not_z_flag;
11541154}
11551155
11561156
11571157M68KMAKE_OP(add, 32, er, .)
11581158{
1159   uint* r_dst = &DX;
1160   uint src = M68KMAKE_GET_OPER_AY_32;
1161   uint dst = *r_dst;
1162   uint res = src + dst;
1159   UINT32* r_dst = &DX;
1160   UINT32 src = M68KMAKE_GET_OPER_AY_32;
1161   UINT32 dst = *r_dst;
1162   UINT32 res = src + dst;
11631163
1164   FLAG_N = NFLAG_32(res);
1165   FLAG_V = VFLAG_ADD_32(src, dst, res);
1166   FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
1167   FLAG_Z = MASK_OUT_ABOVE_32(res);
1164   m68k->n_flag = NFLAG_32(res);
1165   m68k->v_flag = VFLAG_ADD_32(src, dst, res);
1166   m68k->x_flag = m68k->c_flag = CFLAG_ADD_32(src, dst, res);
1167   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
11681168
1169   *r_dst = FLAG_Z;
1169   *r_dst = m68k->not_z_flag;
11701170}
11711171
11721172
11731173M68KMAKE_OP(add, 8, re, .)
11741174{
1175   uint ea = M68KMAKE_GET_EA_AY_8;
1176   uint src = MASK_OUT_ABOVE_8(DX);
1177   uint dst = m68ki_read_8(ea);
1178   uint res = src + dst;
1175   UINT32 ea = M68KMAKE_GET_EA_AY_8;
1176   UINT32 src = MASK_OUT_ABOVE_8(DX);
1177   UINT32 dst = m68ki_read_8(m68k, ea);
1178   UINT32 res = src + dst;
11791179
1180   FLAG_N = NFLAG_8(res);
1181   FLAG_V = VFLAG_ADD_8(src, dst, res);
1182   FLAG_X = FLAG_C = CFLAG_8(res);
1183   FLAG_Z = MASK_OUT_ABOVE_8(res);
1180   m68k->n_flag = NFLAG_8(res);
1181   m68k->v_flag = VFLAG_ADD_8(src, dst, res);
1182   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
1183   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
11841184
1185   m68ki_write_8(ea, FLAG_Z);
1185   m68ki_write_8(m68k, ea, m68k->not_z_flag);
11861186}
11871187
11881188
11891189M68KMAKE_OP(add, 16, re, .)
11901190{
1191   uint ea = M68KMAKE_GET_EA_AY_16;
1192   uint src = MASK_OUT_ABOVE_16(DX);
1193   uint dst = m68ki_read_16(ea);
1194   uint res = src + dst;
1191   UINT32 ea = M68KMAKE_GET_EA_AY_16;
1192   UINT32 src = MASK_OUT_ABOVE_16(DX);
1193   UINT32 dst = m68ki_read_16(m68k, ea);
1194   UINT32 res = src + dst;
11951195
1196   FLAG_N = NFLAG_16(res);
1197   FLAG_V = VFLAG_ADD_16(src, dst, res);
1198   FLAG_X = FLAG_C = CFLAG_16(res);
1199   FLAG_Z = MASK_OUT_ABOVE_16(res);
1196   m68k->n_flag = NFLAG_16(res);
1197   m68k->v_flag = VFLAG_ADD_16(src, dst, res);
1198   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
1199   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
12001200
1201   m68ki_write_16(ea, FLAG_Z);
1201   m68ki_write_16(m68k, ea, m68k->not_z_flag);
12021202}
12031203
12041204
12051205M68KMAKE_OP(add, 32, re, .)
12061206{
1207   uint ea = M68KMAKE_GET_EA_AY_32;
1208   uint src = DX;
1209   uint dst = m68ki_read_32(ea);
1210   uint res = src + dst;
1207   UINT32 ea = M68KMAKE_GET_EA_AY_32;
1208   UINT32 src = DX;
1209   UINT32 dst = m68ki_read_32(m68k, ea);
1210   UINT32 res = src + dst;
12111211
1212   FLAG_N = NFLAG_32(res);
1213   FLAG_V = VFLAG_ADD_32(src, dst, res);
1214   FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
1215   FLAG_Z = MASK_OUT_ABOVE_32(res);
1212   m68k->n_flag = NFLAG_32(res);
1213   m68k->v_flag = VFLAG_ADD_32(src, dst, res);
1214   m68k->x_flag = m68k->c_flag = CFLAG_ADD_32(src, dst, res);
1215   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
12161216
1217   m68ki_write_32(ea, FLAG_Z);
1217   m68ki_write_32(m68k, ea, m68k->not_z_flag);
12181218}
12191219
12201220
12211221M68KMAKE_OP(adda, 16, ., d)
12221222{
1223   uint* r_dst = &AX;
1223   UINT32* r_dst = &AX;
12241224
12251225   *r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(DY));
12261226}
r3535r3536
12281228
12291229M68KMAKE_OP(adda, 16, ., a)
12301230{
1231   uint* r_dst = &AX;
1231   UINT32* r_dst = &AX;
12321232
12331233   *r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(AY));
12341234}
r3535r3536
12361236
12371237M68KMAKE_OP(adda, 16, ., .)
12381238{
1239   uint* r_dst = &AX;
1240   uint src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16);
1239   UINT32* r_dst = &AX;
1240   UINT32 src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16);
12411241
12421242   *r_dst = MASK_OUT_ABOVE_32(*r_dst + src);
12431243}
r3535r3536
12451245
12461246M68KMAKE_OP(adda, 32, ., d)
12471247{
1248   uint* r_dst = &AX;
1248   UINT32* r_dst = &AX;
12491249
12501250   *r_dst = MASK_OUT_ABOVE_32(*r_dst + DY);
12511251}
r3535r3536
12531253
12541254M68KMAKE_OP(adda, 32, ., a)
12551255{
1256   uint* r_dst = &AX;
1256   UINT32* r_dst = &AX;
12571257
12581258   *r_dst = MASK_OUT_ABOVE_32(*r_dst + AY);
12591259}
r3535r3536
12611261
12621262M68KMAKE_OP(adda, 32, ., .)
12631263{
1264   uint* r_dst = &AX;
1265   uint src = M68KMAKE_GET_OPER_AY_32;
1264   UINT32* r_dst = &AX;
1265   UINT32 src = M68KMAKE_GET_OPER_AY_32;
12661266
12671267   *r_dst = MASK_OUT_ABOVE_32(*r_dst + src);
12681268}
r3535r3536
12701270
12711271M68KMAKE_OP(addi, 8, ., d)
12721272{
1273   uint* r_dst = &DY;
1274   uint src = OPER_I_8();
1275   uint dst = MASK_OUT_ABOVE_8(*r_dst);
1276   uint res = src + dst;
1273   UINT32* r_dst = &DY;
1274   UINT32 src = OPER_I_8(m68k);
1275   UINT32 dst = MASK_OUT_ABOVE_8(*r_dst);
1276   UINT32 res = src + dst;
12771277
1278   FLAG_N = NFLAG_8(res);
1279   FLAG_V = VFLAG_ADD_8(src, dst, res);
1280   FLAG_X = FLAG_C = CFLAG_8(res);
1281   FLAG_Z = MASK_OUT_ABOVE_8(res);
1278   m68k->n_flag = NFLAG_8(res);
1279   m68k->v_flag = VFLAG_ADD_8(src, dst, res);
1280   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
1281   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
12821282
1283   *r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
1283   *r_dst = MASK_OUT_BELOW_8(*r_dst) | m68k->not_z_flag;
12841284}
12851285
12861286
12871287M68KMAKE_OP(addi, 8, ., .)
12881288{
1289   uint src = OPER_I_8();
1290   uint ea = M68KMAKE_GET_EA_AY_8;
1291   uint dst = m68ki_read_8(ea);
1292   uint res = src + dst;
1289   UINT32 src = OPER_I_8(m68k);
1290   UINT32 ea = M68KMAKE_GET_EA_AY_8;
1291   UINT32 dst = m68ki_read_8(m68k, ea);
1292   UINT32 res = src + dst;
12931293
1294   FLAG_N = NFLAG_8(res);
1295   FLAG_V = VFLAG_ADD_8(src, dst, res);
1296   FLAG_X = FLAG_C = CFLAG_8(res);
1297   FLAG_Z = MASK_OUT_ABOVE_8(res);
1294   m68k->n_flag = NFLAG_8(res);
1295   m68k->v_flag = VFLAG_ADD_8(src, dst, res);
1296   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
1297   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
12981298
1299   m68ki_write_8(ea, FLAG_Z);
1299   m68ki_write_8(m68k, ea, m68k->not_z_flag);
13001300}
13011301
13021302
13031303M68KMAKE_OP(addi, 16, ., d)
13041304{
1305   uint* r_dst = &DY;
1306   uint src = OPER_I_16();
1307   uint dst = MASK_OUT_ABOVE_16(*r_dst);
1308   uint res = src + dst;
1305   UINT32* r_dst = &DY;
1306   UINT32 src = OPER_I_16(m68k);
1307   UINT32 dst = MASK_OUT_ABOVE_16(*r_dst);
1308   UINT32 res = src + dst;
13091309
1310   FLAG_N = NFLAG_16(res);
1311   FLAG_V = VFLAG_ADD_16(src, dst, res);
1312   FLAG_X = FLAG_C = CFLAG_16(res);
1313   FLAG_Z = MASK_OUT_ABOVE_16(res);
1310   m68k->n_flag = NFLAG_16(res);
1311   m68k->v_flag = VFLAG_ADD_16(src, dst, res);
1312   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
1313   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
13141314
1315   *r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
1315   *r_dst = MASK_OUT_BELOW_16(*r_dst) | m68k->not_z_flag;
13161316}
13171317
13181318
13191319M68KMAKE_OP(addi, 16, ., .)
13201320{
1321   uint src = OPER_I_16();
1322   uint ea = M68KMAKE_GET_EA_AY_16;
1323   uint dst = m68ki_read_16(ea);
1324   uint res = src + dst;
1321   UINT32 src = OPER_I_16(m68k);
1322   UINT32 ea = M68KMAKE_GET_EA_AY_16;
1323   UINT32 dst = m68ki_read_16(m68k, ea);
1324   UINT32 res = src + dst;
13251325
1326   FLAG_N = NFLAG_16(res);
1327   FLAG_V = VFLAG_ADD_16(src, dst, res);
1328   FLAG_X = FLAG_C = CFLAG_16(res);
1329   FLAG_Z = MASK_OUT_ABOVE_16(res);
1326   m68k->n_flag = NFLAG_16(res);
1327   m68k->v_flag = VFLAG_ADD_16(src, dst, res);
1328   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
1329   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
13301330
1331   m68ki_write_16(ea, FLAG_Z);
1331   m68ki_write_16(m68k, ea, m68k->not_z_flag);
13321332}
13331333
13341334
13351335M68KMAKE_OP(addi, 32, ., d)
13361336{
1337   uint* r_dst = &DY;
1338   uint src = OPER_I_32();
1339   uint dst = *r_dst;
1340   uint res = src + dst;
1337   UINT32* r_dst = &DY;
1338   UINT32 src = OPER_I_32(m68k);
1339   UINT32 dst = *r_dst;
1340   UINT32 res = src + dst;
13411341
1342   FLAG_N = NFLAG_32(res);
1343   FLAG_V = VFLAG_ADD_32(src, dst, res);
1344   FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
1345   FLAG_Z = MASK_OUT_ABOVE_32(res);
1342   m68k->n_flag = NFLAG_32(res);
1343   m68k->v_flag = VFLAG_ADD_32(src, dst, res);
1344   m68k->x_flag = m68k->c_flag = CFLAG_ADD_32(src, dst, res);
1345   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
13461346
1347   *r_dst = FLAG_Z;
1347   *r_dst = m68k->not_z_flag;
13481348}
13491349
13501350
13511351M68KMAKE_OP(addi, 32, ., .)
13521352{
1353   uint src = OPER_I_32();
1354   uint ea = M68KMAKE_GET_EA_AY_32;
1355   uint dst = m68ki_read_32(ea);
1356   uint res = src + dst;
1353   UINT32 src = OPER_I_32(m68k);
1354   UINT32 ea = M68KMAKE_GET_EA_AY_32;
1355   UINT32 dst = m68ki_read_32(m68k, ea);
1356   UINT32 res = src + dst;
13571357
1358   FLAG_N = NFLAG_32(res);
1359   FLAG_V = VFLAG_ADD_32(src, dst, res);
1360   FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
1361   FLAG_Z = MASK_OUT_ABOVE_32(res);
1358   m68k->n_flag = NFLAG_32(res);
1359   m68k->v_flag = VFLAG_ADD_32(src, dst, res);
1360   m68k->x_flag = m68k->c_flag = CFLAG_ADD_32(src, dst, res);
1361   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
13621362
1363   m68ki_write_32(ea, FLAG_Z);
1363   m68ki_write_32(m68k, ea, m68k->not_z_flag);
13641364}
13651365
13661366
13671367M68KMAKE_OP(addq, 8, ., d)
13681368{
1369   uint* r_dst = &DY;
1370   uint src = (((REG_IR >> 9) - 1) & 7) + 1;
1371   uint dst = MASK_OUT_ABOVE_8(*r_dst);
1372   uint res = src + dst;
1369   UINT32* r_dst = &DY;
1370   UINT32 src = (((m68k->ir >> 9) - 1) & 7) + 1;
1371   UINT32 dst = MASK_OUT_ABOVE_8(*r_dst);
1372   UINT32 res = src + dst;
13731373
1374   FLAG_N = NFLAG_8(res);
1375   FLAG_V = VFLAG_ADD_8(src, dst, res);
1376   FLAG_X = FLAG_C = CFLAG_8(res);
1377   FLAG_Z = MASK_OUT_ABOVE_8(res);
1374   m68k->n_flag = NFLAG_8(res);
1375   m68k->v_flag = VFLAG_ADD_8(src, dst, res);
1376   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
1377   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
13781378
1379   *r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
1379   *r_dst = MASK_OUT_BELOW_8(*r_dst) | m68k->not_z_flag;
13801380}
13811381
13821382
13831383M68KMAKE_OP(addq, 8, ., .)
13841384{
1385   uint src = (((REG_IR >> 9) - 1) & 7) + 1;
1386   uint ea = M68KMAKE_GET_EA_AY_8;
1387   uint dst = m68ki_read_8(ea);
1388   uint res = src + dst;
1385   UINT32 src = (((m68k->ir >> 9) - 1) & 7) + 1;
1386   UINT32 ea = M68KMAKE_GET_EA_AY_8;
1387   UINT32 dst = m68ki_read_8(m68k, ea);
1388   UINT32 res = src + dst;
13891389
1390   FLAG_N = NFLAG_8(res);
1391   FLAG_V = VFLAG_ADD_8(src, dst, res);
1392   FLAG_X = FLAG_C = CFLAG_8(res);
1393   FLAG_Z = MASK_OUT_ABOVE_8(res);
1390   m68k->n_flag = NFLAG_8(res);
1391   m68k->v_flag = VFLAG_ADD_8(src, dst, res);
1392   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
1393   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
13941394
1395   m68ki_write_8(ea, FLAG_Z);
1395   m68ki_write_8(m68k, ea, m68k->not_z_flag);
13961396}
13971397
13981398
13991399M68KMAKE_OP(addq, 16, ., d)
14001400{
1401   uint* r_dst = &DY;
1402   uint src = (((REG_IR >> 9) - 1) & 7) + 1;
1403   uint dst = MASK_OUT_ABOVE_16(*r_dst);
1404   uint res = src + dst;
1401   UINT32* r_dst = &DY;
1402   UINT32 src = (((m68k->ir >> 9) - 1) & 7) + 1;
1403   UINT32 dst = MASK_OUT_ABOVE_16(*r_dst);
1404   UINT32 res = src + dst;
14051405
1406   FLAG_N = NFLAG_16(res);
1407   FLAG_V = VFLAG_ADD_16(src, dst, res);
1408   FLAG_X = FLAG_C = CFLAG_16(res);
1409   FLAG_Z = MASK_OUT_ABOVE_16(res);
1406   m68k->n_flag = NFLAG_16(res);
1407   m68k->v_flag = VFLAG_ADD_16(src, dst, res);
1408   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
1409   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
14101410
1411   *r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
1411   *r_dst = MASK_OUT_BELOW_16(*r_dst) | m68k->not_z_flag;
14121412}
14131413
14141414
14151415M68KMAKE_OP(addq, 16, ., a)
14161416{
1417   uint* r_dst = &AY;
1417   UINT32* r_dst = &AY;
14181418
1419   *r_dst = MASK_OUT_ABOVE_32(*r_dst + (((REG_IR >> 9) - 1) & 7) + 1);
1419   *r_dst = MASK_OUT_ABOVE_32(*r_dst + (((m68k->ir >> 9) - 1) & 7) + 1);
14201420}
14211421
14221422
14231423M68KMAKE_OP(addq, 16, ., .)
14241424{
1425   uint src = (((REG_IR >> 9) - 1) & 7) + 1;
1426   uint ea = M68KMAKE_GET_EA_AY_16;
1427   uint dst = m68ki_read_16(ea);
1428   uint res = src + dst;
1425   UINT32 src = (((m68k->ir >> 9) - 1) & 7) + 1;
1426   UINT32 ea = M68KMAKE_GET_EA_AY_16;
1427   UINT32 dst = m68ki_read_16(m68k, ea);
1428   UINT32 res = src + dst;
14291429
1430   FLAG_N = NFLAG_16(res);
1431   FLAG_V = VFLAG_ADD_16(src, dst, res);
1432   FLAG_X = FLAG_C = CFLAG_16(res);
1433   FLAG_Z = MASK_OUT_ABOVE_16(res);
1430   m68k->n_flag = NFLAG_16(res);
1431   m68k->v_flag = VFLAG_ADD_16(src, dst, res);
1432   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
1433   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
14341434
1435   m68ki_write_16(ea, FLAG_Z);
1435   m68ki_write_16(m68k, ea, m68k->not_z_flag);
14361436}
14371437
14381438
14391439M68KMAKE_OP(addq, 32, ., d)
14401440{
1441   uint* r_dst = &DY;
1442   uint src = (((REG_IR >> 9) - 1) & 7) + 1;
1443   uint dst = *r_dst;
1444   uint res = src + dst;
1441   UINT32* r_dst = &DY;
1442   UINT32 src = (((m68k->ir >> 9) - 1) & 7) + 1;
1443   UINT32 dst = *r_dst;
1444   UINT32 res = src + dst;
14451445
1446   FLAG_N = NFLAG_32(res);
1447   FLAG_V = VFLAG_ADD_32(src, dst, res);
1448   FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
1449   FLAG_Z = MASK_OUT_ABOVE_32(res);
1446   m68k->n_flag = NFLAG_32(res);
1447   m68k->v_flag = VFLAG_ADD_32(src, dst, res);
1448   m68k->x_flag = m68k->c_flag = CFLAG_ADD_32(src, dst, res);
1449   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
14501450
1451   *r_dst = FLAG_Z;
1451   *r_dst = m68k->not_z_flag;
14521452}
14531453
14541454
14551455M68KMAKE_OP(addq, 32, ., a)
14561456{
1457   uint* r_dst = &AY;
1457   UINT32* r_dst = &AY;
14581458
1459   *r_dst = MASK_OUT_ABOVE_32(*r_dst + (((REG_IR >> 9) - 1) & 7) + 1);
1459   *r_dst = MASK_OUT_ABOVE_32(*r_dst + (((m68k->ir >> 9) - 1) & 7) + 1);
14601460}
14611461
14621462
14631463M68KMAKE_OP(addq, 32, ., .)
14641464{
1465   uint src = (((REG_IR >> 9) - 1) & 7) + 1;
1466   uint ea = M68KMAKE_GET_EA_AY_32;
1467   uint dst = m68ki_read_32(ea);
1468   uint res = src + dst;
1465   UINT32 src = (((m68k->ir >> 9) - 1) & 7) + 1;
1466   UINT32 ea = M68KMAKE_GET_EA_AY_32;
1467   UINT32 dst = m68ki_read_32(m68k, ea);
1468   UINT32 res = src + dst;
14691469
14701470
1471   FLAG_N = NFLAG_32(res);
1472   FLAG_V = VFLAG_ADD_32(src, dst, res);
1473   FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
1474   FLAG_Z = MASK_OUT_ABOVE_32(res);
1471   m68k->n_flag = NFLAG_32(res);
1472   m68k->v_flag = VFLAG_ADD_32(src, dst, res);
1473   m68k->x_flag = m68k->c_flag = CFLAG_ADD_32(src, dst, res);
1474   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
14751475
1476   m68ki_write_32(ea, FLAG_Z);
1476   m68ki_write_32(m68k, ea, m68k->not_z_flag);
14771477}
14781478
14791479
14801480M68KMAKE_OP(addx, 8, rr, .)
14811481{
1482   uint* r_dst = &DX;
1483   uint src = MASK_OUT_ABOVE_8(DY);
1484   uint dst = MASK_OUT_ABOVE_8(*r_dst);
1485   uint res = src + dst + XFLAG_AS_1();
1482   UINT32* r_dst = &DX;
1483   UINT32 src = MASK_OUT_ABOVE_8(DY);
1484   UINT32 dst = MASK_OUT_ABOVE_8(*r_dst);
1485   UINT32 res = src + dst + XFLAG_AS_1(m68k);
14861486
1487   FLAG_N = NFLAG_8(res);
1488   FLAG_V = VFLAG_ADD_8(src, dst, res);
1489   FLAG_X = FLAG_C = CFLAG_8(res);
1487   m68k->n_flag = NFLAG_8(res);
1488   m68k->v_flag = VFLAG_ADD_8(src, dst, res);
1489   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
14901490
14911491   res = MASK_OUT_ABOVE_8(res);
1492   FLAG_Z |= res;
1492   m68k->not_z_flag |= res;
14931493
14941494   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
14951495}
r3535r3536
14971497
14981498M68KMAKE_OP(addx, 16, rr, .)
14991499{
1500   uint* r_dst = &DX;
1501   uint src = MASK_OUT_ABOVE_16(DY);
1502   uint dst = MASK_OUT_ABOVE_16(*r_dst);
1503   uint res = src + dst + XFLAG_AS_1();
1500   UINT32* r_dst = &DX;
1501   UINT32 src = MASK_OUT_ABOVE_16(DY);
1502   UINT32 dst = MASK_OUT_ABOVE_16(*r_dst);
1503   UINT32 res = src + dst + XFLAG_AS_1(m68k);
15041504
1505   FLAG_N = NFLAG_16(res);
1506   FLAG_V = VFLAG_ADD_16(src, dst, res);
1507   FLAG_X = FLAG_C = CFLAG_16(res);
1505   m68k->n_flag = NFLAG_16(res);
1506   m68k->v_flag = VFLAG_ADD_16(src, dst, res);
1507   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
15081508
15091509   res = MASK_OUT_ABOVE_16(res);
1510   FLAG_Z |= res;
1510   m68k->not_z_flag |= res;
15111511
15121512   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
15131513}
r3535r3536
15151515
15161516M68KMAKE_OP(addx, 32, rr, .)
15171517{
1518   uint* r_dst = &DX;
1519   uint src = DY;
1520   uint dst = *r_dst;
1521   uint res = src + dst + XFLAG_AS_1();
1518   UINT32* r_dst = &DX;
1519   UINT32 src = DY;
1520   UINT32 dst = *r_dst;
1521   UINT32 res = src + dst + XFLAG_AS_1(m68k);
15221522
1523   FLAG_N = NFLAG_32(res);
1524   FLAG_V = VFLAG_ADD_32(src, dst, res);
1525   FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
1523   m68k->n_flag = NFLAG_32(res);
1524   m68k->v_flag = VFLAG_ADD_32(src, dst, res);
1525   m68k->x_flag = m68k->c_flag = CFLAG_ADD_32(src, dst, res);
15261526
15271527   res = MASK_OUT_ABOVE_32(res);
1528   FLAG_Z |= res;
1528   m68k->not_z_flag |= res;
15291529
15301530   *r_dst = res;
15311531}
r3535r3536
15331533
15341534M68KMAKE_OP(addx, 8, mm, ax7)
15351535{
1536   uint src = OPER_AY_PD_8();
1537   uint ea  = EA_A7_PD_8();
1538   uint dst = m68ki_read_8(ea);
1539   uint res = src + dst + XFLAG_AS_1();
1536   UINT32 src = OPER_AY_PD_8(m68k);
1537   UINT32 ea  = EA_A7_PD_8(m68k);
1538   UINT32 dst = m68ki_read_8(m68k, ea);
1539   UINT32 res = src + dst + XFLAG_AS_1(m68k);
15401540
1541   FLAG_N = NFLAG_8(res);
1542   FLAG_V = VFLAG_ADD_8(src, dst, res);
1543   FLAG_X = FLAG_C = CFLAG_8(res);
1541   m68k->n_flag = NFLAG_8(res);
1542   m68k->v_flag = VFLAG_ADD_8(src, dst, res);
1543   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
15441544
15451545   res = MASK_OUT_ABOVE_8(res);
1546   FLAG_Z |= res;
1546   m68k->not_z_flag |= res;
15471547
1548   m68ki_write_8(ea, res);
1548   m68ki_write_8(m68k, ea, res);
15491549}
15501550
15511551
15521552M68KMAKE_OP(addx, 8, mm, ay7)
15531553{
1554   uint src = OPER_A7_PD_8();
1555   uint ea  = EA_AX_PD_8();
1556   uint dst = m68ki_read_8(ea);
1557   uint res = src + dst + XFLAG_AS_1();
1554   UINT32 src = OPER_A7_PD_8(m68k);
1555   UINT32 ea  = EA_AX_PD_8(m68k);
1556   UINT32 dst = m68ki_read_8(m68k, ea);
1557   UINT32 res = src + dst + XFLAG_AS_1(m68k);
15581558
1559   FLAG_N = NFLAG_8(res);
1560   FLAG_V = VFLAG_ADD_8(src, dst, res);
1561   FLAG_X = FLAG_C = CFLAG_8(res);
1559   m68k->n_flag = NFLAG_8(res);
1560   m68k->v_flag = VFLAG_ADD_8(src, dst, res);
1561   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
15621562
15631563   res = MASK_OUT_ABOVE_8(res);
1564   FLAG_Z |= res;
1564   m68k->not_z_flag |= res;
15651565
1566   m68ki_write_8(ea, res);
1566   m68ki_write_8(m68k, ea, res);
15671567}
15681568
15691569
15701570M68KMAKE_OP(addx, 8, mm, axy7)
15711571{
1572   uint src = OPER_A7_PD_8();
1573   uint ea  = EA_A7_PD_8();
1574   uint dst = m68ki_read_8(ea);
1575   uint res = src + dst + XFLAG_AS_1();
1572   UINT32 src = OPER_A7_PD_8(m68k);
1573   UINT32 ea  = EA_A7_PD_8(m68k);
1574   UINT32 dst = m68ki_read_8(m68k, ea);
1575   UINT32 res = src + dst + XFLAG_AS_1(m68k);
15761576
1577   FLAG_N = NFLAG_8(res);
1578   FLAG_V = VFLAG_ADD_8(src, dst, res);
1579   FLAG_X = FLAG_C = CFLAG_8(res);
1577   m68k->n_flag = NFLAG_8(res);
1578   m68k->v_flag = VFLAG_ADD_8(src, dst, res);
1579   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
15801580
15811581   res = MASK_OUT_ABOVE_8(res);
1582   FLAG_Z |= res;
1582   m68k->not_z_flag |= res;
15831583
1584   m68ki_write_8(ea, res);
1584   m68ki_write_8(m68k, ea, res);
15851585}
15861586
15871587
15881588M68KMAKE_OP(addx, 8, mm, .)
15891589{
1590   uint src = OPER_AY_PD_8();
1591   uint ea  = EA_AX_PD_8();
1592   uint dst = m68ki_read_8(ea);
1593   uint res = src + dst + XFLAG_AS_1();
1590   UINT32 src = OPER_AY_PD_8(m68k);
1591   UINT32 ea  = EA_AX_PD_8(m68k);
1592   UINT32 dst = m68ki_read_8(m68k, ea);
1593   UINT32 res = src + dst + XFLAG_AS_1(m68k);
15941594
1595   FLAG_N = NFLAG_8(res);
1596   FLAG_V = VFLAG_ADD_8(src, dst, res);
1597   FLAG_X = FLAG_C = CFLAG_8(res);
1595   m68k->n_flag = NFLAG_8(res);
1596   m68k->v_flag = VFLAG_ADD_8(src, dst, res);
1597   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
15981598
15991599   res = MASK_OUT_ABOVE_8(res);
1600   FLAG_Z |= res;
1600   m68k->not_z_flag |= res;
16011601
1602   m68ki_write_8(ea, res);
1602   m68ki_write_8(m68k, ea, res);
16031603}
16041604
16051605
16061606M68KMAKE_OP(addx, 16, mm, .)
16071607{
1608   uint src = OPER_AY_PD_16();
1609   uint ea  = EA_AX_PD_16();
1610   uint dst = m68ki_read_16(ea);
1611   uint res = src + dst + XFLAG_AS_1();
1608   UINT32 src = OPER_AY_PD_16(m68k);
1609   UINT32 ea  = EA_AX_PD_16(m68k);
1610   UINT32 dst = m68ki_read_16(m68k, ea);
1611   UINT32 res = src + dst + XFLAG_AS_1(m68k);
16121612
1613   FLAG_N = NFLAG_16(res);
1614   FLAG_V = VFLAG_ADD_16(src, dst, res);
1615   FLAG_X = FLAG_C = CFLAG_16(res);
1613   m68k->n_flag = NFLAG_16(res);
1614   m68k->v_flag = VFLAG_ADD_16(src, dst, res);
1615   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
16161616
16171617   res = MASK_OUT_ABOVE_16(res);
1618   FLAG_Z |= res;
1618   m68k->not_z_flag |= res;
16191619
1620   m68ki_write_16(ea, res);
1620   m68ki_write_16(m68k, ea, res);
16211621}
16221622
16231623
16241624M68KMAKE_OP(addx, 32, mm, .)
16251625{
1626   uint src = OPER_AY_PD_32();
1627   uint ea  = EA_AX_PD_32();
1628   uint dst = m68ki_read_32(ea);
1629   uint res = src + dst + XFLAG_AS_1();
1626   UINT32 src = OPER_AY_PD_32(m68k);
1627   UINT32 ea  = EA_AX_PD_32(m68k);
1628   UINT32 dst = m68ki_read_32(m68k, ea);
1629   UINT32 res = src + dst + XFLAG_AS_1(m68k);
16301630
1631   FLAG_N = NFLAG_32(res);
1632   FLAG_V = VFLAG_ADD_32(src, dst, res);
1633   FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
1631   m68k->n_flag = NFLAG_32(res);
1632   m68k->v_flag = VFLAG_ADD_32(src, dst, res);
1633   m68k->x_flag = m68k->c_flag = CFLAG_ADD_32(src, dst, res);
16341634
16351635   res = MASK_OUT_ABOVE_32(res);
1636   FLAG_Z |= res;
1636   m68k->not_z_flag |= res;
16371637
1638   m68ki_write_32(ea, res);
1638   m68ki_write_32(m68k, ea, res);
16391639}
16401640
16411641
16421642M68KMAKE_OP(and, 8, er, d)
16431643{
1644   FLAG_Z = MASK_OUT_ABOVE_8(DX &= (DY | 0xffffff00));
1644   m68k->not_z_flag = MASK_OUT_ABOVE_8(DX &= (DY | 0xffffff00));
16451645
1646   FLAG_N = NFLAG_8(FLAG_Z);
1647   FLAG_C = CFLAG_CLEAR;
1648   FLAG_V = VFLAG_CLEAR;
1646   m68k->n_flag = NFLAG_8(m68k->not_z_flag);
1647   m68k->c_flag = CFLAG_CLEAR;
1648   m68k->v_flag = VFLAG_CLEAR;
16491649}
16501650
16511651
16521652M68KMAKE_OP(and, 8, er, .)
16531653{
1654   FLAG_Z = MASK_OUT_ABOVE_8(DX &= (M68KMAKE_GET_OPER_AY_8 | 0xffffff00));
1654   m68k->not_z_flag = MASK_OUT_ABOVE_8(DX &= (M68KMAKE_GET_OPER_AY_8 | 0xffffff00));
16551655
1656   FLAG_N = NFLAG_8(FLAG_Z);
1657   FLAG_C = CFLAG_CLEAR;
1658   FLAG_V = VFLAG_CLEAR;
1656   m68k->n_flag = NFLAG_8(m68k->not_z_flag);
1657   m68k->c_flag = CFLAG_CLEAR;
1658   m68k->v_flag = VFLAG_CLEAR;
16591659}
16601660
16611661
16621662M68KMAKE_OP(and, 16, er, d)
16631663{
1664   FLAG_Z = MASK_OUT_ABOVE_16(DX &= (DY | 0xffff0000));
1664   m68k->not_z_flag = MASK_OUT_ABOVE_16(DX &= (DY | 0xffff0000));
16651665
1666   FLAG_N = NFLAG_16(FLAG_Z);
1667   FLAG_C = CFLAG_CLEAR;
1668   FLAG_V = VFLAG_CLEAR;
1666   m68k->n_flag = NFLAG_16(m68k->not_z_flag);
1667   m68k->c_flag = CFLAG_CLEAR;
1668   m68k->v_flag = VFLAG_CLEAR;
16691669}
16701670
16711671
16721672M68KMAKE_OP(and, 16, er, .)
16731673{
1674   FLAG_Z = MASK_OUT_ABOVE_16(DX &= (M68KMAKE_GET_OPER_AY_16 | 0xffff0000));
1674   m68k->not_z_flag = MASK_OUT_ABOVE_16(DX &= (M68KMAKE_GET_OPER_AY_16 | 0xffff0000));
16751675
1676   FLAG_N = NFLAG_16(FLAG_Z);
1677   FLAG_C = CFLAG_CLEAR;
1678   FLAG_V = VFLAG_CLEAR;
1676   m68k->n_flag = NFLAG_16(m68k->not_z_flag);
1677   m68k->c_flag = CFLAG_CLEAR;
1678   m68k->v_flag = VFLAG_CLEAR;
16791679}
16801680
16811681
16821682M68KMAKE_OP(and, 32, er, d)
16831683{
1684   FLAG_Z = DX &= DY;
1684   m68k->not_z_flag = DX &= DY;
16851685
1686   FLAG_N = NFLAG_32(FLAG_Z);
1687   FLAG_C = CFLAG_CLEAR;
1688   FLAG_V = VFLAG_CLEAR;
1686   m68k->n_flag = NFLAG_32(m68k->not_z_flag);
1687   m68k->c_flag = CFLAG_CLEAR;
1688   m68k->v_flag = VFLAG_CLEAR;
16891689}
16901690
16911691
16921692M68KMAKE_OP(and, 32, er, .)
16931693{
1694   FLAG_Z = DX &= M68KMAKE_GET_OPER_AY_32;
1694   m68k->not_z_flag = DX &= M68KMAKE_GET_OPER_AY_32;
16951695
1696   FLAG_N = NFLAG_32(FLAG_Z);
1697   FLAG_C = CFLAG_CLEAR;
1698   FLAG_V = VFLAG_CLEAR;
1696   m68k->n_flag = NFLAG_32(m68k->not_z_flag);
1697   m68k->c_flag = CFLAG_CLEAR;
1698   m68k->v_flag = VFLAG_CLEAR;
16991699}
17001700
17011701
17021702M68KMAKE_OP(and, 8, re, .)
17031703{
1704   uint ea = M68KMAKE_GET_EA_AY_8;
1705   uint res = DX & m68ki_read_8(ea);
1704   UINT32 ea = M68KMAKE_GET_EA_AY_8;
1705   UINT32 res = DX & m68ki_read_8(m68k, ea);
17061706
1707   FLAG_N = NFLAG_8(res);
1708   FLAG_C = CFLAG_CLEAR;
1709   FLAG_V = VFLAG_CLEAR;
1710   FLAG_Z = MASK_OUT_ABOVE_8(res);
1707   m68k->n_flag = NFLAG_8(res);
1708   m68k->c_flag = CFLAG_CLEAR;
1709   m68k->v_flag = VFLAG_CLEAR;
1710   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
17111711
1712   m68ki_write_8(ea, FLAG_Z);
1712   m68ki_write_8(m68k, ea, m68k->not_z_flag);
17131713}
17141714
17151715
17161716M68KMAKE_OP(and, 16, re, .)
17171717{
1718   uint ea = M68KMAKE_GET_EA_AY_16;
1719   uint res = DX & m68ki_read_16(ea);
1718   UINT32 ea = M68KMAKE_GET_EA_AY_16;
1719   UINT32 res = DX & m68ki_read_16(m68k, ea);
17201720
1721   FLAG_N = NFLAG_16(res);
1722   FLAG_C = CFLAG_CLEAR;
1723   FLAG_V = VFLAG_CLEAR;
1724   FLAG_Z = MASK_OUT_ABOVE_16(res);
1721   m68k->n_flag = NFLAG_16(res);
1722   m68k->c_flag = CFLAG_CLEAR;
1723   m68k->v_flag = VFLAG_CLEAR;
1724   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
17251725
1726   m68ki_write_16(ea, FLAG_Z);
1726   m68ki_write_16(m68k, ea, m68k->not_z_flag);
17271727}
17281728
17291729
17301730M68KMAKE_OP(and, 32, re, .)
17311731{
1732   uint ea = M68KMAKE_GET_EA_AY_32;
1733   uint res = DX & m68ki_read_32(ea);
1732   UINT32 ea = M68KMAKE_GET_EA_AY_32;
1733   UINT32 res = DX & m68ki_read_32(m68k, ea);
17341734
1735   FLAG_N = NFLAG_32(res);
1736   FLAG_Z = res;
1737   FLAG_C = CFLAG_CLEAR;
1738   FLAG_V = VFLAG_CLEAR;
1735   m68k->n_flag = NFLAG_32(res);
1736   m68k->not_z_flag = res;
1737   m68k->c_flag = CFLAG_CLEAR;
1738   m68k->v_flag = VFLAG_CLEAR;
17391739
1740   m68ki_write_32(ea, res);
1740   m68ki_write_32(m68k, ea, res);
17411741}
17421742
17431743
17441744M68KMAKE_OP(andi, 8, ., d)
17451745{
1746   FLAG_Z = MASK_OUT_ABOVE_8(DY &= (OPER_I_8() | 0xffffff00));
1746   m68k->not_z_flag = MASK_OUT_ABOVE_8(DY &= (OPER_I_8(m68k) | 0xffffff00));
17471747
1748   FLAG_N = NFLAG_8(FLAG_Z);
1749   FLAG_C = CFLAG_CLEAR;
1750   FLAG_V = VFLAG_CLEAR;
1748   m68k->n_flag = NFLAG_8(m68k->not_z_flag);
1749   m68k->c_flag = CFLAG_CLEAR;
1750   m68k->v_flag = VFLAG_CLEAR;
17511751}
17521752
17531753
17541754M68KMAKE_OP(andi, 8, ., .)
17551755{
1756   uint src = OPER_I_8();
1757   uint ea = M68KMAKE_GET_EA_AY_8;
1758   uint res = src & m68ki_read_8(ea);
1756   UINT32 src = OPER_I_8(m68k);
1757   UINT32 ea = M68KMAKE_GET_EA_AY_8;
1758   UINT32 res = src & m68ki_read_8(m68k, ea);
17591759
1760   FLAG_N = NFLAG_8(res);
1761   FLAG_Z = res;
1762   FLAG_C = CFLAG_CLEAR;
1763   FLAG_V = VFLAG_CLEAR;
1760   m68k->n_flag = NFLAG_8(res);
1761   m68k->not_z_flag = res;
1762   m68k->c_flag = CFLAG_CLEAR;
1763   m68k->v_flag = VFLAG_CLEAR;
17641764
1765   m68ki_write_8(ea, res);
1765   m68ki_write_8(m68k, ea, res);
17661766}
17671767
17681768
17691769M68KMAKE_OP(andi, 16, ., d)
17701770{
1771   FLAG_Z = MASK_OUT_ABOVE_16(DY &= (OPER_I_16() | 0xffff0000));
1771   m68k->not_z_flag = MASK_OUT_ABOVE_16(DY &= (OPER_I_16(m68k) | 0xffff0000));
17721772
1773   FLAG_N = NFLAG_16(FLAG_Z);
1774   FLAG_C = CFLAG_CLEAR;
1775   FLAG_V = VFLAG_CLEAR;
1773   m68k->n_flag = NFLAG_16(m68k->not_z_flag);
1774   m68k->c_flag = CFLAG_CLEAR;
1775   m68k->v_flag = VFLAG_CLEAR;
17761776}
17771777
17781778
17791779M68KMAKE_OP(andi, 16, ., .)
17801780{
1781   uint src = OPER_I_16();
1782   uint ea = M68KMAKE_GET_EA_AY_16;
1783   uint res = src & m68ki_read_16(ea);
1781   UINT32 src = OPER_I_16(m68k);
1782   UINT32 ea = M68KMAKE_GET_EA_AY_16;
1783   UINT32 res = src & m68ki_read_16(m68k, ea);
17841784
1785   FLAG_N = NFLAG_16(res);
1786   FLAG_Z = res;
1787   FLAG_C = CFLAG_CLEAR;
1788   FLAG_V = VFLAG_CLEAR;
1785   m68k->n_flag = NFLAG_16(res);
1786   m68k->not_z_flag = res;
1787   m68k->c_flag = CFLAG_CLEAR;
1788   m68k->v_flag = VFLAG_CLEAR;
17891789
1790   m68ki_write_16(ea, res);
1790   m68ki_write_16(m68k, ea, res);
17911791}
17921792
17931793
17941794M68KMAKE_OP(andi, 32, ., d)
17951795{
1796   FLAG_Z = DY &= (OPER_I_32());
1796   m68k->not_z_flag = DY &= (OPER_I_32(m68k));
17971797
1798   FLAG_N = NFLAG_32(FLAG_Z);
1799   FLAG_C = CFLAG_CLEAR;
1800   FLAG_V = VFLAG_CLEAR;
1798   m68k->n_flag = NFLAG_32(m68k->not_z_flag);
1799   m68k->c_flag = CFLAG_CLEAR;
1800   m68k->v_flag = VFLAG_CLEAR;
18011801}
18021802
18031803
18041804M68KMAKE_OP(andi, 32, ., .)
18051805{
1806   uint src = OPER_I_32();
1807   uint ea = M68KMAKE_GET_EA_AY_32;
1808   uint res = src & m68ki_read_32(ea);
1806   UINT32 src = OPER_I_32(m68k);
1807   UINT32 ea = M68KMAKE_GET_EA_AY_32;
1808   UINT32 res = src & m68ki_read_32(m68k, ea);
18091809
1810   FLAG_N = NFLAG_32(res);
1811   FLAG_Z = res;
1812   FLAG_C = CFLAG_CLEAR;
1813   FLAG_V = VFLAG_CLEAR;
1810   m68k->n_flag = NFLAG_32(res);
1811   m68k->not_z_flag = res;
1812   m68k->c_flag = CFLAG_CLEAR;
1813   m68k->v_flag = VFLAG_CLEAR;
18141814
1815   m68ki_write_32(ea, res);
1815   m68ki_write_32(m68k, ea, res);
18161816}
18171817
18181818
18191819M68KMAKE_OP(andi, 16, toc, .)
18201820{
1821   m68ki_set_ccr(m68ki_get_ccr() & OPER_I_16());
1821   m68ki_set_ccr(m68k, m68ki_get_ccr(m68k) & OPER_I_16(m68k));
18221822}
18231823
18241824
18251825M68KMAKE_OP(andi, 16, tos, .)
18261826{
1827   if(FLAG_S)
1827   if(m68k->s_flag)
18281828   {
1829      uint src = OPER_I_16();
1829      UINT32 src = OPER_I_16(m68k);
18301830      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
1831      m68ki_set_sr(m68ki_get_sr() & src);
1831      m68ki_set_sr(m68k, m68ki_get_sr(m68k) & src);
18321832      return;
18331833   }
1834   m68ki_exception_privilege_violation();
1834   m68ki_exception_privilege_violation(m68k);
18351835}
18361836
18371837
18381838M68KMAKE_OP(asr, 8, s, .)
18391839{
1840   uint* r_dst = &DY;
1841   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
1842   uint src = MASK_OUT_ABOVE_8(*r_dst);
1843   uint res = src >> shift;
1840   UINT32* r_dst = &DY;
1841   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
1842   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
1843   UINT32 res = src >> shift;
18441844
18451845   if(shift != 0)
1846      USE_CYCLES(shift<<CYC_SHIFT);
1846      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
18471847
18481848   if(GET_MSB_8(src))
18491849      res |= m68ki_shift_8_table[shift];
18501850
18511851   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
18521852
1853   FLAG_N = NFLAG_8(res);
1854   FLAG_Z = res;
1855   FLAG_V = VFLAG_CLEAR;
1856   FLAG_X = FLAG_C = src << (9-shift);
1853   m68k->n_flag = NFLAG_8(res);
1854   m68k->not_z_flag = res;
1855   m68k->v_flag = VFLAG_CLEAR;
1856   m68k->x_flag = m68k->c_flag = src << (9-shift);
18571857}
18581858
18591859
18601860M68KMAKE_OP(asr, 16, s, .)
18611861{
1862   uint* r_dst = &DY;
1863   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
1864   uint src = MASK_OUT_ABOVE_16(*r_dst);
1865   uint res = src >> shift;
1862   UINT32* r_dst = &DY;
1863   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
1864   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
1865   UINT32 res = src >> shift;
18661866
18671867   if(shift != 0)
1868      USE_CYCLES(shift<<CYC_SHIFT);
1868      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
18691869
18701870   if(GET_MSB_16(src))
18711871      res |= m68ki_shift_16_table[shift];
18721872
18731873   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
18741874
1875   FLAG_N = NFLAG_16(res);
1876   FLAG_Z = res;
1877   FLAG_V = VFLAG_CLEAR;
1878   FLAG_X = FLAG_C = src << (9-shift);
1875   m68k->n_flag = NFLAG_16(res);
1876   m68k->not_z_flag = res;
1877   m68k->v_flag = VFLAG_CLEAR;
1878   m68k->x_flag = m68k->c_flag = src << (9-shift);
18791879}
18801880
18811881
18821882M68KMAKE_OP(asr, 32, s, .)
18831883{
1884   uint* r_dst = &DY;
1885   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
1886   uint src = *r_dst;
1887   uint res = src >> shift;
1884   UINT32* r_dst = &DY;
1885   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
1886   UINT32 src = *r_dst;
1887   UINT32 res = src >> shift;
18881888
18891889   if(shift != 0)
1890      USE_CYCLES(shift<<CYC_SHIFT);
1890      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
18911891
18921892   if(GET_MSB_32(src))
18931893      res |= m68ki_shift_32_table[shift];
18941894
18951895   *r_dst = res;
18961896
1897   FLAG_N = NFLAG_32(res);
1898   FLAG_Z = res;
1899   FLAG_V = VFLAG_CLEAR;
1900   FLAG_X = FLAG_C = src << (9-shift);
1897   m68k->n_flag = NFLAG_32(res);
1898   m68k->not_z_flag = res;
1899   m68k->v_flag = VFLAG_CLEAR;
1900   m68k->x_flag = m68k->c_flag = src << (9-shift);
19011901}
19021902
19031903
19041904M68KMAKE_OP(asr, 8, r, .)
19051905{
1906   uint* r_dst = &DY;
1907   uint shift = DX & 0x3f;
1908   uint src = MASK_OUT_ABOVE_8(*r_dst);
1909   uint res = src >> shift;
1906   UINT32* r_dst = &DY;
1907   UINT32 shift = DX & 0x3f;
1908   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
1909   UINT32 res = src >> shift;
19101910
19111911   if(shift != 0)
19121912   {
1913      USE_CYCLES(shift<<CYC_SHIFT);
1913      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
19141914
19151915      if(shift < 8)
19161916      {
r3535r3536
19191919
19201920         *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
19211921
1922         FLAG_X = FLAG_C = src << (9-shift);
1923         FLAG_N = NFLAG_8(res);
1924         FLAG_Z = res;
1925         FLAG_V = VFLAG_CLEAR;
1922         m68k->x_flag = m68k->c_flag = src << (9-shift);
1923         m68k->n_flag = NFLAG_8(res);
1924         m68k->not_z_flag = res;
1925         m68k->v_flag = VFLAG_CLEAR;
19261926         return;
19271927      }
19281928
19291929      if(GET_MSB_8(src))
19301930      {
19311931         *r_dst |= 0xff;
1932         FLAG_C = CFLAG_SET;
1933         FLAG_X = XFLAG_SET;
1934         FLAG_N = NFLAG_SET;
1935         FLAG_Z = ZFLAG_CLEAR;
1936         FLAG_V = VFLAG_CLEAR;
1932         m68k->c_flag = CFLAG_SET;
1933         m68k->x_flag = XFLAG_SET;
1934         m68k->n_flag = NFLAG_SET;
1935         m68k->not_z_flag = ZFLAG_CLEAR;
1936         m68k->v_flag = VFLAG_CLEAR;
19371937         return;
19381938      }
19391939
19401940      *r_dst &= 0xffffff00;
1941      FLAG_C = CFLAG_CLEAR;
1942      FLAG_X = XFLAG_CLEAR;
1943      FLAG_N = NFLAG_CLEAR;
1944      FLAG_Z = ZFLAG_SET;
1945      FLAG_V = VFLAG_CLEAR;
1941      m68k->c_flag = CFLAG_CLEAR;
1942      m68k->x_flag = XFLAG_CLEAR;
1943      m68k->n_flag = NFLAG_CLEAR;
1944      m68k->not_z_flag = ZFLAG_SET;
1945      m68k->v_flag = VFLAG_CLEAR;
19461946      return;
19471947   }
19481948
1949   FLAG_C = CFLAG_CLEAR;
1950   FLAG_N = NFLAG_8(src);
1951   FLAG_Z = src;
1952   FLAG_V = VFLAG_CLEAR;
1949   m68k->c_flag = CFLAG_CLEAR;
1950   m68k->n_flag = NFLAG_8(src);
1951   m68k->not_z_flag = src;
1952   m68k->v_flag = VFLAG_CLEAR;
19531953}
19541954
19551955
19561956M68KMAKE_OP(asr, 16, r, .)
19571957{
1958   uint* r_dst = &DY;
1959   uint shift = DX & 0x3f;
1960   uint src = MASK_OUT_ABOVE_16(*r_dst);
1961   uint res = src >> shift;
1958   UINT32* r_dst = &DY;
1959   UINT32 shift = DX & 0x3f;
1960   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
1961   UINT32 res = src >> shift;
19621962
19631963   if(shift != 0)
19641964   {
1965      USE_CYCLES(shift<<CYC_SHIFT);
1965      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
19661966
19671967      if(shift < 16)
19681968      {
r3535r3536
19711971
19721972         *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
19731973
1974         FLAG_C = FLAG_X = (src >> (shift - 1))<<8;
1975         FLAG_N = NFLAG_16(res);
1976         FLAG_Z = res;
1977         FLAG_V = VFLAG_CLEAR;
1974         m68k->c_flag = m68k->x_flag = (src >> (shift - 1))<<8;
1975         m68k->n_flag = NFLAG_16(res);
1976         m68k->not_z_flag = res;
1977         m68k->v_flag = VFLAG_CLEAR;
19781978         return;
19791979      }
19801980
19811981      if(GET_MSB_16(src))
19821982      {
19831983         *r_dst |= 0xffff;
1984         FLAG_C = CFLAG_SET;
1985         FLAG_X = XFLAG_SET;
1986         FLAG_N = NFLAG_SET;
1987         FLAG_Z = ZFLAG_CLEAR;
1988         FLAG_V = VFLAG_CLEAR;
1984         m68k->c_flag = CFLAG_SET;
1985         m68k->x_flag = XFLAG_SET;
1986         m68k->n_flag = NFLAG_SET;
1987         m68k->not_z_flag = ZFLAG_CLEAR;
1988         m68k->v_flag = VFLAG_CLEAR;
19891989         return;
19901990      }
19911991
19921992      *r_dst &= 0xffff0000;
1993      FLAG_C = CFLAG_CLEAR;
1994      FLAG_X = XFLAG_CLEAR;
1995      FLAG_N = NFLAG_CLEAR;
1996      FLAG_Z = ZFLAG_SET;
1997      FLAG_V = VFLAG_CLEAR;
1993      m68k->c_flag = CFLAG_CLEAR;
1994      m68k->x_flag = XFLAG_CLEAR;
1995      m68k->n_flag = NFLAG_CLEAR;
1996      m68k->not_z_flag = ZFLAG_SET;
1997      m68k->v_flag = VFLAG_CLEAR;
19981998      return;
19991999   }
20002000
2001   FLAG_C = CFLAG_CLEAR;
2002   FLAG_N = NFLAG_16(src);
2003   FLAG_Z = src;
2004   FLAG_V = VFLAG_CLEAR;
2001   m68k->c_flag = CFLAG_CLEAR;
2002   m68k->n_flag = NFLAG_16(src);
2003   m68k->not_z_flag = src;
2004   m68k->v_flag = VFLAG_CLEAR;
20052005}
20062006
20072007
20082008M68KMAKE_OP(asr, 32, r, .)
20092009{
2010   uint* r_dst = &DY;
2011   uint shift = DX & 0x3f;
2012   uint src = *r_dst;
2013   uint res = src >> shift;
2010   UINT32* r_dst = &DY;
2011   UINT32 shift = DX & 0x3f;
2012   UINT32 src = *r_dst;
2013   UINT32 res = src >> shift;
20142014
20152015   if(shift != 0)
20162016   {
2017      USE_CYCLES(shift<<CYC_SHIFT);
2017      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
20182018
20192019      if(shift < 32)
20202020      {
r3535r3536
20232023
20242024         *r_dst = res;
20252025
2026         FLAG_C = FLAG_X = (src >> (shift - 1))<<8;
2027         FLAG_N = NFLAG_32(res);
2028         FLAG_Z = res;
2029         FLAG_V = VFLAG_CLEAR;
2026         m68k->c_flag = m68k->x_flag = (src >> (shift - 1))<<8;
2027         m68k->n_flag = NFLAG_32(res);
2028         m68k->not_z_flag = res;
2029         m68k->v_flag = VFLAG_CLEAR;
20302030         return;
20312031      }
20322032
20332033      if(GET_MSB_32(src))
20342034      {
20352035         *r_dst = 0xffffffff;
2036         FLAG_C = CFLAG_SET;
2037         FLAG_X = XFLAG_SET;
2038         FLAG_N = NFLAG_SET;
2039         FLAG_Z = ZFLAG_CLEAR;
2040         FLAG_V = VFLAG_CLEAR;
2036         m68k->c_flag = CFLAG_SET;
2037         m68k->x_flag = XFLAG_SET;
2038         m68k->n_flag = NFLAG_SET;
2039         m68k->not_z_flag = ZFLAG_CLEAR;
2040         m68k->v_flag = VFLAG_CLEAR;
20412041         return;
20422042      }
20432043
20442044      *r_dst = 0;
2045      FLAG_C = CFLAG_CLEAR;
2046      FLAG_X = XFLAG_CLEAR;
2047      FLAG_N = NFLAG_CLEAR;
2048      FLAG_Z = ZFLAG_SET;
2049      FLAG_V = VFLAG_CLEAR;
2045      m68k->c_flag = CFLAG_CLEAR;
2046      m68k->x_flag = XFLAG_CLEAR;
2047      m68k->n_flag = NFLAG_CLEAR;
2048      m68k->not_z_flag = ZFLAG_SET;
2049      m68k->v_flag = VFLAG_CLEAR;
20502050      return;
20512051   }
20522052
2053   FLAG_C = CFLAG_CLEAR;
2054   FLAG_N = NFLAG_32(src);
2055   FLAG_Z = src;
2056   FLAG_V = VFLAG_CLEAR;
2053   m68k->c_flag = CFLAG_CLEAR;
2054   m68k->n_flag = NFLAG_32(src);
2055   m68k->not_z_flag = src;
2056   m68k->v_flag = VFLAG_CLEAR;
20572057}
20582058
20592059
20602060M68KMAKE_OP(asr, 16, ., .)
20612061{
2062   uint ea = M68KMAKE_GET_EA_AY_16;
2063   uint src = m68ki_read_16(ea);
2064   uint res = src >> 1;
2062   UINT32 ea = M68KMAKE_GET_EA_AY_16;
2063   UINT32 src = m68ki_read_16(m68k, ea);
2064   UINT32 res = src >> 1;
20652065
20662066   if(GET_MSB_16(src))
20672067      res |= 0x8000;
20682068
2069   m68ki_write_16(ea, res);
2069   m68ki_write_16(m68k, ea, res);
20702070
2071   FLAG_N = NFLAG_16(res);
2072   FLAG_Z = res;
2073   FLAG_V = VFLAG_CLEAR;
2074   FLAG_C = FLAG_X = src << 8;
2071   m68k->n_flag = NFLAG_16(res);
2072   m68k->not_z_flag = res;
2073   m68k->v_flag = VFLAG_CLEAR;
2074   m68k->c_flag = m68k->x_flag = src << 8;
20752075}
20762076
20772077
20782078M68KMAKE_OP(asl, 8, s, .)
20792079{
2080   uint* r_dst = &DY;
2081   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
2082   uint src = MASK_OUT_ABOVE_8(*r_dst);
2083   uint res = MASK_OUT_ABOVE_8(src << shift);
2080   UINT32* r_dst = &DY;
2081   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
2082   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
2083   UINT32 res = MASK_OUT_ABOVE_8(src << shift);
20842084
20852085   if(shift != 0)
2086      USE_CYCLES(shift<<CYC_SHIFT);
2086      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
20872087
20882088   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
20892089
2090   FLAG_X = FLAG_C = src << shift;
2091   FLAG_N = NFLAG_8(res);
2092   FLAG_Z = res;
2090   m68k->x_flag = m68k->c_flag = src << shift;
2091   m68k->n_flag = NFLAG_8(res);
2092   m68k->not_z_flag = res;
20932093   src &= m68ki_shift_8_table[shift + 1];
2094   FLAG_V = (!(src == 0 || (src == m68ki_shift_8_table[shift + 1] && shift < 8)))<<7;
2094   m68k->v_flag = (!(src == 0 || (src == m68ki_shift_8_table[shift + 1] && shift < 8)))<<7;
20952095}
20962096
20972097
20982098M68KMAKE_OP(asl, 16, s, .)
20992099{
2100   uint* r_dst = &DY;
2101   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
2102   uint src = MASK_OUT_ABOVE_16(*r_dst);
2103   uint res = MASK_OUT_ABOVE_16(src << shift);
2100   UINT32* r_dst = &DY;
2101   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
2102   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
2103   UINT32 res = MASK_OUT_ABOVE_16(src << shift);
21042104
21052105   if(shift != 0)
2106      USE_CYCLES(shift<<CYC_SHIFT);
2106      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
21072107
21082108   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
21092109
2110   FLAG_N = NFLAG_16(res);
2111   FLAG_Z = res;
2112   FLAG_X = FLAG_C = src >> (8-shift);
2110   m68k->n_flag = NFLAG_16(res);
2111   m68k->not_z_flag = res;
2112   m68k->x_flag = m68k->c_flag = src >> (8-shift);
21132113   src &= m68ki_shift_16_table[shift + 1];
2114   FLAG_V = (!(src == 0 || src == m68ki_shift_16_table[shift + 1]))<<7;
2114   m68k->v_flag = (!(src == 0 || src == m68ki_shift_16_table[shift + 1]))<<7;
21152115}
21162116
21172117
21182118M68KMAKE_OP(asl, 32, s, .)
21192119{
2120   uint* r_dst = &DY;
2121   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
2122   uint src = *r_dst;
2123   uint res = MASK_OUT_ABOVE_32(src << shift);
2120   UINT32* r_dst = &DY;
2121   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
2122   UINT32 src = *r_dst;
2123   UINT32 res = MASK_OUT_ABOVE_32(src << shift);
21242124
21252125   if(shift != 0)
2126      USE_CYCLES(shift<<CYC_SHIFT);
2126      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
21272127
21282128   *r_dst = res;
21292129
2130   FLAG_N = NFLAG_32(res);
2131   FLAG_Z = res;
2132   FLAG_X = FLAG_C = src >> (24-shift);
2130   m68k->n_flag = NFLAG_32(res);
2131   m68k->not_z_flag = res;
2132   m68k->x_flag = m68k->c_flag = src >> (24-shift);
21332133   src &= m68ki_shift_32_table[shift + 1];
2134   FLAG_V = (!(src == 0 || src == m68ki_shift_32_table[shift + 1]))<<7;
2134   m68k->v_flag = (!(src == 0 || src == m68ki_shift_32_table[shift + 1]))<<7;
21352135}
21362136
21372137
21382138M68KMAKE_OP(asl, 8, r, .)
21392139{
2140   uint* r_dst = &DY;
2141   uint shift = DX & 0x3f;
2142   uint src = MASK_OUT_ABOVE_8(*r_dst);
2143   uint res = MASK_OUT_ABOVE_8(src << shift);
2140   UINT32* r_dst = &DY;
2141   UINT32 shift = DX & 0x3f;
2142   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
2143   UINT32 res = MASK_OUT_ABOVE_8(src << shift);
21442144
21452145   if(shift != 0)
21462146   {
2147      USE_CYCLES(shift<<CYC_SHIFT);
2147      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
21482148
21492149      if(shift < 8)
21502150      {
21512151         *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
2152         FLAG_X = FLAG_C = src << shift;
2153         FLAG_N = NFLAG_8(res);
2154         FLAG_Z = res;
2152         m68k->x_flag = m68k->c_flag = src << shift;
2153         m68k->n_flag = NFLAG_8(res);
2154         m68k->not_z_flag = res;
21552155         src &= m68ki_shift_8_table[shift + 1];
2156         FLAG_V = (!(src == 0 || src == m68ki_shift_8_table[shift + 1]))<<7;
2156         m68k->v_flag = (!(src == 0 || src == m68ki_shift_8_table[shift + 1]))<<7;
21572157         return;
21582158      }
21592159
21602160      *r_dst &= 0xffffff00;
2161      FLAG_X = FLAG_C = ((shift == 8 ? src & 1 : 0))<<8;
2162      FLAG_N = NFLAG_CLEAR;
2163      FLAG_Z = ZFLAG_SET;
2164      FLAG_V = (!(src == 0))<<7;
2161      m68k->x_flag = m68k->c_flag = ((shift == 8 ? src & 1 : 0))<<8;
2162      m68k->n_flag = NFLAG_CLEAR;
2163      m68k->not_z_flag = ZFLAG_SET;
2164      m68k->v_flag = (!(src == 0))<<7;
21652165      return;
21662166   }
21672167
2168   FLAG_C = CFLAG_CLEAR;
2169   FLAG_N = NFLAG_8(src);
2170   FLAG_Z = src;
2171   FLAG_V = VFLAG_CLEAR;
2168   m68k->c_flag = CFLAG_CLEAR;
2169   m68k->n_flag = NFLAG_8(src);
2170   m68k->not_z_flag = src;
2171   m68k->v_flag = VFLAG_CLEAR;
21722172}
21732173
21742174
21752175M68KMAKE_OP(asl, 16, r, .)
21762176{
2177   uint* r_dst = &DY;
2178   uint shift = DX & 0x3f;
2179   uint src = MASK_OUT_ABOVE_16(*r_dst);
2180   uint res = MASK_OUT_ABOVE_16(src << shift);
2177   UINT32* r_dst = &DY;
2178   UINT32 shift = DX & 0x3f;
2179   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
2180   UINT32 res = MASK_OUT_ABOVE_16(src << shift);
21812181
21822182   if(shift != 0)
21832183   {
2184      USE_CYCLES(shift<<CYC_SHIFT);
2184      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
21852185
21862186      if(shift < 16)
21872187      {
21882188         *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
2189         FLAG_X = FLAG_C = (src << shift) >> 8;
2190         FLAG_N = NFLAG_16(res);
2191         FLAG_Z = res;
2189         m68k->x_flag = m68k->c_flag = (src << shift) >> 8;
2190         m68k->n_flag = NFLAG_16(res);
2191         m68k->not_z_flag = res;
21922192         src &= m68ki_shift_16_table[shift + 1];
2193         FLAG_V = (!(src == 0 || src == m68ki_shift_16_table[shift + 1]))<<7;
2193         m68k->v_flag = (!(src == 0 || src == m68ki_shift_16_table[shift + 1]))<<7;
21942194         return;
21952195      }
21962196
21972197      *r_dst &= 0xffff0000;
2198      FLAG_X = FLAG_C = ((shift == 16 ? src & 1 : 0))<<8;
2199      FLAG_N = NFLAG_CLEAR;
2200      FLAG_Z = ZFLAG_SET;
2201      FLAG_V = (!(src == 0))<<7;
2198      m68k->x_flag = m68k->c_flag = ((shift == 16 ? src & 1 : 0))<<8;
2199      m68k->n_flag = NFLAG_CLEAR;
2200      m68k->not_z_flag = ZFLAG_SET;
2201      m68k->v_flag = (!(src == 0))<<7;
22022202      return;
22032203   }
22042204
2205   FLAG_C = CFLAG_CLEAR;
2206   FLAG_N = NFLAG_16(src);
2207   FLAG_Z = src;
2208   FLAG_V = VFLAG_CLEAR;
2205   m68k->c_flag = CFLAG_CLEAR;
2206   m68k->n_flag = NFLAG_16(src);
2207   m68k->not_z_flag = src;
2208   m68k->v_flag = VFLAG_CLEAR;
22092209}
22102210
22112211
22122212M68KMAKE_OP(asl, 32, r, .)
22132213{
2214   uint* r_dst = &DY;
2215   uint shift = DX & 0x3f;
2216   uint src = *r_dst;
2217   uint res = MASK_OUT_ABOVE_32(src << shift);
2214   UINT32* r_dst = &DY;
2215   UINT32 shift = DX & 0x3f;
2216   UINT32 src = *r_dst;
2217   UINT32 res = MASK_OUT_ABOVE_32(src << shift);
22182218
22192219   if(shift != 0)
22202220   {
2221      USE_CYCLES(shift<<CYC_SHIFT);
2221      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
22222222
22232223      if(shift < 32)
22242224      {
22252225         *r_dst = res;
2226         FLAG_X = FLAG_C = (src >> (32 - shift)) << 8;
2227         FLAG_N = NFLAG_32(res);
2228         FLAG_Z = res;
2226         m68k->x_flag = m68k->c_flag = (src >> (32 - shift)) << 8;
2227         m68k->n_flag = NFLAG_32(res);
2228         m68k->not_z_flag = res;
22292229         src &= m68ki_shift_32_table[shift + 1];
2230         FLAG_V = (!(src == 0 || src == m68ki_shift_32_table[shift + 1]))<<7;
2230         m68k->v_flag = (!(src == 0 || src == m68ki_shift_32_table[shift + 1]))<<7;
22312231         return;
22322232      }
22332233
22342234      *r_dst = 0;
2235      FLAG_X = FLAG_C = ((shift == 32 ? src & 1 : 0))<<8;
2236      FLAG_N = NFLAG_CLEAR;
2237      FLAG_Z = ZFLAG_SET;
2238      FLAG_V = (!(src == 0))<<7;
2235      m68k->x_flag = m68k->c_flag = ((shift == 32 ? src & 1 : 0))<<8;
2236      m68k->n_flag = NFLAG_CLEAR;
2237      m68k->not_z_flag = ZFLAG_SET;
2238      m68k->v_flag = (!(src == 0))<<7;
22392239      return;
22402240   }
22412241
2242   FLAG_C = CFLAG_CLEAR;
2243   FLAG_N = NFLAG_32(src);
2244   FLAG_Z = src;
2245   FLAG_V = VFLAG_CLEAR;
2242   m68k->c_flag = CFLAG_CLEAR;
2243   m68k->n_flag = NFLAG_32(src);
2244   m68k->not_z_flag = src;
2245   m68k->v_flag = VFLAG_CLEAR;
22462246}
22472247
22482248
22492249M68KMAKE_OP(asl, 16, ., .)
22502250{
2251   uint ea = M68KMAKE_GET_EA_AY_16;
2252   uint src = m68ki_read_16(ea);
2253   uint res = MASK_OUT_ABOVE_16(src << 1);
2251   UINT32 ea = M68KMAKE_GET_EA_AY_16;
2252   UINT32 src = m68ki_read_16(m68k, ea);
2253   UINT32 res = MASK_OUT_ABOVE_16(src << 1);
22542254
2255   m68ki_write_16(ea, res);
2255   m68ki_write_16(m68k, ea, res);
22562256
2257   FLAG_N = NFLAG_16(res);
2258   FLAG_Z = res;
2259   FLAG_X = FLAG_C = src >> 7;
2257   m68k->n_flag = NFLAG_16(res);
2258   m68k->not_z_flag = res;
2259   m68k->x_flag = m68k->c_flag = src >> 7;
22602260   src &= 0xc000;
2261   FLAG_V = (!(src == 0 || src == 0xc000))<<7;
2261   m68k->v_flag = (!(src == 0 || src == 0xc000))<<7;
22622262}
22632263
22642264
r3535r3536
22672267   if(M68KMAKE_CC)
22682268   {
22692269      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
2270      m68ki_branch_8(MASK_OUT_ABOVE_8(REG_IR));
2270      m68ki_branch_8(m68k, MASK_OUT_ABOVE_8(m68k->ir));
22712271      return;
22722272   }
2273   USE_CYCLES(CYC_BCC_NOTAKE_B);
2273   USE_CYCLES(m68k, m68k->cyc_bcc_notake_b);
22742274}
22752275
22762276
r3535r3536
22782278{
22792279   if(M68KMAKE_CC)
22802280   {
2281      uint offset = OPER_I_16();
2281      UINT32 offset = OPER_I_16(m68k);
22822282      REG_PC -= 2;
22832283      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
2284      m68ki_branch_16(offset);
2284      m68ki_branch_16(m68k, offset);
22852285      return;
22862286   }
22872287   REG_PC += 2;
2288   USE_CYCLES(CYC_BCC_NOTAKE_W);
2288   USE_CYCLES(m68k, m68k->cyc_bcc_notake_w);
22892289}
22902290
22912291
22922292M68KMAKE_OP(bcc, 32, ., .)
22932293{
2294   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2294   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
22952295   {
22962296      if(M68KMAKE_CC)
22972297      {
2298         uint offset = OPER_I_32();
2298         UINT32 offset = OPER_I_32(m68k);
22992299         REG_PC -= 4;
23002300         m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
2301         m68ki_branch_32(offset);
2301         m68ki_branch_32(m68k, offset);
23022302         return;
23032303      }
23042304      REG_PC += 4;
r3535r3536
23092309      if(M68KMAKE_CC)
23102310      {
23112311         m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
2312         m68ki_branch_8(MASK_OUT_ABOVE_8(REG_IR));
2312         m68ki_branch_8(m68k, MASK_OUT_ABOVE_8(m68k->ir));
23132313         return;
23142314      }
2315      USE_CYCLES(CYC_BCC_NOTAKE_B);
2315      USE_CYCLES(m68k, m68k->cyc_bcc_notake_b);
23162316   }
23172317}
23182318
23192319
23202320M68KMAKE_OP(bchg, 32, r, d)
23212321{
2322   uint* r_dst = &DY;
2323   uint mask = 1 << (DX & 0x1f);
2322   UINT32* r_dst = &DY;
2323   UINT32 mask = 1 << (DX & 0x1f);
23242324
2325   FLAG_Z = *r_dst & mask;
2325   m68k->not_z_flag = *r_dst & mask;
23262326   *r_dst ^= mask;
23272327}
23282328
23292329
23302330M68KMAKE_OP(bchg, 8, r, .)
23312331{
2332   uint ea = M68KMAKE_GET_EA_AY_8;
2333   uint src = m68ki_read_8(ea);
2334   uint mask = 1 << (DX & 7);
2332   UINT32 ea = M68KMAKE_GET_EA_AY_8;
2333   UINT32 src = m68ki_read_8(m68k, ea);
2334   UINT32 mask = 1 << (DX & 7);
23352335
2336   FLAG_Z = src & mask;
2337   m68ki_write_8(ea, src ^ mask);
2336   m68k->not_z_flag = src & mask;
2337   m68ki_write_8(m68k, ea, src ^ mask);
23382338}
23392339
23402340
23412341M68KMAKE_OP(bchg, 32, s, d)
23422342{
2343   uint* r_dst = &DY;
2344   uint mask = 1 << (OPER_I_8() & 0x1f);
2343   UINT32* r_dst = &DY;
2344   UINT32 mask = 1 << (OPER_I_8(m68k) & 0x1f);
23452345
2346   FLAG_Z = *r_dst & mask;
2346   m68k->not_z_flag = *r_dst & mask;
23472347   *r_dst ^= mask;
23482348}
23492349
23502350
23512351M68KMAKE_OP(bchg, 8, s, .)
23522352{
2353   uint mask = 1 << (OPER_I_8() & 7);
2354   uint ea = M68KMAKE_GET_EA_AY_8;
2355   uint src = m68ki_read_8(ea);
2353   UINT32 mask = 1 << (OPER_I_8(m68k) & 7);
2354   UINT32 ea = M68KMAKE_GET_EA_AY_8;
2355   UINT32 src = m68ki_read_8(m68k, ea);
23562356
2357   FLAG_Z = src & mask;
2358   m68ki_write_8(ea, src ^ mask);
2357   m68k->not_z_flag = src & mask;
2358   m68ki_write_8(m68k, ea, src ^ mask);
23592359}
23602360
23612361
23622362M68KMAKE_OP(bclr, 32, r, d)
23632363{
2364   uint* r_dst = &DY;
2365   uint mask = 1 << (DX & 0x1f);
2364   UINT32* r_dst = &DY;
2365   UINT32 mask = 1 << (DX & 0x1f);
23662366
2367   FLAG_Z = *r_dst & mask;
2367   m68k->not_z_flag = *r_dst & mask;
23682368   *r_dst &= ~mask;
23692369}
23702370
23712371
23722372M68KMAKE_OP(bclr, 8, r, .)
23732373{
2374   uint ea = M68KMAKE_GET_EA_AY_8;
2375   uint src = m68ki_read_8(ea);
2376   uint mask = 1 << (DX & 7);
2374   UINT32 ea = M68KMAKE_GET_EA_AY_8;
2375   UINT32 src = m68ki_read_8(m68k, ea);
2376   UINT32 mask = 1 << (DX & 7);
23772377
2378   FLAG_Z = src & mask;
2379   m68ki_write_8(ea, src & ~mask);
2378   m68k->not_z_flag = src & mask;
2379   m68ki_write_8(m68k, ea, src & ~mask);
23802380}
23812381
23822382
23832383M68KMAKE_OP(bclr, 32, s, d)
23842384{
2385   uint* r_dst = &DY;
2386   uint mask = 1 << (OPER_I_8() & 0x1f);
2385   UINT32* r_dst = &DY;
2386   UINT32 mask = 1 << (OPER_I_8(m68k) & 0x1f);
23872387
2388   FLAG_Z = *r_dst & mask;
2388   m68k->not_z_flag = *r_dst & mask;
23892389   *r_dst &= ~mask;
23902390}
23912391
23922392
23932393M68KMAKE_OP(bclr, 8, s, .)
23942394{
2395   uint mask = 1 << (OPER_I_8() & 7);
2396   uint ea = M68KMAKE_GET_EA_AY_8;
2397   uint src = m68ki_read_8(ea);
2395   UINT32 mask = 1 << (OPER_I_8(m68k) & 7);
2396   UINT32 ea = M68KMAKE_GET_EA_AY_8;
2397   UINT32 src = m68ki_read_8(m68k, ea);
23982398
2399   FLAG_Z = src & mask;
2400   m68ki_write_8(ea, src & ~mask);
2399   m68k->not_z_flag = src & mask;
2400   m68ki_write_8(m68k, ea, src & ~mask);
24012401}
24022402
24032403
24042404M68KMAKE_OP(bfchg, 32, ., d)
24052405{
2406   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2406   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
24072407   {
2408      uint word2 = OPER_I_16();
2409      uint offset = (word2>>6)&31;
2410      uint width = word2;
2411      uint* data = &DY;
2412      uint64 mask;
2408      UINT32 word2 = OPER_I_16(m68k);
2409      UINT32 offset = (word2>>6)&31;
2410      UINT32 width = word2;
2411      UINT32* data = &DY;
2412      UINT64 mask;
24132413
24142414
24152415      if(BIT_B(word2))
r3535r3536
24232423      mask = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
24242424      mask = ROR_32(mask, offset);
24252425
2426      FLAG_N = NFLAG_32(*data<<offset);
2427      FLAG_Z = *data & mask;
2428      FLAG_V = VFLAG_CLEAR;
2429      FLAG_C = CFLAG_CLEAR;
2426      m68k->n_flag = NFLAG_32(*data<<offset);
2427      m68k->not_z_flag = *data & mask;
2428      m68k->v_flag = VFLAG_CLEAR;
2429      m68k->c_flag = CFLAG_CLEAR;
24302430
24312431      *data ^= mask;
24322432
24332433      return;
24342434   }
2435   m68ki_exception_illegal();
2435   m68ki_exception_illegal(m68k);
24362436}
24372437
24382438
24392439M68KMAKE_OP(bfchg, 32, ., .)
24402440{
2441   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2441   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
24422442   {
2443      uint word2 = OPER_I_16();
2444      sint offset = (word2>>6)&31;
2445      uint width = word2;
2446      uint mask_base;
2447      uint data_long;
2448      uint mask_long;
2449      uint data_byte = 0;
2450      uint mask_byte = 0;
2451      uint ea = M68KMAKE_GET_EA_AY_8;
2443      UINT32 word2 = OPER_I_16(m68k);
2444      INT32 offset = (word2>>6)&31;
2445      UINT32 width = word2;
2446      UINT32 mask_base;
2447      UINT32 data_long;
2448      UINT32 mask_long;
2449      UINT32 data_byte = 0;
2450      UINT32 mask_byte = 0;
2451      UINT32 ea = M68KMAKE_GET_EA_AY_8;
24522452
24532453
24542454      if(BIT_B(word2))
r3535r3536
24692469      mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
24702470      mask_long = mask_base >> offset;
24712471
2472      data_long = m68ki_read_32(ea);
2473      FLAG_N = NFLAG_32(data_long << offset);
2474      FLAG_Z = data_long & mask_long;
2475      FLAG_V = VFLAG_CLEAR;
2476      FLAG_C = CFLAG_CLEAR;
2472      data_long = m68ki_read_32(m68k, ea);
2473      m68k->n_flag = NFLAG_32(data_long << offset);
2474      m68k->not_z_flag = data_long & mask_long;
2475      m68k->v_flag = VFLAG_CLEAR;
2476      m68k->c_flag = CFLAG_CLEAR;
24772477
2478      m68ki_write_32(ea, data_long ^ mask_long);
2478      m68ki_write_32(m68k, ea, data_long ^ mask_long);
24792479
24802480      if((width + offset) > 32)
24812481      {
24822482         mask_byte = MASK_OUT_ABOVE_8(mask_base);
2483         data_byte = m68ki_read_8(ea+4);
2484         FLAG_Z |= (data_byte & mask_byte);
2485         m68ki_write_8(ea+4, data_byte ^ mask_byte);
2483         data_byte = m68ki_read_8(m68k, ea+4);
2484         m68k->not_z_flag |= (data_byte & mask_byte);
2485         m68ki_write_8(m68k, ea+4, data_byte ^ mask_byte);
24862486      }
24872487      return;
24882488   }
2489   m68ki_exception_illegal();
2489   m68ki_exception_illegal(m68k);
24902490}
24912491
24922492
24932493M68KMAKE_OP(bfclr, 32, ., d)
24942494{
2495   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2495   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
24962496   {
2497      uint word2 = OPER_I_16();
2498      uint offset = (word2>>6)&31;
2499      uint width = word2;
2500      uint* data = &DY;
2501      uint64 mask;
2497      UINT32 word2 = OPER_I_16(m68k);
2498      UINT32 offset = (word2>>6)&31;
2499      UINT32 width = word2;
2500      UINT32* data = &DY;
2501      UINT64 mask;
25022502
25032503
25042504      if(BIT_B(word2))
r3535r3536
25142514      mask = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
25152515      mask = ROR_32(mask, offset);
25162516
2517      FLAG_N = NFLAG_32(*data<<offset);
2518      FLAG_Z = *data & mask;
2519      FLAG_V = VFLAG_CLEAR;
2520      FLAG_C = CFLAG_CLEAR;
2517      m68k->n_flag = NFLAG_32(*data<<offset);
2518      m68k->not_z_flag = *data & mask;
2519      m68k->v_flag = VFLAG_CLEAR;
2520      m68k->c_flag = CFLAG_CLEAR;
25212521
25222522      *data &= ~mask;
25232523
25242524      return;
25252525   }
2526   m68ki_exception_illegal();
2526   m68ki_exception_illegal(m68k);
25272527}
25282528
25292529
25302530M68KMAKE_OP(bfclr, 32, ., .)
25312531{
2532   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2532   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
25332533   {
2534      uint word2 = OPER_I_16();
2535      sint offset = (word2>>6)&31;
2536      uint width = word2;
2537      uint mask_base;
2538      uint data_long;
2539      uint mask_long;
2540      uint data_byte = 0;
2541      uint mask_byte = 0;
2542      uint ea = M68KMAKE_GET_EA_AY_8;
2534      UINT32 word2 = OPER_I_16(m68k);
2535      INT32 offset = (word2>>6)&31;
2536      UINT32 width = word2;
2537      UINT32 mask_base;
2538      UINT32 data_long;
2539      UINT32 mask_long;
2540      UINT32 data_byte = 0;
2541      UINT32 mask_byte = 0;
2542      UINT32 ea = M68KMAKE_GET_EA_AY_8;
25432543
25442544
25452545      if(BIT_B(word2))
r3535r3536
25602560      mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
25612561      mask_long = mask_base >> offset;
25622562
2563      data_long = m68ki_read_32(ea);
2564      FLAG_N = NFLAG_32(data_long << offset);
2565      FLAG_Z = data_long & mask_long;
2566      FLAG_V = VFLAG_CLEAR;
2567      FLAG_C = CFLAG_CLEAR;
2563      data_long = m68ki_read_32(m68k, ea);
2564      m68k->n_flag = NFLAG_32(data_long << offset);
2565      m68k->not_z_flag = data_long & mask_long;
2566      m68k->v_flag = VFLAG_CLEAR;
2567      m68k->c_flag = CFLAG_CLEAR;
25682568
2569      m68ki_write_32(ea, data_long & ~mask_long);
2569      m68ki_write_32(m68k, ea, data_long & ~mask_long);
25702570
25712571      if((width + offset) > 32)
25722572      {
25732573         mask_byte = MASK_OUT_ABOVE_8(mask_base);
2574         data_byte = m68ki_read_8(ea+4);
2575         FLAG_Z |= (data_byte & mask_byte);
2576         m68ki_write_8(ea+4, data_byte & ~mask_byte);
2574         data_byte = m68ki_read_8(m68k, ea+4);
2575         m68k->not_z_flag |= (data_byte & mask_byte);
2576         m68ki_write_8(m68k, ea+4, data_byte & ~mask_byte);
25772577      }
25782578      return;
25792579   }
2580   m68ki_exception_illegal();
2580   m68ki_exception_illegal(m68k);
25812581}
25822582
25832583
25842584M68KMAKE_OP(bfexts, 32, ., d)
25852585{
2586   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2586   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
25872587   {
2588      uint word2 = OPER_I_16();
2589      uint offset = (word2>>6)&31;
2590      uint width = word2;
2591      uint64 data = DY;
2588      UINT32 word2 = OPER_I_16(m68k);
2589      UINT32 offset = (word2>>6)&31;
2590      UINT32 width = word2;
2591      UINT64 data = DY;
25922592
25932593
25942594      if(BIT_B(word2))
r3535r3536
26002600      width = ((width-1) & 31) + 1;
26012601
26022602      data = ROL_32(data, offset);
2603      FLAG_N = NFLAG_32(data);
2603      m68k->n_flag = NFLAG_32(data);
26042604      data = MAKE_INT_32(data) >> (32 - width);
26052605
2606      FLAG_Z = data;
2607      FLAG_V = VFLAG_CLEAR;
2608      FLAG_C = CFLAG_CLEAR;
2606      m68k->not_z_flag = data;
2607      m68k->v_flag = VFLAG_CLEAR;
2608      m68k->c_flag = CFLAG_CLEAR;
26092609
26102610      REG_D[(word2>>12)&7] = data;
26112611
26122612      return;
26132613   }
2614   m68ki_exception_illegal();
2614   m68ki_exception_illegal(m68k);
26152615}
26162616
26172617
26182618M68KMAKE_OP(bfexts, 32, ., .)
26192619{
2620   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2620   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
26212621   {
2622      uint word2 = OPER_I_16();
2623      sint offset = (word2>>6)&31;
2624      uint width = word2;
2625      uint data;
2626      uint ea = M68KMAKE_GET_EA_AY_8;
2622      UINT32 word2 = OPER_I_16(m68k);
2623      INT32 offset = (word2>>6)&31;
2624      UINT32 width = word2;
2625      UINT32 data;
2626      UINT32 ea = M68KMAKE_GET_EA_AY_8;
26272627
26282628
26292629      if(BIT_B(word2))
r3535r3536
26412641      }
26422642      width = ((width-1) & 31) + 1;
26432643
2644      data = m68ki_read_32(ea);
2644      data = m68ki_read_32(m68k, ea);
26452645
26462646      data = MASK_OUT_ABOVE_32(data<<offset);
26472647
26482648      if((offset+width) > 32)
2649         data |= (m68ki_read_8(ea+4) << offset) >> 8;
2649         data |= (m68ki_read_8(m68k, ea+4) << offset) >> 8;
26502650
2651      FLAG_N = NFLAG_32(data);
2651      m68k->n_flag = NFLAG_32(data);
26522652      data  = MAKE_INT_32(data) >> (32 - width);
26532653
2654      FLAG_Z = data;
2655      FLAG_V = VFLAG_CLEAR;
2656      FLAG_C = CFLAG_CLEAR;
2654      m68k->not_z_flag = data;
2655      m68k->v_flag = VFLAG_CLEAR;
2656      m68k->c_flag = CFLAG_CLEAR;
26572657
26582658      REG_D[(word2 >> 12) & 7] = data;
26592659
26602660      return;
26612661   }
2662   m68ki_exception_illegal();
2662   m68ki_exception_illegal(m68k);
26632663}
26642664
26652665
26662666M68KMAKE_OP(bfextu, 32, ., d)
26672667{
2668   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2668   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
26692669   {
2670      uint word2 = OPER_I_16();
2671      uint offset = (word2>>6)&31;
2672      uint width = word2;
2673      uint64 data = DY;
2670      UINT32 word2 = OPER_I_16(m68k);
2671      UINT32 offset = (word2>>6)&31;
2672      UINT32 width = word2;
2673      UINT64 data = DY;
26742674
26752675
26762676      if(BIT_B(word2))
r3535r3536
26822682      width = ((width-1) & 31) + 1;
26832683
26842684      data = ROL_32(data, offset);
2685      FLAG_N = NFLAG_32(data);
2685      m68k->n_flag = NFLAG_32(data);
26862686      data >>= 32 - width;
26872687
2688      FLAG_Z = data;
2689      FLAG_V = VFLAG_CLEAR;
2690      FLAG_C = CFLAG_CLEAR;
2688      m68k->not_z_flag = data;
2689      m68k->v_flag = VFLAG_CLEAR;
2690      m68k->c_flag = CFLAG_CLEAR;
26912691
26922692      REG_D[(word2>>12)&7] = data;
26932693
26942694      return;
26952695   }
2696   m68ki_exception_illegal();
2696   m68ki_exception_illegal(m68k);
26972697}
26982698
26992699
27002700M68KMAKE_OP(bfextu, 32, ., .)
27012701{
2702   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2702   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
27032703   {
2704      uint word2 = OPER_I_16();
2705      sint offset = (word2>>6)&31;
2706      uint width = word2;
2707      uint data;
2708      uint ea = M68KMAKE_GET_EA_AY_8;
2704      UINT32 word2 = OPER_I_16(m68k);
2705      INT32 offset = (word2>>6)&31;
2706      UINT32 width = word2;
2707      UINT32 data;
2708      UINT32 ea = M68KMAKE_GET_EA_AY_8;
27092709
27102710
27112711      if(BIT_B(word2))
r3535r3536
27232723      }
27242724      width = ((width-1) & 31) + 1;
27252725
2726      data = m68ki_read_32(ea);
2726      data = m68ki_read_32(m68k, ea);
27272727      data = MASK_OUT_ABOVE_32(data<<offset);
27282728
27292729      if((offset+width) > 32)
2730         data |= (m68ki_read_8(ea+4) << offset) >> 8;
2730         data |= (m68ki_read_8(m68k, ea+4) << offset) >> 8;
27312731
2732      FLAG_N = NFLAG_32(data);
2732      m68k->n_flag = NFLAG_32(data);
27332733      data  >>= (32 - width);
27342734
2735      FLAG_Z = data;
2736      FLAG_V = VFLAG_CLEAR;
2737      FLAG_C = CFLAG_CLEAR;
2735      m68k->not_z_flag = data;
2736      m68k->v_flag = VFLAG_CLEAR;
2737      m68k->c_flag = CFLAG_CLEAR;
27382738
27392739      REG_D[(word2 >> 12) & 7] = data;
27402740
27412741      return;
27422742   }
2743   m68ki_exception_illegal();
2743   m68ki_exception_illegal(m68k);
27442744}
27452745
27462746
27472747M68KMAKE_OP(bfffo, 32, ., d)
27482748{
2749   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2749   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
27502750   {
2751      uint word2 = OPER_I_16();
2752      uint offset = (word2>>6)&31;
2753      uint width = word2;
2754      uint64 data = DY;
2755      uint bit;
2751      UINT32 word2 = OPER_I_16(m68k);
2752      UINT32 offset = (word2>>6)&31;
2753      UINT32 width = word2;
2754      UINT64 data = DY;
2755      UINT32 bit;
27562756
27572757
27582758      if(BIT_B(word2))
r3535r3536
27642764      width = ((width-1) & 31) + 1;
27652765
27662766      data = ROL_32(data, offset);
2767      FLAG_N = NFLAG_32(data);
2767      m68k->n_flag = NFLAG_32(data);
27682768      data >>= 32 - width;
27692769
2770      FLAG_Z = data;
2771      FLAG_V = VFLAG_CLEAR;
2772      FLAG_C = CFLAG_CLEAR;
2770      m68k->not_z_flag = data;
2771      m68k->v_flag = VFLAG_CLEAR;
2772      m68k->c_flag = CFLAG_CLEAR;
27732773
27742774      for(bit = 1<<(width-1);bit && !(data & bit);bit>>= 1)
27752775         offset++;
r3535r3536
27782778
27792779      return;
27802780   }
2781   m68ki_exception_illegal();
2781   m68ki_exception_illegal(m68k);
27822782}
27832783
27842784
27852785M68KMAKE_OP(bfffo, 32, ., .)
27862786{
2787   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2787   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
27882788   {
2789      uint word2 = OPER_I_16();
2790      sint offset = (word2>>6)&31;
2791      sint local_offset;
2792      uint width = word2;
2793      uint data;
2794      uint bit;
2795      uint ea = M68KMAKE_GET_EA_AY_8;
2789      UINT32 word2 = OPER_I_16(m68k);
2790      INT32 offset = (word2>>6)&31;
2791      INT32 local_offset;
2792      UINT32 width = word2;
2793      UINT32 data;
2794      UINT32 bit;
2795      UINT32 ea = M68KMAKE_GET_EA_AY_8;
27962796
27972797
27982798      if(BIT_B(word2))
r3535r3536
28102810      }
28112811      width = ((width-1) & 31) + 1;
28122812
2813      data = m68ki_read_32(ea);
2813      data = m68ki_read_32(m68k, ea);
28142814      data = MASK_OUT_ABOVE_32(data<<local_offset);
28152815
28162816      if((local_offset+width) > 32)
2817         data |= (m68ki_read_8(ea+4) << local_offset) >> 8;
2817         data |= (m68ki_read_8(m68k, ea+4) << local_offset) >> 8;
28182818
2819      FLAG_N = NFLAG_32(data);
2819      m68k->n_flag = NFLAG_32(data);
28202820      data  >>= (32 - width);
28212821
2822      FLAG_Z = data;
2823      FLAG_V = VFLAG_CLEAR;
2824      FLAG_C = CFLAG_CLEAR;
2822      m68k->not_z_flag = data;
2823      m68k->v_flag = VFLAG_CLEAR;
2824      m68k->c_flag = CFLAG_CLEAR;
28252825
28262826      for(bit = 1<<(width-1);bit && !(data & bit);bit>>= 1)
28272827         offset++;
r3535r3536
28302830
28312831      return;
28322832   }
2833   m68ki_exception_illegal();
2833   m68ki_exception_illegal(m68k);
28342834}
28352835
28362836
28372837M68KMAKE_OP(bfins, 32, ., d)
28382838{
2839   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2839   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
28402840   {
2841      uint word2 = OPER_I_16();
2842      uint offset = (word2>>6)&31;
2843      uint width = word2;
2844      uint* data = &DY;
2845      uint64 mask;
2846      uint64 insert = REG_D[(word2>>12)&7];
2841      UINT32 word2 = OPER_I_16(m68k);
2842      UINT32 offset = (word2>>6)&31;
2843      UINT32 width = word2;
2844      UINT32* data = &DY;
2845      UINT64 mask;
2846      UINT64 insert = REG_D[(word2>>12)&7];
28472847
28482848
28492849      if(BIT_B(word2))
r3535r3536
28602860      mask = ROR_32(mask, offset);
28612861
28622862      insert = MASK_OUT_ABOVE_32(insert << (32 - width));
2863      FLAG_N = NFLAG_32(insert);
2864      FLAG_Z = insert;
2863      m68k->n_flag = NFLAG_32(insert);
2864      m68k->not_z_flag = insert;
28652865      insert = ROR_32(insert, offset);
28662866
2867      FLAG_V = VFLAG_CLEAR;
2868      FLAG_C = CFLAG_CLEAR;
2867      m68k->v_flag = VFLAG_CLEAR;
2868      m68k->c_flag = CFLAG_CLEAR;
28692869
28702870      *data &= ~mask;
28712871      *data |= insert;
28722872
28732873      return;
28742874   }
2875   m68ki_exception_illegal();
2875   m68ki_exception_illegal(m68k);
28762876}
28772877
28782878
28792879M68KMAKE_OP(bfins, 32, ., .)
28802880{
2881   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2881   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
28822882   {
2883      uint word2 = OPER_I_16();
2884      sint offset = (word2>>6)&31;
2885      uint width = word2;
2886      uint insert_base = REG_D[(word2>>12)&7];
2887      uint insert_long;
2888      uint insert_byte;
2889      uint mask_base;
2890      uint data_long;
2891      uint mask_long;
2892      uint data_byte = 0;
2893      uint mask_byte = 0;
2894      uint ea = M68KMAKE_GET_EA_AY_8;
2883      UINT32 word2 = OPER_I_16(m68k);
2884      INT32 offset = (word2>>6)&31;
2885      UINT32 width = word2;
2886      UINT32 insert_base = REG_D[(word2>>12)&7];
2887      UINT32 insert_long;
2888      UINT32 insert_byte;
2889      UINT32 mask_base;
2890      UINT32 data_long;
2891      UINT32 mask_long;
2892      UINT32 data_byte = 0;
2893      UINT32 mask_byte = 0;
2894      UINT32 ea = M68KMAKE_GET_EA_AY_8;
28952895
28962896
28972897      if(BIT_B(word2))
r3535r3536
29132913      mask_long = mask_base >> offset;
29142914
29152915      insert_base = MASK_OUT_ABOVE_32(insert_base << (32 - width));
2916      FLAG_N = NFLAG_32(insert_base);
2917      FLAG_Z = insert_base;
2916      m68k->n_flag = NFLAG_32(insert_base);
2917      m68k->not_z_flag = insert_base;
29182918      insert_long = insert_base >> offset;
29192919
2920      data_long = m68ki_read_32(ea);
2921      FLAG_V = VFLAG_CLEAR;
2922      FLAG_C = CFLAG_CLEAR;
2920      data_long = m68ki_read_32(m68k, ea);
2921      m68k->v_flag = VFLAG_CLEAR;
2922      m68k->c_flag = CFLAG_CLEAR;
29232923
2924      m68ki_write_32(ea, (data_long & ~mask_long) | insert_long);
2924      m68ki_write_32(m68k, ea, (data_long & ~mask_long) | insert_long);
29252925
29262926      if((width + offset) > 32)
29272927      {
29282928         mask_byte = MASK_OUT_ABOVE_8(mask_base);
29292929         insert_byte = MASK_OUT_ABOVE_8(insert_base);
2930         data_byte = m68ki_read_8(ea+4);
2931         FLAG_Z |= (data_byte & mask_byte);
2932         m68ki_write_8(ea+4, (data_byte & ~mask_byte) | insert_byte);
2930         data_byte = m68ki_read_8(m68k, ea+4);
2931         m68k->not_z_flag |= (data_byte & mask_byte);
2932         m68ki_write_8(m68k, ea+4, (data_byte & ~mask_byte) | insert_byte);
29332933      }
29342934      return;
29352935   }
2936   m68ki_exception_illegal();
2936   m68ki_exception_illegal(m68k);
29372937}
29382938
29392939
29402940M68KMAKE_OP(bfset, 32, ., d)
29412941{
2942   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2942   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
29432943   {
2944      uint word2 = OPER_I_16();
2945      uint offset = (word2>>6)&31;
2946      uint width = word2;
2947      uint* data = &DY;
2948      uint64 mask;
2944      UINT32 word2 = OPER_I_16(m68k);
2945      UINT32 offset = (word2>>6)&31;
2946      UINT32 width = word2;
2947      UINT32* data = &DY;
2948      UINT64 mask;
29492949
29502950
29512951      if(BIT_B(word2))
r3535r3536
29612961      mask = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
29622962      mask = ROR_32(mask, offset);
29632963
2964      FLAG_N = NFLAG_32(*data<<offset);
2965      FLAG_Z = *data & mask;
2966      FLAG_V = VFLAG_CLEAR;
2967      FLAG_C = CFLAG_CLEAR;
2964      m68k->n_flag = NFLAG_32(*data<<offset);
2965      m68k->not_z_flag = *data & mask;
2966      m68k->v_flag = VFLAG_CLEAR;
2967      m68k->c_flag = CFLAG_CLEAR;
29682968
29692969      *data |= mask;
29702970
29712971      return;
29722972   }
2973   m68ki_exception_illegal();
2973   m68ki_exception_illegal(m68k);
29742974}
29752975
29762976
29772977M68KMAKE_OP(bfset, 32, ., .)
29782978{
2979   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
2979   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
29802980   {
2981      uint word2 = OPER_I_16();
2982      sint offset = (word2>>6)&31;
2983      uint width = word2;
2984      uint mask_base;
2985      uint data_long;
2986      uint mask_long;
2987      uint data_byte = 0;
2988      uint mask_byte = 0;
2989      uint ea = M68KMAKE_GET_EA_AY_8;
2981      UINT32 word2 = OPER_I_16(m68k);
2982      INT32 offset = (word2>>6)&31;
2983      UINT32 width = word2;
2984      UINT32 mask_base;
2985      UINT32 data_long;
2986      UINT32 mask_long;
2987      UINT32 data_byte = 0;
2988      UINT32 mask_byte = 0;
2989      UINT32 ea = M68KMAKE_GET_EA_AY_8;
29902990
29912991
29922992      if(BIT_B(word2))
r3535r3536
30083008      mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
30093009      mask_long = mask_base >> offset;
30103010
3011      data_long = m68ki_read_32(ea);
3012      FLAG_N = NFLAG_32(data_long << offset);
3013      FLAG_Z = data_long & mask_long;
3014      FLAG_V = VFLAG_CLEAR;
3015      FLAG_C = CFLAG_CLEAR;
3011      data_long = m68ki_read_32(m68k, ea);
3012      m68k->n_flag = NFLAG_32(data_long << offset);
3013      m68k->not_z_flag = data_long & mask_long;
3014      m68k->v_flag = VFLAG_CLEAR;
3015      m68k->c_flag = CFLAG_CLEAR;
30163016
3017      m68ki_write_32(ea, data_long | mask_long);
3017      m68ki_write_32(m68k, ea, data_long | mask_long);
30183018
30193019      if((width + offset) > 32)
30203020      {
30213021         mask_byte = MASK_OUT_ABOVE_8(mask_base);
3022         data_byte = m68ki_read_8(ea+4);
3023         FLAG_Z |= (data_byte & mask_byte);
3024         m68ki_write_8(ea+4, data_byte | mask_byte);
3022         data_byte = m68ki_read_8(m68k, ea+4);
3023         m68k->not_z_flag |= (data_byte & mask_byte);
3024         m68ki_write_8(m68k, ea+4, data_byte | mask_byte);
30253025      }
30263026      return;
30273027   }
3028   m68ki_exception_illegal();
3028   m68ki_exception_illegal(m68k);
30293029}
30303030
30313031
30323032M68KMAKE_OP(bftst, 32, ., d)
30333033{
3034   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3034   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
30353035   {
3036      uint word2 = OPER_I_16();
3037      uint offset = (word2>>6)&31;
3038      uint width = word2;
3039      uint* data = &DY;
3040      uint64 mask;
3036      UINT32 word2 = OPER_I_16(m68k);
3037      UINT32 offset = (word2>>6)&31;
3038      UINT32 width = word2;
3039      UINT32* data = &DY;
3040      UINT64 mask;
30413041
30423042
30433043      if(BIT_B(word2))
r3535r3536
30533053      mask = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
30543054      mask = ROR_32(mask, offset);
30553055
3056      FLAG_N = NFLAG_32(*data<<offset);
3057      FLAG_Z = *data & mask;
3058      FLAG_V = VFLAG_CLEAR;
3059      FLAG_C = CFLAG_CLEAR;
3056      m68k->n_flag = NFLAG_32(*data<<offset);
3057      m68k->not_z_flag = *data & mask;
3058      m68k->v_flag = VFLAG_CLEAR;
3059      m68k->c_flag = CFLAG_CLEAR;
30603060
30613061      return;
30623062   }
3063   m68ki_exception_illegal();
3063   m68ki_exception_illegal(m68k);
30643064}
30653065
30663066
30673067M68KMAKE_OP(bftst, 32, ., .)
30683068{
3069   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3069   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
30703070   {
3071      uint word2 = OPER_I_16();
3072      sint offset = (word2>>6)&31;
3073      uint width = word2;
3074      uint mask_base;
3075      uint data_long;
3076      uint mask_long;
3077      uint data_byte = 0;
3078      uint mask_byte = 0;
3079      uint ea = M68KMAKE_GET_EA_AY_8;
3071      UINT32 word2 = OPER_I_16(m68k);
3072      INT32 offset = (word2>>6)&31;
3073      UINT32 width = word2;
3074      UINT32 mask_base;
3075      UINT32 data_long;
3076      UINT32 mask_long;
3077      UINT32 data_byte = 0;
3078      UINT32 mask_byte = 0;
3079      UINT32 ea = M68KMAKE_GET_EA_AY_8;
30803080
30813081      if(BIT_B(word2))
30823082         offset = MAKE_INT_32(REG_D[offset&7]);
r3535r3536
30973097      mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
30983098      mask_long = mask_base >> offset;
30993099
3100      data_long = m68ki_read_32(ea);
3101      FLAG_N = ((data_long & (0x80000000 >> offset))<<offset)>>24;
3102      FLAG_Z = data_long & mask_long;
3103      FLAG_V = VFLAG_CLEAR;
3104      FLAG_C = CFLAG_CLEAR;
3100      data_long = m68ki_read_32(m68k, ea);
3101      m68k->n_flag = ((data_long & (0x80000000 >> offset))<<offset)>>24;
3102      m68k->not_z_flag = data_long & mask_long;
3103      m68k->v_flag = VFLAG_CLEAR;
3104      m68k->c_flag = CFLAG_CLEAR;
31053105
31063106      if((width + offset) > 32)
31073107      {
31083108         mask_byte = MASK_OUT_ABOVE_8(mask_base);
3109         data_byte = m68ki_read_8(ea+4);
3110         FLAG_Z |= (data_byte & mask_byte);
3109         data_byte = m68ki_read_8(m68k, ea+4);
3110         m68k->not_z_flag |= (data_byte & mask_byte);
31113111      }
31123112      return;
31133113   }
3114   m68ki_exception_illegal();
3114   m68ki_exception_illegal(m68k);
31153115}
31163116
31173117
31183118M68KMAKE_OP(bkpt, 0, ., .)
31193119{
3120   if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
3120   if(CPU_TYPE_IS_010_PLUS(m68k->cpu_type))
31213121   {
3122      m68ki_bkpt_ack(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE) ? REG_IR & 7 : 0);   /* auto-disable (see m68kcpu.h) */
3122      (*m68k->bkpt_ack_callback)(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type) ? m68k->ir & 7 : 0);
31233123   }
3124   m68ki_exception_illegal();
3124   m68ki_exception_illegal(m68k);
31253125}
31263126
31273127
31283128M68KMAKE_OP(bra, 8, ., .)
31293129{
31303130   m68ki_trace_t0();               /* auto-disable (see m68kcpu.h) */
3131   m68ki_branch_8(MASK_OUT_ABOVE_8(REG_IR));
3131   m68ki_branch_8(m68k, MASK_OUT_ABOVE_8(m68k->ir));
31323132   if(REG_PC == REG_PPC)
3133      USE_ALL_CYCLES();
3133      USE_ALL_CYCLES(m68k);
31343134}
31353135
31363136
31373137M68KMAKE_OP(bra, 16, ., .)
31383138{
3139   uint offset = OPER_I_16();
3139   UINT32 offset = OPER_I_16(m68k);
31403140   REG_PC -= 2;
31413141   m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
3142   m68ki_branch_16(offset);
3142   m68ki_branch_16(m68k, offset);
31433143   if(REG_PC == REG_PPC)
3144      USE_ALL_CYCLES();
3144      USE_ALL_CYCLES(m68k);
31453145}
31463146
31473147
31483148M68KMAKE_OP(bra, 32, ., .)
31493149{
3150   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3150   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
31513151   {
3152      uint offset = OPER_I_32();
3152      UINT32 offset = OPER_I_32(m68k);
31533153      REG_PC -= 4;
31543154      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
3155      m68ki_branch_32(offset);
3155      m68ki_branch_32(m68k, offset);
31563156      if(REG_PC == REG_PPC)
3157         USE_ALL_CYCLES();
3157         USE_ALL_CYCLES(m68k);
31583158      return;
31593159   }
31603160   else
31613161   {
31623162      m68ki_trace_t0();               /* auto-disable (see m68kcpu.h) */
3163      m68ki_branch_8(MASK_OUT_ABOVE_8(REG_IR));
3163      m68ki_branch_8(m68k, MASK_OUT_ABOVE_8(m68k->ir));
31643164      if(REG_PC == REG_PPC)
3165         USE_ALL_CYCLES();
3165         USE_ALL_CYCLES(m68k);
31663166   }
31673167}
31683168
31693169
31703170M68KMAKE_OP(bset, 32, r, d)
31713171{
3172   uint* r_dst = &DY;
3173   uint mask = 1 << (DX & 0x1f);
3172   UINT32* r_dst = &DY;
3173   UINT32 mask = 1 << (DX & 0x1f);
31743174
3175   FLAG_Z = *r_dst & mask;
3175   m68k->not_z_flag = *r_dst & mask;
31763176   *r_dst |= mask;
31773177}
31783178
31793179
31803180M68KMAKE_OP(bset, 8, r, .)
31813181{
3182   uint ea = M68KMAKE_GET_EA_AY_8;
3183   uint src = m68ki_read_8(ea);
3184   uint mask = 1 << (DX & 7);
3182   UINT32 ea = M68KMAKE_GET_EA_AY_8;
3183   UINT32 src = m68ki_read_8(m68k, ea);
3184   UINT32 mask = 1 << (DX & 7);
31853185
3186   FLAG_Z = src & mask;
3187   m68ki_write_8(ea, src | mask);
3186   m68k->not_z_flag = src & mask;
3187   m68ki_write_8(m68k, ea, src | mask);
31883188}
31893189
31903190
31913191M68KMAKE_OP(bset, 32, s, d)
31923192{
3193   uint* r_dst = &DY;
3194   uint mask = 1 << (OPER_I_8() & 0x1f);
3193   UINT32* r_dst = &DY;
3194   UINT32 mask = 1 << (OPER_I_8(m68k) & 0x1f);
31953195
3196   FLAG_Z = *r_dst & mask;
3196   m68k->not_z_flag = *r_dst & mask;
31973197   *r_dst |= mask;
31983198}
31993199
32003200
32013201M68KMAKE_OP(bset, 8, s, .)
32023202{
3203   uint mask = 1 << (OPER_I_8() & 7);
3204   uint ea = M68KMAKE_GET_EA_AY_8;
3205   uint src = m68ki_read_8(ea);
3203   UINT32 mask = 1 << (OPER_I_8(m68k) & 7);
3204   UINT32 ea = M68KMAKE_GET_EA_AY_8;
3205   UINT32 src = m68ki_read_8(m68k, ea);
32063206
3207   FLAG_Z = src & mask;
3208   m68ki_write_8(ea, src | mask);
3207   m68k->not_z_flag = src & mask;
3208   m68ki_write_8(m68k, ea, src | mask);
32093209}
32103210
32113211
32123212M68KMAKE_OP(bsr, 8, ., .)
32133213{
32143214   m68ki_trace_t0();               /* auto-disable (see m68kcpu.h) */
3215   m68ki_push_32(REG_PC);
3216   m68ki_branch_8(MASK_OUT_ABOVE_8(REG_IR));
3215   m68ki_push_32(m68k, REG_PC);
3216   m68ki_branch_8(m68k, MASK_OUT_ABOVE_8(m68k->ir));
32173217}
32183218
32193219
32203220M68KMAKE_OP(bsr, 16, ., .)
32213221{
3222   uint offset = OPER_I_16();
3222   UINT32 offset = OPER_I_16(m68k);
32233223   m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
3224   m68ki_push_32(REG_PC);
3224   m68ki_push_32(m68k, REG_PC);
32253225   REG_PC -= 2;
3226   m68ki_branch_16(offset);
3226   m68ki_branch_16(m68k, offset);
32273227}
32283228
32293229
32303230M68KMAKE_OP(bsr, 32, ., .)
32313231{
3232   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3232   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
32333233   {
3234      uint offset = OPER_I_32();
3234      UINT32 offset = OPER_I_32(m68k);
32353235      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
3236      m68ki_push_32(REG_PC);
3236      m68ki_push_32(m68k, REG_PC);
32373237      REG_PC -= 4;
3238      m68ki_branch_32(offset);
3238      m68ki_branch_32(m68k, offset);
32393239      return;
32403240   }
32413241   else
32423242   {
32433243      m68ki_trace_t0();               /* auto-disable (see m68kcpu.h) */
3244      m68ki_push_32(REG_PC);
3245      m68ki_branch_8(MASK_OUT_ABOVE_8(REG_IR));
3244      m68ki_push_32(m68k, REG_PC);
3245      m68ki_branch_8(m68k, MASK_OUT_ABOVE_8(m68k->ir));
32463246   }
32473247}
32483248
32493249
32503250M68KMAKE_OP(btst, 32, r, d)
32513251{
3252   FLAG_Z = DY & (1 << (DX & 0x1f));
3252   m68k->not_z_flag = DY & (1 << (DX & 0x1f));
32533253}
32543254
32553255
32563256M68KMAKE_OP(btst, 8, r, .)
32573257{
3258   FLAG_Z = M68KMAKE_GET_OPER_AY_8 & (1 << (DX & 7));
3258   m68k->not_z_flag = M68KMAKE_GET_OPER_AY_8 & (1 << (DX & 7));
32593259}
32603260
32613261
32623262M68KMAKE_OP(btst, 32, s, d)
32633263{
3264   FLAG_Z = DY & (1 << (OPER_I_8() & 0x1f));
3264   m68k->not_z_flag = DY & (1 << (OPER_I_8(m68k) & 0x1f));
32653265}
32663266
32673267
32683268M68KMAKE_OP(btst, 8, s, .)
32693269{
3270   uint bit = OPER_I_8() & 7;
3270   UINT32 bit = OPER_I_8(m68k) & 7;
32713271
3272   FLAG_Z = M68KMAKE_GET_OPER_AY_8 & (1 << bit);
3272   m68k->not_z_flag = M68KMAKE_GET_OPER_AY_8 & (1 << bit);
32733273}
32743274
32753275
32763276M68KMAKE_OP(callm, 32, ., .)
32773277{
32783278   /* note: watch out for pcrelative modes */
3279   if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
3279   if(CPU_TYPE_IS_020_VARIANT(m68k->cpu_type))
32803280   {
3281      uint ea = M68KMAKE_GET_EA_AY_32;
3281      UINT32 ea = M68KMAKE_GET_EA_AY_32;
32823282
32833283      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
32843284      REG_PC += 2;
32853285(void)ea;   /* just to avoid an 'unused variable' warning */
32863286      M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
3287                m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
3288                m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
3287                m68ki_cpu_names[m68k->cpu_type], ADDRESS_68K(m68k, REG_PC - 2), m68k->ir,
3288                m68k_disassemble_quick(ADDRESS_68K(m68k, REG_PC - 2))));
32893289      return;
32903290   }
3291   m68ki_exception_illegal();
3291   m68ki_exception_illegal(m68k);
32923292}
32933293
32943294
32953295M68KMAKE_OP(cas, 8, ., .)
32963296{
3297   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3297   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
32983298   {
3299      uint word2 = OPER_I_16();
3300      uint ea = M68KMAKE_GET_EA_AY_8;
3301      uint dest = m68ki_read_8(ea);
3302      uint* compare = &REG_D[word2 & 7];
3303      uint res = dest - MASK_OUT_ABOVE_8(*compare);
3299      UINT32 word2 = OPER_I_16(m68k);
3300      UINT32 ea = M68KMAKE_GET_EA_AY_8;
3301      UINT32 dest = m68ki_read_8(m68k, ea);
3302      UINT32* compare = &REG_D[word2 & 7];
3303      UINT32 res = dest - MASK_OUT_ABOVE_8(*compare);
33043304
33053305      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
3306      FLAG_N = NFLAG_8(res);
3307      FLAG_Z = MASK_OUT_ABOVE_8(res);
3308      FLAG_V = VFLAG_SUB_8(*compare, dest, res);
3309      FLAG_C = CFLAG_8(res);
3306      m68k->n_flag = NFLAG_8(res);
3307      m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
3308      m68k->v_flag = VFLAG_SUB_8(*compare, dest, res);
3309      m68k->c_flag = CFLAG_8(res);
33103310
3311      if(COND_NE())
3311      if(COND_NE(m68k))
33123312         *compare = MASK_OUT_BELOW_8(*compare) | dest;
33133313      else
33143314      {
3315         USE_CYCLES(3);
3316         m68ki_write_8(ea, MASK_OUT_ABOVE_8(REG_D[(word2 >> 6) & 7]));
3315         USE_CYCLES(m68k, 3);
3316         m68ki_write_8(m68k, ea, MASK_OUT_ABOVE_8(REG_D[(word2 >> 6) & 7]));
33173317      }
33183318      return;
33193319   }
3320   m68ki_exception_illegal();
3320   m68ki_exception_illegal(m68k);
33213321}
33223322
33233323
33243324M68KMAKE_OP(cas, 16, ., .)
33253325{
3326   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3326   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
33273327   {
3328      uint word2 = OPER_I_16();
3329      uint ea = M68KMAKE_GET_EA_AY_16;
3330      uint dest = m68ki_read_16(ea);
3331      uint* compare = &REG_D[word2 & 7];
3332      uint res = dest - MASK_OUT_ABOVE_16(*compare);
3328      UINT32 word2 = OPER_I_16(m68k);
3329      UINT32 ea = M68KMAKE_GET_EA_AY_16;
3330      UINT32 dest = m68ki_read_16(m68k, ea);
3331      UINT32* compare = &REG_D[word2 & 7];
3332      UINT32 res = dest - MASK_OUT_ABOVE_16(*compare);
33333333
33343334      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
3335      FLAG_N = NFLAG_16(res);
3336      FLAG_Z = MASK_OUT_ABOVE_16(res);
3337      FLAG_V = VFLAG_SUB_16(*compare, dest, res);
3338      FLAG_C = CFLAG_16(res);
3335      m68k->n_flag = NFLAG_16(res);
3336      m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
3337      m68k->v_flag = VFLAG_SUB_16(*compare, dest, res);
3338      m68k->c_flag = CFLAG_16(res);
33393339
3340      if(COND_NE())
3340      if(COND_NE(m68k))
33413341         *compare = MASK_OUT_BELOW_16(*compare) | dest;
33423342      else
33433343      {
3344         USE_CYCLES(3);
3345         m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_D[(word2 >> 6) & 7]));
3344         USE_CYCLES(m68k, 3);
3345         m68ki_write_16(m68k, ea, MASK_OUT_ABOVE_16(REG_D[(word2 >> 6) & 7]));
33463346      }
33473347      return;
33483348   }
3349   m68ki_exception_illegal();
3349   m68ki_exception_illegal(m68k);
33503350}
33513351
33523352
33533353M68KMAKE_OP(cas, 32, ., .)
33543354{
3355   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3355   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
33563356   {
3357      uint word2 = OPER_I_16();
3358      uint ea = M68KMAKE_GET_EA_AY_32;
3359      uint dest = m68ki_read_32(ea);
3360      uint* compare = &REG_D[word2 & 7];
3361      uint res = dest - *compare;
3357      UINT32 word2 = OPER_I_16(m68k);
3358      UINT32 ea = M68KMAKE_GET_EA_AY_32;
3359      UINT32 dest = m68ki_read_32(m68k, ea);
3360      UINT32* compare = &REG_D[word2 & 7];
3361      UINT32 res = dest - *compare;
33623362
33633363      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
3364      FLAG_N = NFLAG_32(res);
3365      FLAG_Z = MASK_OUT_ABOVE_32(res);
3366      FLAG_V = VFLAG_SUB_32(*compare, dest, res);
3367      FLAG_C = CFLAG_SUB_32(*compare, dest, res);
3364      m68k->n_flag = NFLAG_32(res);
3365      m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
3366      m68k->v_flag = VFLAG_SUB_32(*compare, dest, res);
3367      m68k->c_flag = CFLAG_SUB_32(*compare, dest, res);
33683368
3369      if(COND_NE())
3369      if(COND_NE(m68k))
33703370         *compare = dest;
33713371      else
33723372      {
3373         USE_CYCLES(3);
3374         m68ki_write_32(ea, REG_D[(word2 >> 6) & 7]);
3373         USE_CYCLES(m68k, 3);
3374         m68ki_write_32(m68k, ea, REG_D[(word2 >> 6) & 7]);
33753375      }
33763376      return;
33773377   }
3378   m68ki_exception_illegal();
3378   m68ki_exception_illegal(m68k);
33793379}
33803380
33813381
33823382M68KMAKE_OP(cas2, 16, ., .)
33833383{
3384   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3384   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
33853385   {
3386      uint word2 = OPER_I_32();
3387      uint* compare1 = &REG_D[(word2 >> 16) & 7];
3388      uint ea1 = REG_DA[(word2 >> 28) & 15];
3389      uint dest1 = m68ki_read_16(ea1);
3390      uint res1 = dest1 - MASK_OUT_ABOVE_16(*compare1);
3391      uint* compare2 = &REG_D[word2 & 7];
3392      uint ea2 = REG_DA[(word2 >> 12) & 15];
3393      uint dest2 = m68ki_read_16(ea2);
3394      uint res2;
3386      UINT32 word2 = OPER_I_32(m68k);
3387      UINT32* compare1 = &REG_D[(word2 >> 16) & 7];
3388      UINT32 ea1 = REG_DA[(word2 >> 28) & 15];
3389      UINT32 dest1 = m68ki_read_16(m68k, ea1);
3390      UINT32 res1 = dest1 - MASK_OUT_ABOVE_16(*compare1);
3391      UINT32* compare2 = &REG_D[word2 & 7];
3392      UINT32 ea2 = REG_DA[(word2 >> 12) & 15];
3393      UINT32 dest2 = m68ki_read_16(m68k, ea2);
3394      UINT32 res2;
33953395
33963396      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
3397      FLAG_N = NFLAG_16(res1);
3398      FLAG_Z = MASK_OUT_ABOVE_16(res1);
3399      FLAG_V = VFLAG_SUB_16(*compare1, dest1, res1);
3400      FLAG_C = CFLAG_16(res1);
3397      m68k->n_flag = NFLAG_16(res1);
3398      m68k->not_z_flag = MASK_OUT_ABOVE_16(res1);
3399      m68k->v_flag = VFLAG_SUB_16(*compare1, dest1, res1);
3400      m68k->c_flag = CFLAG_16(res1);
34013401
3402      if(COND_EQ())
3402      if(COND_EQ(m68k))
34033403      {
34043404         res2 = dest2 - MASK_OUT_ABOVE_16(*compare2);
34053405
3406         FLAG_N = NFLAG_16(res2);
3407         FLAG_Z = MASK_OUT_ABOVE_16(res2);
3408         FLAG_V = VFLAG_SUB_16(*compare2, dest2, res2);
3409         FLAG_C = CFLAG_16(res2);
3406         m68k->n_flag = NFLAG_16(res2);
3407         m68k->not_z_flag = MASK_OUT_ABOVE_16(res2);
3408         m68k->v_flag = VFLAG_SUB_16(*compare2, dest2, res2);
3409         m68k->c_flag = CFLAG_16(res2);
34103410
3411         if(COND_EQ())
3411         if(COND_EQ(m68k))
34123412         {
3413            USE_CYCLES(3);
3414            m68ki_write_16(ea1, REG_D[(word2 >> 22) & 7]);
3415            m68ki_write_16(ea2, REG_D[(word2 >> 6) & 7]);
3413            USE_CYCLES(m68k, 3);
3414            m68ki_write_16(m68k, ea1, REG_D[(word2 >> 22) & 7]);
3415            m68ki_write_16(m68k, ea2, REG_D[(word2 >> 6) & 7]);
34163416            return;
34173417         }
34183418      }
r3535r3536
34203420      *compare2 = BIT_F(word2) ? MAKE_INT_16(dest2) : MASK_OUT_BELOW_16(*compare2) | dest2;
34213421      return;
34223422   }
3423   m68ki_exception_illegal();
3423   m68ki_exception_illegal(m68k);
34243424}
34253425
34263426
34273427M68KMAKE_OP(cas2, 32, ., .)
34283428{
3429   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3429   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
34303430   {
3431      uint word2 = OPER_I_32();
3432      uint* compare1 = &REG_D[(word2 >> 16) & 7];
3433      uint ea1 = REG_DA[(word2 >> 28) & 15];
3434      uint dest1 = m68ki_read_32(ea1);
3435      uint res1 = dest1 - *compare1;
3436      uint* compare2 = &REG_D[word2 & 7];
3437      uint ea2 = REG_DA[(word2 >> 12) & 15];
3438      uint dest2 = m68ki_read_32(ea2);
3439      uint res2;
3431      UINT32 word2 = OPER_I_32(m68k);
3432      UINT32* compare1 = &REG_D[(word2 >> 16) & 7];
3433      UINT32 ea1 = REG_DA[(word2 >> 28) & 15];
3434      UINT32 dest1 = m68ki_read_32(m68k, ea1);
3435      UINT32 res1 = dest1 - *compare1;
3436      UINT32* compare2 = &REG_D[word2 & 7];
3437      UINT32 ea2 = REG_DA[(word2 >> 12) & 15];
3438      UINT32 dest2 = m68ki_read_32(m68k, ea2);
3439      UINT32 res2;
34403440
34413441      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
3442      FLAG_N = NFLAG_32(res1);
3443      FLAG_Z = MASK_OUT_ABOVE_32(res1);
3444      FLAG_V = VFLAG_SUB_32(*compare1, dest1, res1);
3445      FLAG_C = CFLAG_SUB_32(*compare1, dest1, res1);
3442      m68k->n_flag = NFLAG_32(res1);
3443      m68k->not_z_flag = MASK_OUT_ABOVE_32(res1);
3444      m68k->v_flag = VFLAG_SUB_32(*compare1, dest1, res1);
3445      m68k->c_flag = CFLAG_SUB_32(*compare1, dest1, res1);
34463446
3447      if(COND_EQ())
3447      if(COND_EQ(m68k))
34483448      {
34493449         res2 = dest2 - *compare2;
34503450
3451         FLAG_N = NFLAG_32(res2);
3452         FLAG_Z = MASK_OUT_ABOVE_32(res2);
3453         FLAG_V = VFLAG_SUB_32(*compare2, dest2, res2);
3454         FLAG_C = CFLAG_SUB_32(*compare2, dest2, res2);
3451         m68k->n_flag = NFLAG_32(res2);
3452         m68k->not_z_flag = MASK_OUT_ABOVE_32(res2);
3453         m68k->v_flag = VFLAG_SUB_32(*compare2, dest2, res2);
3454         m68k->c_flag = CFLAG_SUB_32(*compare2, dest2, res2);
34553455
3456         if(COND_EQ())
3456         if(COND_EQ(m68k))
34573457         {
3458            USE_CYCLES(3);
3459            m68ki_write_32(ea1, REG_D[(word2 >> 22) & 7]);
3460            m68ki_write_32(ea2, REG_D[(word2 >> 6) & 7]);
3458            USE_CYCLES(m68k, 3);
3459            m68ki_write_32(m68k, ea1, REG_D[(word2 >> 22) & 7]);
3460            m68ki_write_32(m68k, ea2, REG_D[(word2 >> 6) & 7]);
34613461            return;
34623462         }
34633463      }
r3535r3536
34653465      *compare2 = dest2;
34663466      return;
34673467   }
3468   m68ki_exception_illegal();
3468   m68ki_exception_illegal(m68k);
34693469}
34703470
34713471
34723472M68KMAKE_OP(chk, 16, ., d)
34733473{
3474   sint src = MAKE_INT_16(DX);
3475   sint bound = MAKE_INT_16(DY);
3474   INT32 src = MAKE_INT_16(DX);
3475   INT32 bound = MAKE_INT_16(DY);
34763476
3477   FLAG_Z = ZFLAG_16(src); /* Undocumented */
3478   FLAG_V = VFLAG_CLEAR;   /* Undocumented */
3479   FLAG_C = CFLAG_CLEAR;   /* Undocumented */
3477   m68k->not_z_flag = ZFLAG_16(src); /* Undocumented */
3478   m68k->v_flag = VFLAG_CLEAR;   /* Undocumented */
3479   m68k->c_flag = CFLAG_CLEAR;   /* Undocumented */
34803480
34813481   if(src >= 0 && src <= bound)
34823482   {
34833483      return;
34843484   }
3485   FLAG_N = (src < 0)<<7;
3486   m68ki_exception_trap(EXCEPTION_CHK);
3485   m68k->n_flag = (src < 0)<<7;
3486   m68ki_exception_trap(m68k, EXCEPTION_CHK);
34873487}
34883488
34893489
34903490M68KMAKE_OP(chk, 16, ., .)
34913491{
3492   sint src = MAKE_INT_16(DX);
3493   sint bound = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16);
3492   INT32 src = MAKE_INT_16(DX);
3493   INT32 bound = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16);
34943494
3495   FLAG_Z = ZFLAG_16(src); /* Undocumented */
3496   FLAG_V = VFLAG_CLEAR;   /* Undocumented */
3497   FLAG_C = CFLAG_CLEAR;   /* Undocumented */
3495   m68k->not_z_flag = ZFLAG_16(src); /* Undocumented */
3496   m68k->v_flag = VFLAG_CLEAR;   /* Undocumented */
3497   m68k->c_flag = CFLAG_CLEAR;   /* Undocumented */
34983498
34993499   if(src >= 0 && src <= bound)
35003500   {
35013501      return;
35023502   }
3503   FLAG_N = (src < 0)<<7;
3504   m68ki_exception_trap(EXCEPTION_CHK);
3503   m68k->n_flag = (src < 0)<<7;
3504   m68ki_exception_trap(m68k, EXCEPTION_CHK);
35053505}
35063506
35073507
35083508M68KMAKE_OP(chk, 32, ., d)
35093509{
3510   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3510   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
35113511   {
3512      sint src = MAKE_INT_32(DX);
3513      sint bound = MAKE_INT_32(DY);
3512      INT32 src = MAKE_INT_32(DX);
3513      INT32 bound = MAKE_INT_32(DY);
35143514
3515      FLAG_Z = ZFLAG_32(src); /* Undocumented */
3516      FLAG_V = VFLAG_CLEAR;   /* Undocumented */
3517      FLAG_C = CFLAG_CLEAR;   /* Undocumented */
3515      m68k->not_z_flag = ZFLAG_32(src); /* Undocumented */
3516      m68k->v_flag = VFLAG_CLEAR;   /* Undocumented */
3517      m68k->c_flag = CFLAG_CLEAR;   /* Undocumented */
35183518
35193519      if(src >= 0 && src <= bound)
35203520      {
35213521         return;
35223522      }
3523      FLAG_N = (src < 0)<<7;
3524      m68ki_exception_trap(EXCEPTION_CHK);
3523      m68k->n_flag = (src < 0)<<7;
3524      m68ki_exception_trap(m68k, EXCEPTION_CHK);
35253525      return;
35263526   }
3527   m68ki_exception_illegal();
3527   m68ki_exception_illegal(m68k);
35283528}
35293529
35303530
35313531M68KMAKE_OP(chk, 32, ., .)
35323532{
3533   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3533   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
35343534   {
3535      sint src = MAKE_INT_32(DX);
3536      sint bound = MAKE_INT_32(M68KMAKE_GET_OPER_AY_32);
3535      INT32 src = MAKE_INT_32(DX);
3536      INT32 bound = MAKE_INT_32(M68KMAKE_GET_OPER_AY_32);
35373537
3538      FLAG_Z = ZFLAG_32(src); /* Undocumented */
3539      FLAG_V = VFLAG_CLEAR;   /* Undocumented */
3540      FLAG_C = CFLAG_CLEAR;   /* Undocumented */
3538      m68k->not_z_flag = ZFLAG_32(src); /* Undocumented */
3539      m68k->v_flag = VFLAG_CLEAR;   /* Undocumented */
3540      m68k->c_flag = CFLAG_CLEAR;   /* Undocumented */
35413541
35423542      if(src >= 0 && src <= bound)
35433543      {
35443544         return;
35453545      }
3546      FLAG_N = (src < 0)<<7;
3547      m68ki_exception_trap(EXCEPTION_CHK);
3546      m68k->n_flag = (src < 0)<<7;
3547      m68ki_exception_trap(m68k, EXCEPTION_CHK);
35483548      return;
35493549   }
3550   m68ki_exception_illegal();
3550   m68ki_exception_illegal(m68k);
35513551}
35523552
35533553
35543554M68KMAKE_OP(chk2cmp2, 8, ., pcdi)
35553555{
3556   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3556   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
35573557   {
3558      uint word2 = OPER_I_16();
3559      uint compare = REG_DA[(word2 >> 12) & 15]&0xff;
3560      uint ea = EA_PCDI_8();
3561      uint lower_bound = m68ki_read_pcrel_8(ea);
3562      uint upper_bound = m68ki_read_pcrel_8(ea + 1);
3558      UINT32 word2 = OPER_I_16(m68k);
3559      UINT32 compare = REG_DA[(word2 >> 12) & 15]&0xff;
3560      UINT32 ea = EA_PCDI_8(m68k);
3561      UINT32 lower_bound = m68ki_read_pcrel_8(m68k, ea);
3562      UINT32 upper_bound = m68ki_read_pcrel_8(m68k, ea + 1);
35633563
35643564      if(!BIT_F(word2))
3565         FLAG_C = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound);
3565         m68k->c_flag = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound);
35663566      else
3567         FLAG_C = compare - lower_bound;
3568      FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
3569      if(COND_CS())
3567         m68k->c_flag = compare - lower_bound;
3568      m68k->not_z_flag = !((upper_bound==compare) | (lower_bound==compare));
3569      if(COND_CS(m68k))
35703570      {
35713571         if(BIT_B(word2))
3572            m68ki_exception_trap(EXCEPTION_CHK);
3572            m68ki_exception_trap(m68k, EXCEPTION_CHK);
35733573         return;
35743574      }
35753575
3576      FLAG_C = upper_bound - compare;
3577      if(COND_CS() && BIT_B(word2))
3578            m68ki_exception_trap(EXCEPTION_CHK);
3576      m68k->c_flag = upper_bound - compare;
3577      if(COND_CS(m68k) && BIT_B(word2))
3578            m68ki_exception_trap(m68k, EXCEPTION_CHK);
35793579      return;
35803580   }
3581   m68ki_exception_illegal();
3581   m68ki_exception_illegal(m68k);
35823582}
35833583
35843584
35853585M68KMAKE_OP(chk2cmp2, 8, ., pcix)
35863586{
3587   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3587   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
35883588   {
3589      uint word2 = OPER_I_16();
3590      uint compare = REG_DA[(word2 >> 12) & 15]&0xff;
3591      uint ea = EA_PCIX_8();
3592      uint lower_bound = m68ki_read_pcrel_8(ea);
3593      uint upper_bound = m68ki_read_pcrel_8(ea + 1);
3589      UINT32 word2 = OPER_I_16(m68k);
3590      UINT32 compare = REG_DA[(word2 >> 12) & 15]&0xff;
3591      UINT32 ea = EA_PCIX_8(m68k);
3592      UINT32 lower_bound = m68ki_read_pcrel_8(m68k, ea);
3593      UINT32 upper_bound = m68ki_read_pcrel_8(m68k, ea + 1);
35943594
35953595      if(!BIT_F(word2))
3596         FLAG_C = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound);
3596         m68k->c_flag = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound);
35973597      else
3598         FLAG_C = compare - lower_bound;
3599      FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
3600      if(COND_CS())
3598         m68k->c_flag = compare - lower_bound;
3599      m68k->not_z_flag = !((upper_bound==compare) | (lower_bound==compare));
3600      if(COND_CS(m68k))
36013601      {
36023602         if(BIT_B(word2))
3603            m68ki_exception_trap(EXCEPTION_CHK);
3603            m68ki_exception_trap(m68k, EXCEPTION_CHK);
36043604         return;
36053605      }
36063606
3607      FLAG_C = upper_bound - compare;
3608      if(COND_CS() && BIT_B(word2))
3609            m68ki_exception_trap(EXCEPTION_CHK);
3607      m68k->c_flag = upper_bound - compare;
3608      if(COND_CS(m68k) && BIT_B(word2))
3609            m68ki_exception_trap(m68k, EXCEPTION_CHK);
36103610      return;
36113611   }
3612   m68ki_exception_illegal();
3612   m68ki_exception_illegal(m68k);
36133613}
36143614
36153615
36163616M68KMAKE_OP(chk2cmp2, 8, ., .)
36173617{
3618   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3618   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
36193619   {
3620      uint word2 = OPER_I_16();
3621      uint compare = REG_DA[(word2 >> 12) & 15]&0xff;
3622      uint ea = M68KMAKE_GET_EA_AY_8;
3623      uint lower_bound = m68ki_read_8(ea);
3624      uint upper_bound = m68ki_read_8(ea + 1);
3620      UINT32 word2 = OPER_I_16(m68k);
3621      UINT32 compare = REG_DA[(word2 >> 12) & 15]&0xff;
3622      UINT32 ea = M68KMAKE_GET_EA_AY_8;
3623      UINT32 lower_bound = m68ki_read_8(m68k, ea);
3624      UINT32 upper_bound = m68ki_read_8(m68k, ea + 1);
36253625
36263626      if(!BIT_F(word2))
3627         FLAG_C = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound);
3627         m68k->c_flag = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound);
36283628      else
3629         FLAG_C = compare - lower_bound;
3630      FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
3631      if(COND_CS())
3629         m68k->c_flag = compare - lower_bound;
3630      m68k->not_z_flag = !((upper_bound==compare) | (lower_bound==compare));
3631      if(COND_CS(m68k))
36323632      {
36333633         if(BIT_B(word2))
3634            m68ki_exception_trap(EXCEPTION_CHK);
3634            m68ki_exception_trap(m68k, EXCEPTION_CHK);
36353635         return;
36363636      }
36373637
3638      FLAG_C = upper_bound - compare;
3639      if(COND_CS() && BIT_B(word2))
3640            m68ki_exception_trap(EXCEPTION_CHK);
3638      m68k->c_flag = upper_bound - compare;
3639      if(COND_CS(m68k) && BIT_B(word2))
3640            m68ki_exception_trap(m68k, EXCEPTION_CHK);
36413641      return;
36423642   }
3643   m68ki_exception_illegal();
3643   m68ki_exception_illegal(m68k);
36443644}
36453645
36463646
36473647M68KMAKE_OP(chk2cmp2, 16, ., pcdi)
36483648{
3649   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3649   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
36503650   {
3651      uint word2 = OPER_I_16();
3652      uint compare = REG_DA[(word2 >> 12) & 15]&0xffff;
3653      uint ea = EA_PCDI_16();
3654      uint lower_bound = m68ki_read_pcrel_16(ea);
3655      uint upper_bound = m68ki_read_pcrel_16(ea + 2);
3651      UINT32 word2 = OPER_I_16(m68k);
3652      UINT32 compare = REG_DA[(word2 >> 12) & 15]&0xffff;
3653      UINT32 ea = EA_PCDI_16(m68k);
3654      UINT32 lower_bound = m68ki_read_pcrel_16(m68k, ea);
3655      UINT32 upper_bound = m68ki_read_pcrel_16(m68k, ea + 2);
36563656
36573657      if(!BIT_F(word2))
3658         FLAG_C = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound);
3658         m68k->c_flag = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound);
36593659      else
3660         FLAG_C = compare - lower_bound;
3661      FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
3662      FLAG_C = CFLAG_16(FLAG_C);
3663      if(COND_CS())
3660         m68k->c_flag = compare - lower_bound;
3661      m68k->not_z_flag = !((upper_bound==compare) | (lower_bound==compare));
3662      m68k->c_flag = CFLAG_16(m68k->c_flag);
3663      if(COND_CS(m68k))
36643664      {
36653665         if(BIT_B(word2))
3666            m68ki_exception_trap(EXCEPTION_CHK);
3666            m68ki_exception_trap(m68k, EXCEPTION_CHK);
36673667         return;
36683668      }
36693669
36703670      if(!BIT_F(word2))
3671         FLAG_C = MAKE_INT_16(upper_bound) - MAKE_INT_16(compare);
3671         m68k->c_flag = MAKE_INT_16(upper_bound) - MAKE_INT_16(compare);
36723672      else
3673         FLAG_C = upper_bound - compare;
3674      FLAG_C = CFLAG_16(FLAG_C);
3675      if(COND_CS() && BIT_B(word2))
3676            m68ki_exception_trap(EXCEPTION_CHK);
3673         m68k->c_flag = upper_bound - compare;
3674      m68k->c_flag = CFLAG_16(m68k->c_flag);
3675      if(COND_CS(m68k) && BIT_B(word2))
3676            m68ki_exception_trap(m68k, EXCEPTION_CHK);
36773677      return;
36783678   }
3679   m68ki_exception_illegal();
3679   m68ki_exception_illegal(m68k);
36803680}
36813681
36823682
36833683M68KMAKE_OP(chk2cmp2, 16, ., pcix)
36843684{
3685   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3685   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
36863686   {
3687      uint word2 = OPER_I_16();
3688      uint compare = REG_DA[(word2 >> 12) & 15]&0xffff;
3689      uint ea = EA_PCIX_16();
3690      uint lower_bound = m68ki_read_pcrel_16(ea);
3691      uint upper_bound = m68ki_read_pcrel_16(ea + 2);
3687      UINT32 word2 = OPER_I_16(m68k);
3688      UINT32 compare = REG_DA[(word2 >> 12) & 15]&0xffff;
3689      UINT32 ea = EA_PCIX_16(m68k);
3690      UINT32 lower_bound = m68ki_read_pcrel_16(m68k, ea);
3691      UINT32 upper_bound = m68ki_read_pcrel_16(m68k, ea + 2);
36923692
36933693      if(!BIT_F(word2))
3694         FLAG_C = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound);
3694         m68k->c_flag = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound);
36953695      else
3696         FLAG_C = compare - lower_bound;
3697      FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
3698      FLAG_C = CFLAG_16(FLAG_C);
3699      if(COND_CS())
3696         m68k->c_flag = compare - lower_bound;
3697      m68k->not_z_flag = !((upper_bound==compare) | (lower_bound==compare));
3698      m68k->c_flag = CFLAG_16(m68k->c_flag);
3699      if(COND_CS(m68k))
37003700      {
37013701         if(BIT_B(word2))
3702            m68ki_exception_trap(EXCEPTION_CHK);
3702            m68ki_exception_trap(m68k, EXCEPTION_CHK);
37033703         return;
37043704      }
37053705
37063706      if(!BIT_F(word2))
3707         FLAG_C = MAKE_INT_16(upper_bound) - MAKE_INT_16(compare);
3707         m68k->c_flag = MAKE_INT_16(upper_bound) - MAKE_INT_16(compare);
37083708      else
3709         FLAG_C = upper_bound - compare;
3710      FLAG_C = CFLAG_16(FLAG_C);
3711      if(COND_CS() && BIT_B(word2))
3712            m68ki_exception_trap(EXCEPTION_CHK);
3709         m68k->c_flag = upper_bound - compare;
3710      m68k->c_flag = CFLAG_16(m68k->c_flag);
3711      if(COND_CS(m68k) && BIT_B(word2))
3712            m68ki_exception_trap(m68k, EXCEPTION_CHK);
37133713      return;
37143714   }
3715   m68ki_exception_illegal();
3715   m68ki_exception_illegal(m68k);
37163716}
37173717
37183718
37193719M68KMAKE_OP(chk2cmp2, 16, ., .)
37203720{
3721   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3721   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
37223722   {
3723      uint word2 = OPER_I_16();
3724      uint compare = REG_DA[(word2 >> 12) & 15]&0xffff;
3725      uint ea = M68KMAKE_GET_EA_AY_16;
3726      uint lower_bound = m68ki_read_16(ea);
3727      uint upper_bound = m68ki_read_16(ea + 2);
3723      UINT32 word2 = OPER_I_16(m68k);
3724      UINT32 compare = REG_DA[(word2 >> 12) & 15]&0xffff;
3725      UINT32 ea = M68KMAKE_GET_EA_AY_16;
3726      UINT32 lower_bound = m68ki_read_16(m68k, ea);
3727      UINT32 upper_bound = m68ki_read_16(m68k, ea + 2);
37283728
37293729      if(!BIT_F(word2))
3730         FLAG_C = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound);
3730         m68k->c_flag = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound);
37313731      else
3732         FLAG_C = compare - lower_bound;
3732         m68k->c_flag = compare - lower_bound;
37333733
3734      FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
3735      FLAG_C = CFLAG_16(FLAG_C);
3736      if(COND_CS())
3734      m68k->not_z_flag = !((upper_bound==compare) | (lower_bound==compare));
3735      m68k->c_flag = CFLAG_16(m68k->c_flag);
3736      if(COND_CS(m68k))
37373737      {
37383738         if(BIT_B(word2))
3739            m68ki_exception_trap(EXCEPTION_CHK);
3739            m68ki_exception_trap(m68k, EXCEPTION_CHK);
37403740         return;
37413741      }
37423742      if(!BIT_F(word2))
3743         FLAG_C = MAKE_INT_16(upper_bound) - MAKE_INT_16(compare);
3743         m68k->c_flag = MAKE_INT_16(upper_bound) - MAKE_INT_16(compare);
37443744      else
3745         FLAG_C = upper_bound - compare;
3745         m68k->c_flag = upper_bound - compare;
37463746
3747      FLAG_C = CFLAG_16(FLAG_C);
3748      if(COND_CS() && BIT_B(word2))
3749            m68ki_exception_trap(EXCEPTION_CHK);
3747      m68k->c_flag = CFLAG_16(m68k->c_flag);
3748      if(COND_CS(m68k) && BIT_B(word2))
3749            m68ki_exception_trap(m68k, EXCEPTION_CHK);
37503750      return;
37513751   }
3752   m68ki_exception_illegal();
3752   m68ki_exception_illegal(m68k);
37533753}
37543754
37553755
37563756M68KMAKE_OP(chk2cmp2, 32, ., pcdi)
37573757{
3758   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3758   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
37593759   {
3760      uint word2 = OPER_I_16();
3761      uint compare = REG_DA[(word2 >> 12) & 15];
3762      uint ea = EA_PCDI_32();
3763      uint lower_bound = m68ki_read_pcrel_32(ea);
3764      uint upper_bound = m68ki_read_pcrel_32(ea + 4);
3760      UINT32 word2 = OPER_I_16(m68k);
3761      UINT32 compare = REG_DA[(word2 >> 12) & 15];
3762      UINT32 ea = EA_PCDI_32(m68k);
3763      UINT32 lower_bound = m68ki_read_pcrel_32(m68k, ea);
3764      UINT32 upper_bound = m68ki_read_pcrel_32(m68k, ea + 4);
37653765
3766      FLAG_C = compare - lower_bound;
3767      FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
3768      FLAG_C = CFLAG_SUB_32(lower_bound, compare, FLAG_C);
3769      if(COND_CS())
3766      m68k->c_flag = compare - lower_bound;
3767      m68k->not_z_flag = !((upper_bound==compare) | (lower_bound==compare));
3768      m68k->c_flag = CFLAG_SUB_32(lower_bound, compare, m68k->c_flag);
3769      if(COND_CS(m68k))
37703770      {
37713771         if(BIT_B(word2))
3772            m68ki_exception_trap(EXCEPTION_CHK);
3772            m68ki_exception_trap(m68k, EXCEPTION_CHK);
37733773         return;
37743774      }
37753775
3776      FLAG_C = upper_bound - compare;
3777      FLAG_C = CFLAG_SUB_32(compare, upper_bound, FLAG_C);
3778      if(COND_CS() && BIT_B(word2))
3779            m68ki_exception_trap(EXCEPTION_CHK);
3776      m68k->c_flag = upper_bound - compare;
3777      m68k->c_flag = CFLAG_SUB_32(compare, upper_bound, m68k->c_flag);
3778      if(COND_CS(m68k) && BIT_B(word2))
3779            m68ki_exception_trap(m68k, EXCEPTION_CHK);
37803780      return;
37813781   }
3782   m68ki_exception_illegal();
3782   m68ki_exception_illegal(m68k);
37833783}
37843784
37853785
37863786M68KMAKE_OP(chk2cmp2, 32, ., pcix)
37873787{
3788   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3788   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
37893789   {
3790      uint word2 = OPER_I_16();
3791      uint compare = REG_DA[(word2 >> 12) & 15];
3792      uint ea = EA_PCIX_32();
3793      uint lower_bound = m68ki_read_pcrel_32(ea);
3794      uint upper_bound = m68ki_read_pcrel_32(ea + 4);
3790      UINT32 word2 = OPER_I_16(m68k);
3791      UINT32 compare = REG_DA[(word2 >> 12) & 15];
3792      UINT32 ea = EA_PCIX_32(m68k);
3793      UINT32 lower_bound = m68ki_read_pcrel_32(m68k, ea);
3794      UINT32 upper_bound = m68ki_read_pcrel_32(m68k, ea + 4);
37953795
3796      FLAG_C = compare - lower_bound;
3797      FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
3798      FLAG_C = CFLAG_SUB_32(lower_bound, compare, FLAG_C);
3799      if(COND_CS())
3796      m68k->c_flag = compare - lower_bound;
3797      m68k->not_z_flag = !((upper_bound==compare) | (lower_bound==compare));
3798      m68k->c_flag = CFLAG_SUB_32(lower_bound, compare, m68k->c_flag);
3799      if(COND_CS(m68k))
38003800      {
38013801         if(BIT_B(word2))
3802            m68ki_exception_trap(EXCEPTION_CHK);
3802            m68ki_exception_trap(m68k, EXCEPTION_CHK);
38033803         return;
38043804      }
38053805
3806      FLAG_C = upper_bound - compare;
3807      FLAG_C = CFLAG_SUB_32(compare, upper_bound, FLAG_C);
3808      if(COND_CS() && BIT_B(word2))
3809            m68ki_exception_trap(EXCEPTION_CHK);
3806      m68k->c_flag = upper_bound - compare;
3807      m68k->c_flag = CFLAG_SUB_32(compare, upper_bound, m68k->c_flag);
3808      if(COND_CS(m68k) && BIT_B(word2))
3809            m68ki_exception_trap(m68k, EXCEPTION_CHK);
38103810      return;
38113811   }
3812   m68ki_exception_illegal();
3812   m68ki_exception_illegal(m68k);
38133813}
38143814
38153815
38163816M68KMAKE_OP(chk2cmp2, 32, ., .)
38173817{
3818   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
3818   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
38193819   {
3820      uint word2 = OPER_I_16();
3821      uint compare = REG_DA[(word2 >> 12) & 15];
3822      uint ea = M68KMAKE_GET_EA_AY_32;
3823      uint lower_bound = m68ki_read_32(ea);
3824      uint upper_bound = m68ki_read_32(ea + 4);
3820      UINT32 word2 = OPER_I_16(m68k);
3821      UINT32 compare = REG_DA[(word2 >> 12) & 15];
3822      UINT32 ea = M68KMAKE_GET_EA_AY_32;
3823      UINT32 lower_bound = m68ki_read_32(m68k, ea);
3824      UINT32 upper_bound = m68ki_read_32(m68k, ea + 4);
38253825
3826      FLAG_C = compare - lower_bound;
3827      FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
3828      FLAG_C = CFLAG_SUB_32(lower_bound, compare, FLAG_C);
3829      if(COND_CS())
3826      m68k->c_flag = compare - lower_bound;
3827      m68k->not_z_flag = !((upper_bound==compare) | (lower_bound==compare));
3828      m68k->c_flag = CFLAG_SUB_32(lower_bound, compare, m68k->c_flag);
3829      if(COND_CS(m68k))
38303830      {
38313831         if(BIT_B(word2))
3832            m68ki_exception_trap(EXCEPTION_CHK);
3832            m68ki_exception_trap(m68k, EXCEPTION_CHK);
38333833         return;
38343834      }
38353835
3836      FLAG_C = upper_bound - compare;
3837      FLAG_C = CFLAG_SUB_32(compare, upper_bound, FLAG_C);
3838      if(COND_CS() && BIT_B(word2))
3839            m68ki_exception_trap(EXCEPTION_CHK);
3836      m68k->c_flag = upper_bound - compare;
3837      m68k->c_flag = CFLAG_SUB_32(compare, upper_bound, m68k->c_flag);
3838      if(COND_CS(m68k) && BIT_B(word2))
3839            m68ki_exception_trap(m68k, EXCEPTION_CHK);
38403840      return;
38413841   }
3842   m68ki_exception_illegal();
3842   m68ki_exception_illegal(m68k);
38433843}
38443844
38453845
r3535r3536
38473847{
38483848   DY &= 0xffffff00;
38493849
3850   FLAG_N = NFLAG_CLEAR;
3851   FLAG_V = VFLAG_CLEAR;
3852   FLAG_C = CFLAG_CLEAR;
3853   FLAG_Z = ZFLAG_SET;
3850   m68k->n_flag = NFLAG_CLEAR;
3851   m68k->v_flag = VFLAG_CLEAR;
3852   m68k->c_flag = CFLAG_CLEAR;
3853   m68k->not_z_flag = ZFLAG_SET;
38543854}
38553855
38563856
38573857M68KMAKE_OP(clr, 8, ., .)
38583858{
3859   m68ki_write_8(M68KMAKE_GET_EA_AY_8, 0);
3859   m68ki_write_8(m68k, M68KMAKE_GET_EA_AY_8, 0);
38603860
3861   FLAG_N = NFLAG_CLEAR;
3862   FLAG_V = VFLAG_CLEAR;
3863   FLAG_C = CFLAG_CLEAR;
3864   FLAG_Z = ZFLAG_SET;
3861   m68k->n_flag = NFLAG_CLEAR;
3862   m68k->v_flag = VFLAG_CLEAR;
3863   m68k->c_flag = CFLAG_CLEAR;
3864   m68k->not_z_flag = ZFLAG_SET;
38653865}
38663866
38673867
r3535r3536
38693869{
38703870   DY &= 0xffff0000;
38713871
3872   FLAG_N = NFLAG_CLEAR;
3873   FLAG_V = VFLAG_CLEAR;
3874   FLAG_C = CFLAG_CLEAR;
3875   FLAG_Z = ZFLAG_SET;
3872   m68k->n_flag = NFLAG_CLEAR;
3873   m68k->v_flag = VFLAG_CLEAR;
3874   m68k->c_flag = CFLAG_CLEAR;
3875   m68k->not_z_flag = ZFLAG_SET;
38763876}
38773877
38783878
38793879M68KMAKE_OP(clr, 16, ., .)
38803880{
3881   m68ki_write_16(M68KMAKE_GET_EA_AY_16, 0);
3881   m68ki_write_16(m68k, M68KMAKE_GET_EA_AY_16, 0);
38823882
3883   FLAG_N = NFLAG_CLEAR;
3884   FLAG_V = VFLAG_CLEAR;
3885   FLAG_C = CFLAG_CLEAR;
3886   FLAG_Z = ZFLAG_SET;
3883   m68k->n_flag = NFLAG_CLEAR;
3884   m68k->v_flag = VFLAG_CLEAR;
3885   m68k->c_flag = CFLAG_CLEAR;
3886   m68k->not_z_flag = ZFLAG_SET;
38873887}
38883888
38893889
r3535r3536
38913891{
38923892   DY = 0;
38933893
3894   FLAG_N = NFLAG_CLEAR;
3895   FLAG_V = VFLAG_CLEAR;
3896   FLAG_C = CFLAG_CLEAR;
3897   FLAG_Z = ZFLAG_SET;
3894   m68k->n_flag = NFLAG_CLEAR;
3895   m68k->v_flag = VFLAG_CLEAR;
3896   m68k->c_flag = CFLAG_CLEAR;
3897   m68k->not_z_flag = ZFLAG_SET;
38983898}
38993899
39003900
39013901M68KMAKE_OP(clr, 32, ., .)
39023902{
3903   m68ki_write_32(M68KMAKE_GET_EA_AY_32, 0);
3903   m68ki_write_32(m68k, M68KMAKE_GET_EA_AY_32, 0);
39043904
3905   FLAG_N = NFLAG_CLEAR;
3906   FLAG_V = VFLAG_CLEAR;
3907   FLAG_C = CFLAG_CLEAR;
3908   FLAG_Z = ZFLAG_SET;
3905   m68k->n_flag = NFLAG_CLEAR;
3906   m68k->v_flag = VFLAG_CLEAR;
3907   m68k->c_flag = CFLAG_CLEAR;
3908   m68k->not_z_flag = ZFLAG_SET;
39093909}
39103910
39113911
39123912M68KMAKE_OP(cmp, 8, ., d)
39133913{
3914   uint src = MASK_OUT_ABOVE_8(DY);
3915   uint dst = MASK_OUT_ABOVE_8(DX);
3916   uint res = dst - src;
3914   UINT32 src = MASK_OUT_ABOVE_8(DY);
3915   UINT32 dst = MASK_OUT_ABOVE_8(DX);
3916   UINT32 res = dst - src;
39173917
3918   FLAG_N = NFLAG_8(res);
3919   FLAG_Z = MASK_OUT_ABOVE_8(res);
3920   FLAG_V = VFLAG_SUB_8(src, dst, res);
3921   FLAG_C = CFLAG_8(res);
3918   m68k->n_flag = NFLAG_8(res);
3919   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
3920   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
3921   m68k->c_flag = CFLAG_8(res);
39223922}
39233923
39243924
39253925M68KMAKE_OP(cmp, 8, ., .)
39263926{
3927   uint src = M68KMAKE_GET_OPER_AY_8;
3928   uint dst = MASK_OUT_ABOVE_8(DX);
3929   uint res = dst - src;
3927   UINT32 src = M68KMAKE_GET_OPER_AY_8;
3928   UINT32 dst = MASK_OUT_ABOVE_8(DX);
3929   UINT32 res = dst - src;
39303930
3931   FLAG_N = NFLAG_8(res);
3932   FLAG_Z = MASK_OUT_ABOVE_8(res);
3933   FLAG_V = VFLAG_SUB_8(src, dst, res);
3934   FLAG_C = CFLAG_8(res);
3931   m68k->n_flag = NFLAG_8(res);
3932   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
3933   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
3934   m68k->c_flag = CFLAG_8(res);
39353935}
39363936
39373937
39383938M68KMAKE_OP(cmp, 16, ., d)
39393939{
3940   uint src = MASK_OUT_ABOVE_16(DY);
3941   uint dst = MASK_OUT_ABOVE_16(DX);
3942   uint res = dst - src;
3940   UINT32 src = MASK_OUT_ABOVE_16(DY);
3941   UINT32 dst = MASK_OUT_ABOVE_16(DX);
3942   UINT32 res = dst - src;
39433943
3944   FLAG_N = NFLAG_16(res);
3945   FLAG_Z = MASK_OUT_ABOVE_16(res);
3946   FLAG_V = VFLAG_SUB_16(src, dst, res);
3947   FLAG_C = CFLAG_16(res);
3944   m68k->n_flag = NFLAG_16(res);
3945   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
3946   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
3947   m68k->c_flag = CFLAG_16(res);
39483948}
39493949
39503950
39513951M68KMAKE_OP(cmp, 16, ., a)
39523952{
3953   uint src = MASK_OUT_ABOVE_16(AY);
3954   uint dst = MASK_OUT_ABOVE_16(DX);
3955   uint res = dst - src;
3953   UINT32 src = MASK_OUT_ABOVE_16(AY);
3954   UINT32 dst = MASK_OUT_ABOVE_16(DX);
3955   UINT32 res = dst - src;
39563956
3957   FLAG_N = NFLAG_16(res);
3958   FLAG_Z = MASK_OUT_ABOVE_16(res);
3959   FLAG_V = VFLAG_SUB_16(src, dst, res);
3960   FLAG_C = CFLAG_16(res);
3957   m68k->n_flag = NFLAG_16(res);
3958   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
3959   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
3960   m68k->c_flag = CFLAG_16(res);
39613961}
39623962
39633963
39643964M68KMAKE_OP(cmp, 16, ., .)
39653965{
3966   uint src = M68KMAKE_GET_OPER_AY_16;
3967   uint dst = MASK_OUT_ABOVE_16(DX);
3968   uint res = dst - src;
3966   UINT32 src = M68KMAKE_GET_OPER_AY_16;
3967   UINT32 dst = MASK_OUT_ABOVE_16(DX);
3968   UINT32 res = dst - src;
39693969
3970   FLAG_N = NFLAG_16(res);
3971   FLAG_Z = MASK_OUT_ABOVE_16(res);
3972   FLAG_V = VFLAG_SUB_16(src, dst, res);
3973   FLAG_C = CFLAG_16(res);
3970   m68k->n_flag = NFLAG_16(res);
3971   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
3972   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
3973   m68k->c_flag = CFLAG_16(res);
39743974}
39753975
39763976
39773977M68KMAKE_OP(cmp, 32, ., d)
39783978{
3979   uint src = DY;
3980   uint dst = DX;
3981   uint res = dst - src;
3979   UINT32 src = DY;
3980   UINT32 dst = DX;
3981   UINT32 res = dst - src;
39823982
3983   FLAG_N = NFLAG_32(res);
3984   FLAG_Z = MASK_OUT_ABOVE_32(res);
3985   FLAG_V = VFLAG_SUB_32(src, dst, res);
3986   FLAG_C = CFLAG_SUB_32(src, dst, res);
3983   m68k->n_flag = NFLAG_32(res);
3984   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
3985   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
3986   m68k->c_flag = CFLAG_SUB_32(src, dst, res);
39873987}
39883988
39893989
39903990M68KMAKE_OP(cmp, 32, ., a)
39913991{
3992   uint src = AY;
3993   uint dst = DX;
3994   uint res = dst - src;
3992   UINT32 src = AY;
3993   UINT32 dst = DX;
3994   UINT32 res = dst - src;
39953995
3996   FLAG_N = NFLAG_32(res);
3997   FLAG_Z = MASK_OUT_ABOVE_32(res);
3998   FLAG_V = VFLAG_SUB_32(src, dst, res);
3999   FLAG_C = CFLAG_SUB_32(src, dst, res);
3996   m68k->n_flag = NFLAG_32(res);
3997   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
3998   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
3999   m68k->c_flag = CFLAG_SUB_32(src, dst, res);
40004000}
40014001
40024002
40034003M68KMAKE_OP(cmp, 32, ., .)
40044004{
4005   uint src = M68KMAKE_GET_OPER_AY_32;
4006   uint dst = DX;
4007   uint res = dst - src;
4005   UINT32 src = M68KMAKE_GET_OPER_AY_32;
4006   UINT32 dst = DX;
4007   UINT32 res = dst - src;
40084008
4009   FLAG_N = NFLAG_32(res);
4010   FLAG_Z = MASK_OUT_ABOVE_32(res);
4011   FLAG_V = VFLAG_SUB_32(src, dst, res);
4012   FLAG_C = CFLAG_SUB_32(src, dst, res);
4009   m68k->n_flag = NFLAG_32(res);
4010   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
4011   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
4012   m68k->c_flag = CFLAG_SUB_32(src, dst, res);
40134013}
40144014
40154015
40164016M68KMAKE_OP(cmpa, 16, ., d)
40174017{
4018   uint src = MAKE_INT_16(DY);
4019   uint dst = AX;
4020   uint res = dst - src;
4018   UINT32 src = MAKE_INT_16(DY);
4019   UINT32 dst = AX;
4020   UINT32 res = dst - src;
40214021
4022   FLAG_N = NFLAG_32(res);
4023   FLAG_Z = MASK_OUT_ABOVE_32(res);
4024   FLAG_V = VFLAG_SUB_32(src, dst, res);
4025   FLAG_C = CFLAG_SUB_32(src, dst, res);
4022   m68k->n_flag = NFLAG_32(res);
4023   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
4024   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
4025   m68k->c_flag = CFLAG_SUB_32(src, dst, res);
40264026}
40274027
40284028
40294029M68KMAKE_OP(cmpa, 16, ., a)
40304030{
4031   uint src = MAKE_INT_16(AY);
4032   uint dst = AX;
4033   uint res = dst - src;
4031   UINT32 src = MAKE_INT_16(AY);
4032   UINT32 dst = AX;
4033   UINT32 res = dst - src;
40344034
4035   FLAG_N = NFLAG_32(res);
4036   FLAG_Z = MASK_OUT_ABOVE_32(res);
4037   FLAG_V = VFLAG_SUB_32(src, dst, res);
4038   FLAG_C = CFLAG_SUB_32(src, dst, res);
4035   m68k->n_flag = NFLAG_32(res);
4036   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
4037   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
4038   m68k->c_flag = CFLAG_SUB_32(src, dst, res);
40394039}
40404040
40414041
40424042M68KMAKE_OP(cmpa, 16, ., .)
40434043{
4044   uint src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16);
4045   uint dst = AX;
4046   uint res = dst - src;
4044   UINT32 src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16);
4045   UINT32 dst = AX;
4046   UINT32 res = dst - src;
40474047
4048   FLAG_N = NFLAG_32(res);
4049   FLAG_Z = MASK_OUT_ABOVE_32(res);
4050   FLAG_V = VFLAG_SUB_32(src, dst, res);
4051   FLAG_C = CFLAG_SUB_32(src, dst, res);
4048   m68k->n_flag = NFLAG_32(res);
4049   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
4050   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
4051   m68k->c_flag = CFLAG_SUB_32(src, dst, res);
40524052}
40534053
40544054
40554055M68KMAKE_OP(cmpa, 32, ., d)
40564056{
4057   uint src = DY;
4058   uint dst = AX;
4059   uint res = dst - src;
4057   UINT32 src = DY;
4058   UINT32 dst = AX;
4059   UINT32 res = dst - src;
40604060
4061   FLAG_N = NFLAG_32(res);
4062   FLAG_Z = MASK_OUT_ABOVE_32(res);
4063   FLAG_V = VFLAG_SUB_32(src, dst, res);
4064   FLAG_C = CFLAG_SUB_32(src, dst, res);
4061   m68k->n_flag = NFLAG_32(res);
4062   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
4063   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
4064   m68k->c_flag = CFLAG_SUB_32(src, dst, res);
40654065}
40664066
40674067
40684068M68KMAKE_OP(cmpa, 32, ., a)
40694069{
4070   uint src = AY;
4071   uint dst = AX;
4072   uint res = dst - src;
4070   UINT32 src = AY;
4071   UINT32 dst = AX;
4072   UINT32 res = dst - src;
40734073
4074   FLAG_N = NFLAG_32(res);
4075   FLAG_Z = MASK_OUT_ABOVE_32(res);
4076   FLAG_V = VFLAG_SUB_32(src, dst, res);
4077   FLAG_C = CFLAG_SUB_32(src, dst, res);
4074   m68k->n_flag = NFLAG_32(res);
4075   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
4076   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
4077   m68k->c_flag = CFLAG_SUB_32(src, dst, res);
40784078}
40794079
40804080
40814081M68KMAKE_OP(cmpa, 32, ., .)
40824082{
4083   uint src = M68KMAKE_GET_OPER_AY_32;
4084   uint dst = AX;
4085   uint res = dst - src;
4083   UINT32 src = M68KMAKE_GET_OPER_AY_32;
4084   UINT32 dst = AX;
4085   UINT32 res = dst - src;
40864086
4087   FLAG_N = NFLAG_32(res);
4088   FLAG_Z = MASK_OUT_ABOVE_32(res);
4089   FLAG_V = VFLAG_SUB_32(src, dst, res);
4090   FLAG_C = CFLAG_SUB_32(src, dst, res);
4087   m68k->n_flag = NFLAG_32(res);
4088   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
4089   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
4090   m68k->c_flag = CFLAG_SUB_32(src, dst, res);
40914091}
40924092
40934093
40944094M68KMAKE_OP(cmpi, 8, ., d)
40954095{
4096   uint src = OPER_I_8();
4097   uint dst = MASK_OUT_ABOVE_8(DY);
4098   uint res = dst - src;
4096   UINT32 src = OPER_I_8(m68k);
4097   UINT32 dst = MASK_OUT_ABOVE_8(DY);
4098   UINT32 res = dst - src;
40994099
4100   FLAG_N = NFLAG_8(res);
4101   FLAG_Z = MASK_OUT_ABOVE_8(res);
4102   FLAG_V = VFLAG_SUB_8(src, dst, res);
4103   FLAG_C = CFLAG_8(res);
4100   m68k->n_flag = NFLAG_8(res);
4101   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
4102   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
4103   m68k->c_flag = CFLAG_8(res);
41044104}
41054105
41064106
41074107M68KMAKE_OP(cmpi, 8, ., .)
41084108{
4109   uint src = OPER_I_8();
4110   uint dst = M68KMAKE_GET_OPER_AY_8;
4111   uint res = dst - src;
4109   UINT32 src = OPER_I_8(m68k);
4110   UINT32 dst = M68KMAKE_GET_OPER_AY_8;
4111   UINT32 res = dst - src;
41124112
4113   FLAG_N = NFLAG_8(res);
4114   FLAG_Z = MASK_OUT_ABOVE_8(res);
4115   FLAG_V = VFLAG_SUB_8(src, dst, res);
4116   FLAG_C = CFLAG_8(res);
4113   m68k->n_flag = NFLAG_8(res);
4114   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
4115   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
4116   m68k->c_flag = CFLAG_8(res);
41174117}
41184118
41194119
41204120M68KMAKE_OP(cmpi, 8, ., pcdi)
41214121{
4122   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4122   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
41234123   {
4124      uint src = OPER_I_8();
4125      uint dst = OPER_PCDI_8();
4126      uint res = dst - src;
4124      UINT32 src = OPER_I_8(m68k);
4125      UINT32 dst = OPER_PCDI_8(m68k);
4126      UINT32 res = dst - src;
41274127
4128      FLAG_N = NFLAG_8(res);
4129      FLAG_Z = MASK_OUT_ABOVE_8(res);
4130      FLAG_V = VFLAG_SUB_8(src, dst, res);
4131      FLAG_C = CFLAG_8(res);
4128      m68k->n_flag = NFLAG_8(res);
4129      m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
4130      m68k->v_flag = VFLAG_SUB_8(src, dst, res);
4131      m68k->c_flag = CFLAG_8(res);
41324132      return;
41334133   }
4134   m68ki_exception_illegal();
4134   m68ki_exception_illegal(m68k);
41354135}
41364136
41374137
41384138M68KMAKE_OP(cmpi, 8, ., pcix)
41394139{
4140   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4140   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
41414141   {
4142      uint src = OPER_I_8();
4143      uint dst = OPER_PCIX_8();
4144      uint res = dst - src;
4142      UINT32 src = OPER_I_8(m68k);
4143      UINT32 dst = OPER_PCIX_8(m68k);
4144      UINT32 res = dst - src;
41454145
4146      FLAG_N = NFLAG_8(res);
4147      FLAG_Z = MASK_OUT_ABOVE_8(res);
4148      FLAG_V = VFLAG_SUB_8(src, dst, res);
4149      FLAG_C = CFLAG_8(res);
4146      m68k->n_flag = NFLAG_8(res);
4147      m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
4148      m68k->v_flag = VFLAG_SUB_8(src, dst, res);
4149      m68k->c_flag = CFLAG_8(res);
41504150      return;
41514151   }
4152   m68ki_exception_illegal();
4152   m68ki_exception_illegal(m68k);
41534153}
41544154
41554155
41564156M68KMAKE_OP(cmpi, 16, ., d)
41574157{
4158   uint src = OPER_I_16();
4159   uint dst = MASK_OUT_ABOVE_16(DY);
4160   uint res = dst - src;
4158   UINT32 src = OPER_I_16(m68k);
4159   UINT32 dst = MASK_OUT_ABOVE_16(DY);
4160   UINT32 res = dst - src;
41614161
4162   FLAG_N = NFLAG_16(res);
4163   FLAG_Z = MASK_OUT_ABOVE_16(res);
4164   FLAG_V = VFLAG_SUB_16(src, dst, res);
4165   FLAG_C = CFLAG_16(res);
4162   m68k->n_flag = NFLAG_16(res);
4163   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
4164   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
4165   m68k->c_flag = CFLAG_16(res);
41664166}
41674167
41684168
41694169M68KMAKE_OP(cmpi, 16, ., .)
41704170{
4171   uint src = OPER_I_16();
4172   uint dst = M68KMAKE_GET_OPER_AY_16;
4173   uint res = dst - src;
4171   UINT32 src = OPER_I_16(m68k);
4172   UINT32 dst = M68KMAKE_GET_OPER_AY_16;
4173   UINT32 res = dst - src;
41744174
4175   FLAG_N = NFLAG_16(res);
4176   FLAG_Z = MASK_OUT_ABOVE_16(res);
4177   FLAG_V = VFLAG_SUB_16(src, dst, res);
4178   FLAG_C = CFLAG_16(res);
4175   m68k->n_flag = NFLAG_16(res);
4176   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
4177   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
4178   m68k->c_flag = CFLAG_16(res);
41794179}
41804180
41814181
41824182M68KMAKE_OP(cmpi, 16, ., pcdi)
41834183{
4184   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4184   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
41854185   {
4186      uint src = OPER_I_16();
4187      uint dst = OPER_PCDI_16();
4188      uint res = dst - src;
4186      UINT32 src = OPER_I_16(m68k);
4187      UINT32 dst = OPER_PCDI_16(m68k);
4188      UINT32 res = dst - src;
41894189
4190      FLAG_N = NFLAG_16(res);
4191      FLAG_Z = MASK_OUT_ABOVE_16(res);
4192      FLAG_V = VFLAG_SUB_16(src, dst, res);
4193      FLAG_C = CFLAG_16(res);
4190      m68k->n_flag = NFLAG_16(res);
4191      m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
4192      m68k->v_flag = VFLAG_SUB_16(src, dst, res);
4193      m68k->c_flag = CFLAG_16(res);
41944194      return;
41954195   }
4196   m68ki_exception_illegal();
4196   m68ki_exception_illegal(m68k);
41974197}
41984198
41994199
42004200M68KMAKE_OP(cmpi, 16, ., pcix)
42014201{
4202   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4202   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
42034203   {
4204      uint src = OPER_I_16();
4205      uint dst = OPER_PCIX_16();
4206      uint res = dst - src;
4204      UINT32 src = OPER_I_16(m68k);
4205      UINT32 dst = OPER_PCIX_16(m68k);
4206      UINT32 res = dst - src;
42074207
4208      FLAG_N = NFLAG_16(res);
4209      FLAG_Z = MASK_OUT_ABOVE_16(res);
4210      FLAG_V = VFLAG_SUB_16(src, dst, res);
4211      FLAG_C = CFLAG_16(res);
4208      m68k->n_flag = NFLAG_16(res);
4209      m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
4210      m68k->v_flag = VFLAG_SUB_16(src, dst, res);
4211      m68k->c_flag = CFLAG_16(res);
42124212      return;
42134213   }
4214   m68ki_exception_illegal();
4214   m68ki_exception_illegal(m68k);
42154215}
42164216
42174217
42184218M68KMAKE_OP(cmpi, 32, ., d)
42194219{
4220   uint src = OPER_I_32();
4221   uint dst = DY;
4222   uint res = dst - src;
4220   UINT32 src = OPER_I_32(m68k);
4221   UINT32 dst = DY;
4222   UINT32 res = dst - src;
42234223
4224   m68ki_cmpild_callback(src, REG_IR & 7);         /* auto-disable (see m68kcpu.h) */
4224   (*m68k->cmpild_instr_callback)(src, m68k->ir & 7);         /* auto-disable (see m68kcpu.h) */
42254225
4226   FLAG_N = NFLAG_32(res);
4227   FLAG_Z = MASK_OUT_ABOVE_32(res);
4228   FLAG_V = VFLAG_SUB_32(src, dst, res);
4229   FLAG_C = CFLAG_SUB_32(src, dst, res);
4226   m68k->n_flag = NFLAG_32(res);
4227   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
4228   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
4229   m68k->c_flag = CFLAG_SUB_32(src, dst, res);
42304230}
42314231
42324232
42334233M68KMAKE_OP(cmpi, 32, ., .)
42344234{
4235   uint src = OPER_I_32();
4236   uint dst = M68KMAKE_GET_OPER_AY_32;
4237   uint res = dst - src;
4235   UINT32 src = OPER_I_32(m68k);
4236   UINT32 dst = M68KMAKE_GET_OPER_AY_32;
4237   UINT32 res = dst - src;
42384238
4239   FLAG_N = NFLAG_32(res);
4240   FLAG_Z = MASK_OUT_ABOVE_32(res);
4241   FLAG_V = VFLAG_SUB_32(src, dst, res);
4242   FLAG_C = CFLAG_SUB_32(src, dst, res);
4239   m68k->n_flag = NFLAG_32(res);
4240   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
4241   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
4242   m68k->c_flag = CFLAG_SUB_32(src, dst, res);
42434243}
42444244
42454245
42464246M68KMAKE_OP(cmpi, 32, ., pcdi)
42474247{
4248   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4248   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
42494249   {
4250      uint src = OPER_I_32();
4251      uint dst = OPER_PCDI_32();
4252      uint res = dst - src;
4250      UINT32 src = OPER_I_32(m68k);
4251      UINT32 dst = OPER_PCDI_32(m68k);
4252      UINT32 res = dst - src;
42534253
4254      FLAG_N = NFLAG_32(res);
4255      FLAG_Z = MASK_OUT_ABOVE_32(res);
4256      FLAG_V = VFLAG_SUB_32(src, dst, res);
4257      FLAG_C = CFLAG_SUB_32(src, dst, res);
4254      m68k->n_flag = NFLAG_32(res);
4255      m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
4256      m68k->v_flag = VFLAG_SUB_32(src, dst, res);
4257      m68k->c_flag = CFLAG_SUB_32(src, dst, res);
42584258      return;
42594259   }
4260   m68ki_exception_illegal();
4260   m68ki_exception_illegal(m68k);
42614261}
42624262
42634263
42644264M68KMAKE_OP(cmpi, 32, ., pcix)
42654265{
4266   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4266   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
42674267   {
4268      uint src = OPER_I_32();
4269      uint dst = OPER_PCIX_32();
4270      uint res = dst - src;
4268      UINT32 src = OPER_I_32(m68k);
4269      UINT32 dst = OPER_PCIX_32(m68k);
4270      UINT32 res = dst - src;
42714271
4272      FLAG_N = NFLAG_32(res);
4273      FLAG_Z = MASK_OUT_ABOVE_32(res);
4274      FLAG_V = VFLAG_SUB_32(src, dst, res);
4275      FLAG_C = CFLAG_SUB_32(src, dst, res);
4272      m68k->n_flag = NFLAG_32(res);
4273      m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
4274      m68k->v_flag = VFLAG_SUB_32(src, dst, res);
4275      m68k->c_flag = CFLAG_SUB_32(src, dst, res);
42764276      return;
42774277   }
4278   m68ki_exception_illegal();
4278   m68ki_exception_illegal(m68k);
42794279}
42804280
42814281
42824282M68KMAKE_OP(cmpm, 8, ., ax7)
42834283{
4284   uint src = OPER_AY_PI_8();
4285   uint dst = OPER_A7_PI_8();
4286   uint res = dst - src;
4284   UINT32 src = OPER_AY_PI_8(m68k);
4285   UINT32 dst = OPER_A7_PI_8(m68k);
4286   UINT32 res = dst - src;
42874287
4288   FLAG_N = NFLAG_8(res);
4289   FLAG_Z = MASK_OUT_ABOVE_8(res);
4290   FLAG_V = VFLAG_SUB_8(src, dst, res);
4291   FLAG_C = CFLAG_8(res);
4288   m68k->n_flag = NFLAG_8(res);
4289   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
4290   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
4291   m68k->c_flag = CFLAG_8(res);
42924292}
42934293
42944294
42954295M68KMAKE_OP(cmpm, 8, ., ay7)
42964296{
4297   uint src = OPER_A7_PI_8();
4298   uint dst = OPER_AX_PI_8();
4299   uint res = dst - src;
4297   UINT32 src = OPER_A7_PI_8(m68k);
4298   UINT32 dst = OPER_AX_PI_8(m68k);
4299   UINT32 res = dst - src;
43004300
4301   FLAG_N = NFLAG_8(res);
4302   FLAG_Z = MASK_OUT_ABOVE_8(res);
4303   FLAG_V = VFLAG_SUB_8(src, dst, res);
4304   FLAG_C = CFLAG_8(res);
4301   m68k->n_flag = NFLAG_8(res);
4302   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
4303   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
4304   m68k->c_flag = CFLAG_8(res);
43054305}
43064306
43074307
43084308M68KMAKE_OP(cmpm, 8, ., axy7)
43094309{
4310   uint src = OPER_A7_PI_8();
4311   uint dst = OPER_A7_PI_8();
4312   uint res = dst - src;
4310   UINT32 src = OPER_A7_PI_8(m68k);
4311   UINT32 dst = OPER_A7_PI_8(m68k);
4312   UINT32 res = dst - src;
43134313
4314   FLAG_N = NFLAG_8(res);
4315   FLAG_Z = MASK_OUT_ABOVE_8(res);
4316   FLAG_V = VFLAG_SUB_8(src, dst, res);
4317   FLAG_C = CFLAG_8(res);
4314   m68k->n_flag = NFLAG_8(res);
4315   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
4316   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
4317   m68k->c_flag = CFLAG_8(res);
43184318}
43194319
43204320
43214321M68KMAKE_OP(cmpm, 8, ., .)
43224322{
4323   uint src = OPER_AY_PI_8();
4324   uint dst = OPER_AX_PI_8();
4325   uint res = dst - src;
4323   UINT32 src = OPER_AY_PI_8(m68k);
4324   UINT32 dst = OPER_AX_PI_8(m68k);
4325   UINT32 res = dst - src;
43264326
4327   FLAG_N = NFLAG_8(res);
4328   FLAG_Z = MASK_OUT_ABOVE_8(res);
4329   FLAG_V = VFLAG_SUB_8(src, dst, res);
4330   FLAG_C = CFLAG_8(res);
4327   m68k->n_flag = NFLAG_8(res);
4328   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
4329   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
4330   m68k->c_flag = CFLAG_8(res);
43314331}
43324332
43334333
43344334M68KMAKE_OP(cmpm, 16, ., .)
43354335{
4336   uint src = OPER_AY_PI_16();
4337   uint dst = OPER_AX_PI_16();
4338   uint res = dst - src;
4336   UINT32 src = OPER_AY_PI_16(m68k);
4337   UINT32 dst = OPER_AX_PI_16(m68k);
4338   UINT32 res = dst - src;
43394339
4340   FLAG_N = NFLAG_16(res);
4341   FLAG_Z = MASK_OUT_ABOVE_16(res);
4342   FLAG_V = VFLAG_SUB_16(src, dst, res);
4343   FLAG_C = CFLAG_16(res);
4340   m68k->n_flag = NFLAG_16(res);
4341   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
4342   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
4343   m68k->c_flag = CFLAG_16(res);
43444344}
43454345
43464346
43474347M68KMAKE_OP(cmpm, 32, ., .)
43484348{
4349   uint src = OPER_AY_PI_32();
4350   uint dst = OPER_AX_PI_32();
4351   uint res = dst - src;
4349   UINT32 src = OPER_AY_PI_32(m68k);
4350   UINT32 dst = OPER_AX_PI_32(m68k);
4351   UINT32 res = dst - src;
43524352
4353   FLAG_N = NFLAG_32(res);
4354   FLAG_Z = MASK_OUT_ABOVE_32(res);
4355   FLAG_V = VFLAG_SUB_32(src, dst, res);
4356   FLAG_C = CFLAG_SUB_32(src, dst, res);
4353   m68k->n_flag = NFLAG_32(res);
4354   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
4355   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
4356   m68k->c_flag = CFLAG_SUB_32(src, dst, res);
43574357}
43584358
43594359
43604360M68KMAKE_OP(cpbcc, 32, ., .)
43614361{
4362   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4362   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
43634363   {
43644364      M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
4365                m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
4366                m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
4365                m68ki_cpu_names[m68k->cpu_type], ADDRESS_68K(m68k, REG_PC - 2), m68k->ir,
4366                m68k_disassemble_quick(ADDRESS_68K(m68k, REG_PC - 2))));
43674367      return;
43684368   }
4369   m68ki_exception_1111();
4369   m68ki_exception_1111(m68k);
43704370}
43714371
43724372
43734373M68KMAKE_OP(cpdbcc, 32, ., .)
43744374{
4375   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4375   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
43764376   {
43774377      M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
4378                m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
4379                m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
4378                m68ki_cpu_names[m68k->cpu_type], ADDRESS_68K(m68k, REG_PC - 2), m68k->ir,
4379                m68k_disassemble_quick(ADDRESS_68K(m68k, REG_PC - 2))));
43804380      return;
43814381   }
4382   m68ki_exception_1111();
4382   m68ki_exception_1111(m68k);
43834383}
43844384
43854385
43864386M68KMAKE_OP(cpgen, 32, ., .)
43874387{
4388   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4388   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
43894389   {
43904390      M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
4391                m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
4392                m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
4391                m68ki_cpu_names[m68k->cpu_type], ADDRESS_68K(m68k, REG_PC - 2), m68k->ir,
4392                m68k_disassemble_quick(ADDRESS_68K(m68k, REG_PC - 2))));
43934393      return;
43944394   }
4395   m68ki_exception_1111();
4395   m68ki_exception_1111(m68k);
43964396}
43974397
43984398
43994399M68KMAKE_OP(cpscc, 32, ., .)
44004400{
4401   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4401   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
44024402   {
44034403      M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
4404                m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
4405                m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
4404                m68ki_cpu_names[m68k->cpu_type], ADDRESS_68K(m68k, REG_PC - 2), m68k->ir,
4405                m68k_disassemble_quick(ADDRESS_68K(m68k, REG_PC - 2))));
44064406      return;
44074407   }
4408   m68ki_exception_1111();
4408   m68ki_exception_1111(m68k);
44094409}
44104410
44114411
44124412M68KMAKE_OP(cptrapcc, 32, ., .)
44134413{
4414   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4414   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
44154415   {
44164416      M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
4417                m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
4418                m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
4417                m68ki_cpu_names[m68k->cpu_type], ADDRESS_68K(m68k, REG_PC - 2), m68k->ir,
4418                m68k_disassemble_quick(ADDRESS_68K(m68k, REG_PC - 2))));
44194419      return;
44204420   }
4421   m68ki_exception_1111();
4421   m68ki_exception_1111(m68k);
44224422}
44234423
44244424
r3535r3536
44304430
44314431M68KMAKE_OP(dbf, 16, ., .)
44324432{
4433   uint* r_dst = &DY;
4434   uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
4433   UINT32* r_dst = &DY;
4434   UINT32 res = MASK_OUT_ABOVE_16(*r_dst - 1);
44354435
44364436   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
44374437   if(res != 0xffff)
44384438   {
4439      uint offset = OPER_I_16();
4439      UINT32 offset = OPER_I_16(m68k);
44404440      REG_PC -= 2;
44414441      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
4442      m68ki_branch_16(offset);
4443      USE_CYCLES(CYC_DBCC_F_NOEXP);
4442      m68ki_branch_16(m68k, offset);
4443      USE_CYCLES(m68k, m68k->cyc_dbcc_f_noexp);
44444444      return;
44454445   }
44464446   REG_PC += 2;
4447   USE_CYCLES(CYC_DBCC_F_EXP);
4447   USE_CYCLES(m68k, m68k->cyc_dbcc_f_exp);
44484448}
44494449
44504450
r3535r3536
44524452{
44534453   if(M68KMAKE_NOT_CC)
44544454   {
4455      uint* r_dst = &DY;
4456      uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
4455      UINT32* r_dst = &DY;
4456      UINT32 res = MASK_OUT_ABOVE_16(*r_dst - 1);
44574457
44584458      *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
44594459      if(res != 0xffff)
44604460      {
4461         uint offset = OPER_I_16();
4461         UINT32 offset = OPER_I_16(m68k);
44624462         REG_PC -= 2;
44634463         m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
4464         m68ki_branch_16(offset);
4465         USE_CYCLES(CYC_DBCC_F_NOEXP);
4464         m68ki_branch_16(m68k, offset);
4465         USE_CYCLES(m68k, m68k->cyc_dbcc_f_noexp);
44664466         return;
44674467      }
44684468      REG_PC += 2;
4469      USE_CYCLES(CYC_DBCC_F_EXP);
4469      USE_CYCLES(m68k, m68k->cyc_dbcc_f_exp);
44704470      return;
44714471   }
44724472   REG_PC += 2;
r3535r3536
44754475
44764476M68KMAKE_OP(divs, 16, ., d)
44774477{
4478   uint* r_dst = &DX;
4479   sint src = MAKE_INT_16(DY);
4480   sint quotient;
4481   sint remainder;
4478   UINT32* r_dst = &DX;
4479   INT32 src = MAKE_INT_16(DY);
4480   INT32 quotient;
4481   INT32 remainder;
44824482
44834483   if(src != 0)
44844484   {
4485      if((uint32)*r_dst == 0x80000000 && src == -1)
4485      if((UINT32)*r_dst == 0x80000000 && src == -1)
44864486      {
4487         FLAG_Z = 0;
4488         FLAG_N = NFLAG_CLEAR;
4489         FLAG_V = VFLAG_CLEAR;
4490         FLAG_C = CFLAG_CLEAR;
4487         m68k->not_z_flag = 0;
4488         m68k->n_flag = NFLAG_CLEAR;
4489         m68k->v_flag = VFLAG_CLEAR;
4490         m68k->c_flag = CFLAG_CLEAR;
44914491         *r_dst = 0;
44924492         return;
44934493      }
r3535r3536
44974497
44984498      if(quotient == MAKE_INT_16(quotient))
44994499      {
4500         FLAG_Z = quotient;
4501         FLAG_N = NFLAG_16(quotient);
4502         FLAG_V = VFLAG_CLEAR;
4503         FLAG_C = CFLAG_CLEAR;
4500         m68k->not_z_flag = quotient;
4501         m68k->n_flag = NFLAG_16(quotient);
4502         m68k->v_flag = VFLAG_CLEAR;
4503         m68k->c_flag = CFLAG_CLEAR;
45044504         *r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
45054505         return;
45064506      }
4507      FLAG_V = VFLAG_SET;
4507      m68k->v_flag = VFLAG_SET;
45084508      return;
45094509   }
4510   m68ki_exception_trap(EXCEPTION_ZERO_DIVIDE);
4510   m68ki_exception_trap(m68k, EXCEPTION_ZERO_DIVIDE);
45114511}
45124512
45134513
45144514M68KMAKE_OP(divs, 16, ., .)
45154515{
4516   uint* r_dst = &DX;
4517   sint src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16);
4518   sint quotient;
4519   sint remainder;
4516   UINT32* r_dst = &DX;
4517   INT32 src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16);
4518   INT32 quotient;
4519   INT32 remainder;
45204520
45214521   if(src != 0)
45224522   {
4523      if((uint32)*r_dst == 0x80000000 && src == -1)
4523      if((UINT32)*r_dst == 0x80000000 && src == -1)
45244524      {
4525         FLAG_Z = 0;
4526         FLAG_N = NFLAG_CLEAR;
4527         FLAG_V = VFLAG_CLEAR;
4528         FLAG_C = CFLAG_CLEAR;
4525         m68k->not_z_flag = 0;
4526         m68k->n_flag = NFLAG_CLEAR;
4527         m68k->v_flag = VFLAG_CLEAR;
4528         m68k->c_flag = CFLAG_CLEAR;
45294529         *r_dst = 0;
45304530         return;
45314531      }
r3535r3536
45354535
45364536      if(quotient == MAKE_INT_16(quotient))
45374537      {
4538         FLAG_Z = quotient;
4539         FLAG_N = NFLAG_16(quotient);
4540         FLAG_V = VFLAG_CLEAR;
4541         FLAG_C = CFLAG_CLEAR;
4538         m68k->not_z_flag = quotient;
4539         m68k->n_flag = NFLAG_16(quotient);
4540         m68k->v_flag = VFLAG_CLEAR;
4541         m68k->c_flag = CFLAG_CLEAR;
45424542         *r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
45434543         return;
45444544      }
4545      FLAG_V = VFLAG_SET;
4545      m68k->v_flag = VFLAG_SET;
45464546      return;
45474547   }
4548   m68ki_exception_trap(EXCEPTION_ZERO_DIVIDE);
4548   m68ki_exception_trap(m68k, EXCEPTION_ZERO_DIVIDE);
45494549}
45504550
45514551
45524552M68KMAKE_OP(divu, 16, ., d)
45534553{
4554   uint* r_dst = &DX;
4555   uint src = MASK_OUT_ABOVE_16(DY);
4554   UINT32* r_dst = &DX;
4555   UINT32 src = MASK_OUT_ABOVE_16(DY);
45564556
45574557   if(src != 0)
45584558   {
4559      uint quotient = *r_dst / src;
4560      uint remainder = *r_dst % src;
4559      UINT32 quotient = *r_dst / src;
4560      UINT32 remainder = *r_dst % src;
45614561
45624562      if(quotient < 0x10000)
45634563      {
4564         FLAG_Z = quotient;
4565         FLAG_N = NFLAG_16(quotient);
4566         FLAG_V = VFLAG_CLEAR;
4567         FLAG_C = CFLAG_CLEAR;
4564         m68k->not_z_flag = quotient;
4565         m68k->n_flag = NFLAG_16(quotient);
4566         m68k->v_flag = VFLAG_CLEAR;
4567         m68k->c_flag = CFLAG_CLEAR;
45684568         *r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
45694569         return;
45704570      }
4571      FLAG_V = VFLAG_SET;
4571      m68k->v_flag = VFLAG_SET;
45724572      return;
45734573   }
4574   m68ki_exception_trap(EXCEPTION_ZERO_DIVIDE);
4574   m68ki_exception_trap(m68k, EXCEPTION_ZERO_DIVIDE);
45754575}
45764576
45774577
45784578M68KMAKE_OP(divu, 16, ., .)
45794579{
4580   uint* r_dst = &DX;
4581   uint src = M68KMAKE_GET_OPER_AY_16;
4580   UINT32* r_dst = &DX;
4581   UINT32 src = M68KMAKE_GET_OPER_AY_16;
45824582
45834583   if(src != 0)
45844584   {
4585      uint quotient = *r_dst / src;
4586      uint remainder = *r_dst % src;
4585      UINT32 quotient = *r_dst / src;
4586      UINT32 remainder = *r_dst % src;
45874587
45884588      if(quotient < 0x10000)
45894589      {
4590         FLAG_Z = quotient;
4591         FLAG_N = NFLAG_16(quotient);
4592         FLAG_V = VFLAG_CLEAR;
4593         FLAG_C = CFLAG_CLEAR;
4590         m68k->not_z_flag = quotient;
4591         m68k->n_flag = NFLAG_16(quotient);
4592         m68k->v_flag = VFLAG_CLEAR;
4593         m68k->c_flag = CFLAG_CLEAR;
45944594         *r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
45954595         return;
45964596      }
4597      FLAG_V = VFLAG_SET;
4597      m68k->v_flag = VFLAG_SET;
45984598      return;
45994599   }
4600   m68ki_exception_trap(EXCEPTION_ZERO_DIVIDE);
4600   m68ki_exception_trap(m68k, EXCEPTION_ZERO_DIVIDE);
46014601}
46024602
46034603
r3535r3536
46054605{
46064606#if M68K_USE_64_BIT
46074607
4608   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4608   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
46094609   {
4610      uint word2 = OPER_I_16();
4611      uint64 divisor   = DY;
4612      uint64 dividend  = 0;
4613      uint64 quotient  = 0;
4614      uint64 remainder = 0;
4610      UINT32 word2 = OPER_I_16(m68k);
4611      UINT64 divisor   = DY;
4612      UINT64 dividend  = 0;
4613      UINT64 quotient  = 0;
4614      UINT64 remainder = 0;
46154615
46164616      if(divisor != 0)
46174617      {
r3535r3536
46234623
46244624            if(BIT_B(word2))      /* signed */
46254625            {
4626               quotient  = (uint64)((sint64)dividend / (sint64)((sint32)divisor));
4627               remainder = (uint64)((sint64)dividend % (sint64)((sint32)divisor));
4628               if((sint64)quotient != (sint64)((sint32)quotient))
4626               quotient  = (UINT64)((INT64)dividend / (INT64)((INT32)divisor));
4627               remainder = (UINT64)((INT64)dividend % (INT64)((INT32)divisor));
4628               if((INT64)quotient != (INT64)((INT32)quotient))
46294629               {
4630                  FLAG_V = VFLAG_SET;
4630                  m68k->v_flag = VFLAG_SET;
46314631                  return;
46324632               }
46334633            }
r3535r3536
46364636               quotient = dividend / divisor;
46374637               if(quotient > 0xffffffff)
46384638               {
4639                  FLAG_V = VFLAG_SET;
4639                  m68k->v_flag = VFLAG_SET;
46404640                  return;
46414641               }
46424642               remainder = dividend % divisor;
r3535r3536
46474647            dividend = REG_D[(word2 >> 12) & 7];
46484648            if(BIT_B(word2))      /* signed */
46494649            {
4650               quotient  = (uint64)((sint64)((sint32)dividend) / (sint64)((sint32)divisor));
4651               remainder = (uint64)((sint64)((sint32)dividend) % (sint64)((sint32)divisor));
4650               quotient  = (UINT64)((INT64)((INT32)dividend) / (INT64)((INT32)divisor));
4651               remainder = (UINT64)((INT64)((INT32)dividend) % (INT64)((INT32)divisor));
46524652            }
46534653            else               /* unsigned */
46544654            {
r3535r3536
46604660         REG_D[word2 & 7] = remainder;
46614661         REG_D[(word2 >> 12) & 7] = quotient;
46624662
4663         FLAG_N = NFLAG_32(quotient);
4664         FLAG_Z = quotient;
4665         FLAG_V = VFLAG_CLEAR;
4666         FLAG_C = CFLAG_CLEAR;
4663         m68k->n_flag = NFLAG_32(quotient);
4664         m68k->not_z_flag = quotient;
4665         m68k->v_flag = VFLAG_CLEAR;
4666         m68k->c_flag = CFLAG_CLEAR;
46674667         return;
46684668      }
4669      m68ki_exception_trap(EXCEPTION_ZERO_DIVIDE);
4669      m68ki_exception_trap(m68k, EXCEPTION_ZERO_DIVIDE);
46704670      return;
46714671   }
4672   m68ki_exception_illegal();
4672   m68ki_exception_illegal(m68k);
46734673
46744674#else
46754675
4676   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4676   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
46774677   {
4678      uint word2 = OPER_I_16();
4679      uint divisor = DY;
4680      uint dividend_hi = REG_D[word2 & 7];
4681      uint dividend_lo = REG_D[(word2 >> 12) & 7];
4682      uint quotient = 0;
4683      uint remainder = 0;
4684      uint dividend_neg = 0;
4685      uint divisor_neg = 0;
4686      sint i;
4687      uint overflow;
4678      UINT32 word2 = OPER_I_16(m68k);
4679      UINT32 divisor = DY;
4680      UINT32 dividend_hi = REG_D[word2 & 7];
4681      UINT32 dividend_lo = REG_D[(word2 >> 12) & 7];
4682      UINT32 quotient = 0;
4683      UINT32 remainder = 0;
4684      UINT32 dividend_neg = 0;
4685      UINT32 divisor_neg = 0;
4686      INT32 i;
4687      UINT32 overflow;
46884688
46894689      if(divisor != 0)
46904690      {
r3535r3536
46994699                  REG_D[word2 & 7] = 0;
47004700                  REG_D[(word2 >> 12) & 7] = 0x80000000;
47014701
4702                  FLAG_N = NFLAG_SET;
4703                  FLAG_Z = ZFLAG_CLEAR;
4704                  FLAG_V = VFLAG_CLEAR;
4705                  FLAG_C = CFLAG_CLEAR;
4702                  m68k->n_flag = NFLAG_SET;
4703                  m68k->not_z_flag = ZFLAG_CLEAR;
4704                  m68k->v_flag = VFLAG_CLEAR;
4705                  m68k->c_flag = CFLAG_CLEAR;
47064706                  return;
47074707               }
47084708               if(GET_MSB_32(dividend_hi))
47094709               {
47104710                  dividend_neg = 1;
4711                  dividend_hi = (uint)MASK_OUT_ABOVE_32((-(sint)dividend_hi) - (dividend_lo != 0));
4712                  dividend_lo = (uint)MASK_OUT_ABOVE_32(-(sint)dividend_lo);
4711                  dividend_hi = (UINT32)MASK_OUT_ABOVE_32((-(INT32)dividend_hi) - (dividend_lo != 0));
4712                  dividend_lo = (UINT32)MASK_OUT_ABOVE_32(-(INT32)dividend_lo);
47134713               }
47144714               if(GET_MSB_32(divisor))
47154715               {
47164716                  divisor_neg = 1;
4717                  divisor = (uint)MASK_OUT_ABOVE_32(-(sint)divisor);
4717                  divisor = (UINT32)MASK_OUT_ABOVE_32(-(INT32)divisor);
47184718
47194719               }
47204720            }
r3535r3536
47224722            /* if the upper long is greater than the divisor, we're overflowing. */
47234723            if(dividend_hi >= divisor)
47244724            {
4725               FLAG_V = VFLAG_SET;
4725               m68k->v_flag = VFLAG_SET;
47264726               return;
47274727            }
47284728
r3535r3536
47524752            {
47534753               if(quotient > 0x7fffffff)
47544754               {
4755                  FLAG_V = VFLAG_SET;
4755                  m68k->v_flag = VFLAG_SET;
47564756                  return;
47574757               }
47584758               if(dividend_neg)
47594759               {
4760                  remainder = (uint)MASK_OUT_ABOVE_32(-(sint)remainder);
4761                  quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
4760                  remainder = (UINT32)MASK_OUT_ABOVE_32(-(INT32)remainder);
4761                  quotient = (UINT32)MASK_OUT_ABOVE_32(-(INT32)quotient);
47624762               }
47634763               if(divisor_neg)
4764                  quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
4764                  quotient = (UINT32)MASK_OUT_ABOVE_32(-(INT32)quotient);
47654765            }
47664766
47674767            REG_D[word2 & 7] = remainder;
47684768            REG_D[(word2 >> 12) & 7] = quotient;
47694769
4770            FLAG_N = NFLAG_32(quotient);
4771            FLAG_Z = quotient;
4772            FLAG_V = VFLAG_CLEAR;
4773            FLAG_C = CFLAG_CLEAR;
4770            m68k->n_flag = NFLAG_32(quotient);
4771            m68k->not_z_flag = quotient;
4772            m68k->v_flag = VFLAG_CLEAR;
4773            m68k->c_flag = CFLAG_CLEAR;
47744774            return;
47754775         }
47764776
r3535r3536
47804780            /* Special case in divide */
47814781            if(dividend_lo == 0x80000000 && divisor == 0xffffffff)
47824782            {
4783               FLAG_N = NFLAG_SET;
4784               FLAG_Z = ZFLAG_CLEAR;
4785               FLAG_V = VFLAG_CLEAR;
4786               FLAG_C = CFLAG_CLEAR;
4783               m68k->n_flag = NFLAG_SET;
4784               m68k->not_z_flag = ZFLAG_CLEAR;
4785               m68k->v_flag = VFLAG_CLEAR;
4786               m68k->c_flag = CFLAG_CLEAR;
47874787               REG_D[(word2 >> 12) & 7] = 0x80000000;
47884788               REG_D[word2 & 7] = 0;
47894789               return;
r3535r3536
47974797            quotient = REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(dividend_lo) / MASK_OUT_ABOVE_32(divisor);
47984798         }
47994799
4800         FLAG_N = NFLAG_32(quotient);
4801         FLAG_Z = quotient;
4802         FLAG_V = VFLAG_CLEAR;
4803         FLAG_C = CFLAG_CLEAR;
4800         m68k->n_flag = NFLAG_32(quotient);
4801         m68k->not_z_flag = quotient;
4802         m68k->v_flag = VFLAG_CLEAR;
4803         m68k->c_flag = CFLAG_CLEAR;
48044804         return;
48054805      }
4806      m68ki_exception_trap(EXCEPTION_ZERO_DIVIDE);
4806      m68ki_exception_trap(m68k, EXCEPTION_ZERO_DIVIDE);
48074807      return;
48084808   }
4809   m68ki_exception_illegal();
4809   m68ki_exception_illegal(m68k);
48104810
48114811#endif
48124812}
r3535r3536
48164816{
48174817#if M68K_USE_64_BIT
48184818
4819   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4819   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
48204820   {
4821      uint word2 = OPER_I_16();
4822      uint64 divisor = M68KMAKE_GET_OPER_AY_32;
4823      uint64 dividend  = 0;
4824      uint64 quotient  = 0;
4825      uint64 remainder = 0;
4821      UINT32 word2 = OPER_I_16(m68k);
4822      UINT64 divisor = M68KMAKE_GET_OPER_AY_32;
4823      UINT64 dividend  = 0;
4824      UINT64 quotient  = 0;
4825      UINT64 remainder = 0;
48264826
48274827      if(divisor != 0)
48284828      {
r3535r3536
48344834
48354835            if(BIT_B(word2))      /* signed */
48364836            {
4837               quotient  = (uint64)((sint64)dividend / (sint64)((sint32)divisor));
4838               remainder = (uint64)((sint64)dividend % (sint64)((sint32)divisor));
4839               if((sint64)quotient != (sint64)((sint32)quotient))
4837               quotient  = (UINT64)((INT64)dividend / (INT64)((INT32)divisor));
4838               remainder = (UINT64)((INT64)dividend % (INT64)((INT32)divisor));
4839               if((INT64)quotient != (INT64)((INT32)quotient))
48404840               {
4841                  FLAG_V = VFLAG_SET;
4841                  m68k->v_flag = VFLAG_SET;
48424842                  return;
48434843               }
48444844            }
r3535r3536
48474847               quotient = dividend / divisor;
48484848               if(quotient > 0xffffffff)
48494849               {
4850                  FLAG_V = VFLAG_SET;
4850                  m68k->v_flag = VFLAG_SET;
48514851                  return;
48524852               }
48534853               remainder = dividend % divisor;
r3535r3536
48584858            dividend = REG_D[(word2 >> 12) & 7];
48594859            if(BIT_B(word2))      /* signed */
48604860            {
4861               quotient  = (uint64)((sint64)((sint32)dividend) / (sint64)((sint32)divisor));
4862               remainder = (uint64)((sint64)((sint32)dividend) % (sint64)((sint32)divisor));
4861               quotient  = (UINT64)((INT64)((INT32)dividend) / (INT64)((INT32)divisor));
4862               remainder = (UINT64)((INT64)((INT32)dividend) % (INT64)((INT32)divisor));
48634863            }
48644864            else               /* unsigned */
48654865            {
r3535r3536
48714871         REG_D[word2 & 7] = remainder;
48724872         REG_D[(word2 >> 12) & 7] = quotient;
48734873
4874         FLAG_N = NFLAG_32(quotient);
4875         FLAG_Z = quotient;
4876         FLAG_V = VFLAG_CLEAR;
4877         FLAG_C = CFLAG_CLEAR;
4874         m68k->n_flag = NFLAG_32(quotient);
4875         m68k->not_z_flag = quotient;
4876         m68k->v_flag = VFLAG_CLEAR;
4877         m68k->c_flag = CFLAG_CLEAR;
48784878         return;
48794879      }
4880      m68ki_exception_trap(EXCEPTION_ZERO_DIVIDE);
4880      m68ki_exception_trap(m68k, EXCEPTION_ZERO_DIVIDE);
48814881      return;
48824882   }
4883   m68ki_exception_illegal();
4883   m68ki_exception_illegal(m68k);
48844884
48854885#else
48864886
4887   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
4887   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
48884888   {
4889      uint word2 = OPER_I_16();
4890      uint divisor = M68KMAKE_GET_OPER_AY_32;
4891      uint dividend_hi = REG_D[word2 & 7];
4892      uint dividend_lo = REG_D[(word2 >> 12) & 7];
4893      uint quotient = 0;
4894      uint remainder = 0;
4895      uint dividend_neg = 0;
4896      uint divisor_neg = 0;
4897      sint i;
4898      uint overflow;
4889      UINT32 word2 = OPER_I_16(m68k);
4890      UINT32 divisor = M68KMAKE_GET_OPER_AY_32;
4891      UINT32 dividend_hi = REG_D[word2 & 7];
4892      UINT32 dividend_lo = REG_D[(word2 >> 12) & 7];
4893      UINT32 quotient = 0;
4894      UINT32 remainder = 0;
4895      UINT32 dividend_neg = 0;
4896      UINT32 divisor_neg = 0;
4897      INT32 i;
4898      UINT32 overflow;
48994899
49004900      if(divisor != 0)
49014901      {
r3535r3536
49104910                  REG_D[word2 & 7] = 0;
49114911                  REG_D[(word2 >> 12) & 7] = 0x80000000;
49124912
4913                  FLAG_N = NFLAG_SET;
4914                  FLAG_Z = ZFLAG_CLEAR;
4915                  FLAG_V = VFLAG_CLEAR;
4916                  FLAG_C = CFLAG_CLEAR;
4913                  m68k->n_flag = NFLAG_SET;
4914                  m68k->not_z_flag = ZFLAG_CLEAR;
4915                  m68k->v_flag = VFLAG_CLEAR;
4916                  m68k->c_flag = CFLAG_CLEAR;
49174917                  return;
49184918               }
49194919               if(GET_MSB_32(dividend_hi))
49204920               {
49214921                  dividend_neg = 1;
4922                  dividend_hi = (uint)MASK_OUT_ABOVE_32((-(sint)dividend_hi) - (dividend_lo != 0));
4923                  dividend_lo = (uint)MASK_OUT_ABOVE_32(-(sint)dividend_lo);
4922                  dividend_hi = (UINT32)MASK_OUT_ABOVE_32((-(INT32)dividend_hi) - (dividend_lo != 0));
4923                  dividend_lo = (UINT32)MASK_OUT_ABOVE_32(-(INT32)dividend_lo);
49244924               }
49254925               if(GET_MSB_32(divisor))
49264926               {
49274927                  divisor_neg = 1;
4928                  divisor = (uint)MASK_OUT_ABOVE_32(-(sint)divisor);
4928                  divisor = (UINT32)MASK_OUT_ABOVE_32(-(INT32)divisor);
49294929
49304930               }
49314931            }
r3535r3536
49334933            /* if the upper long is greater than the divisor, we're overflowing. */
49344934            if(dividend_hi >= divisor)
49354935            {
4936               FLAG_V = VFLAG_SET;
4936               m68k->v_flag = VFLAG_SET;
49374937               return;
49384938            }
49394939
r3535r3536
49634963            {
49644964               if(quotient > 0x7fffffff)
49654965               {
4966                  FLAG_V = VFLAG_SET;
4966                  m68k->v_flag = VFLAG_SET;
49674967                  return;
49684968               }
49694969               if(dividend_neg)
49704970               {
4971                  remainder = (uint)MASK_OUT_ABOVE_32(-(sint)remainder);
4972                  quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
4971                  remainder = (UINT32)MASK_OUT_ABOVE_32(-(INT32)remainder);
4972                  quotient = (UINT32)MASK_OUT_ABOVE_32(-(INT32)quotient);
49734973               }
49744974               if(divisor_neg)
4975                  quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
4975                  quotient = (UINT32)MASK_OUT_ABOVE_32(-(INT32)quotient);
49764976            }
49774977
49784978            REG_D[word2 & 7] = remainder;
49794979            REG_D[(word2 >> 12) & 7] = quotient;
49804980
4981            FLAG_N = NFLAG_32(quotient);
4982            FLAG_Z = quotient;
4983            FLAG_V = VFLAG_CLEAR;
4984            FLAG_C = CFLAG_CLEAR;
4981            m68k->n_flag = NFLAG_32(quotient);
4982            m68k->not_z_flag = quotient;
4983            m68k->v_flag = VFLAG_CLEAR;
4984            m68k->c_flag = CFLAG_CLEAR;
49854985            return;
49864986         }
49874987
r3535r3536
49914991            /* Special case in divide */
49924992            if(dividend_lo == 0x80000000 && divisor == 0xffffffff)
49934993            {
4994               FLAG_N = NFLAG_SET;
4995               FLAG_Z = ZFLAG_CLEAR;
4996               FLAG_V = VFLAG_CLEAR;
4997               FLAG_C = CFLAG_CLEAR;
4994               m68k->n_flag = NFLAG_SET;
4995               m68k->not_z_flag = ZFLAG_CLEAR;
4996               m68k->v_flag = VFLAG_CLEAR;
4997               m68k->c_flag = CFLAG_CLEAR;
49984998               REG_D[(word2 >> 12) & 7] = 0x80000000;
49994999               REG_D[word2 & 7] = 0;
50005000               return;
r3535r3536
50085008            quotient = REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(dividend_lo) / MASK_OUT_ABOVE_32(divisor);
50095009         }
50105010
5011         FLAG_N = NFLAG_32(quotient);
5012         FLAG_Z = quotient;
5013         FLAG_V = VFLAG_CLEAR;
5014         FLAG_C = CFLAG_CLEAR;
5011         m68k->n_flag = NFLAG_32(quotient);
5012         m68k->not_z_flag = quotient;
5013         m68k->v_flag = VFLAG_CLEAR;
5014         m68k->c_flag = CFLAG_CLEAR;
50155015         return;
50165016      }
5017      m68ki_exception_trap(EXCEPTION_ZERO_DIVIDE);
5017      m68ki_exception_trap(m68k, EXCEPTION_ZERO_DIVIDE);
50185018      return;
50195019   }
5020   m68ki_exception_illegal();
5020   m68ki_exception_illegal(m68k);
50215021
50225022#endif
50235023}
r3535r3536
50255025
50265026M68KMAKE_OP(eor, 8, ., d)
50275027{
5028   uint res = MASK_OUT_ABOVE_8(DY ^= MASK_OUT_ABOVE_8(DX));
5028   UINT32 res = MASK_OUT_ABOVE_8(DY ^= MASK_OUT_ABOVE_8(DX));
50295029
5030   FLAG_N = NFLAG_8(res);
5031   FLAG_Z = res;
5032   FLAG_C = CFLAG_CLEAR;
5033   FLAG_V = VFLAG_CLEAR;
5030   m68k->n_flag = NFLAG_8(res);
5031   m68k->not_z_flag = res;
5032   m68k->c_flag = CFLAG_CLEAR;
5033   m68k->v_flag = VFLAG_CLEAR;
50345034}
50355035
50365036
50375037M68KMAKE_OP(eor, 8, ., .)
50385038{
5039   uint ea = M68KMAKE_GET_EA_AY_8;
5040   uint res = MASK_OUT_ABOVE_8(DX ^ m68ki_read_8(ea));
5039   UINT32 ea = M68KMAKE_GET_EA_AY_8;
5040   UINT32 res = MASK_OUT_ABOVE_8(DX ^ m68ki_read_8(m68k, ea));
50415041
5042   m68ki_write_8(ea, res);
5042   m68ki_write_8(m68k, ea, res);
50435043
5044   FLAG_N = NFLAG_8(res);
5045   FLAG_Z = res;
5046   FLAG_C = CFLAG_CLEAR;
5047   FLAG_V = VFLAG_CLEAR;
5044   m68k->n_flag = NFLAG_8(res);
5045   m68k->not_z_flag = res;
5046   m68k->c_flag = CFLAG_CLEAR;
5047   m68k->v_flag = VFLAG_CLEAR;
50485048}
50495049
50505050
50515051M68KMAKE_OP(eor, 16, ., d)
50525052{
5053   uint res = MASK_OUT_ABOVE_16(DY ^= MASK_OUT_ABOVE_16(DX));
5053   UINT32 res = MASK_OUT_ABOVE_16(DY ^= MASK_OUT_ABOVE_16(DX));
50545054
5055   FLAG_N = NFLAG_16(res);
5056   FLAG_Z = res;
5057   FLAG_C = CFLAG_CLEAR;
5058   FLAG_V = VFLAG_CLEAR;
5055   m68k->n_flag = NFLAG_16(res);
5056   m68k->not_z_flag = res;
5057   m68k->c_flag = CFLAG_CLEAR;
5058   m68k->v_flag = VFLAG_CLEAR;
50595059}
50605060
50615061
50625062M68KMAKE_OP(eor, 16, ., .)
50635063{
5064   uint ea = M68KMAKE_GET_EA_AY_16;
5065   uint res = MASK_OUT_ABOVE_16(DX ^ m68ki_read_16(ea));
5064   UINT32 ea = M68KMAKE_GET_EA_AY_16;
5065   UINT32 res = MASK_OUT_ABOVE_16(DX ^ m68ki_read_16(m68k, ea));
50665066
5067   m68ki_write_16(ea, res);
5067   m68ki_write_16(m68k, ea, res);
50685068
5069   FLAG_N = NFLAG_16(res);
5070   FLAG_Z = res;
5071   FLAG_C = CFLAG_CLEAR;
5072   FLAG_V = VFLAG_CLEAR;
5069   m68k->n_flag = NFLAG_16(res);
5070   m68k->not_z_flag = res;
5071   m68k->c_flag = CFLAG_CLEAR;
5072   m68k->v_flag = VFLAG_CLEAR;
50735073}
50745074
50755075
50765076M68KMAKE_OP(eor, 32, ., d)
50775077{
5078   uint res = DY ^= DX;
5078   UINT32 res = DY ^= DX;
50795079
5080   FLAG_N = NFLAG_32(res);
5081   FLAG_Z = res;
5082   FLAG_C = CFLAG_CLEAR;
5083   FLAG_V = VFLAG_CLEAR;
5080   m68k->n_flag = NFLAG_32(res);
5081   m68k->not_z_flag = res;
5082   m68k->c_flag = CFLAG_CLEAR;
5083   m68k->v_flag = VFLAG_CLEAR;
50845084}
50855085
50865086
50875087M68KMAKE_OP(eor, 32, ., .)
50885088{
5089   uint ea = M68KMAKE_GET_EA_AY_32;
5090   uint res = DX ^ m68ki_read_32(ea);
5089   UINT32 ea = M68KMAKE_GET_EA_AY_32;
5090   UINT32 res = DX ^ m68ki_read_32(m68k, ea);
50915091
5092   m68ki_write_32(ea, res);
5092   m68ki_write_32(m68k, ea, res);
50935093
5094   FLAG_N = NFLAG_32(res);
5095   FLAG_Z = res;
5096   FLAG_C = CFLAG_CLEAR;
5097   FLAG_V = VFLAG_CLEAR;
5094   m68k->n_flag = NFLAG_32(res);
5095   m68k->not_z_flag = res;
5096   m68k->c_flag = CFLAG_CLEAR;
5097   m68k->v_flag = VFLAG_CLEAR;
50985098}
50995099
51005100
51015101M68KMAKE_OP(eori, 8, ., d)
51025102{
5103   uint res = MASK_OUT_ABOVE_8(DY ^= OPER_I_8());
5103   UINT32 res = MASK_OUT_ABOVE_8(DY ^= OPER_I_8(m68k));
51045104
5105   FLAG_N = NFLAG_8(res);
5106   FLAG_Z = res;
5107   FLAG_C = CFLAG_CLEAR;
5108   FLAG_V = VFLAG_CLEAR;
5105   m68k->n_flag = NFLAG_8(res);
5106   m68k->not_z_flag = res;
5107   m68k->c_flag = CFLAG_CLEAR;
5108   m68k->v_flag = VFLAG_CLEAR;
51095109}
51105110
51115111
51125112M68KMAKE_OP(eori, 8, ., .)
51135113{
5114   uint src = OPER_I_8();
5115   uint ea = M68KMAKE_GET_EA_AY_8;
5116   uint res = src ^ m68ki_read_8(ea);
5114   UINT32 src = OPER_I_8(m68k);
5115   UINT32 ea = M68KMAKE_GET_EA_AY_8;
5116   UINT32 res = src ^ m68ki_read_8(m68k, ea);
51175117
5118   m68ki_write_8(ea, res);
5118   m68ki_write_8(m68k, ea, res);
51195119
5120   FLAG_N = NFLAG_8(res);
5121   FLAG_Z = res;
5122   FLAG_C = CFLAG_CLEAR;
5123   FLAG_V = VFLAG_CLEAR;
5120   m68k->n_flag = NFLAG_8(res);
5121   m68k->not_z_flag = res;
5122   m68k->c_flag = CFLAG_CLEAR;
5123   m68k->v_flag = VFLAG_CLEAR;
51245124}
51255125
51265126
51275127M68KMAKE_OP(eori, 16, ., d)
51285128{
5129   uint res = MASK_OUT_ABOVE_16(DY ^= OPER_I_16());
5129   UINT32 res = MASK_OUT_ABOVE_16(DY ^= OPER_I_16(m68k));
51305130
5131   FLAG_N = NFLAG_16(res);
5132   FLAG_Z = res;
5133   FLAG_C = CFLAG_CLEAR;
5134   FLAG_V = VFLAG_CLEAR;
5131   m68k->n_flag = NFLAG_16(res);
5132   m68k->not_z_flag = res;
5133   m68k->c_flag = CFLAG_CLEAR;
5134   m68k->v_flag = VFLAG_CLEAR;
51355135}
51365136
51375137
51385138M68KMAKE_OP(eori, 16, ., .)
51395139{
5140   uint src = OPER_I_16();
5141   uint ea = M68KMAKE_GET_EA_AY_16;
5142   uint res = src ^ m68ki_read_16(ea);
5140   UINT32 src = OPER_I_16(m68k);
5141   UINT32 ea = M68KMAKE_GET_EA_AY_16;
5142   UINT32 res = src ^ m68ki_read_16(m68k, ea);
51435143
5144   m68ki_write_16(ea, res);
5144   m68ki_write_16(m68k, ea, res);
51455145
5146   FLAG_N = NFLAG_16(res);
5147   FLAG_Z = res;
5148   FLAG_C = CFLAG_CLEAR;
5149   FLAG_V = VFLAG_CLEAR;
5146   m68k->n_flag = NFLAG_16(res);
5147   m68k->not_z_flag = res;
5148   m68k->c_flag = CFLAG_CLEAR;
5149   m68k->v_flag = VFLAG_CLEAR;
51505150}
51515151
51525152
51535153M68KMAKE_OP(eori, 32, ., d)
51545154{
5155   uint res = DY ^= OPER_I_32();
5155   UINT32 res = DY ^= OPER_I_32(m68k);
51565156
5157   FLAG_N = NFLAG_32(res);
5158   FLAG_Z = res;
5159   FLAG_C = CFLAG_CLEAR;
5160   FLAG_V = VFLAG_CLEAR;
5157   m68k->n_flag = NFLAG_32(res);
5158   m68k->not_z_flag = res;
5159   m68k->c_flag = CFLAG_CLEAR;
5160   m68k->v_flag = VFLAG_CLEAR;
51615161}
51625162
51635163
51645164M68KMAKE_OP(eori, 32, ., .)
51655165{
5166   uint src = OPER_I_32();
5167   uint ea = M68KMAKE_GET_EA_AY_32;
5168   uint res = src ^ m68ki_read_32(ea);
5166   UINT32 src = OPER_I_32(m68k);
5167   UINT32 ea = M68KMAKE_GET_EA_AY_32;
5168   UINT32 res = src ^ m68ki_read_32(m68k, ea);
51695169
5170   m68ki_write_32(ea, res);
5170   m68ki_write_32(m68k, ea, res);
51715171
5172   FLAG_N = NFLAG_32(res);
5173   FLAG_Z = res;
5174   FLAG_C = CFLAG_CLEAR;
5175   FLAG_V = VFLAG_CLEAR;
5172   m68k->n_flag = NFLAG_32(res);
5173   m68k->not_z_flag = res;
5174   m68k->c_flag = CFLAG_CLEAR;
5175   m68k->v_flag = VFLAG_CLEAR;
51765176}
51775177
51785178
51795179M68KMAKE_OP(eori, 16, toc, .)
51805180{
5181   m68ki_set_ccr(m68ki_get_ccr() ^ OPER_I_16());
5181   m68ki_set_ccr(m68k, m68ki_get_ccr(m68k) ^ OPER_I_16(m68k));
51825182}
51835183
51845184
51855185M68KMAKE_OP(eori, 16, tos, .)
51865186{
5187   if(FLAG_S)
5187   if(m68k->s_flag)
51885188   {
5189      uint src = OPER_I_16();
5189      UINT32 src = OPER_I_16(m68k);
51905190      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
5191      m68ki_set_sr(m68ki_get_sr() ^ src);
5191      m68ki_set_sr(m68k, m68ki_get_sr(m68k) ^ src);
51925192      return;
51935193   }
5194   m68ki_exception_privilege_violation();
5194   m68ki_exception_privilege_violation(m68k);
51955195}
51965196
51975197
51985198M68KMAKE_OP(exg, 32, dd, .)
51995199{
5200   uint* reg_a = &DX;
5201   uint* reg_b = &DY;
5202   uint tmp = *reg_a;
5200   UINT32* reg_a = &DX;
5201   UINT32* reg_b = &DY;
5202   UINT32 tmp = *reg_a;
52035203   *reg_a = *reg_b;
52045204   *reg_b = tmp;
52055205}
r3535r3536
52075207
52085208M68KMAKE_OP(exg, 32, aa, .)
52095209{
5210   uint* reg_a = &AX;
5211   uint* reg_b = &AY;
5212   uint tmp = *reg_a;
5210   UINT32* reg_a = &AX;
5211   UINT32* reg_b = &AY;
5212   UINT32 tmp = *reg_a;
52135213   *reg_a = *reg_b;
52145214   *reg_b = tmp;
52155215}
r3535r3536
52175217
52185218M68KMAKE_OP(exg, 32, da, .)
52195219{
5220   uint* reg_a = &DX;
5221   uint* reg_b = &AY;
5222   uint tmp = *reg_a;
5220   UINT32* reg_a = &DX;
5221   UINT32* reg_b = &AY;
5222   UINT32 tmp = *reg_a;
52235223   *reg_a = *reg_b;
52245224   *reg_b = tmp;
52255225}
r3535r3536
52275227
52285228M68KMAKE_OP(ext, 16, ., .)
52295229{
5230   uint* r_dst = &DY;
5230   UINT32* r_dst = &DY;
52315231
52325232   *r_dst = MASK_OUT_BELOW_16(*r_dst) | MASK_OUT_ABOVE_8(*r_dst) | (GET_MSB_8(*r_dst) ? 0xff00 : 0);
52335233
5234   FLAG_N = NFLAG_16(*r_dst);
5235   FLAG_Z = MASK_OUT_ABOVE_16(*r_dst);
5236   FLAG_V = VFLAG_CLEAR;
5237   FLAG_C = CFLAG_CLEAR;
5234   m68k->n_flag = NFLAG_16(*r_dst);
5235   m68k->not_z_flag = MASK_OUT_ABOVE_16(*r_dst);
5236   m68k->v_flag = VFLAG_CLEAR;
5237   m68k->c_flag = CFLAG_CLEAR;
52385238}
52395239
52405240
52415241M68KMAKE_OP(ext, 32, ., .)
52425242{
5243   uint* r_dst = &DY;
5243   UINT32* r_dst = &DY;
52445244
52455245   *r_dst = MASK_OUT_ABOVE_16(*r_dst) | (GET_MSB_16(*r_dst) ? 0xffff0000 : 0);
52465246
5247   FLAG_N = NFLAG_32(*r_dst);
5248   FLAG_Z = *r_dst;
5249   FLAG_V = VFLAG_CLEAR;
5250   FLAG_C = CFLAG_CLEAR;
5247   m68k->n_flag = NFLAG_32(*r_dst);
5248   m68k->not_z_flag = *r_dst;
5249   m68k->v_flag = VFLAG_CLEAR;
5250   m68k->c_flag = CFLAG_CLEAR;
52515251}
52525252
52535253
52545254M68KMAKE_OP(extb, 32, ., .)
52555255{
5256   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
5256   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
52575257   {
5258      uint* r_dst = &DY;
5258      UINT32* r_dst = &DY;
52595259
52605260      *r_dst = MASK_OUT_ABOVE_8(*r_dst) | (GET_MSB_8(*r_dst) ? 0xffffff00 : 0);
52615261
5262      FLAG_N = NFLAG_32(*r_dst);
5263      FLAG_Z = *r_dst;
5264      FLAG_V = VFLAG_CLEAR;
5265      FLAG_C = CFLAG_CLEAR;
5262      m68k->n_flag = NFLAG_32(*r_dst);
5263      m68k->not_z_flag = *r_dst;
5264      m68k->v_flag = VFLAG_CLEAR;
5265      m68k->c_flag = CFLAG_CLEAR;
52665266      return;
52675267   }
5268   m68ki_exception_illegal();
5268   m68ki_exception_illegal(m68k);
52695269}
52705270
52715271
52725272M68KMAKE_OP(illegal, 0, ., .)
52735273{
5274   m68ki_exception_illegal();
5274   m68ki_exception_illegal(m68k);
52755275}
52765276
52775277M68KMAKE_OP(jmp, 32, ., .)
52785278{
5279   m68ki_jump(M68KMAKE_GET_EA_AY_32);
5279   m68ki_jump(m68k, M68KMAKE_GET_EA_AY_32);
52805280   m68ki_trace_t0();               /* auto-disable (see m68kcpu.h) */
52815281   if(REG_PC == REG_PPC)
5282      USE_ALL_CYCLES();
5282      USE_ALL_CYCLES(m68k);
52835283}
52845284
52855285
52865286M68KMAKE_OP(jsr, 32, ., .)
52875287{
5288   uint ea = M68KMAKE_GET_EA_AY_32;
5288   UINT32 ea = M68KMAKE_GET_EA_AY_32;
52895289   m68ki_trace_t0();               /* auto-disable (see m68kcpu.h) */
5290   m68ki_push_32(REG_PC);
5291   m68ki_jump(ea);
5290   m68ki_push_32(m68k, REG_PC);
5291   m68ki_jump(m68k, ea);
52925292}
52935293
52945294
r3535r3536
53015301M68KMAKE_OP(link, 16, ., a7)
53025302{
53035303   REG_A[7] -= 4;
5304   m68ki_write_32(REG_A[7], REG_A[7]);
5305   REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + MAKE_INT_16(OPER_I_16()));
5304   m68ki_write_32(m68k, REG_A[7], REG_A[7]);
5305   REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + MAKE_INT_16(OPER_I_16(m68k)));
53065306}
53075307
53085308
53095309M68KMAKE_OP(link, 16, ., .)
53105310{
5311   uint* r_dst = &AY;
5311   UINT32* r_dst = &AY;
53125312
5313   m68ki_push_32(*r_dst);
5313   m68ki_push_32(m68k, *r_dst);
53145314   *r_dst = REG_A[7];
5315   REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + MAKE_INT_16(OPER_I_16()));
5315   REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + MAKE_INT_16(OPER_I_16(m68k)));
53165316}
53175317
53185318
53195319M68KMAKE_OP(link, 32, ., a7)
53205320{
5321   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
5321   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
53225322   {
53235323      REG_A[7] -= 4;
5324      m68ki_write_32(REG_A[7], REG_A[7]);
5325      REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + OPER_I_32());
5324      m68ki_write_32(m68k, REG_A[7], REG_A[7]);
5325      REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + OPER_I_32(m68k));
53265326      return;
53275327   }
5328   m68ki_exception_illegal();
5328   m68ki_exception_illegal(m68k);
53295329}
53305330
53315331
53325332M68KMAKE_OP(link, 32, ., .)
53335333{
5334   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
5334   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
53355335   {
5336      uint* r_dst = &AY;
5336      UINT32* r_dst = &AY;
53375337
5338      m68ki_push_32(*r_dst);
5338      m68ki_push_32(m68k, *r_dst);
53395339      *r_dst = REG_A[7];
5340      REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + OPER_I_32());
5340      REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + OPER_I_32(m68k));
53415341      return;
53425342   }
5343   m68ki_exception_illegal();
5343   m68ki_exception_illegal(m68k);
53445344}
53455345
53465346
53475347M68KMAKE_OP(lsr, 8, s, .)
53485348{
5349   uint* r_dst = &DY;
5350   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
5351   uint src = MASK_OUT_ABOVE_8(*r_dst);
5352   uint res = src >> shift;
5349   UINT32* r_dst = &DY;
5350   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
5351   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
5352   UINT32 res = src >> shift;
53535353
53545354   if(shift != 0)
5355      USE_CYCLES(shift<<CYC_SHIFT);
5355      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
53565356
53575357   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
53585358
5359   FLAG_N = NFLAG_CLEAR;
5360   FLAG_Z = res;
5361   FLAG_X = FLAG_C = src << (9-shift);
5362   FLAG_V = VFLAG_CLEAR;
5359   m68k->n_flag = NFLAG_CLEAR;
5360   m68k->not_z_flag = res;
5361   m68k->x_flag = m68k->c_flag = src << (9-shift);
5362   m68k->v_flag = VFLAG_CLEAR;
53635363}
53645364
53655365
53665366M68KMAKE_OP(lsr, 16, s, .)
53675367{
5368   uint* r_dst = &DY;
5369   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
5370   uint src = MASK_OUT_ABOVE_16(*r_dst);
5371   uint res = src >> shift;
5368   UINT32* r_dst = &DY;
5369   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
5370   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
5371   UINT32 res = src >> shift;
53725372
53735373   if(shift != 0)
5374      USE_CYCLES(shift<<CYC_SHIFT);
5374      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
53755375
53765376   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
53775377
5378   FLAG_N = NFLAG_CLEAR;
5379   FLAG_Z = res;
5380   FLAG_X = FLAG_C = src << (9-shift);
5381   FLAG_V = VFLAG_CLEAR;
5378   m68k->n_flag = NFLAG_CLEAR;
5379   m68k->not_z_flag = res;
5380   m68k->x_flag = m68k->c_flag = src << (9-shift);
5381   m68k->v_flag = VFLAG_CLEAR;
53825382}
53835383
53845384
53855385M68KMAKE_OP(lsr, 32, s, .)
53865386{
5387   uint* r_dst = &DY;
5388   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
5389   uint src = *r_dst;
5390   uint res = src >> shift;
5387   UINT32* r_dst = &DY;
5388   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
5389   UINT32 src = *r_dst;
5390   UINT32 res = src >> shift;
53915391
53925392   if(shift != 0)
5393      USE_CYCLES(shift<<CYC_SHIFT);
5393      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
53945394
53955395   *r_dst = res;
53965396
5397   FLAG_N = NFLAG_CLEAR;
5398   FLAG_Z = res;
5399   FLAG_X = FLAG_C = src << (9-shift);
5400   FLAG_V = VFLAG_CLEAR;
5397   m68k->n_flag = NFLAG_CLEAR;
5398   m68k->not_z_flag = res;
5399   m68k->x_flag = m68k->c_flag = src << (9-shift);
5400   m68k->v_flag = VFLAG_CLEAR;
54015401}
54025402
54035403
54045404M68KMAKE_OP(lsr, 8, r, .)
54055405{
5406   uint* r_dst = &DY;
5407   uint shift = DX & 0x3f;
5408   uint src = MASK_OUT_ABOVE_8(*r_dst);
5409   uint res = src >> shift;
5406   UINT32* r_dst = &DY;
5407   UINT32 shift = DX & 0x3f;
5408   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
5409   UINT32 res = src >> shift;
54105410
54115411   if(shift != 0)
54125412   {
5413      USE_CYCLES(shift<<CYC_SHIFT);
5413      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
54145414
54155415      if(shift <= 8)
54165416      {
54175417         *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
5418         FLAG_X = FLAG_C = src << (9-shift);
5419         FLAG_N = NFLAG_CLEAR;
5420         FLAG_Z = res;
5421         FLAG_V = VFLAG_CLEAR;
5418         m68k->x_flag = m68k->c_flag = src << (9-shift);
5419         m68k->n_flag = NFLAG_CLEAR;
5420         m68k->not_z_flag = res;
5421         m68k->v_flag = VFLAG_CLEAR;
54225422         return;
54235423      }
54245424
54255425      *r_dst &= 0xffffff00;
5426      FLAG_X = XFLAG_CLEAR;
5427      FLAG_C = CFLAG_CLEAR;
5428      FLAG_N = NFLAG_CLEAR;
5429      FLAG_Z = ZFLAG_SET;
5430      FLAG_V = VFLAG_CLEAR;
5426      m68k->x_flag = XFLAG_CLEAR;
5427      m68k->c_flag = CFLAG_CLEAR;
5428      m68k->n_flag = NFLAG_CLEAR;
5429      m68k->not_z_flag = ZFLAG_SET;
5430      m68k->v_flag = VFLAG_CLEAR;
54315431      return;
54325432   }
54335433
5434   FLAG_C = CFLAG_CLEAR;
5435   FLAG_N = NFLAG_8(src);
5436   FLAG_Z = src;
5437   FLAG_V = VFLAG_CLEAR;
5434   m68k->c_flag = CFLAG_CLEAR;
5435   m68k->n_flag = NFLAG_8(src);
5436   m68k->not_z_flag = src;
5437   m68k->v_flag = VFLAG_CLEAR;
54385438}
54395439
54405440
54415441M68KMAKE_OP(lsr, 16, r, .)
54425442{
5443   uint* r_dst = &DY;
5444   uint shift = DX & 0x3f;
5445   uint src = MASK_OUT_ABOVE_16(*r_dst);
5446   uint res = src >> shift;
5443   UINT32* r_dst = &DY;
5444   UINT32 shift = DX & 0x3f;
5445   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
5446   UINT32 res = src >> shift;
54475447
54485448   if(shift != 0)
54495449   {
5450      USE_CYCLES(shift<<CYC_SHIFT);
5450      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
54515451
54525452      if(shift <= 16)
54535453      {
54545454         *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
5455         FLAG_C = FLAG_X = (src >> (shift - 1))<<8;
5456         FLAG_N = NFLAG_CLEAR;
5457         FLAG_Z = res;
5458         FLAG_V = VFLAG_CLEAR;
5455         m68k->c_flag = m68k->x_flag = (src >> (shift - 1))<<8;
5456         m68k->n_flag = NFLAG_CLEAR;
5457         m68k->not_z_flag = res;
5458         m68k->v_flag = VFLAG_CLEAR;
54595459         return;
54605460      }
54615461
54625462      *r_dst &= 0xffff0000;
5463      FLAG_X = XFLAG_CLEAR;
5464      FLAG_C = CFLAG_CLEAR;
5465      FLAG_N = NFLAG_CLEAR;
5466      FLAG_Z = ZFLAG_SET;
5467      FLAG_V = VFLAG_CLEAR;
5463      m68k->x_flag = XFLAG_CLEAR;
5464      m68k->c_flag = CFLAG_CLEAR;
5465      m68k->n_flag = NFLAG_CLEAR;
5466      m68k->not_z_flag = ZFLAG_SET;
5467      m68k->v_flag = VFLAG_CLEAR;
54685468      return;
54695469   }
54705470
5471   FLAG_C = CFLAG_CLEAR;
5472   FLAG_N = NFLAG_16(src);
5473   FLAG_Z = src;
5474   FLAG_V = VFLAG_CLEAR;
5471   m68k->c_flag = CFLAG_CLEAR;
5472   m68k->n_flag = NFLAG_16(src);
5473   m68k->not_z_flag = src;
5474   m68k->v_flag = VFLAG_CLEAR;
54755475}
54765476
54775477
54785478M68KMAKE_OP(lsr, 32, r, .)
54795479{
5480   uint* r_dst = &DY;
5481   uint shift = DX & 0x3f;
5482   uint src = *r_dst;
5483   uint res = src >> shift;
5480   UINT32* r_dst = &DY;
5481   UINT32 shift = DX & 0x3f;
5482   UINT32 src = *r_dst;
5483   UINT32 res = src >> shift;
54845484
54855485   if(shift != 0)
54865486   {
5487      USE_CYCLES(shift<<CYC_SHIFT);
5487      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
54885488
54895489      if(shift < 32)
54905490      {
54915491         *r_dst = res;
5492         FLAG_C = FLAG_X = (src >> (shift - 1))<<8;
5493         FLAG_N = NFLAG_CLEAR;
5494         FLAG_Z = res;
5495         FLAG_V = VFLAG_CLEAR;
5492         m68k->c_flag = m68k->x_flag = (src >> (shift - 1))<<8;
5493         m68k->n_flag = NFLAG_CLEAR;
5494         m68k->not_z_flag = res;
5495         m68k->v_flag = VFLAG_CLEAR;
54965496         return;
54975497      }
54985498
54995499      *r_dst = 0;
5500      FLAG_X = FLAG_C = (shift == 32 ? GET_MSB_32(src)>>23 : 0);
5501      FLAG_N = NFLAG_CLEAR;
5502      FLAG_Z = ZFLAG_SET;
5503      FLAG_V = VFLAG_CLEAR;
5500      m68k->x_flag = m68k->c_flag = (shift == 32 ? GET_MSB_32(src)>>23 : 0);
5501      m68k->n_flag = NFLAG_CLEAR;
5502      m68k->not_z_flag = ZFLAG_SET;
5503      m68k->v_flag = VFLAG_CLEAR;
55045504      return;
55055505   }
55065506
5507   FLAG_C = CFLAG_CLEAR;
5508   FLAG_N = NFLAG_32(src);
5509   FLAG_Z = src;
5510   FLAG_V = VFLAG_CLEAR;
5507   m68k->c_flag = CFLAG_CLEAR;
5508   m68k->n_flag = NFLAG_32(src);
5509   m68k->not_z_flag = src;
5510   m68k->v_flag = VFLAG_CLEAR;
55115511}
55125512
55135513
55145514M68KMAKE_OP(lsr, 16, ., .)
55155515{
5516   uint ea = M68KMAKE_GET_EA_AY_16;
5517   uint src = m68ki_read_16(ea);
5518   uint res = src >> 1;
5516   UINT32 ea = M68KMAKE_GET_EA_AY_16;
5517   UINT32 src = m68ki_read_16(m68k, ea);
5518   UINT32 res = src >> 1;
55195519
5520   m68ki_write_16(ea, res);
5520   m68ki_write_16(m68k, ea, res);
55215521
5522   FLAG_N = NFLAG_CLEAR;
5523   FLAG_Z = res;
5524   FLAG_C = FLAG_X = src << 8;
5525   FLAG_V = VFLAG_CLEAR;
5522   m68k->n_flag = NFLAG_CLEAR;
5523   m68k->not_z_flag = res;
5524   m68k->c_flag = m68k->x_flag = src << 8;
5525   m68k->v_flag = VFLAG_CLEAR;
55265526}
55275527
55285528
55295529M68KMAKE_OP(lsl, 8, s, .)
55305530{
5531   uint* r_dst = &DY;
5532   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
5533   uint src = MASK_OUT_ABOVE_8(*r_dst);
5534   uint res = MASK_OUT_ABOVE_8(src << shift);
5531   UINT32* r_dst = &DY;
5532   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
5533   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
5534   UINT32 res = MASK_OUT_ABOVE_8(src << shift);
55355535
55365536   if(shift != 0)
5537      USE_CYCLES(shift<<CYC_SHIFT);
5537      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
55385538
55395539   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
55405540
5541   FLAG_N = NFLAG_8(res);
5542   FLAG_Z = res;
5543   FLAG_X = FLAG_C = src << shift;
5544   FLAG_V = VFLAG_CLEAR;
5541   m68k->n_flag = NFLAG_8(res);
5542   m68k->not_z_flag = res;
5543   m68k->x_flag = m68k->c_flag = src << shift;
5544   m68k->v_flag = VFLAG_CLEAR;
55455545}
55465546
55475547
55485548M68KMAKE_OP(lsl, 16, s, .)
55495549{
5550   uint* r_dst = &DY;
5551   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
5552   uint src = MASK_OUT_ABOVE_16(*r_dst);
5553   uint res = MASK_OUT_ABOVE_16(src << shift);
5550   UINT32* r_dst = &DY;
5551   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
5552   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
5553   UINT32 res = MASK_OUT_ABOVE_16(src << shift);
55545554
55555555   if(shift != 0)
5556      USE_CYCLES(shift<<CYC_SHIFT);
5556      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
55575557
55585558   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
55595559
5560   FLAG_N = NFLAG_16(res);
5561   FLAG_Z = res;
5562   FLAG_X = FLAG_C = src >> (8-shift);
5563   FLAG_V = VFLAG_CLEAR;
5560   m68k->n_flag = NFLAG_16(res);
5561   m68k->not_z_flag = res;
5562   m68k->x_flag = m68k->c_flag = src >> (8-shift);
5563   m68k->v_flag = VFLAG_CLEAR;
55645564}
55655565
55665566
55675567M68KMAKE_OP(lsl, 32, s, .)
55685568{
5569   uint* r_dst = &DY;
5570   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
5571   uint src = *r_dst;
5572   uint res = MASK_OUT_ABOVE_32(src << shift);
5569   UINT32* r_dst = &DY;
5570   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
5571   UINT32 src = *r_dst;
5572   UINT32 res = MASK_OUT_ABOVE_32(src << shift);
55735573
55745574   if(shift != 0)
5575      USE_CYCLES(shift<<CYC_SHIFT);
5575      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
55765576
55775577   *r_dst = res;
55785578
5579   FLAG_N = NFLAG_32(res);
5580   FLAG_Z = res;
5581   FLAG_X = FLAG_C = src >> (24-shift);
5582   FLAG_V = VFLAG_CLEAR;
5579   m68k->n_flag = NFLAG_32(res);
5580   m68k->not_z_flag = res;
5581   m68k->x_flag = m68k->c_flag = src >> (24-shift);
5582   m68k->v_flag = VFLAG_CLEAR;
55835583}
55845584
55855585
55865586M68KMAKE_OP(lsl, 8, r, .)
55875587{
5588   uint* r_dst = &DY;
5589   uint shift = DX & 0x3f;
5590   uint src = MASK_OUT_ABOVE_8(*r_dst);
5591   uint res = MASK_OUT_ABOVE_8(src << shift);
5588   UINT32* r_dst = &DY;
5589   UINT32 shift = DX & 0x3f;
5590   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
5591   UINT32 res = MASK_OUT_ABOVE_8(src << shift);
55925592
55935593   if(shift != 0)
55945594   {
5595      USE_CYCLES(shift<<CYC_SHIFT);
5595      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
55965596
55975597      if(shift <= 8)
55985598      {
55995599         *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
5600         FLAG_X = FLAG_C = src << shift;
5601         FLAG_N = NFLAG_8(res);
5602         FLAG_Z = res;
5603         FLAG_V = VFLAG_CLEAR;
5600         m68k->x_flag = m68k->c_flag = src << shift;
5601         m68k->n_flag = NFLAG_8(res);
5602         m68k->not_z_flag = res;
5603         m68k->v_flag = VFLAG_CLEAR;
56045604         return;
56055605      }
56065606
56075607      *r_dst &= 0xffffff00;
5608      FLAG_X = XFLAG_CLEAR;
5609      FLAG_C = CFLAG_CLEAR;
5610      FLAG_N = NFLAG_CLEAR;
5611      FLAG_Z = ZFLAG_SET;
5612      FLAG_V = VFLAG_CLEAR;
5608      m68k->x_flag = XFLAG_CLEAR;
5609      m68k->c_flag = CFLAG_CLEAR;
5610      m68k->n_flag = NFLAG_CLEAR;
5611      m68k->not_z_flag = ZFLAG_SET;
5612      m68k->v_flag = VFLAG_CLEAR;
56135613      return;
56145614   }
56155615
5616   FLAG_C = CFLAG_CLEAR;
5617   FLAG_N = NFLAG_8(src);
5618   FLAG_Z = src;
5619   FLAG_V = VFLAG_CLEAR;
5616   m68k->c_flag = CFLAG_CLEAR;
5617   m68k->n_flag = NFLAG_8(src);
5618   m68k->not_z_flag = src;
5619   m68k->v_flag = VFLAG_CLEAR;
56205620}
56215621
56225622
56235623M68KMAKE_OP(lsl, 16, r, .)
56245624{
5625   uint* r_dst = &DY;
5626   uint shift = DX & 0x3f;
5627   uint src = MASK_OUT_ABOVE_16(*r_dst);
5628   uint res = MASK_OUT_ABOVE_16(src << shift);
5625   UINT32* r_dst = &DY;
5626   UINT32 shift = DX & 0x3f;
5627   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
5628   UINT32 res = MASK_OUT_ABOVE_16(src << shift);
56295629
56305630   if(shift != 0)
56315631   {
5632      USE_CYCLES(shift<<CYC_SHIFT);
5632      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
56335633
56345634      if(shift <= 16)
56355635      {
56365636         *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
5637         FLAG_X = FLAG_C = (src << shift) >> 8;
5638         FLAG_N = NFLAG_16(res);
5639         FLAG_Z = res;
5640         FLAG_V = VFLAG_CLEAR;
5637         m68k->x_flag = m68k->c_flag = (src << shift) >> 8;
5638         m68k->n_flag = NFLAG_16(res);
5639         m68k->not_z_flag = res;
5640         m68k->v_flag = VFLAG_CLEAR;
56415641         return;
56425642      }
56435643
56445644      *r_dst &= 0xffff0000;
5645      FLAG_X = XFLAG_CLEAR;
5646      FLAG_C = CFLAG_CLEAR;
5647      FLAG_N = NFLAG_CLEAR;
5648      FLAG_Z = ZFLAG_SET;
5649      FLAG_V = VFLAG_CLEAR;
5645      m68k->x_flag = XFLAG_CLEAR;
5646      m68k->c_flag = CFLAG_CLEAR;
5647      m68k->n_flag = NFLAG_CLEAR;
5648      m68k->not_z_flag = ZFLAG_SET;
5649      m68k->v_flag = VFLAG_CLEAR;
56505650      return;
56515651   }
56525652
5653   FLAG_C = CFLAG_CLEAR;
5654   FLAG_N = NFLAG_16(src);
5655   FLAG_Z = src;
5656   FLAG_V = VFLAG_CLEAR;
5653   m68k->c_flag = CFLAG_CLEAR;
5654   m68k->n_flag = NFLAG_16(src);
5655   m68k->not_z_flag = src;
5656   m68k->v_flag = VFLAG_CLEAR;
56575657}
56585658
56595659
56605660M68KMAKE_OP(lsl, 32, r, .)
56615661{
5662   uint* r_dst = &DY;
5663   uint shift = DX & 0x3f;
5664   uint src = *r_dst;
5665   uint res = MASK_OUT_ABOVE_32(src << shift);
5662   UINT32* r_dst = &DY;
5663   UINT32 shift = DX & 0x3f;
5664   UINT32 src = *r_dst;
5665   UINT32 res = MASK_OUT_ABOVE_32(src << shift);
56665666
56675667   if(shift != 0)
56685668   {
5669      USE_CYCLES(shift<<CYC_SHIFT);
5669      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
56705670
56715671      if(shift < 32)
56725672      {
56735673         *r_dst = res;
5674         FLAG_X = FLAG_C = (src >> (32 - shift)) << 8;
5675         FLAG_N = NFLAG_32(res);
5676         FLAG_Z = res;
5677         FLAG_V = VFLAG_CLEAR;
5674         m68k->x_flag = m68k->c_flag = (src >> (32 - shift)) << 8;
5675         m68k->n_flag = NFLAG_32(res);
5676         m68k->not_z_flag = res;
5677         m68k->v_flag = VFLAG_CLEAR;
56785678         return;
56795679      }
56805680
56815681      *r_dst = 0;
5682      FLAG_X = FLAG_C = ((shift == 32 ? src & 1 : 0))<<8;
5683      FLAG_N = NFLAG_CLEAR;
5684      FLAG_Z = ZFLAG_SET;
5685      FLAG_V = VFLAG_CLEAR;
5682      m68k->x_flag = m68k->c_flag = ((shift == 32 ? src & 1 : 0))<<8;
5683      m68k->n_flag = NFLAG_CLEAR;
5684      m68k->not_z_flag = ZFLAG_SET;
5685      m68k->v_flag = VFLAG_CLEAR;
56865686      return;
56875687   }
56885688
5689   FLAG_C = CFLAG_CLEAR;
5690   FLAG_N = NFLAG_32(src);
5691   FLAG_Z = src;
5692   FLAG_V = VFLAG_CLEAR;
5689   m68k->c_flag = CFLAG_CLEAR;
5690   m68k->n_flag = NFLAG_32(src);
5691   m68k->not_z_flag = src;
5692   m68k->v_flag = VFLAG_CLEAR;
56935693}
56945694
56955695
56965696M68KMAKE_OP(lsl, 16, ., .)
56975697{
5698   uint ea = M68KMAKE_GET_EA_AY_16;
5699   uint src = m68ki_read_16(ea);
5700   uint res = MASK_OUT_ABOVE_16(src << 1);
5698   UINT32 ea = M68KMAKE_GET_EA_AY_16;
5699   UINT32 src = m68ki_read_16(m68k, ea);
5700   UINT32 res = MASK_OUT_ABOVE_16(src << 1);
57015701
5702   m68ki_write_16(ea, res);
5702   m68ki_write_16(m68k, ea, res);
57035703
5704   FLAG_N = NFLAG_16(res);
5705   FLAG_Z = res;
5706   FLAG_X = FLAG_C = src >> 7;
5707   FLAG_V = VFLAG_CLEAR;
5704   m68k->n_flag = NFLAG_16(res);
5705   m68k->not_z_flag = res;
5706   m68k->x_flag = m68k->c_flag = src >> 7;
5707   m68k->v_flag = VFLAG_CLEAR;
57085708}
57095709
57105710
57115711M68KMAKE_OP(move, 8, d, d)
57125712{
5713   uint res = MASK_OUT_ABOVE_8(DY);
5714   uint* r_dst = &DX;
5713   UINT32 res = MASK_OUT_ABOVE_8(DY);
5714   UINT32* r_dst = &DX;
57155715
57165716   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
57175717
5718   FLAG_N = NFLAG_8(res);
5719   FLAG_Z = res;
5720   FLAG_V = VFLAG_CLEAR;
5721   FLAG_C = CFLAG_CLEAR;
5718   m68k->n_flag = NFLAG_8(res);
5719   m68k->not_z_flag = res;
5720   m68k->v_flag = VFLAG_CLEAR;
5721   m68k->c_flag = CFLAG_CLEAR;
57225722}
57235723
57245724
57255725M68KMAKE_OP(move, 8, d, .)
57265726{
5727   uint res = M68KMAKE_GET_OPER_AY_8;
5728   uint* r_dst = &DX;
5727   UINT32 res = M68KMAKE_GET_OPER_AY_8;
5728   UINT32* r_dst = &DX;
57295729
57305730   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
57315731
5732   FLAG_N = NFLAG_8(res);
5733   FLAG_Z = res;
5734   FLAG_V = VFLAG_CLEAR;
5735   FLAG_C = CFLAG_CLEAR;
5732   m68k->n_flag = NFLAG_8(res);
5733   m68k->not_z_flag = res;
5734   m68k->v_flag = VFLAG_CLEAR;
5735   m68k->c_flag = CFLAG_CLEAR;
57365736}
57375737
57385738
57395739M68KMAKE_OP(move, 8, ai, d)
57405740{
5741   uint res = MASK_OUT_ABOVE_8(DY);
5742   uint ea = EA_AX_AI_8();
5741   UINT32 res = MASK_OUT_ABOVE_8(DY);
5742   UINT32 ea = EA_AX_AI_8(m68k);
57435743
5744   m68ki_write_8(ea, res);
5744   m68ki_write_8(m68k, ea, res);
57455745
5746   FLAG_N = NFLAG_8(res);
5747   FLAG_Z = res;
5748   FLAG_V = VFLAG_CLEAR;
5749   FLAG_C = CFLAG_CLEAR;
5746   m68k->n_flag = NFLAG_8(res);
5747   m68k->not_z_flag = res;
5748   m68k->v_flag = VFLAG_CLEAR;
5749   m68k->c_flag = CFLAG_CLEAR;
57505750}
57515751
57525752
57535753M68KMAKE_OP(move, 8, ai, .)
57545754{
5755   uint res = M68KMAKE_GET_OPER_AY_8;
5756   uint ea = EA_AX_AI_8();
5755   UINT32 res = M68KMAKE_GET_OPER_AY_8;
5756   UINT32 ea = EA_AX_AI_8(m68k);
57575757
5758   m68ki_write_8(ea, res);
5758   m68ki_write_8(m68k, ea, res);
57595759
5760   FLAG_N = NFLAG_8(res);
5761   FLAG_Z = res;
5762   FLAG_V = VFLAG_CLEAR;
5763   FLAG_C = CFLAG_CLEAR;
5760   m68k->n_flag = NFLAG_8(res);
5761   m68k->not_z_flag = res;
5762   m68k->v_flag = VFLAG_CLEAR;
5763   m68k->c_flag = CFLAG_CLEAR;
57645764}
57655765
57665766
57675767M68KMAKE_OP(move, 8, pi7, d)
57685768{
5769   uint res = MASK_OUT_ABOVE_8(DY);
5770   uint ea = EA_A7_PI_8();
5769   UINT32 res = MASK_OUT_ABOVE_8(DY);
5770   UINT32 ea = EA_A7_PI_8(m68k);
57715771
5772   m68ki_write_8(ea, res);
5772   m68ki_write_8(m68k, ea, res);
57735773
5774   FLAG_N = NFLAG_8(res);
5775   FLAG_Z = res;
5776   FLAG_V = VFLAG_CLEAR;
5777   FLAG_C = CFLAG_CLEAR;
5774   m68k->n_flag = NFLAG_8(res);
5775   m68k->not_z_flag = res;
5776   m68k->v_flag = VFLAG_CLEAR;
5777   m68k->c_flag = CFLAG_CLEAR;
57785778}
57795779
57805780
57815781M68KMAKE_OP(move, 8, pi, d)
57825782{
5783   uint res = MASK_OUT_ABOVE_8(DY);
5784   uint ea = EA_AX_PI_8();
5783   UINT32 res = MASK_OUT_ABOVE_8(DY);
5784   UINT32 ea = EA_AX_PI_8(m68k);
57855785
5786   m68ki_write_8(ea, res);
5786   m68ki_write_8(m68k, ea, res);
57875787
5788   FLAG_N = NFLAG_8(res);
5789   FLAG_Z = res;
5790   FLAG_V = VFLAG_CLEAR;
5791   FLAG_C = CFLAG_CLEAR;
5788   m68k->n_flag = NFLAG_8(res);
5789   m68k->not_z_flag = res;
5790   m68k->v_flag = VFLAG_CLEAR;
5791   m68k->c_flag = CFLAG_CLEAR;
57925792}
57935793
57945794
57955795M68KMAKE_OP(move, 8, pi7, .)
57965796{
5797   uint res = M68KMAKE_GET_OPER_AY_8;
5798   uint ea = EA_A7_PI_8();
5797   UINT32 res = M68KMAKE_GET_OPER_AY_8;
5798   UINT32 ea = EA_A7_PI_8(m68k);
57995799
5800   m68ki_write_8(ea, res);
5800   m68ki_write_8(m68k, ea, res);
58015801
5802   FLAG_N = NFLAG_8(res);
5803   FLAG_Z = res;
5804   FLAG_V = VFLAG_CLEAR;
5805   FLAG_C = CFLAG_CLEAR;
5802   m68k->n_flag = NFLAG_8(res);
5803   m68k->not_z_flag = res;
5804   m68k->v_flag = VFLAG_CLEAR;
5805   m68k->c_flag = CFLAG_CLEAR;
58065806}
58075807
58085808
58095809M68KMAKE_OP(move, 8, pi, .)
58105810{
5811   uint res = M68KMAKE_GET_OPER_AY_8;
5812   uint ea = EA_AX_PI_8();
5811   UINT32 res = M68KMAKE_GET_OPER_AY_8;
5812   UINT32 ea = EA_AX_PI_8(m68k);
58135813
5814   m68ki_write_8(ea, res);
5814   m68ki_write_8(m68k, ea, res);
58155815
5816   FLAG_N = NFLAG_8(res);
5817   FLAG_Z = res;
5818   FLAG_V = VFLAG_CLEAR;
5819   FLAG_C = CFLAG_CLEAR;
5816   m68k->n_flag = NFLAG_8(res);
5817   m68k->not_z_flag = res;
5818   m68k->v_flag = VFLAG_CLEAR;
5819   m68k->c_flag = CFLAG_CLEAR;
58205820}
58215821
58225822
58235823M68KMAKE_OP(move, 8, pd7, d)
58245824{
5825   uint res = MASK_OUT_ABOVE_8(DY);
5826   uint ea = EA_A7_PD_8();
5825   UINT32 res = MASK_OUT_ABOVE_8(DY);
5826   UINT32 ea = EA_A7_PD_8(m68k);
58275827
5828   m68ki_write_8(ea, res);
5828   m68ki_write_8(m68k, ea, res);
58295829
5830   FLAG_N = NFLAG_8(res);
5831   FLAG_Z = res;
5832   FLAG_V = VFLAG_CLEAR;
5833   FLAG_C = CFLAG_CLEAR;
5830   m68k->n_flag = NFLAG_8(res);
5831   m68k->not_z_flag = res;
5832   m68k->v_flag = VFLAG_CLEAR;
5833   m68k->c_flag = CFLAG_CLEAR;
58345834}
58355835
58365836
58375837M68KMAKE_OP(move, 8, pd, d)
58385838{
5839   uint res = MASK_OUT_ABOVE_8(DY);
5840   uint ea = EA_AX_PD_8();
5839   UINT32 res = MASK_OUT_ABOVE_8(DY);
5840   UINT32 ea = EA_AX_PD_8(m68k);
58415841
5842   m68ki_write_8(ea, res);
5842   m68ki_write_8(m68k, ea, res);
58435843
5844   FLAG_N = NFLAG_8(res);
5845   FLAG_Z = res;
5846   FLAG_V = VFLAG_CLEAR;
5847   FLAG_C = CFLAG_CLEAR;
5844   m68k->n_flag = NFLAG_8(res);
5845   m68k->not_z_flag = res;
5846   m68k->v_flag = VFLAG_CLEAR;
5847   m68k->c_flag = CFLAG_CLEAR;
58485848}
58495849
58505850
58515851M68KMAKE_OP(move, 8, pd7, .)
58525852{
5853   uint res = M68KMAKE_GET_OPER_AY_8;
5854   uint ea = EA_A7_PD_8();
5853   UINT32 res = M68KMAKE_GET_OPER_AY_8;
5854   UINT32 ea = EA_A7_PD_8(m68k);
58555855
5856   m68ki_write_8(ea, res);
5856   m68ki_write_8(m68k, ea, res);
58575857
5858   FLAG_N = NFLAG_8(res);
5859   FLAG_Z = res;
5860   FLAG_V = VFLAG_CLEAR;
5861   FLAG_C = CFLAG_CLEAR;
5858   m68k->n_flag = NFLAG_8(res);
5859   m68k->not_z_flag = res;
5860   m68k->v_flag = VFLAG_CLEAR;
5861   m68k->c_flag = CFLAG_CLEAR;
58625862}
58635863
58645864
58655865M68KMAKE_OP(move, 8, pd, .)
58665866{
5867   uint res = M68KMAKE_GET_OPER_AY_8;
5868   uint ea = EA_AX_PD_8();
5867   UINT32 res = M68KMAKE_GET_OPER_AY_8;
5868   UINT32 ea = EA_AX_PD_8(m68k);
58695869
5870   m68ki_write_8(ea, res);
5870   m68ki_write_8(m68k, ea, res);
58715871
5872   FLAG_N = NFLAG_8(res);
5873   FLAG_Z = res;
5874   FLAG_V = VFLAG_CLEAR;
5875   FLAG_C = CFLAG_CLEAR;
5872   m68k->n_flag = NFLAG_8(res);
5873   m68k->not_z_flag = res;
5874   m68k->v_flag = VFLAG_CLEAR;
5875   m68k->c_flag = CFLAG_CLEAR;
58765876}
58775877
58785878
58795879M68KMAKE_OP(move, 8, di, d)
58805880{
5881   uint res = MASK_OUT_ABOVE_8(DY);
5882   uint ea = EA_AX_DI_8();
5881   UINT32 res = MASK_OUT_ABOVE_8(DY);
5882   UINT32 ea = EA_AX_DI_8(m68k);
58835883
5884   m68ki_write_8(ea, res);
5884   m68ki_write_8(m68k, ea, res);
58855885
5886   FLAG_N = NFLAG_8(res);
5887   FLAG_Z = res;
5888   FLAG_V = VFLAG_CLEAR;
5889   FLAG_C = CFLAG_CLEAR;
5886   m68k->n_flag = NFLAG_8(res);
5887   m68k->not_z_flag = res;
5888   m68k->v_flag = VFLAG_CLEAR;
5889   m68k->c_flag = CFLAG_CLEAR;
58905890}
58915891
58925892
58935893M68KMAKE_OP(move, 8, di, .)
58945894{
5895   uint res = M68KMAKE_GET_OPER_AY_8;
5896   uint ea = EA_AX_DI_8();
5895   UINT32 res = M68KMAKE_GET_OPER_AY_8;
5896   UINT32 ea = EA_AX_DI_8(m68k);
58975897
5898   m68ki_write_8(ea, res);
5898   m68ki_write_8(m68k, ea, res);
58995899
5900   FLAG_N = NFLAG_8(res);
5901   FLAG_Z = res;
5902   FLAG_V = VFLAG_CLEAR;
5903   FLAG_C = CFLAG_CLEAR;
5900   m68k->n_flag = NFLAG_8(res);
5901   m68k->not_z_flag = res;
5902   m68k->v_flag = VFLAG_CLEAR;
5903   m68k->c_flag = CFLAG_CLEAR;
59045904}
59055905
59065906
59075907M68KMAKE_OP(move, 8, ix, d)
59085908{
5909   uint res = MASK_OUT_ABOVE_8(DY);
5910   uint ea = EA_AX_IX_8();
5909   UINT32 res = MASK_OUT_ABOVE_8(DY);
5910   UINT32 ea = EA_AX_IX_8(m68k);
59115911
5912   m68ki_write_8(ea, res);
5912   m68ki_write_8(m68k, ea, res);
59135913
5914   FLAG_N = NFLAG_8(res);
5915   FLAG_Z = res;
5916   FLAG_V = VFLAG_CLEAR;
5917   FLAG_C = CFLAG_CLEAR;
5914   m68k->n_flag = NFLAG_8(res);
5915   m68k->not_z_flag = res;
5916   m68k->v_flag = VFLAG_CLEAR;
5917   m68k->c_flag = CFLAG_CLEAR;
59185918}
59195919
59205920
59215921M68KMAKE_OP(move, 8, ix, .)
59225922{
5923   uint res = M68KMAKE_GET_OPER_AY_8;
5924   uint ea = EA_AX_IX_8();
5923   UINT32 res = M68KMAKE_GET_OPER_AY_8;
5924   UINT32 ea = EA_AX_IX_8(m68k);
59255925
5926   m68ki_write_8(ea, res);
5926   m68ki_write_8(m68k, ea, res);
59275927
5928   FLAG_N = NFLAG_8(res);
5929   FLAG_Z = res;
5930   FLAG_V = VFLAG_CLEAR;
5931   FLAG_C = CFLAG_CLEAR;
5928   m68k->n_flag = NFLAG_8(res);
5929   m68k->not_z_flag = res;
5930   m68k->v_flag = VFLAG_CLEAR;
5931   m68k->c_flag = CFLAG_CLEAR;
59325932}
59335933
59345934
59355935M68KMAKE_OP(move, 8, aw, d)
59365936{
5937   uint res = MASK_OUT_ABOVE_8(DY);
5938   uint ea = EA_AW_8();
5937   UINT32 res = MASK_OUT_ABOVE_8(DY);
5938   UINT32 ea = EA_AW_8(m68k);
59395939
5940   m68ki_write_8(ea, res);
5940   m68ki_write_8(m68k, ea, res);
59415941
5942   FLAG_N = NFLAG_8(res);
5943   FLAG_Z = res;
5944   FLAG_V = VFLAG_CLEAR;
5945   FLAG_C = CFLAG_CLEAR;
5942   m68k->n_flag = NFLAG_8(res);
5943   m68k->not_z_flag = res;
5944   m68k->v_flag = VFLAG_CLEAR;
5945   m68k->c_flag = CFLAG_CLEAR;
59465946}
59475947
59485948
59495949M68KMAKE_OP(move, 8, aw, .)
59505950{
5951   uint res = M68KMAKE_GET_OPER_AY_8;
5952   uint ea = EA_AW_8();
5951   UINT32 res = M68KMAKE_GET_OPER_AY_8;
5952   UINT32 ea = EA_AW_8(m68k);
59535953
5954   m68ki_write_8(ea, res);
5954   m68ki_write_8(m68k, ea, res);
59555955
5956   FLAG_N = NFLAG_8(res);
5957   FLAG_Z = res;
5958   FLAG_V = VFLAG_CLEAR;
5959   FLAG_C = CFLAG_CLEAR;
5956   m68k->n_flag = NFLAG_8(res);
5957   m68k->not_z_flag = res;
5958   m68k->v_flag = VFLAG_CLEAR;
5959   m68k->c_flag = CFLAG_CLEAR;
59605960}
59615961
59625962
59635963M68KMAKE_OP(move, 8, al, d)
59645964{
5965   uint res = MASK_OUT_ABOVE_8(DY);
5966   uint ea = EA_AL_8();
5965   UINT32 res = MASK_OUT_ABOVE_8(DY);
5966   UINT32 ea = EA_AL_8(m68k);
59675967
5968   m68ki_write_8(ea, res);
5968   m68ki_write_8(m68k, ea, res);
59695969
5970   FLAG_N = NFLAG_8(res);
5971   FLAG_Z = res;
5972   FLAG_V = VFLAG_CLEAR;
5973   FLAG_C = CFLAG_CLEAR;
5970   m68k->n_flag = NFLAG_8(res);
5971   m68k->not_z_flag = res;
5972   m68k->v_flag = VFLAG_CLEAR;
5973   m68k->c_flag = CFLAG_CLEAR;
59745974}
59755975
59765976
59775977M68KMAKE_OP(move, 8, al, .)
59785978{
5979   uint res = M68KMAKE_GET_OPER_AY_8;
5980   uint ea = EA_AL_8();
5979   UINT32 res = M68KMAKE_GET_OPER_AY_8;
5980   UINT32 ea = EA_AL_8(m68k);
59815981
5982   m68ki_write_8(ea, res);
5982   m68ki_write_8(m68k, ea, res);
59835983
5984   FLAG_N = NFLAG_8(res);
5985   FLAG_Z = res;
5986   FLAG_V = VFLAG_CLEAR;
5987   FLAG_C = CFLAG_CLEAR;
5984   m68k->n_flag = NFLAG_8(res);
5985   m68k->not_z_flag = res;
5986   m68k->v_flag = VFLAG_CLEAR;
5987   m68k->c_flag = CFLAG_CLEAR;
59885988}
59895989
59905990
59915991M68KMAKE_OP(move, 16, d, d)
59925992{
5993   uint res = MASK_OUT_ABOVE_16(DY);
5994   uint* r_dst = &DX;
5993   UINT32 res = MASK_OUT_ABOVE_16(DY);
5994   UINT32* r_dst = &DX;
59955995
59965996   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
59975997
5998   FLAG_N = NFLAG_16(res);
5999   FLAG_Z = res;
6000   FLAG_V = VFLAG_CLEAR;
6001   FLAG_C = CFLAG_CLEAR;
5998   m68k->n_flag = NFLAG_16(res);
5999   m68k->not_z_flag = res;
6000   m68k->v_flag = VFLAG_CLEAR;
6001   m68k->c_flag = CFLAG_CLEAR;
60026002}
60036003
60046004
60056005M68KMAKE_OP(move, 16, d, a)
60066006{
6007   uint res = MASK_OUT_ABOVE_16(AY);
6008   uint* r_dst = &DX;
6007   UINT32 res = MASK_OUT_ABOVE_16(AY);
6008   UINT32* r_dst = &DX;
60096009
60106010   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
60116011
6012   FLAG_N = NFLAG_16(res);
6013   FLAG_Z = res;
6014   FLAG_V = VFLAG_CLEAR;
6015   FLAG_C = CFLAG_CLEAR;
6012   m68k->n_flag = NFLAG_16(res);
6013   m68k->not_z_flag = res;
6014   m68k->v_flag = VFLAG_CLEAR;
6015   m68k->c_flag = CFLAG_CLEAR;
60166016}
60176017
60186018
60196019M68KMAKE_OP(move, 16, d, .)
60206020{
6021   uint res = M68KMAKE_GET_OPER_AY_16;
6022   uint* r_dst = &DX;
6021   UINT32 res = M68KMAKE_GET_OPER_AY_16;
6022   UINT32* r_dst = &DX;
60236023
60246024   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
60256025
6026   FLAG_N = NFLAG_16(res);
6027   FLAG_Z = res;
6028   FLAG_V = VFLAG_CLEAR;
6029   FLAG_C = CFLAG_CLEAR;
6026   m68k->n_flag = NFLAG_16(res);
6027   m68k->not_z_flag = res;
6028   m68k->v_flag = VFLAG_CLEAR;
6029   m68k->c_flag = CFLAG_CLEAR;
60306030}
60316031
60326032
60336033M68KMAKE_OP(move, 16, ai, d)
60346034{
6035   uint res = MASK_OUT_ABOVE_16(DY);
6036   uint ea = EA_AX_AI_16();
6035   UINT32 res = MASK_OUT_ABOVE_16(DY);
6036   UINT32 ea = EA_AX_AI_16(m68k);
60376037
6038   m68ki_write_16(ea, res);
6038   m68ki_write_16(m68k, ea, res);
60396039
6040   FLAG_N = NFLAG_16(res);
6041   FLAG_Z = res;
6042   FLAG_V = VFLAG_CLEAR;
6043   FLAG_C = CFLAG_CLEAR;
6040   m68k->n_flag = NFLAG_16(res);
6041   m68k->not_z_flag = res;
6042   m68k->v_flag = VFLAG_CLEAR;
6043   m68k->c_flag = CFLAG_CLEAR;
60446044}
60456045
60466046
60476047M68KMAKE_OP(move, 16, ai, a)
60486048{
6049   uint res = MASK_OUT_ABOVE_16(AY);
6050   uint ea = EA_AX_AI_16();
6049   UINT32 res = MASK_OUT_ABOVE_16(AY);
6050   UINT32 ea = EA_AX_AI_16(m68k);
60516051
6052   m68ki_write_16(ea, res);
6052   m68ki_write_16(m68k, ea, res);
60536053
6054   FLAG_N = NFLAG_16(res);
6055   FLAG_Z = res;
6056   FLAG_V = VFLAG_CLEAR;
6057   FLAG_C = CFLAG_CLEAR;
6054   m68k->n_flag = NFLAG_16(res);
6055   m68k->not_z_flag = res;
6056   m68k->v_flag = VFLAG_CLEAR;
6057   m68k->c_flag = CFLAG_CLEAR;
60586058}
60596059
60606060
60616061M68KMAKE_OP(move, 16, ai, .)
60626062{
6063   uint res = M68KMAKE_GET_OPER_AY_16;
6064   uint ea = EA_AX_AI_16();
6063   UINT32 res = M68KMAKE_GET_OPER_AY_16;
6064   UINT32 ea = EA_AX_AI_16(m68k);
60656065
6066   m68ki_write_16(ea, res);
6066   m68ki_write_16(m68k, ea, res);
60676067
6068   FLAG_N = NFLAG_16(res);
6069   FLAG_Z = res;
6070   FLAG_V = VFLAG_CLEAR;
6071   FLAG_C = CFLAG_CLEAR;
6068   m68k->n_flag = NFLAG_16(res);
6069   m68k->not_z_flag = res;
6070   m68k->v_flag = VFLAG_CLEAR;
6071   m68k->c_flag = CFLAG_CLEAR;
60726072}
60736073
60746074
60756075M68KMAKE_OP(move, 16, pi, d)
60766076{
6077   uint res = MASK_OUT_ABOVE_16(DY);
6078   uint ea = EA_AX_PI_16();
6077   UINT32 res = MASK_OUT_ABOVE_16(DY);
6078   UINT32 ea = EA_AX_PI_16(m68k);
60796079
6080   m68ki_write_16(ea, res);
6080   m68ki_write_16(m68k, ea, res);
60816081
6082   FLAG_N = NFLAG_16(res);
6083   FLAG_Z = res;
6084   FLAG_V = VFLAG_CLEAR;
6085   FLAG_C = CFLAG_CLEAR;
6082   m68k->n_flag = NFLAG_16(res);
6083   m68k->not_z_flag = res;
6084   m68k->v_flag = VFLAG_CLEAR;
6085   m68k->c_flag = CFLAG_CLEAR;
60866086}
60876087
60886088
60896089M68KMAKE_OP(move, 16, pi, a)
60906090{
6091   uint res = MASK_OUT_ABOVE_16(AY);
6092   uint ea = EA_AX_PI_16();
6091   UINT32 res = MASK_OUT_ABOVE_16(AY);
6092   UINT32 ea = EA_AX_PI_16(m68k);
60936093
6094   m68ki_write_16(ea, res);
6094   m68ki_write_16(m68k, ea, res);
60956095
6096   FLAG_N = NFLAG_16(res);
6097   FLAG_Z = res;
6098   FLAG_V = VFLAG_CLEAR;
6099   FLAG_C = CFLAG_CLEAR;
6096   m68k->n_flag = NFLAG_16(res);
6097   m68k->not_z_flag = res;
6098   m68k->v_flag = VFLAG_CLEAR;
6099   m68k->c_flag = CFLAG_CLEAR;
61006100}
61016101
61026102
61036103M68KMAKE_OP(move, 16, pi, .)
61046104{
6105   uint res = M68KMAKE_GET_OPER_AY_16;
6106   uint ea = EA_AX_PI_16();
6105   UINT32 res = M68KMAKE_GET_OPER_AY_16;
6106   UINT32 ea = EA_AX_PI_16(m68k);
61076107
6108   m68ki_write_16(ea, res);
6108   m68ki_write_16(m68k, ea, res);
61096109
6110   FLAG_N = NFLAG_16(res);
6111   FLAG_Z = res;
6112   FLAG_V = VFLAG_CLEAR;
6113   FLAG_C = CFLAG_CLEAR;
6110   m68k->n_flag = NFLAG_16(res);
6111   m68k->not_z_flag = res;
6112   m68k->v_flag = VFLAG_CLEAR;
6113   m68k->c_flag = CFLAG_CLEAR;
61146114}
61156115
61166116
61176117M68KMAKE_OP(move, 16, pd, d)
61186118{
6119   uint res = MASK_OUT_ABOVE_16(DY);
6120   uint ea = EA_AX_PD_16();
6119   UINT32 res = MASK_OUT_ABOVE_16(DY);
6120   UINT32 ea = EA_AX_PD_16(m68k);
61216121
6122   m68ki_write_16(ea, res);
6122   m68ki_write_16(m68k, ea, res);
61236123
6124   FLAG_N = NFLAG_16(res);
6125   FLAG_Z = res;
6126   FLAG_V = VFLAG_CLEAR;
6127   FLAG_C = CFLAG_CLEAR;
6124   m68k->n_flag = NFLAG_16(res);
6125   m68k->not_z_flag = res;
6126   m68k->v_flag = VFLAG_CLEAR;
6127   m68k->c_flag = CFLAG_CLEAR;
61286128}
61296129
61306130
61316131M68KMAKE_OP(move, 16, pd, a)
61326132{
6133   uint res = MASK_OUT_ABOVE_16(AY);
6134   uint ea = EA_AX_PD_16();
6133   UINT32 res = MASK_OUT_ABOVE_16(AY);
6134   UINT32 ea = EA_AX_PD_16(m68k);
61356135
6136   m68ki_write_16(ea, res);
6136   m68ki_write_16(m68k, ea, res);
61376137
6138   FLAG_N = NFLAG_16(res);
6139   FLAG_Z = res;
6140   FLAG_V = VFLAG_CLEAR;
6141   FLAG_C = CFLAG_CLEAR;
6138   m68k->n_flag = NFLAG_16(res);
6139   m68k->not_z_flag = res;
6140   m68k->v_flag = VFLAG_CLEAR;
6141   m68k->c_flag = CFLAG_CLEAR;
61426142}
61436143
61446144
61456145M68KMAKE_OP(move, 16, pd, .)
61466146{
6147   uint res = M68KMAKE_GET_OPER_AY_16;
6148   uint ea = EA_AX_PD_16();
6147   UINT32 res = M68KMAKE_GET_OPER_AY_16;
6148   UINT32 ea = EA_AX_PD_16(m68k);
61496149
6150   m68ki_write_16(ea, res);
6150   m68ki_write_16(m68k, ea, res);
61516151
6152   FLAG_N = NFLAG_16(res);
6153   FLAG_Z = res;
6154   FLAG_V = VFLAG_CLEAR;
6155   FLAG_C = CFLAG_CLEAR;
6152   m68k->n_flag = NFLAG_16(res);
6153   m68k->not_z_flag = res;
6154   m68k->v_flag = VFLAG_CLEAR;
6155   m68k->c_flag = CFLAG_CLEAR;
61566156}
61576157
61586158
61596159M68KMAKE_OP(move, 16, di, d)
61606160{
6161   uint res = MASK_OUT_ABOVE_16(DY);
6162   uint ea = EA_AX_DI_16();
6161   UINT32 res = MASK_OUT_ABOVE_16(DY);
6162   UINT32 ea = EA_AX_DI_16(m68k);
61636163
6164   m68ki_write_16(ea, res);
6164   m68ki_write_16(m68k, ea, res);
61656165
6166   FLAG_N = NFLAG_16(res);
6167   FLAG_Z = res;
6168   FLAG_V = VFLAG_CLEAR;
6169   FLAG_C = CFLAG_CLEAR;
6166   m68k->n_flag = NFLAG_16(res);
6167   m68k->not_z_flag = res;
6168   m68k->v_flag = VFLAG_CLEAR;
6169   m68k->c_flag = CFLAG_CLEAR;
61706170}
61716171
61726172
61736173M68KMAKE_OP(move, 16, di, a)
61746174{
6175   uint res = MASK_OUT_ABOVE_16(AY);
6176   uint ea = EA_AX_DI_16();
6175   UINT32 res = MASK_OUT_ABOVE_16(AY);
6176   UINT32 ea = EA_AX_DI_16(m68k);
61776177
6178   m68ki_write_16(ea, res);
6178   m68ki_write_16(m68k, ea, res);
61796179
6180   FLAG_N = NFLAG_16(res);
6181   FLAG_Z = res;
6182   FLAG_V = VFLAG_CLEAR;
6183   FLAG_C = CFLAG_CLEAR;
6180   m68k->n_flag = NFLAG_16(res);
6181   m68k->not_z_flag = res;
6182   m68k->v_flag = VFLAG_CLEAR;
6183   m68k->c_flag = CFLAG_CLEAR;
61846184}
61856185
61866186
61876187M68KMAKE_OP(move, 16, di, .)
61886188{
6189   uint res = M68KMAKE_GET_OPER_AY_16;
6190   uint ea = EA_AX_DI_16();
6189   UINT32 res = M68KMAKE_GET_OPER_AY_16;
6190   UINT32 ea = EA_AX_DI_16(m68k);
61916191
6192   m68ki_write_16(ea, res);
6192   m68ki_write_16(m68k, ea, res);
61936193
6194   FLAG_N = NFLAG_16(res);
6195   FLAG_Z = res;
6196   FLAG_V = VFLAG_CLEAR;
6197   FLAG_C = CFLAG_CLEAR;
6194   m68k->n_flag = NFLAG_16(res);
6195   m68k->not_z_flag = res;
6196   m68k->v_flag = VFLAG_CLEAR;
6197   m68k->c_flag = CFLAG_CLEAR;
61986198}
61996199
62006200
62016201M68KMAKE_OP(move, 16, ix, d)
62026202{
6203   uint res = MASK_OUT_ABOVE_16(DY);
6204   uint ea = EA_AX_IX_16();
6203   UINT32 res = MASK_OUT_ABOVE_16(DY);
6204   UINT32 ea = EA_AX_IX_16(m68k);
62056205
6206   m68ki_write_16(ea, res);
6206   m68ki_write_16(m68k, ea, res);
62076207
6208   FLAG_N = NFLAG_16(res);
6209   FLAG_Z = res;
6210   FLAG_V = VFLAG_CLEAR;
6211   FLAG_C = CFLAG_CLEAR;
6208   m68k->n_flag = NFLAG_16(res);
6209   m68k->not_z_flag = res;
6210   m68k->v_flag = VFLAG_CLEAR;
6211   m68k->c_flag = CFLAG_CLEAR;
62126212}
62136213
62146214
62156215M68KMAKE_OP(move, 16, ix, a)
62166216{
6217   uint res = MASK_OUT_ABOVE_16(AY);
6218   uint ea = EA_AX_IX_16();
6217   UINT32 res = MASK_OUT_ABOVE_16(AY);
6218   UINT32 ea = EA_AX_IX_16(m68k);
62196219
6220   m68ki_write_16(ea, res);
6220   m68ki_write_16(m68k, ea, res);
62216221
6222   FLAG_N = NFLAG_16(res);
6223   FLAG_Z = res;
6224   FLAG_V = VFLAG_CLEAR;
6225   FLAG_C = CFLAG_CLEAR;
6222   m68k->n_flag = NFLAG_16(res);
6223   m68k->not_z_flag = res;
6224   m68k->v_flag = VFLAG_CLEAR;
6225   m68k->c_flag = CFLAG_CLEAR;
62266226}
62276227
62286228
62296229M68KMAKE_OP(move, 16, ix, .)
62306230{
6231   uint res = M68KMAKE_GET_OPER_AY_16;
6232   uint ea = EA_AX_IX_16();
6231   UINT32 res = M68KMAKE_GET_OPER_AY_16;
6232   UINT32 ea = EA_AX_IX_16(m68k);
62336233
6234   m68ki_write_16(ea, res);
6234   m68ki_write_16(m68k, ea, res);
62356235
6236   FLAG_N = NFLAG_16(res);
6237   FLAG_Z = res;
6238   FLAG_V = VFLAG_CLEAR;
6239   FLAG_C = CFLAG_CLEAR;
6236   m68k->n_flag = NFLAG_16(res);
6237   m68k->not_z_flag = res;
6238   m68k->v_flag = VFLAG_CLEAR;
6239   m68k->c_flag = CFLAG_CLEAR;
62406240}
62416241
62426242
62436243M68KMAKE_OP(move, 16, aw, d)
62446244{
6245   uint res = MASK_OUT_ABOVE_16(DY);
6246   uint ea = EA_AW_16();
6245   UINT32 res = MASK_OUT_ABOVE_16(DY);
6246   UINT32 ea = EA_AW_16(m68k);
62476247
6248   m68ki_write_16(ea, res);
6248   m68ki_write_16(m68k, ea, res);
62496249
6250   FLAG_N = NFLAG_16(res);
6251   FLAG_Z = res;
6252   FLAG_V = VFLAG_CLEAR;
6253   FLAG_C = CFLAG_CLEAR;
6250   m68k->n_flag = NFLAG_16(res);
6251   m68k->not_z_flag = res;
6252   m68k->v_flag = VFLAG_CLEAR;
6253   m68k->c_flag = CFLAG_CLEAR;
62546254}
62556255
62566256
62576257M68KMAKE_OP(move, 16, aw, a)
62586258{
6259   uint res = MASK_OUT_ABOVE_16(AY);
6260   uint ea = EA_AW_16();
6259   UINT32 res = MASK_OUT_ABOVE_16(AY);
6260   UINT32 ea = EA_AW_16(m68k);
62616261
6262   m68ki_write_16(ea, res);
6262   m68ki_write_16(m68k, ea, res);
62636263
6264   FLAG_N = NFLAG_16(res);
6265   FLAG_Z = res;
6266   FLAG_V = VFLAG_CLEAR;
6267   FLAG_C = CFLAG_CLEAR;
6264   m68k->n_flag = NFLAG_16(res);
6265   m68k->not_z_flag = res;
6266   m68k->v_flag = VFLAG_CLEAR;
6267   m68k->c_flag = CFLAG_CLEAR;
62686268}
62696269
62706270
62716271M68KMAKE_OP(move, 16, aw, .)
62726272{
6273   uint res = M68KMAKE_GET_OPER_AY_16;
6274   uint ea = EA_AW_16();
6273   UINT32 res = M68KMAKE_GET_OPER_AY_16;
6274   UINT32 ea = EA_AW_16(m68k);
62756275
6276   m68ki_write_16(ea, res);
6276   m68ki_write_16(m68k, ea, res);
62776277
6278   FLAG_N = NFLAG_16(res);
6279   FLAG_Z = res;
6280   FLAG_V = VFLAG_CLEAR;
6281   FLAG_C = CFLAG_CLEAR;
6278   m68k->n_flag = NFLAG_16(res);
6279   m68k->not_z_flag = res;
6280   m68k->v_flag = VFLAG_CLEAR;
6281   m68k->c_flag = CFLAG_CLEAR;
62826282}
62836283
62846284
62856285M68KMAKE_OP(move, 16, al, d)
62866286{
6287   uint res = MASK_OUT_ABOVE_16(DY);
6288   uint ea = EA_AL_16();
6287   UINT32 res = MASK_OUT_ABOVE_16(DY);
6288   UINT32 ea = EA_AL_16(m68k);
62896289
6290   m68ki_write_16(ea, res);
6290   m68ki_write_16(m68k, ea, res);
62916291
6292   FLAG_N = NFLAG_16(res);
6293   FLAG_Z = res;
6294   FLAG_V = VFLAG_CLEAR;
6295   FLAG_C = CFLAG_CLEAR;
6292   m68k->n_flag = NFLAG_16(res);
6293   m68k->not_z_flag = res;
6294   m68k->v_flag = VFLAG_CLEAR;
6295   m68k->c_flag = CFLAG_CLEAR;
62966296}
62976297
62986298
62996299M68KMAKE_OP(move, 16, al, a)
63006300{
6301   uint res = MASK_OUT_ABOVE_16(AY);
6302   uint ea = EA_AL_16();
6301   UINT32 res = MASK_OUT_ABOVE_16(AY);
6302   UINT32 ea = EA_AL_16(m68k);
63036303
6304   m68ki_write_16(ea, res);
6304   m68ki_write_16(m68k, ea, res);
63056305
6306   FLAG_N = NFLAG_16(res);
6307   FLAG_Z = res;
6308   FLAG_V = VFLAG_CLEAR;
6309   FLAG_C = CFLAG_CLEAR;
6306   m68k->n_flag = NFLAG_16(res);
6307   m68k->not_z_flag = res;
6308   m68k->v_flag = VFLAG_CLEAR;
6309   m68k->c_flag = CFLAG_CLEAR;
63106310}
63116311
63126312
63136313M68KMAKE_OP(move, 16, al, .)
63146314{
6315   uint res = M68KMAKE_GET_OPER_AY_16;
6316   uint ea = EA_AL_16();
6315   UINT32 res = M68KMAKE_GET_OPER_AY_16;
6316   UINT32 ea = EA_AL_16(m68k);
63176317
6318   m68ki_write_16(ea, res);
6318   m68ki_write_16(m68k, ea, res);
63196319
6320   FLAG_N = NFLAG_16(res);
6321   FLAG_Z = res;
6322   FLAG_V = VFLAG_CLEAR;
6323   FLAG_C = CFLAG_CLEAR;
6320   m68k->n_flag = NFLAG_16(res);
6321   m68k->not_z_flag = res;
6322   m68k->v_flag = VFLAG_CLEAR;
6323   m68k->c_flag = CFLAG_CLEAR;
63246324}
63256325
63266326
63276327M68KMAKE_OP(move, 32, d, d)
63286328{
6329   uint res = DY;
6330   uint* r_dst = &DX;
6329   UINT32 res = DY;
6330   UINT32* r_dst = &DX;
63316331
63326332   *r_dst = res;
63336333
6334   FLAG_N = NFLAG_32(res);
6335   FLAG_Z = res;
6336   FLAG_V = VFLAG_CLEAR;
6337   FLAG_C = CFLAG_CLEAR;
6334   m68k->n_flag = NFLAG_32(res);
6335   m68k->not_z_flag = res;
6336   m68k->v_flag = VFLAG_CLEAR;
6337   m68k->c_flag = CFLAG_CLEAR;
63386338}
63396339
63406340
63416341M68KMAKE_OP(move, 32, d, a)
63426342{
6343   uint res = AY;
6344   uint* r_dst = &DX;
6343   UINT32 res = AY;
6344   UINT32* r_dst = &DX;
63456345
63466346   *r_dst = res;
63476347
6348   FLAG_N = NFLAG_32(res);
6349   FLAG_Z = res;
6350   FLAG_V = VFLAG_CLEAR;
6351   FLAG_C = CFLAG_CLEAR;
6348   m68k->n_flag = NFLAG_32(res);
6349   m68k->not_z_flag = res;
6350   m68k->v_flag = VFLAG_CLEAR;
6351   m68k->c_flag = CFLAG_CLEAR;
63526352}
63536353
63546354
63556355M68KMAKE_OP(move, 32, d, .)
63566356{
6357   uint res = M68KMAKE_GET_OPER_AY_32;
6358   uint* r_dst = &DX;
6357   UINT32 res = M68KMAKE_GET_OPER_AY_32;
6358   UINT32* r_dst = &DX;
63596359
63606360   *r_dst = res;
63616361
6362   FLAG_N = NFLAG_32(res);
6363   FLAG_Z = res;
6364   FLAG_V = VFLAG_CLEAR;
6365   FLAG_C = CFLAG_CLEAR;
6362   m68k->n_flag = NFLAG_32(res);
6363   m68k->not_z_flag = res;
6364   m68k->v_flag = VFLAG_CLEAR;
6365   m68k->c_flag = CFLAG_CLEAR;
63666366}
63676367
63686368
63696369M68KMAKE_OP(move, 32, ai, d)
63706370{
6371   uint res = DY;
6372   uint ea = EA_AX_AI_32();
6371   UINT32 res = DY;
6372   UINT32 ea = EA_AX_AI_32(m68k);
63736373
6374   m68ki_write_32(ea, res);
6374   m68ki_write_32(m68k, ea, res);
63756375
6376   FLAG_N = NFLAG_32(res);
6377   FLAG_Z = res;
6378   FLAG_V = VFLAG_CLEAR;
6379   FLAG_C = CFLAG_CLEAR;
6376   m68k->n_flag = NFLAG_32(res);
6377   m68k->not_z_flag = res;
6378   m68k->v_flag = VFLAG_CLEAR;
6379   m68k->c_flag = CFLAG_CLEAR;
63806380}
63816381
63826382
63836383M68KMAKE_OP(move, 32, ai, a)
63846384{
6385   uint res = AY;
6386   uint ea = EA_AX_AI_32();
6385   UINT32 res = AY;
6386   UINT32 ea = EA_AX_AI_32(m68k);
63876387
6388   m68ki_write_32(ea, res);
6388   m68ki_write_32(m68k, ea, res);
63896389
6390   FLAG_N = NFLAG_32(res);
6391   FLAG_Z = res;
6392   FLAG_V = VFLAG_CLEAR;
6393   FLAG_C = CFLAG_CLEAR;
6390   m68k->n_flag = NFLAG_32(res);
6391   m68k->not_z_flag = res;
6392   m68k->v_flag = VFLAG_CLEAR;
6393   m68k->c_flag = CFLAG_CLEAR;
63946394}
63956395
63966396
63976397M68KMAKE_OP(move, 32, ai, .)
63986398{
6399   uint res = M68KMAKE_GET_OPER_AY_32;
6400   uint ea = EA_AX_AI_32();
6399   UINT32 res = M68KMAKE_GET_OPER_AY_32;
6400   UINT32 ea = EA_AX_AI_32(m68k);
64016401
6402   m68ki_write_32(ea, res);
6402   m68ki_write_32(m68k, ea, res);
64036403
6404   FLAG_N = NFLAG_32(res);
6405   FLAG_Z = res;
6406   FLAG_V = VFLAG_CLEAR;
6407   FLAG_C = CFLAG_CLEAR;
6404   m68k->n_flag = NFLAG_32(res);
6405   m68k->not_z_flag = res;
6406   m68k->v_flag = VFLAG_CLEAR;
6407   m68k->c_flag = CFLAG_CLEAR;
64086408}
64096409
64106410
64116411M68KMAKE_OP(move, 32, pi, d)
64126412{
6413   uint res = DY;
6414   uint ea = EA_AX_PI_32();
6413   UINT32 res = DY;
6414   UINT32 ea = EA_AX_PI_32(m68k);
64156415
6416   m68ki_write_32(ea, res);
6416   m68ki_write_32(m68k, ea, res);
64176417
6418   FLAG_N = NFLAG_32(res);
6419   FLAG_Z = res;
6420   FLAG_V = VFLAG_CLEAR;
6421   FLAG_C = CFLAG_CLEAR;
6418   m68k->n_flag = NFLAG_32(res);
6419   m68k->not_z_flag = res;
6420   m68k->v_flag = VFLAG_CLEAR;
6421   m68k->c_flag = CFLAG_CLEAR;
64226422}
64236423
64246424
64256425M68KMAKE_OP(move, 32, pi, a)
64266426{
6427   uint res = AY;
6428   uint ea = EA_AX_PI_32();
6427   UINT32 res = AY;
6428   UINT32 ea = EA_AX_PI_32(m68k);
64296429
6430   m68ki_write_32(ea, res);
6430   m68ki_write_32(m68k, ea, res);
64316431
6432   FLAG_N = NFLAG_32(res);
6433   FLAG_Z = res;
6434   FLAG_V = VFLAG_CLEAR;
6435   FLAG_C = CFLAG_CLEAR;
6432   m68k->n_flag = NFLAG_32(res);
6433   m68k->not_z_flag = res;
6434   m68k->v_flag = VFLAG_CLEAR;
6435   m68k->c_flag = CFLAG_CLEAR;
64366436}
64376437
64386438
64396439M68KMAKE_OP(move, 32, pi, .)
64406440{
6441   uint res = M68KMAKE_GET_OPER_AY_32;
6442   uint ea = EA_AX_PI_32();
6441   UINT32 res = M68KMAKE_GET_OPER_AY_32;
6442   UINT32 ea = EA_AX_PI_32(m68k);
64436443
6444   m68ki_write_32(ea, res);
6444   m68ki_write_32(m68k, ea, res);
64456445
6446   FLAG_N = NFLAG_32(res);
6447   FLAG_Z = res;
6448   FLAG_V = VFLAG_CLEAR;
6449   FLAG_C = CFLAG_CLEAR;
6446   m68k->n_flag = NFLAG_32(res);
6447   m68k->not_z_flag = res;
6448   m68k->v_flag = VFLAG_CLEAR;
6449   m68k->c_flag = CFLAG_CLEAR;
64506450}
64516451
64526452
64536453M68KMAKE_OP(move, 32, pd, d)
64546454{
6455   uint res = DY;
6456   uint ea = EA_AX_PD_32();
6455   UINT32 res = DY;
6456   UINT32 ea = EA_AX_PD_32(m68k);
64576457
6458   m68ki_write_16(ea+2, res & 0xFFFF );
6459   m68ki_write_16(ea, (res >> 16) & 0xFFFF );
6458   m68ki_write_16(m68k, ea+2, res & 0xFFFF );
6459   m68ki_write_16(m68k, ea, (res >> 16) & 0xFFFF );
64606460
6461   FLAG_N = NFLAG_32(res);
6462   FLAG_Z = res;
6463   FLAG_V = VFLAG_CLEAR;
6464   FLAG_C = CFLAG_CLEAR;
6461   m68k->n_flag = NFLAG_32(res);
6462   m68k->not_z_flag = res;
6463   m68k->v_flag = VFLAG_CLEAR;
6464   m68k->c_flag = CFLAG_CLEAR;
64656465}
64666466
64676467
64686468M68KMAKE_OP(move, 32, pd, a)
64696469{
6470   uint res = AY;
6471   uint ea = EA_AX_PD_32();
6470   UINT32 res = AY;
6471   UINT32 ea = EA_AX_PD_32(m68k);
64726472
6473   m68ki_write_16(ea+2, res & 0xFFFF );
6474   m68ki_write_16(ea, (res >> 16) & 0xFFFF );
6473   m68ki_write_16(m68k, ea+2, res & 0xFFFF );
6474   m68ki_write_16(m68k, ea, (res >> 16) & 0xFFFF );
64756475
6476   FLAG_N = NFLAG_32(res);
6477   FLAG_Z = res;
6478   FLAG_V = VFLAG_CLEAR;
6479   FLAG_C = CFLAG_CLEAR;
6476   m68k->n_flag = NFLAG_32(res);
6477   m68k->not_z_flag = res;
6478   m68k->v_flag = VFLAG_CLEAR;
6479   m68k->c_flag = CFLAG_CLEAR;
64806480}
64816481
64826482
64836483M68KMAKE_OP(move, 32, pd, .)
64846484{
6485   uint res = M68KMAKE_GET_OPER_AY_32;
6486   uint ea = EA_AX_PD_32();
6485   UINT32 res = M68KMAKE_GET_OPER_AY_32;
6486   UINT32 ea = EA_AX_PD_32(m68k);
64876487
6488   m68ki_write_16(ea+2, res & 0xFFFF );
6489   m68ki_write_16(ea, (res >> 16) & 0xFFFF );
6488   m68ki_write_16(m68k, ea+2, res & 0xFFFF );
6489   m68ki_write_16(m68k, ea, (res >> 16) & 0xFFFF );
64906490
6491   FLAG_N = NFLAG_32(res);
6492   FLAG_Z = res;
6493   FLAG_V = VFLAG_CLEAR;
6494   FLAG_C = CFLAG_CLEAR;
6491   m68k->n_flag = NFLAG_32(res);
6492   m68k->not_z_flag = res;
6493   m68k->v_flag = VFLAG_CLEAR;
6494   m68k->c_flag = CFLAG_CLEAR;
64956495}
64966496
64976497
64986498M68KMAKE_OP(move, 32, di, d)
64996499{
6500   uint res = DY;
6501   uint ea = EA_AX_DI_32();
6500   UINT32 res = DY;
6501   UINT32 ea = EA_AX_DI_32(m68k);
65026502
6503   m68ki_write_32(ea, res);
6503   m68ki_write_32(m68k, ea, res);
65046504
6505   FLAG_N = NFLAG_32(res);
6506   FLAG_Z = res;
6507   FLAG_V = VFLAG_CLEAR;
6508   FLAG_C = CFLAG_CLEAR;
6505   m68k->n_flag = NFLAG_32(res);
6506   m68k->not_z_flag = res;
6507   m68k->v_flag = VFLAG_CLEAR;
6508   m68k->c_flag = CFLAG_CLEAR;
65096509}
65106510
65116511
65126512M68KMAKE_OP(move, 32, di, a)
65136513{
6514   uint res = AY;
6515   uint ea = EA_AX_DI_32();
6514   UINT32 res = AY;
6515   UINT32 ea = EA_AX_DI_32(m68k);
65166516
6517   m68ki_write_32(ea, res);
6517   m68ki_write_32(m68k, ea, res);
65186518
6519   FLAG_N = NFLAG_32(res);
6520   FLAG_Z = res;
6521   FLAG_V = VFLAG_CLEAR;
6522   FLAG_C = CFLAG_CLEAR;
6519   m68k->n_flag = NFLAG_32(res);
6520   m68k->not_z_flag = res;
6521   m68k->v_flag = VFLAG_CLEAR;
6522   m68k->c_flag = CFLAG_CLEAR;
65236523}
65246524
65256525
65266526M68KMAKE_OP(move, 32, di, .)
65276527{
6528   uint res = M68KMAKE_GET_OPER_AY_32;
6529   uint ea = EA_AX_DI_32();
6528   UINT32 res = M68KMAKE_GET_OPER_AY_32;
6529   UINT32 ea = EA_AX_DI_32(m68k);
65306530
6531   m68ki_write_32(ea, res);
6531   m68ki_write_32(m68k, ea, res);
65326532
6533   FLAG_N = NFLAG_32(res);
6534   FLAG_Z = res;
6535   FLAG_V = VFLAG_CLEAR;
6536   FLAG_C = CFLAG_CLEAR;
6533   m68k->n_flag = NFLAG_32(res);
6534   m68k->not_z_flag = res;
6535   m68k->v_flag = VFLAG_CLEAR;
6536   m68k->c_flag = CFLAG_CLEAR;
65376537}
65386538
65396539
65406540M68KMAKE_OP(move, 32, ix, d)
65416541{
6542   uint res = DY;
6543   uint ea = EA_AX_IX_32();
6542   UINT32 res = DY;
6543   UINT32 ea = EA_AX_IX_32(m68k);
65446544
6545   m68ki_write_32(ea, res);
6545   m68ki_write_32(m68k, ea, res);
65466546
6547   FLAG_N = NFLAG_32(res);
6548   FLAG_Z = res;
6549   FLAG_V = VFLAG_CLEAR;
6550   FLAG_C = CFLAG_CLEAR;
6547   m68k->n_flag = NFLAG_32(res);
6548   m68k->not_z_flag = res;
6549   m68k->v_flag = VFLAG_CLEAR;
6550   m68k->c_flag = CFLAG_CLEAR;
65516551}
65526552
65536553
65546554M68KMAKE_OP(move, 32, ix, a)
65556555{
6556   uint res = AY;
6557   uint ea = EA_AX_IX_32();
6556   UINT32 res = AY;
6557   UINT32 ea = EA_AX_IX_32(m68k);
65586558
6559   m68ki_write_32(ea, res);
6559   m68ki_write_32(m68k, ea, res);
65606560
6561   FLAG_N = NFLAG_32(res);
6562   FLAG_Z = res;
6563   FLAG_V = VFLAG_CLEAR;
6564   FLAG_C = CFLAG_CLEAR;
6561   m68k->n_flag = NFLAG_32(res);
6562   m68k->not_z_flag = res;
6563   m68k->v_flag = VFLAG_CLEAR;
6564   m68k->c_flag = CFLAG_CLEAR;
65656565}
65666566
65676567
65686568M68KMAKE_OP(move, 32, ix, .)
65696569{
6570   uint res = M68KMAKE_GET_OPER_AY_32;
6571   uint ea = EA_AX_IX_32();
6570   UINT32 res = M68KMAKE_GET_OPER_AY_32;
6571   UINT32 ea = EA_AX_IX_32(m68k);
65726572
6573   m68ki_write_32(ea, res);
6573   m68ki_write_32(m68k, ea, res);
65746574
6575   FLAG_N = NFLAG_32(res);
6576   FLAG_Z = res;
6577   FLAG_V = VFLAG_CLEAR;
6578   FLAG_C = CFLAG_CLEAR;
6575   m68k->n_flag = NFLAG_32(res);
6576   m68k->not_z_flag = res;
6577   m68k->v_flag = VFLAG_CLEAR;
6578   m68k->c_flag = CFLAG_CLEAR;
65796579}
65806580
65816581
65826582M68KMAKE_OP(move, 32, aw, d)
65836583{
6584   uint res = DY;
6585   uint ea = EA_AW_32();
6584   UINT32 res = DY;
6585   UINT32 ea = EA_AW_32(m68k);
65866586
6587   m68ki_write_32(ea, res);
6587   m68ki_write_32(m68k, ea, res);
65886588
6589   FLAG_N = NFLAG_32(res);
6590   FLAG_Z = res;
6591   FLAG_V = VFLAG_CLEAR;
6592   FLAG_C = CFLAG_CLEAR;
6589   m68k->n_flag = NFLAG_32(res);
6590   m68k->not_z_flag = res;
6591   m68k->v_flag = VFLAG_CLEAR;
6592   m68k->c_flag = CFLAG_CLEAR;
65936593}
65946594
65956595
65966596M68KMAKE_OP(move, 32, aw, a)
65976597{
6598   uint res = AY;
6599   uint ea = EA_AW_32();
6598   UINT32 res = AY;
6599   UINT32 ea = EA_AW_32(m68k);
66006600
6601   m68ki_write_32(ea, res);
6601   m68ki_write_32(m68k, ea, res);
66026602
6603   FLAG_N = NFLAG_32(res);
6604   FLAG_Z = res;
6605   FLAG_V = VFLAG_CLEAR;
6606   FLAG_C = CFLAG_CLEAR;
6603   m68k->n_flag = NFLAG_32(res);
6604   m68k->not_z_flag = res;
6605   m68k->v_flag = VFLAG_CLEAR;
6606   m68k->c_flag = CFLAG_CLEAR;
66076607}
66086608
66096609
66106610M68KMAKE_OP(move, 32, aw, .)
66116611{
6612   uint res = M68KMAKE_GET_OPER_AY_32;
6613   uint ea = EA_AW_32();
6612   UINT32 res = M68KMAKE_GET_OPER_AY_32;
6613   UINT32 ea = EA_AW_32(m68k);
66146614
6615   m68ki_write_32(ea, res);
6615   m68ki_write_32(m68k, ea, res);
66166616
6617   FLAG_N = NFLAG_32(res);
6618   FLAG_Z = res;
6619   FLAG_V = VFLAG_CLEAR;
6620   FLAG_C = CFLAG_CLEAR;
6617   m68k->n_flag = NFLAG_32(res);
6618   m68k->not_z_flag = res;
6619   m68k->v_flag = VFLAG_CLEAR;
6620   m68k->c_flag = CFLAG_CLEAR;
66216621}
66226622
66236623
66246624M68KMAKE_OP(move, 32, al, d)
66256625{
6626   uint res = DY;
6627   uint ea = EA_AL_32();
6626   UINT32 res = DY;
6627   UINT32 ea = EA_AL_32(m68k);
66286628
6629   m68ki_write_32(ea, res);
6629   m68ki_write_32(m68k, ea, res);
66306630
6631   FLAG_N = NFLAG_32(res);
6632   FLAG_Z = res;
6633   FLAG_V = VFLAG_CLEAR;
6634   FLAG_C = CFLAG_CLEAR;
6631   m68k->n_flag = NFLAG_32(res);
6632   m68k->not_z_flag = res;
6633   m68k->v_flag = VFLAG_CLEAR;
6634   m68k->c_flag = CFLAG_CLEAR;
66356635}
66366636
66376637
66386638M68KMAKE_OP(move, 32, al, a)
66396639{
6640   uint res = AY;
6641   uint ea = EA_AL_32();
6640   UINT32 res = AY;
6641   UINT32 ea = EA_AL_32(m68k);
66426642
6643   m68ki_write_32(ea, res);
6643   m68ki_write_32(m68k, ea, res);
66446644
6645   FLAG_N = NFLAG_32(res);
6646   FLAG_Z = res;
6647   FLAG_V = VFLAG_CLEAR;
6648   FLAG_C = CFLAG_CLEAR;
6645   m68k->n_flag = NFLAG_32(res);
6646   m68k->not_z_flag = res;
6647   m68k->v_flag = VFLAG_CLEAR;
6648   m68k->c_flag = CFLAG_CLEAR;
66496649}
66506650
66516651
66526652M68KMAKE_OP(move, 32, al, .)
66536653{
6654   uint res = M68KMAKE_GET_OPER_AY_32;
6655   uint ea = EA_AL_32();
6654   UINT32 res = M68KMAKE_GET_OPER_AY_32;
6655   UINT32 ea = EA_AL_32(m68k);
66566656
6657   m68ki_write_32(ea, res);
6657   m68ki_write_32(m68k, ea, res);
66586658
6659   FLAG_N = NFLAG_32(res);
6660   FLAG_Z = res;
6661   FLAG_V = VFLAG_CLEAR;
6662   FLAG_C = CFLAG_CLEAR;
6659   m68k->n_flag = NFLAG_32(res);
6660   m68k->not_z_flag = res;
6661   m68k->v_flag = VFLAG_CLEAR;
6662   m68k->c_flag = CFLAG_CLEAR;
66636663}
66646664
66656665
r3535r3536
67016701
67026702M68KMAKE_OP(move, 16, frc, d)
67036703{
6704   if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
6704   if(CPU_TYPE_IS_010_PLUS(m68k->cpu_type))
67056705   {
6706      DY = MASK_OUT_BELOW_16(DY) | m68ki_get_ccr();
6706      DY = MASK_OUT_BELOW_16(DY) | m68ki_get_ccr(m68k);
67076707      return;
67086708   }
6709   m68ki_exception_illegal();
6709   m68ki_exception_illegal(m68k);
67106710}
67116711
67126712
67136713M68KMAKE_OP(move, 16, frc, .)
67146714{
6715   if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
6715   if(CPU_TYPE_IS_010_PLUS(m68k->cpu_type))
67166716   {
6717      m68ki_write_16(M68KMAKE_GET_EA_AY_16, m68ki_get_ccr());
6717      m68ki_write_16(m68k, M68KMAKE_GET_EA_AY_16, m68ki_get_ccr(m68k));
67186718      return;
67196719   }
6720   m68ki_exception_illegal();
6720   m68ki_exception_illegal(m68k);
67216721}
67226722
67236723
67246724M68KMAKE_OP(move, 16, toc, d)
67256725{
6726   m68ki_set_ccr(DY);
6726   m68ki_set_ccr(m68k, DY);
67276727}
67286728
67296729
67306730M68KMAKE_OP(move, 16, toc, .)
67316731{
6732   m68ki_set_ccr(M68KMAKE_GET_OPER_AY_16);
6732   m68ki_set_ccr(m68k, M68KMAKE_GET_OPER_AY_16);
67336733}
67346734
67356735
67366736M68KMAKE_OP(move, 16, frs, d)
67376737{
6738   if(CPU_TYPE_IS_000(CPU_TYPE) || FLAG_S)   /* NS990408 */
6738   if(CPU_TYPE_IS_000(m68k->cpu_type) || m68k->s_flag)   /* NS990408 */
67396739   {
6740      DY = MASK_OUT_BELOW_16(DY) | m68ki_get_sr();
6740      DY = MASK_OUT_BELOW_16(DY) | m68ki_get_sr(m68k);
67416741      return;
67426742   }
6743   m68ki_exception_privilege_violation();
6743   m68ki_exception_privilege_violation(m68k);
67446744}
67456745
67466746
67476747M68KMAKE_OP(move, 16, frs, .)
67486748{
6749   if(CPU_TYPE_IS_000(CPU_TYPE) || FLAG_S)   /* NS990408 */
6749   if(CPU_TYPE_IS_000(m68k->cpu_type) || m68k->s_flag)   /* NS990408 */
67506750   {
6751      uint ea = M68KMAKE_GET_EA_AY_16;
6752      m68ki_write_16(ea, m68ki_get_sr());
6751      UINT32 ea = M68KMAKE_GET_EA_AY_16;
6752      m68ki_write_16(m68k, ea, m68ki_get_sr(m68k));
67536753      return;
67546754   }
6755   m68ki_exception_privilege_violation();
6755   m68ki_exception_privilege_violation(m68k);
67566756}
67576757
67586758
67596759M68KMAKE_OP(move, 16, tos, d)
67606760{
6761   if(FLAG_S)
6761   if(m68k->s_flag)
67626762   {
6763      m68ki_set_sr(DY);
6763      m68ki_set_sr(m68k, DY);
67646764      return;
67656765   }
6766   m68ki_exception_privilege_violation();
6766   m68ki_exception_privilege_violation(m68k);
67676767}
67686768
67696769
67706770M68KMAKE_OP(move, 16, tos, .)
67716771{
6772   if(FLAG_S)
6772   if(m68k->s_flag)
67736773   {
6774      uint new_sr = M68KMAKE_GET_OPER_AY_16;
6774      UINT32 new_sr = M68KMAKE_GET_OPER_AY_16;
67756775      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
6776      m68ki_set_sr(new_sr);
6776      m68ki_set_sr(m68k, new_sr);
67776777      return;
67786778   }
6779   m68ki_exception_privilege_violation();
6779   m68ki_exception_privilege_violation(m68k);
67806780}
67816781
67826782
67836783M68KMAKE_OP(move, 32, fru, .)
67846784{
6785   if(FLAG_S)
6785   if(m68k->s_flag)
67866786   {
67876787      AY = REG_USP;
67886788      return;
67896789   }
6790   m68ki_exception_privilege_violation();
6790   m68ki_exception_privilege_violation(m68k);
67916791}
67926792
67936793
67946794M68KMAKE_OP(move, 32, tou, .)
67956795{
6796   if(FLAG_S)
6796   if(m68k->s_flag)
67976797   {
67986798      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
67996799      REG_USP = AY;
68006800      return;
68016801   }
6802   m68ki_exception_privilege_violation();
6802   m68ki_exception_privilege_violation(m68k);
68036803}
68046804
68056805
68066806M68KMAKE_OP(movec, 32, cr, .)
68076807{
6808   if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
6808   if(CPU_TYPE_IS_010_PLUS(m68k->cpu_type))
68096809   {
6810      if(FLAG_S)
6810      if(m68k->s_flag)
68116811      {
6812         uint word2 = OPER_I_16();
6812         UINT32 word2 = OPER_I_16(m68k);
68136813
68146814         m68ki_trace_t0();         /* auto-disable (see m68kcpu.h) */
68156815         switch (word2 & 0xfff)
68166816         {
68176817         case 0x000:            /* SFC */
6818            REG_DA[(word2 >> 12) & 15] = REG_SFC;
6818            REG_DA[(word2 >> 12) & 15] = m68k->sfc;
68196819            return;
68206820         case 0x001:            /* DFC */
6821            REG_DA[(word2 >> 12) & 15] = REG_DFC;
6821            REG_DA[(word2 >> 12) & 15] = m68k->dfc;
68226822            return;
68236823         case 0x002:            /* CACR */
6824            if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
6824            if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
68256825            {
6826               REG_DA[(word2 >> 12) & 15] = REG_CACR;
6826               REG_DA[(word2 >> 12) & 15] = m68k->cacr;
68276827               return;
68286828            }
68296829            return;
r3535r3536
68316831            REG_DA[(word2 >> 12) & 15] = REG_USP;
68326832            return;
68336833         case 0x801:            /* VBR */
6834            REG_DA[(word2 >> 12) & 15] = REG_VBR;
6834            REG_DA[(word2 >> 12) & 15] = m68k->vbr;
68356835            return;
68366836         case 0x802:            /* CAAR */
6837            if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
6837            if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
68386838            {
6839               REG_DA[(word2 >> 12) & 15] = REG_CAAR;
6839               REG_DA[(word2 >> 12) & 15] = m68k->caar;
68406840               return;
68416841            }
6842            m68ki_exception_illegal();
6842            m68ki_exception_illegal(m68k);
68436843            break;
68446844         case 0x803:            /* MSP */
6845            if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
6845            if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
68466846            {
6847               REG_DA[(word2 >> 12) & 15] = FLAG_M ? REG_SP : REG_MSP;
6847               REG_DA[(word2 >> 12) & 15] = m68k->m_flag ? REG_SP : REG_MSP;
68486848               return;
68496849            }
6850            m68ki_exception_illegal();
6850            m68ki_exception_illegal(m68k);
68516851            return;
68526852         case 0x804:            /* ISP */
6853            if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
6853            if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
68546854            {
6855               REG_DA[(word2 >> 12) & 15] = FLAG_M ? REG_ISP : REG_SP;
6855               REG_DA[(word2 >> 12) & 15] = m68k->m_flag ? REG_ISP : REG_SP;
68566856               return;
68576857            }
6858            m68ki_exception_illegal();
6858            m68ki_exception_illegal(m68k);
68596859            return;
68606860         case 0x003:            /* TC */
6861            if(CPU_TYPE_IS_040_PLUS(CPU_TYPE))
6861            if(CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
68626862            {
68636863               /* TODO */
68646864               return;
68656865            }
6866            m68ki_exception_illegal();
6866            m68ki_exception_illegal(m68k);
68676867            return;
68686868         case 0x004:            /* ITT0 */
6869            if(CPU_TYPE_IS_040_PLUS(CPU_TYPE))
6869            if(CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
68706870            {
68716871               /* TODO */
68726872               return;
68736873            }
6874            m68ki_exception_illegal();
6874            m68ki_exception_illegal(m68k);
68756875            return;
68766876         case 0x005:            /* ITT1 */
6877            if(CPU_TYPE_IS_040_PLUS(CPU_TYPE))
6877            if(CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
68786878            {
68796879               /* TODO */
68806880               return;
68816881            }
6882            m68ki_exception_illegal();
6882            m68ki_exception_illegal(m68k);
68836883            return;
68846884         case 0x006:            /* DTT0 */
6885            if(CPU_TYPE_IS_040_PLUS(CPU_TYPE))
6885            if(CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
68866886            {
68876887               /* TODO */
68886888               return;
68896889            }
6890            m68ki_exception_illegal();
6890            m68ki_exception_illegal(m68k);
68916891            return;
68926892         case 0x007:            /* DTT1 */
6893            if(CPU_TYPE_IS_040_PLUS(CPU_TYPE))
6893            if(CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
68946894            {
68956895               /* TODO */
68966896               return;
68976897            }
6898            m68ki_exception_illegal();
6898            m68ki_exception_illegal(m68k);
68996899            return;
69006900         case 0x805:            /* MMUSR */
6901            if(CPU_TYPE_IS_040_PLUS(CPU_TYPE))
6901            if(CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
69026902            {
69036903               /* TODO */
69046904               return;
69056905            }
6906            m68ki_exception_illegal();
6906            m68ki_exception_illegal(m68k);
69076907            return;
69086908         case 0x806:            /* URP */
6909            if(CPU_TYPE_IS_040_PLUS(CPU_TYPE))
6909            if(CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
69106910            {
69116911               /* TODO */
69126912               return;
69136913            }
6914            m68ki_exception_illegal();
6914            m68ki_exception_illegal(m68k);
69156915            return;
69166916         case 0x807:            /* SRP */
6917            if(CPU_TYPE_IS_040_PLUS(CPU_TYPE))
6917            if(CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
69186918            {
69196919               /* TODO */
69206920               return;
69216921            }
6922            m68ki_exception_illegal();
6922            m68ki_exception_illegal(m68k);
69236923            return;
69246924         default:
6925            m68ki_exception_illegal();
6925            m68ki_exception_illegal(m68k);
69266926            return;
69276927         }
69286928      }
6929      m68ki_exception_privilege_violation();
6929      m68ki_exception_privilege_violation(m68k);
69306930      return;
69316931   }
6932   m68ki_exception_illegal();
6932   m68ki_exception_illegal(m68k);
69336933}
69346934
69356935
69366936M68KMAKE_OP(movec, 32, rc, .)
69376937{
6938   if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
6938   if(CPU_TYPE_IS_010_PLUS(m68k->cpu_type))
69396939   {
6940      if(FLAG_S)
6940      if(m68k->s_flag)
69416941      {
6942         uint word2 = OPER_I_16();
6942         UINT32 word2 = OPER_I_16(m68k);
69436943
69446944         m68ki_trace_t0();         /* auto-disable (see m68kcpu.h) */
69456945         switch (word2 & 0xfff)
69466946         {
69476947         case 0x000:            /* SFC */
6948            REG_SFC = REG_DA[(word2 >> 12) & 15] & 7;
6948            m68k->sfc = REG_DA[(word2 >> 12) & 15] & 7;
69496949            return;
69506950         case 0x001:            /* DFC */
6951            REG_DFC = REG_DA[(word2 >> 12) & 15] & 7;
6951            m68k->dfc = REG_DA[(word2 >> 12) & 15] & 7;
69526952            return;
69536953         case 0x002:            /* CACR */
6954            if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
6954            if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
69556955            {
6956               if (CPU_TYPE_IS_040_PLUS(CPU_TYPE))
6956               if (CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
69576957               {
6958                  REG_CACR = REG_DA[(word2 >> 12) & 15];
6958                  m68k->cacr = REG_DA[(word2 >> 12) & 15];
69596959               }
69606960               else
69616961               {
69626962                  /* non 68040 can only set the lower 4 bits (C,CE,F,E) */
6963                  REG_CACR = REG_DA[(word2 >> 12) & 15] & 0x0f;
6963                  m68k->cacr = REG_DA[(word2 >> 12) & 15] & 0x0f;
69646964               }
69656965               return;
69666966            }
6967            m68ki_exception_illegal();
6967            m68ki_exception_illegal(m68k);
69686968            return;
69696969         case 0x800:            /* USP */
69706970            REG_USP = REG_DA[(word2 >> 12) & 15];
69716971            return;
69726972         case 0x801:            /* VBR */
6973            REG_VBR = REG_DA[(word2 >> 12) & 15];
6973            m68k->vbr = REG_DA[(word2 >> 12) & 15];
69746974            return;
69756975         case 0x802:            /* CAAR */
6976            if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
6976            if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
69776977            {
6978               REG_CAAR = REG_DA[(word2 >> 12) & 15];
6978               m68k->caar = REG_DA[(word2 >> 12) & 15];
69796979               return;
69806980            }
6981            m68ki_exception_illegal();
6981            m68ki_exception_illegal(m68k);
69826982            return;
69836983         case 0x803:            /* MSP */
6984            if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
6984            if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
69856985            {
69866986               /* we are in supervisor mode so just check for M flag */
6987               if(!FLAG_M)
6987               if(!m68k->m_flag)
69886988               {
69896989                  REG_MSP = REG_DA[(word2 >> 12) & 15];
69906990                  return;
r3535r3536
69926992               REG_SP = REG_DA[(word2 >> 12) & 15];
69936993               return;
69946994            }
6995            m68ki_exception_illegal();
6995            m68ki_exception_illegal(m68k);
69966996            return;
69976997         case 0x804:            /* ISP */
6998            if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
6998            if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
69996999            {
7000               if(!FLAG_M)
7000               if(!m68k->m_flag)
70017001               {
70027002                  REG_SP = REG_DA[(word2 >> 12) & 15];
70037003                  return;
r3535r3536
70057005               REG_ISP = REG_DA[(word2 >> 12) & 15];
70067006               return;
70077007            }
7008            m68ki_exception_illegal();
7008            m68ki_exception_illegal(m68k);
70097009            return;
70107010         case 0x003:         /* TC */
7011            if (CPU_TYPE_IS_040_PLUS(CPU_TYPE))
7011            if (CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
70127012            {
70137013               /* TODO */
70147014               return;
70157015            }
7016            m68ki_exception_illegal();
7016            m68ki_exception_illegal(m68k);
70177017            return;
70187018         case 0x004:         /* ITT0 */
7019            if (CPU_TYPE_IS_040_PLUS(CPU_TYPE))
7019            if (CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
70207020            {
70217021               /* TODO */
70227022               return;
70237023            }
7024            m68ki_exception_illegal();
7024            m68ki_exception_illegal(m68k);
70257025            return;
70267026         case 0x005:         /* ITT1 */
7027            if (CPU_TYPE_IS_040_PLUS(CPU_TYPE))
7027            if (CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
70287028            {
70297029               /* TODO */
70307030               return;
70317031            }
7032            m68ki_exception_illegal();
7032            m68ki_exception_illegal(m68k);
70337033            return;
70347034         case 0x006:         /* DTT0 */
7035            if (CPU_TYPE_IS_040_PLUS(CPU_TYPE))
7035            if (CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
70367036            {
70377037               /* TODO */
70387038               return;
70397039            }
7040            m68ki_exception_illegal();
7040            m68ki_exception_illegal(m68k);
70417041            return;
70427042         case 0x007:         /* DTT1 */
7043            if (CPU_TYPE_IS_040_PLUS(CPU_TYPE))
7043            if (CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
70447044            {
70457045               /* TODO */
70467046               return;
70477047            }
7048            m68ki_exception_illegal();
7048            m68ki_exception_illegal(m68k);
70497049            return;
70507050         case 0x805:         /* MMUSR */
7051            if (CPU_TYPE_IS_040_PLUS(CPU_TYPE))
7051            if (CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
70527052            {
70537053               /* TODO */
70547054               return;
70557055            }
7056            m68ki_exception_illegal();
7056            m68ki_exception_illegal(m68k);
70577057            return;
70587058         case 0x806:         /* URP */
7059            if (CPU_TYPE_IS_040_PLUS(CPU_TYPE))
7059            if (CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
70607060            {
70617061               /* TODO */
70627062               return;
70637063            }
7064            m68ki_exception_illegal();
7064            m68ki_exception_illegal(m68k);
70657065            return;
70667066         case 0x807:         /* SRP */
7067            if (CPU_TYPE_IS_040_PLUS(CPU_TYPE))
7067            if (CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
70687068            {
70697069               /* TODO */
70707070               return;
70717071            }
7072            m68ki_exception_illegal();
7072            m68ki_exception_illegal(m68k);
70737073            return;
70747074         default:
7075            m68ki_exception_illegal();
7075            m68ki_exception_illegal(m68k);
70767076            return;
70777077         }
70787078      }
7079      m68ki_exception_privilege_violation();
7079      m68ki_exception_privilege_violation(m68k);
70807080      return;
70817081   }
7082   m68ki_exception_illegal();
7082   m68ki_exception_illegal(m68k);
70837083}
70847084
70857085
70867086M68KMAKE_OP(movem, 16, re, pd)
70877087{
7088   uint i = 0;
7089   uint register_list = OPER_I_16();
7090   uint ea = AY;
7091   uint count = 0;
7088   UINT32 i = 0;
7089   UINT32 register_list = OPER_I_16(m68k);
7090   UINT32 ea = AY;
7091   UINT32 count = 0;
70927092
70937093   for(; i < 16; i++)
70947094      if(register_list & (1 << i))
70957095      {
70967096         ea -= 2;
7097         m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_DA[15-i]));
7097         m68ki_write_16(m68k, ea, MASK_OUT_ABOVE_16(REG_DA[15-i]));
70987098         count++;
70997099      }
71007100   AY = ea;
71017101
7102   USE_CYCLES(count<<CYC_MOVEM_W);
7102   USE_CYCLES(m68k, count<<m68k->cyc_movem_w);
71037103}
71047104
71057105
71067106M68KMAKE_OP(movem, 16, re, .)
71077107{
7108   uint i = 0;
7109   uint register_list = OPER_I_16();
7110   uint ea = M68KMAKE_GET_EA_AY_16;
7111   uint count = 0;
7108   UINT32 i = 0;
7109   UINT32 register_list = OPER_I_16(m68k);
7110   UINT32 ea = M68KMAKE_GET_EA_AY_16;
7111   UINT32 count = 0;
71127112
71137113   for(; i < 16; i++)
71147114      if(register_list & (1 << i))
71157115      {
7116         m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_DA[i]));
7116         m68ki_write_16(m68k, ea, MASK_OUT_ABOVE_16(REG_DA[i]));
71177117         ea += 2;
71187118         count++;
71197119      }
71207120
7121   USE_CYCLES(count<<CYC_MOVEM_W);
7121   USE_CYCLES(m68k, count<<m68k->cyc_movem_w);
71227122}
71237123
71247124
71257125M68KMAKE_OP(movem, 32, re, pd)
71267126{
7127   uint i = 0;
7128   uint register_list = OPER_I_16();
7129   uint ea = AY;
7130   uint count = 0;
7127   UINT32 i = 0;
7128   UINT32 register_list = OPER_I_16(m68k);
7129   UINT32 ea = AY;
7130   UINT32 count = 0;
71317131
71327132   for(; i < 16; i++)
71337133      if(register_list & (1 << i))
71347134      {
71357135         ea -= 4;
7136         m68ki_write_16(ea+2, REG_DA[15-i] & 0xFFFF );
7137         m68ki_write_16(ea, (REG_DA[15-i] >> 16) & 0xFFFF );
7136         m68ki_write_16(m68k, ea+2, REG_DA[15-i] & 0xFFFF );
7137         m68ki_write_16(m68k, ea, (REG_DA[15-i] >> 16) & 0xFFFF );
71387138         count++;
71397139      }
71407140   AY = ea;
71417141
7142   USE_CYCLES(count<<CYC_MOVEM_L);
7142   USE_CYCLES(m68k, count<<m68k->cyc_movem_l);
71437143}
71447144
71457145
71467146M68KMAKE_OP(movem, 32, re, .)
71477147{
7148   uint i = 0;
7149   uint register_list = OPER_I_16();
7150   uint ea = M68KMAKE_GET_EA_AY_32;
7151   uint count = 0;
7148   UINT32 i = 0;
7149   UINT32 register_list = OPER_I_16(m68k);
7150   UINT32 ea = M68KMAKE_GET_EA_AY_32;
7151   UINT32 count = 0;
71527152
71537153   for(; i < 16; i++)
71547154      if(register_list & (1 << i))
71557155      {
7156         m68ki_write_32(ea, REG_DA[i]);
7156         m68ki_write_32(m68k, ea, REG_DA[i]);
71577157         ea += 4;
71587158         count++;
71597159      }
71607160
7161   USE_CYCLES(count<<CYC_MOVEM_L);
7161   USE_CYCLES(m68k, count<<m68k->cyc_movem_l);
71627162}
71637163
71647164
71657165M68KMAKE_OP(movem, 16, er, pi)
71667166{
7167   uint i = 0;
7168   uint register_list = OPER_I_16();
7169   uint ea = AY;
7170   uint count = 0;
7167   UINT32 i = 0;
7168   UINT32 register_list = OPER_I_16(m68k);
7169   UINT32 ea = AY;
7170   UINT32 count = 0;
71717171
71727172   for(; i < 16; i++)
71737173      if(register_list & (1 << i))
71747174      {
7175         REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_16(ea)));
7175         REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_16(m68k, ea)));
71767176         ea += 2;
71777177         count++;
71787178      }
71797179   AY = ea;
71807180
7181   USE_CYCLES(count<<CYC_MOVEM_W);
7181   USE_CYCLES(m68k, count<<m68k->cyc_movem_w);
71827182}
71837183
71847184
71857185M68KMAKE_OP(movem, 16, er, pcdi)
71867186{
7187   uint i = 0;
7188   uint register_list = OPER_I_16();
7189   uint ea = EA_PCDI_16();
7190   uint count = 0;
7187   UINT32 i = 0;
7188   UINT32 register_list = OPER_I_16(m68k);
7189   UINT32 ea = EA_PCDI_16(m68k);
7190   UINT32 count = 0;
71917191
71927192   for(; i < 16; i++)
71937193      if(register_list & (1 << i))
71947194      {
7195         REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_pcrel_16(ea)));
7195         REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_pcrel_16(m68k, ea)));
71967196         ea += 2;
71977197         count++;
71987198      }
71997199
7200   USE_CYCLES(count<<CYC_MOVEM_W);
7200   USE_CYCLES(m68k, count<<m68k->cyc_movem_w);
72017201}
72027202
72037203
72047204M68KMAKE_OP(movem, 16, er, pcix)
72057205{
7206   uint i = 0;
7207   uint register_list = OPER_I_16();
7208   uint ea = EA_PCIX_16();
7209   uint count = 0;
7206   UINT32 i = 0;
7207   UINT32 register_list = OPER_I_16(m68k);
7208   UINT32 ea = EA_PCIX_16(m68k);
7209   UINT32 count = 0;
72107210
72117211   for(; i < 16; i++)
72127212      if(register_list & (1 << i))
72137213      {
7214         REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_pcrel_16(ea)));
7214         REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_pcrel_16(m68k, ea)));
72157215         ea += 2;
72167216         count++;
72177217      }
72187218
7219   USE_CYCLES(count<<CYC_MOVEM_W);
7219   USE_CYCLES(m68k, count<<m68k->cyc_movem_w);
72207220}
72217221
72227222
72237223M68KMAKE_OP(movem, 16, er, .)
72247224{
7225   uint i = 0;
7226   uint register_list = OPER_I_16();
7227   uint ea = M68KMAKE_GET_EA_AY_16;
7228   uint count = 0;
7225   UINT32 i = 0;
7226   UINT32 register_list = OPER_I_16(m68k);
7227   UINT32 ea = M68KMAKE_GET_EA_AY_16;
7228   UINT32 count = 0;
72297229
72307230   for(; i < 16; i++)
72317231      if(register_list & (1 << i))
72327232      {
7233         REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_16(ea)));
7233         REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_16(m68k, ea)));
72347234         ea += 2;
72357235         count++;
72367236      }
72377237
7238   USE_CYCLES(count<<CYC_MOVEM_W);
7238   USE_CYCLES(m68k, count<<m68k->cyc_movem_w);
72397239}
72407240
72417241
72427242M68KMAKE_OP(movem, 32, er, pi)
72437243{
7244   uint i = 0;
7245   uint register_list = OPER_I_16();
7246   uint ea = AY;
7247   uint count = 0;
7244   UINT32 i = 0;
7245   UINT32 register_list = OPER_I_16(m68k);
7246   UINT32 ea = AY;
7247   UINT32 count = 0;
72487248
72497249   for(; i < 16; i++)
72507250      if(register_list & (1 << i))
72517251      {
7252         REG_DA[i] = m68ki_read_32(ea);
7252         REG_DA[i] = m68ki_read_32(m68k, ea);
72537253         ea += 4;
72547254         count++;
72557255      }
72567256   AY = ea;
72577257
7258   USE_CYCLES(count<<CYC_MOVEM_L);
7258   USE_CYCLES(m68k, count<<m68k->cyc_movem_l);
72597259}
72607260
72617261
72627262M68KMAKE_OP(movem, 32, er, pcdi)
72637263{
7264   uint i = 0;
7265   uint register_list = OPER_I_16();
7266   uint ea = EA_PCDI_32();
7267   uint count = 0;
7264   UINT32 i = 0;
7265   UINT32 register_list = OPER_I_16(m68k);
7266   UINT32 ea = EA_PCDI_32(m68k);
7267   UINT32 count = 0;
72687268
72697269   for(; i < 16; i++)
72707270      if(register_list & (1 << i))
72717271      {
7272         REG_DA[i] = m68ki_read_pcrel_32(ea);
7272         REG_DA[i] = m68ki_read_pcrel_32(m68k, ea);
72737273         ea += 4;
72747274         count++;
72757275      }
72767276
7277   USE_CYCLES(count<<CYC_MOVEM_L);
7277   USE_CYCLES(m68k, count<<m68k->cyc_movem_l);
72787278}
72797279
72807280
72817281M68KMAKE_OP(movem, 32, er, pcix)
72827282{
7283   uint i = 0;
7284   uint register_list = OPER_I_16();
7285   uint ea = EA_PCIX_32();
7286   uint count = 0;
7283   UINT32 i = 0;
7284   UINT32 register_list = OPER_I_16(m68k);
7285   UINT32 ea = EA_PCIX_32(m68k);
7286   UINT32 count = 0;
72877287
72887288   for(; i < 16; i++)
72897289      if(register_list & (1 << i))
72907290      {
7291         REG_DA[i] = m68ki_read_pcrel_32(ea);
7291         REG_DA[i] = m68ki_read_pcrel_32(m68k, ea);
72927292         ea += 4;
72937293         count++;
72947294      }
72957295
7296   USE_CYCLES(count<<CYC_MOVEM_L);
7296   USE_CYCLES(m68k, count<<m68k->cyc_movem_l);
72977297}
72987298
72997299
73007300M68KMAKE_OP(movem, 32, er, .)
73017301{
7302   uint i = 0;
7303   uint register_list = OPER_I_16();
7304   uint ea = M68KMAKE_GET_EA_AY_32;
7305   uint count = 0;
7302   UINT32 i = 0;
7303   UINT32 register_list = OPER_I_16(m68k);
7304   UINT32 ea = M68KMAKE_GET_EA_AY_32;
7305   UINT32 count = 0;
73067306
73077307   for(; i < 16; i++)
73087308      if(register_list & (1 << i))
73097309      {
7310         REG_DA[i] = m68ki_read_32(ea);
7310         REG_DA[i] = m68ki_read_32(m68k, ea);
73117311         ea += 4;
73127312         count++;
73137313      }
73147314
7315   USE_CYCLES(count<<CYC_MOVEM_L);
7315   USE_CYCLES(m68k, count<<m68k->cyc_movem_l);
73167316}
73177317
73187318
73197319M68KMAKE_OP(movep, 16, re, .)
73207320{
7321   uint ea = EA_AY_DI_16();
7322   uint src = DX;
7321   UINT32 ea = EA_AY_DI_16(m68k);
7322   UINT32 src = DX;
73237323
7324   m68ki_write_8(ea, MASK_OUT_ABOVE_8(src >> 8));
7325   m68ki_write_8(ea += 2, MASK_OUT_ABOVE_8(src));
7324   m68ki_write_8(m68k, ea, MASK_OUT_ABOVE_8(src >> 8));
7325   m68ki_write_8(m68k, ea += 2, MASK_OUT_ABOVE_8(src));
73267326}
73277327
73287328
73297329M68KMAKE_OP(movep, 32, re, .)
73307330{
7331   uint ea = EA_AY_DI_32();
7332   uint src = DX;
7331   UINT32 ea = EA_AY_DI_32(m68k);
7332   UINT32 src = DX;
73337333
7334   m68ki_write_8(ea, MASK_OUT_ABOVE_8(src >> 24));
7335   m68ki_write_8(ea += 2, MASK_OUT_ABOVE_8(src >> 16));
7336   m68ki_write_8(ea += 2, MASK_OUT_ABOVE_8(src >> 8));
7337   m68ki_write_8(ea += 2, MASK_OUT_ABOVE_8(src));
7334   m68ki_write_8(m68k, ea, MASK_OUT_ABOVE_8(src >> 24));
7335   m68ki_write_8(m68k, ea += 2, MASK_OUT_ABOVE_8(src >> 16));
7336   m68ki_write_8(m68k, ea += 2, MASK_OUT_ABOVE_8(src >> 8));
7337   m68ki_write_8(m68k, ea += 2, MASK_OUT_ABOVE_8(src));
73387338}
73397339
73407340
73417341M68KMAKE_OP(movep, 16, er, .)
73427342{
7343   uint ea = EA_AY_DI_16();
7344   uint* r_dst = &DX;
7343   UINT32 ea = EA_AY_DI_16(m68k);
7344   UINT32* r_dst = &DX;
73457345
7346   *r_dst = MASK_OUT_BELOW_16(*r_dst) | ((m68ki_read_8(ea) << 8) + m68ki_read_8(ea + 2));
7346   *r_dst = MASK_OUT_BELOW_16(*r_dst) | ((m68ki_read_8(m68k, ea) << 8) + m68ki_read_8(m68k, ea + 2));
73477347}
73487348
73497349
73507350M68KMAKE_OP(movep, 32, er, .)
73517351{
7352   uint ea = EA_AY_DI_32();
7352   UINT32 ea = EA_AY_DI_32(m68k);
73537353
7354   DX = (m68ki_read_8(ea) << 24) + (m68ki_read_8(ea + 2) << 16)
7355      + (m68ki_read_8(ea + 4) << 8) + m68ki_read_8(ea + 6);
7354   DX = (m68ki_read_8(m68k, ea) << 24) + (m68ki_read_8(m68k, ea + 2) << 16)
7355      + (m68ki_read_8(m68k, ea + 4) << 8) + m68ki_read_8(m68k, ea + 6);
73567356}
73577357
73587358
73597359M68KMAKE_OP(moves, 8, ., .)
73607360{
7361   if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
7361   if(CPU_TYPE_IS_010_PLUS(m68k->cpu_type))
73627362   {
7363      if(FLAG_S)
7363      if(m68k->s_flag)
73647364      {
7365         uint word2 = OPER_I_16();
7366         uint ea = M68KMAKE_GET_EA_AY_8;
7365         UINT32 word2 = OPER_I_16(m68k);
7366         UINT32 ea = M68KMAKE_GET_EA_AY_8;
73677367
73687368         m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
73697369         if(BIT_B(word2))         /* Register to memory */
73707370         {
7371            m68ki_write_8_fc(ea, REG_DFC, MASK_OUT_ABOVE_8(REG_DA[(word2 >> 12) & 15]));
7371            m68ki_write_8_fc(m68k, ea, m68k->dfc, MASK_OUT_ABOVE_8(REG_DA[(word2 >> 12) & 15]));
73727372            return;
73737373         }
73747374         if(BIT_F(word2))         /* Memory to address register */
73757375         {
7376            REG_A[(word2 >> 12) & 7] = MAKE_INT_8(m68ki_read_8_fc(ea, REG_SFC));
7377            if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
7378               USE_CYCLES(2);
7376            REG_A[(word2 >> 12) & 7] = MAKE_INT_8(m68ki_read_8_fc(m68k, ea, m68k->sfc));
7377            if(CPU_TYPE_IS_020_VARIANT(m68k->cpu_type))
7378               USE_CYCLES(m68k, 2);
73797379            return;
73807380         }
73817381         /* Memory to data register */
7382         REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_8(REG_D[(word2 >> 12) & 7]) | m68ki_read_8_fc(ea, REG_SFC);
7383         if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
7384            USE_CYCLES(2);
7382         REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_8(REG_D[(word2 >> 12) & 7]) | m68ki_read_8_fc(m68k, ea, m68k->sfc);
7383         if(CPU_TYPE_IS_020_VARIANT(m68k->cpu_type))
7384            USE_CYCLES(m68k, 2);
73857385         return;
73867386      }
7387      m68ki_exception_privilege_violation();
7387      m68ki_exception_privilege_violation(m68k);
73887388      return;
73897389   }
7390   m68ki_exception_illegal();
7390   m68ki_exception_illegal(m68k);
73917391}
73927392
73937393
73947394M68KMAKE_OP(moves, 16, ., .)
73957395{
7396   if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
7396   if(CPU_TYPE_IS_010_PLUS(m68k->cpu_type))
73977397   {
7398      if(FLAG_S)
7398      if(m68k->s_flag)
73997399      {
7400         uint word2 = OPER_I_16();
7401         uint ea = M68KMAKE_GET_EA_AY_16;
7400         UINT32 word2 = OPER_I_16(m68k);
7401         UINT32 ea = M68KMAKE_GET_EA_AY_16;
74027402
74037403         m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
74047404         if(BIT_B(word2))         /* Register to memory */
74057405         {
7406            m68ki_write_16_fc(ea, REG_DFC, MASK_OUT_ABOVE_16(REG_DA[(word2 >> 12) & 15]));
7406            m68ki_write_16_fc(m68k, ea, m68k->dfc, MASK_OUT_ABOVE_16(REG_DA[(word2 >> 12) & 15]));
74077407            return;
74087408         }
74097409         if(BIT_F(word2))         /* Memory to address register */
74107410         {
7411            REG_A[(word2 >> 12) & 7] = MAKE_INT_16(m68ki_read_16_fc(ea, REG_SFC));
7412            if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
7413               USE_CYCLES(2);
7411            REG_A[(word2 >> 12) & 7] = MAKE_INT_16(m68ki_read_16_fc(m68k, ea, m68k->sfc));
7412            if(CPU_TYPE_IS_020_VARIANT(m68k->cpu_type))
7413               USE_CYCLES(m68k, 2);
74147414            return;
74157415         }
74167416         /* Memory to data register */
7417         REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_16(REG_D[(word2 >> 12) & 7]) | m68ki_read_16_fc(ea, REG_SFC);
7418         if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
7419            USE_CYCLES(2);
7417         REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_16(REG_D[(word2 >> 12) & 7]) | m68ki_read_16_fc(m68k, ea, m68k->sfc);
7418         if(CPU_TYPE_IS_020_VARIANT(m68k->cpu_type))
7419            USE_CYCLES(m68k, 2);
74207420         return;
74217421      }
7422      m68ki_exception_privilege_violation();
7422      m68ki_exception_privilege_violation(m68k);
74237423      return;
74247424   }
7425   m68ki_exception_illegal();
7425   m68ki_exception_illegal(m68k);
74267426}
74277427
74287428
74297429M68KMAKE_OP(moves, 32, ., .)
74307430{
7431   if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
7431   if(CPU_TYPE_IS_010_PLUS(m68k->cpu_type))
74327432   {
7433      if(FLAG_S)
7433      if(m68k->s_flag)
74347434      {
7435         uint word2 = OPER_I_16();
7436         uint ea = M68KMAKE_GET_EA_AY_32;
7435         UINT32 word2 = OPER_I_16(m68k);
7436         UINT32 ea = M68KMAKE_GET_EA_AY_32;
74377437
74387438         m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
74397439         if(BIT_B(word2))         /* Register to memory */
74407440         {
7441            m68ki_write_32_fc(ea, REG_DFC, REG_DA[(word2 >> 12) & 15]);
7442            if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
7443               USE_CYCLES(2);
7441            m68ki_write_32_fc(m68k, ea, m68k->dfc, REG_DA[(word2 >> 12) & 15]);
7442            if(CPU_TYPE_IS_020_VARIANT(m68k->cpu_type))
7443               USE_CYCLES(m68k, 2);
74447444            return;
74457445         }
74467446         /* Memory to register */
7447         REG_DA[(word2 >> 12) & 15] = m68ki_read_32_fc(ea, REG_SFC);
7448         if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
7449            USE_CYCLES(2);
7447         REG_DA[(word2 >> 12) & 15] = m68ki_read_32_fc(m68k, ea, m68k->sfc);
7448         if(CPU_TYPE_IS_020_VARIANT(m68k->cpu_type))
7449            USE_CYCLES(m68k, 2);
74507450         return;
74517451      }
7452      m68ki_exception_privilege_violation();
7452      m68ki_exception_privilege_violation(m68k);
74537453      return;
74547454   }
7455   m68ki_exception_illegal();
7455   m68ki_exception_illegal(m68k);
74567456}
74577457
74587458
74597459M68KMAKE_OP(moveq, 32, ., .)
74607460{
7461   uint res = DX = MAKE_INT_8(MASK_OUT_ABOVE_8(REG_IR));
7461   UINT32 res = DX = MAKE_INT_8(MASK_OUT_ABOVE_8(m68k->ir));
74627462
7463   FLAG_N = NFLAG_32(res);
7464   FLAG_Z = res;
7465   FLAG_V = VFLAG_CLEAR;
7466   FLAG_C = CFLAG_CLEAR;
7463   m68k->n_flag = NFLAG_32(res);
7464   m68k->not_z_flag = res;
7465   m68k->v_flag = VFLAG_CLEAR;
7466   m68k->c_flag = CFLAG_CLEAR;
74677467}
74687468
74697469
74707470M68KMAKE_OP(move16, 32, ., .)
74717471{
7472   UINT16 w2 = OPER_I_16();
7473   int ax = REG_IR & 7;
7472   UINT16 w2 = OPER_I_16(m68k);
7473   int ax = m68k->ir & 7;
74747474   int ay = (w2 >> 12) & 7;
74757475
7476   m68ki_write_32(REG_A[ay],    m68ki_read_32(REG_A[ax]));
7477   m68ki_write_32(REG_A[ay]+4,  m68ki_read_32(REG_A[ax]+4));
7478   m68ki_write_32(REG_A[ay]+8,  m68ki_read_32(REG_A[ax]+8));
7479   m68ki_write_32(REG_A[ay]+12, m68ki_read_32(REG_A[ax]+12));
7476   m68ki_write_32(m68k, REG_A[ay],    m68ki_read_32(m68k, REG_A[ax]));
7477   m68ki_write_32(m68k, REG_A[ay]+4,  m68ki_read_32(m68k, REG_A[ax]+4));
7478   m68ki_write_32(m68k, REG_A[ay]+8,  m68ki_read_32(m68k, REG_A[ax]+8));
7479   m68ki_write_32(m68k, REG_A[ay]+12, m68ki_read_32(m68k, REG_A[ax]+12));
74807480
74817481   REG_A[ax] += 16;
74827482   REG_A[ay] += 16;
r3535r3536
74857485
74867486M68KMAKE_OP(muls, 16, ., d)
74877487{
7488   uint* r_dst = &DX;
7489   uint res = MASK_OUT_ABOVE_32(MAKE_INT_16(DY) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
7488   UINT32* r_dst = &DX;
7489   UINT32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(DY) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
74907490
74917491   *r_dst = res;
74927492
7493   FLAG_Z = res;
7494   FLAG_N = NFLAG_32(res);
7495   FLAG_V = VFLAG_CLEAR;
7496   FLAG_C = CFLAG_CLEAR;
7493   m68k->not_z_flag = res;
7494   m68k->n_flag = NFLAG_32(res);
7495   m68k->v_flag = VFLAG_CLEAR;
7496   m68k->c_flag = CFLAG_CLEAR;
74977497}
74987498
74997499
75007500M68KMAKE_OP(muls, 16, ., .)
75017501{
7502   uint* r_dst = &DX;
7503   uint res = MASK_OUT_ABOVE_32(MAKE_INT_16(M68KMAKE_GET_OPER_AY_16) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
7502   UINT32* r_dst = &DX;
7503   UINT32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(M68KMAKE_GET_OPER_AY_16) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
75047504
75057505   *r_dst = res;
75067506
7507   FLAG_Z = res;
7508   FLAG_N = NFLAG_32(res);
7509   FLAG_V = VFLAG_CLEAR;
7510   FLAG_C = CFLAG_CLEAR;
7507   m68k->not_z_flag = res;
7508   m68k->n_flag = NFLAG_32(res);
7509   m68k->v_flag = VFLAG_CLEAR;
7510   m68k->c_flag = CFLAG_CLEAR;
75117511}
75127512
75137513
75147514M68KMAKE_OP(mulu, 16, ., d)
75157515{
7516   uint* r_dst = &DX;
7517   uint res = MASK_OUT_ABOVE_16(DY) * MASK_OUT_ABOVE_16(*r_dst);
7516   UINT32* r_dst = &DX;
7517   UINT32 res = MASK_OUT_ABOVE_16(DY) * MASK_OUT_ABOVE_16(*r_dst);
75187518
75197519   *r_dst = res;
75207520
7521   FLAG_Z = res;
7522   FLAG_N = NFLAG_32(res);
7523   FLAG_V = VFLAG_CLEAR;
7524   FLAG_C = CFLAG_CLEAR;
7521   m68k->not_z_flag = res;
7522   m68k->n_flag = NFLAG_32(res);
7523   m68k->v_flag = VFLAG_CLEAR;
7524   m68k->c_flag = CFLAG_CLEAR;
75257525}
75267526
75277527
75287528M68KMAKE_OP(mulu, 16, ., .)
75297529{
7530   uint* r_dst = &DX;
7531   uint res = M68KMAKE_GET_OPER_AY_16 * MASK_OUT_ABOVE_16(*r_dst);
7530   UINT32* r_dst = &DX;
7531   UINT32 res = M68KMAKE_GET_OPER_AY_16 * MASK_OUT_ABOVE_16(*r_dst);
75327532
75337533   *r_dst = res;
75347534
7535   FLAG_Z = res;
7536   FLAG_N = NFLAG_32(res);
7537   FLAG_V = VFLAG_CLEAR;
7538   FLAG_C = CFLAG_CLEAR;
7535   m68k->not_z_flag = res;
7536   m68k->n_flag = NFLAG_32(res);
7537   m68k->v_flag = VFLAG_CLEAR;
7538   m68k->c_flag = CFLAG_CLEAR;
75397539}
75407540
75417541
r3535r3536
75437543{
75447544#if M68K_USE_64_BIT
75457545
7546   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
7546   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
75477547   {
7548      uint word2 = OPER_I_16();
7549      uint64 src = DY;
7550      uint64 dst = REG_D[(word2 >> 12) & 7];
7551      uint64 res;
7548      UINT32 word2 = OPER_I_16(m68k);
7549      UINT64 src = DY;
7550      UINT64 dst = REG_D[(word2 >> 12) & 7];
7551      UINT64 res;
75527552
7553      FLAG_C = CFLAG_CLEAR;
7553      m68k->c_flag = CFLAG_CLEAR;
75547554
75557555      if(BIT_B(word2))            /* signed */
75567556      {
7557         res = (sint64)((sint32)src) * (sint64)((sint32)dst);
7557         res = (INT64)((INT32)src) * (INT64)((INT32)dst);
75587558         if(!BIT_A(word2))
75597559         {
7560            FLAG_Z = MASK_OUT_ABOVE_32(res);
7561            FLAG_N = NFLAG_32(res);
7562            FLAG_V = ((sint64)res != (sint32)res)<<7;
7563            REG_D[(word2 >> 12) & 7] = FLAG_Z;
7560            m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
7561            m68k->n_flag = NFLAG_32(res);
7562            m68k->v_flag = ((INT64)res != (INT32)res)<<7;
7563            REG_D[(word2 >> 12) & 7] = m68k->not_z_flag;
75647564            return;
75657565         }
7566         FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
7567         FLAG_N = NFLAG_64(res);
7568         FLAG_V = VFLAG_CLEAR;
7566         m68k->not_z_flag = MASK_OUT_ABOVE_32(res) | (res>>32);
7567         m68k->n_flag = NFLAG_64(res);
7568         m68k->v_flag = VFLAG_CLEAR;
75697569         REG_D[word2 & 7] = (res >> 32);
75707570         REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
75717571         return;
r3535r3536
75747574      res = src * dst;
75757575      if(!BIT_A(word2))
75767576      {
7577         FLAG_Z = MASK_OUT_ABOVE_32(res);
7578         FLAG_N = NFLAG_32(res);
7579         FLAG_V = (res > 0xffffffff)<<7;
7580         REG_D[(word2 >> 12) & 7] = FLAG_Z;
7577         m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
7578         m68k->n_flag = NFLAG_32(res);
7579         m68k->v_flag = (res > 0xffffffff)<<7;
7580         REG_D[(word2 >> 12) & 7] = m68k->not_z_flag;
75817581         return;
75827582      }
7583      FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
7584      FLAG_N = NFLAG_64(res);
7585      FLAG_V = VFLAG_CLEAR;
7583      m68k->not_z_flag = MASK_OUT_ABOVE_32(res) | (res>>32);
7584      m68k->n_flag = NFLAG_64(res);
7585      m68k->v_flag = VFLAG_CLEAR;
75867586      REG_D[word2 & 7] = (res >> 32);
75877587      REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
75887588      return;
75897589   }
7590   m68ki_exception_illegal();
7590   m68ki_exception_illegal(m68k);
75917591
75927592#else
75937593
7594   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
7594   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
75957595   {
7596      uint word2 = OPER_I_16();
7597      uint src = DY;
7598      uint dst = REG_D[(word2 >> 12) & 7];
7599      uint neg = GET_MSB_32(src ^ dst);
7600      uint src1;
7601      uint src2;
7602      uint dst1;
7603      uint dst2;
7604      uint r1;
7605      uint r2;
7606      uint r3;
7607      uint r4;
7608      uint lo;
7609      uint hi;
7596      UINT32 word2 = OPER_I_16(m68k);
7597      UINT32 src = DY;
7598      UINT32 dst = REG_D[(word2 >> 12) & 7];
7599      UINT32 neg = GET_MSB_32(src ^ dst);
7600      UINT32 src1;
7601      UINT32 src2;
7602      UINT32 dst1;
7603      UINT32 dst2;
7604      UINT32 r1;
7605      UINT32 r2;
7606      UINT32 r3;
7607      UINT32 r4;
7608      UINT32 lo;
7609      UINT32 hi;
76107610
7611      FLAG_C = CFLAG_CLEAR;
7611      m68k->c_flag = CFLAG_CLEAR;
76127612
76137613      if(BIT_B(word2))            /* signed */
76147614      {
76157615         if(GET_MSB_32(src))
7616            src = (uint)MASK_OUT_ABOVE_32(-(sint)src);
7616            src = (UINT32)MASK_OUT_ABOVE_32(-(INT32)src);
76177617         if(GET_MSB_32(dst))
7618            dst = (uint)MASK_OUT_ABOVE_32(-(sint)dst);
7618            dst = (UINT32)MASK_OUT_ABOVE_32(-(INT32)dst);
76197619      }
76207620
76217621      src1 = MASK_OUT_ABOVE_16(src);
r3535r3536
76347634
76357635      if(BIT_B(word2) && neg)
76367636      {
7637         hi = (uint)MASK_OUT_ABOVE_32((-(sint)hi) - (lo != 0));
7638         lo = (uint)MASK_OUT_ABOVE_32(-(sint)lo);
7637         hi = (UINT32)MASK_OUT_ABOVE_32((-(INT32)hi) - (lo != 0));
7638         lo = (UINT32)MASK_OUT_ABOVE_32(-(INT32)lo);
76397639      }
76407640
76417641      if(BIT_A(word2))
76427642      {
76437643         REG_D[word2 & 7] = hi;
76447644         REG_D[(word2 >> 12) & 7] = lo;
7645         FLAG_N = NFLAG_32(hi);
7646         FLAG_Z = hi | lo;
7647         FLAG_V = VFLAG_CLEAR;
7645         m68k->n_flag = NFLAG_32(hi);
7646         m68k->not_z_flag = hi | lo;
7647         m68k->v_flag = VFLAG_CLEAR;
76487648         return;
76497649      }
76507650
76517651      REG_D[(word2 >> 12) & 7] = lo;
7652      FLAG_N = NFLAG_32(lo);
7653      FLAG_Z = lo;
7652      m68k->n_flag = NFLAG_32(lo);
7653      m68k->not_z_flag = lo;
76547654      if(BIT_B(word2))
7655         FLAG_V = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
7655         m68k->v_flag = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
76567656      else
7657         FLAG_V = (hi != 0) << 7;
7657         m68k->v_flag = (hi != 0) << 7;
76587658      return;
76597659   }
7660   m68ki_exception_illegal();
7660   m68ki_exception_illegal(m68k);
76617661
76627662#endif
76637663}
r3535r3536
76677667{
76687668#if M68K_USE_64_BIT
76697669
7670   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
7670   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
76717671   {
7672      uint word2 = OPER_I_16();
7673      uint64 src = M68KMAKE_GET_OPER_AY_32;
7674      uint64 dst = REG_D[(word2 >> 12) & 7];
7675      uint64 res;
7672      UINT32 word2 = OPER_I_16(m68k);
7673      UINT64 src = M68KMAKE_GET_OPER_AY_32;
7674      UINT64 dst = REG_D[(word2 >> 12) & 7];
7675      UINT64 res;
76767676
7677      FLAG_C = CFLAG_CLEAR;
7677      m68k->c_flag = CFLAG_CLEAR;
76787678
76797679      if(BIT_B(word2))            /* signed */
76807680      {
7681         res = (sint64)((sint32)src) * (sint64)((sint32)dst);
7681         res = (INT64)((INT32)src) * (INT64)((INT32)dst);
76827682         if(!BIT_A(word2))
76837683         {
7684            FLAG_Z = MASK_OUT_ABOVE_32(res);
7685            FLAG_N = NFLAG_32(res);
7686            FLAG_V = ((sint64)res != (sint32)res)<<7;
7687            REG_D[(word2 >> 12) & 7] = FLAG_Z;
7684            m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
7685            m68k->n_flag = NFLAG_32(res);
7686            m68k->v_flag = ((INT64)res != (INT32)res)<<7;
7687            REG_D[(word2 >> 12) & 7] = m68k->not_z_flag;
76887688            return;
76897689         }
7690         FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
7691         FLAG_N = NFLAG_64(res);
7692         FLAG_V = VFLAG_CLEAR;
7690         m68k->not_z_flag = MASK_OUT_ABOVE_32(res) | (res>>32);
7691         m68k->n_flag = NFLAG_64(res);
7692         m68k->v_flag = VFLAG_CLEAR;
76937693         REG_D[word2 & 7] = (res >> 32);
76947694         REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
76957695         return;
r3535r3536
76987698      res = src * dst;
76997699      if(!BIT_A(word2))
77007700      {
7701         FLAG_Z = MASK_OUT_ABOVE_32(res);
7702         FLAG_N = NFLAG_32(res);
7703         FLAG_V = (res > 0xffffffff)<<7;
7704         REG_D[(word2 >> 12) & 7] = FLAG_Z;
7701         m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
7702         m68k->n_flag = NFLAG_32(res);
7703         m68k->v_flag = (res > 0xffffffff)<<7;
7704         REG_D[(word2 >> 12) & 7] = m68k->not_z_flag;
77057705         return;
77067706      }
7707      FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
7708      FLAG_N = NFLAG_64(res);
7709      FLAG_V = VFLAG_CLEAR;
7707      m68k->not_z_flag = MASK_OUT_ABOVE_32(res) | (res>>32);
7708      m68k->n_flag = NFLAG_64(res);
7709      m68k->v_flag = VFLAG_CLEAR;
77107710      REG_D[word2 & 7] = (res >> 32);
77117711      REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
77127712      return;
77137713   }
7714   m68ki_exception_illegal();
7714   m68ki_exception_illegal(m68k);
77157715
77167716#else
77177717
7718   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
7718   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
77197719   {
7720      uint word2 = OPER_I_16();
7721      uint src = M68KMAKE_GET_OPER_AY_32;
7722      uint dst = REG_D[(word2 >> 12) & 7];
7723      uint neg = GET_MSB_32(src ^ dst);
7724      uint src1;
7725      uint src2;
7726      uint dst1;
7727      uint dst2;
7728      uint r1;
7729      uint r2;
7730      uint r3;
7731      uint r4;
7732      uint lo;
7733      uint hi;
7720      UINT32 word2 = OPER_I_16(m68k);
7721      UINT32 src = M68KMAKE_GET_OPER_AY_32;
7722      UINT32 dst = REG_D[(word2 >> 12) & 7];
7723      UINT32 neg = GET_MSB_32(src ^ dst);
7724      UINT32 src1;
7725      UINT32 src2;
7726      UINT32 dst1;
7727      UINT32 dst2;
7728      UINT32 r1;
7729      UINT32 r2;
7730      UINT32 r3;
7731      UINT32 r4;
7732      UINT32 lo;
7733      UINT32 hi;
77347734
7735      FLAG_C = CFLAG_CLEAR;
7735      m68k->c_flag = CFLAG_CLEAR;
77367736
77377737      if(BIT_B(word2))            /* signed */
77387738      {
77397739         if(GET_MSB_32(src))
7740            src = (uint)MASK_OUT_ABOVE_32(-(sint)src);
7740            src = (UINT32)MASK_OUT_ABOVE_32(-(INT32)src);
77417741         if(GET_MSB_32(dst))
7742            dst = (uint)MASK_OUT_ABOVE_32(-(sint)dst);
7742            dst = (UINT32)MASK_OUT_ABOVE_32(-(INT32)dst);
77437743      }
77447744
77457745      src1 = MASK_OUT_ABOVE_16(src);
r3535r3536
77587758
77597759      if(BIT_B(word2) && neg)
77607760      {
7761         hi = (uint)MASK_OUT_ABOVE_32((-(sint)hi) - (lo != 0));
7762         lo = (uint)MASK_OUT_ABOVE_32(-(sint)lo);
7761         hi = (UINT32)MASK_OUT_ABOVE_32((-(INT32)hi) - (lo != 0));
7762         lo = (UINT32)MASK_OUT_ABOVE_32(-(INT32)lo);
77637763      }
77647764
77657765      if(BIT_A(word2))
77667766      {
77677767         REG_D[word2 & 7] = hi;
77687768         REG_D[(word2 >> 12) & 7] = lo;
7769         FLAG_N = NFLAG_32(hi);
7770         FLAG_Z = hi | lo;
7771         FLAG_V = VFLAG_CLEAR;
7769         m68k->n_flag = NFLAG_32(hi);
7770         m68k->not_z_flag = hi | lo;
7771         m68k->v_flag = VFLAG_CLEAR;
77727772         return;
77737773      }
77747774
77757775      REG_D[(word2 >> 12) & 7] = lo;
7776      FLAG_N = NFLAG_32(lo);
7777      FLAG_Z = lo;
7776      m68k->n_flag = NFLAG_32(lo);
7777      m68k->not_z_flag = lo;
77787778      if(BIT_B(word2))
7779         FLAG_V = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
7779         m68k->v_flag = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
77807780      else
7781         FLAG_V = (hi != 0) << 7;
7781         m68k->v_flag = (hi != 0) << 7;
77827782      return;
77837783   }
7784   m68ki_exception_illegal();
7784   m68ki_exception_illegal(m68k);
77857785
77867786#endif
77877787}
r3535r3536
77897789
77907790M68KMAKE_OP(nbcd, 8, ., d)
77917791{
7792   uint* r_dst = &DY;
7793   uint dst = *r_dst;
7794   uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1());
7792   UINT32* r_dst = &DY;
7793   UINT32 dst = *r_dst;
7794   UINT32 res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1(m68k));
77957795
77967796   if(res != 0x9a)
77977797   {
7798      FLAG_V = ~res; /* Undefined V behavior */
7798      m68k->v_flag = ~res; /* Undefined V behavior */
77997799
78007800      if((res & 0x0f) == 0xa)
78017801         res = (res & 0xf0) + 0x10;
78027802
78037803      res = MASK_OUT_ABOVE_8(res);
78047804
7805      FLAG_V &= res; /* Undefined V behavior part II */
7805      m68k->v_flag &= res; /* Undefined V behavior part II */
78067806
78077807      *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
78087808
7809      FLAG_Z |= res;
7810      FLAG_C = CFLAG_SET;
7811      FLAG_X = XFLAG_SET;
7809      m68k->not_z_flag |= res;
7810      m68k->c_flag = CFLAG_SET;
7811      m68k->x_flag = XFLAG_SET;
78127812   }
78137813   else
78147814   {
7815      FLAG_V = VFLAG_CLEAR;
7816      FLAG_C = CFLAG_CLEAR;
7817      FLAG_X = XFLAG_CLEAR;
7815      m68k->v_flag = VFLAG_CLEAR;
7816      m68k->c_flag = CFLAG_CLEAR;
7817      m68k->x_flag = XFLAG_CLEAR;
78187818   }
7819   FLAG_N = NFLAG_8(res);   /* Undefined N behavior */
7819   m68k->n_flag = NFLAG_8(res);   /* Undefined N behavior */
78207820}
78217821
78227822
78237823M68KMAKE_OP(nbcd, 8, ., .)
78247824{
7825   uint ea = M68KMAKE_GET_EA_AY_8;
7826   uint dst = m68ki_read_8(ea);
7827   uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1());
7825   UINT32 ea = M68KMAKE_GET_EA_AY_8;
7826   UINT32 dst = m68ki_read_8(m68k, ea);
7827   UINT32 res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1(m68k));
78287828
78297829   if(res != 0x9a)
78307830   {
7831      FLAG_V = ~res; /* Undefined V behavior */
7831      m68k->v_flag = ~res; /* Undefined V behavior */
78327832
78337833      if((res & 0x0f) == 0xa)
78347834         res = (res & 0xf0) + 0x10;
78357835
78367836      res = MASK_OUT_ABOVE_8(res);
78377837
7838      FLAG_V &= res; /* Undefined V behavior part II */
7838      m68k->v_flag &= res; /* Undefined V behavior part II */
78397839
7840      m68ki_write_8(ea, MASK_OUT_ABOVE_8(res));
7840      m68ki_write_8(m68k, ea, MASK_OUT_ABOVE_8(res));
78417841
7842      FLAG_Z |= res;
7843      FLAG_C = CFLAG_SET;
7844      FLAG_X = XFLAG_SET;
7842      m68k->not_z_flag |= res;
7843      m68k->c_flag = CFLAG_SET;
7844      m68k->x_flag = XFLAG_SET;
78457845   }
78467846   else
78477847   {
7848      FLAG_V = VFLAG_CLEAR;
7849      FLAG_C = CFLAG_CLEAR;
7850      FLAG_X = XFLAG_CLEAR;
7848      m68k->v_flag = VFLAG_CLEAR;
7849      m68k->c_flag = CFLAG_CLEAR;
7850      m68k->x_flag = XFLAG_CLEAR;
78517851   }
7852   FLAG_N = NFLAG_8(res);   /* Undefined N behavior */
7852   m68k->n_flag = NFLAG_8(res);   /* Undefined N behavior */
78537853}
78547854
78557855
78567856M68KMAKE_OP(neg, 8, ., d)
78577857{
7858   uint* r_dst = &DY;
7859   uint res = 0 - MASK_OUT_ABOVE_8(*r_dst);
7858   UINT32* r_dst = &DY;
7859   UINT32 res = 0 - MASK_OUT_ABOVE_8(*r_dst);
78607860
7861   FLAG_N = NFLAG_8(res);
7862   FLAG_C = FLAG_X = CFLAG_8(res);
7863   FLAG_V = *r_dst & res;
7864   FLAG_Z = MASK_OUT_ABOVE_8(res);
7861   m68k->n_flag = NFLAG_8(res);
7862   m68k->c_flag = m68k->x_flag = CFLAG_8(res);
7863   m68k->v_flag = *r_dst & res;
7864   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
78657865
7866   *r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
7866   *r_dst = MASK_OUT_BELOW_8(*r_dst) | m68k->not_z_flag;
78677867}
78687868
78697869
78707870M68KMAKE_OP(neg, 8, ., .)
78717871{
7872   uint ea = M68KMAKE_GET_EA_AY_8;
7873   uint src = m68ki_read_8(ea);
7874   uint res = 0 - src;
7872   UINT32 ea = M68KMAKE_GET_EA_AY_8;
7873   UINT32 src = m68ki_read_8(m68k, ea);
7874   UINT32 res = 0 - src;
78757875
7876   FLAG_N = NFLAG_8(res);
7877   FLAG_C = FLAG_X = CFLAG_8(res);
7878   FLAG_V = src & res;
7879   FLAG_Z = MASK_OUT_ABOVE_8(res);
7876   m68k->n_flag = NFLAG_8(res);
7877   m68k->c_flag = m68k->x_flag = CFLAG_8(res);
7878   m68k->v_flag = src & res;
7879   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
78807880
7881   m68ki_write_8(ea, FLAG_Z);
7881   m68ki_write_8(m68k, ea, m68k->not_z_flag);
78827882}
78837883
78847884
78857885M68KMAKE_OP(neg, 16, ., d)
78867886{
7887   uint* r_dst = &DY;
7888   uint res = 0 - MASK_OUT_ABOVE_16(*r_dst);
7887   UINT32* r_dst = &DY;
7888   UINT32 res = 0 - MASK_OUT_ABOVE_16(*r_dst);
78897889
7890   FLAG_N = NFLAG_16(res);
7891   FLAG_C = FLAG_X = CFLAG_16(res);
7892   FLAG_V = (*r_dst & res)>>8;
7893   FLAG_Z = MASK_OUT_ABOVE_16(res);
7890   m68k->n_flag = NFLAG_16(res);
7891   m68k->c_flag = m68k->x_flag = CFLAG_16(res);
7892   m68k->v_flag = (*r_dst & res)>>8;
7893   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
78947894
7895   *r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
7895   *r_dst = MASK_OUT_BELOW_16(*r_dst) | m68k->not_z_flag;
78967896}
78977897
78987898
78997899M68KMAKE_OP(neg, 16, ., .)
79007900{
7901   uint ea = M68KMAKE_GET_EA_AY_16;
7902   uint src = m68ki_read_16(ea);
7903   uint res = 0 - src;
7901   UINT32 ea = M68KMAKE_GET_EA_AY_16;
7902   UINT32 src = m68ki_read_16(m68k, ea);
7903   UINT32 res = 0 - src;
79047904
7905   FLAG_N = NFLAG_16(res);
7906   FLAG_C = FLAG_X = CFLAG_16(res);
7907   FLAG_V = (src & res)>>8;
7908   FLAG_Z = MASK_OUT_ABOVE_16(res);
7905   m68k->n_flag = NFLAG_16(res);
7906   m68k->c_flag = m68k->x_flag = CFLAG_16(res);
7907   m68k->v_flag = (src & res)>>8;
7908   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
79097909
7910   m68ki_write_16(ea, FLAG_Z);
7910   m68ki_write_16(m68k, ea, m68k->not_z_flag);
79117911}
79127912
79137913
79147914M68KMAKE_OP(neg, 32, ., d)
79157915{
7916   uint* r_dst = &DY;
7917   uint res = 0 - *r_dst;
7916   UINT32* r_dst = &DY;
7917   UINT32 res = 0 - *r_dst;
79187918
7919   FLAG_N = NFLAG_32(res);
7920   FLAG_C = FLAG_X = CFLAG_SUB_32(*r_dst, 0, res);
7921   FLAG_V = (*r_dst & res)>>24;
7922   FLAG_Z = MASK_OUT_ABOVE_32(res);
7919   m68k->n_flag = NFLAG_32(res);
7920   m68k->c_flag = m68k->x_flag = CFLAG_SUB_32(*r_dst, 0, res);
7921   m68k->v_flag = (*r_dst & res)>>24;
7922   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
79237923
7924   *r_dst = FLAG_Z;
7924   *r_dst = m68k->not_z_flag;
79257925}
79267926
79277927
79287928M68KMAKE_OP(neg, 32, ., .)
79297929{
7930   uint ea = M68KMAKE_GET_EA_AY_32;
7931   uint src = m68ki_read_32(ea);
7932   uint res = 0 - src;
7930   UINT32 ea = M68KMAKE_GET_EA_AY_32;
7931   UINT32 src = m68ki_read_32(m68k, ea);
7932   UINT32 res = 0 - src;
79337933
7934   FLAG_N = NFLAG_32(res);
7935   FLAG_C = FLAG_X = CFLAG_SUB_32(src, 0, res);
7936   FLAG_V = (src & res)>>24;
7937   FLAG_Z = MASK_OUT_ABOVE_32(res);
7934   m68k->n_flag = NFLAG_32(res);
7935   m68k->c_flag = m68k->x_flag = CFLAG_SUB_32(src, 0, res);
7936   m68k->v_flag = (src & res)>>24;
7937   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
79387938
7939   m68ki_write_32(ea, FLAG_Z);
7939   m68ki_write_32(m68k, ea, m68k->not_z_flag);
79407940}
79417941
79427942
79437943M68KMAKE_OP(negx, 8, ., d)
79447944{
7945   uint* r_dst = &DY;
7946   uint res = 0 - MASK_OUT_ABOVE_8(*r_dst) - XFLAG_AS_1();
7945   UINT32* r_dst = &DY;
7946   UINT32 res = 0 - MASK_OUT_ABOVE_8(*r_dst) - XFLAG_AS_1(m68k);
79477947
7948   FLAG_N = NFLAG_8(res);
7949   FLAG_X = FLAG_C = CFLAG_8(res);
7950   FLAG_V = *r_dst & res;
7948   m68k->n_flag = NFLAG_8(res);
7949   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
7950   m68k->v_flag = *r_dst & res;
79517951
79527952   res = MASK_OUT_ABOVE_8(res);
7953   FLAG_Z |= res;
7953   m68k->not_z_flag |= res;
79547954
79557955   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
79567956}
r3535r3536
79587958
79597959M68KMAKE_OP(negx, 8, ., .)
79607960{
7961   uint ea = M68KMAKE_GET_EA_AY_8;
7962   uint src = m68ki_read_8(ea);
7963   uint res = 0 - src - XFLAG_AS_1();
7961   UINT32 ea = M68KMAKE_GET_EA_AY_8;
7962   UINT32 src = m68ki_read_8(m68k, ea);
7963   UINT32 res = 0 - src - XFLAG_AS_1(m68k);
79647964
7965   FLAG_N = NFLAG_8(res);
7966   FLAG_X = FLAG_C = CFLAG_8(res);
7967   FLAG_V = src & res;
7965   m68k->n_flag = NFLAG_8(res);
7966   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
7967   m68k->v_flag = src & res;
79687968
79697969   res = MASK_OUT_ABOVE_8(res);
7970   FLAG_Z |= res;
7970   m68k->not_z_flag |= res;
79717971
7972   m68ki_write_8(ea, res);
7972   m68ki_write_8(m68k, ea, res);
79737973}
79747974
79757975
79767976M68KMAKE_OP(negx, 16, ., d)
79777977{
7978   uint* r_dst = &DY;
7979   uint res = 0 - MASK_OUT_ABOVE_16(*r_dst) - XFLAG_AS_1();
7978   UINT32* r_dst = &DY;
7979   UINT32 res = 0 - MASK_OUT_ABOVE_16(*r_dst) - XFLAG_AS_1(m68k);
79807980
7981   FLAG_N = NFLAG_16(res);
7982   FLAG_X = FLAG_C = CFLAG_16(res);
7983   FLAG_V = (*r_dst & res)>>8;
7981   m68k->n_flag = NFLAG_16(res);
7982   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
7983   m68k->v_flag = (*r_dst & res)>>8;
79847984
79857985   res = MASK_OUT_ABOVE_16(res);
7986   FLAG_Z |= res;
7986   m68k->not_z_flag |= res;
79877987
79887988   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
79897989}
r3535r3536
79917991
79927992M68KMAKE_OP(negx, 16, ., .)
79937993{
7994   uint ea  = M68KMAKE_GET_EA_AY_16;
7995   uint src = m68ki_read_16(ea);
7996   uint res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_AS_1();
7994   UINT32 ea  = M68KMAKE_GET_EA_AY_16;
7995   UINT32 src = m68ki_read_16(m68k, ea);
7996   UINT32 res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_AS_1(m68k);
79977997
7998   FLAG_N = NFLAG_16(res);
7999   FLAG_X = FLAG_C = CFLAG_16(res);
8000   FLAG_V = (src & res)>>8;
7998   m68k->n_flag = NFLAG_16(res);
7999   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
8000   m68k->v_flag = (src & res)>>8;
80018001
80028002   res = MASK_OUT_ABOVE_16(res);
8003   FLAG_Z |= res;
8003   m68k->not_z_flag |= res;
80048004
8005   m68ki_write_16(ea, res);
8005   m68ki_write_16(m68k, ea, res);
80068006}
80078007
80088008
80098009M68KMAKE_OP(negx, 32, ., d)
80108010{
8011   uint* r_dst = &DY;
8012   uint res = 0 - MASK_OUT_ABOVE_32(*r_dst) - XFLAG_AS_1();
8011   UINT32* r_dst = &DY;
8012   UINT32 res = 0 - MASK_OUT_ABOVE_32(*r_dst) - XFLAG_AS_1(m68k);
80138013
8014   FLAG_N = NFLAG_32(res);
8015   FLAG_X = FLAG_C = CFLAG_SUB_32(*r_dst, 0, res);
8016   FLAG_V = (*r_dst & res)>>24;
8014   m68k->n_flag = NFLAG_32(res);
8015   m68k->x_flag = m68k->c_flag = CFLAG_SUB_32(*r_dst, 0, res);
8016   m68k->v_flag = (*r_dst & res)>>24;
80178017
80188018   res = MASK_OUT_ABOVE_32(res);
8019   FLAG_Z |= res;
8019   m68k->not_z_flag |= res;
80208020
80218021   *r_dst = res;
80228022}
r3535r3536
80248024
80258025M68KMAKE_OP(negx, 32, ., .)
80268026{
8027   uint ea  = M68KMAKE_GET_EA_AY_32;
8028   uint src = m68ki_read_32(ea);
8029   uint res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_AS_1();
8027   UINT32 ea  = M68KMAKE_GET_EA_AY_32;
8028   UINT32 src = m68ki_read_32(m68k, ea);
8029   UINT32 res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_AS_1(m68k);
80308030
8031   FLAG_N = NFLAG_32(res);
8032   FLAG_X = FLAG_C = CFLAG_SUB_32(src, 0, res);
8033   FLAG_V = (src & res)>>24;
8031   m68k->n_flag = NFLAG_32(res);
8032   m68k->x_flag = m68k->c_flag = CFLAG_SUB_32(src, 0, res);
8033   m68k->v_flag = (src & res)>>24;
80348034
80358035   res = MASK_OUT_ABOVE_32(res);
8036   FLAG_Z |= res;
8036   m68k->not_z_flag |= res;
80378037
8038   m68ki_write_32(ea, res);
8038   m68ki_write_32(m68k, ea, res);
80398039}
80408040
80418041
r3535r3536
80478047
80488048M68KMAKE_OP(not, 8, ., d)
80498049{
8050   uint* r_dst = &DY;
8051   uint res = MASK_OUT_ABOVE_8(~*r_dst);
8050   UINT32* r_dst = &DY;
8051   UINT32 res = MASK_OUT_ABOVE_8(~*r_dst);
80528052
80538053   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
80548054
8055   FLAG_N = NFLAG_8(res);
8056   FLAG_Z = res;
8057   FLAG_C = CFLAG_CLEAR;
8058   FLAG_V = VFLAG_CLEAR;
8055   m68k->n_flag = NFLAG_8(res);
8056   m68k->not_z_flag = res;
8057   m68k->c_flag = CFLAG_CLEAR;
8058   m68k->v_flag = VFLAG_CLEAR;
80598059}
80608060
80618061
80628062M68KMAKE_OP(not, 8, ., .)
80638063{
8064   uint ea = M68KMAKE_GET_EA_AY_8;
8065   uint res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea));
8064   UINT32 ea = M68KMAKE_GET_EA_AY_8;
8065   UINT32 res = MASK_OUT_ABOVE_8(~m68ki_read_8(m68k, ea));
80668066
8067   m68ki_write_8(ea, res);
8067   m68ki_write_8(m68k, ea, res);
80688068
8069   FLAG_N = NFLAG_8(res);
8070   FLAG_Z = res;
8071   FLAG_C = CFLAG_CLEAR;
8072   FLAG_V = VFLAG_CLEAR;
8069   m68k->n_flag = NFLAG_8(res);
8070   m68k->not_z_flag = res;
8071   m68k->c_flag = CFLAG_CLEAR;
8072   m68k->v_flag = VFLAG_CLEAR;
80738073}
80748074
80758075
80768076M68KMAKE_OP(not, 16, ., d)
80778077{
8078   uint* r_dst = &DY;
8079   uint res = MASK_OUT_ABOVE_16(~*r_dst);
8078   UINT32* r_dst = &DY;
8079   UINT32 res = MASK_OUT_ABOVE_16(~*r_dst);
80808080
80818081   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
80828082
8083   FLAG_N = NFLAG_16(res);
8084   FLAG_Z = res;
8085   FLAG_C = CFLAG_CLEAR;
8086   FLAG_V = VFLAG_CLEAR;
8083   m68k->n_flag = NFLAG_16(res);
8084   m68k->not_z_flag = res;
8085   m68k->c_flag = CFLAG_CLEAR;
8086   m68k->v_flag = VFLAG_CLEAR;
80878087}
80888088
80898089
80908090M68KMAKE_OP(not, 16, ., .)
80918091{
8092   uint ea = M68KMAKE_GET_EA_AY_16;
8093   uint res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea));
8092   UINT32 ea = M68KMAKE_GET_EA_AY_16;
8093   UINT32 res = MASK_OUT_ABOVE_16(~m68ki_read_16(m68k, ea));
80948094
8095   m68ki_write_16(ea, res);
8095   m68ki_write_16(m68k, ea, res);
80968096
8097   FLAG_N = NFLAG_16(res);
8098   FLAG_Z = res;
8099   FLAG_C = CFLAG_CLEAR;
8100   FLAG_V = VFLAG_CLEAR;
8097   m68k->n_flag = NFLAG_16(res);
8098   m68k->not_z_flag = res;
8099   m68k->c_flag = CFLAG_CLEAR;
8100   m68k->v_flag = VFLAG_CLEAR;
81018101}
81028102
81038103
81048104M68KMAKE_OP(not, 32, ., d)
81058105{
8106   uint* r_dst = &DY;
8107   uint res = *r_dst = MASK_OUT_ABOVE_32(~*r_dst);
8106   UINT32* r_dst = &DY;
8107   UINT32 res = *r_dst = MASK_OUT_ABOVE_32(~*r_dst);
81088108
8109   FLAG_N = NFLAG_32(res);
8110   FLAG_Z = res;
8111   FLAG_C = CFLAG_CLEAR;
8112   FLAG_V = VFLAG_CLEAR;
8109   m68k->n_flag = NFLAG_32(res);
8110   m68k->not_z_flag = res;
8111   m68k->c_flag = CFLAG_CLEAR;
8112   m68k->v_flag = VFLAG_CLEAR;
81138113}
81148114
81158115
81168116M68KMAKE_OP(not, 32, ., .)
81178117{
8118   uint ea = M68KMAKE_GET_EA_AY_32;
8119   uint res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea));
8118   UINT32 ea = M68KMAKE_GET_EA_AY_32;
8119   UINT32 res = MASK_OUT_ABOVE_32(~m68ki_read_32(m68k, ea));
81208120
8121   m68ki_write_32(ea, res);
8121   m68ki_write_32(m68k, ea, res);
81228122
8123   FLAG_N = NFLAG_32(res);
8124   FLAG_Z = res;
8125   FLAG_C = CFLAG_CLEAR;
8126   FLAG_V = VFLAG_CLEAR;
8123   m68k->n_flag = NFLAG_32(res);
8124   m68k->not_z_flag = res;
8125   m68k->c_flag = CFLAG_CLEAR;
8126   m68k->v_flag = VFLAG_CLEAR;
81278127}
81288128
81298129
81308130M68KMAKE_OP(or, 8, er, d)
81318131{
8132   uint res = MASK_OUT_ABOVE_8((DX |= MASK_OUT_ABOVE_8(DY)));
8132   UINT32 res = MASK_OUT_ABOVE_8((DX |= MASK_OUT_ABOVE_8(DY)));
81338133
8134   FLAG_N = NFLAG_8(res);
8135   FLAG_Z = res;
8136   FLAG_C = CFLAG_CLEAR;
8137   FLAG_V = VFLAG_CLEAR;
8134   m68k->n_flag = NFLAG_8(res);
8135   m68k->not_z_flag = res;
8136   m68k->c_flag = CFLAG_CLEAR;
8137   m68k->v_flag = VFLAG_CLEAR;
81388138}
81398139
81408140
81418141M68KMAKE_OP(or, 8, er, .)
81428142{
8143   uint res = MASK_OUT_ABOVE_8((DX |= M68KMAKE_GET_OPER_AY_8));
8143   UINT32 res = MASK_OUT_ABOVE_8((DX |= M68KMAKE_GET_OPER_AY_8));
81448144
8145   FLAG_N = NFLAG_8(res);
8146   FLAG_Z = res;
8147   FLAG_C = CFLAG_CLEAR;
8148   FLAG_V = VFLAG_CLEAR;
8145   m68k->n_flag = NFLAG_8(res);
8146   m68k->not_z_flag = res;
8147   m68k->c_flag = CFLAG_CLEAR;
8148   m68k->v_flag = VFLAG_CLEAR;
81498149}
81508150
81518151
81528152M68KMAKE_OP(or, 16, er, d)
81538153{
8154   uint res = MASK_OUT_ABOVE_16((DX |= MASK_OUT_ABOVE_16(DY)));
8154   UINT32 res = MASK_OUT_ABOVE_16((DX |= MASK_OUT_ABOVE_16(DY)));
81558155
8156   FLAG_N = NFLAG_16(res);
8157   FLAG_Z = res;
8158   FLAG_C = CFLAG_CLEAR;
8159   FLAG_V = VFLAG_CLEAR;
8156   m68k->n_flag = NFLAG_16(res);
8157   m68k->not_z_flag = res;
8158   m68k->c_flag = CFLAG_CLEAR;
8159   m68k->v_flag = VFLAG_CLEAR;
81608160}
81618161
81628162
81638163M68KMAKE_OP(or, 16, er, .)
81648164{
8165   uint res = MASK_OUT_ABOVE_16((DX |= M68KMAKE_GET_OPER_AY_16));
8165   UINT32 res = MASK_OUT_ABOVE_16((DX |= M68KMAKE_GET_OPER_AY_16));
81668166
8167   FLAG_N = NFLAG_16(res);
8168   FLAG_Z = res;
8169   FLAG_C = CFLAG_CLEAR;
8170   FLAG_V = VFLAG_CLEAR;
8167   m68k->n_flag = NFLAG_16(res);
8168   m68k->not_z_flag = res;
8169   m68k->c_flag = CFLAG_CLEAR;
8170   m68k->v_flag = VFLAG_CLEAR;
81718171}
81728172
81738173
81748174M68KMAKE_OP(or, 32, er, d)
81758175{
8176   uint res = DX |= DY;
8176   UINT32 res = DX |= DY;
81778177
8178   FLAG_N = NFLAG_32(res);
8179   FLAG_Z = res;
8180   FLAG_C = CFLAG_CLEAR;
8181   FLAG_V = VFLAG_CLEAR;
8178   m68k->n_flag = NFLAG_32(res);
8179   m68k->not_z_flag = res;
8180   m68k->c_flag = CFLAG_CLEAR;
8181   m68k->v_flag = VFLAG_CLEAR;
81828182}
81838183
81848184
81858185M68KMAKE_OP(or, 32, er, .)
81868186{
8187   uint res = DX |= M68KMAKE_GET_OPER_AY_32;
8187   UINT32 res = DX |= M68KMAKE_GET_OPER_AY_32;
81888188
8189   FLAG_N = NFLAG_32(res);
8190   FLAG_Z = res;
8191   FLAG_C = CFLAG_CLEAR;
8192   FLAG_V = VFLAG_CLEAR;
8189   m68k->n_flag = NFLAG_32(res);
8190   m68k->not_z_flag = res;
8191   m68k->c_flag = CFLAG_CLEAR;
8192   m68k->v_flag = VFLAG_CLEAR;
81938193}
81948194
81958195
81968196M68KMAKE_OP(or, 8, re, .)
81978197{
8198   uint ea = M68KMAKE_GET_EA_AY_8;
8199   uint res = MASK_OUT_ABOVE_8(DX | m68ki_read_8(ea));
8198   UINT32 ea = M68KMAKE_GET_EA_AY_8;
8199   UINT32 res = MASK_OUT_ABOVE_8(DX | m68ki_read_8(m68k, ea));
82008200
8201   m68ki_write_8(ea, res);
8201   m68ki_write_8(m68k, ea, res);
82028202
8203   FLAG_N = NFLAG_8(res);
8204   FLAG_Z = res;
8205   FLAG_C = CFLAG_CLEAR;
8206   FLAG_V = VFLAG_CLEAR;
8203   m68k->n_flag = NFLAG_8(res);
8204   m68k->not_z_flag = res;
8205   m68k->c_flag = CFLAG_CLEAR;
8206   m68k->v_flag = VFLAG_CLEAR;
82078207}
82088208
82098209
82108210M68KMAKE_OP(or, 16, re, .)
82118211{
8212   uint ea = M68KMAKE_GET_EA_AY_16;
8213   uint res = MASK_OUT_ABOVE_16(DX | m68ki_read_16(ea));
8212   UINT32 ea = M68KMAKE_GET_EA_AY_16;
8213   UINT32 res = MASK_OUT_ABOVE_16(DX | m68ki_read_16(m68k, ea));
82148214
8215   m68ki_write_16(ea, res);
8215   m68ki_write_16(m68k, ea, res);
82168216
8217   FLAG_N = NFLAG_16(res);
8218   FLAG_Z = res;
8219   FLAG_C = CFLAG_CLEAR;
8220   FLAG_V = VFLAG_CLEAR;
8217   m68k->n_flag = NFLAG_16(res);
8218   m68k->not_z_flag = res;
8219   m68k->c_flag = CFLAG_CLEAR;
8220   m68k->v_flag = VFLAG_CLEAR;
82218221}
82228222
82238223
82248224M68KMAKE_OP(or, 32, re, .)
82258225{
8226   uint ea = M68KMAKE_GET_EA_AY_32;
8227   uint res = DX | m68ki_read_32(ea);
8226   UINT32 ea = M68KMAKE_GET_EA_AY_32;
8227   UINT32 res = DX | m68ki_read_32(m68k, ea);
82288228
8229   m68ki_write_32(ea, res);
8229   m68ki_write_32(m68k, ea, res);
82308230
8231   FLAG_N = NFLAG_32(res);
8232   FLAG_Z = res;
8233   FLAG_C = CFLAG_CLEAR;
8234   FLAG_V = VFLAG_CLEAR;
8231   m68k->n_flag = NFLAG_32(res);
8232   m68k->not_z_flag = res;
8233   m68k->c_flag = CFLAG_CLEAR;
8234   m68k->v_flag = VFLAG_CLEAR;
82358235}
82368236
82378237
82388238M68KMAKE_OP(ori, 8, ., d)
82398239{
8240   uint res = MASK_OUT_ABOVE_8((DY |= OPER_I_8()));
8240   UINT32 res = MASK_OUT_ABOVE_8((DY |= OPER_I_8(m68k)));
82418241
8242   FLAG_N = NFLAG_8(res);
8243   FLAG_Z = res;
8244   FLAG_C = CFLAG_CLEAR;
8245   FLAG_V = VFLAG_CLEAR;
8242   m68k->n_flag = NFLAG_8(res);
8243   m68k->not_z_flag = res;
8244   m68k->c_flag = CFLAG_CLEAR;
8245   m68k->v_flag = VFLAG_CLEAR;
82468246}
82478247
82488248
82498249M68KMAKE_OP(ori, 8, ., .)
82508250{
8251   uint src = OPER_I_8();
8252   uint ea = M68KMAKE_GET_EA_AY_8;
8253   uint res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea));
8251   UINT32 src = OPER_I_8(m68k);
8252   UINT32 ea = M68KMAKE_GET_EA_AY_8;
8253   UINT32 res = MASK_OUT_ABOVE_8(src | m68ki_read_8(m68k, ea));
82548254
8255   m68ki_write_8(ea, res);
8255   m68ki_write_8(m68k, ea, res);
82568256
8257   FLAG_N = NFLAG_8(res);
8258   FLAG_Z = res;
8259   FLAG_C = CFLAG_CLEAR;
8260   FLAG_V = VFLAG_CLEAR;
8257   m68k->n_flag = NFLAG_8(res);
8258   m68k->not_z_flag = res;
8259   m68k->c_flag = CFLAG_CLEAR;
8260   m68k->v_flag = VFLAG_CLEAR;
82618261}
82628262
82638263
82648264M68KMAKE_OP(ori, 16, ., d)
82658265{
8266   uint res = MASK_OUT_ABOVE_16(DY |= OPER_I_16());
8266   UINT32 res = MASK_OUT_ABOVE_16(DY |= OPER_I_16(m68k));
82678267
8268   FLAG_N = NFLAG_16(res);
8269   FLAG_Z = res;
8270   FLAG_C = CFLAG_CLEAR;
8271   FLAG_V = VFLAG_CLEAR;
8268   m68k->n_flag = NFLAG_16(res);
8269   m68k->not_z_flag = res;
8270   m68k->c_flag = CFLAG_CLEAR;
8271   m68k->v_flag = VFLAG_CLEAR;
82728272}
82738273
82748274
82758275M68KMAKE_OP(ori, 16, ., .)
82768276{
8277   uint src = OPER_I_16();
8278   uint ea = M68KMAKE_GET_EA_AY_16;
8279   uint res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea));
8277   UINT32 src = OPER_I_16(m68k);
8278   UINT32 ea = M68KMAKE_GET_EA_AY_16;
8279   UINT32 res = MASK_OUT_ABOVE_16(src | m68ki_read_16(m68k, ea));
82808280
8281   m68ki_write_16(ea, res);
8281   m68ki_write_16(m68k, ea, res);
82828282
8283   FLAG_N = NFLAG_16(res);
8284   FLAG_Z = res;
8285   FLAG_C = CFLAG_CLEAR;
8286   FLAG_V = VFLAG_CLEAR;
8283   m68k->n_flag = NFLAG_16(res);
8284   m68k->not_z_flag = res;
8285   m68k->c_flag = CFLAG_CLEAR;
8286   m68k->v_flag = VFLAG_CLEAR;
82878287}
82888288
82898289
82908290M68KMAKE_OP(ori, 32, ., d)
82918291{
8292   uint res = DY |= OPER_I_32();
8292   UINT32 res = DY |= OPER_I_32(m68k);
82938293
8294   FLAG_N = NFLAG_32(res);
8295   FLAG_Z = res;
8296   FLAG_C = CFLAG_CLEAR;
8297   FLAG_V = VFLAG_CLEAR;
8294   m68k->n_flag = NFLAG_32(res);
8295   m68k->not_z_flag = res;
8296   m68k->c_flag = CFLAG_CLEAR;
8297   m68k->v_flag = VFLAG_CLEAR;
82988298}
82998299
83008300
83018301M68KMAKE_OP(ori, 32, ., .)
83028302{
8303   uint src = OPER_I_32();
8304   uint ea = M68KMAKE_GET_EA_AY_32;
8305   uint res = src | m68ki_read_32(ea);
8303   UINT32 src = OPER_I_32(m68k);
8304   UINT32 ea = M68KMAKE_GET_EA_AY_32;
8305   UINT32 res = src | m68ki_read_32(m68k, ea);
83068306
8307   m68ki_write_32(ea, res);
8307   m68ki_write_32(m68k, ea, res);
83088308
8309   FLAG_N = NFLAG_32(res);
8310   FLAG_Z = res;
8311   FLAG_C = CFLAG_CLEAR;
8312   FLAG_V = VFLAG_CLEAR;
8309   m68k->n_flag = NFLAG_32(res);
8310   m68k->not_z_flag = res;
8311   m68k->c_flag = CFLAG_CLEAR;
8312   m68k->v_flag = VFLAG_CLEAR;
83138313}
83148314
83158315
83168316M68KMAKE_OP(ori, 16, toc, .)
83178317{
8318   m68ki_set_ccr(m68ki_get_ccr() | OPER_I_16());
8318   m68ki_set_ccr(m68k, m68ki_get_ccr(m68k) | OPER_I_16(m68k));
83198319}
83208320
83218321
83228322M68KMAKE_OP(ori, 16, tos, .)
83238323{
8324   if(FLAG_S)
8324   if(m68k->s_flag)
83258325   {
8326      uint src = OPER_I_16();
8326      UINT32 src = OPER_I_16(m68k);
83278327      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
8328      m68ki_set_sr(m68ki_get_sr() | src);
8328      m68ki_set_sr(m68k, m68ki_get_sr(m68k) | src);
83298329      return;
83308330   }
8331   m68ki_exception_privilege_violation();
8331   m68ki_exception_privilege_violation(m68k);
83328332}
83338333
83348334
83358335M68KMAKE_OP(pack, 16, rr, .)
83368336{
8337   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
8337   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
83388338   {
83398339      /* Note: DX and DY are reversed in Motorola's docs */
8340      uint src = DY + OPER_I_16();
8341      uint* r_dst = &DX;
8340      UINT32 src = DY + OPER_I_16(m68k);
8341      UINT32* r_dst = &DX;
83428342
83438343      *r_dst = MASK_OUT_BELOW_8(*r_dst) | ((src >> 4) & 0x00f0) | (src & 0x000f);
83448344      return;
83458345   }
8346   m68ki_exception_illegal();
8346   m68ki_exception_illegal(m68k);
83478347}
83488348
83498349
83508350M68KMAKE_OP(pack, 16, mm, ax7)
83518351{
8352   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
8352   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
83538353   {
83548354      /* Note: AX and AY are reversed in Motorola's docs */
8355      uint ea_src = EA_AY_PD_8();
8356      uint src = m68ki_read_8(ea_src);
8357      ea_src = EA_AY_PD_8();
8358      src = ((src << 8) | m68ki_read_8(ea_src)) + OPER_I_16();
8355      UINT32 ea_src = EA_AY_PD_8(m68k);
8356      UINT32 src = m68ki_read_8(m68k, ea_src);
8357      ea_src = EA_AY_PD_8(m68k);
8358      src = ((src << 8) | m68ki_read_8(m68k, ea_src)) + OPER_I_16(m68k);
83598359
8360      m68ki_write_8(EA_A7_PD_8(), ((src >> 4) & 0x00f0) | (src & 0x000f));
8360      m68ki_write_8(m68k, EA_A7_PD_8(m68k), ((src >> 4) & 0x00f0) | (src & 0x000f));
83618361      return;
83628362   }
8363   m68ki_exception_illegal();
8363   m68ki_exception_illegal(m68k);
83648364}
83658365
83668366
83678367M68KMAKE_OP(pack, 16, mm, ay7)
83688368{
8369   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
8369   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
83708370   {
83718371      /* Note: AX and AY are reversed in Motorola's docs */
8372      uint ea_src = EA_A7_PD_8();
8373      uint src = m68ki_read_8(ea_src);
8374      ea_src = EA_A7_PD_8();
8375      src = ((src << 8) | m68ki_read_8(ea_src)) + OPER_I_16();
8372      UINT32 ea_src = EA_A7_PD_8(m68k);
8373      UINT32 src = m68ki_read_8(m68k, ea_src);
8374      ea_src = EA_A7_PD_8(m68k);
8375      src = ((src << 8) | m68ki_read_8(m68k, ea_src)) + OPER_I_16(m68k);
83768376
8377      m68ki_write_8(EA_AX_PD_8(), ((src >> 4) & 0x00f0) | (src & 0x000f));
8377      m68ki_write_8(m68k, EA_AX_PD_8(m68k), ((src >> 4) & 0x00f0) | (src & 0x000f));
83788378      return;
83798379   }
8380   m68ki_exception_illegal();
8380   m68ki_exception_illegal(m68k);
83818381}
83828382
83838383
83848384M68KMAKE_OP(pack, 16, mm, axy7)
83858385{
8386   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
8386   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
83878387   {
8388      uint ea_src = EA_A7_PD_8();
8389      uint src = m68ki_read_8(ea_src);
8390      ea_src = EA_A7_PD_8();
8391      src = ((src << 8) | m68ki_read_8(ea_src)) + OPER_I_16();
8388      UINT32 ea_src = EA_A7_PD_8(m68k);
8389      UINT32 src = m68ki_read_8(m68k, ea_src);
8390      ea_src = EA_A7_PD_8(m68k);
8391      src = ((src << 8) | m68ki_read_8(m68k, ea_src)) + OPER_I_16(m68k);
83928392
8393      m68ki_write_8(EA_A7_PD_8(), ((src >> 4) & 0x00f0) | (src & 0x000f));
8393      m68ki_write_8(m68k, EA_A7_PD_8(m68k), ((src >> 4) & 0x00f0) | (src & 0x000f));
83948394      return;
83958395   }
8396   m68ki_exception_illegal();
8396   m68ki_exception_illegal(m68k);
83978397}
83988398
83998399
84008400M68KMAKE_OP(pack, 16, mm, .)
84018401{
8402   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
8402   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
84038403   {
84048404      /* Note: AX and AY are reversed in Motorola's docs */
8405      uint ea_src = EA_AY_PD_8();
8406      uint src = m68ki_read_8(ea_src);
8407      ea_src = EA_AY_PD_8();
8408      src = ((src << 8) | m68ki_read_8(ea_src)) + OPER_I_16();
8405      UINT32 ea_src = EA_AY_PD_8(m68k);
8406      UINT32 src = m68ki_read_8(m68k, ea_src);
8407      ea_src = EA_AY_PD_8(m68k);
8408      src = ((src << 8) | m68ki_read_8(m68k, ea_src)) + OPER_I_16(m68k);
84098409
8410      m68ki_write_8(EA_AX_PD_8(), ((src >> 4) & 0x00f0) | (src & 0x000f));
8410      m68ki_write_8(m68k, EA_AX_PD_8(m68k), ((src >> 4) & 0x00f0) | (src & 0x000f));
84118411      return;
84128412   }
8413   m68ki_exception_illegal();
8413   m68ki_exception_illegal(m68k);
84148414}
84158415
84168416
84178417M68KMAKE_OP(pea, 32, ., .)
84188418{
8419   uint ea = M68KMAKE_GET_EA_AY_32;
8419   UINT32 ea = M68KMAKE_GET_EA_AY_32;
84208420
8421   m68ki_push_32(ea);
8421   m68ki_push_32(m68k, ea);
84228422}
84238423
84248424
84258425M68KMAKE_OP(pflush, 32, ., .)
84268426{
8427   if(CPU_TYPE_IS_040_PLUS(CPU_TYPE))
8427   if(CPU_TYPE_IS_040_PLUS(m68k->cpu_type))
84288428   {
84298429      // Nothing to do, unless address translation cache is emulated
84308430      return;
84318431   }
8432   m68ki_exception_illegal();
8432   m68ki_exception_illegal(m68k);
84338433}
84348434
84358435
84368436M68KMAKE_OP(reset, 0, ., .)
84378437{
8438   if(FLAG_S)
8438   if(m68k->s_flag)
84398439   {
8440      m68ki_output_reset();         /* auto-disable (see m68kcpu.h) */
8441      USE_CYCLES(CYC_RESET);
8440      (*m68k->reset_instr_callback)();
8441      USE_CYCLES(m68k, m68k->cyc_reset);
84428442      return;
84438443   }
8444   m68ki_exception_privilege_violation();
8444   m68ki_exception_privilege_violation(m68k);
84458445}
84468446
84478447
84488448M68KMAKE_OP(ror, 8, s, .)
84498449{
8450   uint* r_dst = &DY;
8451   uint orig_shift = (((REG_IR >> 9) - 1) & 7) + 1;
8452   uint shift = orig_shift & 7;
8453   uint src = MASK_OUT_ABOVE_8(*r_dst);
8454   uint res = ROR_8(src, shift);
8450   UINT32* r_dst = &DY;
8451   UINT32 orig_shift = (((m68k->ir >> 9) - 1) & 7) + 1;
8452   UINT32 shift = orig_shift & 7;
8453   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
8454   UINT32 res = ROR_8(src, shift);
84558455
84568456   if(orig_shift != 0)
8457      USE_CYCLES(orig_shift<<CYC_SHIFT);
8457      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
84588458
84598459   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
84608460
8461   FLAG_N = NFLAG_8(res);
8462   FLAG_Z = res;
8463   FLAG_C = src << (9-orig_shift);
8464   FLAG_V = VFLAG_CLEAR;
8461   m68k->n_flag = NFLAG_8(res);
8462   m68k->not_z_flag = res;
8463   m68k->c_flag = src << (9-orig_shift);
8464   m68k->v_flag = VFLAG_CLEAR;
84658465}
84668466
84678467
84688468M68KMAKE_OP(ror, 16, s, .)
84698469{
8470   uint* r_dst = &DY;
8471   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
8472   uint src = MASK_OUT_ABOVE_16(*r_dst);
8473   uint res = ROR_16(src, shift);
8470   UINT32* r_dst = &DY;
8471   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
8472   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
8473   UINT32 res = ROR_16(src, shift);
84748474
84758475   if(shift != 0)
8476      USE_CYCLES(shift<<CYC_SHIFT);
8476      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
84778477
84788478   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
84798479
8480   FLAG_N = NFLAG_16(res);
8481   FLAG_Z = res;
8482   FLAG_C = src << (9-shift);
8483   FLAG_V = VFLAG_CLEAR;
8480   m68k->n_flag = NFLAG_16(res);
8481   m68k->not_z_flag = res;
8482   m68k->c_flag = src << (9-shift);
8483   m68k->v_flag = VFLAG_CLEAR;
84848484}
84858485
84868486
84878487M68KMAKE_OP(ror, 32, s, .)
84888488{
8489   uint* r_dst = &DY;
8490   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
8491   uint64 src = *r_dst;
8492   uint res = ROR_32(src, shift);
8489   UINT32* r_dst = &DY;
8490   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
8491   UINT64 src = *r_dst;
8492   UINT32 res = ROR_32(src, shift);
84938493
84948494   if(shift != 0)
8495      USE_CYCLES(shift<<CYC_SHIFT);
8495      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
84968496
84978497   *r_dst = res;
84988498
8499   FLAG_N = NFLAG_32(res);
8500   FLAG_Z = res;
8501   FLAG_C = src << (9-shift);
8502   FLAG_V = VFLAG_CLEAR;
8499   m68k->n_flag = NFLAG_32(res);
8500   m68k->not_z_flag = res;
8501   m68k->c_flag = src << (9-shift);
8502   m68k->v_flag = VFLAG_CLEAR;
85038503}
85048504
85058505
85068506M68KMAKE_OP(ror, 8, r, .)
85078507{
8508   uint* r_dst = &DY;
8509   uint orig_shift = DX & 0x3f;
8510   uint shift = orig_shift & 7;
8511   uint src = MASK_OUT_ABOVE_8(*r_dst);
8512   uint res = ROR_8(src, shift);
8508   UINT32* r_dst = &DY;
8509   UINT32 orig_shift = DX & 0x3f;
8510   UINT32 shift = orig_shift & 7;
8511   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
8512   UINT32 res = ROR_8(src, shift);
85138513
85148514   if(orig_shift != 0)
85158515   {
8516      USE_CYCLES(orig_shift<<CYC_SHIFT);
8516      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
85178517
85188518      *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
8519      FLAG_C = src << (8-((shift-1)&7));
8520      FLAG_N = NFLAG_8(res);
8521      FLAG_Z = res;
8522      FLAG_V = VFLAG_CLEAR;
8519      m68k->c_flag = src << (8-((shift-1)&7));
8520      m68k->n_flag = NFLAG_8(res);
8521      m68k->not_z_flag = res;
8522      m68k->v_flag = VFLAG_CLEAR;
85238523      return;
85248524   }
85258525
8526   FLAG_C = CFLAG_CLEAR;
8527   FLAG_N = NFLAG_8(src);
8528   FLAG_Z = src;
8529   FLAG_V = VFLAG_CLEAR;
8526   m68k->c_flag = CFLAG_CLEAR;
8527   m68k->n_flag = NFLAG_8(src);
8528   m68k->not_z_flag = src;
8529   m68k->v_flag = VFLAG_CLEAR;
85308530}
85318531
85328532
85338533M68KMAKE_OP(ror, 16, r, .)
85348534{
8535   uint* r_dst = &DY;
8536   uint orig_shift = DX & 0x3f;
8537   uint shift = orig_shift & 15;
8538   uint src = MASK_OUT_ABOVE_16(*r_dst);
8539   uint res = ROR_16(src, shift);
8535   UINT32* r_dst = &DY;
8536   UINT32 orig_shift = DX & 0x3f;
8537   UINT32 shift = orig_shift & 15;
8538   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
8539   UINT32 res = ROR_16(src, shift);
85408540
85418541   if(orig_shift != 0)
85428542   {
8543      USE_CYCLES(orig_shift<<CYC_SHIFT);
8543      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
85448544
85458545      *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
8546      FLAG_C = (src >> ((shift - 1) & 15)) << 8;
8547      FLAG_N = NFLAG_16(res);
8548      FLAG_Z = res;
8549      FLAG_V = VFLAG_CLEAR;
8546      m68k->c_flag = (src >> ((shift - 1) & 15)) << 8;
8547      m68k->n_flag = NFLAG_16(res);
8548      m68k->not_z_flag = res;
8549      m68k->v_flag = VFLAG_CLEAR;
85508550      return;
85518551   }
85528552
8553   FLAG_C = CFLAG_CLEAR;
8554   FLAG_N = NFLAG_16(src);
8555   FLAG_Z = src;
8556   FLAG_V = VFLAG_CLEAR;
8553   m68k->c_flag = CFLAG_CLEAR;
8554   m68k->n_flag = NFLAG_16(src);
8555   m68k->not_z_flag = src;
8556   m68k->v_flag = VFLAG_CLEAR;
85578557}
85588558
85598559
85608560M68KMAKE_OP(ror, 32, r, .)
85618561{
8562   uint* r_dst = &DY;
8563   uint orig_shift = DX & 0x3f;
8564   uint shift = orig_shift & 31;
8565   uint64 src = *r_dst;
8566   uint res = ROR_32(src, shift);
8562   UINT32* r_dst = &DY;
8563   UINT32 orig_shift = DX & 0x3f;
8564   UINT32 shift = orig_shift & 31;
8565   UINT64 src = *r_dst;
8566   UINT32 res = ROR_32(src, shift);
85678567
85688568   if(orig_shift != 0)
85698569   {
8570      USE_CYCLES(orig_shift<<CYC_SHIFT);
8570      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
85718571
85728572      *r_dst = res;
8573      FLAG_C = (src >> ((shift - 1) & 31)) << 8;
8574      FLAG_N = NFLAG_32(res);
8575      FLAG_Z = res;
8576      FLAG_V = VFLAG_CLEAR;
8573      m68k->c_flag = (src >> ((shift - 1) & 31)) << 8;
8574      m68k->n_flag = NFLAG_32(res);
8575      m68k->not_z_flag = res;
8576      m68k->v_flag = VFLAG_CLEAR;
85778577      return;
85788578   }
85798579
8580   FLAG_C = CFLAG_CLEAR;
8581   FLAG_N = NFLAG_32(src);
8582   FLAG_Z = src;
8583   FLAG_V = VFLAG_CLEAR;
8580   m68k->c_flag = CFLAG_CLEAR;
8581   m68k->n_flag = NFLAG_32(src);
8582   m68k->not_z_flag = src;
8583   m68k->v_flag = VFLAG_CLEAR;
85848584}
85858585
85868586
85878587M68KMAKE_OP(ror, 16, ., .)
85888588{
8589   uint ea = M68KMAKE_GET_EA_AY_16;
8590   uint src = m68ki_read_16(ea);
8591   uint res = ROR_16(src, 1);
8589   UINT32 ea = M68KMAKE_GET_EA_AY_16;
8590   UINT32 src = m68ki_read_16(m68k, ea);
8591   UINT32 res = ROR_16(src, 1);
85928592
8593   m68ki_write_16(ea, res);
8593   m68ki_write_16(m68k, ea, res);
85948594
8595   FLAG_N = NFLAG_16(res);
8596   FLAG_Z = res;
8597   FLAG_C = src << 8;
8598   FLAG_V = VFLAG_CLEAR;
8595   m68k->n_flag = NFLAG_16(res);
8596   m68k->not_z_flag = res;
8597   m68k->c_flag = src << 8;
8598   m68k->v_flag = VFLAG_CLEAR;
85998599}
86008600
86018601
86028602M68KMAKE_OP(rol, 8, s, .)
86038603{
8604   uint* r_dst = &DY;
8605   uint orig_shift = (((REG_IR >> 9) - 1) & 7) + 1;
8606   uint shift = orig_shift & 7;
8607   uint src = MASK_OUT_ABOVE_8(*r_dst);
8608   uint res = ROL_8(src, shift);
8604   UINT32* r_dst = &DY;
8605   UINT32 orig_shift = (((m68k->ir >> 9) - 1) & 7) + 1;
8606   UINT32 shift = orig_shift & 7;
8607   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
8608   UINT32 res = ROL_8(src, shift);
86098609
86108610   if(orig_shift != 0)
8611      USE_CYCLES(orig_shift<<CYC_SHIFT);
8611      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
86128612
86138613   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
86148614
8615   FLAG_N = NFLAG_8(res);
8616   FLAG_Z = res;
8617   FLAG_C = src << orig_shift;
8618   FLAG_V = VFLAG_CLEAR;
8615   m68k->n_flag = NFLAG_8(res);
8616   m68k->not_z_flag = res;
8617   m68k->c_flag = src << orig_shift;
8618   m68k->v_flag = VFLAG_CLEAR;
86198619}
86208620
86218621
86228622M68KMAKE_OP(rol, 16, s, .)
86238623{
8624   uint* r_dst = &DY;
8625   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
8626   uint src = MASK_OUT_ABOVE_16(*r_dst);
8627   uint res = ROL_16(src, shift);
8624   UINT32* r_dst = &DY;
8625   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
8626   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
8627   UINT32 res = ROL_16(src, shift);
86288628
86298629   if(shift != 0)
8630      USE_CYCLES(shift<<CYC_SHIFT);
8630      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
86318631
86328632   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
86338633
8634   FLAG_N = NFLAG_16(res);
8635   FLAG_Z = res;
8636   FLAG_C = src >> (8-shift);
8637   FLAG_V = VFLAG_CLEAR;
8634   m68k->n_flag = NFLAG_16(res);
8635   m68k->not_z_flag = res;
8636   m68k->c_flag = src >> (8-shift);
8637   m68k->v_flag = VFLAG_CLEAR;
86388638}
86398639
86408640
86418641M68KMAKE_OP(rol, 32, s, .)
86428642{
8643   uint* r_dst = &DY;
8644   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
8645   uint64 src = *r_dst;
8646   uint res = ROL_32(src, shift);
8643   UINT32* r_dst = &DY;
8644   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
8645   UINT64 src = *r_dst;
8646   UINT32 res = ROL_32(src, shift);
86478647
86488648   if(shift != 0)
8649      USE_CYCLES(shift<<CYC_SHIFT);
8649      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
86508650
86518651   *r_dst = res;
86528652
8653   FLAG_N = NFLAG_32(res);
8654   FLAG_Z = res;
8655   FLAG_C = src >> (24-shift);
8656   FLAG_V = VFLAG_CLEAR;
8653   m68k->n_flag = NFLAG_32(res);
8654   m68k->not_z_flag = res;
8655   m68k->c_flag = src >> (24-shift);
8656   m68k->v_flag = VFLAG_CLEAR;
86578657}
86588658
86598659
86608660M68KMAKE_OP(rol, 8, r, .)
86618661{
8662   uint* r_dst = &DY;
8663   uint orig_shift = DX & 0x3f;
8664   uint shift = orig_shift & 7;
8665   uint src = MASK_OUT_ABOVE_8(*r_dst);
8666   uint res = ROL_8(src, shift);
8662   UINT32* r_dst = &DY;
8663   UINT32 orig_shift = DX & 0x3f;
8664   UINT32 shift = orig_shift & 7;
8665   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
8666   UINT32 res = ROL_8(src, shift);
86678667
86688668   if(orig_shift != 0)
86698669   {
8670      USE_CYCLES(orig_shift<<CYC_SHIFT);
8670      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
86718671
86728672      if(shift != 0)
86738673      {
86748674         *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
8675         FLAG_C = src << shift;
8676         FLAG_N = NFLAG_8(res);
8677         FLAG_Z = res;
8678         FLAG_V = VFLAG_CLEAR;
8675         m68k->c_flag = src << shift;
8676         m68k->n_flag = NFLAG_8(res);
8677         m68k->not_z_flag = res;
8678         m68k->v_flag = VFLAG_CLEAR;
86798679         return;
86808680      }
8681      FLAG_C = (src & 1)<<8;
8682      FLAG_N = NFLAG_8(src);
8683      FLAG_Z = src;
8684      FLAG_V = VFLAG_CLEAR;
8681      m68k->c_flag = (src & 1)<<8;
8682      m68k->n_flag = NFLAG_8(src);
8683      m68k->not_z_flag = src;
8684      m68k->v_flag = VFLAG_CLEAR;
86858685      return;
86868686   }
86878687
8688   FLAG_C = CFLAG_CLEAR;
8689   FLAG_N = NFLAG_8(src);
8690   FLAG_Z = src;
8691   FLAG_V = VFLAG_CLEAR;
8688   m68k->c_flag = CFLAG_CLEAR;
8689   m68k->n_flag = NFLAG_8(src);
8690   m68k->not_z_flag = src;
8691   m68k->v_flag = VFLAG_CLEAR;
86928692}
86938693
86948694
86958695M68KMAKE_OP(rol, 16, r, .)
86968696{
8697   uint* r_dst = &DY;
8698   uint orig_shift = DX & 0x3f;
8699   uint shift = orig_shift & 15;
8700   uint src = MASK_OUT_ABOVE_16(*r_dst);
8701   uint res = MASK_OUT_ABOVE_16(ROL_16(src, shift));
8697   UINT32* r_dst = &DY;
8698   UINT32 orig_shift = DX & 0x3f;
8699   UINT32 shift = orig_shift & 15;
8700   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
8701   UINT32 res = MASK_OUT_ABOVE_16(ROL_16(src, shift));
87028702
87038703   if(orig_shift != 0)
87048704   {
8705      USE_CYCLES(orig_shift<<CYC_SHIFT);
8705      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
87068706
87078707      if(shift != 0)
87088708      {
87098709         *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
8710         FLAG_C = (src << shift) >> 8;
8711         FLAG_N = NFLAG_16(res);
8712         FLAG_Z = res;
8713         FLAG_V = VFLAG_CLEAR;
8710         m68k->c_flag = (src << shift) >> 8;
8711         m68k->n_flag = NFLAG_16(res);
8712         m68k->not_z_flag = res;
8713         m68k->v_flag = VFLAG_CLEAR;
87148714         return;
87158715      }
8716      FLAG_C = (src & 1)<<8;
8717      FLAG_N = NFLAG_16(src);
8718      FLAG_Z = src;
8719      FLAG_V = VFLAG_CLEAR;
8716      m68k->c_flag = (src & 1)<<8;
8717      m68k->n_flag = NFLAG_16(src);
8718      m68k->not_z_flag = src;
8719      m68k->v_flag = VFLAG_CLEAR;
87208720      return;
87218721   }
87228722
8723   FLAG_C = CFLAG_CLEAR;
8724   FLAG_N = NFLAG_16(src);
8725   FLAG_Z = src;
8726   FLAG_V = VFLAG_CLEAR;
8723   m68k->c_flag = CFLAG_CLEAR;
8724   m68k->n_flag = NFLAG_16(src);
8725   m68k->not_z_flag = src;
8726   m68k->v_flag = VFLAG_CLEAR;
87278727}
87288728
87298729
87308730M68KMAKE_OP(rol, 32, r, .)
87318731{
8732   uint* r_dst = &DY;
8733   uint orig_shift = DX & 0x3f;
8734   uint shift = orig_shift & 31;
8735   uint64 src = *r_dst;
8736   uint res = ROL_32(src, shift);
8732   UINT32* r_dst = &DY;
8733   UINT32 orig_shift = DX & 0x3f;
8734   UINT32 shift = orig_shift & 31;
8735   UINT64 src = *r_dst;
8736   UINT32 res = ROL_32(src, shift);
87378737
87388738   if(orig_shift != 0)
87398739   {
8740      USE_CYCLES(orig_shift<<CYC_SHIFT);
8740      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
87418741
87428742      *r_dst = res;
87438743
8744      FLAG_C = (src >> ((32 - shift) & 0x1f)) << 8;
8745      FLAG_N = NFLAG_32(res);
8746      FLAG_Z = res;
8747      FLAG_V = VFLAG_CLEAR;
8744      m68k->c_flag = (src >> ((32 - shift) & 0x1f)) << 8;
8745      m68k->n_flag = NFLAG_32(res);
8746      m68k->not_z_flag = res;
8747      m68k->v_flag = VFLAG_CLEAR;
87488748      return;
87498749   }
87508750
8751   FLAG_C = CFLAG_CLEAR;
8752   FLAG_N = NFLAG_32(src);
8753   FLAG_Z = src;
8754   FLAG_V = VFLAG_CLEAR;
8751   m68k->c_flag = CFLAG_CLEAR;
8752   m68k->n_flag = NFLAG_32(src);
8753   m68k->not_z_flag = src;
8754   m68k->v_flag = VFLAG_CLEAR;
87558755}
87568756
87578757
87588758M68KMAKE_OP(rol, 16, ., .)
87598759{
8760   uint ea = M68KMAKE_GET_EA_AY_16;
8761   uint src = m68ki_read_16(ea);
8762   uint res = MASK_OUT_ABOVE_16(ROL_16(src, 1));
8760   UINT32 ea = M68KMAKE_GET_EA_AY_16;
8761   UINT32 src = m68ki_read_16(m68k, ea);
8762   UINT32 res = MASK_OUT_ABOVE_16(ROL_16(src, 1));
87638763
8764   m68ki_write_16(ea, res);
8764   m68ki_write_16(m68k, ea, res);
87658765
8766   FLAG_N = NFLAG_16(res);
8767   FLAG_Z = res;
8768   FLAG_C = src >> 7;
8769   FLAG_V = VFLAG_CLEAR;
8766   m68k->n_flag = NFLAG_16(res);
8767   m68k->not_z_flag = res;
8768   m68k->c_flag = src >> 7;
8769   m68k->v_flag = VFLAG_CLEAR;
87708770}
87718771
87728772
87738773M68KMAKE_OP(roxr, 8, s, .)
87748774{
8775   uint* r_dst = &DY;
8776   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
8777   uint src = MASK_OUT_ABOVE_8(*r_dst);
8778   uint res = ROR_9(src | (XFLAG_AS_1() << 8), shift);
8775   UINT32* r_dst = &DY;
8776   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
8777   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
8778   UINT32 res = ROR_9(src | (XFLAG_AS_1(m68k) << 8), shift);
87798779
87808780   if(shift != 0)
8781      USE_CYCLES(shift<<CYC_SHIFT);
8781      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
87828782
8783   FLAG_C = FLAG_X = res;
8783   m68k->c_flag = m68k->x_flag = res;
87848784   res = MASK_OUT_ABOVE_8(res);
87858785
87868786   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
87878787
8788   FLAG_N = NFLAG_8(res);
8789   FLAG_Z = res;
8790   FLAG_V = VFLAG_CLEAR;
8788   m68k->n_flag = NFLAG_8(res);
8789   m68k->not_z_flag = res;
8790   m68k->v_flag = VFLAG_CLEAR;
87918791}
87928792
87938793
87948794M68KMAKE_OP(roxr, 16, s, .)
87958795{
8796   uint* r_dst = &DY;
8797   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
8798   uint src = MASK_OUT_ABOVE_16(*r_dst);
8799   uint res = ROR_17(src | (XFLAG_AS_1() << 16), shift);
8796   UINT32* r_dst = &DY;
8797   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
8798   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
8799   UINT32 res = ROR_17(src | (XFLAG_AS_1(m68k) << 16), shift);
88008800
88018801   if(shift != 0)
8802      USE_CYCLES(shift<<CYC_SHIFT);
8802      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
88038803
8804   FLAG_C = FLAG_X = res >> 8;
8804   m68k->c_flag = m68k->x_flag = res >> 8;
88058805   res = MASK_OUT_ABOVE_16(res);
88068806
88078807   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
88088808
8809   FLAG_N = NFLAG_16(res);
8810   FLAG_Z = res;
8811   FLAG_V = VFLAG_CLEAR;
8809   m68k->n_flag = NFLAG_16(res);
8810   m68k->not_z_flag = res;
8811   m68k->v_flag = VFLAG_CLEAR;
88128812}
88138813
88148814
r3535r3536
88168816{
88178817#if M68K_USE_64_BIT
88188818
8819   uint*  r_dst = &DY;
8820   uint   shift = (((REG_IR >> 9) - 1) & 7) + 1;
8821   uint64 src   = *r_dst;
8822   uint64 res   = src | (((uint64)XFLAG_AS_1()) << 32);
8819   UINT32*  r_dst = &DY;
8820   UINT32   shift = (((m68k->ir >> 9) - 1) & 7) + 1;
8821   UINT64 src   = *r_dst;
8822   UINT64 res   = src | (((UINT64)XFLAG_AS_1(m68k)) << 32);
88238823
88248824   if(shift != 0)
8825      USE_CYCLES(shift<<CYC_SHIFT);
8825      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
88268826
88278827   res = ROR_33_64(res, shift);
88288828
8829   FLAG_C = FLAG_X = res >> 24;
8829   m68k->c_flag = m68k->x_flag = res >> 24;
88308830   res = MASK_OUT_ABOVE_32(res);
88318831
88328832   *r_dst =  res;
88338833
8834   FLAG_N = NFLAG_32(res);
8835   FLAG_Z = res;
8836   FLAG_V = VFLAG_CLEAR;
8834   m68k->n_flag = NFLAG_32(res);
8835   m68k->not_z_flag = res;
8836   m68k->v_flag = VFLAG_CLEAR;
88378837
88388838#else
88398839
8840   uint* r_dst = &DY;
8841   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
8842   uint src = *r_dst;
8843   uint res = MASK_OUT_ABOVE_32((ROR_33(src, shift) & ~(1 << (32 - shift))) | (XFLAG_AS_1() << (32 - shift)));
8844   uint new_x_flag = src & (1 << (shift - 1));
8840   UINT32* r_dst = &DY;
8841   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
8842   UINT32 src = *r_dst;
8843   UINT32 res = MASK_OUT_ABOVE_32((ROR_33(src, shift) & ~(1 << (32 - shift))) | (XFLAG_AS_1(m68k) << (32 - shift)));
8844   UINT32 new_x_flag = src & (1 << (shift - 1));
88458845
88468846   if(shift != 0)
8847      USE_CYCLES(shift<<CYC_SHIFT);
8847      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
88488848
88498849   *r_dst = res;
88508850
8851   FLAG_C = FLAG_X = (new_x_flag != 0)<<8;
8852   FLAG_N = NFLAG_32(res);
8853   FLAG_Z = res;
8854   FLAG_V = VFLAG_CLEAR;
8851   m68k->c_flag = m68k->x_flag = (new_x_flag != 0)<<8;
8852   m68k->n_flag = NFLAG_32(res);
8853   m68k->not_z_flag = res;
8854   m68k->v_flag = VFLAG_CLEAR;
88558855
88568856#endif
88578857}
r3535r3536
88598859
88608860M68KMAKE_OP(roxr, 8, r, .)
88618861{
8862   uint* r_dst = &DY;
8863   uint orig_shift = DX & 0x3f;
8862   UINT32* r_dst = &DY;
8863   UINT32 orig_shift = DX & 0x3f;
88648864
88658865   if(orig_shift != 0)
88668866   {
8867      uint shift = orig_shift % 9;
8868      uint src   = MASK_OUT_ABOVE_8(*r_dst);
8869      uint res   = ROR_9(src | (XFLAG_AS_1() << 8), shift);
8867      UINT32 shift = orig_shift % 9;
8868      UINT32 src   = MASK_OUT_ABOVE_8(*r_dst);
8869      UINT32 res   = ROR_9(src | (XFLAG_AS_1(m68k) << 8), shift);
88708870
8871      USE_CYCLES(orig_shift<<CYC_SHIFT);
8871      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
88728872
8873      FLAG_C = FLAG_X = res;
8873      m68k->c_flag = m68k->x_flag = res;
88748874      res = MASK_OUT_ABOVE_8(res);
88758875
88768876      *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
8877      FLAG_N = NFLAG_8(res);
8878      FLAG_Z = res;
8879      FLAG_V = VFLAG_CLEAR;
8877      m68k->n_flag = NFLAG_8(res);
8878      m68k->not_z_flag = res;
8879      m68k->v_flag = VFLAG_CLEAR;
88808880      return;
88818881   }
88828882
8883   FLAG_C = FLAG_X;
8884   FLAG_N = NFLAG_8(*r_dst);
8885   FLAG_Z = MASK_OUT_ABOVE_8(*r_dst);
8886   FLAG_V = VFLAG_CLEAR;
8883   m68k->c_flag = m68k->x_flag;
8884   m68k->n_flag = NFLAG_8(*r_dst);
8885   m68k->not_z_flag = MASK_OUT_ABOVE_8(*r_dst);
8886   m68k->v_flag = VFLAG_CLEAR;
88878887}
88888888
88898889
88908890M68KMAKE_OP(roxr, 16, r, .)
88918891{
8892   uint* r_dst = &DY;
8893   uint orig_shift = DX & 0x3f;
8892   UINT32* r_dst = &DY;
8893   UINT32 orig_shift = DX & 0x3f;
88948894
88958895   if(orig_shift != 0)
88968896   {
8897      uint shift = orig_shift % 17;
8898      uint src   = MASK_OUT_ABOVE_16(*r_dst);
8899      uint res   = ROR_17(src | (XFLAG_AS_1() << 16), shift);
8897      UINT32 shift = orig_shift % 17;
8898      UINT32 src   = MASK_OUT_ABOVE_16(*r_dst);
8899      UINT32 res   = ROR_17(src | (XFLAG_AS_1(m68k) << 16), shift);
89008900
8901      USE_CYCLES(orig_shift<<CYC_SHIFT);
8901      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
89028902
8903      FLAG_C = FLAG_X = res >> 8;
8903      m68k->c_flag = m68k->x_flag = res >> 8;
89048904      res = MASK_OUT_ABOVE_16(res);
89058905
89068906      *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
8907      FLAG_N = NFLAG_16(res);
8908      FLAG_Z = res;
8909      FLAG_V = VFLAG_CLEAR;
8907      m68k->n_flag = NFLAG_16(res);
8908      m68k->not_z_flag = res;
8909      m68k->v_flag = VFLAG_CLEAR;
89108910      return;
89118911   }
89128912
8913   FLAG_C = FLAG_X;
8914   FLAG_N = NFLAG_16(*r_dst);
8915   FLAG_Z = MASK_OUT_ABOVE_16(*r_dst);
8916   FLAG_V = VFLAG_CLEAR;
8913   m68k->c_flag = m68k->x_flag;
8914   m68k->n_flag = NFLAG_16(*r_dst);
8915   m68k->not_z_flag = MASK_OUT_ABOVE_16(*r_dst);
8916   m68k->v_flag = VFLAG_CLEAR;
89178917}
89188918
89198919
r3535r3536
89218921{
89228922#if M68K_USE_64_BIT
89238923
8924   uint*  r_dst = &DY;
8925   uint   orig_shift = DX & 0x3f;
8924   UINT32*  r_dst = &DY;
8925   UINT32   orig_shift = DX & 0x3f;
89268926
89278927   if(orig_shift != 0)
89288928   {
8929      uint   shift = orig_shift % 33;
8930      uint64 src   = *r_dst;
8931      uint64 res   = src | (((uint64)XFLAG_AS_1()) << 32);
8929      UINT32   shift = orig_shift % 33;
8930      UINT64 src   = *r_dst;
8931      UINT64 res   = src | (((UINT64)XFLAG_AS_1(m68k)) << 32);
89328932
89338933      res = ROR_33_64(res, shift);
89348934
8935      USE_CYCLES(orig_shift<<CYC_SHIFT);
8935      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
89368936
8937      FLAG_C = FLAG_X = res >> 24;
8937      m68k->c_flag = m68k->x_flag = res >> 24;
89388938      res = MASK_OUT_ABOVE_32(res);
89398939
89408940      *r_dst = res;
8941      FLAG_N = NFLAG_32(res);
8942      FLAG_Z = res;
8943      FLAG_V = VFLAG_CLEAR;
8941      m68k->n_flag = NFLAG_32(res);
8942      m68k->not_z_flag = res;
8943      m68k->v_flag = VFLAG_CLEAR;
89448944      return;
89458945   }
89468946
8947   FLAG_C = FLAG_X;
8948   FLAG_N = NFLAG_32(*r_dst);
8949   FLAG_Z = *r_dst;
8950   FLAG_V = VFLAG_CLEAR;
8947   m68k->c_flag = m68k->x_flag;
8948   m68k->n_flag = NFLAG_32(*r_dst);
8949   m68k->not_z_flag = *r_dst;
8950   m68k->v_flag = VFLAG_CLEAR;
89518951
89528952#else
89538953
8954   uint* r_dst = &DY;
8955   uint orig_shift = DX & 0x3f;
8956   uint shift = orig_shift % 33;
8957   uint src = *r_dst;
8958   uint res = MASK_OUT_ABOVE_32((ROR_33(src, shift) & ~(1 << (32 - shift))) | (XFLAG_AS_1() << (32 - shift)));
8959   uint new_x_flag = src & (1 << (shift - 1));
8954   UINT32* r_dst = &DY;
8955   UINT32 orig_shift = DX & 0x3f;
8956   UINT32 shift = orig_shift % 33;
8957   UINT32 src = *r_dst;
8958   UINT32 res = MASK_OUT_ABOVE_32((ROR_33(src, shift) & ~(1 << (32 - shift))) | (XFLAG_AS_1(m68k) << (32 - shift)));
8959   UINT32 new_x_flag = src & (1 << (shift - 1));
89608960
89618961   if(orig_shift != 0)
8962      USE_CYCLES(orig_shift<<CYC_SHIFT);
8962      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
89638963
89648964   if(shift != 0)
89658965   {
89668966      *r_dst = res;
8967      FLAG_X = (new_x_flag != 0)<<8;
8967      m68k->x_flag = (new_x_flag != 0)<<8;
89688968   }
89698969   else
89708970      res = src;
8971   FLAG_C = FLAG_X;
8972   FLAG_N = NFLAG_32(res);
8973   FLAG_Z = res;
8974   FLAG_V = VFLAG_CLEAR;
8971   m68k->c_flag = m68k->x_flag;
8972   m68k->n_flag = NFLAG_32(res);
8973   m68k->not_z_flag = res;
8974   m68k->v_flag = VFLAG_CLEAR;
89758975
89768976#endif
89778977}
r3535r3536
89798979
89808980M68KMAKE_OP(roxr, 16, ., .)
89818981{
8982   uint ea = M68KMAKE_GET_EA_AY_16;
8983   uint src = m68ki_read_16(ea);
8984   uint res = ROR_17(src | (XFLAG_AS_1() << 16), 1);
8982   UINT32 ea = M68KMAKE_GET_EA_AY_16;
8983   UINT32 src = m68ki_read_16(m68k, ea);
8984   UINT32 res = ROR_17(src | (XFLAG_AS_1(m68k) << 16), 1);
89858985
8986   FLAG_C = FLAG_X = res >> 8;
8986   m68k->c_flag = m68k->x_flag = res >> 8;
89878987   res = MASK_OUT_ABOVE_16(res);
89888988
8989   m68ki_write_16(ea, res);
8989   m68ki_write_16(m68k, ea, res);
89908990
8991   FLAG_N = NFLAG_16(res);
8992   FLAG_Z = res;
8993   FLAG_V = VFLAG_CLEAR;
8991   m68k->n_flag = NFLAG_16(res);
8992   m68k->not_z_flag = res;
8993   m68k->v_flag = VFLAG_CLEAR;
89948994}
89958995
89968996
89978997M68KMAKE_OP(roxl, 8, s, .)
89988998{
8999   uint* r_dst = &DY;
9000   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
9001   uint src = MASK_OUT_ABOVE_8(*r_dst);
9002   uint res = ROL_9(src | (XFLAG_AS_1() << 8), shift);
8999   UINT32* r_dst = &DY;
9000   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
9001   UINT32 src = MASK_OUT_ABOVE_8(*r_dst);
9002   UINT32 res = ROL_9(src | (XFLAG_AS_1(m68k) << 8), shift);
90039003
90049004   if(shift != 0)
9005      USE_CYCLES(shift<<CYC_SHIFT);
9005      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
90069006
9007   FLAG_C = FLAG_X = res;
9007   m68k->c_flag = m68k->x_flag = res;
90089008   res = MASK_OUT_ABOVE_8(res);
90099009
90109010   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
90119011
9012   FLAG_N = NFLAG_8(res);
9013   FLAG_Z = res;
9014   FLAG_V = VFLAG_CLEAR;
9012   m68k->n_flag = NFLAG_8(res);
9013   m68k->not_z_flag = res;
9014   m68k->v_flag = VFLAG_CLEAR;
90159015}
90169016
90179017
90189018M68KMAKE_OP(roxl, 16, s, .)
90199019{
9020   uint* r_dst = &DY;
9021   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
9022   uint src = MASK_OUT_ABOVE_16(*r_dst);
9023   uint res = ROL_17(src | (XFLAG_AS_1() << 16), shift);
9020   UINT32* r_dst = &DY;
9021   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
9022   UINT32 src = MASK_OUT_ABOVE_16(*r_dst);
9023   UINT32 res = ROL_17(src | (XFLAG_AS_1(m68k) << 16), shift);
90249024
90259025   if(shift != 0)
9026      USE_CYCLES(shift<<CYC_SHIFT);
9026      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
90279027
9028   FLAG_C = FLAG_X = res >> 8;
9028   m68k->c_flag = m68k->x_flag = res >> 8;
90299029   res = MASK_OUT_ABOVE_16(res);
90309030
90319031   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
90329032
9033   FLAG_N = NFLAG_16(res);
9034   FLAG_Z = res;
9035   FLAG_V = VFLAG_CLEAR;
9033   m68k->n_flag = NFLAG_16(res);
9034   m68k->not_z_flag = res;
9035   m68k->v_flag = VFLAG_CLEAR;
90369036}
90379037
90389038
r3535r3536
90409040{
90419041#if M68K_USE_64_BIT
90429042
9043   uint*  r_dst = &DY;
9044   uint   shift = (((REG_IR >> 9) - 1) & 7) + 1;
9045   uint64 src   = *r_dst;
9046   uint64 res   = src | (((uint64)XFLAG_AS_1()) << 32);
9043   UINT32*  r_dst = &DY;
9044   UINT32   shift = (((m68k->ir >> 9) - 1) & 7) + 1;
9045   UINT64 src   = *r_dst;
9046   UINT64 res   = src | (((UINT64)XFLAG_AS_1(m68k)) << 32);
90479047
90489048   if(shift != 0)
9049      USE_CYCLES(shift<<CYC_SHIFT);
9049      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
90509050
90519051   res = ROL_33_64(res, shift);
90529052
9053   FLAG_C = FLAG_X = res >> 24;
9053   m68k->c_flag = m68k->x_flag = res >> 24;
90549054   res = MASK_OUT_ABOVE_32(res);
90559055
90569056   *r_dst = res;
90579057
9058   FLAG_N = NFLAG_32(res);
9059   FLAG_Z = res;
9060   FLAG_V = VFLAG_CLEAR;
9058   m68k->n_flag = NFLAG_32(res);
9059   m68k->not_z_flag = res;
9060   m68k->v_flag = VFLAG_CLEAR;
90619061
90629062#else
90639063
9064   uint* r_dst = &DY;
9065   uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
9066   uint src = *r_dst;
9067   uint res = MASK_OUT_ABOVE_32((ROL_33(src, shift) & ~(1 << (shift - 1))) | (XFLAG_AS_1() << (shift - 1)));
9068   uint new_x_flag = src & (1 << (32 - shift));
9064   UINT32* r_dst = &DY;
9065   UINT32 shift = (((m68k->ir >> 9) - 1) & 7) + 1;
9066   UINT32 src = *r_dst;
9067   UINT32 res = MASK_OUT_ABOVE_32((ROL_33(src, shift) & ~(1 << (shift - 1))) | (XFLAG_AS_1(m68k) << (shift - 1)));
9068   UINT32 new_x_flag = src & (1 << (32 - shift));
90699069
90709070   if(shift != 0)
9071      USE_CYCLES(shift<<CYC_SHIFT);
9071      USE_CYCLES(m68k, shift<<m68k->cyc_shift);
90729072
90739073   *r_dst = res;
90749074
9075   FLAG_C = FLAG_X = (new_x_flag != 0)<<8;
9076   FLAG_N = NFLAG_32(res);
9077   FLAG_Z = res;
9078   FLAG_V = VFLAG_CLEAR;
9075   m68k->c_flag = m68k->x_flag = (new_x_flag != 0)<<8;
9076   m68k->n_flag = NFLAG_32(res);
9077   m68k->not_z_flag = res;
9078   m68k->v_flag = VFLAG_CLEAR;
90799079
90809080#endif
90819081}
r3535r3536
90839083
90849084M68KMAKE_OP(roxl, 8, r, .)
90859085{
9086   uint* r_dst = &DY;
9087   uint orig_shift = DX & 0x3f;
9086   UINT32* r_dst = &DY;
9087   UINT32 orig_shift = DX & 0x3f;
90889088
90899089
90909090   if(orig_shift != 0)
90919091   {
9092      uint shift = orig_shift % 9;
9093      uint src   = MASK_OUT_ABOVE_8(*r_dst);
9094      uint res   = ROL_9(src | (XFLAG_AS_1() << 8), shift);
9092      UINT32 shift = orig_shift % 9;
9093      UINT32 src   = MASK_OUT_ABOVE_8(*r_dst);
9094      UINT32 res   = ROL_9(src | (XFLAG_AS_1(m68k) << 8), shift);
90959095
9096      USE_CYCLES(orig_shift<<CYC_SHIFT);
9096      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
90979097
9098      FLAG_C = FLAG_X = res;
9098      m68k->c_flag = m68k->x_flag = res;
90999099      res = MASK_OUT_ABOVE_8(res);
91009100
91019101      *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
9102      FLAG_N = NFLAG_8(res);
9103      FLAG_Z = res;
9104      FLAG_V = VFLAG_CLEAR;
9102      m68k->n_flag = NFLAG_8(res);
9103      m68k->not_z_flag = res;
9104      m68k->v_flag = VFLAG_CLEAR;
91059105      return;
91069106   }
91079107
9108   FLAG_C = FLAG_X;
9109   FLAG_N = NFLAG_8(*r_dst);
9110   FLAG_Z = MASK_OUT_ABOVE_8(*r_dst);
9111   FLAG_V = VFLAG_CLEAR;
9108   m68k->c_flag = m68k->x_flag;
9109   m68k->n_flag = NFLAG_8(*r_dst);
9110   m68k->not_z_flag = MASK_OUT_ABOVE_8(*r_dst);
9111   m68k->v_flag = VFLAG_CLEAR;
91129112}
91139113
91149114
91159115M68KMAKE_OP(roxl, 16, r, .)
91169116{
9117   uint* r_dst = &DY;
9118   uint orig_shift = DX & 0x3f;
9117   UINT32* r_dst = &DY;
9118   UINT32 orig_shift = DX & 0x3f;
91199119
91209120   if(orig_shift != 0)
91219121   {
9122      uint shift = orig_shift % 17;
9123      uint src   = MASK_OUT_ABOVE_16(*r_dst);
9124      uint res   = ROL_17(src | (XFLAG_AS_1() << 16), shift);
9122      UINT32 shift = orig_shift % 17;
9123      UINT32 src   = MASK_OUT_ABOVE_16(*r_dst);
9124      UINT32 res   = ROL_17(src | (XFLAG_AS_1(m68k) << 16), shift);
91259125
9126      USE_CYCLES(orig_shift<<CYC_SHIFT);
9126      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
91279127
9128      FLAG_C = FLAG_X = res >> 8;
9128      m68k->c_flag = m68k->x_flag = res >> 8;
91299129      res = MASK_OUT_ABOVE_16(res);
91309130
91319131      *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
9132      FLAG_N = NFLAG_16(res);
9133      FLAG_Z = res;
9134      FLAG_V = VFLAG_CLEAR;
9132      m68k->n_flag = NFLAG_16(res);
9133      m68k->not_z_flag = res;
9134      m68k->v_flag = VFLAG_CLEAR;
91359135      return;
91369136   }
91379137
9138   FLAG_C = FLAG_X;
9139   FLAG_N = NFLAG_16(*r_dst);
9140   FLAG_Z = MASK_OUT_ABOVE_16(*r_dst);
9141   FLAG_V = VFLAG_CLEAR;
9138   m68k->c_flag = m68k->x_flag;
9139   m68k->n_flag = NFLAG_16(*r_dst);
9140   m68k->not_z_flag = MASK_OUT_ABOVE_16(*r_dst);
9141   m68k->v_flag = VFLAG_CLEAR;
91429142}
91439143
91449144
r3535r3536
91469146{
91479147#if M68K_USE_64_BIT
91489148
9149   uint*  r_dst = &DY;
9150   uint   orig_shift = DX & 0x3f;
9149   UINT32*  r_dst = &DY;
9150   UINT32   orig_shift = DX & 0x3f;
91519151
91529152   if(orig_shift != 0)
91539153   {
9154      uint   shift = orig_shift % 33;
9155      uint64 src   = *r_dst;
9156      uint64 res   = src | (((uint64)XFLAG_AS_1()) << 32);
9154      UINT32   shift = orig_shift % 33;
9155      UINT64 src   = *r_dst;
9156      UINT64 res   = src | (((UINT64)XFLAG_AS_1(m68k)) << 32);
91579157
91589158      res = ROL_33_64(res, shift);
91599159
9160      USE_CYCLES(orig_shift<<CYC_SHIFT);
9160      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
91619161
9162      FLAG_C = FLAG_X = res >> 24;
9162      m68k->c_flag = m68k->x_flag = res >> 24;
91639163      res = MASK_OUT_ABOVE_32(res);
91649164
91659165      *r_dst = res;
9166      FLAG_N = NFLAG_32(res);
9167      FLAG_Z = res;
9168      FLAG_V = VFLAG_CLEAR;
9166      m68k->n_flag = NFLAG_32(res);
9167      m68k->not_z_flag = res;
9168      m68k->v_flag = VFLAG_CLEAR;
91699169      return;
91709170   }
91719171
9172   FLAG_C = FLAG_X;
9173   FLAG_N = NFLAG_32(*r_dst);
9174   FLAG_Z = *r_dst;
9175   FLAG_V = VFLAG_CLEAR;
9172   m68k->c_flag = m68k->x_flag;
9173   m68k->n_flag = NFLAG_32(*r_dst);
9174   m68k->not_z_flag = *r_dst;
9175   m68k->v_flag = VFLAG_CLEAR;
91769176
91779177#else
91789178
9179   uint* r_dst = &DY;
9180   uint orig_shift = DX & 0x3f;
9181   uint shift = orig_shift % 33;
9182   uint src = *r_dst;
9183   uint res = MASK_OUT_ABOVE_32((ROL_33(src, shift) & ~(1 << (shift - 1))) | (XFLAG_AS_1() << (shift - 1)));
9184   uint new_x_flag = src & (1 << (32 - shift));
9179   UINT32* r_dst = &DY;
9180   UINT32 orig_shift = DX & 0x3f;
9181   UINT32 shift = orig_shift % 33;
9182   UINT32 src = *r_dst;
9183   UINT32 res = MASK_OUT_ABOVE_32((ROL_33(src, shift) & ~(1 << (shift - 1))) | (XFLAG_AS_1(m68k) << (shift - 1)));
9184   UINT32 new_x_flag = src & (1 << (32 - shift));
91859185
91869186   if(orig_shift != 0)
9187      USE_CYCLES(orig_shift<<CYC_SHIFT);
9187      USE_CYCLES(m68k, orig_shift<<m68k->cyc_shift);
91889188
91899189   if(shift != 0)
91909190   {
91919191      *r_dst = res;
9192      FLAG_X = (new_x_flag != 0)<<8;
9192      m68k->x_flag = (new_x_flag != 0)<<8;
91939193   }
91949194   else
91959195      res = src;
9196   FLAG_C = FLAG_X;
9197   FLAG_N = NFLAG_32(res);
9198   FLAG_Z = res;
9199   FLAG_V = VFLAG_CLEAR;
9196   m68k->c_flag = m68k->x_flag;
9197   m68k->n_flag = NFLAG_32(res);
9198   m68k->not_z_flag = res;
9199   m68k->v_flag = VFLAG_CLEAR;
92009200
92019201#endif
92029202}
r3535r3536
92049204
92059205M68KMAKE_OP(roxl, 16, ., .)
92069206{
9207   uint ea = M68KMAKE_GET_EA_AY_16;
9208   uint src = m68ki_read_16(ea);
9209   uint res = ROL_17(src | (XFLAG_AS_1() << 16), 1);
9207   UINT32 ea = M68KMAKE_GET_EA_AY_16;
9208   UINT32 src = m68ki_read_16(m68k, ea);
9209   UINT32 res = ROL_17(src | (XFLAG_AS_1(m68k) << 16), 1);
92109210
9211   FLAG_C = FLAG_X = res >> 8;
9211   m68k->c_flag = m68k->x_flag = res >> 8;
92129212   res = MASK_OUT_ABOVE_16(res);
92139213
9214   m68ki_write_16(ea, res);
9214   m68ki_write_16(m68k, ea, res);
92159215
9216   FLAG_N = NFLAG_16(res);
9217   FLAG_Z = res;
9218   FLAG_V = VFLAG_CLEAR;
9216   m68k->n_flag = NFLAG_16(res);
9217   m68k->not_z_flag = res;
9218   m68k->v_flag = VFLAG_CLEAR;
92199219}
92209220
92219221
92229222M68KMAKE_OP(rtd, 32, ., .)
92239223{
9224   if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
9224   if(CPU_TYPE_IS_010_PLUS(m68k->cpu_type))
92259225   {
9226      uint new_pc = m68ki_pull_32();
9226      UINT32 new_pc = m68ki_pull_32(m68k);
92279227
92289228      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
9229      REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + MAKE_INT_16(OPER_I_16()));
9230      m68ki_jump(new_pc);
9229      REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + MAKE_INT_16(OPER_I_16(m68k)));
9230      m68ki_jump(m68k, new_pc);
92319231      return;
92329232   }
9233   m68ki_exception_illegal();
9233   m68ki_exception_illegal(m68k);
92349234}
92359235
92369236
92379237M68KMAKE_OP(rte, 32, ., .)
92389238{
9239   if(FLAG_S)
9239   if(m68k->s_flag)
92409240   {
9241      uint new_sr;
9242      uint new_pc;
9243      uint format_word;
9241      UINT32 new_sr;
9242      UINT32 new_pc;
9243      UINT32 format_word;
92449244
9245      m68ki_rte_callback();         /* auto-disable (see m68kcpu.h) */
9245      (*m68k->rte_instr_callback)();
92469246      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
92479247
9248      if(CPU_TYPE_IS_000(CPU_TYPE))
9248      if(CPU_TYPE_IS_000(m68k->cpu_type))
92499249      {
9250         new_sr = m68ki_pull_16();
9251         new_pc = m68ki_pull_32();
9252         m68ki_jump(new_pc);
9253         m68ki_set_sr(new_sr);
9250         new_sr = m68ki_pull_16(m68k);
9251         new_pc = m68ki_pull_32(m68k);
9252         m68ki_jump(m68k, new_pc);
9253         m68ki_set_sr(m68k, new_sr);
92549254
9255         CPU_INSTR_MODE = INSTRUCTION_YES;
9256         CPU_RUN_MODE = RUN_MODE_NORMAL;
9255         m68k->instr_mode = INSTRUCTION_YES;
9256         m68k->run_mode = RUN_MODE_NORMAL;
92579257
92589258         return;
92599259      }
92609260
9261      if(CPU_TYPE_IS_010(CPU_TYPE))
9261      if(CPU_TYPE_IS_010(m68k->cpu_type))
92629262      {
9263         format_word = m68ki_read_16(REG_A[7]+6) >> 12;
9263         format_word = m68ki_read_16(m68k, REG_A[7]+6) >> 12;
92649264         if(format_word == 0)
92659265         {
9266            new_sr = m68ki_pull_16();
9267            new_pc = m68ki_pull_32();
9268            m68ki_fake_pull_16();   /* format word */
9269            m68ki_jump(new_pc);
9270            m68ki_set_sr(new_sr);
9271            CPU_INSTR_MODE = INSTRUCTION_YES;
9272            CPU_RUN_MODE = RUN_MODE_NORMAL;
9266            new_sr = m68ki_pull_16(m68k);
9267            new_pc = m68ki_pull_32(m68k);
9268            m68ki_fake_pull_16(m68k);   /* format word */
9269            m68ki_jump(m68k, new_pc);
9270            m68ki_set_sr(m68k, new_sr);
9271            m68k->instr_mode = INSTRUCTION_YES;
9272            m68k->run_mode = RUN_MODE_NORMAL;
92739273            return;
92749274         }
9275         CPU_INSTR_MODE = INSTRUCTION_YES;
9276         CPU_RUN_MODE = RUN_MODE_NORMAL;
9275         m68k->instr_mode = INSTRUCTION_YES;
9276         m68k->run_mode = RUN_MODE_NORMAL;
92779277         /* Not handling bus fault (9) */
9278         m68ki_exception_format_error();
9278         m68ki_exception_format_error(m68k);
92799279         return;
92809280      }
92819281
92829282      /* Otherwise it's 020 */
92839283rte_loop:
9284      format_word = m68ki_read_16(REG_A[7]+6) >> 12;
9284      format_word = m68ki_read_16(m68k, REG_A[7]+6) >> 12;
92859285      switch(format_word)
92869286      {
92879287         case 0: /* Normal */
9288            new_sr = m68ki_pull_16();
9289            new_pc = m68ki_pull_32();
9290            m68ki_fake_pull_16();   /* format word */
9291            m68ki_jump(new_pc);
9292            m68ki_set_sr(new_sr);
9293            CPU_INSTR_MODE = INSTRUCTION_YES;
9294            CPU_RUN_MODE = RUN_MODE_NORMAL;
9288            new_sr = m68ki_pull_16(m68k);
9289            new_pc = m68ki_pull_32(m68k);
9290            m68ki_fake_pull_16(m68k);   /* format word */
9291            m68ki_jump(m68k, new_pc);
9292            m68ki_set_sr(m68k, new_sr);
9293            m68k->instr_mode = INSTRUCTION_YES;
9294            m68k->run_mode = RUN_MODE_NORMAL;
92959295            return;
92969296         case 1: /* Throwaway */
9297            new_sr = m68ki_pull_16();
9298            m68ki_fake_pull_32();   /* program counter */
9299            m68ki_fake_pull_16();   /* format word */
9300            m68ki_set_sr_noint(new_sr);
9297            new_sr = m68ki_pull_16(m68k);
9298            m68ki_fake_pull_32(m68k);   /* program counter */
9299            m68ki_fake_pull_16(m68k);   /* format word */
9300            m68ki_set_sr_noint(m68k, new_sr);
93019301            goto rte_loop;
93029302         case 2: /* Trap */
9303            new_sr = m68ki_pull_16();
9304            new_pc = m68ki_pull_32();
9305            m68ki_fake_pull_16();   /* format word */
9306            m68ki_fake_pull_32();   /* address */
9307            m68ki_jump(new_pc);
9308            m68ki_set_sr(new_sr);
9309            CPU_INSTR_MODE = INSTRUCTION_YES;
9310            CPU_RUN_MODE = RUN_MODE_NORMAL;
9303            new_sr = m68ki_pull_16(m68k);
9304            new_pc = m68ki_pull_32(m68k);
9305            m68ki_fake_pull_16(m68k);   /* format word */
9306            m68ki_fake_pull_32(m68k);   /* address */
9307            m68ki_jump(m68k, new_pc);
9308            m68ki_set_sr(m68k, new_sr);
9309            m68k->instr_mode = INSTRUCTION_YES;
9310            m68k->run_mode = RUN_MODE_NORMAL;
93119311            return;
93129312      }
93139313      /* Not handling long or short bus fault */
9314      CPU_INSTR_MODE = INSTRUCTION_YES;
9315      CPU_RUN_MODE = RUN_MODE_NORMAL;
9316      m68ki_exception_format_error();
9314      m68k->instr_mode = INSTRUCTION_YES;
9315      m68k->run_mode = RUN_MODE_NORMAL;
9316      m68ki_exception_format_error(m68k);
93179317      return;
93189318   }
9319   m68ki_exception_privilege_violation();
9319   m68ki_exception_privilege_violation(m68k);
93209320}
93219321
93229322
93239323M68KMAKE_OP(rtm, 32, ., .)
93249324{
9325   if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
9325   if(CPU_TYPE_IS_020_VARIANT(m68k->cpu_type))
93269326   {
93279327      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
93289328      M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
9329                m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
9330                m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
9329                m68ki_cpu_names[m68k->cpu_type], ADDRESS_68K(m68k, REG_PC - 2), m68k->ir,
9330                m68k_disassemble_quick(ADDRESS_68K(m68k, REG_PC - 2))));
93319331      return;
93329332   }
9333   m68ki_exception_illegal();
9333   m68ki_exception_illegal(m68k);
93349334}
93359335
93369336
93379337M68KMAKE_OP(rtr, 32, ., .)
93389338{
93399339   m68ki_trace_t0();               /* auto-disable (see m68kcpu.h) */
9340   m68ki_set_ccr(m68ki_pull_16());
9341   m68ki_jump(m68ki_pull_32());
9340   m68ki_set_ccr(m68k, m68ki_pull_16(m68k));
9341   m68ki_jump(m68k, m68ki_pull_32(m68k));
93429342}
93439343
93449344
93459345M68KMAKE_OP(rts, 32, ., .)
93469346{
93479347   m68ki_trace_t0();               /* auto-disable (see m68kcpu.h) */
9348   m68ki_jump(m68ki_pull_32());
9348   m68ki_jump(m68k, m68ki_pull_32(m68k));
93499349}
93509350
93519351
93529352M68KMAKE_OP(sbcd, 8, rr, .)
93539353{
9354   uint* r_dst = &DX;
9355   uint src = DY;
9356   uint dst = *r_dst;
9357   uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
9354   UINT32* r_dst = &DX;
9355   UINT32 src = DY;
9356   UINT32 dst = *r_dst;
9357   UINT32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(m68k);
93589358
9359//  FLAG_V = ~res; /* Undefined V behavior */
9360   FLAG_V = VFLAG_CLEAR;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to assume cleared. */
9359//  m68k->v_flag = ~res; /* Undefined V behavior */
9360   m68k->v_flag = VFLAG_CLEAR;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to assume cleared. */
93619361
93629362   if(res > 9)
93639363      res -= 6;
r3535r3536
93659365   if(res > 0x99)
93669366   {
93679367      res += 0xa0;
9368      FLAG_X = FLAG_C = CFLAG_SET;
9369      FLAG_N = NFLAG_SET;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
9368      m68k->x_flag = m68k->c_flag = CFLAG_SET;
9369      m68k->n_flag = NFLAG_SET;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
93709370   }
93719371   else
9372      FLAG_N = FLAG_X = FLAG_C = 0;
9372      m68k->n_flag = m68k->x_flag = m68k->c_flag = 0;
93739373
93749374   res = MASK_OUT_ABOVE_8(res);
93759375
9376//  FLAG_V &= res; /* Undefined V behavior part II */
9377//  FLAG_N = NFLAG_8(res); /* Undefined N behavior */
9378   FLAG_Z |= res;
9376//  m68k->v_flag &= res; /* Undefined V behavior part II */
9377//  m68k->n_flag = NFLAG_8(res); /* Undefined N behavior */
9378   m68k->not_z_flag |= res;
93799379
93809380   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
93819381}
r3535r3536
93839383
93849384M68KMAKE_OP(sbcd, 8, mm, ax7)
93859385{
9386   uint src = OPER_AY_PD_8();
9387   uint ea  = EA_A7_PD_8();
9388   uint dst = m68ki_read_8(ea);
9389   uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
9386   UINT32 src = OPER_AY_PD_8(m68k);
9387   UINT32 ea  = EA_A7_PD_8(m68k);
9388   UINT32 dst = m68ki_read_8(m68k, ea);
9389   UINT32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(m68k);
93909390
9391//  FLAG_V = ~res; /* Undefined V behavior */
9392   FLAG_V = VFLAG_CLEAR;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */
9391//  m68k->v_flag = ~res; /* Undefined V behavior */
9392   m68k->v_flag = VFLAG_CLEAR;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */
93939393
93949394   if(res > 9)
93959395      res -= 6;
r3535r3536
93979397   if(res > 0x99)
93989398   {
93999399      res += 0xa0;
9400      FLAG_X = FLAG_C = CFLAG_SET;
9401      FLAG_N = NFLAG_SET;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
9400      m68k->x_flag = m68k->c_flag = CFLAG_SET;
9401      m68k->n_flag = NFLAG_SET;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
94029402   }
94039403   else
9404      FLAG_N = FLAG_X = FLAG_C = 0;
9404      m68k->n_flag = m68k->x_flag = m68k->c_flag = 0;
94059405
94069406   res = MASK_OUT_ABOVE_8(res);
94079407
9408//  FLAG_V &= res; /* Undefined V behavior part II */
9409//  FLAG_N = NFLAG_8(res); /* Undefined N behavior */
9410   FLAG_Z |= res;
9408//  m68k->v_flag &= res; /* Undefined V behavior part II */
9409//  m68k->n_flag = NFLAG_8(res); /* Undefined N behavior */
9410   m68k->not_z_flag |= res;
94119411
9412   m68ki_write_8(ea, res);
9412   m68ki_write_8(m68k, ea, res);
94139413}
94149414
94159415
94169416M68KMAKE_OP(sbcd, 8, mm, ay7)
94179417{
9418   uint src = OPER_A7_PD_8();
9419   uint ea  = EA_AX_PD_8();
9420   uint dst = m68ki_read_8(ea);
9421   uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
9418   UINT32 src = OPER_A7_PD_8(m68k);
9419   UINT32 ea  = EA_AX_PD_8(m68k);
9420   UINT32 dst = m68ki_read_8(m68k, ea);
9421   UINT32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(m68k);
94229422
9423//  FLAG_V = ~res; /* Undefined V behavior */
9424   FLAG_V = VFLAG_CLEAR;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */
9423//  m68k->v_flag = ~res; /* Undefined V behavior */
9424   m68k->v_flag = VFLAG_CLEAR;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */
94259425
94269426   if(res > 9)
94279427      res -= 6;
r3535r3536
94299429   if(res > 0x99)
94309430   {
94319431      res += 0xa0;
9432      FLAG_X = FLAG_C = CFLAG_SET;
9433      FLAG_N = NFLAG_SET;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
9432      m68k->x_flag = m68k->c_flag = CFLAG_SET;
9433      m68k->n_flag = NFLAG_SET;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
94349434   }
94359435   else
9436      FLAG_N = FLAG_X = FLAG_C = 0;
9436      m68k->n_flag = m68k->x_flag = m68k->c_flag = 0;
94379437
94389438   res = MASK_OUT_ABOVE_8(res);
94399439
9440//  FLAG_V &= res; /* Undefined V behavior part II */
9441//  FLAG_N = NFLAG_8(res); /* Undefined N behavior */
9442   FLAG_Z |= res;
9440//  m68k->v_flag &= res; /* Undefined V behavior part II */
9441//  m68k->n_flag = NFLAG_8(res); /* Undefined N behavior */
9442   m68k->not_z_flag |= res;
94439443
9444   m68ki_write_8(ea, res);
9444   m68ki_write_8(m68k, ea, res);
94459445}
94469446
94479447
94489448M68KMAKE_OP(sbcd, 8, mm, axy7)
94499449{
9450   uint src = OPER_A7_PD_8();
9451   uint ea  = EA_A7_PD_8();
9452   uint dst = m68ki_read_8(ea);
9453   uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
9450   UINT32 src = OPER_A7_PD_8(m68k);
9451   UINT32 ea  = EA_A7_PD_8(m68k);
9452   UINT32 dst = m68ki_read_8(m68k, ea);
9453   UINT32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(m68k);
94549454
9455//  FLAG_V = ~res; /* Undefined V behavior */
9456   FLAG_V = VFLAG_CLEAR;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */
9455//  m68k->v_flag = ~res; /* Undefined V behavior */
9456   m68k->v_flag = VFLAG_CLEAR;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */
94579457
94589458   if(res > 9)
94599459      res -= 6;
r3535r3536
94619461   if(res > 0x99)
94629462   {
94639463      res += 0xa0;
9464      FLAG_X = FLAG_C = CFLAG_SET;
9465      FLAG_N = NFLAG_SET;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
9464      m68k->x_flag = m68k->c_flag = CFLAG_SET;
9465      m68k->n_flag = NFLAG_SET;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
94669466   }
94679467   else
9468      FLAG_N = FLAG_X = FLAG_C = 0;
9468      m68k->n_flag = m68k->x_flag = m68k->c_flag = 0;
94699469
94709470   res = MASK_OUT_ABOVE_8(res);
94719471
9472//  FLAG_V &= res; /* Undefined V behavior part II */
9473//  FLAG_N = NFLAG_8(res); /* Undefined N behavior */
9474   FLAG_Z |= res;
9472//  m68k->v_flag &= res; /* Undefined V behavior part II */
9473//  m68k->n_flag = NFLAG_8(res); /* Undefined N behavior */
9474   m68k->not_z_flag |= res;
94759475
9476   m68ki_write_8(ea, res);
9476   m68ki_write_8(m68k, ea, res);
94779477}
94789478
94799479
94809480M68KMAKE_OP(sbcd, 8, mm, .)
94819481{
9482   uint src = OPER_AY_PD_8();
9483   uint ea  = EA_AX_PD_8();
9484   uint dst = m68ki_read_8(ea);
9485   uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
9482   UINT32 src = OPER_AY_PD_8(m68k);
9483   UINT32 ea  = EA_AX_PD_8(m68k);
9484   UINT32 dst = m68ki_read_8(m68k, ea);
9485   UINT32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(m68k);
94869486
9487//  FLAG_V = ~res; /* Undefined V behavior */
9488   FLAG_V = VFLAG_CLEAR;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */
9487//  m68k->v_flag = ~res; /* Undefined V behavior */
9488   m68k->v_flag = VFLAG_CLEAR;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */
94899489
94909490   if(res > 9)
94919491      res -= 6;
r3535r3536
94939493   if(res > 0x99)
94949494   {
94959495      res += 0xa0;
9496      FLAG_X = FLAG_C = CFLAG_SET;
9497      FLAG_N = NFLAG_SET;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
9496      m68k->x_flag = m68k->c_flag = CFLAG_SET;
9497      m68k->n_flag = NFLAG_SET;   /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
94989498   }
94999499   else
9500      FLAG_N = FLAG_X = FLAG_C = 0;
9500      m68k->n_flag = m68k->x_flag = m68k->c_flag = 0;
95019501
95029502   res = MASK_OUT_ABOVE_8(res);
95039503
9504//  FLAG_V &= res; /* Undefined V behavior part II */
9505//  FLAG_N = NFLAG_8(res); /* Undefined N behavior */
9506   FLAG_Z |= res;
9504//  m68k->v_flag &= res; /* Undefined V behavior part II */
9505//  m68k->n_flag = NFLAG_8(res); /* Undefined N behavior */
9506   m68k->not_z_flag |= res;
95079507
9508   m68ki_write_8(ea, res);
9508   m68ki_write_8(m68k, ea, res);
95099509}
95109510
95119511
r3535r3536
95179517
95189518M68KMAKE_OP(st, 8, ., .)
95199519{
9520   m68ki_write_8(M68KMAKE_GET_EA_AY_8, 0xff);
9520   m68ki_write_8(m68k, M68KMAKE_GET_EA_AY_8, 0xff);
95219521}
95229522
95239523
r3535r3536
95299529
95309530M68KMAKE_OP(sf, 8, ., .)
95319531{
9532   m68ki_write_8(M68KMAKE_GET_EA_AY_8, 0);
9532   m68ki_write_8(m68k, M68KMAKE_GET_EA_AY_8, 0);
95339533}
95349534
95359535
r3535r3536
95389538   if(M68KMAKE_CC)
95399539   {
95409540      DY |= 0xff;
9541      USE_CYCLES(CYC_SCC_R_TRUE);
9541      USE_CYCLES(m68k, m68k->cyc_scc_r_true);
95429542      return;
95439543   }
95449544   DY &= 0xffffff00;
r3535r3536
95479547
95489548M68KMAKE_OP(scc, 8, ., .)
95499549{
9550   m68ki_write_8(M68KMAKE_GET_EA_AY_8, M68KMAKE_CC ? 0xff : 0);
9550   m68ki_write_8(m68k, M68KMAKE_GET_EA_AY_8, M68KMAKE_CC ? 0xff : 0);
95519551}
95529552
95539553
95549554M68KMAKE_OP(stop, 0, ., .)
95559555{
9556   if(FLAG_S)
9556   if(m68k->s_flag)
95579557   {
9558      uint new_sr = OPER_I_16();
9558      UINT32 new_sr = OPER_I_16(m68k);
95599559      m68ki_trace_t0();            /* auto-disable (see m68kcpu.h) */
9560      CPU_STOPPED |= STOP_LEVEL_STOP;
9561      m68ki_set_sr(new_sr);
9562      m68ki_remaining_cycles = 0;
9560      m68k->stopped |= STOP_LEVEL_STOP;
9561      m68ki_set_sr(m68k, new_sr);
9562      m68k->remaining_cycles = 0;
95639563      return;
95649564   }
9565   m68ki_exception_privilege_violation();
9565   m68ki_exception_privilege_violation(m68k);
95669566}
95679567
95689568
95699569M68KMAKE_OP(sub, 8, er, d)
95709570{
9571   uint* r_dst = &DX;
9572   uint src = MASK_OUT_ABOVE_8(DY);
9573   uint dst = MASK_OUT_ABOVE_8(*r_dst);
9574   uint res = dst - src;
9571   UINT32* r_dst = &DX;
9572   UINT32 src = MASK_OUT_ABOVE_8(DY);
9573   UINT32 dst = MASK_OUT_ABOVE_8(*r_dst);
9574   UINT32 res = dst - src;
95759575
9576   FLAG_N = NFLAG_8(res);
9577   FLAG_X = FLAG_C = CFLAG_8(res);
9578   FLAG_V = VFLAG_SUB_8(src, dst, res);
9579   FLAG_Z = MASK_OUT_ABOVE_8(res);
9576   m68k->n_flag = NFLAG_8(res);
9577   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
9578   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
9579   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
95809580
9581   *r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
9581   *r_dst = MASK_OUT_BELOW_8(*r_dst) | m68k->not_z_flag;
95829582}
95839583
95849584
95859585M68KMAKE_OP(sub, 8, er, .)
95869586{
9587   uint* r_dst = &DX;
9588   uint src = M68KMAKE_GET_OPER_AY_8;
9589   uint dst = MASK_OUT_ABOVE_8(*r_dst);
9590   uint res = dst - src;
9587   UINT32* r_dst = &DX;
9588   UINT32 src = M68KMAKE_GET_OPER_AY_8;
9589   UINT32 dst = MASK_OUT_ABOVE_8(*r_dst);
9590   UINT32 res = dst - src;
95919591
9592   FLAG_N = NFLAG_8(res);
9593   FLAG_X = FLAG_C = CFLAG_8(res);
9594   FLAG_V = VFLAG_SUB_8(src, dst, res);
9595   FLAG_Z = MASK_OUT_ABOVE_8(res);
9592   m68k->n_flag = NFLAG_8(res);
9593   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
9594   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
9595   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
95969596
9597   *r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
9597   *r_dst = MASK_OUT_BELOW_8(*r_dst) | m68k->not_z_flag;
95989598}
95999599
96009600
96019601M68KMAKE_OP(sub, 16, er, d)
96029602{
9603   uint* r_dst = &DX;
9604   uint src = MASK_OUT_ABOVE_16(DY);
9605   uint dst = MASK_OUT_ABOVE_16(*r_dst);
9606   uint res = dst - src;
9603   UINT32* r_dst = &DX;
9604   UINT32 src = MASK_OUT_ABOVE_16(DY);
9605   UINT32 dst = MASK_OUT_ABOVE_16(*r_dst);
9606   UINT32 res = dst - src;
96079607
9608   FLAG_N = NFLAG_16(res);
9609   FLAG_X = FLAG_C = CFLAG_16(res);
9610   FLAG_V = VFLAG_SUB_16(src, dst, res);
9611   FLAG_Z = MASK_OUT_ABOVE_16(res);
9608   m68k->n_flag = NFLAG_16(res);
9609   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
9610   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
9611   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
96129612
9613   *r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
9613   *r_dst = MASK_OUT_BELOW_16(*r_dst) | m68k->not_z_flag;
96149614}
96159615
96169616
96179617M68KMAKE_OP(sub, 16, er, a)
96189618{
9619   uint* r_dst = &DX;
9620   uint src = MASK_OUT_ABOVE_16(AY);
9621   uint dst = MASK_OUT_ABOVE_16(*r_dst);
9622   uint res = dst - src;
9619   UINT32* r_dst = &DX;
9620   UINT32 src = MASK_OUT_ABOVE_16(AY);
9621   UINT32 dst = MASK_OUT_ABOVE_16(*r_dst);
9622   UINT32 res = dst - src;
96239623
9624   FLAG_N = NFLAG_16(res);
9625   FLAG_X = FLAG_C = CFLAG_16(res);
9626   FLAG_V = VFLAG_SUB_16(src, dst, res);
9627   FLAG_Z = MASK_OUT_ABOVE_16(res);
9624   m68k->n_flag = NFLAG_16(res);
9625   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
9626   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
9627   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
96289628
9629   *r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
9629   *r_dst = MASK_OUT_BELOW_16(*r_dst) | m68k->not_z_flag;
96309630}
96319631
96329632
96339633M68KMAKE_OP(sub, 16, er, .)
96349634{
9635   uint* r_dst = &DX;
9636   uint src = M68KMAKE_GET_OPER_AY_16;
9637   uint dst = MASK_OUT_ABOVE_16(*r_dst);
9638   uint res = dst - src;
9635   UINT32* r_dst = &DX;
9636   UINT32 src = M68KMAKE_GET_OPER_AY_16;
9637   UINT32 dst = MASK_OUT_ABOVE_16(*r_dst);
9638   UINT32 res = dst - src;
96399639
9640   FLAG_N = NFLAG_16(res);
9641   FLAG_X = FLAG_C = CFLAG_16(res);
9642   FLAG_V = VFLAG_SUB_16(src, dst, res);
9643   FLAG_Z = MASK_OUT_ABOVE_16(res);
9640   m68k->n_flag = NFLAG_16(res);
9641   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
9642   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
9643   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
96449644
9645   *r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
9645   *r_dst = MASK_OUT_BELOW_16(*r_dst) | m68k->not_z_flag;
96469646}
96479647
96489648
96499649M68KMAKE_OP(sub, 32, er, d)
96509650{
9651   uint* r_dst = &DX;
9652   uint src = DY;
9653   uint dst = *r_dst;
9654   uint res = dst - src;
9651   UINT32* r_dst = &DX;
9652   UINT32 src = DY;
9653   UINT32 dst = *r_dst;
9654   UINT32 res = dst - src;
96559655
9656   FLAG_N = NFLAG_32(res);
9657   FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
9658   FLAG_V = VFLAG_SUB_32(src, dst, res);
9659   FLAG_Z = MASK_OUT_ABOVE_32(res);
9656   m68k->n_flag = NFLAG_32(res);
9657   m68k->x_flag = m68k->c_flag = CFLAG_SUB_32(src, dst, res);
9658   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
9659   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
96609660
9661   *r_dst = FLAG_Z;
9661   *r_dst = m68k->not_z_flag;
96629662}
96639663
96649664
96659665M68KMAKE_OP(sub, 32, er, a)
96669666{
9667   uint* r_dst = &DX;
9668   uint src = AY;
9669   uint dst = *r_dst;
9670   uint res = dst - src;
9667   UINT32* r_dst = &DX;
9668   UINT32 src = AY;
9669   UINT32 dst = *r_dst;
9670   UINT32 res = dst - src;
96719671
9672   FLAG_N = NFLAG_32(res);
9673   FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
9674   FLAG_V = VFLAG_SUB_32(src, dst, res);
9675   FLAG_Z = MASK_OUT_ABOVE_32(res);
9672   m68k->n_flag = NFLAG_32(res);
9673   m68k->x_flag = m68k->c_flag = CFLAG_SUB_32(src, dst, res);
9674   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
9675   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
96769676
9677   *r_dst = FLAG_Z;
9677   *r_dst = m68k->not_z_flag;
96789678}
96799679
96809680
96819681M68KMAKE_OP(sub, 32, er, .)
96829682{
9683   uint* r_dst = &DX;
9684   uint src = M68KMAKE_GET_OPER_AY_32;
9685   uint dst = *r_dst;
9686   uint res = dst - src;
9683   UINT32* r_dst = &DX;
9684   UINT32 src = M68KMAKE_GET_OPER_AY_32;
9685   UINT32 dst = *r_dst;
9686   UINT32 res = dst - src;
96879687
9688   FLAG_N = NFLAG_32(res);
9689   FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
9690   FLAG_V = VFLAG_SUB_32(src, dst, res);
9691   FLAG_Z = MASK_OUT_ABOVE_32(res);
9688   m68k->n_flag = NFLAG_32(res);
9689   m68k->x_flag = m68k->c_flag = CFLAG_SUB_32(src, dst, res);
9690   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
9691   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
96929692
9693   *r_dst = FLAG_Z;
9693   *r_dst = m68k->not_z_flag;
96949694}
96959695
96969696
96979697M68KMAKE_OP(sub, 8, re, .)
96989698{
9699   uint ea = M68KMAKE_GET_EA_AY_8;
9700   uint src = MASK_OUT_ABOVE_8(DX);
9701   uint dst = m68ki_read_8(ea);
9702   uint res = dst - src;
9699   UINT32 ea = M68KMAKE_GET_EA_AY_8;
9700   UINT32 src = MASK_OUT_ABOVE_8(DX);
9701   UINT32 dst = m68ki_read_8(m68k, ea);
9702   UINT32 res = dst - src;
97039703
9704   FLAG_N = NFLAG_8(res);
9705   FLAG_Z = MASK_OUT_ABOVE_8(res);
9706   FLAG_X = FLAG_C = CFLAG_8(res);
9707   FLAG_V = VFLAG_SUB_8(src, dst, res);
9704   m68k->n_flag = NFLAG_8(res);
9705   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
9706   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
9707   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
97089708
9709   m68ki_write_8(ea, FLAG_Z);
9709   m68ki_write_8(m68k, ea, m68k->not_z_flag);
97109710}
97119711
97129712
97139713M68KMAKE_OP(sub, 16, re, .)
97149714{
9715   uint ea = M68KMAKE_GET_EA_AY_16;
9716   uint src = MASK_OUT_ABOVE_16(DX);
9717   uint dst = m68ki_read_16(ea);
9718   uint res = dst - src;
9715   UINT32 ea = M68KMAKE_GET_EA_AY_16;
9716   UINT32 src = MASK_OUT_ABOVE_16(DX);
9717   UINT32 dst = m68ki_read_16(m68k, ea);
9718   UINT32 res = dst - src;
97199719
9720   FLAG_N = NFLAG_16(res);
9721   FLAG_Z = MASK_OUT_ABOVE_16(res);
9722   FLAG_X = FLAG_C = CFLAG_16(res);
9723   FLAG_V = VFLAG_SUB_16(src, dst, res);
9720   m68k->n_flag = NFLAG_16(res);
9721   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
9722   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
9723   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
97249724
9725   m68ki_write_16(ea, FLAG_Z);
9725   m68ki_write_16(m68k, ea, m68k->not_z_flag);
97269726}
97279727
97289728
97299729M68KMAKE_OP(sub, 32, re, .)
97309730{
9731   uint ea = M68KMAKE_GET_EA_AY_32;
9732   uint src = DX;
9733   uint dst = m68ki_read_32(ea);
9734   uint res = dst - src;
9731   UINT32 ea = M68KMAKE_GET_EA_AY_32;
9732   UINT32 src = DX;
9733   UINT32 dst = m68ki_read_32(m68k, ea);
9734   UINT32 res = dst - src;
97359735
9736   FLAG_N = NFLAG_32(res);
9737   FLAG_Z = MASK_OUT_ABOVE_32(res);
9738   FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
9739   FLAG_V = VFLAG_SUB_32(src, dst, res);
9736   m68k->n_flag = NFLAG_32(res);
9737   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
9738   m68k->x_flag = m68k->c_flag = CFLAG_SUB_32(src, dst, res);
9739   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
97409740
9741   m68ki_write_32(ea, FLAG_Z);
9741   m68ki_write_32(m68k, ea, m68k->not_z_flag);
97429742}
97439743
97449744
97459745M68KMAKE_OP(suba, 16, ., d)
97469746{
9747   uint* r_dst = &AX;
9747   UINT32* r_dst = &AX;
97489748
97499749   *r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(DY));
97509750}
r3535r3536
97529752
97539753M68KMAKE_OP(suba, 16, ., a)
97549754{
9755   uint* r_dst = &AX;
9755   UINT32* r_dst = &AX;
97569756
97579757   *r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(AY));
97589758}
r3535r3536
97609760
97619761M68KMAKE_OP(suba, 16, ., .)
97629762{
9763   uint* r_dst = &AX;
9764   uint src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16);
9763   UINT32* r_dst = &AX;
9764   UINT32 src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16);
97659765
97669766   *r_dst = MASK_OUT_ABOVE_32(*r_dst - src);
97679767}
r3535r3536
97699769
97709770M68KMAKE_OP(suba, 32, ., d)
97719771{
9772   uint* r_dst = &AX;
9772   UINT32* r_dst = &AX;
97739773
97749774   *r_dst = MASK_OUT_ABOVE_32(*r_dst - DY);
97759775}
r3535r3536
97779777
97789778M68KMAKE_OP(suba, 32, ., a)
97799779{
9780   uint* r_dst = &AX;
9780   UINT32* r_dst = &AX;
97819781
97829782   *r_dst = MASK_OUT_ABOVE_32(*r_dst - AY);
97839783}
r3535r3536
97859785
97869786M68KMAKE_OP(suba, 32, ., .)
97879787{
9788   uint* r_dst = &AX;
9789   uint src = M68KMAKE_GET_OPER_AY_32;
9788   UINT32* r_dst = &AX;
9789   UINT32 src = M68KMAKE_GET_OPER_AY_32;
97909790
97919791   *r_dst = MASK_OUT_ABOVE_32(*r_dst - src);
97929792}
r3535r3536
97949794
97959795M68KMAKE_OP(subi, 8, ., d)
97969796{
9797   uint* r_dst = &DY;
9798   uint src = OPER_I_8();
9799   uint dst = MASK_OUT_ABOVE_8(*r_dst);
9800   uint res = dst - src;
9797   UINT32* r_dst = &DY;
9798   UINT32 src = OPER_I_8(m68k);
9799   UINT32 dst = MASK_OUT_ABOVE_8(*r_dst);
9800   UINT32 res = dst - src;
98019801
9802   FLAG_N = NFLAG_8(res);
9803   FLAG_Z = MASK_OUT_ABOVE_8(res);
9804   FLAG_X = FLAG_C = CFLAG_8(res);
9805   FLAG_V = VFLAG_SUB_8(src, dst, res);
9802   m68k->n_flag = NFLAG_8(res);
9803   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
9804   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
9805   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
98069806
9807   *r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
9807   *r_dst = MASK_OUT_BELOW_8(*r_dst) | m68k->not_z_flag;
98089808}
98099809
98109810
98119811M68KMAKE_OP(subi, 8, ., .)
98129812{
9813   uint src = OPER_I_8();
9814   uint ea = M68KMAKE_GET_EA_AY_8;
9815   uint dst = m68ki_read_8(ea);
9816   uint res = dst - src;
9813   UINT32 src = OPER_I_8(m68k);
9814   UINT32 ea = M68KMAKE_GET_EA_AY_8;
9815   UINT32 dst = m68ki_read_8(m68k, ea);
9816   UINT32 res = dst - src;
98179817
9818   FLAG_N = NFLAG_8(res);
9819   FLAG_Z = MASK_OUT_ABOVE_8(res);
9820   FLAG_X = FLAG_C = CFLAG_8(res);
9821   FLAG_V = VFLAG_SUB_8(src, dst, res);
9818   m68k->n_flag = NFLAG_8(res);
9819   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
9820   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
9821   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
98229822
9823   m68ki_write_8(ea, FLAG_Z);
9823   m68ki_write_8(m68k, ea, m68k->not_z_flag);
98249824}
98259825
98269826
98279827M68KMAKE_OP(subi, 16, ., d)
98289828{
9829   uint* r_dst = &DY;
9830   uint src = OPER_I_16();
9831   uint dst = MASK_OUT_ABOVE_16(*r_dst);
9832   uint res = dst - src;
9829   UINT32* r_dst = &DY;
9830   UINT32 src = OPER_I_16(m68k);
9831   UINT32 dst = MASK_OUT_ABOVE_16(*r_dst);
9832   UINT32 res = dst - src;
98339833
9834   FLAG_N = NFLAG_16(res);
9835   FLAG_Z = MASK_OUT_ABOVE_16(res);
9836   FLAG_X = FLAG_C = CFLAG_16(res);
9837   FLAG_V = VFLAG_SUB_16(src, dst, res);
9834   m68k->n_flag = NFLAG_16(res);
9835   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
9836   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
9837   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
98389838
9839   *r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
9839   *r_dst = MASK_OUT_BELOW_16(*r_dst) | m68k->not_z_flag;
98409840}
98419841
98429842
98439843M68KMAKE_OP(subi, 16, ., .)
98449844{
9845   uint src = OPER_I_16();
9846   uint ea = M68KMAKE_GET_EA_AY_16;
9847   uint dst = m68ki_read_16(ea);
9848   uint res = dst - src;
9845   UINT32 src = OPER_I_16(m68k);
9846   UINT32 ea = M68KMAKE_GET_EA_AY_16;
9847   UINT32 dst = m68ki_read_16(m68k, ea);
9848   UINT32 res = dst - src;
98499849
9850   FLAG_N = NFLAG_16(res);
9851   FLAG_Z = MASK_OUT_ABOVE_16(res);
9852   FLAG_X = FLAG_C = CFLAG_16(res);
9853   FLAG_V = VFLAG_SUB_16(src, dst, res);
9850   m68k->n_flag = NFLAG_16(res);
9851   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
9852   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
9853   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
98549854
9855   m68ki_write_16(ea, FLAG_Z);
9855   m68ki_write_16(m68k, ea, m68k->not_z_flag);
98569856}
98579857
98589858
98599859M68KMAKE_OP(subi, 32, ., d)
98609860{
9861   uint* r_dst = &DY;
9862   uint src = OPER_I_32();
9863   uint dst = *r_dst;
9864   uint res = dst - src;
9861   UINT32* r_dst = &DY;
9862   UINT32 src = OPER_I_32(m68k);
9863   UINT32 dst = *r_dst;
9864   UINT32 res = dst - src;
98659865
9866   FLAG_N = NFLAG_32(res);
9867   FLAG_Z = MASK_OUT_ABOVE_32(res);
9868   FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
9869   FLAG_V = VFLAG_SUB_32(src, dst, res);
9866   m68k->n_flag = NFLAG_32(res);
9867   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
9868   m68k->x_flag = m68k->c_flag = CFLAG_SUB_32(src, dst, res);
9869   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
98709870
9871   *r_dst = FLAG_Z;
9871   *r_dst = m68k->not_z_flag;
98729872}
98739873
98749874
98759875M68KMAKE_OP(subi, 32, ., .)
98769876{
9877   uint src = OPER_I_32();
9878   uint ea = M68KMAKE_GET_EA_AY_32;
9879   uint dst = m68ki_read_32(ea);
9880   uint res = dst - src;
9877   UINT32 src = OPER_I_32(m68k);
9878   UINT32 ea = M68KMAKE_GET_EA_AY_32;
9879   UINT32 dst = m68ki_read_32(m68k, ea);
9880   UINT32 res = dst - src;
98819881
9882   FLAG_N = NFLAG_32(res);
9883   FLAG_Z = MASK_OUT_ABOVE_32(res);
9884   FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
9885   FLAG_V = VFLAG_SUB_32(src, dst, res);
9882   m68k->n_flag = NFLAG_32(res);
9883   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
9884   m68k->x_flag = m68k->c_flag = CFLAG_SUB_32(src, dst, res);
9885   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
98869886
9887   m68ki_write_32(ea, FLAG_Z);
9887   m68ki_write_32(m68k, ea, m68k->not_z_flag);
98889888}
98899889
98909890
98919891M68KMAKE_OP(subq, 8, ., d)
98929892{
9893   uint* r_dst = &DY;
9894   uint src = (((REG_IR >> 9) - 1) & 7) + 1;
9895   uint dst = MASK_OUT_ABOVE_8(*r_dst);
9896   uint res = dst - src;
9893   UINT32* r_dst = &DY;
9894   UINT32 src = (((m68k->ir >> 9) - 1) & 7) + 1;
9895   UINT32 dst = MASK_OUT_ABOVE_8(*r_dst);
9896   UINT32 res = dst - src;
98979897
9898   FLAG_N = NFLAG_8(res);
9899   FLAG_Z = MASK_OUT_ABOVE_8(res);
9900   FLAG_X = FLAG_C = CFLAG_8(res);
9901   FLAG_V = VFLAG_SUB_8(src, dst, res);
9898   m68k->n_flag = NFLAG_8(res);
9899   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
9900   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
9901   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
99029902
9903   *r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
9903   *r_dst = MASK_OUT_BELOW_8(*r_dst) | m68k->not_z_flag;
99049904}
99059905
99069906
99079907M68KMAKE_OP(subq, 8, ., .)
99089908{
9909   uint src = (((REG_IR >> 9) - 1) & 7) + 1;
9910   uint ea = M68KMAKE_GET_EA_AY_8;
9911   uint dst = m68ki_read_8(ea);
9912   uint res = dst - src;
9909   UINT32 src = (((m68k->ir >> 9) - 1) & 7) + 1;
9910   UINT32 ea = M68KMAKE_GET_EA_AY_8;
9911   UINT32 dst = m68ki_read_8(m68k, ea);
9912   UINT32 res = dst - src;
99139913
9914   FLAG_N = NFLAG_8(res);
9915   FLAG_Z = MASK_OUT_ABOVE_8(res);
9916   FLAG_X = FLAG_C = CFLAG_8(res);
9917   FLAG_V = VFLAG_SUB_8(src, dst, res);
9914   m68k->n_flag = NFLAG_8(res);
9915   m68k->not_z_flag = MASK_OUT_ABOVE_8(res);
9916   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
9917   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
99189918
9919   m68ki_write_8(ea, FLAG_Z);
9919   m68ki_write_8(m68k, ea, m68k->not_z_flag);
99209920}
99219921
99229922
99239923M68KMAKE_OP(subq, 16, ., d)
99249924{
9925   uint* r_dst = &DY;
9926   uint src = (((REG_IR >> 9) - 1) & 7) + 1;
9927   uint dst = MASK_OUT_ABOVE_16(*r_dst);
9928   uint res = dst - src;
9925   UINT32* r_dst = &DY;
9926   UINT32 src = (((m68k->ir >> 9) - 1) & 7) + 1;
9927   UINT32 dst = MASK_OUT_ABOVE_16(*r_dst);
9928   UINT32 res = dst - src;
99299929
9930   FLAG_N = NFLAG_16(res);
9931   FLAG_Z = MASK_OUT_ABOVE_16(res);
9932   FLAG_X = FLAG_C = CFLAG_16(res);
9933   FLAG_V = VFLAG_SUB_16(src, dst, res);
9930   m68k->n_flag = NFLAG_16(res);
9931   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
9932   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
9933   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
99349934
9935   *r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
9935   *r_dst = MASK_OUT_BELOW_16(*r_dst) | m68k->not_z_flag;
99369936}
99379937
99389938
99399939M68KMAKE_OP(subq, 16, ., a)
99409940{
9941   uint* r_dst = &AY;
9941   UINT32* r_dst = &AY;
99429942
9943   *r_dst = MASK_OUT_ABOVE_32(*r_dst - ((((REG_IR >> 9) - 1) & 7) + 1));
9943   *r_dst = MASK_OUT_ABOVE_32(*r_dst - ((((m68k->ir >> 9) - 1) & 7) + 1));
99449944}
99459945
99469946
99479947M68KMAKE_OP(subq, 16, ., .)
99489948{
9949   uint src = (((REG_IR >> 9) - 1) & 7) + 1;
9950   uint ea = M68KMAKE_GET_EA_AY_16;
9951   uint dst = m68ki_read_16(ea);
9952   uint res = dst - src;
9949   UINT32 src = (((m68k->ir >> 9) - 1) & 7) + 1;
9950   UINT32 ea = M68KMAKE_GET_EA_AY_16;
9951   UINT32 dst = m68ki_read_16(m68k, ea);
9952   UINT32 res = dst - src;
99539953
9954   FLAG_N = NFLAG_16(res);
9955   FLAG_Z = MASK_OUT_ABOVE_16(res);
9956   FLAG_X = FLAG_C = CFLAG_16(res);
9957   FLAG_V = VFLAG_SUB_16(src, dst, res);
9954   m68k->n_flag = NFLAG_16(res);
9955   m68k->not_z_flag = MASK_OUT_ABOVE_16(res);
9956   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
9957   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
99589958
9959   m68ki_write_16(ea, FLAG_Z);
9959   m68ki_write_16(m68k, ea, m68k->not_z_flag);
99609960}
99619961
99629962
99639963M68KMAKE_OP(subq, 32, ., d)
99649964{
9965   uint* r_dst = &DY;
9966   uint src = (((REG_IR >> 9) - 1) & 7) + 1;
9967   uint dst = *r_dst;
9968   uint res = dst - src;
9965   UINT32* r_dst = &DY;
9966   UINT32 src = (((m68k->ir >> 9) - 1) & 7) + 1;
9967   UINT32 dst = *r_dst;
9968   UINT32 res = dst - src;
99699969
9970   FLAG_N = NFLAG_32(res);
9971   FLAG_Z = MASK_OUT_ABOVE_32(res);
9972   FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
9973   FLAG_V = VFLAG_SUB_32(src, dst, res);
9970   m68k->n_flag = NFLAG_32(res);
9971   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
9972   m68k->x_flag = m68k->c_flag = CFLAG_SUB_32(src, dst, res);
9973   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
99749974
9975   *r_dst = FLAG_Z;
9975   *r_dst = m68k->not_z_flag;
99769976}
99779977
99789978
99799979M68KMAKE_OP(subq, 32, ., a)
99809980{
9981   uint* r_dst = &AY;
9981   UINT32* r_dst = &AY;
99829982
9983   *r_dst = MASK_OUT_ABOVE_32(*r_dst - ((((REG_IR >> 9) - 1) & 7) + 1));
9983   *r_dst = MASK_OUT_ABOVE_32(*r_dst - ((((m68k->ir >> 9) - 1) & 7) + 1));
99849984}
99859985
99869986
99879987M68KMAKE_OP(subq, 32, ., .)
99889988{
9989   uint src = (((REG_IR >> 9) - 1) & 7) + 1;
9990   uint ea = M68KMAKE_GET_EA_AY_32;
9991   uint dst = m68ki_read_32(ea);
9992   uint res = dst - src;
9989   UINT32 src = (((m68k->ir >> 9) - 1) & 7) + 1;
9990   UINT32 ea = M68KMAKE_GET_EA_AY_32;
9991   UINT32 dst = m68ki_read_32(m68k, ea);
9992   UINT32 res = dst - src;
99939993
9994   FLAG_N = NFLAG_32(res);
9995   FLAG_Z = MASK_OUT_ABOVE_32(res);
9996   FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
9997   FLAG_V = VFLAG_SUB_32(src, dst, res);
9994   m68k->n_flag = NFLAG_32(res);
9995   m68k->not_z_flag = MASK_OUT_ABOVE_32(res);
9996   m68k->x_flag = m68k->c_flag = CFLAG_SUB_32(src, dst, res);
9997   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
99989998
9999   m68ki_write_32(ea, FLAG_Z);
9999   m68ki_write_32(m68k, ea, m68k->not_z_flag);
1000010000}
1000110001
1000210002
1000310003M68KMAKE_OP(subx, 8, rr, .)
1000410004{
10005   uint* r_dst = &DX;
10006   uint src = MASK_OUT_ABOVE_8(DY);
10007   uint dst = MASK_OUT_ABOVE_8(*r_dst);
10008   uint res = dst - src - XFLAG_AS_1();
10005   UINT32* r_dst = &DX;
10006   UINT32 src = MASK_OUT_ABOVE_8(DY);
10007   UINT32 dst = MASK_OUT_ABOVE_8(*r_dst);
10008   UINT32 res = dst - src - XFLAG_AS_1(m68k);
1000910009
10010   FLAG_N = NFLAG_8(res);
10011   FLAG_X = FLAG_C = CFLAG_8(res);
10012   FLAG_V = VFLAG_SUB_8(src, dst, res);
10010   m68k->n_flag = NFLAG_8(res);
10011   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
10012   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
1001310013
1001410014   res = MASK_OUT_ABOVE_8(res);
10015   FLAG_Z |= res;
10015   m68k->not_z_flag |= res;
1001610016
1001710017   *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
1001810018}
r3535r3536
1002010020
1002110021M68KMAKE_OP(subx, 16, rr, .)
1002210022{
10023   uint* r_dst = &DX;
10024   uint src = MASK_OUT_ABOVE_16(DY);
10025   uint dst = MASK_OUT_ABOVE_16(*r_dst);
10026   uint res = dst - src - XFLAG_AS_1();
10023   UINT32* r_dst = &DX;
10024   UINT32 src = MASK_OUT_ABOVE_16(DY);
10025   UINT32 dst = MASK_OUT_ABOVE_16(*r_dst);
10026   UINT32 res = dst - src - XFLAG_AS_1(m68k);
1002710027
10028   FLAG_N = NFLAG_16(res);
10029   FLAG_X = FLAG_C = CFLAG_16(res);
10030   FLAG_V = VFLAG_SUB_16(src, dst, res);
10028   m68k->n_flag = NFLAG_16(res);
10029   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
10030   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
1003110031
1003210032   res = MASK_OUT_ABOVE_16(res);
10033   FLAG_Z |= res;
10033   m68k->not_z_flag |= res;
1003410034
1003510035   *r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
1003610036}
r3535r3536
1003810038
1003910039M68KMAKE_OP(subx, 32, rr, .)
1004010040{
10041   uint* r_dst = &DX;
10042   uint src = DY;
10043   uint dst = *r_dst;
10044   uint res = dst - src - XFLAG_AS_1();
10041   UINT32* r_dst = &DX;
10042   UINT32 src = DY;
10043   UINT32 dst = *r_dst;
10044   UINT32 res = dst - src - XFLAG_AS_1(m68k);
1004510045
10046   FLAG_N = NFLAG_32(res);
10047   FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
10048   FLAG_V = VFLAG_SUB_32(src, dst, res);
10046   m68k->n_flag = NFLAG_32(res);
10047   m68k->x_flag = m68k->c_flag = CFLAG_SUB_32(src, dst, res);
10048   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
1004910049
1005010050   res = MASK_OUT_ABOVE_32(res);
10051   FLAG_Z |= res;
10051   m68k->not_z_flag |= res;
1005210052
1005310053   *r_dst = res;
1005410054}
r3535r3536
1005610056
1005710057M68KMAKE_OP(subx, 8, mm, ax7)
1005810058{
10059   uint src = OPER_AY_PD_8();
10060   uint ea  = EA_A7_PD_8();
10061   uint dst = m68ki_read_8(ea);
10062   uint res = dst - src - XFLAG_AS_1();
10059   UINT32 src = OPER_AY_PD_8(m68k);
10060   UINT32 ea  = EA_A7_PD_8(m68k);
10061   UINT32 dst = m68ki_read_8(m68k, ea);
10062   UINT32 res = dst - src - XFLAG_AS_1(m68k);
1006310063
10064   FLAG_N = NFLAG_8(res);
10065   FLAG_X = FLAG_C = CFLAG_8(res);
10066   FLAG_V = VFLAG_SUB_8(src, dst, res);
10064   m68k->n_flag = NFLAG_8(res);
10065   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
10066   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
1006710067
1006810068   res = MASK_OUT_ABOVE_8(res);
10069   FLAG_Z |= res;
10069   m68k->not_z_flag |= res;
1007010070
10071   m68ki_write_8(ea, res);
10071   m68ki_write_8(m68k, ea, res);
1007210072}
1007310073
1007410074
1007510075M68KMAKE_OP(subx, 8, mm, ay7)
1007610076{
10077   uint src = OPER_A7_PD_8();
10078   uint ea  = EA_AX_PD_8();
10079   uint dst = m68ki_read_8(ea);
10080   uint res = dst - src - XFLAG_AS_1();
10077   UINT32 src = OPER_A7_PD_8(m68k);
10078   UINT32 ea  = EA_AX_PD_8(m68k);
10079   UINT32 dst = m68ki_read_8(m68k, ea);
10080   UINT32 res = dst - src - XFLAG_AS_1(m68k);
1008110081
10082   FLAG_N = NFLAG_8(res);
10083   FLAG_X = FLAG_C = CFLAG_8(res);
10084   FLAG_V = VFLAG_SUB_8(src, dst, res);
10082   m68k->n_flag = NFLAG_8(res);
10083   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
10084   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
1008510085
1008610086   res = MASK_OUT_ABOVE_8(res);
10087   FLAG_Z |= res;
10087   m68k->not_z_flag |= res;
1008810088
10089   m68ki_write_8(ea, res);
10089   m68ki_write_8(m68k, ea, res);
1009010090}
1009110091
1009210092
1009310093M68KMAKE_OP(subx, 8, mm, axy7)
1009410094{
10095   uint src = OPER_A7_PD_8();
10096   uint ea  = EA_A7_PD_8();
10097   uint dst = m68ki_read_8(ea);
10098   uint res = dst - src - XFLAG_AS_1();
10095   UINT32 src = OPER_A7_PD_8(m68k);
10096   UINT32 ea  = EA_A7_PD_8(m68k);
10097   UINT32 dst = m68ki_read_8(m68k, ea);
10098   UINT32 res = dst - src - XFLAG_AS_1(m68k);
1009910099
10100   FLAG_N = NFLAG_8(res);
10101   FLAG_X = FLAG_C = CFLAG_8(res);
10102   FLAG_V = VFLAG_SUB_8(src, dst, res);
10100   m68k->n_flag = NFLAG_8(res);
10101   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
10102   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
1010310103
1010410104   res = MASK_OUT_ABOVE_8(res);
10105   FLAG_Z |= res;
10105   m68k->not_z_flag |= res;
1010610106
10107   m68ki_write_8(ea, res);
10107   m68ki_write_8(m68k, ea, res);
1010810108}
1010910109
1011010110
1011110111M68KMAKE_OP(subx, 8, mm, .)
1011210112{
10113   uint src = OPER_AY_PD_8();
10114   uint ea  = EA_AX_PD_8();
10115   uint dst = m68ki_read_8(ea);
10116   uint res = dst - src - XFLAG_AS_1();
10113   UINT32 src = OPER_AY_PD_8(m68k);
10114   UINT32 ea  = EA_AX_PD_8(m68k);
10115   UINT32 dst = m68ki_read_8(m68k, ea);
10116   UINT32 res = dst - src - XFLAG_AS_1(m68k);
1011710117
10118   FLAG_N = NFLAG_8(res);
10119   FLAG_X = FLAG_C = CFLAG_8(res);
10120   FLAG_V = VFLAG_SUB_8(src, dst, res);
10118   m68k->n_flag = NFLAG_8(res);
10119   m68k->x_flag = m68k->c_flag = CFLAG_8(res);
10120   m68k->v_flag = VFLAG_SUB_8(src, dst, res);
1012110121
1012210122   res = MASK_OUT_ABOVE_8(res);
10123   FLAG_Z |= res;
10123   m68k->not_z_flag |= res;
1012410124
10125   m68ki_write_8(ea, res);
10125   m68ki_write_8(m68k, ea, res);
1012610126}
1012710127
1012810128
1012910129M68KMAKE_OP(subx, 16, mm, .)
1013010130{
10131   uint src = OPER_AY_PD_16();
10132   uint ea  = EA_AX_PD_16();
10133   uint dst = m68ki_read_16(ea);
10134   uint res = dst - src - XFLAG_AS_1();
10131   UINT32 src = OPER_AY_PD_16(m68k);
10132   UINT32 ea  = EA_AX_PD_16(m68k);
10133   UINT32 dst = m68ki_read_16(m68k, ea);
10134   UINT32 res = dst - src - XFLAG_AS_1(m68k);
1013510135
10136   FLAG_N = NFLAG_16(res);
10137   FLAG_X = FLAG_C = CFLAG_16(res);
10138   FLAG_V = VFLAG_SUB_16(src, dst, res);
10136   m68k->n_flag = NFLAG_16(res);
10137   m68k->x_flag = m68k->c_flag = CFLAG_16(res);
10138   m68k->v_flag = VFLAG_SUB_16(src, dst, res);
1013910139
1014010140   res = MASK_OUT_ABOVE_16(res);
10141   FLAG_Z |= res;
10141   m68k->not_z_flag |= res;
1014210142
10143   m68ki_write_16(ea, res);
10143   m68ki_write_16(m68k, ea, res);
1014410144}
1014510145
1014610146
1014710147M68KMAKE_OP(subx, 32, mm, .)
1014810148{
10149   uint src = OPER_AY_PD_32();
10150   uint ea  = EA_AX_PD_32();
10151   uint dst = m68ki_read_32(ea);
10152   uint res = dst - src - XFLAG_AS_1();
10149   UINT32 src = OPER_AY_PD_32(m68k);
10150   UINT32 ea  = EA_AX_PD_32(m68k);
10151   UINT32 dst = m68ki_read_32(m68k, ea);
10152   UINT32 res = dst - src - XFLAG_AS_1(m68k);
1015310153
10154   FLAG_N = NFLAG_32(res);
10155   FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
10156   FLAG_V = VFLAG_SUB_32(src, dst, res);
10154   m68k->n_flag = NFLAG_32(res);
10155   m68k->x_flag = m68k->c_flag = CFLAG_SUB_32(src, dst, res);
10156   m68k->v_flag = VFLAG_SUB_32(src, dst, res);
1015710157
1015810158   res = MASK_OUT_ABOVE_32(res);
10159   FLAG_Z |= res;
10159   m68k->not_z_flag |= res;
1016010160
10161   m68ki_write_32(ea, res);
10161   m68ki_write_32(m68k, ea, res);
1016210162}
1016310163
1016410164
1016510165M68KMAKE_OP(swap, 32, ., .)
1016610166{
10167   uint* r_dst = &DY;
10167   UINT32* r_dst = &DY;
1016810168
10169   FLAG_Z = MASK_OUT_ABOVE_32(*r_dst<<16);
10170   *r_dst = (*r_dst>>16) | FLAG_Z;
10169   m68k->not_z_flag = MASK_OUT_ABOVE_32(*r_dst<<16);
10170   *r_dst = (*r_dst>>16) | m68k->not_z_flag;
1017110171
10172   FLAG_Z = *r_dst;
10173   FLAG_N = NFLAG_32(*r_dst);
10174   FLAG_C = CFLAG_CLEAR;
10175   FLAG_V = VFLAG_CLEAR;
10172   m68k->not_z_flag = *r_dst;
10173   m68k->n_flag = NFLAG_32(*r_dst);
10174   m68k->c_flag = CFLAG_CLEAR;
10175   m68k->v_flag = VFLAG_CLEAR;
1017610176}
1017710177
1017810178
1017910179M68KMAKE_OP(tas, 8, ., d)
1018010180{
10181   uint* r_dst = &DY;
10181   UINT32* r_dst = &DY;
1018210182
10183   FLAG_Z = MASK_OUT_ABOVE_8(*r_dst);
10184   FLAG_N = NFLAG_8(*r_dst);
10185   FLAG_V = VFLAG_CLEAR;
10186   FLAG_C = CFLAG_CLEAR;
10183   m68k->not_z_flag = MASK_OUT_ABOVE_8(*r_dst);
10184   m68k->n_flag = NFLAG_8(*r_dst);
10185   m68k->v_flag = VFLAG_CLEAR;
10186   m68k->c_flag = CFLAG_CLEAR;
1018710187   *r_dst |= 0x80;
1018810188}
1018910189
1019010190
1019110191M68KMAKE_OP(tas, 8, ., .)
1019210192{
10193   uint ea = M68KMAKE_GET_EA_AY_8;
10194   uint dst = m68ki_read_8(ea);
10195   uint allow_writeback;
10193   UINT32 ea = M68KMAKE_GET_EA_AY_8;
10194   UINT32 dst = m68ki_read_8(m68k, ea);
10195   UINT32 allow_writeback;
1019610196
10197   FLAG_Z = dst;
10198   FLAG_N = NFLAG_8(dst);
10199   FLAG_V = VFLAG_CLEAR;
10200   FLAG_C = CFLAG_CLEAR;
10197   m68k->not_z_flag = dst;
10198   m68k->n_flag = NFLAG_8(dst);
10199   m68k->v_flag = VFLAG_CLEAR;
10200   m68k->c_flag = CFLAG_CLEAR;
1020110201
1020210202   /* The Genesis/Megadrive games Gargoyles and Ex-Mutants need the TAS writeback
1020310203       disabled in order to function properly.  Some Amiga software may also rely
1020410204       on this, but only when accessing specific addresses so additional functionality
1020510205       will be needed. */
10206   allow_writeback = m68ki_tas_callback();
10206   allow_writeback = (*m68k->tas_instr_callback)();
1020710207
10208   if (allow_writeback==1) m68ki_write_8(ea, dst | 0x80);
10208   if (allow_writeback==1) m68ki_write_8(m68k, ea, dst | 0x80);
1020910209}
1021010210
1021110211
1021210212M68KMAKE_OP(trap, 0, ., .)
1021310213{
1021410214   /* Trap#n stacks exception frame type 0 */
10215   m68ki_exception_trapN(EXCEPTION_TRAP_BASE + (REG_IR & 0xf));   /* HJB 990403 */
10215   m68ki_exception_trapN(m68k, EXCEPTION_TRAP_BASE + (m68k->ir & 0xf));   /* HJB 990403 */
1021610216}
1021710217
1021810218
1021910219M68KMAKE_OP(trapt, 0, ., .)
1022010220{
10221   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10221   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1022210222   {
10223      m68ki_exception_trap(EXCEPTION_TRAPV);   /* HJB 990403 */
10223      m68ki_exception_trap(m68k, EXCEPTION_TRAPV);   /* HJB 990403 */
1022410224      return;
1022510225   }
10226   m68ki_exception_illegal();
10226   m68ki_exception_illegal(m68k);
1022710227}
1022810228
1022910229
1023010230M68KMAKE_OP(trapt, 16, ., .)
1023110231{
10232   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10232   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1023310233   {
10234      m68ki_exception_trap(EXCEPTION_TRAPV);   /* HJB 990403 */
10234      m68ki_exception_trap(m68k, EXCEPTION_TRAPV);   /* HJB 990403 */
1023510235      return;
1023610236   }
10237   m68ki_exception_illegal();
10237   m68ki_exception_illegal(m68k);
1023810238}
1023910239
1024010240
1024110241M68KMAKE_OP(trapt, 32, ., .)
1024210242{
10243   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10243   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1024410244   {
10245      m68ki_exception_trap(EXCEPTION_TRAPV);   /* HJB 990403 */
10245      m68ki_exception_trap(m68k, EXCEPTION_TRAPV);   /* HJB 990403 */
1024610246      return;
1024710247   }
10248   m68ki_exception_illegal();
10248   m68ki_exception_illegal(m68k);
1024910249}
1025010250
1025110251
1025210252M68KMAKE_OP(trapf, 0, ., .)
1025310253{
10254   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10254   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1025510255   {
1025610256      return;
1025710257   }
10258   m68ki_exception_illegal();
10258   m68ki_exception_illegal(m68k);
1025910259}
1026010260
1026110261
1026210262M68KMAKE_OP(trapf, 16, ., .)
1026310263{
10264   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10264   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1026510265   {
1026610266      REG_PC += 2;
1026710267      return;
1026810268   }
10269   m68ki_exception_illegal();
10269   m68ki_exception_illegal(m68k);
1027010270}
1027110271
1027210272
1027310273M68KMAKE_OP(trapf, 32, ., .)
1027410274{
10275   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10275   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1027610276   {
1027710277      REG_PC += 4;
1027810278      return;
1027910279   }
10280   m68ki_exception_illegal();
10280   m68ki_exception_illegal(m68k);
1028110281}
1028210282
1028310283
1028410284M68KMAKE_OP(trapcc, 0, ., .)
1028510285{
10286   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10286   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1028710287   {
1028810288      if(M68KMAKE_CC)
10289         m68ki_exception_trap(EXCEPTION_TRAPV);   /* HJB 990403 */
10289         m68ki_exception_trap(m68k, EXCEPTION_TRAPV);   /* HJB 990403 */
1029010290      return;
1029110291   }
10292   m68ki_exception_illegal();
10292   m68ki_exception_illegal(m68k);
1029310293}
1029410294
1029510295
1029610296M68KMAKE_OP(trapcc, 16, ., .)
1029710297{
10298   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10298   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1029910299   {
1030010300      if(M68KMAKE_CC)
1030110301      {
10302         m68ki_exception_trap(EXCEPTION_TRAPV);   /* HJB 990403 */
10302         m68ki_exception_trap(m68k, EXCEPTION_TRAPV);   /* HJB 990403 */
1030310303         return;
1030410304      }
1030510305      REG_PC += 2;
1030610306      return;
1030710307   }
10308   m68ki_exception_illegal();
10308   m68ki_exception_illegal(m68k);
1030910309}
1031010310
1031110311
1031210312M68KMAKE_OP(trapcc, 32, ., .)
1031310313{
10314   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10314   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1031510315   {
1031610316      if(M68KMAKE_CC)
1031710317      {
10318         m68ki_exception_trap(EXCEPTION_TRAPV);   /* HJB 990403 */
10318         m68ki_exception_trap(m68k, EXCEPTION_TRAPV);   /* HJB 990403 */
1031910319         return;
1032010320      }
1032110321      REG_PC += 4;
1032210322      return;
1032310323   }
10324   m68ki_exception_illegal();
10324   m68ki_exception_illegal(m68k);
1032510325}
1032610326
1032710327
1032810328M68KMAKE_OP(trapv, 0, ., .)
1032910329{
10330   if(COND_VC())
10330   if(COND_VC(m68k))
1033110331   {
1033210332      return;
1033310333   }
10334   m68ki_exception_trap(EXCEPTION_TRAPV);  /* HJB 990403 */
10334   m68ki_exception_trap(m68k, EXCEPTION_TRAPV);  /* HJB 990403 */
1033510335}
1033610336
1033710337
1033810338M68KMAKE_OP(tst, 8, ., d)
1033910339{
10340   uint res = MASK_OUT_ABOVE_8(DY);
10340   UINT32 res = MASK_OUT_ABOVE_8(DY);
1034110341
10342   FLAG_N = NFLAG_8(res);
10343   FLAG_Z = res;
10344   FLAG_V = VFLAG_CLEAR;
10345   FLAG_C = CFLAG_CLEAR;
10342   m68k->n_flag = NFLAG_8(res);
10343   m68k->not_z_flag = res;
10344   m68k->v_flag = VFLAG_CLEAR;
10345   m68k->c_flag = CFLAG_CLEAR;
1034610346}
1034710347
1034810348
1034910349M68KMAKE_OP(tst, 8, ., .)
1035010350{
10351   uint res = M68KMAKE_GET_OPER_AY_8;
10351   UINT32 res = M68KMAKE_GET_OPER_AY_8;
1035210352
10353   FLAG_N = NFLAG_8(res);
10354   FLAG_Z = res;
10355   FLAG_V = VFLAG_CLEAR;
10356   FLAG_C = CFLAG_CLEAR;
10353   m68k->n_flag = NFLAG_8(res);
10354   m68k->not_z_flag = res;
10355   m68k->v_flag = VFLAG_CLEAR;
10356   m68k->c_flag = CFLAG_CLEAR;
1035710357}
1035810358
1035910359
1036010360M68KMAKE_OP(tst, 8, ., pcdi)
1036110361{
10362   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10362   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1036310363   {
10364      uint res = OPER_PCDI_8();
10364      UINT32 res = OPER_PCDI_8(m68k);
1036510365
10366      FLAG_N = NFLAG_8(res);
10367      FLAG_Z = res;
10368      FLAG_V = VFLAG_CLEAR;
10369      FLAG_C = CFLAG_CLEAR;
10366      m68k->n_flag = NFLAG_8(res);
10367      m68k->not_z_flag = res;
10368      m68k->v_flag = VFLAG_CLEAR;
10369      m68k->c_flag = CFLAG_CLEAR;
1037010370      return;
1037110371   }
10372   m68ki_exception_illegal();
10372   m68ki_exception_illegal(m68k);
1037310373}
1037410374
1037510375
1037610376M68KMAKE_OP(tst, 8, ., pcix)
1037710377{
10378   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10378   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1037910379   {
10380      uint res = OPER_PCIX_8();
10380      UINT32 res = OPER_PCIX_8(m68k);
1038110381
10382      FLAG_N = NFLAG_8(res);
10383      FLAG_Z = res;
10384      FLAG_V = VFLAG_CLEAR;
10385      FLAG_C = CFLAG_CLEAR;
10382      m68k->n_flag = NFLAG_8(res);
10383      m68k->not_z_flag = res;
10384      m68k->v_flag = VFLAG_CLEAR;
10385      m68k->c_flag = CFLAG_CLEAR;
1038610386      return;
1038710387   }
10388   m68ki_exception_illegal();
10388   m68ki_exception_illegal(m68k);
1038910389}
1039010390
1039110391
1039210392M68KMAKE_OP(tst, 8, ., i)
1039310393{
10394   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10394   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1039510395   {
10396      uint res = OPER_I_8();
10396      UINT32 res = OPER_I_8(m68k);
1039710397
10398      FLAG_N = NFLAG_8(res);
10399      FLAG_Z = res;
10400      FLAG_V = VFLAG_CLEAR;
10401      FLAG_C = CFLAG_CLEAR;
10398      m68k->n_flag = NFLAG_8(res);
10399      m68k->not_z_flag = res;
10400      m68k->v_flag = VFLAG_CLEAR;
10401      m68k->c_flag = CFLAG_CLEAR;
1040210402      return;
1040310403   }
10404   m68ki_exception_illegal();
10404   m68ki_exception_illegal(m68k);
1040510405}
1040610406
1040710407
1040810408M68KMAKE_OP(tst, 16, ., d)
1040910409{
10410   uint res = MASK_OUT_ABOVE_16(DY);
10410   UINT32 res = MASK_OUT_ABOVE_16(DY);
1041110411
10412   FLAG_N = NFLAG_16(res);
10413   FLAG_Z = res;
10414   FLAG_V = VFLAG_CLEAR;
10415   FLAG_C = CFLAG_CLEAR;
10412   m68k->n_flag = NFLAG_16(res);
10413   m68k->not_z_flag = res;
10414   m68k->v_flag = VFLAG_CLEAR;
10415   m68k->c_flag = CFLAG_CLEAR;
1041610416}
1041710417
1041810418
1041910419M68KMAKE_OP(tst, 16, ., a)
1042010420{
10421   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10421   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1042210422   {
10423      uint res = MAKE_INT_16(AY);
10423      UINT32 res = MAKE_INT_16(AY);
1042410424
10425      FLAG_N = NFLAG_16(res);
10426      FLAG_Z = res;
10427      FLAG_V = VFLAG_CLEAR;
10428      FLAG_C = CFLAG_CLEAR;
10425      m68k->n_flag = NFLAG_16(res);
10426      m68k->not_z_flag = res;
10427      m68k->v_flag = VFLAG_CLEAR;
10428      m68k->c_flag = CFLAG_CLEAR;
1042910429      return;
1043010430   }
10431   m68ki_exception_illegal();
10431   m68ki_exception_illegal(m68k);
1043210432}
1043310433
1043410434
1043510435M68KMAKE_OP(tst, 16, ., .)
1043610436{
10437   uint res = M68KMAKE_GET_OPER_AY_16;
10437   UINT32 res = M68KMAKE_GET_OPER_AY_16;
1043810438
10439   FLAG_N = NFLAG_16(res);
10440   FLAG_Z = res;
10441   FLAG_V = VFLAG_CLEAR;
10442   FLAG_C = CFLAG_CLEAR;
10439   m68k->n_flag = NFLAG_16(res);
10440   m68k->not_z_flag = res;
10441   m68k->v_flag = VFLAG_CLEAR;
10442   m68k->c_flag = CFLAG_CLEAR;
1044310443}
1044410444
1044510445
1044610446M68KMAKE_OP(tst, 16, ., pcdi)
1044710447{
10448   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10448   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1044910449   {
10450      uint res = OPER_PCDI_16();
10450      UINT32 res = OPER_PCDI_16(m68k);
1045110451
10452      FLAG_N = NFLAG_16(res);
10453      FLAG_Z = res;
10454      FLAG_V = VFLAG_CLEAR;
10455      FLAG_C = CFLAG_CLEAR;
10452      m68k->n_flag = NFLAG_16(res);
10453      m68k->not_z_flag = res;
10454      m68k->v_flag = VFLAG_CLEAR;
10455      m68k->c_flag = CFLAG_CLEAR;
1045610456      return;
1045710457   }
10458   m68ki_exception_illegal();
10458   m68ki_exception_illegal(m68k);
1045910459}
1046010460
1046110461
1046210462M68KMAKE_OP(tst, 16, ., pcix)
1046310463{
10464   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10464   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1046510465   {
10466      uint res = OPER_PCIX_16();
10466      UINT32 res = OPER_PCIX_16(m68k);
1046710467
10468      FLAG_N = NFLAG_16(res);
10469      FLAG_Z = res;
10470      FLAG_V = VFLAG_CLEAR;
10471      FLAG_C = CFLAG_CLEAR;
10468      m68k->n_flag = NFLAG_16(res);
10469      m68k->not_z_flag = res;
10470      m68k->v_flag = VFLAG_CLEAR;
10471      m68k->c_flag = CFLAG_CLEAR;
1047210472      return;
1047310473   }
10474   m68ki_exception_illegal();
10474   m68ki_exception_illegal(m68k);
1047510475}
1047610476
1047710477
1047810478M68KMAKE_OP(tst, 16, ., i)
1047910479{
10480   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10480   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1048110481   {
10482      uint res = OPER_I_16();
10482      UINT32 res = OPER_I_16(m68k);
1048310483
10484      FLAG_N = NFLAG_16(res);
10485      FLAG_Z = res;
10486      FLAG_V = VFLAG_CLEAR;
10487      FLAG_C = CFLAG_CLEAR;
10484      m68k->n_flag = NFLAG_16(res);
10485      m68k->not_z_flag = res;
10486      m68k->v_flag = VFLAG_CLEAR;
10487      m68k->c_flag = CFLAG_CLEAR;
1048810488      return;
1048910489   }
10490   m68ki_exception_illegal();
10490   m68ki_exception_illegal(m68k);
1049110491}
1049210492
1049310493
1049410494M68KMAKE_OP(tst, 32, ., d)
1049510495{
10496   uint res = DY;
10496   UINT32 res = DY;
1049710497
10498   FLAG_N = NFLAG_32(res);
10499   FLAG_Z = res;
10500   FLAG_V = VFLAG_CLEAR;
10501   FLAG_C = CFLAG_CLEAR;
10498   m68k->n_flag = NFLAG_32(res);
10499   m68k->not_z_flag = res;
10500   m68k->v_flag = VFLAG_CLEAR;
10501   m68k->c_flag = CFLAG_CLEAR;
1050210502}
1050310503
1050410504
1050510505M68KMAKE_OP(tst, 32, ., a)
1050610506{
10507   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10507   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1050810508   {
10509      uint res = AY;
10509      UINT32 res = AY;
1051010510
10511      FLAG_N = NFLAG_32(res);
10512      FLAG_Z = res;
10513      FLAG_V = VFLAG_CLEAR;
10514      FLAG_C = CFLAG_CLEAR;
10511      m68k->n_flag = NFLAG_32(res);
10512      m68k->not_z_flag = res;
10513      m68k->v_flag = VFLAG_CLEAR;
10514      m68k->c_flag = CFLAG_CLEAR;
1051510515      return;
1051610516   }
10517   m68ki_exception_illegal();
10517   m68ki_exception_illegal(m68k);
1051810518}
1051910519
1052010520
1052110521M68KMAKE_OP(tst, 32, ., .)
1052210522{
10523   uint res = M68KMAKE_GET_OPER_AY_32;
10523   UINT32 res = M68KMAKE_GET_OPER_AY_32;
1052410524
10525   FLAG_N = NFLAG_32(res);
10526   FLAG_Z = res;
10527   FLAG_V = VFLAG_CLEAR;
10528   FLAG_C = CFLAG_CLEAR;
10525   m68k->n_flag = NFLAG_32(res);
10526   m68k->not_z_flag = res;
10527   m68k->v_flag = VFLAG_CLEAR;
10528   m68k->c_flag = CFLAG_CLEAR;
1052910529}
1053010530
1053110531
1053210532M68KMAKE_OP(tst, 32, ., pcdi)
1053310533{
10534   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10534   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1053510535   {
10536      uint res = OPER_PCDI_32();
10536      UINT32 res = OPER_PCDI_32(m68k);
1053710537
10538      FLAG_N = NFLAG_32(res);
10539      FLAG_Z = res;
10540      FLAG_V = VFLAG_CLEAR;
10541      FLAG_C = CFLAG_CLEAR;
10538      m68k->n_flag = NFLAG_32(res);
10539      m68k->not_z_flag = res;
10540      m68k->v_flag = VFLAG_CLEAR;
10541      m68k->c_flag = CFLAG_CLEAR;
1054210542      return;
1054310543   }
10544   m68ki_exception_illegal();
10544   m68ki_exception_illegal(m68k);
1054510545}
1054610546
1054710547
1054810548M68KMAKE_OP(tst, 32, ., pcix)
1054910549{
10550   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10550   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1055110551   {
10552      uint res = OPER_PCIX_32();
10552      UINT32 res = OPER_PCIX_32(m68k);
1055310553
10554      FLAG_N = NFLAG_32(res);
10555      FLAG_Z = res;
10556      FLAG_V = VFLAG_CLEAR;
10557      FLAG_C = CFLAG_CLEAR;
10554      m68k->n_flag = NFLAG_32(res);
10555      m68k->not_z_flag = res;
10556      m68k->v_flag = VFLAG_CLEAR;
10557      m68k->c_flag = CFLAG_CLEAR;
1055810558      return;
1055910559   }
10560   m68ki_exception_illegal();
10560   m68ki_exception_illegal(m68k);
1056110561}
1056210562
1056310563
1056410564M68KMAKE_OP(tst, 32, ., i)
1056510565{
10566   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10566   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1056710567   {
10568      uint res = OPER_I_32();
10568      UINT32 res = OPER_I_32(m68k);
1056910569
10570      FLAG_N = NFLAG_32(res);
10571      FLAG_Z = res;
10572      FLAG_V = VFLAG_CLEAR;
10573      FLAG_C = CFLAG_CLEAR;
10570      m68k->n_flag = NFLAG_32(res);
10571      m68k->not_z_flag = res;
10572      m68k->v_flag = VFLAG_CLEAR;
10573      m68k->c_flag = CFLAG_CLEAR;
1057410574      return;
1057510575   }
10576   m68ki_exception_illegal();
10576   m68ki_exception_illegal(m68k);
1057710577}
1057810578
1057910579
1058010580M68KMAKE_OP(unlk, 32, ., a7)
1058110581{
10582   REG_A[7] = m68ki_read_32(REG_A[7]);
10582   REG_A[7] = m68ki_read_32(m68k, REG_A[7]);
1058310583}
1058410584
1058510585
1058610586M68KMAKE_OP(unlk, 32, ., .)
1058710587{
10588   uint* r_dst = &AY;
10588   UINT32* r_dst = &AY;
1058910589
1059010590   REG_A[7] = *r_dst;
10591   *r_dst = m68ki_pull_32();
10591   *r_dst = m68ki_pull_32(m68k);
1059210592}
1059310593
1059410594
1059510595M68KMAKE_OP(unpk, 16, rr, .)
1059610596{
10597   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10597   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1059810598   {
1059910599      /* Note: DX and DY are reversed in Motorola's docs */
10600      uint src = DY;
10601      uint* r_dst = &DX;
10600      UINT32 src = DY;
10601      UINT32* r_dst = &DX;
1060210602
10603      *r_dst = MASK_OUT_BELOW_16(*r_dst) | (((((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16()) & 0xffff);
10603      *r_dst = MASK_OUT_BELOW_16(*r_dst) | (((((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(m68k)) & 0xffff);
1060410604      return;
1060510605   }
10606   m68ki_exception_illegal();
10606   m68ki_exception_illegal(m68k);
1060710607}
1060810608
1060910609
1061010610M68KMAKE_OP(unpk, 16, mm, ax7)
1061110611{
10612   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10612   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1061310613   {
1061410614      /* Note: AX and AY are reversed in Motorola's docs */
10615      uint src = OPER_AY_PD_8();
10616      uint ea_dst;
10615      UINT32 src = OPER_AY_PD_8(m68k);
10616      UINT32 ea_dst;
1061710617
10618      src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16();
10619      ea_dst = EA_A7_PD_8();
10620      m68ki_write_8(ea_dst, (src >> 8) & 0xff);
10621      ea_dst = EA_A7_PD_8();
10622      m68ki_write_8(ea_dst, src & 0xff);
10618      src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(m68k);
10619      ea_dst = EA_A7_PD_8(m68k);
10620      m68ki_write_8(m68k, ea_dst, (src >> 8) & 0xff);
10621      ea_dst = EA_A7_PD_8(m68k);
10622      m68ki_write_8(m68k, ea_dst, src & 0xff);
1062310623      return;
1062410624   }
10625   m68ki_exception_illegal();
10625   m68ki_exception_illegal(m68k);
1062610626}
1062710627
1062810628
1062910629M68KMAKE_OP(unpk, 16, mm, ay7)
1063010630{
10631   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10631   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1063210632   {
1063310633      /* Note: AX and AY are reversed in Motorola's docs */
10634      uint src = OPER_A7_PD_8();
10635      uint ea_dst;
10634      UINT32 src = OPER_A7_PD_8(m68k);
10635      UINT32 ea_dst;
1063610636
10637      src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16();
10638      ea_dst = EA_AX_PD_8();
10639      m68ki_write_8(ea_dst, (src >> 8) & 0xff);
10640      ea_dst = EA_AX_PD_8();
10641      m68ki_write_8(ea_dst, src & 0xff);
10637      src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(m68k);
10638      ea_dst = EA_AX_PD_8(m68k);
10639      m68ki_write_8(m68k, ea_dst, (src >> 8) & 0xff);
10640      ea_dst = EA_AX_PD_8(m68k);
10641      m68ki_write_8(m68k, ea_dst, src & 0xff);
1064210642      return;
1064310643   }
10644   m68ki_exception_illegal();
10644   m68ki_exception_illegal(m68k);
1064510645}
1064610646
1064710647
1064810648M68KMAKE_OP(unpk, 16, mm, axy7)
1064910649{
10650   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10650   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1065110651   {
10652      uint src = OPER_A7_PD_8();
10653      uint ea_dst;
10652      UINT32 src = OPER_A7_PD_8(m68k);
10653      UINT32 ea_dst;
1065410654
10655      src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16();
10656      ea_dst = EA_A7_PD_8();
10657      m68ki_write_8(ea_dst, (src >> 8) & 0xff);
10658      ea_dst = EA_A7_PD_8();
10659      m68ki_write_8(ea_dst, src & 0xff);
10655      src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(m68k);
10656      ea_dst = EA_A7_PD_8(m68k);
10657      m68ki_write_8(m68k, ea_dst, (src >> 8) & 0xff);
10658      ea_dst = EA_A7_PD_8(m68k);
10659      m68ki_write_8(m68k, ea_dst, src & 0xff);
1066010660      return;
1066110661   }
10662   m68ki_exception_illegal();
10662   m68ki_exception_illegal(m68k);
1066310663}
1066410664
1066510665
1066610666M68KMAKE_OP(unpk, 16, mm, .)
1066710667{
10668   if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
10668   if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type))
1066910669   {
1067010670      /* Note: AX and AY are reversed in Motorola's docs */
10671      uint src = OPER_AY_PD_8();
10672      uint ea_dst;
10671      UINT32 src = OPER_AY_PD_8(m68k);
10672      UINT32 ea_dst;
1067310673
10674      src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16();
10675      ea_dst = EA_AX_PD_8();
10676      m68ki_write_8(ea_dst, (src >> 8) & 0xff);
10677      ea_dst = EA_AX_PD_8();
10678      m68ki_write_8(ea_dst, src & 0xff);
10674      src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(m68k);
10675      ea_dst = EA_AX_PD_8(m68k);
10676      m68ki_write_8(m68k, ea_dst, (src >> 8) & 0xff);
10677      ea_dst = EA_AX_PD_8(m68k);
10678      m68ki_write_8(m68k, ea_dst, src & 0xff);
1067910679      return;
1068010680   }
10681   m68ki_exception_illegal();
10681   m68ki_exception_illegal(m68k);
1068210682}
1068310683
1068410684
src/emu/cpu/m68000/m68kcpu.c
r3535r3536
3232/* ================================ INCLUDES ============================== */
3333/* ======================================================================== */
3434
35extern void m68040_fpu_op0(void);
36extern void m68040_fpu_op1(void);
37
38#include "m68kops.h"
35#include <setjmp.h>
3936#include "m68kcpu.h"
37#include "m68kops.h"
4038#include "m68kfpu.c"
4139
40extern void m68040_fpu_op0(m68ki_cpu_core *m68k);
41extern void m68040_fpu_op1(m68ki_cpu_core *m68k);
42
4243/* ======================================================================== */
4344/* ================================= DATA ================================= */
4445/* ======================================================================== */
4546
46int  m68ki_initial_cycles;
47int  m68ki_remaining_cycles = 0;                     /* Number of clocks remaining */
48uint m68ki_tracing = 0;
49uint m68ki_address_space;
50
5147#ifdef M68K_LOG_ENABLE
5248const char *const m68ki_cpu_names[] =
5349{
r3535r3536
7167};
7268#endif /* M68K_LOG_ENABLE */
7369
74/* The CPU core */
75m68ki_cpu_core m68ki_cpu = {0};
76
77#if M68K_EMULATE_ADDRESS_ERROR
78jmp_buf m68ki_aerr_trap;
79#endif /* M68K_EMULATE_ADDRESS_ERROR */
80
81uint    m68ki_aerr_address;
82uint    m68ki_aerr_write_mode;
83uint    m68ki_aerr_fc;
84
8570/* Used by shift & rotate instructions */
86const uint8 m68ki_shift_8_table[65] =
71const UINT8 m68ki_shift_8_table[65] =
8772{
8873   0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff,
8974   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
r3535r3536
9277   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
9378   0xff, 0xff, 0xff, 0xff, 0xff
9479};
95const uint16 m68ki_shift_16_table[65] =
80const UINT16 m68ki_shift_16_table[65] =
9681{
9782   0x0000, 0x8000, 0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00, 0xff00,
9883   0xff80, 0xffc0, 0xffe0, 0xfff0, 0xfff8, 0xfffc, 0xfffe, 0xffff, 0xffff,
r3535r3536
10388   0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
10489   0xffff, 0xffff
10590};
106const uint m68ki_shift_32_table[65] =
91const UINT32 m68ki_shift_32_table[65] =
10792{
10893   0x00000000, 0x80000000, 0xc0000000, 0xe0000000, 0xf0000000, 0xf8000000,
10994   0xfc000000, 0xfe000000, 0xff000000, 0xff800000, 0xffc00000, 0xffe00000,
r3535r3536
122107/* Number of clock cycles to use for exception processing.
123108 * I used 4 for any vectors that are undocumented for processing times.
124109 */
125const uint8 m68ki_exception_cycle_table[4][256] =
110const UINT8 m68ki_exception_cycle_table[4][256] =
126111{
127112   { /* 000 */
128113        4, /*  0: Reset - Initial Stack Pointer                      */
r3535r3536
418403   }
419404};
420405
421const uint8 m68ki_ea_idx_cycle_table[64] =
406const UINT8 m68ki_ea_idx_cycle_table[64] =
422407{
423408    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
424409    0, /* ..01.000 no memory indirect, base NULL             */
r3535r3536
450435
451436/* Interrupt acknowledge */
452437static int default_int_ack_callback_data;
453static int default_int_ack_callback(int int_level)
438static int default_int_ack_callback(void *param, int int_level)
454439{
440   m68ki_cpu_core *m68k = param;
455441   default_int_ack_callback_data = int_level;
456   CPU_INT_LEVEL = 0;
442   m68k->int_level = 0;
457443   return M68K_INT_ACK_AUTOVECTOR;
458444}
459445
460446/* Breakpoint acknowledge */
461static unsigned int default_bkpt_ack_callback_data;
462447static void default_bkpt_ack_callback(unsigned int data)
463448{
464   default_bkpt_ack_callback_data = data;
465449}
466450
467451/* Called when a reset instruction is executed */
r3535r3536
505489}
506490
507491
508#if M68K_EMULATE_ADDRESS_ERROR
509   #include <setjmp.h>
510   jmp_buf m68ki_aerr_trap;
511#endif /* M68K_EMULATE_ADDRESS_ERROR */
512
513
514492/* ======================================================================== */
515493/* ================================= API ================================== */
516494/* ======================================================================== */
517495
518496/* Access the internals of the CPU */
519unsigned int m68k_get_reg(void* context, m68k_register_t regnum)
497unsigned int m68k_get_reg(m68ki_cpu_core *m68k, m68k_register_t regnum)
520498{
521   m68ki_cpu_core* cpu = context != NULL ?(m68ki_cpu_core*)context : &m68ki_cpu;
522
523499   switch(regnum)
524500   {
525      case M68K_REG_D0:   return cpu->dar[0];
526      case M68K_REG_D1:   return cpu->dar[1];
527      case M68K_REG_D2:   return cpu->dar[2];
528      case M68K_REG_D3:   return cpu->dar[3];
529      case M68K_REG_D4:   return cpu->dar[4];
530      case M68K_REG_D5:   return cpu->dar[5];
531      case M68K_REG_D6:   return cpu->dar[6];
532      case M68K_REG_D7:   return cpu->dar[7];
533      case M68K_REG_A0:   return cpu->dar[8];
534      case M68K_REG_A1:   return cpu->dar[9];
535      case M68K_REG_A2:   return cpu->dar[10];
536      case M68K_REG_A3:   return cpu->dar[11];
537      case M68K_REG_A4:   return cpu->dar[12];
538      case M68K_REG_A5:   return cpu->dar[13];
539      case M68K_REG_A6:   return cpu->dar[14];
540      case M68K_REG_A7:   return cpu->dar[15];
541      case M68K_REG_PC:   return MASK_OUT_ABOVE_32(cpu->pc);
542      case M68K_REG_SR:   return   cpu->t1_flag                  |
543                           cpu->t0_flag                  |
544                           (cpu->s_flag << 11)               |
545                           (cpu->m_flag << 11)               |
546                           cpu->int_mask                  |
547                           ((cpu->x_flag & XFLAG_SET) >> 4)   |
548                           ((cpu->n_flag & NFLAG_SET) >> 4)   |
549                           ((!cpu->not_z_flag) << 2)         |
550                           ((cpu->v_flag & VFLAG_SET) >> 6)   |
551                           ((cpu->c_flag & CFLAG_SET) >> 8);
552      case M68K_REG_SP:   return cpu->dar[15];
553      case M68K_REG_USP:   return cpu->s_flag ? cpu->sp[0] : cpu->dar[15];
554      case M68K_REG_ISP:   return cpu->s_flag && !cpu->m_flag ? cpu->dar[15] : cpu->sp[4];
555      case M68K_REG_MSP:   return cpu->s_flag && cpu->m_flag ? cpu->dar[15] : cpu->sp[6];
556      case M68K_REG_SFC:   return cpu->sfc;
557      case M68K_REG_DFC:   return cpu->dfc;
558      case M68K_REG_VBR:   return cpu->vbr;
559      case M68K_REG_CACR:   return cpu->cacr;
560      case M68K_REG_CAAR:   return cpu->caar;
561      case M68K_REG_PREF_ADDR:   return cpu->pref_addr;
562      case M68K_REG_PREF_DATA:   return cpu->pref_data;
563      case M68K_REG_PPC:   return MASK_OUT_ABOVE_32(cpu->ppc);
564      case M68K_REG_IR:   return cpu->ir;
501      case M68K_REG_D0:   return m68k->dar[0];
502      case M68K_REG_D1:   return m68k->dar[1];
503      case M68K_REG_D2:   return m68k->dar[2];
504      case M68K_REG_D3:   return m68k->dar[3];
505      case M68K_REG_D4:   return m68k->dar[4];
506      case M68K_REG_D5:   return m68k->dar[5];
507      case M68K_REG_D6:   return m68k->dar[6];
508      case M68K_REG_D7:   return m68k->dar[7];
509      case M68K_REG_A0:   return m68k->dar[8];
510      case M68K_REG_A1:   return m68k->dar[9];
511      case M68K_REG_A2:   return m68k->dar[10];
512      case M68K_REG_A3:   return m68k->dar[11];
513      case M68K_REG_A4:   return m68k->dar[12];
514      case M68K_REG_A5:   return m68k->dar[13];
515      case M68K_REG_A6:   return m68k->dar[14];
516      case M68K_REG_A7:   return m68k->dar[15];
517      case M68K_REG_PC:   return MASK_OUT_ABOVE_32(m68k->pc);
518      case M68K_REG_SR:   return   m68k->t1_flag                  |
519                           m68k->t0_flag                  |
520                           (m68k->s_flag << 11)               |
521                           (m68k->m_flag << 11)               |
522                           m68k->int_mask                  |
523                           ((m68k->x_flag & XFLAG_SET) >> 4)   |
524                           ((m68k->n_flag & NFLAG_SET) >> 4)   |
525                           ((!m68k->not_z_flag) << 2)         |
526                           ((m68k->v_flag & VFLAG_SET) >> 6)   |
527                           ((m68k->c_flag & CFLAG_SET) >> 8);
528      case M68K_REG_SP:   return m68k->dar[15];
529      case M68K_REG_USP:   return m68k->s_flag ? m68k->sp[0] : m68k->dar[15];
530      case M68K_REG_ISP:   return m68k->s_flag && !m68k->m_flag ? m68k->dar[15] : m68k->sp[4];
531      case M68K_REG_MSP:   return m68k->s_flag && m68k->m_flag ? m68k->dar[15] : m68k->sp[6];
532      case M68K_REG_SFC:   return m68k->sfc;
533      case M68K_REG_DFC:   return m68k->dfc;
534      case M68K_REG_VBR:   return m68k->vbr;
535      case M68K_REG_CACR:   return m68k->cacr;
536      case M68K_REG_CAAR:   return m68k->caar;
537      case M68K_REG_PREF_ADDR:   return m68k->pref_addr;
538      case M68K_REG_PREF_DATA:   return m68k->pref_data;
539      case M68K_REG_PPC:   return MASK_OUT_ABOVE_32(m68k->ppc);
540      case M68K_REG_IR:   return m68k->ir;
565541      case M68K_REG_CPU_TYPE:
566         switch(cpu->cpu_type)
542         switch(m68k->cpu_type)
567543         {
568544            case CPU_TYPE_000:      return (unsigned int)M68K_CPU_TYPE_68000;
569545            case CPU_TYPE_008:      return (unsigned int)M68K_CPU_TYPE_68008;
r3535r3536
577553   }
578554}
579555
580void m68k_set_reg(m68k_register_t regnum, unsigned int value)
556void m68k_set_reg(m68ki_cpu_core *m68k, m68k_register_t regnum, unsigned int value)
581557{
582558   switch(regnum)
583559   {
r3535r3536
597573      case M68K_REG_A5:   REG_A[5] = MASK_OUT_ABOVE_32(value); return;
598574      case M68K_REG_A6:   REG_A[6] = MASK_OUT_ABOVE_32(value); return;
599575      case M68K_REG_A7:   REG_A[7] = MASK_OUT_ABOVE_32(value); return;
600      case M68K_REG_PC:   m68ki_jump(MASK_OUT_ABOVE_32(value)); return;
601      case M68K_REG_SR:   m68ki_set_sr(value); return;
576      case M68K_REG_PC:   m68ki_jump(m68k, MASK_OUT_ABOVE_32(value)); return;
577      case M68K_REG_SR:   m68ki_set_sr(m68k, value); return;
602578      case M68K_REG_SP:   REG_SP = MASK_OUT_ABOVE_32(value); return;
603      case M68K_REG_USP:   if(FLAG_S)
579      case M68K_REG_USP:   if(m68k->s_flag)
604580                        REG_USP = MASK_OUT_ABOVE_32(value);
605581                     else
606582                        REG_SP = MASK_OUT_ABOVE_32(value);
607583                     return;
608      case M68K_REG_ISP:   if(FLAG_S && !FLAG_M)
584      case M68K_REG_ISP:   if(m68k->s_flag && !m68k->m_flag)
609585                        REG_SP = MASK_OUT_ABOVE_32(value);
610586                     else
611587                        REG_ISP = MASK_OUT_ABOVE_32(value);
612588                     return;
613      case M68K_REG_MSP:   if(FLAG_S && FLAG_M)
589      case M68K_REG_MSP:   if(m68k->s_flag && m68k->m_flag)
614590                        REG_SP = MASK_OUT_ABOVE_32(value);
615591                     else
616592                        REG_MSP = MASK_OUT_ABOVE_32(value);
617593                     return;
618      case M68K_REG_VBR:   REG_VBR = MASK_OUT_ABOVE_32(value); return;
619      case M68K_REG_SFC:   REG_SFC = value & 7; return;
620      case M68K_REG_DFC:   REG_DFC = value & 7; return;
621      case M68K_REG_CACR:   REG_CACR = MASK_OUT_ABOVE_32(value); return;
622      case M68K_REG_CAAR:   REG_CAAR = MASK_OUT_ABOVE_32(value); return;
594      case M68K_REG_VBR:   m68k->vbr = MASK_OUT_ABOVE_32(value); return;
595      case M68K_REG_SFC:   m68k->sfc = value & 7; return;
596      case M68K_REG_DFC:   m68k->dfc = value & 7; return;
597      case M68K_REG_CACR:   m68k->cacr = MASK_OUT_ABOVE_32(value); return;
598      case M68K_REG_CAAR:   m68k->caar = MASK_OUT_ABOVE_32(value); return;
623599      case M68K_REG_PPC:   REG_PPC = MASK_OUT_ABOVE_32(value); return;
624      case M68K_REG_IR:   REG_IR = MASK_OUT_ABOVE_16(value); return;
625      case M68K_REG_PREF_ADDR:   CPU_PREF_ADDR = MASK_OUT_ABOVE_32(value); return;
626      case M68K_REG_CPU_TYPE: m68k_set_cpu_type(value); return;
600      case M68K_REG_IR:   m68k->ir = MASK_OUT_ABOVE_16(value); return;
601      case M68K_REG_PREF_ADDR:   m68k->pref_addr = MASK_OUT_ABOVE_32(value); return;
602      case M68K_REG_CPU_TYPE: m68k_set_cpu_type(m68k, value); return;
627603      default:         return;
628604   }
629605}
630606
631607/* Set the callbacks */
632void m68k_set_int_ack_callback(int  (*callback)(int int_level))
608void m68k_set_int_ack_callback(m68ki_cpu_core *m68k, void *param, int  (*callback)(void *param, int int_level))
633609{
634   CALLBACK_INT_ACK = callback ? callback : default_int_ack_callback;
610   m68k->int_ack_callback = callback ? callback : default_int_ack_callback;
611   m68k->int_ack_param = callback ? param : m68k;
635612}
636613
637void m68k_set_bkpt_ack_callback(void  (*callback)(unsigned int data))
614void m68k_set_bkpt_ack_callback(m68ki_cpu_core *m68k, void  (*callback)(unsigned int data))
638615{
639   CALLBACK_BKPT_ACK = callback ? callback : default_bkpt_ack_callback;
616   m68k->bkpt_ack_callback = callback ? callback : default_bkpt_ack_callback;
640617}
641618
642void m68k_set_reset_instr_callback(void  (*callback)(void))
619void m68k_set_reset_instr_callback(m68ki_cpu_core *m68k, void  (*callback)(void))
643620{
644   CALLBACK_RESET_INSTR = callback ? callback : default_reset_instr_callback;
621   m68k->reset_instr_callback = callback ? callback : default_reset_instr_callback;
645622}
646623
647void m68k_set_cmpild_instr_callback(void  (*callback)(unsigned int, int))
624void m68k_set_cmpild_instr_callback(m68ki_cpu_core *m68k, void  (*callback)(unsigned int, int))
648625{
649   CALLBACK_CMPILD_INSTR = callback ? callback : default_cmpild_instr_callback;
626   m68k->cmpild_instr_callback = callback ? callback : default_cmpild_instr_callback;
650627}
651628
652void m68k_set_rte_instr_callback(void  (*callback)(void))
629void m68k_set_rte_instr_callback(m68ki_cpu_core *m68k, void  (*callback)(void))
653630{
654   CALLBACK_RTE_INSTR = callback ? callback : default_rte_instr_callback;
631   m68k->rte_instr_callback = callback ? callback : default_rte_instr_callback;
655632}
656633
657void m68k_set_tas_instr_callback(int  (*callback)(void))
634void m68k_set_tas_instr_callback(m68ki_cpu_core *m68k, int  (*callback)(void))
658635{
659   CALLBACK_TAS_INSTR = callback ? callback : default_tas_instr_callback;
636   m68k->tas_instr_callback = callback ? callback : default_tas_instr_callback;
660637}
661638
662void m68k_set_pc_changed_callback(void  (*callback)(unsigned int new_pc))
639void m68k_set_pc_changed_callback(m68ki_cpu_core *m68k, void  (*callback)(unsigned int new_pc))
663640{
664   CALLBACK_PC_CHANGED = callback ? callback : default_pc_changed_callback;
641   m68k->pc_changed_callback = callback ? callback : default_pc_changed_callback;
665642}
666643
667void m68k_set_fc_callback(void  (*callback)(unsigned int new_fc))
644void m68k_set_fc_callback(m68ki_cpu_core *m68k, void  (*callback)(unsigned int new_fc))
668645{
669   CALLBACK_SET_FC = callback ? callback : default_set_fc_callback;
646   m68k->set_fc_callback = callback ? callback : default_set_fc_callback;
670647}
671648
672void m68k_set_instr_hook_callback(void  (*callback)(unsigned int pc))
649void m68k_set_instr_hook_callback(m68ki_cpu_core *m68k, void  (*callback)(unsigned int pc))
673650{
674   CALLBACK_INSTR_HOOK = callback ? callback : default_instr_hook_callback;
651   m68k->instr_hook_callback = callback ? callback : default_instr_hook_callback;
675652}
676653
677654#include <stdio.h>
678655/* Set the CPU type. */
679void m68k_set_cpu_type(unsigned int cpu_type)
656void m68k_set_cpu_type(m68ki_cpu_core *m68k, unsigned int cpu_type)
680657{
681658   switch(cpu_type)
682659   {
683660      case M68K_CPU_TYPE_68000:
684         CPU_TYPE         = CPU_TYPE_000;
685         CPU_ADDRESS_MASK = 0x00ffffff;
686         CPU_SR_MASK      = 0xa71f; /* T1 -- S  -- -- I2 I1 I0 -- -- -- X  N  Z  V  C  */
687         CYC_INSTRUCTION  = m68ki_cycles[0];
688         CYC_EXCEPTION    = m68ki_exception_cycle_table[0];
689         CYC_BCC_NOTAKE_B = -2;
690         CYC_BCC_NOTAKE_W = 2;
691         CYC_DBCC_F_NOEXP = -2;
692         CYC_DBCC_F_EXP   = 2;
693         CYC_SCC_R_TRUE   = 2;
694         CYC_MOVEM_W      = 2;
695         CYC_MOVEM_L      = 3;
696         CYC_SHIFT        = 1;
697         CYC_RESET        = 132;
661         m68k->cpu_type         = CPU_TYPE_000;
662         m68k->address_mask = 0x00ffffff;
663         m68k->sr_mask      = 0xa71f; /* T1 -- S  -- -- I2 I1 I0 -- -- -- X  N  Z  V  C  */
664         m68k->cyc_instruction  = m68ki_cycles[0];
665         m68k->cyc_exception    = m68ki_exception_cycle_table[0];
666         m68k->cyc_bcc_notake_b = -2;
667         m68k->cyc_bcc_notake_w = 2;
668         m68k->cyc_dbcc_f_noexp = -2;
669         m68k->cyc_dbcc_f_exp   = 2;
670         m68k->cyc_scc_r_true   = 2;
671         m68k->cyc_movem_w      = 2;
672         m68k->cyc_movem_l      = 3;
673         m68k->cyc_shift        = 1;
674         m68k->cyc_reset        = 132;
698675         return;
699676      case M68K_CPU_TYPE_68008:
700         CPU_TYPE         = CPU_TYPE_008;
701         CPU_ADDRESS_MASK = 0x003fffff;
702         CPU_SR_MASK      = 0xa71f; /* T1 -- S  -- -- I2 I1 I0 -- -- -- X  N  Z  V  C  */
703         CYC_INSTRUCTION  = m68ki_cycles[0];
704         CYC_EXCEPTION    = m68ki_exception_cycle_table[0];
705         CYC_BCC_NOTAKE_B = -2;
706         CYC_BCC_NOTAKE_W = 2;
707         CYC_DBCC_F_NOEXP = -2;
708         CYC_DBCC_F_EXP   = 2;
709         CYC_SCC_R_TRUE   = 2;
710         CYC_MOVEM_W      = 2;
711         CYC_MOVEM_L      = 3;
712         CYC_SHIFT        = 1;
713         CYC_RESET        = 132;
677         m68k->cpu_type         = CPU_TYPE_008;
678         m68k->address_mask = 0x003fffff;
679         m68k->sr_mask      = 0xa71f; /* T1 -- S  -- -- I2 I1 I0 -- -- -- X  N  Z  V  C  */
680         m68k->cyc_instruction  = m68ki_cycles[0];
681         m68k->cyc_exception    = m68ki_exception_cycle_table[0];
682         m68k->cyc_bcc_notake_b = -2;
683         m68k->cyc_bcc_notake_w = 2;
684         m68k->cyc_dbcc_f_noexp = -2;
685         m68k->cyc_dbcc_f_exp   = 2;
686         m68k->cyc_scc_r_true   = 2;
687         m68k->cyc_movem_w      = 2;
688         m68k->cyc_movem_l      = 3;
689         m68k->cyc_shift        = 1;
690         m68k->cyc_reset        = 132;
714691         return;
715692      case M68K_CPU_TYPE_68010:
716         CPU_TYPE         = CPU_TYPE_010;
717         CPU_ADDRESS_MASK = 0x00ffffff;
718         CPU_SR_MASK      = 0xa71f; /* T1 -- S  -- -- I2 I1 I0 -- -- -- X  N  Z  V  C  */
719         CYC_INSTRUCTION  = m68ki_cycles[1];
720         CYC_EXCEPTION    = m68ki_exception_cycle_table[1];
721         CYC_BCC_NOTAKE_B = -4;
722         CYC_BCC_NOTAKE_W = 0;
723         CYC_DBCC_F_NOEXP = 0;
724         CYC_DBCC_F_EXP   = 6;
725         CYC_SCC_R_TRUE   = 0;
726         CYC_MOVEM_W      = 2;
727         CYC_MOVEM_L      = 3;
728         CYC_SHIFT        = 1;
729         CYC_RESET        = 130;
693         m68k->cpu_type         = CPU_TYPE_010;
694         m68k->address_mask = 0x00ffffff;
695         m68k->sr_mask      = 0xa71f; /* T1 -- S  -- -- I2 I1 I0 -- -- -- X  N  Z  V  C  */
696         m68k->cyc_instruction  = m68ki_cycles[1];
697         m68k->cyc_exception    = m68ki_exception_cycle_table[1];
698         m68k->cyc_bcc_notake_b = -4;
699         m68k->cyc_bcc_notake_w = 0;
700         m68k->cyc_dbcc_f_noexp = 0;
701         m68k->cyc_dbcc_f_exp   = 6;
702         m68k->cyc_scc_r_true   = 0;
703         m68k->cyc_movem_w      = 2;
704         m68k->cyc_movem_l      = 3;
705         m68k->cyc_shift        = 1;
706         m68k->cyc_reset        = 130;
730707         return;
731708      case M68K_CPU_TYPE_68EC020:
732         CPU_TYPE         = CPU_TYPE_EC020;
733         CPU_ADDRESS_MASK = 0x00ffffff;
734         CPU_SR_MASK      = 0xf71f; /* T1 T0 S  M  -- I2 I1 I0 -- -- -- X  N  Z  V  C  */
735         CYC_INSTRUCTION  = m68ki_cycles[2];
736         CYC_EXCEPTION    = m68ki_exception_cycle_table[2];
737         CYC_BCC_NOTAKE_B = -2;
738         CYC_BCC_NOTAKE_W = 0;
739         CYC_DBCC_F_NOEXP = 0;
740         CYC_DBCC_F_EXP   = 4;
741         CYC_SCC_R_TRUE   = 0;
742         CYC_MOVEM_W      = 2;
743         CYC_MOVEM_L      = 2;
744         CYC_SHIFT        = 0;
745         CYC_RESET        = 518;
709         m68k->cpu_type         = CPU_TYPE_EC020;
710         m68k->address_mask = 0x00ffffff;
711         m68k->sr_mask      = 0xf71f; /* T1 T0 S  M  -- I2 I1 I0 -- -- -- X  N  Z  V  C  */
712         m68k->cyc_instruction  = m68ki_cycles[2];
713         m68k->cyc_exception    = m68ki_exception_cycle_table[2];
714         m68k->cyc_bcc_notake_b = -2;
715         m68k->cyc_bcc_notake_w = 0;
716         m68k->cyc_dbcc_f_noexp = 0;
717         m68k->cyc_dbcc_f_exp   = 4;
718         m68k->cyc_scc_r_true   = 0;
719         m68k->cyc_movem_w      = 2;
720         m68k->cyc_movem_l      = 2;
721         m68k->cyc_shift        = 0;
722         m68k->cyc_reset        = 518;
746723         return;
747724      case M68K_CPU_TYPE_68020:
748         CPU_TYPE         = CPU_TYPE_020;
749         CPU_ADDRESS_MASK = 0xffffffff;
750         CPU_SR_MASK      = 0xf71f; /* T1 T0 S  M  -- I2 I1 I0 -- -- -- X  N  Z  V  C  */
751         CYC_INSTRUCTION  = m68ki_cycles[2];
752         CYC_EXCEPTION    = m68ki_exception_cycle_table[2];
753         CYC_BCC_NOTAKE_B = -2;
754         CYC_BCC_NOTAKE_W = 0;
755         CYC_DBCC_F_NOEXP = 0;
756         CYC_DBCC_F_EXP   = 4;
757         CYC_SCC_R_TRUE   = 0;
758         CYC_MOVEM_W      = 2;
759         CYC_MOVEM_L      = 2;
760         CYC_SHIFT        = 0;
761         CYC_RESET        = 518;
725         m68k->cpu_type         = CPU_TYPE_020;
726         m68k->address_mask = 0xffffffff;
727         m68k->sr_mask      = 0xf71f; /* T1 T0 S  M  -- I2 I1 I0 -- -- -- X  N  Z  V  C  */
728         m68k->cyc_instruction  = m68ki_cycles[2];
729         m68k->cyc_exception    = m68ki_exception_cycle_table[2];
730         m68k->cyc_bcc_notake_b = -2;
731         m68k->cyc_bcc_notake_w = 0;
732         m68k->cyc_dbcc_f_noexp = 0;
733         m68k->cyc_dbcc_f_exp   = 4;
734         m68k->cyc_scc_r_true   = 0;
735         m68k->cyc_movem_w      = 2;
736         m68k->cyc_movem_l      = 2;
737         m68k->cyc_shift        = 0;
738         m68k->cyc_reset        = 518;
762739         return;
763740      case M68K_CPU_TYPE_68040:      // TODO: these values are not correct
764         CPU_TYPE         = CPU_TYPE_040;
765         CPU_ADDRESS_MASK = 0xffffffff;
766         CPU_SR_MASK      = 0xf71f; /* T1 T0 S  M  -- I2 I1 I0 -- -- -- X  N  Z  V  C  */
767         CYC_INSTRUCTION  = m68ki_cycles[2];
768         CYC_EXCEPTION    = m68ki_exception_cycle_table[2];
769         CYC_BCC_NOTAKE_B = -2;
770         CYC_BCC_NOTAKE_W = 0;
771         CYC_DBCC_F_NOEXP = 0;
772         CYC_DBCC_F_EXP   = 4;
773         CYC_SCC_R_TRUE   = 0;
774         CYC_MOVEM_W      = 2;
775         CYC_MOVEM_L      = 2;
776         CYC_SHIFT        = 0;
777         CYC_RESET        = 518;
741         m68k->cpu_type         = CPU_TYPE_040;
742         m68k->address_mask = 0xffffffff;
743         m68k->sr_mask      = 0xf71f; /* T1 T0 S  M  -- I2 I1 I0 -- -- -- X  N  Z  V  C  */
744         m68k->cyc_instruction  = m68ki_cycles[2];
745         m68k->cyc_exception    = m68ki_exception_cycle_table[2];
746         m68k->cyc_bcc_notake_b = -2;
747         m68k->cyc_bcc_notake_w = 0;
748         m68k->cyc_dbcc_f_noexp = 0;
749         m68k->cyc_dbcc_f_exp   = 4;
750         m68k->cyc_scc_r_true   = 0;
751         m68k->cyc_movem_w      = 2;
752         m68k->cyc_movem_l      = 2;
753         m68k->cyc_shift        = 0;
754         m68k->cyc_reset        = 518;
778755         return;
779756   }
780757}
781758
782759/* Execute some instructions until we use up num_cycles clock cycles */
783760/* ASG: removed per-instruction interrupt checks */
784int m68k_execute(int num_cycles)
761int m68k_execute(m68ki_cpu_core *m68k, int num_cycles)
785762{
786763   /* Set our pool of clock cycles available */
787   SET_CYCLES(num_cycles);
788   m68ki_initial_cycles = num_cycles;
764   SET_CYCLES(m68k, num_cycles);
765   m68k->initial_cycles = num_cycles;
789766
790767   /* See if interrupts came in */
791   m68ki_check_interrupts();
768   m68ki_check_interrupts(m68k);
792769
793770   /* Make sure we're not stopped */
794   if(!CPU_STOPPED)
771   if(!m68k->stopped)
795772   {
796773      /* Return point if we had an address error */
797      m68ki_set_address_error_trap(); /* auto-disable (see m68kcpu.h) */
774      m68ki_set_address_error_trap(m68k); /* auto-disable (see m68kcpu.h) */
798775
799776      /* Main loop.  Keep going until we run out of clock cycles */
800777      do
r3535r3536
803780         m68ki_trace_t1(); /* auto-disable (see m68kcpu.h) */
804781
805782         /* Set the address space for reads */
806         m68ki_use_data_space(); /* auto-disable (see m68kcpu.h) */
783         m68ki_use_data_space(m68k); /* auto-disable (see m68kcpu.h) */
807784
808785         /* Call external hook to peek at CPU */
809         m68ki_instr_hook(REG_PC); /* auto-disable (see m68kcpu.h) */
786         debugger_instruction_hook(Machine, REG_PC);
810787
811788         /* Record previous program counter */
812789         REG_PPC = REG_PC;
813790
814791         /* Read an instruction and call its handler */
815         REG_IR = m68ki_read_imm_16();
816         m68ki_instruction_jump_table[REG_IR]();
817         USE_CYCLES(CYC_INSTRUCTION[REG_IR]);
792         m68k->ir = m68ki_read_imm_16(m68k);
793         m68ki_instruction_jump_table[m68k->ir](m68k);
794         USE_CYCLES(m68k, m68k->cyc_instruction[m68k->ir]);
818795
819796         /* Trace m68k_exception, if necessary */
820797         m68ki_exception_if_trace(); /* auto-disable (see m68kcpu.h) */
821      } while(GET_CYCLES() > 0);
798      } while(GET_CYCLES(m68k) > 0);
822799
823800      /* set previous PC to current PC for the next entry into the loop */
824801      REG_PPC = REG_PC;
825802   }
826803   else
827      SET_CYCLES(0);
804      SET_CYCLES(m68k, 0);
828805
829806   /* return how many clocks we used */
830   return m68ki_initial_cycles - GET_CYCLES();
807   return m68k->initial_cycles - GET_CYCLES(m68k);
831808}
832809
833810
834int m68k_cycles_run(void)
811int m68k_cycles_run(m68ki_cpu_core *m68k)
835812{
836   return m68ki_initial_cycles - GET_CYCLES();
813   return m68k->initial_cycles - GET_CYCLES(m68k);
837814}
838815
839int m68k_cycles_remaining(void)
816int m68k_cycles_remaining(m68ki_cpu_core *m68k)
840817{
841   return GET_CYCLES();
818   return GET_CYCLES(m68k);
842819}
843820
844821/* Change the timeslice */
845void m68k_modify_timeslice(int cycles)
822void m68k_modify_timeslice(m68ki_cpu_core *m68k, int cycles)
846823{
847   m68ki_initial_cycles += cycles;
848   ADD_CYCLES(cycles);
824   m68k->initial_cycles += cycles;
825   ADD_CYCLES(m68k, cycles);
849826}
850827
851828
852void m68k_end_timeslice(void)
829void m68k_end_timeslice(m68ki_cpu_core *m68k)
853830{
854   m68ki_initial_cycles = GET_CYCLES();
855   SET_CYCLES(0);
831   m68k->initial_cycles = GET_CYCLES(m68k);
832   SET_CYCLES(m68k, 0);
856833}
857834
858835
r3535r3536
860837/* KS: Modified so that IPL* bits match with mask positions in the SR
861838 *     and cleaned out remenants of the interrupt controller.
862839 */
863void m68k_set_irq(unsigned int int_level)
840void m68k_set_irq(m68ki_cpu_core *m68k, unsigned int int_level)
864841{
865   uint old_level = CPU_INT_LEVEL;
866   CPU_INT_LEVEL = int_level << 8;
842   UINT32 old_level = m68k->int_level;
843   m68k->int_level = int_level << 8;
867844
868845   /* A transition from < 7 to 7 always interrupts (NMI) */
869846   /* Note: Level 7 can also level trigger like a normal IRQ */
870   if(old_level != 0x0700 && CPU_INT_LEVEL == 0x0700)
871      m68ki_cpu.nmi_pending = TRUE;
847   if(old_level != 0x0700 && m68k->int_level == 0x0700)
848      m68k->nmi_pending = TRUE;
872849}
873850
874void m68k_set_virq(unsigned int level, unsigned int active)
851void m68k_set_virq(m68ki_cpu_core *m68k, unsigned int level, unsigned int active)
875852{
876   uint state = m68ki_cpu.virq_state;
877   uint blevel;
853   UINT32 state = m68k->virq_state;
854   UINT32 blevel;
878855
879856   if(active)
880857      state |= 1 << level;
881858   else
882859      state &= ~(1 << level);
883   m68ki_cpu.virq_state = state;
860   m68k->virq_state = state;
884861
885862   for(blevel = 7; blevel > 0; blevel--)
886863      if(state & (1 << blevel))
887864         break;
888   m68k_set_irq(blevel);
865   m68k_set_irq(m68k, blevel);
889866}
890867
891unsigned int m68k_get_virq(unsigned int level)
868unsigned int m68k_get_virq(m68ki_cpu_core *m68k, unsigned int level)
892869{
893   return (m68ki_cpu.virq_state & (1 << level)) ? 1 : 0;
870   return (m68k->virq_state & (1 << level)) ? 1 : 0;
894871}
895872
896void m68k_init(void)
873void m68k_init(m68ki_cpu_core *m68k)
897874{
898   static uint emulation_initialized = 0;
875   static UINT32 emulation_initialized = 0;
899876
900877   /* The first call to this function initializes the opcode handler jump table */
901878   if(!emulation_initialized)
r3535r3536
904881      emulation_initialized = 1;
905882   }
906883
907   m68k_set_int_ack_callback(NULL);
908   m68k_set_bkpt_ack_callback(NULL);
909   m68k_set_reset_instr_callback(NULL);
910   m68k_set_cmpild_instr_callback(NULL);
911   m68k_set_rte_instr_callback(NULL);
912   m68k_set_tas_instr_callback(NULL);
913   m68k_set_pc_changed_callback(NULL);
914   m68k_set_fc_callback(NULL);
915   m68k_set_instr_hook_callback(NULL);
884   m68k_set_int_ack_callback(m68k, NULL, NULL);
885   m68k_set_bkpt_ack_callback(m68k, NULL);
886   m68k_set_reset_instr_callback(m68k, NULL);
887   m68k_set_cmpild_instr_callback(m68k, NULL);
888   m68k_set_rte_instr_callback(m68k, NULL);
889   m68k_set_tas_instr_callback(m68k, NULL);
890   m68k_set_pc_changed_callback(m68k, NULL);
891   m68k_set_fc_callback(m68k, NULL);
892   m68k_set_instr_hook_callback(m68k, NULL);
916893}
917894
918895/* Pulse the RESET line on the CPU */
919void m68k_pulse_reset(void)
896void m68k_pulse_reset(m68ki_cpu_core *m68k)
920897{
921898   /* Clear all stop levels and eat up all remaining cycles */
922   CPU_STOPPED = 0;
923   SET_CYCLES(0);
899   m68k->stopped = 0;
900   SET_CYCLES(m68k, 0);
924901
925   CPU_RUN_MODE = RUN_MODE_BERR_AERR_RESET;
902   m68k->run_mode = RUN_MODE_BERR_AERR_RESET;
926903
927904   /* Turn off tracing */
928   FLAG_T1 = FLAG_T0 = 0;
905   m68k->t1_flag = m68k->t0_flag = 0;
929906   m68ki_clear_trace();
930907   /* Interrupt mask to level 7 */
931   FLAG_INT_MASK = 0x0700;
932   CPU_INT_LEVEL = 0;
933   m68ki_cpu.virq_state = 0;
908   m68k->int_mask = 0x0700;
909   m68k->int_level = 0;
910   m68k->virq_state = 0;
934911   /* Reset VBR */
935   REG_VBR = 0;
912   m68k->vbr = 0;
936913   /* Go to supervisor mode */
937   m68ki_set_sm_flag(SFLAG_SET | MFLAG_CLEAR);
914   m68ki_set_sm_flag(m68k, SFLAG_SET | MFLAG_CLEAR);
938915
939916   /* Invalidate the prefetch queue */
940#if M68K_EMULATE_PREFETCH
941917   /* Set to arbitrary number since our first fetch is from 0 */
942   CPU_PREF_ADDR = 0x1000;
943#endif /* M68K_EMULATE_PREFETCH */
918   m68k->pref_addr = 0x1000;
944919
945920   /* Read the initial stack pointer and program counter */
946   m68ki_jump(0);
947   REG_SP = m68ki_read_imm_32();
948   REG_PC = m68ki_read_imm_32();
949   m68ki_jump(REG_PC);
921   m68ki_jump(m68k, 0);
922   REG_SP = m68ki_read_imm_32(m68k);
923   REG_PC = m68ki_read_imm_32(m68k);
924   m68ki_jump(m68k, REG_PC);
950925
951   CPU_RUN_MODE = RUN_MODE_NORMAL;
926   m68k->run_mode = RUN_MODE_NORMAL;
952927}
953928
954929/* Pulse the HALT line on the CPU */
955void m68k_pulse_halt(void)
930void m68k_pulse_halt(m68ki_cpu_core *m68k)
956931{
957   CPU_STOPPED |= STOP_LEVEL_HALT;
932   m68k->stopped |= STOP_LEVEL_HALT;
958933}
959934
960935
r3535r3536
962937/* This is to allow for multiple CPUs */
963938unsigned int m68k_context_size()
964939{
965   return sizeof(m68ki_cpu_core);
940   return sizeof(void *);
966941}
967942
968unsigned int m68k_get_context(void* dst)
969{
970   if(dst) *(m68ki_cpu_core*)dst = m68ki_cpu;
971   return sizeof(m68ki_cpu_core);
972}
973943
974void m68k_set_context(void* src)
975{
976   if(src) m68ki_cpu = *(m68ki_cpu_core*)src;
977}
978944
979
980
981945/* ======================================================================== */
982946/* ============================== MAME STUFF ============================== */
983947/* ======================================================================== */
984948
985#if M68K_COMPILE_FOR_MAME == OPT_ON
986
987949#include "deprecat.h"
988950
989951static struct {
r3535r3536
994956
995957static void m68k_prepare_substate(running_machine *machine, void *param)
996958{
997   m68k_substate.sr = m68ki_get_sr();
998   m68k_substate.stopped = (CPU_STOPPED & STOP_LEVEL_STOP) != 0;
999   m68k_substate.halted  = (CPU_STOPPED & STOP_LEVEL_HALT) != 0;
959   m68ki_cpu_core *m68k = param;
960   m68k_substate.sr = m68ki_get_sr(m68k);
961   m68k_substate.stopped = (m68k->stopped & STOP_LEVEL_STOP) != 0;
962   m68k_substate.halted  = (m68k->stopped & STOP_LEVEL_HALT) != 0;
1000963}
1001964
1002965static void m68k_post_load(running_machine *machine, void *param)
1003966{
1004   m68ki_set_sr_noint_nosp(m68k_substate.sr);
1005   CPU_STOPPED = m68k_substate.stopped ? STOP_LEVEL_STOP : 0
967   m68ki_cpu_core *m68k = param;
968   m68ki_set_sr_noint_nosp(m68k, m68k_substate.sr);
969   m68k->stopped = m68k_substate.stopped ? STOP_LEVEL_STOP : 0
1006970              | m68k_substate.halted  ? STOP_LEVEL_HALT : 0;
1007   m68ki_jump(REG_PC);
971   m68ki_jump(m68k, REG_PC);
1008972}
1009973
1010void m68k_state_register(const char *type, int index)
974void m68k_state_register(m68ki_cpu_core *m68k, const char *type, int index)
1011975{
1012976   /* Note, D covers A because the dar array is common, REG_A=REG_D+8 */
1013977   state_save_register_item_array(type, index, REG_D);
r3535r3536
1016980   state_save_register_item(type, index, REG_USP);
1017981   state_save_register_item(type, index, REG_ISP);
1018982   state_save_register_item(type, index, REG_MSP);
1019   state_save_register_item(type, index, REG_VBR);
1020   state_save_register_item(type, index, REG_SFC);
1021   state_save_register_item(type, index, REG_DFC);
1022   state_save_register_item(type, index, REG_CACR);
1023   state_save_register_item(type, index, REG_CAAR);
983   state_save_register_item(type, index, m68k->vbr);
984   state_save_register_item(type, index, m68k->sfc);
985   state_save_register_item(type, index, m68k->dfc);
986   state_save_register_item(type, index, m68k->cacr);
987   state_save_register_item(type, index, m68k->caar);
1024988   state_save_register_item(type, index, m68k_substate.sr);
1025   state_save_register_item(type, index, CPU_INT_LEVEL);
989   state_save_register_item(type, index, m68k->int_level);
1026990   state_save_register_item(type, index, m68k_substate.stopped);
1027991   state_save_register_item(type, index, m68k_substate.halted);
1028   state_save_register_item(type, index, CPU_PREF_ADDR);
1029   state_save_register_item(type, index, CPU_PREF_DATA);
1030   state_save_register_presave(Machine, m68k_prepare_substate, NULL);
1031   state_save_register_postload(Machine, m68k_post_load, NULL);
992   state_save_register_item(type, index, m68k->pref_addr);
993   state_save_register_item(type, index, m68k->pref_data);
994   state_save_register_presave(Machine, m68k_prepare_substate, m68k);
995   state_save_register_postload(Machine, m68k_post_load, m68k);
1032996}
1033997
1034#endif /* M68K_COMPILE_FOR_MAME */
1035
1036998/* ======================================================================== */
1037999/* ============================== END OF FILE ============================= */
10381000/* ======================================================================== */
src/emu/cpu/ccpu/ccpu.h
r3535r3536
5353    PUBLIC FUNCTIONS
5454***************************************************************************/
5555
56void ccpu_get_info(UINT32 state, cpuinfo *info);
56CPU_GET_INFO( ccpu );
5757void ccpu_wdt_timer_trigger(void);
5858
59offs_t ccpu_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
59CPU_DISASSEMBLE( ccpu );
6060
6161#endif /* __CCPU_H__ */
src/emu/cpu/ccpu/ccpudasm.c
r3535r3536
1111#include "ccpu.h"
1212
1313
14offs_t ccpu_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
14CPU_DISASSEMBLE( ccpu )
1515{
1616   unsigned startpc = pc;
1717   UINT8 opcode = oprom[pc++ - startpc];
src/emu/cpu/ccpu/ccpu.c
r3535r3536
9696    CONTEXT SWITCHING
9797***************************************************************************/
9898
99static void ccpu_get_context(void *dst)
99static CPU_GET_CONTEXT( ccpu )
100100{
101101   /* copy the context */
102102   *(ccpuRegs *)dst = ccpu;
103103}
104104
105105
106static void ccpu_set_context(void *src)
106static CPU_SET_CONTEXT( ccpu )
107107{
108108   /* copy the context */
109109   if (src)
r3535r3536
134134}
135135
136136
137static void ccpu_init(int index, int clock, const void *_config, int (*irqcallback)(int))
137static CPU_INIT( ccpu )
138138{
139   const ccpu_config *config = _config;
139   const ccpu_config *configdata = config;
140140
141141   /* copy input params */
142   ccpu.external_input = config->external_input ? config->external_input : read_jmi;
143   ccpu.vector_callback = config->vector_callback;
142   ccpu.external_input = configdata->external_input ? configdata->external_input : read_jmi;
143   ccpu.vector_callback = configdata->vector_callback;
144144
145145   state_save_register_item("ccpu", clock, ccpu.PC);
146146   state_save_register_item("ccpu", clock, ccpu.A);
r3535r3536
164164}
165165
166166
167static void ccpu_reset(void)
167static CPU_RESET( ccpu )
168168{
169169   /* zero registers */
170170   ccpu.PC = 0;
r3535r3536
196196    CORE EXECUTION LOOP
197197***************************************************************************/
198198
199static int ccpu_execute(int cycles)
199static CPU_EXECUTE( ccpu )
200200{
201201   if (ccpu.waiting)
202202      return cycles;
r3535r3536
697697    INFORMATION SETTERS
698698***************************************************************************/
699699
700static void ccpu_set_info(UINT32 state, cpuinfo *info)
700static CPU_SET_INFO( ccpu )
701701{
702702   switch (state)
703703   {
r3535r3536
730730    INFORMATION GETTERS
731731***************************************************************************/
732732
733void ccpu_get_info(UINT32 state, cpuinfo *info)
733CPU_GET_INFO( ccpu )
734734{
735735   switch (state)
736736   {
r3535r3536
779779      case CPUINFO_INT_REGISTER + CCPU_T:          info->i = ccpu.T;                  break;
780780
781781      /* --- the following bits of info are returned as pointers to data or functions --- */
782      case CPUINFO_PTR_SET_INFO:                  info->setinfo = ccpu_set_info;         break;
783      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = ccpu_get_context;   break;
784      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = ccpu_set_context;   break;
785      case CPUINFO_PTR_INIT:                     info->init = ccpu_init;               break;
786      case CPUINFO_PTR_RESET:                     info->reset = ccpu_reset;            break;
782      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(ccpu);         break;
783      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(ccpu);   break;
784      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(ccpu);   break;
785      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ccpu);               break;
786      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(ccpu);            break;
787787      case CPUINFO_PTR_EXIT:                     info->exit = NULL;                  break;
788      case CPUINFO_PTR_EXECUTE:                  info->execute = ccpu_execute;         break;
788      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(ccpu);         break;
789789      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
790      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = ccpu_dasm;         break;
790      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(ccpu);         break;
791791      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &ccpu_icount;         break;
792792
793793      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/tms34010/34010ops.h
r3535r3536
165165#define TMS34010_WV         0x0800      /* Window Violation Interrupt */
166166
167167/* IO registers accessor */
168#define IOREG(reg)               (state.IOregs[reg])
169#define SMART_IOREG(reg)         (state.IOregs[state.is_34020 ? REG020_##reg : REG_##reg])
168#define IOREG(reg)               (tms.IOregs[reg])
169#define SMART_IOREG(reg)         (tms.IOregs[tms.is_34020 ? REG020_##reg : REG_##reg])
170170#define PBH                   (IOREG(REG_CONTROL) & 0x0100)
171171#define PBV                   (IOREG(REG_CONTROL) & 0x0200)
172172
src/emu/cpu/tms34010/tms34010.h
r3535r3536
8686VIDEO_UPDATE( tms340x0 );
8787void tms34010_get_display_params(int cpunum, tms34010_display_params *params);
8888
89void tms34010_get_info(UINT32 state, cpuinfo *info);
89CPU_GET_INFO( tms34010 );
9090
9191int       tms34010_io_display_blanked(int cpu);
9292int       tms34010_get_DPYSTRT(int cpu);
9393
9494
9595/* PUBLIC FUNCTIONS - 34020 */
96void tms34020_get_info(UINT32 state, cpuinfo *info);
96CPU_GET_INFO( tms34020 );
9797
9898int       tms34020_io_display_blanked(int cpu);
9999int       tms34020_get_DPYSTRT(int cpu);
r3535r3536
124124#define TOWORD(bitaddr) ((offs_t)(bitaddr) >> 4)
125125
126126
127offs_t tms34010_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
128offs_t tms34020_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
127CPU_DISASSEMBLE( tms34010 );
128CPU_DISASSEMBLE( tms34020 );
129129
130130#endif /* __TMS34010_H__ */
src/emu/cpu/tms34010/34010ops.c
r3535r3536
1616#define ZEXTEND(val,width) if (width) (val) &= ((UINT32)0xffffffff >> (32 - (width)))
1717#define SEXTEND(val,width) if (width) (val) = (INT32)((val) << (32 - (width))) >> (32 - (width))
1818
19#define SXYTOL(val)   ((((INT16)(val).y * state.convsp) + ((INT16)(val).x << state.pixelshift)) + OFFSET)
20#define DXYTOL(val)   ((((INT16)(val).y * state.convdp) + ((INT16)(val).x << state.pixelshift)) + OFFSET)
21#define MXYTOL(val)   ((((INT16)(val).y * state.convmp) + ((INT16)(val).x << state.pixelshift)) + OFFSET)
19#define SXYTOL(val)   ((((INT16)(val).y * tms.convsp) + ((INT16)(val).x << tms.pixelshift)) + OFFSET)
20#define DXYTOL(val)   ((((INT16)(val).y * tms.convdp) + ((INT16)(val).x << tms.pixelshift)) + OFFSET)
21#define MXYTOL(val)   ((((INT16)(val).y * tms.convmp) + ((INT16)(val).x << tms.pixelshift)) + OFFSET)
2222
2323#define COUNT_CYCLES(x)   tms34010_ICount -= x
2424#define COUNT_UNKNOWN_CYCLES(x) COUNT_CYCLES(x)
r3535r3536
3333
3434#define SIGN(val)         ((val) & 0x80000000)
3535
36#define CLR_Z               state.st &= ~STBIT_Z
37#define CLR_V               state.st &= ~STBIT_V
38#define CLR_C               state.st &= ~STBIT_C
39#define CLR_N               state.st &= ~STBIT_N
40#define CLR_NZ               state.st &= ~(STBIT_N | STBIT_Z)
41#define CLR_CZ               state.st &= ~(STBIT_C | STBIT_Z)
42#define CLR_ZV               state.st &= ~(STBIT_Z | STBIT_V)
43#define CLR_NZV               state.st &= ~(STBIT_N | STBIT_Z | STBIT_V)
44#define CLR_NCZ               state.st &= ~(STBIT_N | STBIT_C | STBIT_Z)
45#define CLR_NCZV            state.st &= ~(STBIT_N | STBIT_C | STBIT_Z | STBIT_V)
36#define CLR_Z               tms.st &= ~STBIT_Z
37#define CLR_V               tms.st &= ~STBIT_V
38#define CLR_C               tms.st &= ~STBIT_C
39#define CLR_N               tms.st &= ~STBIT_N
40#define CLR_NZ               tms.st &= ~(STBIT_N | STBIT_Z)
41#define CLR_CZ               tms.st &= ~(STBIT_C | STBIT_Z)
42#define CLR_ZV               tms.st &= ~(STBIT_Z | STBIT_V)
43#define CLR_NZV               tms.st &= ~(STBIT_N | STBIT_Z | STBIT_V)
44#define CLR_NCZ               tms.st &= ~(STBIT_N | STBIT_C | STBIT_Z)
45#define CLR_NCZV            tms.st &= ~(STBIT_N | STBIT_C | STBIT_Z | STBIT_V)
4646
47#define SET_V_BIT_LO(val,bit)   state.st |= ((val) << (28 - (bit))) & STBIT_V
48#define SET_V_BIT_HI(val,bit)   state.st |= ((val) >> ((bit) - 28)) & STBIT_V
49#define SET_V_LOG(val)         state.st |= (val) << 28
50#define SET_Z_BIT_LO(val,bit)   state.st |= ((val) << (29 - (bit))) & STBIT_Z
51#define SET_Z_BIT_HI(val,bit)   state.st |= ((val) >> ((bit) - 29)) & STBIT_Z
52#define SET_Z_LOG(val)         state.st |= (val) << 29
53#define SET_C_BIT_LO(val,bit)   state.st |= ((val) << (30 - (bit))) & STBIT_C
54#define SET_C_BIT_HI(val,bit)   state.st |= ((val) >> ((bit) - 30)) & STBIT_C
55#define SET_C_LOG(val)         state.st |= (val) << 30
56#define SET_N_BIT(val,bit)      state.st |= ((val) << (31 - (bit))) & STBIT_N
57#define SET_N_LOG(val)         state.st |= (val) << 31
47#define SET_V_BIT_LO(val,bit)   tms.st |= ((val) << (28 - (bit))) & STBIT_V
48#define SET_V_BIT_HI(val,bit)   tms.st |= ((val) >> ((bit) - 28)) & STBIT_V
49#define SET_V_LOG(val)         tms.st |= (val) << 28
50#define SET_Z_BIT_LO(val,bit)   tms.st |= ((val) << (29 - (bit))) & STBIT_Z
51#define SET_Z_BIT_HI(val,bit)   tms.st |= ((val) >> ((bit) - 29)) & STBIT_Z
52#define SET_Z_LOG(val)         tms.st |= (val) << 29
53#define SET_C_BIT_LO(val,bit)   tms.st |= ((val) << (30 - (bit))) & STBIT_C
54#define SET_C_BIT_HI(val,bit)   tms.st |= ((val) >> ((bit) - 30)) & STBIT_C
55#define SET_C_LOG(val)         tms.st |= (val) << 30
56#define SET_N_BIT(val,bit)      tms.st |= ((val) << (31 - (bit))) & STBIT_N
57#define SET_N_LOG(val)         tms.st |= (val) << 31
5858
5959#define SET_Z_VAL(val)         SET_Z_LOG((val) == 0)
6060#define SET_N_VAL(val)         SET_N_BIT(val, 31)
r3535r3536
9797   /* extra check to prevent bad things */
9898   if (PC == 0 || opcode_table[cpu_readop16(TOBYTE(PC)) >> 4] == unimpl)
9999   {
100      cpunum_set_input_line(state.screen->machine, cpu_getactivecpu(), INPUT_LINE_HALT, ASSERT_LINE);
101      debugger_break(state.screen->machine);
100      cpunum_set_input_line(tms.screen->machine, cpu_getactivecpu(), INPUT_LINE_HALT, ASSERT_LINE);
101      debugger_break(tms.screen->machine);
102102   }
103103}
104104
r3535r3536
499499
500500static void dint(void)
501501{
502   state.st &= ~STBIT_IE;
502   tms.st &= ~STBIT_IE;
503503   COUNT_CYCLES(3);
504504}
505505
r3535r3536
599599
600600static void eint(void)
601601{
602   state.st |= STBIT_IE;
602   tms.st |= STBIT_IE;
603603   check_interrupt();
604604   COUNT_CYCLES(3);
605605}
r3535r3536
608608{                                                \
609609   UINT8 shift = F ? 6 : 0;                           \
610610   INT32 *rd = &R##REG(DSTREG);                        \
611   UINT32 temp = (state.st >> shift) & 0x3f;               \
612   state.st &= ~(0x3f << shift);                        \
613   state.st |= (*rd & 0x3f) << shift;                     \
611   UINT32 temp = (tms.st >> shift) & 0x3f;               \
612   tms.st &= ~(0x3f << shift);                        \
613   tms.st |= (*rd & 0x3f) << shift;                     \
614614   *rd = temp;                                       \
615615   COUNT_CYCLES(1);                                 \
616616}
r3535r3536
669669   COUNT_CYCLES(2);                                 \
670670   {                                             \
671671      INT32 rd = DSTREG;                              \
672      if (state.is_34020)                              \
672      if (tms.is_34020)                              \
673673      {                                          \
674674         CLR_N;                                    \
675675         SET_N_VAL(R##REG(rd) ^ 0x80000000);               \
r3535r3536
834834#define SETF(F)                                       \
835835{                                                \
836836   UINT8 shift = F ? 6 : 0;                           \
837   state.st &= ~(0x3f << shift);                        \
838   state.st |= (state.op & 0x3f) << shift;                  \
837   tms.st &= ~(0x3f << shift);                        \
838   tms.st |= (tms.op & 0x3f) << shift;                  \
839839   COUNT_CYCLES(1+F);                                 \
840840}
841841static void setf0(void) { SETF(0); }
r3535r3536
15131513
15141514#define DSJS(R)                                       \
15151515{                                                   \
1516   if (state.op & 0x0400)                              \
1516   if (tms.op & 0x0400)                              \
15171517   {                                             \
15181518      if (--R##REG(DSTREG))                           \
15191519      {                                          \
r3535r3536
20402040}
20412041static void addxyi_a(void)
20422042{
2043   if (!state.is_34020) { unimpl(); return; }
2043   if (!tms.is_34020) { unimpl(); return; }
20442044   ADD_XYI(A);
20452045}
20462046static void addxyi_b(void)
20472047{
2048   if (!state.is_34020) { unimpl(); return; }
2048   if (!tms.is_34020) { unimpl(); return; }
20492049   ADD_XYI(B);
20502050}
20512051
r3535r3536
20552055   offs_t dst = BREG(2);
20562056   offs_t bits = BREG(7);
20572057
2058   if (!state.is_34020) { unimpl(); return; }
2058   if (!tms.is_34020) { unimpl(); return; }
20592059
20602060   /* src and dst are aligned */
20612061   if (!(src & 0x0f) && !(dst & 0x0f))
r3535r3536
21082108
21092109static void cexec_l(void)
21102110{
2111   if (!state.is_34020) { unimpl(); return; }
2111   if (!tms.is_34020) { unimpl(); return; }
21122112   logerror("020:cexec_l\n");
21132113}
21142114
21152115static void cexec_s(void)
21162116{
2117   if (!state.is_34020) { unimpl(); return; }
2117   if (!tms.is_34020) { unimpl(); return; }
21182118   logerror("020:cexec_s\n");
21192119}
21202120
21212121static void clip(void)
21222122{
2123   if (!state.is_34020) { unimpl(); return; }
2123   if (!tms.is_34020) { unimpl(); return; }
21242124   logerror("020:clip\n");
21252125}
21262126
21272127static void cmovcg_a(void)
21282128{
2129   if (!state.is_34020) { unimpl(); return; }
2129   if (!tms.is_34020) { unimpl(); return; }
21302130   logerror("020:cmovcg_a\n");
21312131}
21322132
21332133static void cmovcg_b(void)
21342134{
2135   if (!state.is_34020) { unimpl(); return; }
2135   if (!tms.is_34020) { unimpl(); return; }
21362136   logerror("020:cmovcg_b\n");
21372137}
21382138
21392139static void cmovcm_f(void)
21402140{
2141   if (!state.is_34020) { unimpl(); return; }
2141   if (!tms.is_34020) { unimpl(); return; }
21422142   logerror("020:cmovcm_f\n");
21432143}
21442144
21452145static void cmovcm_b(void)
21462146{
2147   if (!state.is_34020) { unimpl(); return; }
2147   if (!tms.is_34020) { unimpl(); return; }
21482148   logerror("020:cmovcm_b\n");
21492149}
21502150
21512151static void cmovgc_a(void)
21522152{
2153   if (!state.is_34020) { unimpl(); return; }
2153   if (!tms.is_34020) { unimpl(); return; }
21542154   logerror("020:cmovgc_a\n");
21552155}
21562156
21572157static void cmovgc_b(void)
21582158{
2159   if (!state.is_34020) { unimpl(); return; }
2159   if (!tms.is_34020) { unimpl(); return; }
21602160   logerror("020:cmovgc_b\n");
21612161}
21622162
21632163static void cmovgc_a_s(void)
21642164{
2165   if (!state.is_34020) { unimpl(); return; }
2165   if (!tms.is_34020) { unimpl(); return; }
21662166   logerror("020:cmovgc_a_s\n");
21672167}
21682168
21692169static void cmovgc_b_s(void)
21702170{
2171   if (!state.is_34020) { unimpl(); return; }
2171   if (!tms.is_34020) { unimpl(); return; }
21722172   logerror("020:cmovgc_b_s\n");
21732173}
21742174
21752175static void cmovmc_f(void)
21762176{
2177   if (!state.is_34020) { unimpl(); return; }
2177   if (!tms.is_34020) { unimpl(); return; }
21782178   logerror("020:cmovmc_f\n");
21792179}
21802180
21812181static void cmovmc_f_va(void)
21822182{
2183   if (!state.is_34020) { unimpl(); return; }
2183   if (!tms.is_34020) { unimpl(); return; }
21842184   logerror("020:cmovmc_f_va\n");
21852185}
21862186
21872187static void cmovmc_f_vb(void)
21882188{
2189   if (!state.is_34020) { unimpl(); return; }
2189   if (!tms.is_34020) { unimpl(); return; }
21902190   logerror("020:cmovmc_f_vb\n");
21912191}
21922192
21932193static void cmovmc_b(void)
21942194{
2195   if (!state.is_34020) { unimpl(); return; }
2195   if (!tms.is_34020) { unimpl(); return; }
21962196   logerror("020:cmovmc_b\n");
21972197}
21982198
r3535r3536
22082208}
22092209static void cmp_k_a(void)
22102210{
2211   if (!state.is_34020) { unimpl(); return; }
2211   if (!tms.is_34020) { unimpl(); return; }
22122212   CMPK(A);
22132213}
22142214static void cmp_k_b(void)
22152215{
2216   if (!state.is_34020) { unimpl(); return; }
2216   if (!tms.is_34020) { unimpl(); return; }
22172217   CMPK(B);
22182218}
22192219
22202220static void cvdxyl_a(void)
22212221{
2222   if (!state.is_34020) { unimpl(); return; }
2222   if (!tms.is_34020) { unimpl(); return; }
22232223   logerror("020:cvdxyl_a\n");
22242224}
22252225
22262226static void cvdxyl_b(void)
22272227{
2228   if (!state.is_34020) { unimpl(); return; }
2228   if (!tms.is_34020) { unimpl(); return; }
22292229   logerror("020:cvdxyl_b\n");
22302230}
22312231
22322232static void cvmxyl_a(void)
22332233{
2234   if (!state.is_34020) { unimpl(); return; }
2234   if (!tms.is_34020) { unimpl(); return; }
22352235   logerror("020:cvmxyl_a\n");
22362236}
22372237
22382238static void cvmxyl_b(void)
22392239{
2240   if (!state.is_34020) { unimpl(); return; }
2240   if (!tms.is_34020) { unimpl(); return; }
22412241   logerror("020:cvmxyl_b\n");
22422242}
22432243
22442244static void cvsxyl_a(void)
22452245{
2246   if (!state.is_34020) { unimpl(); return; }
2246   if (!tms.is_34020) { unimpl(); return; }
22472247   logerror("020:cvsxyl_a\n");
22482248}
22492249
22502250static void cvsxyl_b(void)
22512251{
2252   if (!state.is_34020) { unimpl(); return; }
2252   if (!tms.is_34020) { unimpl(); return; }
22532253   logerror("020:cvsxyl_b\n");
22542254}
22552255
22562256static void exgps_a(void)
22572257{
2258   if (!state.is_34020) { unimpl(); return; }
2258   if (!tms.is_34020) { unimpl(); return; }
22592259   logerror("020:exgps_a\n");
22602260}
22612261
22622262static void exgps_b(void)
22632263{
2264   if (!state.is_34020) { unimpl(); return; }
2264   if (!tms.is_34020) { unimpl(); return; }
22652265   logerror("020:exgps_b\n");
22662266}
22672267
22682268static void fline(void)
22692269{
2270   if (!state.is_34020) { unimpl(); return; }
2270   if (!tms.is_34020) { unimpl(); return; }
22712271   logerror("020:fline\n");
22722272}
22732273
22742274static void fpixeq(void)
22752275{
2276   if (!state.is_34020) { unimpl(); return; }
2276   if (!tms.is_34020) { unimpl(); return; }
22772277   logerror("020:fpixeq\n");
22782278}
22792279
22802280static void fpixne(void)
22812281{
2282   if (!state.is_34020) { unimpl(); return; }
2282   if (!tms.is_34020) { unimpl(); return; }
22832283   logerror("020:fpixne\n");
22842284}
22852285
22862286static void getps_a(void)
22872287{
2288   if (!state.is_34020) { unimpl(); return; }
2288   if (!tms.is_34020) { unimpl(); return; }
22892289   logerror("020:getps_a\n");
22902290}
22912291
22922292static void getps_b(void)
22932293{
2294   if (!state.is_34020) { unimpl(); return; }
2294   if (!tms.is_34020) { unimpl(); return; }
22952295   logerror("020:getps_b\n");
22962296}
22972297
22982298static void idle(void)
22992299{
2300   if (!state.is_34020) { unimpl(); return; }
2300   if (!tms.is_34020) { unimpl(); return; }
23012301   logerror("020:idle\n");
23022302}
23032303
23042304static void linit(void)
23052305{
2306   if (!state.is_34020) { unimpl(); return; }
2306   if (!tms.is_34020) { unimpl(); return; }
23072307   logerror("020:linit\n");
23082308}
23092309
23102310static void mwait(void)
23112311{
2312   if (!state.is_34020) { unimpl(); return; }
2312   if (!tms.is_34020) { unimpl(); return; }
23132313}
23142314
23152315static void pfill_xy(void)
23162316{
2317   if (!state.is_34020) { unimpl(); return; }
2317   if (!tms.is_34020) { unimpl(); return; }
23182318   logerror("020:pfill_xy\n");
23192319}
23202320
23212321static void pixblt_l_m_l(void)
23222322{
2323   if (!state.is_34020) { unimpl(); return; }
2323   if (!tms.is_34020) { unimpl(); return; }
23242324   logerror("020:pixblt_l_m_l\n");
23252325}
23262326
23272327static void retm(void)
23282328{
2329   if (!state.is_34020) { unimpl(); return; }
2329   if (!tms.is_34020) { unimpl(); return; }
23302330   logerror("020:retm\n");
23312331}
23322332
r3535r3536
23552355#define RPIX(R)                           \
23562356{                                    \
23572357   UINT32 v = R##REG(DSTREG);               \
2358   switch (state.pixelshift)               \
2358   switch (tms.pixelshift)               \
23592359   {                                 \
23602360      case 0:                           \
23612361         v = (v & 1) ? 0xffffffff : 0x00000000;\
r3535r3536
23962396
23972397static void rpix_a(void)
23982398{
2399   if (!state.is_34020) { unimpl(); return; }
2399   if (!tms.is_34020) { unimpl(); return; }
24002400   RPIX(A);
24012401}
24022402
24032403static void rpix_b(void)
24042404{
2405   if (!state.is_34020) { unimpl(); return; }
2405   if (!tms.is_34020) { unimpl(); return; }
24062406   RPIX(B);
24072407}
24082408
24092409static void setcdp(void)
24102410{
2411   if (!state.is_34020) { unimpl(); return; }
2411   if (!tms.is_34020) { unimpl(); return; }
24122412   logerror("020:setcdp\n");
24132413}
24142414
24152415static void setcmp(void)
24162416{
2417   if (!state.is_34020) { unimpl(); return; }
2417   if (!tms.is_34020) { unimpl(); return; }
24182418   logerror("020:setcmp\n");
24192419}
24202420
24212421static void setcsp(void)
24222422{
2423   if (!state.is_34020) { unimpl(); return; }
2423   if (!tms.is_34020) { unimpl(); return; }
24242424   logerror("020:setcsp\n");
24252425}
24262426
24272427static void swapf_a(void)
24282428{
2429   if (!state.is_34020) { unimpl(); return; }
2429   if (!tms.is_34020) { unimpl(); return; }
24302430   logerror("020:swapf_a\n");
24312431}
24322432
24332433static void swapf_b(void)
24342434{
2435   if (!state.is_34020) { unimpl(); return; }
2435   if (!tms.is_34020) { unimpl(); return; }
24362436   logerror("020:swapf_b\n");
24372437}
24382438
24392439static void tfill_xy(void)
24402440{
2441   if (!state.is_34020) { unimpl(); return; }
2441   if (!tms.is_34020) { unimpl(); return; }
24422442   logerror("020:tfill_xy\n");
24432443}
24442444
24452445static void trapl(void)
24462446{
2447   if (!state.is_34020) { unimpl(); return; }
2447   if (!tms.is_34020) { unimpl(); return; }
24482448   logerror("020:trapl\n");
24492449}
24502450
24512451static void vblt_b_l(void)
24522452{
2453   if (!state.is_34020) { unimpl(); return; }
2453   if (!tms.is_34020) { unimpl(); return; }
24542454   logerror("020:vblt_b_l\n");
24552455}
24562456
24572457static void vfill_l(void)
24582458{
2459   if (!state.is_34020) { unimpl(); return; }
2459   if (!tms.is_34020) { unimpl(); return; }
24602460   logerror("020:vfill_l\n");
24612461}
24622462
24632463static void vlcol(void)
24642464{
2465   if (!state.is_34020) { unimpl(); return; }
2465   if (!tms.is_34020) { unimpl(); return; }
24662466   logerror("020:vlcol\n");
24672467}
src/emu/cpu/tms34010/34010dsm.c
r3535r3536
17421742   return (_pc - __pc) | flags | DASMFLAG_SUPPORTED;
17431743}
17441744
1745offs_t tms34010_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
1745CPU_DISASSEMBLE( tms34010 )
17461746{
17471747   rombase = oprom;
17481748   rambase = opram;
r3535r3536
17501750   return Dasm340x0(buffer, pc, 0);
17511751}
17521752
1753offs_t tms34020_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
1753CPU_DISASSEMBLE( tms34020 )
17541754{
17551755   rombase = oprom;
17561756   rambase = opram;
src/emu/cpu/tms34010/tms34010.c
r3535r3536
5959   UINT8 is_34020;
6060   UINT8 reset_deferred;
6161   UINT8 hblank_stable;
62   int (*irq_callback)(int irqline);
62   cpu_irq_callback irq_callback;
63   const device_config *device;
6364   const tms34010_config *config;
6465   const device_config *screen;
6566   emu_timer *scantimer;
r3535r3536
8990static int   tms34010_ICount;
9091
9192/* internal state */
92static tms34010_regs       state;
93static tms34010_regs       tms;
9394static UINT8            external_host_access;
9495static const device_config   *screen_to_cpu[MAX_CPU];
9596static UINT8            executing_cpu = 0xff;
r3535r3536
130131#define STBITS_F0      (0x1f << 0)
131132
132133/* register definitions and shortcuts */
133#define PC            (state.pc)
134#define ST            (state.st)
135#define N_FLAG         (state.st & STBIT_N)
136#define Z_FLAG         (state.st & STBIT_Z)
137#define C_FLAG         (state.st & STBIT_C)
138#define V_FLAG         (state.st & STBIT_V)
139#define P_FLAG         (state.st & STBIT_P)
140#define IE_FLAG         (state.st & STBIT_IE)
141#define FE0_FLAG      (state.st & STBIT_FE0)
142#define FE1_FLAG      (state.st & STBIT_FE1)
134#define PC            (tms.pc)
135#define ST            (tms.st)
136#define N_FLAG         (tms.st & STBIT_N)
137#define Z_FLAG         (tms.st & STBIT_Z)
138#define C_FLAG         (tms.st & STBIT_C)
139#define V_FLAG         (tms.st & STBIT_V)
140#define P_FLAG         (tms.st & STBIT_P)
141#define IE_FLAG         (tms.st & STBIT_IE)
142#define FE0_FLAG      (tms.st & STBIT_FE0)
143#define FE1_FLAG      (tms.st & STBIT_FE1)
143144
144145/* register file access */
145#define AREG(i)         (state.regs[i].reg)
146#define AREG_XY(i)      (state.regs[i].xy)
147#define AREG_X(i)      (state.regs[i].xy.x)
148#define AREG_Y(i)      (state.regs[i].xy.y)
149#define BREG(i)         (state.regs[30 - (i)].reg)
150#define BREG_XY(i)      (state.regs[30 - (i)].xy)
151#define BREG_X(i)      (state.regs[30 - (i)].xy.x)
152#define BREG_Y(i)      (state.regs[30 - (i)].xy.y)
146#define AREG(i)         (tms.regs[i].reg)
147#define AREG_XY(i)      (tms.regs[i].xy)
148#define AREG_X(i)      (tms.regs[i].xy.x)
149#define AREG_Y(i)      (tms.regs[i].xy.y)
150#define BREG(i)         (tms.regs[30 - (i)].reg)
151#define BREG_XY(i)      (tms.regs[30 - (i)].xy)
152#define BREG_X(i)      (tms.regs[30 - (i)].xy.x)
153#define BREG_Y(i)      (tms.regs[30 - (i)].xy.y)
153154#define SP            AREG(15)
154#define FW(i)         ((state.st >> (i ? 6 : 0)) & 0x1f)
155#define FWEX(i)         ((state.st >> (i ? 6 : 0)) & 0x3f)
155#define FW(i)         ((tms.st >> (i ? 6 : 0)) & 0x1f)
156#define FWEX(i)         ((tms.st >> (i ? 6 : 0)) & 0x3f)
156157
157158/* opcode decode helpers */
158#define SRCREG         ((state.op >> 5) & 0x0f)
159#define DSTREG         (state.op & 0x0f)
159#define SRCREG         ((tms.op >> 5) & 0x0f)
160#define DSTREG         (tms.op & 0x0f)
160161#define SKIP_WORD      (PC += (2 << 3))
161162#define SKIP_LONG      (PC += (4 << 3))
162#define PARAM_K         ((state.op >> 5) & 0x1f)
163#define PARAM_N         (state.op & 0x1f)
164#define PARAM_REL8      ((INT8)state.op)
163#define PARAM_K         ((tms.op >> 5) & 0x1f)
164#define PARAM_N         (tms.op & 0x1f)
165#define PARAM_REL8      ((INT8)tms.op)
165166
166167/* memory I/O */
167168#define WFIELD0(a,b)   (*tms34010_wfield_functions[FW(0)])(a,b)
168169#define WFIELD1(a,b)   (*tms34010_wfield_functions[FW(1)])(a,b)
169170#define RFIELD0(a)      (*tms34010_rfield_functions[FWEX(0)])(a)
170171#define RFIELD1(a)      (*tms34010_rfield_functions[FWEX(1)])(a)
171#define WPIXEL(a,b)      state.pixel_write(a,b)
172#define RPIXEL(a)      state.pixel_read(a)
172#define WPIXEL(a,b)      tms.pixel_write(a,b)
173#define RPIXEL(a)      tms.pixel_read(a)
173174
174175/* Implied Operands */
175176#define SADDR         BREG(0)
r3535r3536
211212/* Combine indiviual flags into the Status Register */
212213INLINE UINT32 GET_ST(void)
213214{
214   return state.st;
215   return tms.st;
215216}
216217
217218/* Break up Status Register into indiviual flags */
218219INLINE void SET_ST(UINT32 st)
219220{
220   state.st = st;
221   tms.st = st;
221222   /* interrupts might have been enabled, check it */
222223   check_interrupt();
223224}
r3535r3536
329330/* Shift register read */
330331static UINT32 read_pixel_shiftreg(offs_t offset)
331332{
332   if (state.config->to_shiftreg)
333      state.config->to_shiftreg(offset, &state.shiftreg[0]);
333   if (tms.config->to_shiftreg)
334      tms.config->to_shiftreg(offset, &tms.shiftreg[0]);
334335   else
335336      fatalerror("To ShiftReg function not set. PC = %08X\n", PC);
336   return state.shiftreg[0];
337   return tms.shiftreg[0];
337338}
338339
339340
r3535r3536
375376   UINT32 shiftcount = offset & m1;                                          \
376377                                                                     \
377378   /* TODO: plane masking */                                                \
378   data = state.raster_op(data & m2, (pix >> shiftcount) & m2) & m2;                  \
379   data = tms.raster_op(data & m2, (pix >> shiftcount) & m2) & m2;                  \
379380   pix = (pix & ~(m2 << shiftcount)) | (data << shiftcount);                        \
380381   TMS34010_WRMEM_WORD(a, pix);                                             \
381382
r3535r3536
386387   UINT32 shiftcount = offset & m1;                                          \
387388                                                                     \
388389   /* TODO: plane masking */                                                \
389   data = state.raster_op(data & m2, (pix >> shiftcount) & m2) & m2;                  \
390   data = tms.raster_op(data & m2, (pix >> shiftcount) & m2) & m2;                  \
390391   if (data)                                                            \
391392   {                                                                  \
392393      pix = (pix & ~(m2 << shiftcount)) | (data << shiftcount);                     \
r3535r3536
437438{
438439   /* TODO: plane masking */
439440   UINT32 a = TOBYTE(offset & 0xfffffff0);
440   TMS34010_WRMEM_WORD(a, state.raster_op(data, TMS34010_RDMEM_WORD(a)));
441   TMS34010_WRMEM_WORD(a, tms.raster_op(data, TMS34010_RDMEM_WORD(a)));
441442}
442443static void write_pixel_r_32(offs_t offset, UINT32 data)
443444{
444445   /* TODO: plane masking */
445446   UINT32 a = TOBYTE(offset & 0xffffffe0);
446   TMS34010_WRMEM_DWORD(a, state.raster_op(data, TMS34010_RDMEM_DWORD(a)));
447   TMS34010_WRMEM_DWORD(a, tms.raster_op(data, TMS34010_RDMEM_DWORD(a)));
447448}
448449
449450/* Raster Op + Transparency */
r3535r3536
455456{
456457   /* TODO: plane masking */
457458   UINT32 a = TOBYTE(offset & 0xfffffff0);
458   data = state.raster_op(data, TMS34010_RDMEM_WORD(a));
459   data = tms.raster_op(data, TMS34010_RDMEM_WORD(a));
459460
460461   if (data)
461462      TMS34010_WRMEM_WORD(a, data);
r3535r3536
464465{
465466   /* TODO: plane masking */
466467   UINT32 a = TOBYTE(offset & 0xffffffe0);
467   data = state.raster_op(data, TMS34010_RDMEM_DWORD(a));
468   data = tms.raster_op(data, TMS34010_RDMEM_DWORD(a));
468469
469470   if (data)
470471      TMS34010_WRMEM_DWORD(a, data);
r3535r3536
473474/* Shift register write */
474475static void write_pixel_shiftreg(offs_t offset, UINT32 data)
475476{
476   if (state.config->from_shiftreg)
477      state.config->from_shiftreg(offset, &state.shiftreg[0]);
477   if (tms.config->from_shiftreg)
478      tms.config->from_shiftreg(offset, &tms.shiftreg[0]);
478479   else
479480      fatalerror("From ShiftReg function not set. PC = %08X\n", PC);
480481}
r3535r3536
620621
621622      /* call the callback for externals */
622623      if (irqline >= 0)
623         (void)(*state.irq_callback)(irqline);
624         (void)(*tms.irq_callback)(tms.device, irqline);
624625   }
625626}
626627
r3535r3536
630631    Reset the CPU emulation
631632***************************************************************************/
632633
633static void tms34010_init(int index, int clock, const void *_config, int (*irqcallback)(int))
634static CPU_INIT( tms34010 )
634635{
635   const tms34010_config *config = _config ? _config : &default_config;
636   const tms34010_config *configdata = config ? config : &default_config;
636637
637638   external_host_access = FALSE;
638639
639   state.config = config;
640   state.irq_callback = irqcallback;
641   state.screen = device_list_find_by_tag(Machine->config->devicelist, VIDEO_SCREEN, config->screen_tag);
640   tms.config = configdata;
641   tms.irq_callback = irqcallback;
642   tms.device = device;
643   tms.screen = device_list_find_by_tag(device->machine->config->devicelist, VIDEO_SCREEN, configdata->screen_tag);
642644
643645   /* if we have a scanline callback, make us the owner of this screen */
644   if (config->scanline_callback != NULL)
646   if (configdata->scanline_callback != NULL)
645647   {
646648      int i;
647649
r3535r3536
650652            break;
651653
652654      assert(i != MAX_CPU);
653      screen_to_cpu[i] = state.screen;
655      screen_to_cpu[i] = tms.screen;
654656   }
655657
656658   /* allocate a scanline timer and set it to go off at the start */
657   state.scantimer = timer_alloc(scanline_callback, NULL);
658   timer_adjust_oneshot(state.scantimer, attotime_zero, index);
659   tms.scantimer = timer_alloc(scanline_callback, NULL);
660   timer_adjust_oneshot(tms.scantimer, attotime_zero, index);
659661
660662   /* allocate the shiftreg */
661   state.shiftreg = auto_malloc(SHIFTREG_SIZE);
663   tms.shiftreg = auto_malloc(SHIFTREG_SIZE);
662664
663   state_save_register_item("tms34010", index, state.op);
664   state_save_register_item("tms34010", index, state.pc);
665   state_save_register_item("tms34010", index, state.st);
666   state_save_register_item("tms34010", index, state.reset_deferred);
667   state_save_register_item_pointer("tms34010", index, state.shiftreg, SHIFTREG_SIZE / 2);
668   state_save_register_item_array("tms34010", index, state.IOregs);
669   state_save_register_item("tms34010", index, state.convsp);
670   state_save_register_item("tms34010", index, state.convdp);
671   state_save_register_item("tms34010", index, state.convmp);
672   state_save_register_item("tms34010", index, state.pixelshift);
673   state_save_register_item("tms34010", index, state.gfxcycles);
674   state_save_register_item_pointer("tms34010", index, (&state.regs[0].reg), ARRAY_LENGTH(state.regs));
665   state_save_register_item("tms34010", index, tms.op);
666   state_save_register_item("tms34010", index, tms.pc);
667   state_save_register_item("tms34010", index, tms.st);
668   state_save_register_item("tms34010", index, tms.reset_deferred);
669   state_save_register_item_pointer("tms34010", index, tms.shiftreg, SHIFTREG_SIZE / 2);
670   state_save_register_item_array("tms34010", index, tms.IOregs);
671   state_save_register_item("tms34010", index, tms.convsp);
672   state_save_register_item("tms34010", index, tms.convdp);
673   state_save_register_item("tms34010", index, tms.convmp);
674   state_save_register_item("tms34010", index, tms.pixelshift);
675   state_save_register_item("tms34010", index, tms.gfxcycles);
676   state_save_register_item_pointer("tms34010", index, (&tms.regs[0].reg), ARRAY_LENGTH(tms.regs));
675677   state_save_register_postload(Machine, tms34010_state_postload, NULL);
676678}
677679
678static void tms34010_reset(void)
680static CPU_RESET( tms34010 )
679681{
680682   /* zap the state and copy in the config pointer */
681   const tms34010_config *config = state.config;
682   const device_config *screen = state.screen;
683   UINT16 *shiftreg = state.shiftreg;
684   int (*save_irqcallback)(int) = state.irq_callback;
685   emu_timer *save_scantimer = state.scantimer;
683   const tms34010_config *config = tms.config;
684   const device_config *screen = tms.screen;
685   UINT16 *shiftreg = tms.shiftreg;
686   cpu_irq_callback save_irqcallback = tms.irq_callback;
687   const device_config *save_device = tms.device;
688   emu_timer *save_scantimer = tms.scantimer;
686689
687   memset(&state, 0, sizeof(state));
690   memset(&tms, 0, sizeof(tms));
688691
689   state.config = config;
690   state.screen = screen;
691   state.shiftreg = shiftreg;
692   state.irq_callback = save_irqcallback;
693   state.scantimer = save_scantimer;
692   tms.config = config;
693   tms.screen = screen;
694   tms.shiftreg = shiftreg;
695   tms.irq_callback = save_irqcallback;
696   tms.device = save_device;
697   tms.scantimer = save_scantimer;
694698
695699   /* fetch the initial PC and reset the state */
696700   PC = RLONG(0xffffffe0) & 0xfffffff0;
r3535r3536
699703
700704   /* HALT the CPU if requested, and remember to re-read the starting PC */
701705   /* the first time we are run */
702   state.reset_deferred = state.config->halt_on_reset;
703   if (state.config->halt_on_reset)
706   tms.reset_deferred = tms.config->halt_on_reset;
707   if (tms.config->halt_on_reset)
704708      tms34010_io_register_w(Machine, REG_HSTCTLH, 0x8000, 0xffff);
705709}
706710
707711#if (HAS_TMS34020)
708static void tms34020_reset(void)
712static CPU_RESET( tms34020 )
709713{
710   tms34010_reset();
711   state.is_34020 = 1;
714   CPU_RESET_CALL(tms34010);
715   tms.is_34020 = 1;
712716}
713717#endif
714718
r3535r3536
718722    Shut down the CPU emulation
719723***************************************************************************/
720724
721static void tms34010_exit(void)
725static CPU_EXIT( tms34010 )
722726{
723   state.shiftreg = NULL;
727   tms.shiftreg = NULL;
724728}
725729
726730
r3535r3536
729733    Get all registers in given buffer
730734***************************************************************************/
731735
732static void tms34010_get_context(void *dst)
736static CPU_GET_CONTEXT( tms34010 )
733737{
734738   if (dst)
735      memcpy(dst, &state, TMS34010_STATE_SIZE);
739      memcpy(dst, &tms, TMS34010_STATE_SIZE);
736740}
737741
738742#if (HAS_TMS34020)
739static void tms34020_get_context(void *dst)
743static CPU_GET_CONTEXT( tms34020 )
740744{
741745   if (dst)
742      memcpy(dst, &state, TMS34020_STATE_SIZE);
746      memcpy(dst, &tms, TMS34020_STATE_SIZE);
743747}
744748#endif
745749
r3535r3536
749753    Set all registers to given values
750754***************************************************************************/
751755
752static void tms34010_set_context(void *src)
756static CPU_SET_CONTEXT( tms34010 )
753757{
754758   if (src)
755      memcpy(&state, src, TMS34010_STATE_SIZE);
759      memcpy(&tms, src, TMS34010_STATE_SIZE);
756760   change_pc(TOBYTE(PC));
757761}
758762
759763#if (HAS_TMS34020)
760static void tms34020_set_context(void *src)
764static CPU_SET_CONTEXT( tms34020 )
761765{
762766   if (src)
763      memcpy(&state, src, TMS34020_STATE_SIZE);
767      memcpy(&tms, src, TMS34020_STATE_SIZE);
764768   change_pc(TOBYTE(PC));
765769}
766770#endif
r3535r3536
821825    Execute
822826***************************************************************************/
823827
824static int tms34010_execute(int cycles)
828static CPU_EXECUTE( tms34010 )
825829{
826830   /* Get out if CPU is halted. Absolutely no interrupts must be taken!!! */
827831   if (IOREG(REG_HSTCTLH) & 0x8000)
828832      return cycles;
829833
830834   /* if the CPU's reset was deferred, do it now */
831   if (state.reset_deferred)
835   if (tms.reset_deferred)
832836   {
833      state.reset_deferred = 0;
837      tms.reset_deferred = 0;
834838      PC = RLONG(0xffffffe0);
835839   }
836840
r3535r3536
841845   /* check interrupts first */
842846   executing_cpu = cpu_getactivecpu();
843847   check_interrupt();
844   if ((state.screen->machine->debug_flags & DEBUG_FLAG_ENABLED) == 0)
848   if ((tms.screen->machine->debug_flags & DEBUG_FLAG_ENABLED) == 0)
845849   {
846850      do
847851      {
848         state.op = ROPCODE();
849         (*opcode_table[state.op >> 4])();
852         tms.op = ROPCODE();
853         (*opcode_table[tms.op >> 4])();
850854      } while (tms34010_ICount > 0);
851855   }
852856   else
853857   {
854858      do
855859      {
856         if ((state.screen->machine->debug_flags & DEBUG_FLAG_CALL_HOOK) != 0)
860         if ((tms.screen->machine->debug_flags & DEBUG_FLAG_CALL_HOOK) != 0)
857861         {
858            state.st = GET_ST();
862            tms.st = GET_ST();
859863            debugger_instruction_hook(Machine, PC);
860864         }
861         state.op = ROPCODE();
862         (*opcode_table[state.op >> 4])();
865         tms.op = ROPCODE();
866         (*opcode_table[tms.op >> 4])();
863867      } while (tms34010_ICount > 0);
864868   }
865869   executing_cpu = 0xff;
r3535r3536
894898   if (IOREG(REG_DPYCTL) & 0x0800)
895899   {
896900      /* Shift Register Transfer */
897      state.pixel_write = write_pixel_shiftreg;
898      state.pixel_read  = read_pixel_shiftreg;
901      tms.pixel_write = write_pixel_shiftreg;
902      tms.pixel_read  = read_pixel_shiftreg;
899903      return;
900904   }
901905
r3535r3536
911915   }
912916
913917   if (IOREG(REG_CONTROL) & 0x20)
914      i1 = state.raster_op ? 3 : 2;
918      i1 = tms.raster_op ? 3 : 2;
915919   else
916      i1 = state.raster_op ? 1 : 0;
920      i1 = tms.raster_op ? 1 : 0;
917921
918   state.pixel_write = pixel_write_ops[i1][i2];
919   state.pixel_read  = pixel_read_ops [i2];
922   tms.pixel_write = pixel_write_ops[i1][i2];
923   tms.pixel_read  = pixel_read_ops [i2];
920924}
921925
922926
r3535r3536
940944
941945static void set_raster_op(void)
942946{
943   state.raster_op = raster_ops[(IOREG(REG_CONTROL) >> 10) & 0x1f];
947   tms.raster_op = raster_ops[(IOREG(REG_CONTROL) >> 10) & 0x1f];
944948}
945949
946950
r3535r3536
962966   cpuintrf_push_context(cpunum);
963967
964968   /* fetch the core timing parameters */
965   current_visarea = video_screen_get_visible_area(state.screen);
969   current_visarea = video_screen_get_visible_area(tms.screen);
966970   enabled = SMART_IOREG(DPYCTL) & 0x8000;
967   master = (state.is_34020 || (SMART_IOREG(DPYCTL) & 0x2000));
971   master = (tms.is_34020 || (SMART_IOREG(DPYCTL) & 0x2000));
968972   vsblnk = SMART_IOREG(VSBLNK);
969973   veblnk = SMART_IOREG(VEBLNK);
970974   vtotal = SMART_IOREG(VTOTAL);
971975   if (!master)
972976   {
973      vtotal = MIN(video_screen_get_height(state.screen) - 1, vtotal);
974      vcount = video_screen_get_vpos(state.screen);
977      vtotal = MIN(video_screen_get_height(tms.screen) - 1, vtotal);
978      vcount = video_screen_get_vpos(tms.screen);
975979   }
976980
977981   /* update the VCOUNT */
r3535r3536
988992   if (vcount == vsblnk)
989993   {
990994      /* 34010 loads DPYADR with DPYSTRT, and inverts if the origin is 0 */
991      if (!state.is_34020)
995      if (!tms.is_34020)
992996      {
993997         IOREG(REG_DPYADR) = IOREG(REG_DPYSTRT);
994998         LOG(("Start of VBLANK, DPYADR = %04X\n", IOREG(REG_DPYADR)));
r3535r3536
10071011   {
10081012      /* only do this if we have an incoming pixel clock */
10091013      /* also, only do it if the HEBLNK/HSBLNK values are stable */
1010      if (master && state.config->scanline_callback != NULL)
1014      if (master && tms.config->scanline_callback != NULL)
10111015      {
10121016         int htotal = SMART_IOREG(HTOTAL);
10131017         if (htotal > 0 && vtotal > 0)
10141018         {
1015            attoseconds_t refresh = HZ_TO_ATTOSECONDS(state.config->pixclock) * (htotal + 1) * (vtotal + 1);
1016            int width = (htotal + 1) * state.config->pixperclock;
1019            attoseconds_t refresh = HZ_TO_ATTOSECONDS(tms.config->pixclock) * (htotal + 1) * (vtotal + 1);
1020            int width = (htotal + 1) * tms.config->pixperclock;
10171021            int height = vtotal + 1;
10181022            rectangle visarea;
10191023
10201024            /* extract the visible area */
1021            visarea.min_x = SMART_IOREG(HEBLNK) * state.config->pixperclock;
1022            visarea.max_x = SMART_IOREG(HSBLNK) * state.config->pixperclock - 1;
1025            visarea.min_x = SMART_IOREG(HEBLNK) * tms.config->pixperclock;
1026            visarea.max_x = SMART_IOREG(HSBLNK) * tms.config->pixperclock - 1;
10231027            visarea.min_y = veblnk;
10241028            visarea.max_y = vsblnk - 1;
10251029
r3535r3536
10291033               /* because many games play with the HEBLNK/HSBLNK for effects, we don't change
10301034                       if they are the only thing that has changed, unless they are stable for a couple
10311035                       of frames */
1032               int current_width  = video_screen_get_width(state.screen);
1033               int current_height = video_screen_get_height(state.screen);
1036               int current_width  = video_screen_get_width(tms.screen);
1037               int current_height = video_screen_get_height(tms.screen);
10341038
10351039               if (width != current_width || height != current_height || visarea.min_y != current_visarea->min_y || visarea.max_y != current_visarea->max_y ||
1036                  (state.hblank_stable > 2 && (visarea.min_x != current_visarea->min_x || visarea.max_x != current_visarea->max_x)))
1040                  (tms.hblank_stable > 2 && (visarea.min_x != current_visarea->min_x || visarea.max_x != current_visarea->max_x)))
10371041               {
1038                  video_screen_configure(state.screen, width, height, &visarea, refresh);
1042                  video_screen_configure(tms.screen, width, height, &visarea, refresh);
10391043               }
1040               state.hblank_stable++;
1044               tms.hblank_stable++;
10411045            }
10421046
10431047            LOG(("Configuring screen: HTOTAL=%3d BLANK=%3d-%3d VTOTAL=%3d BLANK=%3d-%3d refresh=%f\n",
r3535r3536
10511055   }
10521056
10531057   /* force a partial update within the visible area */
1054   if (vcount >= current_visarea->min_y && vcount <= current_visarea->max_y && state.config->scanline_callback != NULL)
1055      video_screen_update_partial(state.screen, vcount);
1058   if (vcount >= current_visarea->min_y && vcount <= current_visarea->max_y && tms.config->scanline_callback != NULL)
1059      video_screen_update_partial(tms.screen, vcount);
10561060
10571061   /* if we are in the visible area, increment DPYADR by DUDATE */
10581062   if (vcount >= veblnk && vcount < vsblnk)
10591063   {
10601064      /* 34010 increments by the DUDATE field in DPYCTL */
1061      if (!state.is_34020)
1065      if (!tms.is_34020)
10621066      {
10631067         UINT16 dpyadr = IOREG(REG_DPYADR);
10641068         if ((dpyadr & 3) == 0)
r3535r3536
10881092
10891093   /* note that we add !master (0 or 1) as a attoseconds value; this makes no practical difference */
10901094   /* but helps ensure that masters are updated first before slaves */
1091   timer_adjust_oneshot(state.scantimer, attotime_add_attoseconds(video_screen_get_time_until_pos(state.screen, vcount, 0), !master), cpunum | (vcount << 8));
1095   timer_adjust_oneshot(tms.scantimer, attotime_add_attoseconds(video_screen_get_time_until_pos(tms.screen, vcount, 0), !master), cpunum | (vcount << 8));
10921096
10931097   /* restore the context */
10941098   cpuintrf_pop_context();
r3535r3536
11031107   params->vcount = SMART_IOREG(VCOUNT);
11041108   params->veblnk = SMART_IOREG(VEBLNK);
11051109   params->vsblnk = SMART_IOREG(VSBLNK);
1106   params->heblnk = SMART_IOREG(HEBLNK) * state.config->pixperclock;
1107   params->hsblnk = SMART_IOREG(HSBLNK) * state.config->pixperclock;
1110   params->heblnk = SMART_IOREG(HEBLNK) * tms.config->pixperclock;
1111   params->hsblnk = SMART_IOREG(HSBLNK) * tms.config->pixperclock;
11081112
11091113   /* 34010 gets its address from DPYADR and DPYTAP */
1110   if (!state.is_34020)
1114   if (!tms.is_34020)
11111115   {
11121116      UINT16 dpyadr = IOREG(REG_DPYADR);
11131117      if (!(IOREG(REG_DPYCTL) & 0x0400))
r3535r3536
11531157   {
11541158      /* call through to the callback */
11551159      LOG(("  Update: scan=%3d ROW=%04X COL=%04X\n", cliprect->min_y, params.rowaddr, params.coladdr));
1156      (*state.config->scanline_callback)(screen, bitmap, cliprect->min_y, &params);
1160      (*tms.config->scanline_callback)(screen, bitmap, cliprect->min_y, &params);
11571161   }
11581162
11591163   /* otherwise, just blank the current scanline */
r3535r3536
12201224         switch (data)
12211225         {
12221226            default:
1223            case 0x01: state.pixelshift = 0; break;
1224            case 0x02: state.pixelshift = 1; break;
1225            case 0x04: state.pixelshift = 2; break;
1226            case 0x08: state.pixelshift = 3; break;
1227            case 0x10: state.pixelshift = 4; break;
1227            case 0x01: tms.pixelshift = 0; break;
1228            case 0x02: tms.pixelshift = 1; break;
1229            case 0x04: tms.pixelshift = 2; break;
1230            case 0x08: tms.pixelshift = 3; break;
1231            case 0x10: tms.pixelshift = 4; break;
12281232         }
12291233         break;
12301234
r3535r3536
12401244         /* if the CPU is halting itself, stop execution right away */
12411245         if ((data & 0x8000) && !external_host_access)
12421246            tms34010_ICount = 0;
1243         cpunum_set_input_line(state.screen->machine, cpunum, INPUT_LINE_HALT, (data & 0x8000) ? ASSERT_LINE : CLEAR_LINE);
1247         cpunum_set_input_line(tms.screen->machine, cpunum, INPUT_LINE_HALT, (data & 0x8000) ? ASSERT_LINE : CLEAR_LINE);
12441248
12451249         /* NMI issued? */
12461250         if (data & 0x0100)
r3535r3536
12681272         /* the TMS34010 can set output interrupt? */
12691273         if (!(oldreg & 0x0080) && (newreg & 0x0080))
12701274         {
1271            if (state.config->output_int)
1272               (*state.config->output_int)(1);
1275            if (tms.config->output_int)
1276               (*tms.config->output_int)(1);
12731277         }
12741278         else if ((oldreg & 0x0080) && !(newreg & 0x0080))
12751279         {
1276            if (state.config->output_int)
1277               (*state.config->output_int)(0);
1280            if (tms.config->output_int)
1281               (*tms.config->output_int)(0);
12781282         }
12791283
12801284         /* input interrupt? (should really be state-based, but the functions don't exist!) */
r3535r3536
12851289         break;
12861290
12871291      case REG_CONVSP:
1288         state.convsp = 1 << (~data & 0x1f);
1292         tms.convsp = 1 << (~data & 0x1f);
12891293         break;
12901294
12911295      case REG_CONVDP:
1292         state.convdp = 1 << (~data & 0x1f);
1296         tms.convdp = 1 << (~data & 0x1f);
12931297         break;
12941298
12951299      case REG_INTENB:
r3535r3536
13091313      case REG_HEBLNK:
13101314      case REG_HSBLNK:
13111315         if (oldreg != data)
1312            state.hblank_stable = 0;
1316            tms.hblank_stable = 0;
13131317         break;
13141318   }
13151319
13161320   if (LOG_CONTROL_REGS)
1317      logerror("CPU#%d@%08X: %s = %04X (%d)\n", cpunum, activecpu_get_pc(), ioreg_name[offset], IOREG(offset), video_screen_get_vpos(state.screen));
1321      logerror("CPU#%d@%08X: %s = %04X (%d)\n", cpunum, activecpu_get_pc(), ioreg_name[offset], IOREG(offset), video_screen_get_vpos(tms.screen));
13181322}
13191323
13201324
r3535r3536
13511355   IOREG(offset) = data;
13521356
13531357   if (LOG_CONTROL_REGS)
1354      logerror("CPU#%d@%08X: %s = %04X (%d)\n", cpunum, activecpu_get_pc(), ioreg020_name[offset], IOREG(offset), video_screen_get_vpos(state.screen));
1358      logerror("CPU#%d@%08X: %s = %04X (%d)\n", cpunum, activecpu_get_pc(), ioreg020_name[offset], IOREG(offset), video_screen_get_vpos(tms.screen));
13551359
13561360   switch (offset)
13571361   {
r3535r3536
13691373         switch (data)
13701374         {
13711375            default:
1372            case 0x01: state.pixelshift = 0; break;
1373            case 0x02: state.pixelshift = 1; break;
1374            case 0x04: state.pixelshift = 2; break;
1375            case 0x08: state.pixelshift = 3; break;
1376            case 0x10: state.pixelshift = 4; break;
1377            case 0x20: state.pixelshift = 5; break;
1376            case 0x01: tms.pixelshift = 0; break;
1377            case 0x02: tms.pixelshift = 1; break;
1378            case 0x04: tms.pixelshift = 2; break;
1379            case 0x08: tms.pixelshift = 3; break;
1380            case 0x10: tms.pixelshift = 4; break;
1381            case 0x20: tms.pixelshift = 5; break;
13781382         }
13791383         break;
13801384
r3535r3536
13911395         /* if the CPU is halting itself, stop execution right away */
13921396         if ((data & 0x8000) && !external_host_access)
13931397            tms34010_ICount = 0;
1394         cpunum_set_input_line(state.screen->machine, cpunum, INPUT_LINE_HALT, (data & 0x8000) ? ASSERT_LINE : CLEAR_LINE);
1398         cpunum_set_input_line(tms.screen->machine, cpunum, INPUT_LINE_HALT, (data & 0x8000) ? ASSERT_LINE : CLEAR_LINE);
13951399
13961400         /* NMI issued? */
13971401         if (data & 0x0100)
r3535r3536
14191423         /* the TMS34010 can set output interrupt? */
14201424         if (!(oldreg & 0x0080) && (newreg & 0x0080))
14211425         {
1422            if (state.config->output_int)
1423               (*state.config->output_int)(1);
1426            if (tms.config->output_int)
1427               (*tms.config->output_int)(1);
14241428         }
14251429         else if ((oldreg & 0x0080) && !(newreg & 0x0080))
14261430         {
1427            if (state.config->output_int)
1428               (*state.config->output_int)(0);
1431            if (tms.config->output_int)
1432               (*tms.config->output_int)(0);
14291433         }
14301434
14311435         /* input interrupt? (should really be state-based, but the functions don't exist!) */
r3535r3536
14531457         if (data & 0x001f)
14541458         {
14551459            if (data & 0x1f00)
1456               state.convsp = (1 << (~data & 0x1f)) + (1 << (~(data >> 8) & 0x1f));
1460               tms.convsp = (1 << (~data & 0x1f)) + (1 << (~(data >> 8) & 0x1f));
14571461            else
1458               state.convsp = 1 << (~data & 0x1f);
1462               tms.convsp = 1 << (~data & 0x1f);
14591463         }
14601464         else
1461            state.convsp = data;
1465            tms.convsp = data;
14621466         break;
14631467
14641468      case REG020_CONVDP:
14651469         if (data & 0x001f)
14661470         {
14671471            if (data & 0x1f00)
1468               state.convdp = (1 << (~data & 0x1f)) + (1 << (~(data >> 8) & 0x1f));
1472               tms.convdp = (1 << (~data & 0x1f)) + (1 << (~(data >> 8) & 0x1f));
14691473            else
1470               state.convdp = 1 << (~data & 0x1f);
1474               tms.convdp = 1 << (~data & 0x1f);
14711475         }
14721476         else
1473            state.convdp = data;
1477            tms.convdp = data;
14741478         break;
14751479
14761480      case REG020_CONVMP:
14771481         if (data & 0x001f)
14781482         {
14791483            if (data & 0x1f00)
1480               state.convmp = (1 << (~data & 0x1f)) + (1 << (~(data >> 8) & 0x1f));
1484               tms.convmp = (1 << (~data & 0x1f)) + (1 << (~(data >> 8) & 0x1f));
14811485            else
1482               state.convmp = 1 << (~data & 0x1f);
1486               tms.convmp = 1 << (~data & 0x1f);
14831487         }
14841488         else
1485            state.convmp = data;
1489            tms.convmp = data;
14861490         break;
14871491
14881492      case REG020_DPYSTRT:
r3535r3536
14931497      case REG020_HEBLNK:
14941498      case REG020_HSBLNK:
14951499         if (oldreg != data)
1496            state.hblank_stable = 0;
1500            tms.hblank_stable = 0;
14971501         break;
14981502   }
14991503}
r3535r3536
15161520   {
15171521      case REG_HCOUNT:
15181522         /* scale the horizontal position from screen width to HTOTAL */
1519         result = video_screen_get_hpos(state.screen);
1523         result = video_screen_get_hpos(tms.screen);
15201524         total = IOREG(REG_HTOTAL) + 1;
1521         result = result * total / video_screen_get_width(state.screen);
1525         result = result * total / video_screen_get_width(tms.screen);
15221526
15231527         /* offset by the HBLANK end */
15241528         result += IOREG(REG_HEBLNK);
r3535r3536
15381542         /* have an IRQ handler. For this reason, we return it signalled a bit early in order */
15391543         /* to make it past these loops. */
15401544         if (SMART_IOREG(VCOUNT) + 1 == SMART_IOREG(DPYINT) &&
1541            attotime_compare(timer_timeleft(state.scantimer), ATTOTIME_IN_HZ(40000000/8/3)) < 0)
1545            attotime_compare(timer_timeleft(tms.scantimer), ATTOTIME_IN_HZ(40000000/8/3)) < 0)
15421546            result |= TMS34010_DI;
15431547         return result;
15441548   }
r3535r3536
15591563   {
15601564      case REG020_HCOUNT:
15611565         /* scale the horizontal position from screen width to HTOTAL */
1562         result = video_screen_get_hpos(state.screen);
1566         result = video_screen_get_hpos(tms.screen);
15631567         total = IOREG(REG020_HTOTAL) + 1;
1564         result = result * total / video_screen_get_width(state.screen);
1568         result = result * total / video_screen_get_width(tms.screen);
15651569
15661570         /* offset by the HBLANK end */
15671571         result += IOREG(REG020_HEBLNK);
r3535r3536
16841688      /* control register */
16851689      case TMS34010_HOST_CONTROL:
16861690         external_host_access = TRUE;
1687         tms34010_io_register_w(state.screen->machine, REG_HSTCTLH, data & 0xff00, 0xffff);
1688         tms34010_io_register_w(state.screen->machine, REG_HSTCTLL, data & 0x00ff, 0xffff);
1691         tms34010_io_register_w(tms.screen->machine, REG_HSTCTLH, data & 0xff00, 0xffff);
1692         tms34010_io_register_w(tms.screen->machine, REG_HSTCTLL, data & 0x00ff, 0xffff);
16891693         external_host_access = FALSE;
16901694         break;
16911695
r3535r3536
17671771 * Generic set_info
17681772 **************************************************************************/
17691773
1770static void tms34010_set_info(UINT32 _state, cpuinfo *info)
1774static CPU_SET_INFO( tms34010 )
17711775{
1772   switch (_state)
1776   switch (state)
17731777   {
17741778      /* --- the following bits of info are set as 64-bit signed integers --- */
17751779      case CPUINFO_INT_INPUT_STATE + 0:            set_irq_line(0, info->i);            break;
r3535r3536
18191823 * Generic get_info
18201824 **************************************************************************/
18211825
1822void tms34010_get_info(UINT32 _state, cpuinfo *info)
1826CPU_GET_INFO( tms34010 )
18231827{
1824   switch (_state)
1828   switch (state)
18251829   {
18261830      /* --- the following bits of info are returned as 64-bit signed integers --- */
18271831      case CPUINFO_INT_CONTEXT_SIZE:               info->i = TMS34010_STATE_SIZE;         break;
r3535r3536
18871891      case CPUINFO_INT_REGISTER + TMS34010_B14:      info->i = BREG(14);                  break;
18881892
18891893      /* --- the following bits of info are returned as pointers to data or functions --- */
1890      case CPUINFO_PTR_SET_INFO:                  info->setinfo = tms34010_set_info;      break;
1891      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = tms34010_get_context; break;
1892      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = tms34010_set_context; break;
1893      case CPUINFO_PTR_INIT:                     info->init = tms34010_init;            break;
1894      case CPUINFO_PTR_RESET:                     info->reset = tms34010_reset;         break;
1895      case CPUINFO_PTR_EXIT:                     info->exit = tms34010_exit;            break;
1896      case CPUINFO_PTR_EXECUTE:                  info->execute = tms34010_execute;      break;
1894      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(tms34010);      break;
1895      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(tms34010); break;
1896      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(tms34010); break;
1897      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(tms34010);            break;
1898      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(tms34010);         break;
1899      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(tms34010);            break;
1900      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(tms34010);      break;
18971901      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1898      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = tms34010_dasm;      break;
1902      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(tms34010);      break;
18991903      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &tms34010_ICount;      break;
19001904
19011905      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
19071911
19081912      case CPUINFO_STR_FLAGS:
19091913         sprintf(info->s, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
1910            state.st & 0x80000000 ? 'N':'.',
1911            state.st & 0x40000000 ? 'C':'.',
1912            state.st & 0x20000000 ? 'Z':'.',
1913            state.st & 0x10000000 ? 'V':'.',
1914            state.st & 0x02000000 ? 'P':'.',
1915            state.st & 0x00200000 ? 'I':'.',
1916            state.st & 0x00000800 ? 'E':'.',
1917            state.st & 0x00000400 ? 'F':'.',
1918            state.st & 0x00000200 ? 'F':'.',
1919            state.st & 0x00000100 ? 'F':'.',
1920            state.st & 0x00000080 ? 'F':'.',
1921            state.st & 0x00000040 ? 'F':'.',
1922            state.st & 0x00000020 ? 'E':'.',
1923            state.st & 0x00000010 ? 'F':'.',
1924            state.st & 0x00000008 ? 'F':'.',
1925            state.st & 0x00000004 ? 'F':'.',
1926            state.st & 0x00000002 ? 'F':'.',
1927            state.st & 0x00000001 ? 'F':'.');
1914            tms.st & 0x80000000 ? 'N':'.',
1915            tms.st & 0x40000000 ? 'C':'.',
1916            tms.st & 0x20000000 ? 'Z':'.',
1917            tms.st & 0x10000000 ? 'V':'.',
1918            tms.st & 0x02000000 ? 'P':'.',
1919            tms.st & 0x00200000 ? 'I':'.',
1920            tms.st & 0x00000800 ? 'E':'.',
1921            tms.st & 0x00000400 ? 'F':'.',
1922            tms.st & 0x00000200 ? 'F':'.',
1923            tms.st & 0x00000100 ? 'F':'.',
1924            tms.st & 0x00000080 ? 'F':'.',
1925            tms.st & 0x00000040 ? 'F':'.',
1926            tms.st & 0x00000020 ? 'E':'.',
1927            tms.st & 0x00000010 ? 'F':'.',
1928            tms.st & 0x00000008 ? 'F':'.',
1929            tms.st & 0x00000004 ? 'F':'.',
1930            tms.st & 0x00000002 ? 'F':'.',
1931            tms.st & 0x00000001 ? 'F':'.');
19281932         break;
19291933
1930      case CPUINFO_STR_REGISTER + TMS34010_PC:      sprintf(info->s, "PC :%08X", state.pc); break;
1934      case CPUINFO_STR_REGISTER + TMS34010_PC:      sprintf(info->s, "PC :%08X", tms.pc); break;
19311935      case CPUINFO_STR_REGISTER + TMS34010_SP:      sprintf(info->s, "SP :%08X", AREG(15)); break;
1932      case CPUINFO_STR_REGISTER + TMS34010_ST:      sprintf(info->s, "ST :%08X", state.st); break;
1936      case CPUINFO_STR_REGISTER + TMS34010_ST:      sprintf(info->s, "ST :%08X", tms.st); break;
19331937      case CPUINFO_STR_REGISTER + TMS34010_A0:      sprintf(info->s, "A0 :%08X", AREG( 0)); break;
19341938      case CPUINFO_STR_REGISTER + TMS34010_A1:      sprintf(info->s, "A1 :%08X", AREG( 1)); break;
19351939      case CPUINFO_STR_REGISTER + TMS34010_A2:      sprintf(info->s, "A2 :%08X", AREG( 2)); break;
r3535r3536
19691973 * CPU-specific set_info
19701974 **************************************************************************/
19711975
1972void tms34020_get_info(UINT32 _state, cpuinfo *info)
1976CPU_GET_INFO( tms34020 )
19731977{
1974   switch (_state)
1978   switch (state)
19751979   {
19761980      /* --- the following bits of info are returned as 64-bit signed integers --- */
19771981      case CPUINFO_INT_CONTEXT_SIZE:               info->i = TMS34020_STATE_SIZE;         break;
r3535r3536
19791983      case CPUINFO_INT_CLOCK_DIVIDER:               info->i = 4;                     break;
19801984
19811985      /* --- the following bits of info are returned as pointers to data or functions --- */
1982      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = tms34020_get_context; break;
1983      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = tms34020_set_context; break;
1984      case CPUINFO_PTR_RESET:                     info->reset = tms34020_reset;         break;
1985      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = tms34020_dasm;      break;
1986      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(tms34020); break;
1987      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(tms34020); break;
1988      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(tms34020);         break;
1989      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(tms34020);      break;
19861990
19871991      /* --- the following bits of info are returned as NULL-terminated strings --- */
19881992      case CPUINFO_STR_NAME:                     strcpy(info->s, "TMS34020");         break;
19891993
1990      default:                              tms34010_get_info(_state, info);      break;
1994      default:                              CPU_GET_INFO_CALL(tms34010);      break;
19911995   }
19921996}
19931997#endif
src/emu/cpu/tms34010/34010gfx.c
r3535r3536
2222      if (WINDOW_CHECKING != 0 && WINDOW_CHECKING != 3)
2323         logerror("LINE XY  %08X - Window Checking Mode %d not supported\n", PC, WINDOW_CHECKING);
2424
25      state.st |= STBIT_P;
26      TEMP = (state.op & 0x80) ? 1 : 0;  /* boundary value depends on the algorithm */
27      LOGGFX(("%08X(%3d):LINE (%d,%d)-(%d,%d)\n", PC, video_screen_get_vpos(state.screen), DADDR_X, DADDR_Y, DADDR_X + DYDX_X, DADDR_Y + DYDX_Y));
25      tms.st |= STBIT_P;
26      TEMP = (tms.op & 0x80) ? 1 : 0;  /* boundary value depends on the algorithm */
27      LOGGFX(("%08X(%3d):LINE (%d,%d)-(%d,%d)\n", PC, video_screen_get_vpos(tms.screen), DADDR_X, DADDR_Y, DADDR_X + DYDX_X, DADDR_Y + DYDX_Y));
2828   }
2929
3030   if (COUNT > 0)
r3535r3536
5656      PC -= 0x10;  /* not done yet, check for interrupts and restart instruction */
5757      return;
5858   }
59   state.st &= ~STBIT_P;
59   tms.st &= ~STBIT_P;
6060}
6161
6262
r3535r3536
202202/* Shift register handling */
203203static void shiftreg_w(offs_t offset,UINT16 data)
204204{
205   if (state.config->from_shiftreg)
206      (*state.config->from_shiftreg)((UINT32)(offset << 3) & ~15, &state.shiftreg[0]);
205   if (tms.config->from_shiftreg)
206      (*tms.config->from_shiftreg)((UINT32)(offset << 3) & ~15, &tms.shiftreg[0]);
207207   else
208208      logerror("From ShiftReg function not set. PC = %08X\n", PC);
209209}
210210
211211static UINT16 shiftreg_r(offs_t offset)
212212{
213   if (state.config->to_shiftreg)
214      (*state.config->to_shiftreg)((UINT32)(offset << 3) & ~15, &state.shiftreg[0]);
213   if (tms.config->to_shiftreg)
214      (*tms.config->to_shiftreg)((UINT32)(offset << 3) & ~15, &tms.shiftreg[0]);
215215   else
216216      logerror("To ShiftReg function not set. PC = %08X\n", PC);
217   return state.shiftreg[0];
217   return tms.shiftreg[0];
218218}
219219
220220static UINT16 dummy_shiftreg_r(offs_t offset)
221221{
222   return state.shiftreg[0];
222   return tms.shiftreg[0];
223223}
224224
225225
r3535r3536
902902   int trans = (IOREG(REG_CONTROL) & 0x20) >> 5;
903903   int rop = (IOREG(REG_CONTROL) >> 10) & 0x1f;
904904   int ix = trans | (rop << 1) | (psize << 6);
905   if (!P_FLAG) LOGGFX(("%08X(%3d):PIXBLT B,L (%dx%d) depth=%d\n", PC, video_screen_get_vpos(state.screen), DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
905   if (!P_FLAG) LOGGFX(("%08X(%3d):PIXBLT B,L (%dx%d) depth=%d\n", PC, video_screen_get_vpos(tms.screen), DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
906906   pixel_op = pixel_op_table[rop];
907907   pixel_op_timing = pixel_op_timing_table[rop];
908908   (*pixblt_b_op_table[ix])(1);
r3535r3536
914914   int trans = (IOREG(REG_CONTROL) & 0x20) >> 5;
915915   int rop = (IOREG(REG_CONTROL) >> 10) & 0x1f;
916916   int ix = trans | (rop << 1) | (psize << 6);
917   if (!P_FLAG) LOGGFX(("%08X(%3d):PIXBLT B,XY (%d,%d) (%dx%d) depth=%d\n", PC, video_screen_get_vpos(state.screen), DADDR_X, DADDR_Y, DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
917   if (!P_FLAG) LOGGFX(("%08X(%3d):PIXBLT B,XY (%d,%d) (%dx%d) depth=%d\n", PC, video_screen_get_vpos(tms.screen), DADDR_X, DADDR_Y, DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
918918   pixel_op = pixel_op_table[rop];
919919   pixel_op_timing = pixel_op_timing_table[rop];
920920   (*pixblt_b_op_table[ix])(0);
r3535r3536
927927   int rop = (IOREG(REG_CONTROL) >> 10) & 0x1f;
928928   int pbh = (IOREG(REG_CONTROL) >> 8) & 1;
929929   int ix = trans | (rop << 1) | (psize << 6);
930   if (!P_FLAG) LOGGFX(("%08X(%3d):PIXBLT L,L (%dx%d) depth=%d\n", PC, video_screen_get_vpos(state.screen), DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
930   if (!P_FLAG) LOGGFX(("%08X(%3d):PIXBLT L,L (%dx%d) depth=%d\n", PC, video_screen_get_vpos(tms.screen), DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
931931   pixel_op = pixel_op_table[rop];
932932   pixel_op_timing = pixel_op_timing_table[rop];
933933   if (!pbh)
r3535r3536
943943   int rop = (IOREG(REG_CONTROL) >> 10) & 0x1f;
944944   int pbh = (IOREG(REG_CONTROL) >> 8) & 1;
945945   int ix = trans | (rop << 1) | (psize << 6);
946   if (!P_FLAG) LOGGFX(("%08X(%3d):PIXBLT L,XY (%d,%d) (%dx%d) depth=%d\n", PC, video_screen_get_vpos(state.screen), DADDR_X, DADDR_Y, DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
946   if (!P_FLAG) LOGGFX(("%08X(%3d):PIXBLT L,XY (%d,%d) (%dx%d) depth=%d\n", PC, video_screen_get_vpos(tms.screen), DADDR_X, DADDR_Y, DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
947947   pixel_op = pixel_op_table[rop];
948948   pixel_op_timing = pixel_op_timing_table[rop];
949949   if (!pbh)
r3535r3536
959959   int rop = (IOREG(REG_CONTROL) >> 10) & 0x1f;
960960   int pbh = (IOREG(REG_CONTROL) >> 8) & 1;
961961   int ix = trans | (rop << 1) | (psize << 6);
962   if (!P_FLAG) LOGGFX(("%08X(%3d):PIXBLT XY,L (%dx%d) depth=%d\n", PC, video_screen_get_vpos(state.screen), DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
962   if (!P_FLAG) LOGGFX(("%08X(%3d):PIXBLT XY,L (%dx%d) depth=%d\n", PC, video_screen_get_vpos(tms.screen), DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
963963   pixel_op = pixel_op_table[rop];
964964   pixel_op_timing = pixel_op_timing_table[rop];
965965   if (!pbh)
r3535r3536
975975   int rop = (IOREG(REG_CONTROL) >> 10) & 0x1f;
976976   int pbh = (IOREG(REG_CONTROL) >> 8) & 1;
977977   int ix = trans | (rop << 1) | (psize << 6);
978   if (!P_FLAG) LOGGFX(("%08X(%3d):PIXBLT XY,XY (%dx%d) depth=%d\n", PC, video_screen_get_vpos(state.screen), DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
978   if (!P_FLAG) LOGGFX(("%08X(%3d):PIXBLT XY,XY (%dx%d) depth=%d\n", PC, video_screen_get_vpos(tms.screen), DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
979979   pixel_op = pixel_op_table[rop];
980980   pixel_op_timing = pixel_op_timing_table[rop];
981981   if (!pbh)
r3535r3536
990990   int trans = (IOREG(REG_CONTROL) & 0x20) >> 5;
991991   int rop = (IOREG(REG_CONTROL) >> 10) & 0x1f;
992992   int ix = trans | (rop << 1) | (psize << 6);
993   if (!P_FLAG) LOGGFX(("%08X(%3d):FILL L (%dx%d) depth=%d\n", PC, video_screen_get_vpos(state.screen), DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
993   if (!P_FLAG) LOGGFX(("%08X(%3d):FILL L (%dx%d) depth=%d\n", PC, video_screen_get_vpos(tms.screen), DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
994994   pixel_op = pixel_op_table[rop];
995995   pixel_op_timing = pixel_op_timing_table[rop];
996996   (*fill_op_table[ix])(1);
r3535r3536
10021002   int trans = (IOREG(REG_CONTROL) & 0x20) >> 5;
10031003   int rop = (IOREG(REG_CONTROL) >> 10) & 0x1f;
10041004   int ix = trans | (rop << 1) | (psize << 6);
1005   if (!P_FLAG) LOGGFX(("%08X(%3d):FILL XY (%d,%d) (%dx%d) depth=%d\n", PC, video_screen_get_vpos(state.screen), DADDR_X, DADDR_Y, DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
1005   if (!P_FLAG) LOGGFX(("%08X(%3d):FILL XY (%d,%d) (%dx%d) depth=%d\n", PC, video_screen_get_vpos(tms.screen), DADDR_X, DADDR_Y, DYDX_X, DYDX_Y, IOREG(REG_PSIZE) ? IOREG(REG_PSIZE) : 32));
10061006   pixel_op = pixel_op_table[rop];
10071007   pixel_op_timing = pixel_op_timing_table[rop];
10081008   (*fill_op_table[ix])(0);
r3535r3536
10501050      dy = (INT16)DYDX_Y;
10511051
10521052      /* apply the window for non-linear destinations */
1053      state.gfxcycles = 7 + (src_is_linear ? 0 : 2);
1053      tms.gfxcycles = 7 + (src_is_linear ? 0 : 2);
10541054      if (!dst_is_linear)
10551055      {
10561056         dstxy = DADDR_XY;
1057         state.gfxcycles += 2 + (!src_is_linear) + apply_window("PIXBLT", BITS_PER_PIXEL, &saddr, &dstxy, &dx, &dy);
1057         tms.gfxcycles += 2 + (!src_is_linear) + apply_window("PIXBLT", BITS_PER_PIXEL, &saddr, &dstxy, &dx, &dy);
10581058         daddr = DXYTOL(dstxy);
10591059      }
10601060      else
r3535r3536
10871087            daddr += (dy - 1) * DPTCH;
10881088         }
10891089
1090      state.st |= STBIT_P;
1090      tms.st |= STBIT_P;
10911091
10921092      /* loop over rows */
10931093      for (y = 0; y < dy; y++)
r3535r3536
11941194            full_words /= PIXELS_PER_WORD;
11951195
11961196         /* compute cycles */
1197         state.gfxcycles += compute_pixblt_cycles(left_partials, right_partials, full_words, PIXEL_OP_TIMING);
1197         tms.gfxcycles += compute_pixblt_cycles(left_partials, right_partials, full_words, PIXEL_OP_TIMING);
11981198
11991199         /* use word addresses each row */
12001200         swordaddr = saddr >> 4;
r3535r3536
13361336         }
13371337      }
13381338
1339      state.gfxcycles += readwrites * 2 + dx * dy * (PIXEL_OP_TIMING - 2);
1339      tms.gfxcycles += readwrites * 2 + dx * dy * (PIXEL_OP_TIMING - 2);
13401340
1341      LOGGFX(("  (%d cycles)\n", state.gfxcycles));
1341      LOGGFX(("  (%d cycles)\n", tms.gfxcycles));
13421342   }
13431343
13441344   /* eat cycles */
1345   if (state.gfxcycles > tms34010_ICount)
1345   if (tms.gfxcycles > tms34010_ICount)
13461346   {
1347      state.gfxcycles -= tms34010_ICount;
1347      tms.gfxcycles -= tms34010_ICount;
13481348      tms34010_ICount = 0;
13491349      PC -= 0x10;
13501350   }
13511351   else
13521352   {
1353      tms34010_ICount -= state.gfxcycles;
1354      state.st &= ~STBIT_P;
1353      tms34010_ICount -= tms.gfxcycles;
1354      tms.st &= ~STBIT_P;
13551355      if (src_is_linear && dst_is_linear)
13561356         SADDR += DYDX_Y * SPTCH;
13571357      else if (src_is_linear)
r3535r3536
13981398      dy = (INT16)DYDX_Y;
13991399
14001400      /* apply the window for non-linear destinations */
1401      state.gfxcycles = 7 + (src_is_linear ? 0 : 2);
1401      tms.gfxcycles = 7 + (src_is_linear ? 0 : 2);
14021402      if (!dst_is_linear)
14031403      {
14041404         dstxy = DADDR_XY;
1405         state.gfxcycles += 2 + (!src_is_linear) + apply_window("PIXBLT R", BITS_PER_PIXEL, &saddr, &dstxy, &dx, &dy);
1405         tms.gfxcycles += 2 + (!src_is_linear) + apply_window("PIXBLT R", BITS_PER_PIXEL, &saddr, &dstxy, &dx, &dy);
14061406         daddr = DXYTOL(dstxy);
14071407      }
14081408      else
r3535r3536
14401440         }
14411441      }
14421442
1443      state.st |= STBIT_P;
1443      tms.st |= STBIT_P;
14441444
14451445      /* loop over rows */
14461446      for (y = 0; y < dy; y++)
r3535r3536
14631463            full_words /= PIXELS_PER_WORD;
14641464
14651465         /* compute cycles */
1466         state.gfxcycles += compute_pixblt_cycles(left_partials, right_partials, full_words, PIXEL_OP_TIMING);
1466         tms.gfxcycles += compute_pixblt_cycles(left_partials, right_partials, full_words, PIXEL_OP_TIMING);
14671467
14681468         /* use word addresses each row */
14691469         swordaddr = (saddr + 15) >> 4;
r3535r3536
16031603            daddr -= DPTCH;
16041604         }
16051605      }
1606      LOGGFX(("  (%d cycles)\n", state.gfxcycles));
1606      LOGGFX(("  (%d cycles)\n", tms.gfxcycles));
16071607   }
16081608
16091609   /* eat cycles */
1610   if (state.gfxcycles > tms34010_ICount)
1610   if (tms.gfxcycles > tms34010_ICount)
16111611   {
1612      state.gfxcycles -= tms34010_ICount;
1612      tms.gfxcycles -= tms34010_ICount;
16131613      tms34010_ICount = 0;
16141614      PC -= 0x10;
16151615   }
16161616   else
16171617   {
1618      tms34010_ICount -= state.gfxcycles;
1619      state.st &= ~STBIT_P;
1618      tms34010_ICount -= tms.gfxcycles;
1619      tms.st &= ~STBIT_P;
16201620      if (src_is_linear && dst_is_linear)
16211621         SADDR += DYDX_Y * SPTCH;
16221622      else if (src_is_linear)
r3535r3536
16611661      dy = (INT16)DYDX_Y;
16621662
16631663      /* apply the window for non-linear destinations */
1664      state.gfxcycles = 4;
1664      tms.gfxcycles = 4;
16651665      if (!dst_is_linear)
16661666      {
16671667         dstxy = DADDR_XY;
1668         state.gfxcycles += 2 + apply_window("PIXBLT B", 1, &saddr, &dstxy, &dx, &dy);
1668         tms.gfxcycles += 2 + apply_window("PIXBLT B", 1, &saddr, &dstxy, &dx, &dy);
16691669         daddr = DXYTOL(dstxy);
16701670      }
16711671      else
r3535r3536
16991699         full_words /= PIXELS_PER_WORD;
17001700
17011701      /* compute cycles */
1702      state.gfxcycles += compute_pixblt_b_cycles(left_partials, right_partials, full_words, dy, PIXEL_OP_TIMING, BITS_PER_PIXEL);
1703      state.st |= STBIT_P;
1702      tms.gfxcycles += compute_pixblt_b_cycles(left_partials, right_partials, full_words, dy, PIXEL_OP_TIMING, BITS_PER_PIXEL);
1703      tms.st |= STBIT_P;
17041704
17051705      /* loop over rows */
17061706      for (y = 0; y < dy; y++)
r3535r3536
18221822         saddr += SPTCH;
18231823         daddr += DPTCH;
18241824      }
1825      LOGGFX(("  (%d cycles)\n", state.gfxcycles));
1825      LOGGFX(("  (%d cycles)\n", tms.gfxcycles));
18261826   }
18271827
18281828   /* eat cycles */
1829   if (state.gfxcycles > tms34010_ICount)
1829   if (tms.gfxcycles > tms34010_ICount)
18301830   {
1831      state.gfxcycles -= tms34010_ICount;
1831      tms.gfxcycles -= tms34010_ICount;
18321832      tms34010_ICount = 0;
18331833      PC -= 0x10;
18341834   }
18351835   else
18361836   {
1837      tms34010_ICount -= state.gfxcycles;
1838      state.st &= ~STBIT_P;
1837      tms34010_ICount -= tms.gfxcycles;
1838      tms.st &= ~STBIT_P;
18391839      SADDR += DYDX_Y * SPTCH;
18401840      if (dst_is_linear)
18411841         DADDR += DYDX_Y * DPTCH;
r3535r3536
18721872      dy = (INT16)DYDX_Y;
18731873
18741874      /* apply the window for non-linear destinations */
1875      state.gfxcycles = 4;
1875      tms.gfxcycles = 4;
18761876      if (!dst_is_linear)
18771877      {
18781878         dstxy = DADDR_XY;
1879         state.gfxcycles += 2 + apply_window("FILL", 0, NULL, &dstxy, &dx, &dy);
1879         tms.gfxcycles += 2 + apply_window("FILL", 0, NULL, &dstxy, &dx, &dy);
18801880         daddr = DXYTOL(dstxy);
18811881      }
18821882      else
r3535r3536
19101910         full_words /= PIXELS_PER_WORD;
19111911
19121912      /* compute cycles */
1913      state.gfxcycles += 2;
1914      state.st |= STBIT_P;
1913      tms.gfxcycles += 2;
1914      tms.st |= STBIT_P;
19151915
19161916      /* loop over rows */
19171917      for (y = 0; y < dy; y++)
r3535r3536
19231923         dwordaddr = daddr >> 4;
19241924
19251925         /* compute cycles */
1926         state.gfxcycles += compute_fill_cycles(left_partials, right_partials, full_words, PIXEL_OP_TIMING);
1926         tms.gfxcycles += compute_fill_cycles(left_partials, right_partials, full_words, PIXEL_OP_TIMING);
19271927
19281928         /* handle the left partial word */
19291929         if (left_partials != 0)
r3535r3536
20042004         daddr += DPTCH;
20052005      }
20062006
2007      LOGGFX(("  (%d cycles)\n", state.gfxcycles));
2007      LOGGFX(("  (%d cycles)\n", tms.gfxcycles));
20082008   }
20092009
20102010   /* eat cycles */
2011   if (state.gfxcycles > tms34010_ICount)
2011   if (tms.gfxcycles > tms34010_ICount)
20122012   {
2013      state.gfxcycles -= tms34010_ICount;
2013      tms.gfxcycles -= tms34010_ICount;
20142014      tms34010_ICount = 0;
20152015      PC -= 0x10;
20162016   }
20172017   else
20182018   {
2019      tms34010_ICount -= state.gfxcycles;
2020      state.st &= ~STBIT_P;
2019      tms34010_ICount -= tms.gfxcycles;
2020      tms.st &= ~STBIT_P;
20212021      if (dst_is_linear)
20222022         DADDR += DYDX_Y * DPTCH;
20232023      else
src/emu/cpu/tms32031/tms32031.h
r3535r3536
6969    PUBLIC FUNCTIONS
7070***************************************************************************/
7171
72extern void tms32031_get_info(UINT32 state, cpuinfo *info);
73extern void tms32032_get_info(UINT32 state, cpuinfo *info);
72extern CPU_GET_INFO( tms32031 );
73extern CPU_GET_INFO( tms32032 );
7474
7575extern float convert_tms3203x_fp_to_float(UINT32 floatdata);
7676extern double convert_tms3203x_fp_to_double(UINT32 floatdata);
src/emu/cpu/tms32031/tms32031.c
r3535r3536
109109   void         (*xf0_w)(UINT8 val);
110110   void         (*xf1_w)(UINT8 val);
111111   void         (*iack_w)(UINT8 val, offs_t addr);
112   int            (*irq_callback)(int state);
112   cpu_irq_callback irq_callback;
113   const device_config *device;
113114} tms32031_regs;
114115
115116
r3535r3536
385386    CONTEXT SWITCHING
386387***************************************************************************/
387388
388static void tms32031_get_context(void *dst)
389static CPU_GET_CONTEXT( tms32031 )
389390{
390391   /* copy the context */
391392   if (dst)
r3535r3536
393394}
394395
395396
396static void tms32031_set_context(void *src)
397static CPU_SET_CONTEXT( tms32031 )
397398{
398399   /* copy the context */
399400   if (src)
r3535r3536
410411    INITIALIZATION AND SHUTDOWN
411412***************************************************************************/
412413
413static void tms32031_init(int index, int clock, const void *_config, int (*irqcallback)(int))
414static CPU_INIT( tms32031 )
414415{
415   const struct tms32031_config *config = _config;
416   const struct tms32031_config *configdata = config;
416417   int i;
417418   char namebuf[30];
418419
419420   tms32031.irq_callback = irqcallback;
421   tms32031.device = device;
420422
421423   /* copy in the xf write routines */
422   tms32031.bootoffset = config ? config->bootoffset : 0;
423   if (config)
424   tms32031.bootoffset = configdata ? configdata->bootoffset : 0;
425   if (configdata)
424426   {
425      tms32031.xf0_w = config->xf0_w;
426      tms32031.xf1_w = config->xf1_w;
427      tms32031.iack_w = config->iack_w;
427      tms32031.xf0_w = configdata->xf0_w;
428      tms32031.xf1_w = configdata->xf1_w;
429      tms32031.iack_w = configdata->iack_w;
428430   }
429431
430432   state_save_register_item("tms32031", index, tms32031.pc);
r3535r3536
444446
445447}
446448
447static void tms32031_reset(void)
449static CPU_RESET( tms32031 )
448450{
449451   /* if we have a config struct, get the boot ROM address */
450452   if (tms32031.bootoffset)
r3535r3536
470472   tms32031.is_idling = FALSE;
471473}
472474
473static void tms32032_reset(void)
475static CPU_RESET( tms32032 )
474476{
475   tms32031_reset();
477   CPU_RESET_CALL(tms32031);
476478   tms32031.is_32032 = TRUE;
477479}
478480
r3535r3536
481483static UINT32 hits[0x200*4];
482484#endif
483485
484static void tms32031_exit(void)
486static CPU_EXIT( tms32031 )
485487{
486488#if (LOG_OPCODE_USAGE)
487489   int i;
r3535r3536
505507    CORE EXECUTION LOOP
506508***************************************************************************/
507509
508static int tms32031_execute(int cycles)
510static CPU_EXECUTE( tms32031 )
509511{
510512   /* count cycles and interrupt cycles */
511513   tms32031_icount = cycles;
r3535r3536
589591    DISASSEMBLY HOOK
590592***************************************************************************/
591593
592static offs_t tms32031_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
594static CPU_DISASSEMBLE( tms32031 )
593595{
594596   UINT32 op = oprom[0] | (oprom[1] << 8) | (oprom[2] << 16) | (oprom[3] << 24);
595597   extern unsigned dasm_tms32031(char *, unsigned, UINT32);
r3535r3536
670672 * Generic set_info
671673 **************************************************************************/
672674
673static void tms32031_set_info(UINT32 state, cpuinfo *info)
675static CPU_SET_INFO( tms32031 )
674676{
675677   switch (state)
676678   {
r3535r3536
748750 * Generic get_info
749751 **************************************************************************/
750752
751void tms32031_get_info(UINT32 state, cpuinfo *info)
753CPU_GET_INFO( tms32031 )
752754{
753755   float ftemp;
754756
r3535r3536
833835      case CPUINFO_INT_REGISTER + TMS32031_RC:      info->i = IREG(TMR_RC);               break;
834836
835837      /* --- the following bits of info are returned as pointers to data or functions --- */
836      case CPUINFO_PTR_SET_INFO:                  info->setinfo = tms32031_set_info;      break;
837      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = tms32031_get_context; break;
838      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = tms32031_set_context; break;
839      case CPUINFO_PTR_INIT:                     info->init = tms32031_init;            break;
840      case CPUINFO_PTR_RESET:                     info->reset = tms32031_reset;         break;
841      case CPUINFO_PTR_EXIT:                     info->exit = tms32031_exit;            break;
842      case CPUINFO_PTR_EXECUTE:                  info->execute = tms32031_execute;      break;
838      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(tms32031);      break;
839      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(tms32031); break;
840      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(tms32031); break;
841      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(tms32031);            break;
842      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(tms32031);         break;
843      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(tms32031);            break;
844      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(tms32031);      break;
843845      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
844      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = tms32031_dasm;      break;
846      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(tms32031);      break;
845847      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &tms32031_icount;      break;
846      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_internal_32031; break;
848      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(internal_32031); break;
847849
848850      /* --- the following bits of info are returned as NULL-terminated strings --- */
849851      case CPUINFO_STR_NAME:                     strcpy(info->s, "TMS32031");         break;
r3535r3536
908910   }
909911}
910912
911void tms32032_get_info(UINT32 state, cpuinfo *info)
913CPU_GET_INFO( tms32032 )
912914{
913915   switch (state)
914916   {
915917      /* --- the following bits of info are returned as pointers to data or functions --- */
916      case CPUINFO_PTR_RESET:                     info->reset = tms32032_reset;         break;
917      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_internal_32032; break;
918      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(tms32032);         break;
919      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(internal_32032); break;
918920
919921      /* --- the following bits of info are returned as NULL-terminated strings --- */
920922      case CPUINFO_STR_NAME:                     strcpy(info->s, "TMS32032");         break;
921923
922      default:                              tms32031_get_info(state, info);         break;
924      default:                              CPU_GET_INFO_CALL(tms32031);         break;
923925   }
924926}
src/emu/cpu/mcs48/mcs48.c
r3535r3536
6868***************************************************************************/
6969
7070/* live processor state */
71typedef struct _mcs48_regs mcs48_regs;
72struct _mcs48_regs
71typedef struct _mcs48_state mcs48_state;
72struct _mcs48_state
7373{
7474   PAIR      prevpc;            /* 16-bit previous program counter */
7575   PAIR      pc;               /* 16-bit program counter */
r3535r3536
9494
9595   UINT16      a11;            /* A11 value, either 0x000 or 0x800 */
9696
97   int         (*irq_callback)(int irqline);
97   cpu_irq_callback irq_callback;
98   const device_config *device;
99   int         icount;
100
98101   int         inst_cycles;      /* cycles for the current instruction */
99102   UINT8      cpu_feature;      /* processor feature flags */
100103   UINT16      int_rom_size;      /* internal rom size */
r3535r3536
106109struct _mcs48_opcode
107110{
108111   UINT8      cycles;
109   void       (*function)(void);
112   void       (*function)(mcs48_state *);
110113};
111114
112115
r3535r3536
148151
149152/* simplfied access to common bits */
150153#undef A
151#define A            mcs48.a
154#define A            mcs48->a
152155#undef PC
153#define PC            mcs48.pc.w.l
156#define PC            mcs48->pc.w.l
154157#undef PSW
155#define PSW            mcs48.psw
158#define PSW            mcs48->psw
156159
157160/* r0-r7 map to memory via the regptr */
158#define R0            mcs48.regptr[0]
159#define R1            mcs48.regptr[1]
160#define R2            mcs48.regptr[2]
161#define R3            mcs48.regptr[3]
162#define R4            mcs48.regptr[4]
163#define R5            mcs48.regptr[5]
164#define R6            mcs48.regptr[6]
165#define R7            mcs48.regptr[7]
161#define R0            mcs48->regptr[0]
162#define R1            mcs48->regptr[1]
163#define R2            mcs48->regptr[2]
164#define R3            mcs48->regptr[3]
165#define R4            mcs48->regptr[4]
166#define R5            mcs48->regptr[5]
167#define R6            mcs48->regptr[6]
168#define R7            mcs48->regptr[7]
166169
167170/* the carry flag as 0 or 1, used for carry-in */
168171#define CARRYIN         ((PSW & C_FLAG) >> 7)
r3535r3536
173176    GLOBAL VARIABLES
174177***************************************************************************/
175178
176static mcs48_regs   mcs48;
177static int         mcs48_icount;
179static void *token;
178180
179
180
181181/***************************************************************************
182182    FUNCTION PROTOTYPES
183183***************************************************************************/
184184
185static void check_irqs(void);
185static void check_irqs(   mcs48_state *mcs48);
186186
187187
188188
r3535r3536
216216    point to the appropriate register bank
217217-------------------------------------------------*/
218218
219INLINE void update_regptr(void)
219INLINE void update_regptr(mcs48_state *mcs48)
220220{
221   mcs48.regptr = memory_get_write_ptr(cpu_getactivecpu(), ADDRESS_SPACE_DATA, (PSW & B_FLAG) ? 24 : 0);
221   mcs48->regptr = memory_get_write_ptr(cpu_getactivecpu(), ADDRESS_SPACE_DATA, (PSW & B_FLAG) ? 24 : 0);
222222}
223223
224224
r3535r3536
227227    the stack
228228-------------------------------------------------*/
229229
230INLINE void push_pc_psw(void)
230INLINE void push_pc_psw(mcs48_state *mcs48)
231231{
232232   UINT8 sp = PSW & 0x07;
233   ram_w(8 + 2*sp, mcs48.pc.b.l);
234   ram_w(9 + 2*sp, (mcs48.pc.b.h & 0x0f) | (PSW & 0xf0));
233   ram_w(8 + 2*sp, mcs48->pc.b.l);
234   ram_w(9 + 2*sp, (mcs48->pc.b.h & 0x0f) | (PSW & 0xf0));
235235   PSW = (PSW & 0xf8) | ((sp + 1) & 0x07);
236236}
237237
r3535r3536
241241    the stack
242242-------------------------------------------------*/
243243
244INLINE void pull_pc_psw(void)
244INLINE void pull_pc_psw(mcs48_state *mcs48)
245245{
246246   UINT8 sp = (PSW - 1) & 0x07;
247   mcs48.pc.b.l = ram_r(8 + 2*sp);
248   mcs48.pc.b.h = ram_r(9 + 2*sp);
249   PSW = (mcs48.pc.b.h & 0xf0) | 0x08 | sp;
250   mcs48.pc.b.h &= 0x0f;
251   update_regptr();
247   mcs48->pc.b.l = ram_r(8 + 2*sp);
248   mcs48->pc.b.h = ram_r(9 + 2*sp);
249   PSW = (mcs48->pc.b.h & 0xf0) | 0x08 | sp;
250   mcs48->pc.b.h &= 0x0f;
251   update_regptr(mcs48);
252252   change_pc(PC);
253253}
254254
r3535r3536
258258    leaving the upper part of PSW intact
259259-------------------------------------------------*/
260260
261INLINE void pull_pc(void)
261INLINE void pull_pc(mcs48_state *mcs48)
262262{
263263   UINT8 sp = (PSW - 1) & 0x07;
264   mcs48.pc.b.l = ram_r(8 + 2*sp);
265   mcs48.pc.b.h = ram_r(9 + 2*sp) & 0x0f;
264   mcs48->pc.b.l = ram_r(8 + 2*sp);
265   mcs48->pc.b.h = ram_r(9 + 2*sp) & 0x0f;
266266   PSW = (PSW & 0xf0) | 0x08 | sp;
267267   change_pc(PC);
268268}
r3535r3536
273273    instruction
274274-------------------------------------------------*/
275275
276INLINE void execute_add(UINT8 dat)
276INLINE void execute_add(mcs48_state *mcs48, UINT8 dat)
277277{
278278   UINT16 temp = A + dat;
279279   UINT16 temp4 = (A & 0x0f) + (dat & 0x0f);
r3535r3536
290290    instruction
291291-------------------------------------------------*/
292292
293INLINE void execute_addc(UINT8 dat)
293INLINE void execute_addc(mcs48_state *mcs48, UINT8 dat)
294294{
295295   UINT16 temp = A + dat + CARRYIN;
296296   UINT16 temp4 = (A & 0x0f) + (dat & 0x0f) + CARRYIN;
r3535r3536
307307    instruction
308308-------------------------------------------------*/
309309
310INLINE void execute_jmp(UINT16 address)
310INLINE void execute_jmp(mcs48_state *mcs48, UINT16 address)
311311{
312   UINT16 a11 = (mcs48.irq_in_progress) ? 0 : mcs48.a11;
312   UINT16 a11 = (mcs48->irq_in_progress) ? 0 : mcs48->a11;
313313   PC = address | a11;
314314   change_pc(PC);
315315}
r3535r3536
320320    instruction
321321-------------------------------------------------*/
322322
323INLINE void execute_call(UINT16 address)
323INLINE void execute_call(mcs48_state *mcs48, UINT16 address)
324324{
325   push_pc_psw();
326   execute_jmp(address);
325   push_pc_psw(mcs48);
326   execute_jmp(mcs48, address);
327327}
328328
329329
r3535r3536
332332    conditional jump instruction
333333-------------------------------------------------*/
334334
335INLINE void execute_jcc(UINT8 result)
335INLINE void execute_jcc(mcs48_state *mcs48, UINT8 result)
336336{
337337   UINT8 offset = argument_fetch(PC++);
338338   if (result != 0)
r3535r3536
350350    OPCODE HANDLERS
351351***************************************************************************/
352352
353static void illegal(void)
353#define OPHANDLER(_name) static void _name (mcs48_state *mcs48)
354
355OPHANDLER( illegal )
354356{
355357   logerror("I8039:  pc = %04x,  Illegal opcode = %02x\n", PC-1, program_r(PC-1));
356358}
357359
358static void add_a_r0(void)      { execute_add(R0); }
359static void add_a_r1(void)      { execute_add(R1); }
360static void add_a_r2(void)      { execute_add(R2); }
361static void add_a_r3(void)      { execute_add(R3); }
362static void add_a_r4(void)      { execute_add(R4); }
363static void add_a_r5(void)      { execute_add(R5); }
364static void add_a_r6(void)      { execute_add(R6); }
365static void add_a_r7(void)      { execute_add(R7); }
366static void add_a_xr0(void)      { execute_add(ram_r(R0)); }
367static void add_a_xr1(void)      { execute_add(ram_r(R1)); }
368static void add_a_n(void)      { execute_add(argument_fetch(PC++)); }
360OPHANDLER( add_a_r0 )      { execute_add(mcs48, R0); }
361OPHANDLER( add_a_r1 )      { execute_add(mcs48, R1); }
362OPHANDLER( add_a_r2 )      { execute_add(mcs48, R2); }
363OPHANDLER( add_a_r3 )      { execute_add(mcs48, R3); }
364OPHANDLER( add_a_r4 )      { execute_add(mcs48, R4); }
365OPHANDLER( add_a_r5 )      { execute_add(mcs48, R5); }
366OPHANDLER( add_a_r6 )      { execute_add(mcs48, R6); }
367OPHANDLER( add_a_r7 )      { execute_add(mcs48, R7); }
368OPHANDLER( add_a_xr0 )      { execute_add(mcs48, ram_r(R0)); }
369OPHANDLER( add_a_xr1 )      { execute_add(mcs48, ram_r(R1)); }
370OPHANDLER( add_a_n )      { execute_add(mcs48, argument_fetch(PC++)); }
369371
370static void adc_a_r0(void)      { execute_addc(R0); }
371static void adc_a_r1(void)      { execute_addc(R1); }
372static void adc_a_r2(void)      { execute_addc(R2); }
373static void adc_a_r3(void)      { execute_addc(R3); }
374static void adc_a_r4(void)      { execute_addc(R4); }
375static void adc_a_r5(void)      { execute_addc(R5); }
376static void adc_a_r6(void)      { execute_addc(R6); }
377static void adc_a_r7(void)      { execute_addc(R7); }
378static void adc_a_xr0(void)      { execute_addc(ram_r(R0)); }
379static void adc_a_xr1(void)      { execute_addc(ram_r(R1)); }
380static void adc_a_n(void)      { execute_addc(argument_fetch(PC++)); }
372OPHANDLER( adc_a_r0 )      { execute_addc(mcs48, R0); }
373OPHANDLER( adc_a_r1 )      { execute_addc(mcs48, R1); }
374OPHANDLER( adc_a_r2 )      { execute_addc(mcs48, R2); }
375OPHANDLER( adc_a_r3 )      { execute_addc(mcs48, R3); }
376OPHANDLER( adc_a_r4 )      { execute_addc(mcs48, R4); }
377OPHANDLER( adc_a_r5 )      { execute_addc(mcs48, R5); }
378OPHANDLER( adc_a_r6 )      { execute_addc(mcs48, R6); }
379OPHANDLER( adc_a_r7 )      { execute_addc(mcs48, R7); }
380OPHANDLER( adc_a_xr0 )      { execute_addc(mcs48, ram_r(R0)); }
381OPHANDLER( adc_a_xr1 )      { execute_addc(mcs48, ram_r(R1)); }
382OPHANDLER( adc_a_n )      { execute_addc(mcs48, argument_fetch(PC++)); }
381383
382static void anl_a_r0(void)      { A &= R0; }
383static void anl_a_r1(void)      { A &= R1; }
384static void anl_a_r2(void)      { A &= R2; }
385static void anl_a_r3(void)      { A &= R3; }
386static void anl_a_r4(void)      { A &= R4; }
387static void anl_a_r5(void)      { A &= R5; }
388static void anl_a_r6(void)      { A &= R6; }
389static void anl_a_r7(void)      { A &= R7; }
390static void anl_a_xr0(void)      { A &= ram_r(R0); }
391static void anl_a_xr1(void)      { A &= ram_r(R1); }
392static void anl_a_n(void)      { A &= argument_fetch(PC++); }
393static void anl_bus_n(void)      { bus_w(bus_r() & argument_fetch(PC++)); }
394static void anl_p1_n(void)      { port_w(1, mcs48.p1 &= argument_fetch(PC++)); }
395static void anl_p2_n(void)      { port_w(2, mcs48.p2 &= argument_fetch(PC++)); }
384OPHANDLER( anl_a_r0 )      { A &= R0; }
385OPHANDLER( anl_a_r1 )      { A &= R1; }
386OPHANDLER( anl_a_r2 )      { A &= R2; }
387OPHANDLER( anl_a_r3 )      { A &= R3; }
388OPHANDLER( anl_a_r4 )      { A &= R4; }
389OPHANDLER( anl_a_r5 )      { A &= R5; }
390OPHANDLER( anl_a_r6 )      { A &= R6; }
391OPHANDLER( anl_a_r7 )      { A &= R7; }
392OPHANDLER( anl_a_xr0 )      { A &= ram_r(R0); }
393OPHANDLER( anl_a_xr1 )      { A &= ram_r(R1); }
394OPHANDLER( anl_a_n )      { A &= argument_fetch(PC++); }
395OPHANDLER( anl_bus_n )      { bus_w(bus_r() & argument_fetch(PC++)); }
396OPHANDLER( anl_p1_n )      { port_w(1, mcs48->p1 &= argument_fetch(PC++)); }
397OPHANDLER( anl_p2_n )      { port_w(2, mcs48->p2 &= argument_fetch(PC++)); }
396398
397static void anld_p4_a(void)      { port_w(4, port_r(4) & A & 0x0f); }
398static void anld_p5_a(void)      { port_w(5, port_r(5) & A & 0x0f); }
399static void anld_p6_a(void)      { port_w(6, port_r(6) & A & 0x0f); }
400static void anld_p7_a(void)      { port_w(7, port_r(7) & A & 0x0f); }
399OPHANDLER( anld_p4_a )      { port_w(4, port_r(4) & A & 0x0f); }
400OPHANDLER( anld_p5_a )      { port_w(5, port_r(5) & A & 0x0f); }
401OPHANDLER( anld_p6_a )      { port_w(6, port_r(6) & A & 0x0f); }
402OPHANDLER( anld_p7_a )      { port_w(7, port_r(7) & A & 0x0f); }
401403
402static void call_0(void)      { execute_call(argument_fetch(PC++) | 0x000); }
403static void call_1(void)      { execute_call(argument_fetch(PC++) | 0x100); }
404static void call_2(void)      { execute_call(argument_fetch(PC++) | 0x200); }
405static void call_3(void)      { execute_call(argument_fetch(PC++) | 0x300); }
406static void call_4(void)      { execute_call(argument_fetch(PC++) | 0x400); }
407static void call_5(void)      { execute_call(argument_fetch(PC++) | 0x500); }
408static void call_6(void)      { execute_call(argument_fetch(PC++) | 0x600); }
409static void call_7(void)      { execute_call(argument_fetch(PC++) | 0x700); }
404OPHANDLER( call_0 )      { execute_call(mcs48, argument_fetch(PC++) | 0x000); }
405OPHANDLER( call_1 )      { execute_call(mcs48, argument_fetch(PC++) | 0x100); }
406OPHANDLER( call_2 )      { execute_call(mcs48, argument_fetch(PC++) | 0x200); }
407OPHANDLER( call_3 )      { execute_call(mcs48, argument_fetch(PC++) | 0x300); }
408OPHANDLER( call_4 )      { execute_call(mcs48, argument_fetch(PC++) | 0x400); }
409OPHANDLER( call_5 )      { execute_call(mcs48, argument_fetch(PC++) | 0x500); }
410OPHANDLER( call_6 )      { execute_call(mcs48, argument_fetch(PC++) | 0x600); }
411OPHANDLER( call_7 )      { execute_call(mcs48, argument_fetch(PC++) | 0x700); }
410412
411static void clr_a(void)         { A = 0; }
412static void clr_c(void)         { PSW &= ~C_FLAG; }
413static void clr_f0(void)      { PSW &= ~F_FLAG; }
414static void clr_f1(void)      { mcs48.f1 = 0; }
413OPHANDLER( clr_a )         { A = 0; }
414OPHANDLER( clr_c )         { PSW &= ~C_FLAG; }
415OPHANDLER( clr_f0 )      { PSW &= ~F_FLAG; }
416OPHANDLER( clr_f1 )      { mcs48->f1 = 0; }
415417
416static void cpl_a(void)         { A ^= 0xff; }
417static void cpl_c(void)         { PSW ^= C_FLAG; }
418static void cpl_f0(void)      { PSW ^= F_FLAG; }
419static void cpl_f1(void)      { mcs48.f1 ^= 1; }
418OPHANDLER( cpl_a )         { A ^= 0xff; }
419OPHANDLER( cpl_c )         { PSW ^= C_FLAG; }
420OPHANDLER( cpl_f0 )      { PSW ^= F_FLAG; }
421OPHANDLER( cpl_f1 )      { mcs48->f1 ^= 1; }
420422
421static void da_a(void)
423OPHANDLER( da_a )
422424{
423425   if ((A & 0x0f) > 0x09 || (PSW & A_FLAG))
424426   {
r3535r3536
435437      PSW &= ~C_FLAG;
436438}
437439
438static void dec_a(void)         { A--; }
439static void dec_r0(void)      { R0--; }
440static void dec_r1(void)      { R1--; }
441static void dec_r2(void)      { R2--; }
442static void dec_r3(void)      { R3--; }
443static void dec_r4(void)      { R4--; }
444static void dec_r5(void)      { R5--; }
445static void dec_r6(void)      { R6--; }
446static void dec_r7(void)      { R7--; }
440OPHANDLER( dec_a )         { A--; }
441OPHANDLER( dec_r0 )      { R0--; }
442OPHANDLER( dec_r1 )      { R1--; }
443OPHANDLER( dec_r2 )      { R2--; }
444OPHANDLER( dec_r3 )      { R3--; }
445OPHANDLER( dec_r4 )      { R4--; }
446OPHANDLER( dec_r5 )      { R5--; }
447OPHANDLER( dec_r6 )      { R6--; }
448OPHANDLER( dec_r7 )      { R7--; }
447449
448static void dis_i(void)         { mcs48.xirq_enabled = FALSE; }
449static void dis_tcnti(void)      { mcs48.tirq_enabled = FALSE; mcs48.timer_overflow = FALSE; }
450OPHANDLER( dis_i )         { mcs48->xirq_enabled = FALSE; }
451OPHANDLER( dis_tcnti )      { mcs48->tirq_enabled = FALSE; mcs48->timer_overflow = FALSE; }
450452
451static void djnz_r0(void)      { execute_jcc(--R0 != 0); }
452static void djnz_r1(void)      { execute_jcc(--R1 != 0); }
453static void djnz_r2(void)      { execute_jcc(--R2 != 0); }
454static void djnz_r3(void)      { execute_jcc(--R3 != 0); }
455static void djnz_r4(void)      { execute_jcc(--R4 != 0); }
456static void djnz_r5(void)      { execute_jcc(--R5 != 0); }
457static void djnz_r6(void)      { execute_jcc(--R6 != 0); }
458static void djnz_r7(void)      { execute_jcc(--R7 != 0); }
453OPHANDLER( djnz_r0 )      { execute_jcc(mcs48, --R0 != 0); }
454OPHANDLER( djnz_r1 )      { execute_jcc(mcs48, --R1 != 0); }
455OPHANDLER( djnz_r2 )      { execute_jcc(mcs48, --R2 != 0); }
456OPHANDLER( djnz_r3 )      { execute_jcc(mcs48, --R3 != 0); }
457OPHANDLER( djnz_r4 )      { execute_jcc(mcs48, --R4 != 0); }
458OPHANDLER( djnz_r5 )      { execute_jcc(mcs48, --R5 != 0); }
459OPHANDLER( djnz_r6 )      { execute_jcc(mcs48, --R6 != 0); }
460OPHANDLER( djnz_r7 )      { execute_jcc(mcs48, --R7 != 0); }
459461
460static void en_i(void)         { mcs48.xirq_enabled = TRUE; check_irqs(); }
461static void en_tcnti(void)      { mcs48.tirq_enabled = TRUE; check_irqs(); }
462OPHANDLER( en_i )         { mcs48->xirq_enabled = TRUE; check_irqs(mcs48); }
463OPHANDLER( en_tcnti )      { mcs48->tirq_enabled = TRUE; check_irqs(mcs48); }
462464
463static void ento_clk(void)
465OPHANDLER( ento_clk )
464466{
465467   logerror("I8039:  pc = %04x,  Unimplemented opcode = %02x\n", PC-1, program_r(PC-1));
466468}
467469
468static void in_a_p1(void)      { A = port_r(1) & mcs48.p1; }
469static void in_a_p2(void)      { A = port_r(2) & mcs48.p2; }
470static void ins_a_bus(void)      { A = bus_r(); }
470OPHANDLER( in_a_p1 )      { A = port_r(1) & mcs48->p1; }
471OPHANDLER( in_a_p2 )      { A = port_r(2) & mcs48->p2; }
472OPHANDLER( ins_a_bus )      { A = bus_r(); }
471473
472static void inc_a(void)         { A++; }
473static void inc_r0(void)      { R0++; }
474static void inc_r1(void)      { R1++; }
475static void inc_r2(void)      { R2++; }
476static void inc_r3(void)      { R3++; }
477static void inc_r4(void)      { R4++; }
478static void inc_r5(void)      { R5++; }
479static void inc_r6(void)      { R6++; }
480static void inc_r7(void)      { R7++; }
481static void inc_xr0(void)      { ram_w(R0, ram_r(R0) + 1); }
482static void inc_xr1(void)      { ram_w(R1, ram_r(R1) + 1); }
474OPHANDLER( inc_a )         { A++; }
475OPHANDLER( inc_r0 )      { R0++; }
476OPHANDLER( inc_r1 )      { R1++; }
477OPHANDLER( inc_r2 )      { R2++; }
478OPHANDLER( inc_r3 )      { R3++; }
479OPHANDLER( inc_r4 )      { R4++; }
480OPHANDLER( inc_r5 )      { R5++; }
481OPHANDLER( inc_r6 )      { R6++; }
482OPHANDLER( inc_r7 )      { R7++; }
483OPHANDLER( inc_xr0 )      { ram_w(R0, ram_r(R0) + 1); }
484OPHANDLER( inc_xr1 )      { ram_w(R1, ram_r(R1) + 1); }
483485
484static void jb_0(void)         { execute_jcc((A & 0x01) != 0); }
485static void jb_1(void)         { execute_jcc((A & 0x02) != 0); }
486static void jb_2(void)         { execute_jcc((A & 0x04) != 0); }
487static void jb_3(void)         { execute_jcc((A & 0x08) != 0); }
488static void jb_4(void)         { execute_jcc((A & 0x10) != 0); }
489static void jb_5(void)         { execute_jcc((A & 0x20) != 0); }
490static void jb_6(void)         { execute_jcc((A & 0x40) != 0); }
491static void jb_7(void)         { execute_jcc((A & 0x80) != 0); }
492static void jc(void)         { execute_jcc((PSW & C_FLAG) != 0); }
493static void jf0(void)         { execute_jcc((PSW & F_FLAG) != 0); }
494static void jf1(void)         { execute_jcc(mcs48.f1 != 0); }
486OPHANDLER( jb_0 )         { execute_jcc(mcs48, (A & 0x01) != 0); }
487OPHANDLER( jb_1 )         { execute_jcc(mcs48, (A & 0x02) != 0); }
488OPHANDLER( jb_2 )         { execute_jcc(mcs48, (A & 0x04) != 0); }
489OPHANDLER( jb_3 )         { execute_jcc(mcs48, (A & 0x08) != 0); }
490OPHANDLER( jb_4 )         { execute_jcc(mcs48, (A & 0x10) != 0); }
491OPHANDLER( jb_5 )         { execute_jcc(mcs48, (A & 0x20) != 0); }
492OPHANDLER( jb_6 )         { execute_jcc(mcs48, (A & 0x40) != 0); }
493OPHANDLER( jb_7 )         { execute_jcc(mcs48, (A & 0x80) != 0); }
494OPHANDLER( jc )         { execute_jcc(mcs48, (PSW & C_FLAG) != 0); }
495OPHANDLER( jf0 )         { execute_jcc(mcs48, (PSW & F_FLAG) != 0); }
496OPHANDLER( jf1 )         { execute_jcc(mcs48, mcs48->f1 != 0); }
495497
496static void jmp_0(void)         { execute_jmp(argument_fetch(PC) | 0x000); }
497static void jmp_1(void)         { execute_jmp(argument_fetch(PC) | 0x100); }
498static void jmp_2(void)         { execute_jmp(argument_fetch(PC) | 0x200); }
499static void jmp_3(void)         { execute_jmp(argument_fetch(PC) | 0x300); }
500static void jmp_4(void)         { execute_jmp(argument_fetch(PC) | 0x400); }
501static void jmp_5(void)         { execute_jmp(argument_fetch(PC) | 0x500); }
502static void jmp_6(void)         { execute_jmp(argument_fetch(PC) | 0x600); }
503static void jmp_7(void)         { execute_jmp(argument_fetch(PC) | 0x700); }
504static void jmpp_xa(void)      { PC &= 0xf00; PC |= program_r(PC | A); change_pc(PC); }
498OPHANDLER( jmp_0 )         { execute_jmp(mcs48, argument_fetch(PC) | 0x000); }
499OPHANDLER( jmp_1 )         { execute_jmp(mcs48, argument_fetch(PC) | 0x100); }
500OPHANDLER( jmp_2 )         { execute_jmp(mcs48, argument_fetch(PC) | 0x200); }
501OPHANDLER( jmp_3 )         { execute_jmp(mcs48, argument_fetch(PC) | 0x300); }
502OPHANDLER( jmp_4 )         { execute_jmp(mcs48, argument_fetch(PC) | 0x400); }
503OPHANDLER( jmp_5 )         { execute_jmp(mcs48, argument_fetch(PC) | 0x500); }
504OPHANDLER( jmp_6 )         { execute_jmp(mcs48, argument_fetch(PC) | 0x600); }
505OPHANDLER( jmp_7 )         { execute_jmp(mcs48, argument_fetch(PC) | 0x700); }
506OPHANDLER( jmpp_xa )      { PC &= 0xf00; PC |= program_r(PC | A); change_pc(PC); }
505507
506static void jnc(void)         { execute_jcc((PSW & C_FLAG) == 0); }
507static void jni(void)         { execute_jcc(mcs48.irq_state != 0); }
508static void jnt_0(void)        { execute_jcc(test_r(0) == 0); }
509static void jnt_1(void)        { execute_jcc(test_r(1) == 0); }
510static void jnz(void)         { execute_jcc(A != 0); }
511static void jtf(void)         { execute_jcc(mcs48.timer_flag); mcs48.timer_flag = FALSE; }
512static void jt_0(void)        { execute_jcc(test_r(0) != 0); }
513static void jt_1(void)        { execute_jcc(test_r(1) != 0); }
514static void jz(void)         { execute_jcc(A == 0); }
508OPHANDLER( jnc )         { execute_jcc(mcs48, (PSW & C_FLAG) == 0); }
509OPHANDLER( jni )         { execute_jcc(mcs48, mcs48->irq_state != 0); }
510OPHANDLER( jnt_0 )        { execute_jcc(mcs48, test_r(0) == 0); }
511OPHANDLER( jnt_1 )        { execute_jcc(mcs48, test_r(1) == 0); }
512OPHANDLER( jnz )         { execute_jcc(mcs48, A != 0); }
513OPHANDLER( jtf )         { execute_jcc(mcs48, mcs48->timer_flag); mcs48->timer_flag = FALSE; }
514OPHANDLER( jt_0 )        { execute_jcc(mcs48, test_r(0) != 0); }
515OPHANDLER( jt_1 )        { execute_jcc(mcs48, test_r(1) != 0); }
516OPHANDLER( jz )         { execute_jcc(mcs48, A == 0); }
515517
516static void mov_a_n(void)      { A = argument_fetch(PC++); }
517static void mov_a_psw(void)      { A = PSW; }
518static void mov_a_r0(void)      { A = R0; }
519static void mov_a_r1(void)      { A = R1; }
520static void mov_a_r2(void)      { A = R2; }
521static void mov_a_r3(void)      { A = R3; }
522static void mov_a_r4(void)      { A = R4; }
523static void mov_a_r5(void)      { A = R5; }
524static void mov_a_r6(void)      { A = R6; }
525static void mov_a_r7(void)      { A = R7; }
526static void mov_a_xr0(void)      { A = ram_r(R0); }
527static void mov_a_xr1(void)      { A = ram_r(R1); }
528static void mov_a_t(void)      { A = mcs48.timer; }
518OPHANDLER( mov_a_n )      { A = argument_fetch(PC++); }
519OPHANDLER( mov_a_psw )      { A = PSW; }
520OPHANDLER( mov_a_r0 )      { A = R0; }
521OPHANDLER( mov_a_r1 )      { A = R1; }
522OPHANDLER( mov_a_r2 )      { A = R2; }
523OPHANDLER( mov_a_r3 )      { A = R3; }
524OPHANDLER( mov_a_r4 )      { A = R4; }
525OPHANDLER( mov_a_r5 )      { A = R5; }
526OPHANDLER( mov_a_r6 )      { A = R6; }
527OPHANDLER( mov_a_r7 )      { A = R7; }
528OPHANDLER( mov_a_xr0 )      { A = ram_r(R0); }
529OPHANDLER( mov_a_xr1 )      { A = ram_r(R1); }
530OPHANDLER( mov_a_t )      { A = mcs48->timer; }
529531
530static void mov_psw_a(void)      { PSW = A; update_regptr(); }
531static void mov_r0_a(void)      { R0 = A; }
532static void mov_r1_a(void)      { R1 = A; }
533static void mov_r2_a(void)      { R2 = A; }
534static void mov_r3_a(void)      { R3 = A; }
535static void mov_r4_a(void)      { R4 = A; }
536static void mov_r5_a(void)      { R5 = A; }
537static void mov_r6_a(void)      { R6 = A; }
538static void mov_r7_a(void)      { R7 = A; }
539static void mov_r0_n(void)      { R0 = argument_fetch(PC++); }
540static void mov_r1_n(void)      { R1 = argument_fetch(PC++); }
541static void mov_r2_n(void)      { R2 = argument_fetch(PC++); }
542static void mov_r3_n(void)      { R3 = argument_fetch(PC++); }
543static void mov_r4_n(void)      { R4 = argument_fetch(PC++); }
544static void mov_r5_n(void)      { R5 = argument_fetch(PC++); }
545static void mov_r6_n(void)      { R6 = argument_fetch(PC++); }
546static void mov_r7_n(void)      { R7 = argument_fetch(PC++); }
547static void mov_t_a(void)      { mcs48.timer = A; }
548static void mov_xr0_a(void)      { ram_w(R0, A); }
549static void mov_xr1_a(void)      { ram_w(R1, A); }
550static void mov_xr0_n(void)      { ram_w(R0, argument_fetch(PC++)); }
551static void mov_xr1_n(void)      { ram_w(R1, argument_fetch(PC++)); }
532OPHANDLER( mov_psw_a )      { PSW = A; update_regptr(mcs48); }
533OPHANDLER( mov_r0_a )      { R0 = A; }
534OPHANDLER( mov_r1_a )      { R1 = A; }
535OPHANDLER( mov_r2_a )      { R2 = A; }
536OPHANDLER( mov_r3_a )      { R3 = A; }
537OPHANDLER( mov_r4_a )      { R4 = A; }
538OPHANDLER( mov_r5_a )      { R5 = A; }
539OPHANDLER( mov_r6_a )      { R6 = A; }
540OPHANDLER( mov_r7_a )      { R7 = A; }
541OPHANDLER( mov_r0_n )      { R0 = argument_fetch(PC++); }
542OPHANDLER( mov_r1_n )      { R1 = argument_fetch(PC++); }
543OPHANDLER( mov_r2_n )      { R2 = argument_fetch(PC++); }
544OPHANDLER( mov_r3_n )      { R3 = argument_fetch(PC++); }
545OPHANDLER( mov_r4_n )      { R4 = argument_fetch(PC++); }
546OPHANDLER( mov_r5_n )      { R5 = argument_fetch(PC++); }
547OPHANDLER( mov_r6_n )      { R6 = argument_fetch(PC++); }
548OPHANDLER( mov_r7_n )      { R7 = argument_fetch(PC++); }
549OPHANDLER( mov_t_a )      { mcs48->timer = A; }
550OPHANDLER( mov_xr0_a )      { ram_w(R0, A); }
551OPHANDLER( mov_xr1_a )      { ram_w(R1, A); }
552OPHANDLER( mov_xr0_n )      { ram_w(R0, argument_fetch(PC++)); }
553OPHANDLER( mov_xr1_n )      { ram_w(R1, argument_fetch(PC++)); }
552554
553static void movd_a_p4(void)      { A = port_r(4) & 0x0f; }
554static void movd_a_p5(void)      { A = port_r(5) & 0x0f; }
555static void movd_a_p6(void)      { A = port_r(6) & 0x0f; }
556static void movd_a_p7(void)      { A = port_r(7) & 0x0f; }
557static void movd_p4_a(void)      { port_w(4, A & 0x0f); }
558static void movd_p5_a(void)      { port_w(5, A & 0x0f); }
559static void movd_p6_a(void)      { port_w(6, A & 0x0f); }
560static void movd_p7_a(void)      { port_w(7, A & 0x0f); }
555OPHANDLER( movd_a_p4 )      { A = port_r(4) & 0x0f; }
556OPHANDLER( movd_a_p5 )      { A = port_r(5) & 0x0f; }
557OPHANDLER( movd_a_p6 )      { A = port_r(6) & 0x0f; }
558OPHANDLER( movd_a_p7 )      { A = port_r(7) & 0x0f; }
559OPHANDLER( movd_p4_a )      { port_w(4, A & 0x0f); }
560OPHANDLER( movd_p5_a )      { port_w(5, A & 0x0f); }
561OPHANDLER( movd_p6_a )      { port_w(6, A & 0x0f); }
562OPHANDLER( movd_p7_a )      { port_w(7, A & 0x0f); }
561563
562static void movp_a_xa(void)      { A = program_r((PC & 0xf00) | A); }
563static void movp3_a_xa(void)   { A = program_r(0x300 | A); }
564OPHANDLER( movp_a_xa )      { A = program_r((PC & 0xf00) | A); }
565OPHANDLER( movp3_a_xa )   { A = program_r(0x300 | A); }
564566
565static void movx_a_xr0(void)   { A = ext_r(R0); }
566static void movx_a_xr1(void)   { A = ext_r(R1); }
567static void movx_xr0_a(void)   { ext_w(R0, A); }
568static void movx_xr1_a(void)   { ext_w(R1, A); }
567OPHANDLER( movx_a_xr0 )   { A = ext_r(R0); }
568OPHANDLER( movx_a_xr1 )   { A = ext_r(R1); }
569OPHANDLER( movx_xr0_a )   { ext_w(R0, A); }
570OPHANDLER( movx_xr1_a )   { ext_w(R1, A); }
569571
570static void nop(void)         { }
572OPHANDLER( nop )         { }
571573
572static void orl_a_r0(void)      { A |= R0; }
573static void orl_a_r1(void)      { A |= R1; }
574static void orl_a_r2(void)      { A |= R2; }
575static void orl_a_r3(void)      { A |= R3; }
576static void orl_a_r4(void)      { A |= R4; }
577static void orl_a_r5(void)      { A |= R5; }
578static void orl_a_r6(void)      { A |= R6; }
579static void orl_a_r7(void)      { A |= R7; }
580static void orl_a_xr0(void)      { A |= ram_r(R0); }
581static void orl_a_xr1(void)      { A |= ram_r(R1); }
582static void orl_a_n(void)      { A |= argument_fetch(PC++); }
583static void orl_bus_n(void)      { bus_w(bus_r() | argument_fetch(PC++)); }
584static void orl_p1_n(void)      { port_w(1, mcs48.p1 |= argument_fetch(PC++)); }
585static void orl_p2_n(void)      { port_w(2, mcs48.p2 |= argument_fetch(PC++)); }
586static void orld_p4_a(void)      { port_w(4, port_r(4) | A); }
587static void orld_p5_a(void)      { port_w(5, port_r(5) | A); }
588static void orld_p6_a(void)      { port_w(6, port_r(6) | A); }
589static void orld_p7_a(void)      { port_w(7, port_r(7) | A); }
574OPHANDLER( orl_a_r0 )      { A |= R0; }
575OPHANDLER( orl_a_r1 )      { A |= R1; }
576OPHANDLER( orl_a_r2 )      { A |= R2; }
577OPHANDLER( orl_a_r3 )      { A |= R3; }
578OPHANDLER( orl_a_r4 )      { A |= R4; }
579OPHANDLER( orl_a_r5 )      { A |= R5; }
580OPHANDLER( orl_a_r6 )      { A |= R6; }
581OPHANDLER( orl_a_r7 )      { A |= R7; }
582OPHANDLER( orl_a_xr0 )      { A |= ram_r(R0); }
583OPHANDLER( orl_a_xr1 )      { A |= ram_r(R1); }
584OPHANDLER( orl_a_n )      { A |= argument_fetch(PC++); }
585OPHANDLER( orl_bus_n )      { bus_w(bus_r() | argument_fetch(PC++)); }
586OPHANDLER( orl_p1_n )      { port_w(1, mcs48->p1 |= argument_fetch(PC++)); }
587OPHANDLER( orl_p2_n )      { port_w(2, mcs48->p2 |= argument_fetch(PC++)); }
588OPHANDLER( orld_p4_a )      { port_w(4, port_r(4) | A); }
589OPHANDLER( orld_p5_a )      { port_w(5, port_r(5) | A); }
590OPHANDLER( orld_p6_a )      { port_w(6, port_r(6) | A); }
591OPHANDLER( orld_p7_a )      { port_w(7, port_r(7) | A); }
590592
591static void outl_bus_a(void)   { bus_w(A); }
592static void outl_p1_a(void)      { port_w(1, mcs48.p1 = A); }
593static void outl_p2_a(void)      { port_w(2, mcs48.p2 = A); }
594static void ret(void)         { pull_pc(); }
593OPHANDLER( outl_bus_a )   { bus_w(A); }
594OPHANDLER( outl_p1_a )      { port_w(1, mcs48->p1 = A); }
595OPHANDLER( outl_p2_a )      { port_w(2, mcs48->p2 = A); }
596OPHANDLER( ret )         { pull_pc(mcs48); }
595597
596static void retr(void)
598OPHANDLER( retr )
597599{
598   pull_pc_psw();
600   pull_pc_psw(mcs48);
599601
600602   /* implicitly clear the IRQ in progress flip flop and re-check interrupts */
601   mcs48.irq_in_progress = FALSE;
602   check_irqs();
603   mcs48->irq_in_progress = FALSE;
604   check_irqs(mcs48);
603605}
604606
605static void rl_a(void)         { A = (A << 1) | (A >> 7); }
606static void rlc_a(void)       { UINT8 newc = A & C_FLAG; A = (A << 1) | (PSW >> 7); PSW = (PSW & ~C_FLAG) | newc; }
607OPHANDLER( rl_a )         { A = (A << 1) | (A >> 7); }
608OPHANDLER( rlc_a )       { UINT8 newc = A & C_FLAG; A = (A << 1) | (PSW >> 7); PSW = (PSW & ~C_FLAG) | newc; }
607609
608static void rr_a(void)         { A = (A >> 1) | (A << 7); }
609static void rrc_a(void)         { UINT8 newc = (A << 7) & C_FLAG; A = (A >> 1) | (PSW & C_FLAG); PSW = (PSW & ~C_FLAG) | newc; }
610OPHANDLER( rr_a )         { A = (A >> 1) | (A << 7); }
611OPHANDLER( rrc_a )         { UINT8 newc = (A << 7) & C_FLAG; A = (A >> 1) | (PSW & C_FLAG); PSW = (PSW & ~C_FLAG) | newc; }
610612
611static void sel_mb0(void)      { mcs48.a11 = 0x000; }
612static void sel_mb1(void)      { mcs48.a11 = 0x800; }
613OPHANDLER( sel_mb0 )      { mcs48->a11 = 0x000; }
614OPHANDLER( sel_mb1 )      { mcs48->a11 = 0x800; }
613615
614static void sel_rb0(void)      { PSW &= ~B_FLAG; update_regptr();  }
615static void sel_rb1(void)      { PSW |=  B_FLAG; update_regptr(); }
616OPHANDLER( sel_rb0 )      { PSW &= ~B_FLAG; update_regptr(mcs48);  }
617OPHANDLER( sel_rb1 )      { PSW |=  B_FLAG; update_regptr(mcs48); }
616618
617static void stop_tcnt(void)      { mcs48.timecount_enabled = 0; }
619OPHANDLER( stop_tcnt )      { mcs48->timecount_enabled = 0; }
618620
619static void strt_cnt(void)      { mcs48.timecount_enabled = COUNTER_ENABLED; mcs48.t1_history = test_r(1); }
620static void strt_t(void)      { mcs48.timecount_enabled = TIMER_ENABLED; mcs48.prescaler = 0; }
621OPHANDLER( strt_cnt )      { mcs48->timecount_enabled = COUNTER_ENABLED; mcs48->t1_history = test_r(1); }
622OPHANDLER( strt_t )      { mcs48->timecount_enabled = TIMER_ENABLED; mcs48->prescaler = 0; }
621623
622static void swap_a(void)      { A = (A << 4) | (A >> 4); }
624OPHANDLER( swap_a )      { A = (A << 4) | (A >> 4); }
623625
624static void xch_a_r0(void)      { UINT8 tmp = A; A = R0; R0 = tmp; }
625static void xch_a_r1(void)      { UINT8 tmp = A; A = R1; R1 = tmp; }
626static void xch_a_r2(void)      { UINT8 tmp = A; A = R2; R2 = tmp; }
627static void xch_a_r3(void)      { UINT8 tmp = A; A = R3; R3 = tmp; }
628static void xch_a_r4(void)      { UINT8 tmp = A; A = R4; R4 = tmp; }
629static void xch_a_r5(void)      { UINT8 tmp = A; A = R5; R5 = tmp; }
630static void xch_a_r6(void)      { UINT8 tmp = A; A = R6; R6 = tmp; }
631static void xch_a_r7(void)      { UINT8 tmp = A; A = R7; R7 = tmp; }
632static void xch_a_xr0(void)      { UINT8 tmp = A; A = ram_r(R0); ram_w(R0, tmp); }
633static void xch_a_xr1(void)      { UINT8 tmp = A; A = ram_r(R1); ram_w(R1, tmp); }
626OPHANDLER( xch_a_r0 )      { UINT8 tmp = A; A = R0; R0 = tmp; }
627OPHANDLER( xch_a_r1 )      { UINT8 tmp = A; A = R1; R1 = tmp; }
628OPHANDLER( xch_a_r2 )      { UINT8 tmp = A; A = R2; R2 = tmp; }
629OPHANDLER( xch_a_r3 )      { UINT8 tmp = A; A = R3; R3 = tmp; }
630OPHANDLER( xch_a_r4 )      { UINT8 tmp = A; A = R4; R4 = tmp; }
631OPHANDLER( xch_a_r5 )      { UINT8 tmp = A; A = R5; R5 = tmp; }
632OPHANDLER( xch_a_r6 )      { UINT8 tmp = A; A = R6; R6 = tmp; }
633OPHANDLER( xch_a_r7 )      { UINT8 tmp = A; A = R7; R7 = tmp; }
634OPHANDLER( xch_a_xr0 )      { UINT8 tmp = A; A = ram_r(R0); ram_w(R0, tmp); }
635OPHANDLER( xch_a_xr1 )      { UINT8 tmp = A; A = ram_r(R1); ram_w(R1, tmp); }
634636
635static void xchd_a_xr0(void)   { UINT8 oldram = ram_r(R0); ram_w(R0, (oldram & 0xf0) | (A & 0x0f)); A = (A & 0xf0) | (oldram & 0x0f); }
636static void xchd_a_xr1(void)   { UINT8 oldram = ram_r(R1); ram_w(R1, (oldram & 0xf0) | (A & 0x0f)); A = (A & 0xf0) | (oldram & 0x0f); }
637OPHANDLER( xchd_a_xr0 )   { UINT8 oldram = ram_r(R0); ram_w(R0, (oldram & 0xf0) | (A & 0x0f)); A = (A & 0xf0) | (oldram & 0x0f); }
638OPHANDLER( xchd_a_xr1 )   { UINT8 oldram = ram_r(R1); ram_w(R1, (oldram & 0xf0) | (A & 0x0f)); A = (A & 0xf0) | (oldram & 0x0f); }
637639
638static void xrl_a_r0(void)      { A ^= R0; }
639static void xrl_a_r1(void)      { A ^= R1; }
640static void xrl_a_r2(void)      { A ^= R2; }
641static void xrl_a_r3(void)      { A ^= R3; }
642static void xrl_a_r4(void)      { A ^= R4; }
643static void xrl_a_r5(void)      { A ^= R5; }
644static void xrl_a_r6(void)      { A ^= R6; }
645static void xrl_a_r7(void)      { A ^= R7; }
646static void xrl_a_xr0(void)      { A ^= ram_r(R0); }
647static void xrl_a_xr1(void)      { A ^= ram_r(R1); }
648static void xrl_a_n(void)      { A ^= argument_fetch(PC++); }
640OPHANDLER( xrl_a_r0 )      { A ^= R0; }
641OPHANDLER( xrl_a_r1 )      { A ^= R1; }
642OPHANDLER( xrl_a_r2 )      { A ^= R2; }
643OPHANDLER( xrl_a_r3 )      { A ^= R3; }
644OPHANDLER( xrl_a_r4 )      { A ^= R4; }
645OPHANDLER( xrl_a_r5 )      { A ^= R5; }
646OPHANDLER( xrl_a_r6 )      { A ^= R6; }
647OPHANDLER( xrl_a_r7 )      { A ^= R7; }
648OPHANDLER( xrl_a_xr0 )      { A ^= ram_r(R0); }
649OPHANDLER( xrl_a_xr1 )      { A ^= ram_r(R1); }
650OPHANDLER( xrl_a_n )      { A ^= argument_fetch(PC++); }
649651
650652
651653
r3535r3536
699701    mcs48_init - generic MCS-48 initialization
700702-------------------------------------------------*/
701703
702static void mcs48_init(int index, int clock, const void *config, int (*irqcallback)(int), UINT16 romsize)
704static void mcs48_init(const device_config *device, int index, int clock, const void *config, cpu_irq_callback irqcallback, UINT16 romsize)
703705{
704   memset(&mcs48, 0, sizeof(mcs48));
706   mcs48_state *mcs48 = device->token;
705707
708   token = device->token;   // temporary
709
706710   /* External access line
707711     * EA=1 : read from external rom
708712     * EA=0 : read from internal rom
709713     */
710714
711715   /* FIXME: Current implementation suboptimal */
712   mcs48.ea = (romsize ? 0 : 1);
716   mcs48->ea = (romsize ? 0 : 1);
713717
714   mcs48.irq_callback = irqcallback;
715   mcs48.int_rom_size = romsize;
718   mcs48->irq_callback = irqcallback;
719   mcs48->device = device;
720   mcs48->int_rom_size = romsize;
716721
717   state_save_register_item("mcs48", index, mcs48.prevpc.w.l);
722   state_save_register_item("mcs48", index, mcs48->prevpc.w.l);
718723   state_save_register_item("mcs48", index, PC);
719724   state_save_register_item("mcs48", index, A);
720725   state_save_register_item("mcs48", index, PSW);
721   state_save_register_item("mcs48", index, mcs48.p1);
722   state_save_register_item("mcs48", index, mcs48.p2);
723   state_save_register_item("mcs48", index, mcs48.f1);
724   state_save_register_item("mcs48", index, mcs48.ea);
725   state_save_register_item("mcs48", index, mcs48.timer);
726   state_save_register_item("mcs48", index, mcs48.prescaler);
727   state_save_register_item("mcs48", index, mcs48.t1_history);
728   state_save_register_item("mcs48", index, mcs48.irq_state);
729   state_save_register_item("mcs48", index, mcs48.irq_in_progress);
730   state_save_register_item("mcs48", index, mcs48.timer_overflow);
731   state_save_register_item("mcs48", index, mcs48.timer_flag);
732   state_save_register_item("mcs48", index, mcs48.tirq_enabled);
733   state_save_register_item("mcs48", index, mcs48.xirq_enabled);
734   state_save_register_item("mcs48", index, mcs48.timecount_enabled);
735   state_save_register_item("mcs48", index, mcs48.a11);
726   state_save_register_item("mcs48", index, mcs48->p1);
727   state_save_register_item("mcs48", index, mcs48->p2);
728   state_save_register_item("mcs48", index, mcs48->f1);
729   state_save_register_item("mcs48", index, mcs48->ea);
730   state_save_register_item("mcs48", index, mcs48->timer);
731   state_save_register_item("mcs48", index, mcs48->prescaler);
732   state_save_register_item("mcs48", index, mcs48->t1_history);
733   state_save_register_item("mcs48", index, mcs48->irq_state);
734   state_save_register_item("mcs48", index, mcs48->irq_in_progress);
735   state_save_register_item("mcs48", index, mcs48->timer_overflow);
736   state_save_register_item("mcs48", index, mcs48->timer_flag);
737   state_save_register_item("mcs48", index, mcs48->tirq_enabled);
738   state_save_register_item("mcs48", index, mcs48->xirq_enabled);
739   state_save_register_item("mcs48", index, mcs48->timecount_enabled);
740   state_save_register_item("mcs48", index, mcs48->a11);
736741}
737742
738743
r3535r3536
743748-------------------------------------------------*/
744749
745750#if (HAS_I8035 || HAS_MB8884)
746static void i8035_init(int index, int clock, const void *config, int (*irqcallback)(int))
751static CPU_INIT( i8035 )
747752{
748   mcs48_init(index, clock, config, irqcallback, 0x0);
753   mcs48_init(device, index, clock, config, irqcallback, 0x0);
749754}
750755#endif
751756
r3535r3536
757762-------------------------------------------------*/
758763
759764#if (HAS_I8041 || HAS_I8048 || HAS_I8648 || HAS_I8748 || HAS_N7751)
760static void i8041_init(int index, int clock, const void *config, int (*irqcallback)(int))
765static CPU_INIT( i8041 )
761766{
762   mcs48_init(index, clock, config, irqcallback, 0x400);
767   mcs48_init(device, index, clock, config, irqcallback, 0x400);
763768}
764769#endif
765770
r3535r3536
771776-------------------------------------------------*/
772777
773778#if (HAS_I8039)
774static void i8039_init(int index, int clock, const void *config, int (*irqcallback)(int))
779static CPU_INIT( i8039 )
775780{
776   mcs48_init(index, clock, config, irqcallback, 0x0);
781   mcs48_init(device, index, clock, config, irqcallback, 0x0);
777782}
778783#endif
779784
r3535r3536
785790-------------------------------------------------*/
786791
787792#if (HAS_I8049 || HAS_I8749 || HAS_M58715)
788static void i8049_init(int index, int clock, const void *config, int (*irqcallback)(int))
793static CPU_INIT( i8049 )
789794{
790   mcs48_init(index, clock, config, irqcallback, 0x800);
795   mcs48_init(device, index, clock, config, irqcallback, 0x800);
791796}
792797#endif
793798
r3535r3536
796801    mcs48_reset - general reset routine
797802-------------------------------------------------*/
798803
799static void mcs48_reset(void)
804static CPU_RESET( mcs48 )
800805{
806   mcs48_state *mcs48 = device->token;
807
801808   /* confirmed from reset description */
802809   PC = 0;
803810   PSW = (PSW & (C_FLAG | A_FLAG)) | 0x08;
804   mcs48.a11 = 0x000;
811   mcs48->a11 = 0x000;
805812   bus_w(0xff);
806   mcs48.p1 = 0xff;
807   mcs48.p2 = 0xff;
808   port_w(1, mcs48.p1);
809   port_w(2, mcs48.p2);
810   mcs48.tirq_enabled = FALSE;
811   mcs48.xirq_enabled = FALSE;
812   mcs48.timecount_enabled = 0;
813   mcs48.timer_flag = FALSE;
814   mcs48.f1 = 0;
813   mcs48->p1 = 0xff;
814   mcs48->p2 = 0xff;
815   port_w(1, mcs48->p1);
816   port_w(2, mcs48->p2);
817   mcs48->tirq_enabled = FALSE;
818   mcs48->xirq_enabled = FALSE;
819   mcs48->timecount_enabled = 0;
820   mcs48->timer_flag = FALSE;
821   mcs48->f1 = 0;
815822
816823   /* confirmed from interrupt logic description */
817   mcs48.irq_in_progress = FALSE;
818   mcs48.timer_overflow = FALSE;
824   mcs48->irq_in_progress = FALSE;
825   mcs48->timer_overflow = FALSE;
819826}
820827
821828
r3535r3536
828835    check_irqs - check for and process IRQs
829836-------------------------------------------------*/
830837
831static void check_irqs(void)
838static void check_irqs(mcs48_state *mcs48)
832839{
833840   /* if something is in progress, we do nothing */
834   if (mcs48.irq_in_progress)
841   if (mcs48->irq_in_progress)
835842      return;
836843
837844   /* external interrupts take priority */
838   if (mcs48.irq_state && mcs48.xirq_enabled)
845   if (mcs48->irq_state && mcs48->xirq_enabled)
839846   {
840      mcs48.irq_in_progress = TRUE;
847      mcs48->irq_in_progress = TRUE;
841848
842849      /* transfer to location 0x03 */
843      push_pc_psw();
850      push_pc_psw(mcs48);
844851      PC = 0x03;
845852      change_pc(0x03);
846      mcs48.inst_cycles += 2;
853      mcs48->inst_cycles += 2;
847854
848855      /* indicate we took the external IRQ */
849      if (mcs48.irq_callback != NULL)
850         (*mcs48.irq_callback)(0);
856      if (mcs48->irq_callback != NULL)
857         (*mcs48->irq_callback)(mcs48->device, 0);
851858   }
852859
853860   /* timer overflow interrupts follow */
854   if (mcs48.timer_overflow && mcs48.tirq_enabled)
861   if (mcs48->timer_overflow && mcs48->tirq_enabled)
855862   {
856      mcs48.irq_in_progress = TRUE;
863      mcs48->irq_in_progress = TRUE;
857864
858865      /* transfer to location 0x07 */
859      push_pc_psw();
866      push_pc_psw(mcs48);
860867      PC = 0x07;
861868      change_pc(0x07);
862      mcs48.inst_cycles += 2;
869      mcs48->inst_cycles += 2;
863870
864871      /* timer overflow flip-flop is reset once taken */
865      mcs48.timer_overflow = FALSE;
872      mcs48->timer_overflow = FALSE;
866873   }
867874}
868875
r3535r3536
872879    and counters
873880-------------------------------------------------*/
874881
875static void burn_cycles(int count)
882static void burn_cycles(mcs48_state *mcs48, int count)
876883{
877884   int timerover = FALSE;
878885
879886   /* if the timer is enabled, accumulate prescaler cycles */
880   if (mcs48.timecount_enabled & TIMER_ENABLED)
887   if (mcs48->timecount_enabled & TIMER_ENABLED)
881888   {
882      UINT8 oldtimer = mcs48.timer;
883      mcs48.prescaler += count;
884      mcs48.timer += mcs48.prescaler >> 5;
885      mcs48.prescaler &= 0x1f;
886      timerover = (oldtimer != 0 && mcs48.timer == 0);
889      UINT8 oldtimer = mcs48->timer;
890      mcs48->prescaler += count;
891      mcs48->timer += mcs48->prescaler >> 5;
892      mcs48->prescaler &= 0x1f;
893      timerover = (oldtimer != 0 && mcs48->timer == 0);
887894   }
888895
889896   /* if the counter is enabled, poll the T1 test input once for each cycle */
890   else if (mcs48.timecount_enabled & COUNTER_ENABLED)
897   else if (mcs48->timecount_enabled & COUNTER_ENABLED)
891898      for ( ; count > 0; count--)
892899      {
893         mcs48.t1_history = (mcs48.t1_history << 1) | (test_r(1) & 1);
894         if ((mcs48.t1_history & 3) == 2)
895            timerover = (++mcs48.timer == 0);
900         mcs48->t1_history = (mcs48->t1_history << 1) | (test_r(1) & 1);
901         if ((mcs48->t1_history & 3) == 2)
902            timerover = (++mcs48->timer == 0);
896903      }
897904
898905   /* if either source caused a timer overflow, set the flags and check IRQs */
899906   if (timerover)
900907   {
901      mcs48.timer_flag = TRUE;
908      mcs48->timer_flag = TRUE;
902909
903910      /* according to the docs, if an overflow occurs with interrupts disabled, the overflow is not stored */
904      if (mcs48.tirq_enabled)
911      if (mcs48->tirq_enabled)
905912      {
906         mcs48.timer_overflow = TRUE;
907         check_irqs();
913         mcs48->timer_overflow = TRUE;
914         check_irqs(mcs48);
908915      }
909916   }
910917}
r3535r3536
915922    of cycles
916923-------------------------------------------------*/
917924
918static int mcs48_execute(int cycles)
925static CPU_EXECUTE( mcs48 )
919926{
927   mcs48_state *mcs48 = device->token;
920928   unsigned opcode;
921929
922   mcs48_icount = cycles;
930   mcs48->icount = cycles;
923931
924932   /* external interrupts may have been set since we last checked */
925   mcs48.inst_cycles = 0;
926   check_irqs();
927   mcs48_icount -= mcs48.inst_cycles;
928   if (mcs48.timecount_enabled != 0)
929      burn_cycles(mcs48.inst_cycles);
933   mcs48->inst_cycles = 0;
934   check_irqs(mcs48);
935   mcs48->icount -= mcs48->inst_cycles;
936   if (mcs48->timecount_enabled != 0)
937      burn_cycles(mcs48, mcs48->inst_cycles);
930938
931939   /* iterate over remaining cycles, guaranteeing at least one instruction */
932940   do
933941   {
934942      /* fetch next opcode */
935      mcs48.prevpc = mcs48.pc;
943      mcs48->prevpc = mcs48->pc;
936944      debugger_instruction_hook(Machine, PC);
937945      opcode = opcode_fetch(PC++);
938946
939947      /* process opcode and count cycles */
940      mcs48.inst_cycles = opcode_table[opcode].cycles;
941      (*opcode_table[opcode].function)();
948      mcs48->inst_cycles = opcode_table[opcode].cycles;
949      (*opcode_table[opcode].function)(mcs48);
942950
943951      /* burn the cycles */
944      mcs48_icount -= mcs48.inst_cycles;
945      if (mcs48.timecount_enabled != 0)
946         burn_cycles(mcs48.inst_cycles);
952      mcs48->icount -= mcs48->inst_cycles;
953      if (mcs48->timecount_enabled != 0)
954         burn_cycles(mcs48, mcs48->inst_cycles);
947955
948   } while (mcs48_icount > 0);
956   } while (mcs48->icount > 0);
949957
950   return cycles - mcs48_icount;
958   return cycles - mcs48->icount;
951959}
952960
953961
r3535r3536
984992    destination
985993-------------------------------------------------*/
986994
987static void mcs48_get_context(void *dst)
995static CPU_GET_CONTEXT( mcs48 )
988996{
989   if (dst != NULL)
990      *(mcs48_regs *)dst = mcs48;
991997}
992998
993999
r3535r3536
9961002    from the source
9971003-------------------------------------------------*/
9981004
999static void mcs48_set_context(void *src)
1005static CPU_SET_CONTEXT( mcs48 )
10001006{
1001   if (src != NULL)
1002   {
1003      mcs48 = *(mcs48_regs *)src;
1004      update_regptr();
1005      change_pc(PC);
1006   }
1007   mcs48_state *mcs48;
1008   if( src )
1009      token = src;
1010   mcs48 = token;
1011   update_regptr(mcs48);
1012   change_pc(PC);
10071013}
10081014
1009
10101015/*-------------------------------------------------
10111016    mcs48_set_info - set a piece of information
10121017    on the CPU core
10131018-------------------------------------------------*/
10141019
1015static void mcs48_set_info(UINT32 state, cpuinfo *info)
1020static CPU_SET_INFO( mcs48 )
10161021{
1022   mcs48_state *mcs48 = token;
1023
10171024   switch (state)
10181025   {
10191026      /* --- the following bits of info are set as 64-bit signed integers --- */
1020      case CPUINFO_INT_INPUT_STATE + MCS48_INPUT_IRQ:   mcs48.irq_state = (info->i != CLEAR_LINE);   break;
1021      case CPUINFO_INT_INPUT_STATE + MCS48_INPUT_EA:   mcs48.ea = (info->i != CLEAR_LINE);         break;
1027      case CPUINFO_INT_INPUT_STATE + MCS48_INPUT_IRQ:   mcs48->irq_state = (info->i != CLEAR_LINE);   break;
1028      case CPUINFO_INT_INPUT_STATE + MCS48_INPUT_EA:   mcs48->ea = (info->i != CLEAR_LINE);         break;
10221029
10231030      case CPUINFO_INT_PC:
10241031      case CPUINFO_INT_REGISTER + MCS48_PC:         PC = info->i;                        break;
10251032      case CPUINFO_INT_SP:
10261033      case CPUINFO_INT_REGISTER + MCS48_PSW:         PSW = info->i;                        break;
10271034      case CPUINFO_INT_REGISTER + MCS48_A:         A = info->i;                        break;
1028      case CPUINFO_INT_REGISTER + MCS48_TC:         mcs48.timer = info->i;                  break;
1029      case CPUINFO_INT_REGISTER + MCS48_P1:         mcs48.p1 = info->i;                     break;
1030      case CPUINFO_INT_REGISTER + MCS48_P2:         mcs48.p2 = info->i;                     break;
1035      case CPUINFO_INT_REGISTER + MCS48_TC:         mcs48->timer = info->i;                  break;
1036      case CPUINFO_INT_REGISTER + MCS48_P1:         mcs48->p1 = info->i;                     break;
1037      case CPUINFO_INT_REGISTER + MCS48_P2:         mcs48->p2 = info->i;                     break;
10311038      case CPUINFO_INT_REGISTER + MCS48_R0:         R0 = info->i;                        break;
10321039      case CPUINFO_INT_REGISTER + MCS48_R1:         R1 = info->i;                        break;
10331040      case CPUINFO_INT_REGISTER + MCS48_R2:         R2 = info->i;                        break;
r3535r3536
10361043      case CPUINFO_INT_REGISTER + MCS48_R5:         R5 = info->i;                        break;
10371044      case CPUINFO_INT_REGISTER + MCS48_R6:         R6 = info->i;                        break;
10381045      case CPUINFO_INT_REGISTER + MCS48_R7:         R7 = info->i;                        break;
1039      case CPUINFO_INT_REGISTER + MCS48_EA:         mcs48.ea = info->i;                     break;
1046      case CPUINFO_INT_REGISTER + MCS48_EA:         mcs48->ea = info->i;                     break;
10401047   }
10411048}
10421049
r3535r3536
10461053    information from the CPU core
10471054-------------------------------------------------*/
10481055
1049static void mcs48_get_info(UINT32 state, cpuinfo *info)
1056static CPU_GET_INFO( mcs48 )
10501057{
1058   mcs48_state *mcs48 = token;
1059
10511060   switch (state)
10521061   {
10531062      /* --- the following bits of info are returned as 64-bit signed integers --- */
1054      case CPUINFO_INT_CONTEXT_SIZE:                     info->i = sizeof(mcs48);            break;
1063      case CPUINFO_INT_CONTEXT_SIZE:                     info->i = sizeof(mcs48_state);         break;
10551064      case CPUINFO_INT_INPUT_LINES:                     info->i = 2;                     break;
10561065      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:               info->i = MCS48_INPUT_IRQ;            break;
10571066      case CPUINFO_INT_ENDIANNESS:                     info->i = CPU_IS_LE;               break;
r3535r3536
10721081      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 9;                     break;
10731082      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = 0;                     break;
10741083
1075      case CPUINFO_INT_INPUT_STATE + MCS48_INPUT_IRQ:         info->i = mcs48.irq_state ? ASSERT_LINE : CLEAR_LINE; break;
1076      case CPUINFO_INT_INPUT_STATE + MCS48_INPUT_EA:         info->i = mcs48.ea;                  break;
1084      case CPUINFO_INT_INPUT_STATE + MCS48_INPUT_IRQ:         info->i = mcs48->irq_state ? ASSERT_LINE : CLEAR_LINE; break;
1085      case CPUINFO_INT_INPUT_STATE + MCS48_INPUT_EA:         info->i = mcs48->ea;                  break;
10771086
1078      case CPUINFO_INT_PREVIOUSPC:                     info->i = mcs48.prevpc.w.l;            break;
1087      case CPUINFO_INT_PREVIOUSPC:                     info->i = mcs48->prevpc.w.l;            break;
10791088
10801089      case CPUINFO_INT_PC:
10811090      case CPUINFO_INT_REGISTER + MCS48_PC:               info->i = PC;                     break;
10821091      case CPUINFO_INT_REGISTER + MCS48_PSW:               info->i = PSW;                     break;
10831092      case CPUINFO_INT_REGISTER + MCS48_A:               info->i = A;                     break;
1084      case CPUINFO_INT_REGISTER + MCS48_TC:               info->i = mcs48.timer;               break;
1085      case CPUINFO_INT_REGISTER + MCS48_P1:               info->i = mcs48.p1;                  break;
1086      case CPUINFO_INT_REGISTER + MCS48_P2:               info->i = mcs48.p2;                  break;
1093      case CPUINFO_INT_REGISTER + MCS48_TC:               info->i = mcs48->timer;               break;
1094      case CPUINFO_INT_REGISTER + MCS48_P1:               info->i = mcs48->p1;                  break;
1095      case CPUINFO_INT_REGISTER + MCS48_P2:               info->i = mcs48->p2;                  break;
10871096      case CPUINFO_INT_REGISTER + MCS48_R0:               info->i = R0;                     break;
10881097      case CPUINFO_INT_REGISTER + MCS48_R1:               info->i = R1;                     break;
10891098      case CPUINFO_INT_REGISTER + MCS48_R2:               info->i = R2;                     break;
r3535r3536
10921101      case CPUINFO_INT_REGISTER + MCS48_R5:               info->i = R5;                     break;
10931102      case CPUINFO_INT_REGISTER + MCS48_R6:               info->i = R6;                     break;
10941103      case CPUINFO_INT_REGISTER + MCS48_R7:               info->i = R7;                     break;
1095      case CPUINFO_INT_REGISTER + MCS48_EA:               info->i = mcs48.ea;                  break;
1104      case CPUINFO_INT_REGISTER + MCS48_EA:               info->i = mcs48->ea;                  break;
10961105
10971106      /* --- the following bits of info are returned as pointers to data or functions --- */
1098      case CPUINFO_PTR_SET_INFO:                        info->setinfo = mcs48_set_info;         break;
1099      case CPUINFO_PTR_GET_CONTEXT:                     info->getcontext = mcs48_get_context;   break;
1100      case CPUINFO_PTR_SET_CONTEXT:                     info->setcontext = mcs48_set_context;   break;
1101      case CPUINFO_PTR_INIT:                           /*info->init = i8039_init;*/         break;
1102      case CPUINFO_PTR_RESET:                           info->reset = mcs48_reset;            break;
1103      case CPUINFO_PTR_EXECUTE:                        info->execute = mcs48_execute;         break;
1107      case CPUINFO_PTR_SET_INFO:                        info->setinfo = CPU_SET_INFO_NAME(mcs48);         break;
1108      case CPUINFO_PTR_GET_CONTEXT:                     info->getcontext = CPU_GET_CONTEXT_NAME(mcs48);   break;
1109      case CPUINFO_PTR_SET_CONTEXT:                     info->setcontext = CPU_SET_CONTEXT_NAME(mcs48);   break;
1110      case CPUINFO_PTR_INIT:                           /*info->init = CPU_INIT_NAME(i8039);*/         break;
1111      case CPUINFO_PTR_RESET:                           info->reset = CPU_RESET_NAME(mcs48);            break;
1112      case CPUINFO_PTR_EXECUTE:                        info->execute = CPU_EXECUTE_NAME(mcs48);         break;
11041113      case CPUINFO_PTR_BURN:                           info->burn = NULL;                  break;
1105      case CPUINFO_PTR_DISASSEMBLE:                     info->disassemble = mcs48_dasm;         break;
1106      case CPUINFO_PTR_INSTRUCTION_COUNTER:               info->icount = &mcs48_icount;         break;
1114      case CPUINFO_PTR_DISASSEMBLE:                     info->disassemble = CPU_DISASSEMBLE_NAME(mcs48);         break;
1115      case CPUINFO_PTR_INSTRUCTION_COUNTER:               info->icount = &mcs48->icount;         break;
11071116
1108      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: /*info->internal_map8 = address_map_program_10bit;*/ break;
1109      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    /*info->internal_map8 = address_map_data_7bit;*/ break;
1117      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: /*info->internal_map8 = ADDRESS_MAP_NAME(program_10bit);*/ break;
1118      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    /*info->internal_map8 = ADDRESS_MAP_NAME(data_7bit);*/ break;
11101119
11111120      /* --- the following bits of info are returned as NULL-terminated strings --- */
11121121      case CPUINFO_STR_NAME:                           /*strcpy(info->s, "I8039");*/         break;
r3535r3536
11171126
11181127      case CPUINFO_STR_FLAGS:
11191128         sprintf(info->s, "%c%c %c%c%c%c%c%c%c%c",
1120            mcs48.irq_state ? 'I':'.',
1121            mcs48.a11       ? 'M':'.',
1129            mcs48->irq_state ? 'I':'.',
1130            mcs48->a11       ? 'M':'.',
11221131            PSW & 0x80 ? 'C':'.',
11231132            PSW & 0x40 ? 'A':'.',
11241133            PSW & 0x20 ? 'F':'.',
r3535r3536
11321141      case CPUINFO_STR_REGISTER + MCS48_PC:               sprintf(info->s, "PC:%04X", PC);       break;
11331142      case CPUINFO_STR_REGISTER + MCS48_PSW:               sprintf(info->s, "PSW:%02X", PSW);       break;
11341143      case CPUINFO_STR_REGISTER + MCS48_A:               sprintf(info->s, "A:%02X", A);          break;
1135      case CPUINFO_STR_REGISTER + MCS48_TC:               sprintf(info->s, "TC:%02X", mcs48.timer); break;
1136      case CPUINFO_STR_REGISTER + MCS48_P1:               sprintf(info->s, "P1:%02X", mcs48.p1);    break;
1137      case CPUINFO_STR_REGISTER + MCS48_P2:               sprintf(info->s, "P2:%02X", mcs48.p2);    break;
1144      case CPUINFO_STR_REGISTER + MCS48_TC:               sprintf(info->s, "TC:%02X", mcs48->timer); break;
1145      case CPUINFO_STR_REGISTER + MCS48_P1:               sprintf(info->s, "P1:%02X", mcs48->p1);    break;
1146      case CPUINFO_STR_REGISTER + MCS48_P2:               sprintf(info->s, "P2:%02X", mcs48->p2);    break;
11381147      case CPUINFO_STR_REGISTER + MCS48_R0:               sprintf(info->s, "R0:%02X", R0);      break;
11391148      case CPUINFO_STR_REGISTER + MCS48_R1:               sprintf(info->s, "R1:%02X", R1);       break;
11401149      case CPUINFO_STR_REGISTER + MCS48_R2:               sprintf(info->s, "R2:%02X", R2);       break;
r3535r3536
11431152      case CPUINFO_STR_REGISTER + MCS48_R5:               sprintf(info->s, "R5:%02X", R5);       break;
11441153      case CPUINFO_STR_REGISTER + MCS48_R6:               sprintf(info->s, "R6:%02X", R6);       break;
11451154      case CPUINFO_STR_REGISTER + MCS48_R7:               sprintf(info->s, "R7:%02X", R7);       break;
1146      case CPUINFO_STR_REGISTER + MCS48_EA:               sprintf(info->s, "EA:%02X", mcs48.ea);    break;
1155      case CPUINFO_STR_REGISTER + MCS48_EA:               sprintf(info->s, "EA:%02X", mcs48->ea);    break;
11471156   }
11481157}
11491158
r3535r3536
11541163***************************************************************************/
11551164
11561165#if (HAS_I8035)
1157void i8035_get_info(UINT32 state, cpuinfo *info)
1166CPU_GET_INFO( i8035 )
11581167{
11591168   switch (state)
11601169   {
11611170      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:          info->i = 6;                              break;
1162      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = address_map_data_6bit;      break;
1163      case CPUINFO_PTR_INIT:                                 info->init = i8035_init;                     break;
1171      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = ADDRESS_MAP_NAME(data_6bit);      break;
1172      case CPUINFO_PTR_INIT:                                 info->init = CPU_INIT_NAME(i8035);                     break;
11641173      case CPUINFO_STR_NAME:                                 strcpy(info->s, "I8035");                     break;
1165      default:                                          mcs48_get_info(state, info);                  break;
1174      default:                                          CPU_GET_INFO_CALL(mcs48);                     break;
11661175   }
11671176}
11681177#endif
11691178
11701179#if (HAS_I8041)
1171void i8041_get_info(UINT32 state, cpuinfo *info)
1180CPU_GET_INFO( i8041 )
11721181{
11731182   switch (state)
11741183   {
11751184      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:          info->i = 6;                              break;
1176      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = address_map_program_10bit;   break;
1177      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = address_map_data_6bit;      break;
1178      case CPUINFO_PTR_INIT:                                 info->init = i8041_init;                     break;
1185      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = ADDRESS_MAP_NAME(program_10bit);   break;
1186      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = ADDRESS_MAP_NAME(data_6bit);      break;
1187      case CPUINFO_PTR_INIT:                                 info->init = CPU_INIT_NAME(i8041);                     break;
11791188      case CPUINFO_STR_NAME:                                 strcpy(info->s, "I8041");                     break;
1180      default:                                          mcs48_get_info(state, info);                  break;
1189      default:                                          CPU_GET_INFO_CALL(mcs48);                     break;
11811190   }
11821191}
11831192#endif
11841193
11851194#if (HAS_I8048)
1186void i8048_get_info(UINT32 state, cpuinfo *info)
1195CPU_GET_INFO( i8048 )
11871196{
11881197   switch (state)
11891198   {
11901199      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:          info->i = 6;                              break;
1191      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = address_map_program_10bit;   break;
1192      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = address_map_data_6bit;      break;
1193      case CPUINFO_PTR_INIT:                                 info->init = i8041_init;                     break;
1200      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = ADDRESS_MAP_NAME(program_10bit);   break;
1201      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = ADDRESS_MAP_NAME(data_6bit);      break;
1202      case CPUINFO_PTR_INIT:                                 info->init = CPU_INIT_NAME(i8041);                     break;
11941203      case CPUINFO_STR_NAME:                                 strcpy(info->s, "I8048");                     break;
1195      default:                                          mcs48_get_info(state, info);                  break;
1204      default:                                          CPU_GET_INFO_CALL(mcs48);                     break;
11961205   }
11971206}
11981207#endif
11991208
12001209#if (HAS_I8648)
1201void i8648_get_info(UINT32 state, cpuinfo *info)
1210CPU_GET_INFO( i8648 )
12021211{
12031212   switch (state)
12041213   {
12051214      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:          info->i = 6;                              break;
1206      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = address_map_program_10bit;   break;
1207      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = address_map_data_6bit;      break;
1208      case CPUINFO_PTR_INIT:                                 info->init = i8041_init;                     break;
1215      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = ADDRESS_MAP_NAME(program_10bit);   break;
1216      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = ADDRESS_MAP_NAME(data_6bit);      break;
1217      case CPUINFO_PTR_INIT:                                 info->init = CPU_INIT_NAME(i8041);                     break;
12091218      case CPUINFO_STR_NAME:                                 strcpy(info->s, "I8648");                     break;
1210      default:                                          mcs48_get_info(state, info);                  break;
1219      default:                                          CPU_GET_INFO_CALL(mcs48);                     break;
12111220   }
12121221}
12131222#endif
12141223
12151224#if (HAS_I8748)
1216void i8748_get_info(UINT32 state, cpuinfo *info)
1225CPU_GET_INFO( i8748 )
12171226{
12181227   switch (state)
12191228   {
12201229      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:          info->i = 6;                              break;
1221      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = address_map_program_10bit;   break;
1222      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = address_map_data_6bit;      break;
1223      case CPUINFO_PTR_INIT:                                 info->init = i8041_init;                     break;
1230      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = ADDRESS_MAP_NAME(program_10bit);   break;
1231      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = ADDRESS_MAP_NAME(data_6bit);      break;
1232      case CPUINFO_PTR_INIT:                                 info->init = CPU_INIT_NAME(i8041);                     break;
12241233      case CPUINFO_STR_NAME:                                 strcpy(info->s, "I8748");                     break;
1225      default:                                          mcs48_get_info(state, info);                  break;
1234      default:                                          CPU_GET_INFO_CALL(mcs48);                     break;
12261235   }
12271236}
12281237#endif
12291238
12301239#if (HAS_MB8884)
1231void mb8884_get_info(UINT32 state, cpuinfo *info)
1240CPU_GET_INFO( mb8884 )
12321241{
12331242   switch (state)
12341243   {
12351244      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:          info->i = 6;                              break;
1236      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = address_map_data_6bit;      break;
1237      case CPUINFO_PTR_INIT:                                 info->init = i8035_init;                     break;
1245      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = ADDRESS_MAP_NAME(data_6bit);      break;
1246      case CPUINFO_PTR_INIT:                                 info->init = CPU_INIT_NAME(i8035);                     break;
12381247      case CPUINFO_STR_NAME:                                 strcpy(info->s, "MB8884");                     break;
1239      default:                                          mcs48_get_info(state, info);                  break;
1248      default:                                          CPU_GET_INFO_CALL(mcs48);                     break;
12401249   }
12411250}
12421251#endif
12431252
12441253#if (HAS_N7751)
1245void n7751_get_info(UINT32 state, cpuinfo *info)
1254CPU_GET_INFO( n7751 )
12461255{
12471256   switch (state)
12481257   {
12491258      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:          info->i = 6;                              break;
1250      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = address_map_program_10bit;   break;
1251      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = address_map_data_6bit;      break;
1252      case CPUINFO_PTR_INIT:                                 info->init = i8041_init;                     break;
1259      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = ADDRESS_MAP_NAME(program_10bit);   break;
1260      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = ADDRESS_MAP_NAME(data_6bit);      break;
1261      case CPUINFO_PTR_INIT:                                 info->init = CPU_INIT_NAME(i8041);                     break;
12531262      case CPUINFO_STR_NAME:                                 strcpy(info->s, "N7751");                     break;
1254      default:                                          mcs48_get_info(state, info);                  break;
1263      default:                                          CPU_GET_INFO_CALL(mcs48);                     break;
12551264   }
12561265}
12571266#endif
r3535r3536
12591268
12601269
12611270#if (HAS_I8039)
1262void i8039_get_info(UINT32 state, cpuinfo *info)
1271CPU_GET_INFO( i8039 )
12631272{
12641273   switch (state)
12651274   {
12661275      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:          info->i = 7;                              break;
1267      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = address_map_data_7bit;      break;
1268      case CPUINFO_PTR_INIT:                                 info->init = i8039_init;                     break;
1276      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = ADDRESS_MAP_NAME(data_7bit);      break;
1277      case CPUINFO_PTR_INIT:                                 info->init = CPU_INIT_NAME(i8039);                     break;
12691278      case CPUINFO_STR_NAME:                                 strcpy(info->s, "I8039");                     break;
1270      default:                                          mcs48_get_info(state, info);                  break;
1279      default:                                          CPU_GET_INFO_CALL(mcs48);                     break;
12711280   }
12721281}
12731282#endif
12741283
12751284#if (HAS_I8049)
1276void i8049_get_info(UINT32 state, cpuinfo *info)
1285CPU_GET_INFO( i8049 )
12771286{
12781287   switch (state)
12791288   {
12801289      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:          info->i = 7;                              break;
1281      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = address_map_program_11bit;   break;
1282      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = address_map_data_7bit;      break;
1283      case CPUINFO_PTR_INIT:                                 info->init = i8049_init;                     break;
1290      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = ADDRESS_MAP_NAME(program_11bit);   break;
1291      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = ADDRESS_MAP_NAME(data_7bit);      break;
1292      case CPUINFO_PTR_INIT:                                 info->init = CPU_INIT_NAME(i8049);                     break;
12841293      case CPUINFO_STR_NAME:                                 strcpy(info->s, "I8049");                     break;
1285      default:                                          mcs48_get_info(state, info);                  break;
1294      default:                                          CPU_GET_INFO_CALL(mcs48);                     break;
12861295   }
12871296}
12881297#endif
12891298
12901299#if (HAS_I8749)
1291void i8749_get_info(UINT32 state, cpuinfo *info)
1300CPU_GET_INFO( i8749 )
12921301{
12931302   switch (state)
12941303   {
12951304      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:          info->i = 7;                              break;
1296      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = address_map_program_11bit;   break;
1297      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = address_map_data_7bit;      break;
1298      case CPUINFO_PTR_INIT:                                 info->init = i8049_init;                     break;
1305      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = ADDRESS_MAP_NAME(program_11bit);   break;
1306      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = ADDRESS_MAP_NAME(data_7bit);      break;
1307      case CPUINFO_PTR_INIT:                                 info->init = CPU_INIT_NAME(i8049);                     break;
12991308      case CPUINFO_STR_NAME:                                 strcpy(info->s, "I8749");                     break;
1300      default:                                          mcs48_get_info(state, info);                  break;
1309      default:                                          CPU_GET_INFO_CALL(mcs48);                     break;
13011310   }
13021311}
13031312#endif
13041313
13051314#if (HAS_M58715)
1306void m58715_get_info(UINT32 state, cpuinfo *info)
1315CPU_GET_INFO( m58715 )
13071316{
13081317   switch (state)
13091318   {
13101319      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:          info->i = 7;                              break;
1311      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = address_map_program_11bit;   break;
1312      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = address_map_data_7bit;      break;
1313      case CPUINFO_PTR_INIT:                                 info->init = i8049_init;                     break;
1320      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map8 = ADDRESS_MAP_NAME(program_11bit);   break;
1321      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:       info->internal_map8 = ADDRESS_MAP_NAME(data_7bit);      break;
1322      case CPUINFO_PTR_INIT:                                 info->init = CPU_INIT_NAME(i8049);                     break;
13141323      case CPUINFO_STR_NAME:                                 strcpy(info->s, "M58715");                     break;
1315      default:                                          mcs48_get_info(state, info);                  break;
1324      default:                                          CPU_GET_INFO_CALL(mcs48);                     break;
13161325   }
13171326}
13181327#endif
src/emu/cpu/mcs48/mcs48dsm.c
r3535r3536
203203   OpInizialized = 1;
204204}
205205
206offs_t mcs48_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
206CPU_DISASSEMBLE( mcs48 )
207207{
208208   int b, a, d, r, p;   /* these can all be filled in by parsing an instruction */
209209   int i;
src/emu/cpu/mcs48/mcs48.h
r3535r3536
7272***************************************************************************/
7373
7474/* variants with 64 bytes of internal RAM and up to 1k of internal ROM */
75void i8035_get_info(UINT32 state, cpuinfo *info);
76void i8041_get_info(UINT32 state, cpuinfo *info);
77void i8048_get_info(UINT32 state, cpuinfo *info);
78void i8648_get_info(UINT32 state, cpuinfo *info);
79void i8748_get_info(UINT32 state, cpuinfo *info);
80void mb8884_get_info(UINT32 state, cpuinfo *info);
81void n7751_get_info(UINT32 state, cpuinfo *info);
75CPU_GET_INFO( i8035 );
76CPU_GET_INFO( i8041 );
77CPU_GET_INFO( i8048 );
78CPU_GET_INFO( i8648 );
79CPU_GET_INFO( i8748 );
80CPU_GET_INFO( mb8884 );
81CPU_GET_INFO( n7751 );
8282
8383/* variants with 128 bytes of internal RAM and up to 2k of internal ROM */
84void i8039_get_info(UINT32 state, cpuinfo *info);
85void i8049_get_info(UINT32 state, cpuinfo *info);
86void i8749_get_info(UINT32 state, cpuinfo *info);
87void m58715_get_info(UINT32 state, cpuinfo *info);
84CPU_GET_INFO( i8039 );
85CPU_GET_INFO( i8049 );
86CPU_GET_INFO( i8749 );
87CPU_GET_INFO( m58715 );
8888
8989/* disassembler */
90offs_t mcs48_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
90CPU_DISASSEMBLE( mcs48 );
9191
9292#endif  /* __I8039_H__ */
src/emu/cpu/m37710/m37710.c
r3535r3536
768768
769769   if (wantedIRQ != -1)
770770   {
771      if (INT_ACK) INT_ACK(wantedIRQ);
771      if (INT_ACK) INT_ACK(m37710i_cpu.device, wantedIRQ);
772772
773773      // make sure we're running to service the interrupt
774774      CPU_STOPPED &= ~STOP_LEVEL_WAI;
r3535r3536
808808
809809/* external functions */
810810
811static void m37710_reset(void)
811static CPU_RESET( m37710 )
812812{
813813   /* Start the CPU */
814814   CPU_STOPPED = 0;
r3535r3536
848848}
849849
850850/* Exit and clean up */
851void m37710_exit(void)
851CPU_EXIT( m37710 )
852852{
853853   /* nothing to do yet */
854854}
r3535r3536
870870#endif
871871
872872/* Execute some instructions */
873static int m37710_execute(int cycles)
873static CPU_EXECUTE( m37710 )
874874{
875875   m37710_fullCount = cycles;
876876
r3535r3536
881881
882882
883883/* Get the current CPU context */
884static void m37710_get_context(void *dst_context)
884static CPU_GET_CONTEXT( m37710 )
885885{
886   *(m37710i_cpu_struct*)dst_context = m37710i_cpu;
886   *(m37710i_cpu_struct*)dst = m37710i_cpu;
887887}
888888
889889/* Set the current CPU context */
890static void m37710_set_context(void *src_context)
890static CPU_SET_CONTEXT( m37710 )
891891{
892   m37710i_cpu = *(m37710i_cpu_struct*)src_context;
892   m37710i_cpu = *(m37710i_cpu_struct*)src;
893893   m37710i_jumping(REG_PB | REG_PC);
894894}
895895
r3535r3536
950950
951951/* Set the callback that is called when servicing an interrupt */
952952#ifdef UNUSED_FUNCTION
953void m37710_set_irq_callback(int (*callback)(int))
953void m37710_set_irq_callback(cpu_irq_callback callback)
954954{
955955   INT_ACK = callback;
956956}
r3535r3536
959959/* Disassemble an instruction */
960960#include "m7700ds.h"
961961
962static offs_t m37710_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
962static CPU_DISASSEMBLE( m37710 )
963963{
964964   return m7700_disassemble(buffer, (pc&0xffff), pc>>16, oprom, FLAG_M, FLAG_X);
965965}
r3535r3536
973973   m37710i_jumping(REG_PB | REG_PC);
974974}
975975
976static void m37710_init(int index, int clock, const void *config, int (*irqcallback)(int))
976static CPU_INIT( m37710 )
977977{
978978   int i;
979979
980980   memset(&m37710i_cpu, 0, sizeof(m37710i_cpu));
981981
982982   INT_ACK = irqcallback;
983   m37710i_cpu.device = device;
983984
984985   m37710_ICount = 0;
985986   m37710_fullCount = 0;
r3535r3536
10461047 * Generic set_info
10471048 **************************************************************************/
10481049
1049static void m37710_set_info(UINT32 state, cpuinfo *info)
1050static CPU_SET_INFO( m37710 )
10501051{
10511052   switch (state)
10521053   {
r3535r3536
10931094 * Generic get_info
10941095 **************************************************************************/
10951096
1096void m37710_get_info(UINT32 state, cpuinfo *info)
1097CPU_GET_INFO( m37710 )
10971098{
10981099   switch (state)
10991100   {
r3535r3536
11431144      case CPUINFO_INT_REGISTER + M37710_IRQ_STATE:   info->i = m37710_get_reg(M37710_IRQ_STATE); break;
11441145
11451146      /* --- the following bits of info are returned as pointers to data or functions --- */
1146      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m37710_set_info;      break;
1147      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = m37710_get_context;   break;
1148      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = m37710_set_context;   break;
1149      case CPUINFO_PTR_INIT:                     info->init = m37710_init;            break;
1150      case CPUINFO_PTR_RESET:                     info->reset = m37710_reset;            break;
1151      case CPUINFO_PTR_EXIT:                     info->exit = m37710_exit;            break;
1152      case CPUINFO_PTR_EXECUTE:                  info->execute = m37710_execute;         break;
1147      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m37710);      break;
1148      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(m37710);   break;
1149      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(m37710);   break;
1150      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m37710);            break;
1151      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m37710);            break;
1152      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(m37710);            break;
1153      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m37710);         break;
11531154      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1154      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m37710_dasm;      break;
1155      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m37710);      break;
11551156      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m37710_ICount;         break;
11561157
1157      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = address_map_m37710_internal_map; break;
1158      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(m37710_internal_map); break;
11581159      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map16 = NULL;   break;
11591160      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO:      info->internal_map8 = NULL;   break;
11601161
r3535r3536
12011202}
12021203
12031204// 37702 is identical except with an internal ROM, so just change the name
1204void m37702_get_info(UINT32 state, cpuinfo *info)
1205CPU_GET_INFO( m37702 )
12051206{
12061207   if (state == CPUINFO_STR_NAME)
12071208   {
r3535r3536
12091210      return;
12101211   }
12111212
1212   m37710_get_info(state, info);
1213   CPU_GET_INFO_CALL(m37710);
12131214}
12141215
12151216/* ======================================================================== */
src/emu/cpu/m37710/m37710op.h
r3535r3536
301301   m37710i_set_flag_i(IFLAG_SET);
302302   REG_PB = 0;
303303   m37710i_jump_16(m37710i_read_16_normal(vector));
304   if(INT_ACK) INT_ACK(0);
304   if(INT_ACK) INT_ACK(m37710i_cpu.device, 0);
305305}
306306
307307INLINE void m37710i_interrupt_software(uint vector)
src/emu/cpu/m37710/m37710.h
r3535r3536
9696/* ======================================================================== */
9797
9898/* Clean up after the emulation core - Not used in this core - */
99void m37710_exit(void);
99CPU_EXIT( m37710 );
100100
101101/* Save the current CPU state to disk */
102102void m37710_state_save(void *file);
r3535r3536
116116#define m37710_branching(A)
117117
118118
119void m37710_get_info(UINT32 state, cpuinfo *info);
119CPU_GET_INFO( m37710 );
120120
121121/* ======================================================================== */
122122/* ============================== END OF FILE ============================= */
src/emu/cpu/m37710/m37710cm.h
r3535r3536
9696   uint im4;      /* Immediate load target */
9797   uint irq_delay;      /* delay 1 instruction before checking irq */
9898   uint irq_level;      /* irq level */
99   int (*int_ack)(int); /* Interrupt Acknowledge */
99   cpu_irq_callback int_ack;
100   const device_config *device;
100101   uint stopped;      /* Sets how the CPU is stopped */
101102   void (*const *opcodes)(void);      /* opcodes with no prefix */
102103   void (*const *opcodes42)(void);   /* opcodes with 0x42 prefix */
src/emu/cpu/cpu.mak
r3535r3536
663663CPUDEFS += -DHAS_I87C51=$(if $(filter I87C51,$(CPUS)),1,0)
664664CPUDEFS += -DHAS_I87C52=$(if $(filter I87C52,$(CPUS)),1,0)
665665CPUDEFS += -DHAS_AT89C4051=$(if $(filter AT89C4051,$(CPUS)),1,0)
666CPUDEFS += -DHAS_DS5002FP=$(if $(filter DS5002FP,$(CPUS)),1,0)
666667
667ifneq ($(filter I8031 I8032 I8051 I8052 I8751 I8752 I80C31 I80C32 I80C51 I80C52 I87C51 I87C52 AT89C4051,$(CPUS)),)
668ifneq ($(filter DS5002FP I8031 I8032 I8051 I8052 I8751 I8752 I80C31 I80C32 I80C51 I80C52 I87C51 I87C52 AT89C4051,$(CPUS)),)
668669OBJDIRS += $(CPUOBJ)/mcs51
669670CPUOBJS += $(CPUOBJ)/mcs51/mcs51.o
670671DBGOBJS += $(CPUOBJ)/mcs51/mcs51dasm.o
r3535r3536
674675                     $(CPUSRC)/mcs51/mcs51.h \
675676                     $(CPUSRC)/mcs51/mcs51ops.c
676677
677
678
679678#-------------------------------------------------
680# DS5002FP
681#-------------------------------------------------
682
683CPUDEFS += -DHAS_DS5002FP=$(if $(filter DS5002FP,$(CPUS)),1,0)
684
685ifneq ($(filter DS5002FP,$(CPUS)),)
686OBJDIRS += $(CPUOBJ)/ds5002fp
687CPUOBJS += $(CPUOBJ)/ds5002fp/ds5002fp.o
688DBGOBJS += $(CPUOBJ)/ds5002fp/ds5002fpdasm.o
689endif
690
691
692
693#-------------------------------------------------
694679# Intel 80x86 series
695680#-------------------------------------------------
696681
src/emu/cpu/sharc/sharc.c
r3535r3536
77#include "debugger.h"
88#include "deprecat.h"
99
10static offs_t sharc_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
10static CPU_DISASSEMBLE( sharc );
1111
1212static void sharc_dma_exec(int channel);
1313static void check_interrupts(void);
r3535r3536
126126   UINT16 *internal_ram;
127127   UINT16 *internal_ram_block0, *internal_ram_block1;
128128
129   int (*irq_callback)(int irqline);
129   cpu_irq_callback irq_callback;
130   const device_config *device;
130131   void (*opcode_handler)(void);
131132   UINT64 opcode;
132133   UINT64 fetch_opcode;
r3535r3536
404405   }
405406}
406407
407static offs_t sharc_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
408static CPU_DISASSEMBLE( sharc )
408409{
409410   UINT64 op = 0;
410411   UINT32 flags = 0;
r3535r3536
418419}
419420
420421
421static void sharc_init(int index, int clock, const void *config, int (*irqcallback)(int))
422static CPU_INIT( sharc )
422423{
423424   const sharc_config *cfg = config;
424425   int saveindex;
r3535r3536
426427   sharc.boot_mode = cfg->boot_mode;
427428
428429   sharc.irq_callback = irqcallback;
430   sharc.device = device;
429431
430432   build_opcode_table();
431433
r3535r3536
549551   state_save_register_item("sharc", index, sharc.astat_old_old_old);
550552}
551553
552static void sharc_reset(void)
554static CPU_RESET( sharc )
553555{
554556   memset(sharc.internal_ram, 0, 2 * 0x10000 * sizeof(UINT16));
555557
r3535r3536
591593   sharc.interrupt_active = 0;
592594}
593595
594static void sharc_exit(void)
596static CPU_EXIT( sharc )
595597{
596598   /* TODO */
597599}
598600
599static void sharc_get_context(void *dst)
601static CPU_GET_CONTEXT( sharc )
600602{
601603   /* copy the context */
602604   if (dst)
r3535r3536
605607   }
606608}
607609
608static void sharc_set_context(void *src)
610static CPU_SET_CONTEXT( sharc )
609611{
610612   /* copy the context */
611613   if (src)
r3535r3536
683685   }
684686}
685687
686static int sharc_execute(int cycles)
688static CPU_EXECUTE( sharc )
687689{
688690   sharc_icount = cycles;
689691
r3535r3536
861863 * Generic set_info
862864 **************************************************************************/
863865
864static void sharc_set_info(UINT32 state, cpuinfo *info)
866static CPU_SET_INFO( sharc )
865867{
866868   switch (state)
867869   {
r3535r3536
958960}
959961
960962#if (HAS_ADSP21062)
961static void adsp21062_set_info(UINT32 state, cpuinfo *info)
963static CPU_SET_INFO( adsp21062 )
962964{
963965   if (state >= CPUINFO_INT_INPUT_STATE && state <= CPUINFO_INT_INPUT_STATE + 2)
964966   {
r3535r3536
972974   }
973975   switch(state)
974976   {
975      default:   sharc_set_info(state, info);      break;
977      default:   CPU_SET_INFO_CALL(sharc);      break;
976978   }
977979}
978980#endif
979981
980982
981static int sharc_debug_read(int space, UINT32 offset, int size, UINT64 *value)
983static CPU_READ( sharc )
982984{
983985   if (space == ADDRESS_SPACE_PROGRAM)
984986   {
r3535r3536
10401042   return 1;
10411043}
10421044
1043static int sharc_debug_readop(UINT32 offset, int size, UINT64 *value)
1045static CPU_READOP( sharc )
10441046{
10451047   UINT64 mask = (size < 8) ? (((UINT64)1 << (8 * size)) - 1) : ~(UINT64)0;
10461048   int shift = 8 * (offset & 7);
r3535r3536
10691071   AM_RANGE(0x20000, 0x7ffff) AM_RAM
10701072ADDRESS_MAP_END
10711073
1072static void sharc_get_info(UINT32 state, cpuinfo *info)
1074static CPU_GET_INFO( sharc )
10731075{
10741076   switch(state)
10751077   {
r3535r3536
12011203      case CPUINFO_INT_REGISTER + SHARC_B15:         info->i = sharc.dag2.b[7];            break;
12021204
12031205      /* --- the following bits of info are returned as pointers to data or functions --- */
1204      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = sharc_get_context;   break;
1205      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = sharc_set_context;   break;
1206      case CPUINFO_PTR_INIT:                     info->init = sharc_init;            break;
1207      case CPUINFO_PTR_RESET:                     info->reset = sharc_reset;            break;
1208      case CPUINFO_PTR_EXIT:                     info->exit = sharc_exit;            break;
1209      case CPUINFO_PTR_EXECUTE:                  info->execute = sharc_execute;         break;
1206      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(sharc);   break;
1207      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(sharc);   break;
1208      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(sharc);      break;
1209      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(sharc);   break;
1210      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(sharc);      break;
1211      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(sharc);break;
12101212      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1211      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = sharc_dasm;         break;
1213      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(sharc);         break;
12121214      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &sharc_icount;         break;
1213      case CPUINFO_PTR_READ:                     info->read = sharc_debug_read;         break;
1214      case CPUINFO_PTR_READOP:                  info->readop = sharc_debug_readop;      break;
1215      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map64 = address_map_internal_pgm; break;
1215      case CPUINFO_PTR_READ:                     info->read = CPU_READ_NAME(sharc);      break;
1216      case CPUINFO_PTR_READOP:                  info->readop = CPU_READOP_NAME(sharc);   break;
1217      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map64 = ADDRESS_MAP_NAME(internal_pgm); break;
12161218
12171219      /* --- the following bits of info are returned as NULL-terminated strings --- */
12181220      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "SHARC");            break;
r3535r3536
13251327}
13261328
13271329#if (HAS_ADSP21062)
1328void adsp21062_get_info(UINT32 state, cpuinfo *info)
1330CPU_GET_INFO( adsp21062 )
13291331{
13301332   switch(state)
13311333   {
13321334      /* --- the following bits of info are returned as pointers to data or functions --- */
1333      case CPUINFO_PTR_SET_INFO:                  info->setinfo = adsp21062_set_info;      break;
1335      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(adsp21062);      break;
13341336
13351337      /* --- the following bits of info are returned as NULL-terminated strings --- */
13361338      case CPUINFO_STR_NAME:                     strcpy(info->s, "ADSP21062");         break;
13371339
1338      default:                              sharc_get_info(state, info);         break;
1340      default:                              CPU_GET_INFO_CALL(sharc);            break;
13391341   }
13401342}
13411343#endif
src/emu/cpu/sharc/sharcops.c
r3535r3536
27482748static void sharcop_unimplemented(void)
27492749{
27502750   char dasm[1000];
2751   sharc_dasm(dasm, sharc.pc, NULL, NULL);
2751   CPU_DISASSEMBLE_NAME(sharc)(dasm, sharc.pc, NULL, NULL);
27522752   mame_printf_debug("SHARC: %08X: %s\n", sharc.pc, dasm);
27532753   fatalerror("SHARC: Unimplemented opcode %04X%08X at %08X", (UINT16)(sharc.opcode >> 32), (UINT32)(sharc.opcode), sharc.pc);
27542754}
src/emu/cpu/sharc/sharc.h
r3535r3536
2828extern void sharc_external_dma_write(UINT32 address, UINT64 data);
2929
3030#if (HAS_ADSP21062)
31void adsp21062_get_info(UINT32 state, cpuinfo *info);
31CPU_GET_INFO( adsp21062 );
3232#endif
3333
3434extern UINT32 sharc_dasm_one(char *buffer, offs_t pc, UINT64 opcode);
src/emu/cpu/z180/z180op.c
r3535r3536
313313
314314      /* else call back the cpu interface to retrieve the vector */
315315      else
316         irq_vector = (*Z180.irq_callback)(0);
316         irq_vector = (*Z180.irq_callback)(Z180.device, 0);
317317
318318      LOG(("Z180 #%d single int. irq_vector $%02x\n", cpu_getactivecpu(), irq_vector));
319319
src/emu/cpu/z180/z180.c
r3535r3536
117117   UINT8   irq_state[3];      /* irq line states (INT0,INT1,INT2) */
118118   UINT8   after_EI;         /* are we in the EI shadow? */
119119   z80_daisy_state *daisy;
120   int    (*irq_callback)(int irqline);
120   cpu_irq_callback irq_callback;
121   const device_config *device;
121122}   Z180_Regs;
122123
123124#define CF   0x01
r3535r3536
795796static void z180_writecontrol(offs_t port, UINT8 data);
796797static void z180_dma0(void);
797798static void z180_dma1(void);
798static void z180_burn(int cycles);
799static void z180_set_info(UINT32 state, cpuinfo *info);
799static CPU_BURN( z180 );
800static CPU_SET_INFO( z180 );
800801
801802#include "z180daa.h"
802803#include "z180ops.h"
r3535r3536
18971898}
18981899
18991900
1900static void z180_init(int index, int clock, const void *config, int (*irqcallback)(int))
1901static CPU_INIT( z180 )
19011902{
19021903   Z180.daisy = NULL;
19031904   if (config)
19041905      Z180.daisy = z80daisy_init(Machine, Machine->config->cpu[cpu_getactivecpu()].tag, config);
19051906   Z180.irq_callback = irqcallback;
1907   Z180.device = device;
19061908
19071909   state_save_register_item("z180", index, Z180.AF.w.l);
19081910   state_save_register_item("z180", index, Z180.BC.w.l);
r3535r3536
19341936/****************************************************************************
19351937 * Reset registers to their initial values
19361938 ****************************************************************************/
1937static void z180_reset(void)
1939static CPU_RESET( z180 )
19381940{
19391941   z80_daisy_state *save_daisy;
1940   int (*save_irqcallback)(int);
1942   cpu_irq_callback save_irqcallback;
1943   const device_config *save_device;
19411944   int i, p;
19421945#if BIG_FLAGS_ARRAY
19431946   int oldval, newval, val;
r3535r3536
20182021
20192022   save_daisy = Z180.daisy;
20202023   save_irqcallback = Z180.irq_callback;
2024   save_device = Z180.device;
20212025   memset(&Z180, 0, sizeof(Z180));
20222026   Z180.daisy = save_daisy;
20232027   Z180.irq_callback = save_irqcallback;
2028   Z180.device = device;
20242029   _IX = _IY = 0xffff; /* IX and IY are FFFF after a reset! */
20252030   _F = ZF;         /* Zero flag is set */
20262031   Z180.nmi_state = CLEAR_LINE;
r3535r3536
21822187/****************************************************************************
21832188 * Execute 'cycles' T-states. Return number of T-states really executed
21842189 ****************************************************************************/
2185static int z180_execute(int cycles)
2190static CPU_EXECUTE( z180 )
21862191{
21872192   int old_icount = cycles;
21882193   z180_icount = cycles;
r3535r3536
22722277/****************************************************************************
22732278 * Burn 'cycles' T-states. Adjust R register for the lost time
22742279 ****************************************************************************/
2275static void z180_burn(int cycles)
2280static CPU_BURN( z180 )
22762281{
22772282   if( cycles > 0 )
22782283   {
r3535r3536
22862291/****************************************************************************
22872292 * Get all registers in given buffer
22882293 ****************************************************************************/
2289static void z180_get_context (void *dst)
2294static CPU_GET_CONTEXT( z180 )
22902295{
22912296   if( dst )
22922297      *(Z180_Regs*)dst = Z180;
r3535r3536
22952300/****************************************************************************
22962301 * Set all registers to given values
22972302 ****************************************************************************/
2298static void z180_set_context (void *src)
2303static CPU_SET_CONTEXT( z180 )
22992304{
23002305   if( src )
23012306      Z180 = *(Z180_Regs*)src;
r3535r3536
23422347}
23432348
23442349/* logical to physical address translation */
2345static int z180_translate(int space, int intention, offs_t *addr)
2350static CPU_TRANSLATE( z180 )
23462351{
23472352   if (space == ADDRESS_SPACE_PROGRAM)
23482353   {
2349      *addr = MMU_REMAP_ADDR(*addr);
2354      *address = MMU_REMAP_ADDR(*address);
23502355   }
23512356   return TRUE;
23522357}
r3535r3536
23552360 * Generic set_info
23562361 **************************************************************************/
23572362
2358static void z180_set_info(UINT32 state, cpuinfo *info)
2363static CPU_SET_INFO( z180 )
23592364{
23602365   switch (state)
23612366   {
r3535r3536
24662471 * Generic get_info
24672472 **************************************************************************/
24682473
2469void z180_get_info(UINT32 state, cpuinfo *info)
2474CPU_GET_INFO( z180 )
24702475{
24712476   switch (state)
24722477   {
r3535r3536
25862591      case CPUINFO_INT_REGISTER + Z180_IOLINES:      info->i = Z180.iol;                  break;
25872592
25882593      /* --- the following bits of info are returned as pointers to data or functions --- */
2589      case CPUINFO_PTR_SET_INFO:                  info->setinfo = z180_set_info;         break;
2590      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = z180_get_context;   break;
2591      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = z180_set_context;   break;
2592      case CPUINFO_PTR_INIT:                     info->init = z180_init;               break;
2593      case CPUINFO_PTR_RESET:                     info->reset = z180_reset;            break;
2594      case CPUINFO_PTR_EXECUTE:                  info->execute = z180_execute;         break;
2595      case CPUINFO_PTR_BURN:                     info->burn = z180_burn;               break;
2596      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = z180_dasm;         break;
2594      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(z180);         break;
2595      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(z180);   break;
2596      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(z180);   break;
2597      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(z180);               break;
2598      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(z180);            break;
2599      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(z180);         break;
2600      case CPUINFO_PTR_BURN:                     info->burn = CPU_BURN_NAME(z180);               break;
2601      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(z180);         break;
25972602      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &z180_icount;         break;
2598      case CPUINFO_PTR_TRANSLATE:                  info->translate = z180_translate;      break;
2603      case CPUINFO_PTR_TRANSLATE:                  info->translate = CPU_TRANSLATE_NAME(z180);      break;
25992604      case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_op: info->p = (void *)cc[Z180_TABLE_op];         break;
26002605      case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_cb: info->p = (void *)cc[Z180_TABLE_cb];         break;
26012606      case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_ed: info->p = (void *)cc[Z180_TABLE_ed];         break;
src/emu/cpu/z180/z180.h
r3535r3536
129129extern void z180_writemem(offs_t offset, UINT8 data);
130130extern void z180_setOPbase(int pc);
131131
132extern void z180_get_info(UINT32 state, cpuinfo *info);
132extern CPU_GET_INFO( z180 );
133133
134offs_t z180_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
134CPU_DISASSEMBLE( z180 );
135135
136136#endif /* __Z180_H__ */
src/emu/cpu/z180/z180dasm.c
r3535r3536
426426/****************************************************************************
427427 * Disassemble opcode at PC and return number of bytes it takes
428428 ****************************************************************************/
429offs_t z180_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
429CPU_DISASSEMBLE( z180 )
430430{
431431   const z80dasm *d;
432432   const char *src, *ixy;
src/emu/cpu/z180/z180ops.h
r3535r3536
55   _PC--;                                          \
66   _HALT = 1;                                       \
77   if( !Z180.after_EI )                               \
8      z180_burn( z180_icount );                        \
8      CPU_BURN_NAME(z180)( NULL, z180_icount );            \
99}
1010
1111/***************************************************************
src/emu/cpu/i86/instr186.c
r3535r3536
1616{
1717   unsigned tmp=I.regs.w[SP];
1818
19   ICOUNT -= cycles.pusha;
19   ICOUNT -= timing.pusha;
2020   PUSH(I.regs.w[AX]);
2121   PUSH(I.regs.w[CX]);
2222   PUSH(I.regs.w[DX]);
r3535r3536
3131{
3232    unsigned tmp;
3333
34   ICOUNT -= cycles.popa;
34   ICOUNT -= timing.popa;
3535   POP(I.regs.w[DI]);
3636   POP(I.regs.w[SI]);
3737   POP(I.regs.w[BP]);
r3535r3536
5252      I.pc-=2;
5353      PREFIX86(_interrupt)(5);
5454   }
55   ICOUNT -= cycles.bound;
55   ICOUNT -= timing.bound;
5656}
5757
5858static void PREFIX186(_push_d16)(void)    /* Opcode 0x68 */
5959{
6060   unsigned tmp = FETCH;
6161
62   ICOUNT -= cycles.push_imm;
62   ICOUNT -= timing.push_imm;
6363   tmp += FETCH << 8;
6464   PUSH(tmp);
6565}
r3535r3536
7070   unsigned src2=FETCH;
7171   src+=(FETCH<<8);
7272
73   ICOUNT -= (ModRM >= 0xc0) ? cycles.imul_rri16 : cycles.imul_rmi16;
73   ICOUNT -= (ModRM >= 0xc0) ? timing.imul_rri16 : timing.imul_rmi16;
7474
7575   dst = (INT32)((INT16)src)*(INT32)((INT16)src2);
7676   I.CarryVal = I.OverVal = (((INT32)dst) >> 15 != 0) && (((INT32)dst) >> 15 != -1);
r3535r3536
8282{
8383   unsigned tmp = (WORD)((INT16)((INT8)FETCH));
8484
85   ICOUNT -= cycles.push_imm;
85   ICOUNT -= timing.push_imm;
8686   PUSH(tmp);
8787}
8888
r3535r3536
9191   DEF_r16w(dst,src);
9292   unsigned src2= (WORD)((INT16)((INT8)FETCH));
9393
94   ICOUNT -= (ModRM >= 0xc0) ? cycles.imul_rri8 : cycles.imul_rmi8;
94   ICOUNT -= (ModRM >= 0xc0) ? timing.imul_rri8 : timing.imul_rmi8;
9595
9696   dst = (INT32)((INT16)src)*(INT32)((INT16)src2);
9797   I.CarryVal = I.OverVal = (((INT32)dst) >> 15 != 0) && (((INT32)dst) >> 15 != -1);
r3535r3536
100100
101101static void PREFIX186(_insb)(void)    /* Opcode 0x6c */
102102{
103   ICOUNT -= cycles.ins8;
103   ICOUNT -= timing.ins8;
104104   PutMemB(ES,I.regs.w[DI],read_port_byte(I.regs.w[DX]));
105105   I.regs.w[DI] += I.DirVal;
106106}
107107
108108static void PREFIX186(_insw)(void)    /* Opcode 0x6d */
109109{
110   ICOUNT -= cycles.ins16;
110   ICOUNT -= timing.ins16;
111111   PutMemW(ES,I.regs.w[DI],read_port_word(I.regs.w[DX]));
112112   I.regs.w[DI] += 2 * I.DirVal;
113113}
114114
115115static void PREFIX186(_outsb)(void)    /* Opcode 0x6e */
116116{
117   ICOUNT -= cycles.outs8;
117   ICOUNT -= timing.outs8;
118118   write_port_byte(I.regs.w[DX],GetMemB(DS,I.regs.w[SI]));
119119   I.regs.w[SI] += I.DirVal; /* GOL 11/27/01 */
120120}
121121
122122static void PREFIX186(_outsw)(void)    /* Opcode 0x6f */
123123{
124   ICOUNT -= cycles.outs16;
124   ICOUNT -= timing.outs16;
125125   write_port_word(I.regs.w[DX],GetMemW(DS,I.regs.w[SI]));
126126   I.regs.w[SI] += 2 * I.DirVal; /* GOL 11/27/01 */
127127}
r3535r3536
148148
149149   nb += FETCH << 8;
150150   level = FETCH;
151   ICOUNT -= (level == 0) ? cycles.enter0 : (level == 1) ? cycles.enter1 : cycles.enter_base + level * cycles.enter_count;
151   ICOUNT -= (level == 0) ? timing.enter0 : (level == 1) ? timing.enter1 : timing.enter_base + level * timing.enter_count;
152152   PUSH(I.regs.w[BP]);
153153   I.regs.w[BP]=I.regs.w[SP];
154154   I.regs.w[SP] -= nb;
r3535r3536
159159
160160static void PREFIX186(_leave)(void)    /* Opcode 0xc9 */
161161{
162   ICOUNT -= cycles.leave;
162   ICOUNT -= timing.leave;
163163   I.regs.w[SP]=I.regs.w[BP];
164164   POP(I.regs.w[BP]);
165165}
src/emu/cpu/i86/i88intf.h
r3535r3536
66#include "i86intf.h"
77
88/* Public functions */
9void i8088_get_info(UINT32 state, cpuinfo *info);
9CPU_GET_INFO( i8088 );
1010
1111#endif /* __I88INTF_H__ */
src/emu/cpu/i86/v30intf.h
r3535r3536
66#include "i86intf.h"
77
88/* Public functions */
9void v30_get_info(UINT32 state, cpuinfo *info);
9CPU_GET_INFO( v30 );
1010
1111#endif /* __V30INTF_H__ */
src/emu/cpu/i86/v33intf.h
r3535r3536
55#include "v30intrf.h"
66
77/* Public functions */
8void v33_get_info(UINT32 state, cpuinfo *info);
8CPU_GET_INFO( v33 );
99
1010#endif /* __V33INTF_H__ */
src/emu/cpu/i86/i86.c
r3535r3536
4040   UINT32 base[4];
4141   UINT16 sregs[4];
4242   UINT16 flags;
43   int (*irq_callback) (int irqline);
43   cpu_irq_callback irq_callback;
44   const device_config *device;
4445   INT32 AuxVal, OverVal, SignVal, ZeroVal, CarryVal, DirVal;      /* 0 or non-0 valued flags */
4546   UINT8 ParityVal;
4647   UINT8 TF, IF;               /* 0 or 1 valued flags */
r3535r3536
7071
7172static UINT8 parity_table[256];
7273
73static struct i80x86_timing cycles;
74static struct i80x86_timing timing;
7475
7576/* The interrupt number of a pending external interrupt pending NMI is 2.   */
7677/* For INTR interrupts, the level is caught on the bus during an INTA cycle */
r3535r3536
116117   state_save_register_item(type, index, I.test_state);   /* PJB 03/05 */
117118}
118119
119static void i8086_init(int index, int clock, const void *config, int (*irqcallback)(int))
120static CPU_INIT( i8086 )
120121{
121122   unsigned int i, j, c;
122123   static const BREGS reg_name[8] = {AL, CL, DL, BL, AH, CH, DH, BH};
r3535r3536
142143   }
143144
144145   I.irq_callback = irqcallback;
146   I.device = device;
145147
146148   i8086_state_register(index);
147149   configure_memory_16bit();
148150}
149151
150152#if (HAS_I8088||HAS_I80188)
151static void i8088_init(int index, int clock, const void *config, int (*irqcallback)(int))
153static CPU_INIT( i8088 )
152154{
153   i8086_init(index, clock, config, irqcallback);
155   CPU_INIT_CALL(i8086);
154156   configure_memory_8bit();
155157}
156158#endif
157159
158static void i8086_reset(void)
160static CPU_RESET( i8086 )
159161{
160   int (*save_irqcallback)(int);
162   cpu_irq_callback save_irqcallback;
163   const device_config *save_device;
161164    memory_interface save_mem;
162165
163166   save_irqcallback = I.irq_callback;
167   save_device = I.device;
164168   save_mem = I.mem;
165169   memset(&I, 0, sizeof (I));
170   I.device = save_device;
166171   I.irq_callback = save_irqcallback;
167172   I.mem = save_mem;
168173
r3535r3536
174179   change_pc(I.pc);
175180}
176181
177static void i8086_exit(void)
182static CPU_EXIT( i8086 )
178183{
179184   /* nothing to do ? */
180185}
181186
182187/* ASG 971222 -- added these interface functions */
183188
184static void i8086_get_context(void *dst)
189static CPU_GET_CONTEXT( i8086 )
185190{
186191   if (dst)
187192      *(i8086_Regs *) dst = I;
188193}
189194
190static void i8086_set_context(void *src)
195static CPU_SET_CONTEXT( i8086 )
191196{
192197   if (src)
193198   {
r3535r3536
228233        I.test_state = !state;
229234}
230235
231static int i8086_execute(int num_cycles)
236static CPU_EXECUTE( i8086 )
232237{
233238   /* copy over the cycle counts if they're not correct */
234   if (cycles.id != 8086)
235      cycles = i8086_cycles;
239   if (timing.id != 8086)
240      timing = i8086_cycles;
236241
237242   /* adjust for any interrupts that came in */
238   i8086_ICount = num_cycles;
243   i8086_ICount = cycles;
239244   i8086_ICount -= I.extra_cycles;
240245   I.extra_cycles = 0;
241246
r3535r3536
256261   i8086_ICount -= I.extra_cycles;
257262   I.extra_cycles = 0;
258263
259   return num_cycles - i8086_ICount;
264   return cycles - i8086_ICount;
260265}
261266
262267
263static offs_t i8086_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
268static CPU_DISASSEMBLE( i8086 )
264269{
265270   return i386_dasm_one(buffer, pc, oprom, 16);
266271}
r3535r3536
282287#include "instr186.c"
283288#undef I80186
284289
285static int i80186_execute(int num_cycles)
290static CPU_EXECUTE( i80186 )
286291{
287292   /* copy over the cycle counts if they're not correct */
288   if (cycles.id != 80186)
289      cycles = i80186_cycles;
293   if (timing.id != 80186)
294      timing = i80186_cycles;
290295
291296   /* adjust for any interrupts that came in */
292   i8086_ICount = num_cycles;
297   i8086_ICount = cycles;
293298   i8086_ICount -= I.extra_cycles;
294299   I.extra_cycles = 0;
295300
r3535r3536
309314   i8086_ICount -= I.extra_cycles;
310315   I.extra_cycles = 0;
311316
312   return num_cycles - i8086_ICount;
317   return cycles - i8086_ICount;
313318}
314319
315320#endif
r3535r3536
320325 * Generic set_info
321326 **************************************************************************/
322327
323static void i8086_set_info(UINT32 state, cpuinfo *info)
328static CPU_SET_INFO( i8086 )
324329{
325330   switch (state)
326331   {
r3535r3536
374379 * Generic get_info
375380 **************************************************************************/
376381
377void i8086_get_info(UINT32 state, cpuinfo *info)
382CPU_GET_INFO( i8086 )
378383{
379384   switch (state)
380385   {
r3535r3536
427432      case CPUINFO_INT_REGISTER + I8086_VECTOR:      info->i = I.int_vector;               break;
428433
429434      /* --- the following bits of info are returned as pointers to data or functions --- */
430      case CPUINFO_PTR_SET_INFO:                  info->setinfo = i8086_set_info;         break;
431      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = i8086_get_context;   break;
432      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = i8086_set_context;   break;
433      case CPUINFO_PTR_INIT:                     info->init = i8086_init;            break;
434      case CPUINFO_PTR_RESET:                     info->reset = i8086_reset;            break;
435      case CPUINFO_PTR_EXIT:                     info->exit = i8086_exit;            break;
436      case CPUINFO_PTR_EXECUTE:                  info->execute = i8086_execute;         break;
435      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(i8086);         break;
436      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(i8086);   break;
437      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(i8086);   break;
438      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i8086);            break;
439      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(i8086);            break;
440      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(i8086);            break;
441      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(i8086);         break;
437442      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
438      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = i8086_dasm;         break;
443      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i8086);         break;
439444      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &i8086_ICount;         break;
440445
441446      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
491496 * CPU-specific get_info/set_info
492497 **************************************************************************/
493498
494void i8088_get_info(UINT32 state, cpuinfo *info)
499CPU_GET_INFO( i8088 )
495500{
496501   switch (state)
497502   {
r3535r3536
500505      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 8;               break;
501506
502507      /* --- the following bits of info are returned as pointers to data or functions --- */
503      case CPUINFO_PTR_INIT:                     info->init = i8088_init;            break;
508      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i8088);      break;
504509
505510      /* --- the following bits of info are returned as NULL-terminated strings --- */
506511      case CPUINFO_STR_NAME:                     strcpy(info->s, "8088");            break;
507512
508      default:                              i8086_get_info(state, info);         break;
513      default:                              CPU_GET_INFO_CALL(i8086);            break;
509514   }
510515}
511516#endif
r3535r3536
516521 * CPU-specific get_info/set_info
517522 **************************************************************************/
518523
519void i80186_get_info(UINT32 state, cpuinfo *info)
524CPU_GET_INFO( i80186 )
520525{
521526   switch (state)
522527   {
r3535r3536
525530      case CPUINFO_INT_CLOCK_DIVIDER:               info->i = 2;                     break;
526531
527532      /* --- the following bits of info are returned as pointers to data or functions --- */
528      case CPUINFO_PTR_EXECUTE:                  info->execute = i80186_execute;         break;
533      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(i80186);break;
529534
530535      /* --- the following bits of info are returned as NULL-terminated strings --- */
531536      case CPUINFO_STR_NAME:                     strcpy(info->s, "80186");            break;
532537
533      default:                              i8086_get_info(state, info);         break;
538      default:                              CPU_GET_INFO_CALL(i8086);            break;
534539   }
535540}
536541#endif
r3535r3536
541546 * CPU-specific get_info/set_info
542547 **************************************************************************/
543548
544void i80188_get_info(UINT32 state, cpuinfo *info)
549CPU_GET_INFO( i80188 )
545550{
546551   switch (state)
547552   {
r3535r3536
550555      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 8;               break;
551556
552557      /* --- the following bits of info are returned as pointers to data or functions --- */
553      case CPUINFO_PTR_INIT:                     info->init = i8088_init;            break;
554      case CPUINFO_PTR_EXECUTE:                  info->execute = i80186_execute;         break;
558      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i8088);      break;
559      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(i80186);break;
555560
556561      /* --- the following bits of info are returned as NULL-terminated strings --- */
557562      case CPUINFO_STR_NAME:                     strcpy(info->s, "80188");            break;
558563
559      default:                              i8086_get_info(state, info);         break;
564      default:                              CPU_GET_INFO_CALL(i8086);            break;
560565   }
561566}
562567#endif
src/emu/cpu/i86/i186intf.h
r3535r3536
55#include "i86intf.h"
66
77/* Public functions */
8void i80186_get_info(UINT32 state, cpuinfo *info);
8CPU_GET_INFO( i80186 );
99
1010#endif /* __I186INTF_H__ */
src/emu/cpu/i86/instr86.c
r3535r3536
2222   WORD ip = I.pc - I.base[CS];
2323
2424   if (int_num == -1)
25      int_num = (*I.irq_callback)(0);
25      int_num = (*I.irq_callback)(I.device, 0);
2626
2727#ifdef I80286
2828   if (PM) {
r3535r3536
4444#endif
4545   CHANGE_PC(I.pc);
4646
47   I.extra_cycles += cycles.exception;
47   I.extra_cycles += timing.exception;
4848}
4949
5050static void PREFIX86(_trap)(void)
r3535r3536
6262
6363   if (count==0)
6464   {
65      ICOUNT -= (ModRM >= 0xc0) ? cycles.rot_reg_base : cycles.rot_m8_base;
65      ICOUNT -= (ModRM >= 0xc0) ? timing.rot_reg_base : timing.rot_m8_base;
6666   }
6767   else if (count==1)
6868   {
69      ICOUNT -= (ModRM >= 0xc0) ? cycles.rot_reg_1 : cycles.rot_m8_1;
69      ICOUNT -= (ModRM >= 0xc0) ? timing.rot_reg_1 : timing.rot_m8_1;
7070
7171      switch (ModRM & 0x38)
7272      {
r3535r3536
123123   }
124124   else
125125   {
126      ICOUNT -= (ModRM >= 0xc0) ? cycles.rot_reg_base + cycles.rot_reg_bit : cycles.rot_m8_base + cycles.rot_m8_bit;
126      ICOUNT -= (ModRM >= 0xc0) ? timing.rot_reg_base + timing.rot_reg_bit : timing.rot_m8_base + timing.rot_m8_bit;
127127
128128      switch (ModRM & 0x38)
129129      {
r3535r3536
195195
196196   if (count==0)
197197   {
198      ICOUNT -= (ModRM >= 0xc0) ? cycles.rot_reg_base : cycles.rot_m16_base;
198      ICOUNT -= (ModRM >= 0xc0) ? timing.rot_reg_base : timing.rot_m16_base;
199199   }
200200   else if (count==1)
201201   {
202      ICOUNT -= (ModRM >= 0xc0) ? cycles.rot_reg_1 : cycles.rot_m16_1;
202      ICOUNT -= (ModRM >= 0xc0) ? timing.rot_reg_1 : timing.rot_m16_1;
203203
204204      switch (ModRM & 0x38)
205205      {
r3535r3536
314314   }
315315   else
316316   {
317      ICOUNT -= (ModRM >= 0xc0) ? cycles.rot_reg_base + cycles.rot_reg_bit : cycles.rot_m8_base + cycles.rot_m16_bit;
317      ICOUNT -= (ModRM >= 0xc0) ? timing.rot_reg_base + timing.rot_reg_bit : timing.rot_m8_base + timing.rot_m16_bit;
318318
319319      switch (ModRM & 0x38)
320320      {
r3535r3536
393393   case 0x26:  /* ES: */
394394      seg_prefix=TRUE;
395395      prefix_base=I.base[ES];
396      ICOUNT -= cycles.override;
396      ICOUNT -= timing.override;
397397      PREFIX(rep)(flagval);
398398      break;
399399   case 0x2e:  /* CS: */
400400      seg_prefix=TRUE;
401401      prefix_base=I.base[CS];
402      ICOUNT -= cycles.override;
402      ICOUNT -= timing.override;
403403      PREFIX(rep)(flagval);
404404      break;
405405   case 0x36:  /* SS: */
406406      seg_prefix=TRUE;
407407      prefix_base=I.base[SS];
408      ICOUNT -= cycles.override;
408      ICOUNT -= timing.override;
409409      PREFIX(rep)(flagval);
410410      break;
411411   case 0x3e:  /* DS: */
412412      seg_prefix=TRUE;
413413      prefix_base=I.base[DS];
414      ICOUNT -= cycles.override;
414      ICOUNT -= timing.override;
415415      PREFIX(rep)(flagval);
416416      break;
417417#ifndef I8086
418418   case 0x6c:   /* REP INSB */
419      ICOUNT -= cycles.rep_ins8_base;
419      ICOUNT -= timing.rep_ins8_base;
420420      for (; count > 0; count--)
421421      {
422422         if (ICOUNT <= 0) { I.pc = I.prevpc; break; }
423423         PutMemB(ES,I.regs.w[DI],read_port_byte(I.regs.w[DX]));
424424         I.regs.w[DI] += I.DirVal;
425         ICOUNT -= cycles.rep_ins8_count;
425         ICOUNT -= timing.rep_ins8_count;
426426      }
427427      I.regs.w[CX]=count;
428428      break;
429429   case 0x6d:  /* REP INSW */
430      ICOUNT -= cycles.rep_ins16_base;
430      ICOUNT -= timing.rep_ins16_base;
431431      for (; count > 0; count--)
432432      {
433433         if (ICOUNT <= 0) { I.pc = I.prevpc; break; }
434434         PutMemW(ES,I.regs.w[DI],read_port_word(I.regs.w[DX]));
435435         I.regs.w[DI] += 2 * I.DirVal;
436         ICOUNT -= cycles.rep_ins16_count;
436         ICOUNT -= timing.rep_ins16_count;
437437      }
438438      I.regs.w[CX]=count;
439439      break;
440440   case 0x6e:  /* REP OUTSB */
441      ICOUNT -= cycles.rep_outs8_base;
441      ICOUNT -= timing.rep_outs8_base;
442442      for (; count > 0; count--)
443443      {
444444         if (ICOUNT <= 0) { I.pc = I.prevpc; break; }
445445         write_port_byte(I.regs.w[DX],GetMemB(DS,I.regs.w[SI]));
446446         I.regs.w[SI] += I.DirVal; /* GOL 11/27/01 */
447         ICOUNT -= cycles.rep_outs8_count;
447         ICOUNT -= timing.rep_outs8_count;
448448      }
449449      I.regs.w[CX]=count;
450450      break;
451451   case 0x6f:  /* REP OUTSW */
452      ICOUNT -= cycles.rep_outs16_base;
452      ICOUNT -= timing.rep_outs16_base;
453453      for (; count > 0; count--)
454454      {
455455         if (ICOUNT <= 0) { I.pc = I.prevpc; break; }
456456         write_port_word(I.regs.w[DX],GetMemW(DS,I.regs.w[SI]));
457457         I.regs.w[SI] += 2 * I.DirVal; /* GOL 11/27/01 */
458         ICOUNT -= cycles.rep_outs16_count;
458         ICOUNT -= timing.rep_outs16_count;
459459      }
460460      I.regs.w[CX]=count;
461461      break;
462462#endif
463463   case 0xa4:  /* REP MOVSB */
464      ICOUNT -= cycles.rep_movs8_base;
464      ICOUNT -= timing.rep_movs8_base;
465465      for (; count > 0; count--)
466466      {
467467         BYTE tmp;
r3535r3536
471471         PutMemB(ES,I.regs.w[DI], tmp);
472472         I.regs.w[DI] += I.DirVal;
473473         I.regs.w[SI] += I.DirVal;
474         ICOUNT -= cycles.rep_movs8_count;
474         ICOUNT -= timing.rep_movs8_count;
475475      }
476476      I.regs.w[CX]=count;
477477      break;
478478   case 0xa5:  /* REP MOVSW */
479      ICOUNT -= cycles.rep_movs16_base;
479      ICOUNT -= timing.rep_movs16_base;
480480      for (; count > 0; count--)
481481      {
482482         WORD tmp;
r3535r3536
486486         PutMemW(ES,I.regs.w[DI], tmp);
487487         I.regs.w[DI] += 2 * I.DirVal;
488488         I.regs.w[SI] += 2 * I.DirVal;
489         ICOUNT -= cycles.rep_movs16_count;
489         ICOUNT -= timing.rep_movs16_count;
490490      }
491491      I.regs.w[CX]=count;
492492      break;
493493   case 0xa6:  /* REP(N)E CMPSB */
494      ICOUNT -= cycles.rep_cmps8_base;
494      ICOUNT -= timing.rep_cmps8_base;
495495      for (I.ZeroVal = !flagval; (ZF == flagval) && (count > 0); count--)
496496      {
497497         unsigned dst, src;
r3535r3536
502502          SUBB(src,dst); /* opposite of the usual convention */
503503         I.regs.w[DI] += I.DirVal;
504504         I.regs.w[SI] += I.DirVal;
505         ICOUNT -= cycles.rep_cmps8_count;
505         ICOUNT -= timing.rep_cmps8_count;
506506      }
507507      I.regs.w[CX]=count;
508508      break;
509509   case 0xa7:  /* REP(N)E CMPSW */
510      ICOUNT -= cycles.rep_cmps16_base;
510      ICOUNT -= timing.rep_cmps16_base;
511511      for (I.ZeroVal = !flagval; (ZF == flagval) && (count > 0); count--)
512512      {
513513         unsigned dst, src;
r3535r3536
518518          SUBW(src,dst); /* opposite of the usual convention */
519519         I.regs.w[DI] += 2 * I.DirVal;
520520         I.regs.w[SI] += 2 * I.DirVal;
521         ICOUNT -= cycles.rep_cmps16_count;
521         ICOUNT -= timing.rep_cmps16_count;
522522      }
523523      I.regs.w[CX]=count;
524524      break;
525525   case 0xaa:  /* REP STOSB */
526      ICOUNT -= cycles.rep_stos8_base;
526      ICOUNT -= timing.rep_stos8_base;
527527      for (; count > 0; count--)
528528      {
529529         if (ICOUNT <= 0) { I.pc = I.prevpc; break; }
530530         PutMemB(ES,I.regs.w[DI],I.regs.b[AL]);
531531         I.regs.w[DI] += I.DirVal;
532         ICOUNT -= cycles.rep_stos8_count;
532         ICOUNT -= timing.rep_stos8_count;
533533      }
534534      I.regs.w[CX]=count;
535535      break;
536536   case 0xab:  /* REP STOSW */
537      ICOUNT -= cycles.rep_stos16_base;
537      ICOUNT -= timing.rep_stos16_base;
538538      for (; count > 0; count--)
539539      {
540540         if (ICOUNT <= 0) { I.pc = I.prevpc; break; }
541541         PutMemW(ES,I.regs.w[DI],I.regs.w[AX]);
542542         I.regs.w[DI] += 2 * I.DirVal;
543         ICOUNT -= cycles.rep_stos16_count;
543         ICOUNT -= timing.rep_stos16_count;
544544      }
545545      I.regs.w[CX]=count;
546546      break;
547547   case 0xac:  /* REP LODSB */
548      ICOUNT -= cycles.rep_lods8_base;
548      ICOUNT -= timing.rep_lods8_base;
549549      for (; count > 0; count--)
550550      {
551551         if (ICOUNT <= 0) { I.pc = I.prevpc; break; }
552552         I.regs.b[AL] = GetMemB(DS,I.regs.w[SI]);
553553         I.regs.w[SI] += I.DirVal;
554         ICOUNT -= cycles.rep_lods8_count;
554         ICOUNT -= timing.rep_lods8_count;
555555      }
556556      I.regs.w[CX]=count;
557557      break;
558558   case 0xad:  /* REP LODSW */
559      ICOUNT -= cycles.rep_lods16_base;
559      ICOUNT -= timing.rep_lods16_base;
560560      for (; count > 0; count--)
561561      {
562562         if (ICOUNT <= 0) { I.pc = I.prevpc; break; }
563563         I.regs.w[AX] = GetMemW(DS,I.regs.w[SI]);
564564         I.regs.w[SI] += 2 * I.DirVal;
565         ICOUNT -= cycles.rep_lods16_count;
565         ICOUNT -= timing.rep_lods16_count;
566566      }
567567      I.regs.w[CX]=count;
568568      break;
569569   case 0xae:  /* REP(N)E SCASB */
570      ICOUNT -= cycles.rep_scas8_base;
570      ICOUNT -= timing.rep_scas8_base;
571571      for (I.ZeroVal = !flagval; (ZF == flagval) && (count > 0); count--)
572572      {
573573         unsigned src, dst;
r3535r3536
577577         dst = I.regs.b[AL];
578578          SUBB(dst,src);
579579         I.regs.w[DI] += I.DirVal;
580         ICOUNT -= cycles.rep_scas8_count;
580         ICOUNT -= timing.rep_scas8_count;
581581      }
582582      I.regs.w[CX]=count;
583583      break;
584584   case 0xaf:  /* REP(N)E SCASW */
585      ICOUNT -= cycles.rep_scas16_base;
585      ICOUNT -= timing.rep_scas16_base;
586586      for (I.ZeroVal = !flagval; (ZF == flagval) && (count > 0); count--)
587587      {
588588         unsigned src, dst;
r3535r3536
592592         dst = I.regs.w[AX];
593593          SUBW(dst,src);
594594         I.regs.w[DI] += 2 * I.DirVal;
595         ICOUNT -= cycles.rep_scas16_count;
595         ICOUNT -= timing.rep_scas16_count;
596596      }
597597      I.regs.w[CX]=count;
598598      break;
r3535r3536
605605static void PREFIX86(_add_br8)(void)    /* Opcode 0x00 */
606606{
607607   DEF_br8(dst,src);
608   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_mr8;
608   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_mr8;
609609   ADDB(dst,src);
610610    PutbackRMByte(ModRM,dst);
611611}
r3535r3536
613613static void PREFIX86(_add_wr16)(void)    /* Opcode 0x01 */
614614{
615615    DEF_wr16(dst,src);
616   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_mr16;
616   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_mr16;
617617   ADDW(dst,src);
618618   PutbackRMWord(ModRM,dst);
619619}
r3535r3536
621621static void PREFIX86(_add_r8b)(void)    /* Opcode 0x02 */
622622{
623623   DEF_r8b(dst,src);
624   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_rm8;
624   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_rm8;
625625    ADDB(dst,src);
626626    RegByte(ModRM)=dst;
627627}
r3535r3536
629629static void PREFIX86(_add_r16w)(void)    /* Opcode 0x03 */
630630{
631631    DEF_r16w(dst,src);
632   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_rm16;
632   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_rm16;
633633   ADDW(dst,src);
634634   RegWord(ModRM)=dst;
635635}
r3535r3536
638638static void PREFIX86(_add_ald8)(void)    /* Opcode 0x04 */
639639{
640640    DEF_ald8(dst,src);
641   ICOUNT -= cycles.alu_ri8;
641   ICOUNT -= timing.alu_ri8;
642642    ADDB(dst,src);
643643   I.regs.b[AL]=dst;
644644}
r3535r3536
647647static void PREFIX86(_add_axd16)(void)    /* Opcode 0x05 */
648648{
649649    DEF_axd16(dst,src);
650   ICOUNT -= cycles.alu_ri16;
650   ICOUNT -= timing.alu_ri16;
651651   ADDW(dst,src);
652652   I.regs.w[AX]=dst;
653653}
r3535r3536
655655
656656static void PREFIX86(_push_es)(void)    /* Opcode 0x06 */
657657{
658   ICOUNT -= cycles.push_seg;
658   ICOUNT -= timing.push_seg;
659659   PUSH(I.sregs[ES]);
660660}
661661
r3535r3536
670670   POP(I.sregs[ES]);
671671   I.base[ES] = SegBase(ES);
672672#endif
673   ICOUNT -= cycles.pop_seg;
673   ICOUNT -= timing.pop_seg;
674674}
675675
676676static void PREFIX86(_or_br8)(void)    /* Opcode 0x08 */
677677{
678678    DEF_br8(dst,src);
679   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_mr8;
679   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_mr8;
680680   ORB(dst,src);
681681    PutbackRMByte(ModRM,dst);
682682}
r3535r3536
684684static void PREFIX86(_or_wr16)(void)    /* Opcode 0x09 */
685685{
686686   DEF_wr16(dst,src);
687   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_mr16;
687   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_mr16;
688688    ORW(dst,src);
689689    PutbackRMWord(ModRM,dst);
690690}
r3535r3536
692692static void PREFIX86(_or_r8b)(void)    /* Opcode 0x0a */
693693{
694694   DEF_r8b(dst,src);
695   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_rm8;
695   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_rm8;
696696    ORB(dst,src);
697697    RegByte(ModRM)=dst;
698698}
r3535r3536
700700static void PREFIX86(_or_r16w)(void)    /* Opcode 0x0b */
701701{
702702    DEF_r16w(dst,src);
703   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_rm16;
703   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_rm16;
704704    ORW(dst,src);
705705    RegWord(ModRM)=dst;
706706}
r3535r3536
708708static void PREFIX86(_or_ald8)(void)    /* Opcode 0x0c */
709709{
710710    DEF_ald8(dst,src);
711   ICOUNT -= cycles.alu_ri8;
711   ICOUNT -= timing.alu_ri8;
712712    ORB(dst,src);
713713   I.regs.b[AL]=dst;
714714}
r3535r3536
716716static void PREFIX86(_or_axd16)(void)    /* Opcode 0x0d */
717717{
718718    DEF_axd16(dst,src);
719   ICOUNT -= cycles.alu_ri16;
719   ICOUNT -= timing.alu_ri16;
720720   ORW(dst,src);
721721   I.regs.w[AX]=dst;
722722}
723723
724724static void PREFIX86(_push_cs)(void)    /* Opcode 0x0e */
725725{
726   ICOUNT -= cycles.push_seg;
726   ICOUNT -= timing.push_seg;
727727   PUSH(I.sregs[CS]);
728728}
729729
r3535r3536
732732static void PREFIX86(_adc_br8)(void)    /* Opcode 0x10 */
733733{
734734    DEF_br8(dst,src);
735   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_mr8;
735   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_mr8;
736736    src+=CF;
737737    ADDB(dst,src);
738738    PutbackRMByte(ModRM,dst);
r3535r3536
741741static void PREFIX86(_adc_wr16)(void)    /* Opcode 0x11 */
742742{
743743    DEF_wr16(dst,src);
744   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_mr16;
744   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_mr16;
745745    src+=CF;
746746    ADDW(dst,src);
747747   PutbackRMWord(ModRM,dst);
r3535r3536
750750static void PREFIX86(_adc_r8b)(void)    /* Opcode 0x12 */
751751{
752752    DEF_r8b(dst,src);
753   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_rm8;
753   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_rm8;
754754   src+=CF;
755755    ADDB(dst,src);
756756    RegByte(ModRM)=dst;
r3535r3536
759759static void PREFIX86(_adc_r16w)(void)    /* Opcode 0x13 */
760760{
761761    DEF_r16w(dst,src);
762   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_rm16;
762   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_rm16;
763763   src+=CF;
764764    ADDW(dst,src);
765765    RegWord(ModRM)=dst;
r3535r3536
768768static void PREFIX86(_adc_ald8)(void)    /* Opcode 0x14 */
769769{
770770    DEF_ald8(dst,src);
771   ICOUNT -= cycles.alu_ri8;
771   ICOUNT -= timing.alu_ri8;
772772    src+=CF;
773773    ADDB(dst,src);
774774   I.regs.b[AL] = dst;
r3535r3536
777777static void PREFIX86(_adc_axd16)(void)    /* Opcode 0x15 */
778778{
779779   DEF_axd16(dst,src);
780   ICOUNT -= cycles.alu_ri16;
780   ICOUNT -= timing.alu_ri16;
781781   src+=CF;
782782    ADDW(dst,src);
783783   I.regs.w[AX]=dst;
r3535r3536
786786static void PREFIX86(_push_ss)(void)    /* Opcode 0x16 */
787787{
788788   PUSH(I.sregs[SS]);
789   ICOUNT -= cycles.push_seg;
789   ICOUNT -= timing.push_seg;
790790}
791791
792792static void PREFIX86(_pop_ss)(void)    /* Opcode 0x17 */
r3535r3536
799799   POP(I.sregs[SS]);
800800   I.base[SS] = SegBase(SS);
801801#endif
802   ICOUNT -= cycles.pop_seg;
802   ICOUNT -= timing.pop_seg;
803803   PREFIX(_instruction)[FETCHOP](); /* no interrupt before next instruction */
804804}
805805
806806static void PREFIX86(_sbb_br8)(void)    /* Opcode 0x18 */
807807{
808808    DEF_br8(dst,src);
809   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_mr8;
809   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_mr8;
810810    src+=CF;
811811    SUBB(dst,src);
812812    PutbackRMByte(ModRM,dst);
r3535r3536
815815static void PREFIX86(_sbb_wr16)(void)    /* Opcode 0x19 */
816816{
817817    DEF_wr16(dst,src);
818   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_mr16;
818   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_mr16;
819819    src+=CF;
820820   SUBW(dst,src);
821821   PutbackRMWord(ModRM,dst);
r3535r3536
824824static void PREFIX86(_sbb_r8b)(void)    /* Opcode 0x1a */
825825{
826826   DEF_r8b(dst,src);
827   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_rm8;
827   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_rm8;
828828   src+=CF;
829829    SUBB(dst,src);
830830    RegByte(ModRM)=dst;
r3535r3536
833833static void PREFIX86(_sbb_r16w)(void)    /* Opcode 0x1b */
834834{
835835    DEF_r16w(dst,src);
836   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_rm16;
836   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_rm16;
837837   src+=CF;
838838    SUBW(dst,src);
839839    RegWord(ModRM)= dst;
r3535r3536
842842static void PREFIX86(_sbb_ald8)(void)    /* Opcode 0x1c */
843843{
844844    DEF_ald8(dst,src);
845   ICOUNT -= cycles.alu_ri8;
845   ICOUNT -= timing.alu_ri8;
846846    src+=CF;
847847    SUBB(dst,src);
848848   I.regs.b[AL] = dst;
r3535r3536
851851static void PREFIX86(_sbb_axd16)(void)    /* Opcode 0x1d */
852852{
853853    DEF_axd16(dst,src);
854   ICOUNT -= cycles.alu_ri16;
854   ICOUNT -= timing.alu_ri16;
855855   src+=CF;
856856    SUBW(dst,src);
857857   I.regs.w[AX]=dst;
r3535r3536
860860static void PREFIX86(_push_ds)(void)    /* Opcode 0x1e */
861861{
862862   PUSH(I.sregs[DS]);
863   ICOUNT -= cycles.push_seg;
863   ICOUNT -= timing.push_seg;
864864}
865865
866866static void PREFIX86(_pop_ds)(void)    /* Opcode 0x1f */
r3535r3536
873873   POP(I.sregs[DS]);
874874   I.base[DS] = SegBase(DS);
875875#endif
876   ICOUNT -= cycles.push_seg;
876   ICOUNT -= timing.push_seg;
877877}
878878
879879static void PREFIX86(_and_br8)(void)    /* Opcode 0x20 */
880880{
881881    DEF_br8(dst,src);
882   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_mr8;
882   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_mr8;
883883    ANDB(dst,src);
884884    PutbackRMByte(ModRM,dst);
885885}
r3535r3536
887887static void PREFIX86(_and_wr16)(void)    /* Opcode 0x21 */
888888{
889889    DEF_wr16(dst,src);
890   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_mr16;
890   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_mr16;
891891    ANDW(dst,src);
892892    PutbackRMWord(ModRM,dst);
893893}
r3535r3536
895895static void PREFIX86(_and_r8b)(void)    /* Opcode 0x22 */
896896{
897897    DEF_r8b(dst,src);
898   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_rm8;
898   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_rm8;
899899    ANDB(dst,src);
900900    RegByte(ModRM)=dst;
901901}
r3535r3536
903903static void PREFIX86(_and_r16w)(void)    /* Opcode 0x23 */
904904{
905905    DEF_r16w(dst,src);
906   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_rm16;
906   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_rm16;
907907   ANDW(dst,src);
908908    RegWord(ModRM)=dst;
909909}
r3535r3536
911911static void PREFIX86(_and_ald8)(void)    /* Opcode 0x24 */
912912{
913913    DEF_ald8(dst,src);
914   ICOUNT -= cycles.alu_ri8;
914   ICOUNT -= timing.alu_ri8;
915915    ANDB(dst,src);
916916   I.regs.b[AL] = dst;
917917}
r3535r3536
919919static void PREFIX86(_and_axd16)(void)    /* Opcode 0x25 */
920920{
921921    DEF_axd16(dst,src);
922   ICOUNT -= cycles.alu_ri16;
922   ICOUNT -= timing.alu_ri16;
923923    ANDW(dst,src);
924924   I.regs.w[AX]=dst;
925925}
r3535r3536
928928{
929929   seg_prefix=TRUE;
930930   prefix_base=I.base[ES];
931   ICOUNT -= cycles.override;
931   ICOUNT -= timing.override;
932932   PREFIX(_instruction)[FETCHOP]();
933933}
934934
r3535r3536
949949   }
950950
951951   SetSZPF_Byte(I.regs.b[AL]);
952   ICOUNT -= cycles.daa;
952   ICOUNT -= timing.daa;
953953}
954954
955955static void PREFIX86(_sub_br8)(void)    /* Opcode 0x28 */
956956{
957957    DEF_br8(dst,src);
958   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_mr8;
958   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_mr8;
959959    SUBB(dst,src);
960960    PutbackRMByte(ModRM,dst);
961961}
r3535r3536
963963static void PREFIX86(_sub_wr16)(void)    /* Opcode 0x29 */
964964{
965965    DEF_wr16(dst,src);
966   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_mr16;
966   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_mr16;
967967    SUBW(dst,src);
968968    PutbackRMWord(ModRM,dst);
969969}
r3535r3536
971971static void PREFIX86(_sub_r8b)(void)    /* Opcode 0x2a */
972972{
973973    DEF_r8b(dst,src);
974   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_rm8;
974   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_rm8;
975975   SUBB(dst,src);
976976    RegByte(ModRM)=dst;
977977}
r3535r3536
979979static void PREFIX86(_sub_r16w)(void)    /* Opcode 0x2b */
980980{
981981    DEF_r16w(dst,src);
982   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_rm16;
982   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_rm16;
983983    SUBW(dst,src);
984984    RegWord(ModRM)=dst;
985985}
r3535r3536
987987static void PREFIX86(_sub_ald8)(void)    /* Opcode 0x2c */
988988{
989989    DEF_ald8(dst,src);
990   ICOUNT -= cycles.alu_ri8;
990   ICOUNT -= timing.alu_ri8;
991991    SUBB(dst,src);
992992   I.regs.b[AL] = dst;
993993}
r3535r3536
995995static void PREFIX86(_sub_axd16)(void)    /* Opcode 0x2d */
996996{
997997   DEF_axd16(dst,src);
998   ICOUNT -= cycles.alu_ri16;
998   ICOUNT -= timing.alu_ri16;
999999    SUBW(dst,src);
10001000   I.regs.w[AX]=dst;
10011001}
r3535r3536
10041004{
10051005    seg_prefix=TRUE;
10061006   prefix_base=I.base[CS];
1007   ICOUNT -= cycles.override;
1007   ICOUNT -= timing.override;
10081008   PREFIX(_instruction)[FETCHOP]();
10091009}
10101010
r3535r3536
10261026   }
10271027
10281028   SetSZPF_Byte(I.regs.b[AL]);
1029   ICOUNT -= cycles.das;
1029   ICOUNT -= timing.das;
10301030}
10311031
10321032static void PREFIX86(_xor_br8)(void)    /* Opcode 0x30 */
10331033{
10341034    DEF_br8(dst,src);
1035   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_mr8;
1035   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_mr8;
10361036    XORB(dst,src);
10371037   PutbackRMByte(ModRM,dst);
10381038}
r3535r3536
10401040static void PREFIX86(_xor_wr16)(void)    /* Opcode 0x31 */
10411041{
10421042   DEF_wr16(dst,src);
1043   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_mr16;
1043   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_mr16;
10441044   XORW(dst,src);
10451045    PutbackRMWord(ModRM,dst);
10461046}
r3535r3536
10481048static void PREFIX86(_xor_r8b)(void)    /* Opcode 0x32 */
10491049{
10501050    DEF_r8b(dst,src);
1051   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_rm8;
1051   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_rm8;
10521052    XORB(dst,src);
10531053    RegByte(ModRM)=dst;
10541054}
r3535r3536
10561056static void PREFIX86(_xor_r16w)(void)    /* Opcode 0x33 */
10571057{
10581058    DEF_r16w(dst,src);
1059   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_rm16;
1059   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_rm16;
10601060    XORW(dst,src);
10611061   RegWord(ModRM)=dst;
10621062}
r3535r3536
10641064static void PREFIX86(_xor_ald8)(void)    /* Opcode 0x34 */
10651065{
10661066   DEF_ald8(dst,src);
1067   ICOUNT -= cycles.alu_ri8;
1067   ICOUNT -= timing.alu_ri8;
10681068    XORB(dst,src);
10691069   I.regs.b[AL] = dst;
10701070}
r3535r3536
10721072static void PREFIX86(_xor_axd16)(void)    /* Opcode 0x35 */
10731073{
10741074    DEF_axd16(dst,src);
1075   ICOUNT -= cycles.alu_ri16;
1075   ICOUNT -= timing.alu_ri16;
10761076    XORW(dst,src);
10771077   I.regs.w[AX]=dst;
10781078}
r3535r3536
10811081{
10821082   seg_prefix=TRUE;
10831083   prefix_base=I.base[SS];
1084   ICOUNT -= cycles.override;
1084   ICOUNT -= timing.override;
10851085   PREFIX(_instruction)[FETCHOP]();
10861086}
10871087
r3535r3536
11031103      I.CarryVal = 0;
11041104    }
11051105   I.regs.b[AL] &= 0x0F;
1106   ICOUNT -= cycles.aaa;
1106   ICOUNT -= timing.aaa;
11071107}
11081108
11091109static void PREFIX86(_cmp_br8)(void)    /* Opcode 0x38 */
11101110{
11111111    DEF_br8(dst,src);
1112   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_rm8;
1112   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_rm8;
11131113    SUBB(dst,src);
11141114}
11151115
11161116static void PREFIX86(_cmp_wr16)(void)    /* Opcode 0x39 */
11171117{
11181118   DEF_wr16(dst,src);
1119   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_rm16;
1119   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_rm16;
11201120    SUBW(dst,src);
11211121}
11221122
11231123static void PREFIX86(_cmp_r8b)(void)    /* Opcode 0x3a */
11241124{
11251125    DEF_r8b(dst,src);
1126   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_rm8;
1126   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_rm8;
11271127    SUBB(dst,src);
11281128}
11291129
11301130static void PREFIX86(_cmp_r16w)(void)    /* Opcode 0x3b */
11311131{
11321132   DEF_r16w(dst,src);
1133   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_rm16;
1133   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_rm16;
11341134    SUBW(dst,src);
11351135}
11361136
11371137static void PREFIX86(_cmp_ald8)(void)    /* Opcode 0x3c */
11381138{
11391139    DEF_ald8(dst,src);
1140   ICOUNT -= cycles.alu_ri8;
1140   ICOUNT -= timing.alu_ri8;
11411141    SUBB(dst,src);
11421142}
11431143
11441144static void PREFIX86(_cmp_axd16)(void)    /* Opcode 0x3d */
11451145{
11461146    DEF_axd16(dst,src);
1147   ICOUNT -= cycles.alu_ri16;
1147   ICOUNT -= timing.alu_ri16;
11481148    SUBW(dst,src);
11491149}
11501150
r3535r3536
11521152{
11531153   seg_prefix=TRUE;
11541154   prefix_base=I.base[DS];
1155   ICOUNT -= cycles.override;
1155   ICOUNT -= timing.override;
11561156   PREFIX(_instruction)[FETCHOP]();
11571157}
11581158
r3535r3536
11741174      I.CarryVal = 0;
11751175    }
11761176   I.regs.b[AL] &= 0x0F;
1177   ICOUNT -= cycles.aas;
1177   ICOUNT -= timing.aas;
11781178}
11791179
11801180#define IncWordReg(Reg)                \
r3535r3536
11851185   SetAF(tmp1,tmp,1);                  \
11861186   SetSZPF_Word(tmp1);                \
11871187   I.regs.w[Reg]=tmp1;                \
1188   ICOUNT -= cycles.incdec_r16;         \
1188   ICOUNT -= timing.incdec_r16;         \
11891189}
11901190
11911191static void PREFIX86(_inc_ax)(void)    /* Opcode 0x40 */
r3535r3536
12361236    SetAF(tmp1,tmp,1);                   \
12371237   SetSZPF_Word(tmp1);                  \
12381238   I.regs.w[Reg]=tmp1;                \
1239   ICOUNT -= cycles.incdec_r16;         \
1239   ICOUNT -= timing.incdec_r16;         \
12401240}
12411241
12421242static void PREFIX86(_dec_ax)(void)    /* Opcode 0x48 */
r3535r3536
12811281
12821282static void PREFIX86(_push_ax)(void)    /* Opcode 0x50 */
12831283{
1284   ICOUNT -= cycles.push_r16;
1284   ICOUNT -= timing.push_r16;
12851285   PUSH(I.regs.w[AX]);
12861286}
12871287
12881288static void PREFIX86(_push_cx)(void)    /* Opcode 0x51 */
12891289{
1290   ICOUNT -= cycles.push_r16;
1290   ICOUNT -= timing.push_r16;
12911291   PUSH(I.regs.w[CX]);
12921292}
12931293
12941294static void PREFIX86(_push_dx)(void)    /* Opcode 0x52 */
12951295{
1296   ICOUNT -= cycles.push_r16;
1296   ICOUNT -= timing.push_r16;
12971297   PUSH(I.regs.w[DX]);
12981298}
12991299
13001300static void PREFIX86(_push_bx)(void)    /* Opcode 0x53 */
13011301{
1302   ICOUNT -= cycles.push_r16;
1302   ICOUNT -= timing.push_r16;
13031303   PUSH(I.regs.w[BX]);
13041304}
13051305
13061306static void PREFIX86(_push_sp)(void)    /* Opcode 0x54 */
13071307{
1308   ICOUNT -= cycles.push_r16;
1308   ICOUNT -= timing.push_r16;
13091309   PUSH(I.regs.w[SP]);
13101310}
13111311
13121312static void PREFIX86(_push_bp)(void)    /* Opcode 0x55 */
13131313{
1314   ICOUNT -= cycles.push_r16;
1314   ICOUNT -= timing.push_r16;
13151315   PUSH(I.regs.w[BP]);
13161316}
13171317
13181318
13191319static void PREFIX86(_push_si)(void)    /* Opcode 0x56 */
13201320{
1321   ICOUNT -= cycles.push_r16;
1321   ICOUNT -= timing.push_r16;
13221322   PUSH(I.regs.w[SI]);
13231323}
13241324
13251325static void PREFIX86(_push_di)(void)    /* Opcode 0x57 */
13261326{
1327   ICOUNT -= cycles.push_r16;
1327   ICOUNT -= timing.push_r16;
13281328   PUSH(I.regs.w[DI]);
13291329}
13301330
13311331static void PREFIX86(_pop_ax)(void)    /* Opcode 0x58 */
13321332{
1333   ICOUNT -= cycles.pop_r16;
1333   ICOUNT -= timing.pop_r16;
13341334   POP(I.regs.w[AX]);
13351335}
13361336
13371337static void PREFIX86(_pop_cx)(void)    /* Opcode 0x59 */
13381338{
1339   ICOUNT -= cycles.pop_r16;
1339   ICOUNT -= timing.pop_r16;
13401340   POP(I.regs.w[CX]);
13411341}
13421342
13431343static void PREFIX86(_pop_dx)(void)    /* Opcode 0x5a */
13441344{
1345   ICOUNT -= cycles.pop_r16;
1345   ICOUNT -= timing.pop_r16;
13461346   POP(I.regs.w[DX]);
13471347}
13481348
13491349static void PREFIX86(_pop_bx)(void)    /* Opcode 0x5b */
13501350{
1351   ICOUNT -= cycles.pop_r16;
1351   ICOUNT -= timing.pop_r16;
13521352   POP(I.regs.w[BX]);
13531353}
13541354
13551355static void PREFIX86(_pop_sp)(void)    /* Opcode 0x5c */
13561356{
1357   ICOUNT -= cycles.pop_r16;
1357   ICOUNT -= timing.pop_r16;
13581358   POP(I.regs.w[SP]);
13591359}
13601360
13611361static void PREFIX86(_pop_bp)(void)    /* Opcode 0x5d */
13621362{
1363   ICOUNT -= cycles.pop_r16;
1363   ICOUNT -= timing.pop_r16;
13641364   POP(I.regs.w[BP]);
13651365}
13661366
13671367static void PREFIX86(_pop_si)(void)    /* Opcode 0x5e */
13681368{
1369   ICOUNT -= cycles.pop_r16;
1369   ICOUNT -= timing.pop_r16;
13701370   POP(I.regs.w[SI]);
13711371}
13721372
13731373static void PREFIX86(_pop_di)(void)    /* Opcode 0x5f */
13741374{
1375   ICOUNT -= cycles.pop_r16;
1375   ICOUNT -= timing.pop_r16;
13761376   POP(I.regs.w[DI]);
13771377}
13781378
r3535r3536
13821382   if (OF)
13831383   {
13841384      I.pc += tmp;
1385      ICOUNT -= cycles.jcc_t;
1385      ICOUNT -= timing.jcc_t;
13861386/* ASG - can probably assume this is safe
13871387        CHANGE_PC(I.pc);*/
1388   } else ICOUNT -= cycles.jcc_nt;
1388   } else ICOUNT -= timing.jcc_nt;
13891389}
13901390
13911391static void PREFIX86(_jno)(void)    /* Opcode 0x71 */
r3535r3536
13931393   int tmp = (int)((INT8)FETCH);
13941394   if (!OF) {
13951395      I.pc += tmp;
1396      ICOUNT -= cycles.jcc_t;
1396      ICOUNT -= timing.jcc_t;
13971397/* ASG - can probably assume this is safe
13981398        CHANGE_PC(I.pc);*/
1399   } else ICOUNT -= cycles.jcc_nt;
1399   } else ICOUNT -= timing.jcc_nt;
14001400}
14011401
14021402static void PREFIX86(_jb)(void)    /* Opcode 0x72 */
r3535r3536
14041404   int tmp = (int)((INT8)FETCH);
14051405   if (CF) {
14061406      I.pc += tmp;
1407      ICOUNT -= cycles.jcc_t;
1407      ICOUNT -= timing.jcc_t;
14081408/* ASG - can probably assume this is safe
14091409        CHANGE_PC(I.pc);*/
1410   } else ICOUNT -= cycles.jcc_nt;
1410   } else ICOUNT -= timing.jcc_nt;
14111411}
14121412
14131413static void PREFIX86(_jnb)(void)    /* Opcode 0x73 */
r3535r3536
14151415   int tmp = (int)((INT8)FETCH);
14161416   if (!CF) {
14171417      I.pc += tmp;
1418      ICOUNT -= cycles.jcc_t;
1418      ICOUNT -= timing.jcc_t;
14191419/* ASG - can probably assume this is safe
14201420        CHANGE_PC(I.pc);*/
1421   } else ICOUNT -= cycles.jcc_nt;
1421   } else ICOUNT -= timing.jcc_nt;
14221422}
14231423
14241424static void PREFIX86(_jz)(void)    /* Opcode 0x74 */
r3535r3536
14261426   int tmp = (int)((INT8)FETCH);
14271427   if (ZF) {
14281428      I.pc += tmp;
1429      ICOUNT -= cycles.jcc_t;
1429      ICOUNT -= timing.jcc_t;
14301430/* ASG - can probably assume this is safe
14311431        CHANGE_PC(I.pc);*/
1432   } else ICOUNT -= cycles.jcc_nt;
1432   } else ICOUNT -= timing.jcc_nt;
14331433}
14341434
14351435static void PREFIX86(_jnz)(void)    /* Opcode 0x75 */
r3535r3536
14371437   int tmp = (int)((INT8)FETCH);
14381438   if (!ZF) {
14391439      I.pc += tmp;
1440      ICOUNT -= cycles.jcc_t;
1440      ICOUNT -= timing.jcc_t;
14411441/* ASG - can probably assume this is safe
14421442        CHANGE_PC(I.pc);*/
1443   } else ICOUNT -= cycles.jcc_nt;
1443   } else ICOUNT -= timing.jcc_nt;
14441444}
14451445
14461446static void PREFIX86(_jbe)(void)    /* Opcode 0x76 */
r3535r3536
14481448   int tmp = (int)((INT8)FETCH);
14491449    if (CF || ZF) {
14501450      I.pc += tmp;
1451      ICOUNT -= cycles.jcc_t;
1451      ICOUNT -= timing.jcc_t;
14521452/* ASG - can probably assume this is safe
14531453        CHANGE_PC(I.pc);*/
1454   } else ICOUNT -= cycles.jcc_nt;
1454   } else ICOUNT -= timing.jcc_nt;
14551455}
14561456
14571457static void PREFIX86(_jnbe)(void)    /* Opcode 0x77 */
r3535r3536
14591459   int tmp = (int)((INT8)FETCH);
14601460    if (!(CF || ZF)) {
14611461      I.pc += tmp;
1462      ICOUNT -= cycles.jcc_t;
1462      ICOUNT -= timing.jcc_t;
14631463/* ASG - can probably assume this is safe
14641464        CHANGE_PC(I.pc);*/
1465   } else ICOUNT -= cycles.jcc_nt;
1465   } else ICOUNT -= timing.jcc_nt;
14661466}
14671467
14681468static void PREFIX86(_js)(void)    /* Opcode 0x78 */
r3535r3536
14701470   int tmp = (int)((INT8)FETCH);
14711471    if (SF) {
14721472      I.pc += tmp;
1473      ICOUNT -= cycles.jcc_t;
1473      ICOUNT -= timing.jcc_t;
14741474/* ASG - can probably assume this is safe
14751475        CHANGE_PC(I.pc);*/
1476   } else ICOUNT -= cycles.jcc_nt;
1476   } else ICOUNT -= timing.jcc_nt;
14771477}
14781478
14791479static void PREFIX86(_jns)(void)    /* Opcode 0x79 */
r3535r3536
14811481   int tmp = (int)((INT8)FETCH);
14821482    if (!SF) {
14831483      I.pc += tmp;
1484      ICOUNT -= cycles.jcc_t;
1484      ICOUNT -= timing.jcc_t;
14851485/* ASG - can probably assume this is safe
14861486        CHANGE_PC(I.pc);*/
1487   } else ICOUNT -= cycles.jcc_nt;
1487   } else ICOUNT -= timing.jcc_nt;
14881488}
14891489
14901490static void PREFIX86(_jp)(void)    /* Opcode 0x7a */
r3535r3536
14921492   int tmp = (int)((INT8)FETCH);
14931493    if (PF) {
14941494      I.pc += tmp;
1495      ICOUNT -= cycles.jcc_t;
1495      ICOUNT -= timing.jcc_t;
14961496/* ASG - can probably assume this is safe
14971497        CHANGE_PC(I.pc);*/
1498   } else ICOUNT -= cycles.jcc_nt;
1498   } else ICOUNT -= timing.jcc_nt;
14991499}
15001500
15011501static void PREFIX86(_jnp)(void)    /* Opcode 0x7b */
r3535r3536
15031503   int tmp = (int)((INT8)FETCH);
15041504    if (!PF) {
15051505      I.pc += tmp;
1506      ICOUNT -= cycles.jcc_t;
1506      ICOUNT -= timing.jcc_t;
15071507/* ASG - can probably assume this is safe
15081508        CHANGE_PC(I.pc);*/
1509   } else ICOUNT -= cycles.jcc_nt;
1509   } else ICOUNT -= timing.jcc_nt;
15101510}
15111511
15121512static void PREFIX86(_jl)(void)    /* Opcode 0x7c */
r3535r3536
15141514   int tmp = (int)((INT8)FETCH);
15151515    if ((SF!=OF)&&!ZF) {
15161516      I.pc += tmp;
1517      ICOUNT -= cycles.jcc_t;
1517      ICOUNT -= timing.jcc_t;
15181518/* ASG - can probably assume this is safe
15191519        CHANGE_PC(I.pc);*/
1520   } else ICOUNT -= cycles.jcc_nt;
1520   } else ICOUNT -= timing.jcc_nt;
15211521}
15221522
15231523static void PREFIX86(_jnl)(void)    /* Opcode 0x7d */
r3535r3536
15251525   int tmp = (int)((INT8)FETCH);
15261526    if (ZF||(SF==OF)) {
15271527      I.pc += tmp;
1528      ICOUNT -= cycles.jcc_t;
1528      ICOUNT -= timing.jcc_t;
15291529/* ASG - can probably assume this is safe
15301530        CHANGE_PC(I.pc);*/
1531   } else ICOUNT -= cycles.jcc_nt;
1531   } else ICOUNT -= timing.jcc_nt;
15321532}
15331533
15341534static void PREFIX86(_jle)(void)    /* Opcode 0x7e */
r3535r3536
15361536   int tmp = (int)((INT8)FETCH);
15371537    if (ZF||(SF!=OF)) {
15381538      I.pc += tmp;
1539      ICOUNT -= cycles.jcc_t;
1539      ICOUNT -= timing.jcc_t;
15401540/* ASG - can probably assume this is safe
15411541        CHANGE_PC(I.pc);*/
1542   } else ICOUNT -= cycles.jcc_nt;
1542   } else ICOUNT -= timing.jcc_nt;
15431543}
15441544
15451545static void PREFIX86(_jnle)(void)    /* Opcode 0x7f */
r3535r3536
15471547   int tmp = (int)((INT8)FETCH);
15481548    if ((SF==OF)&&!ZF) {
15491549      I.pc += tmp;
1550      ICOUNT -= cycles.jcc_t;
1550      ICOUNT -= timing.jcc_t;
15511551/* ASG - can probably assume this is safe
15521552        CHANGE_PC(I.pc);*/
1553   } else ICOUNT -= cycles.jcc_nt;
1553   } else ICOUNT -= timing.jcc_nt;
15541554}
15551555
15561556static void PREFIX86(_80pre)(void)    /* Opcode 0x80 */
r3535r3536
15641564    case 0x00:  /* ADD eb,d8 */
15651565        ADDB(dst,src);
15661566        PutbackRMByte(ModRM,dst);
1567        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1567        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
15681568      break;
15691569    case 0x08:  /* OR eb,d8 */
15701570        ORB(dst,src);
15711571      PutbackRMByte(ModRM,dst);
1572        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1572        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
15731573      break;
15741574    case 0x10:  /* ADC eb,d8 */
15751575        src+=CF;
15761576        ADDB(dst,src);
15771577      PutbackRMByte(ModRM,dst);
1578        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1578        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
15791579      break;
15801580    case 0x18:  /* SBB eb,b8 */
15811581      src+=CF;
15821582      SUBB(dst,src);
15831583        PutbackRMByte(ModRM,dst);
1584        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1584        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
15851585      break;
15861586    case 0x20:  /* AND eb,d8 */
15871587        ANDB(dst,src);
15881588      PutbackRMByte(ModRM,dst);
1589        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1589        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
15901590      break;
15911591    case 0x28:  /* SUB eb,d8 */
15921592        SUBB(dst,src);
15931593        PutbackRMByte(ModRM,dst);
1594        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1594        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
15951595      break;
15961596    case 0x30:  /* XOR eb,d8 */
15971597        XORB(dst,src);
15981598      PutbackRMByte(ModRM,dst);
1599        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1599        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
16001600      break;
16011601    case 0x38:  /* CMP eb,d8 */
16021602        SUBB(dst,src);
1603        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8_ro;
1603        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8_ro;
16041604      break;
16051605   }
16061606}
r3535r3536
16181618    case 0x00:  /* ADD ew,d16 */
16191619      ADDW(dst,src);
16201620      PutbackRMWord(ModRM,dst);
1621        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri16 : cycles.alu_mi16;
1621        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri16 : timing.alu_mi16;
16221622      break;
16231623    case 0x08:  /* OR ew,d16 */
16241624        ORW(dst,src);
16251625        PutbackRMWord(ModRM,dst);
1626        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri16 : cycles.alu_mi16;
1626        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri16 : timing.alu_mi16;
16271627      break;
16281628   case 0x10:   /* ADC ew,d16 */
16291629      src+=CF;
16301630      ADDW(dst,src);
16311631        PutbackRMWord(ModRM,dst);
1632        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri16 : cycles.alu_mi16;
1632        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri16 : timing.alu_mi16;
16331633      break;
16341634    case 0x18:  /* SBB ew,d16 */
16351635        src+=CF;
16361636      SUBW(dst,src);
16371637        PutbackRMWord(ModRM,dst);
1638        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri16 : cycles.alu_mi16;
1638        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri16 : timing.alu_mi16;
16391639      break;
16401640    case 0x20:  /* AND ew,d16 */
16411641        ANDW(dst,src);
16421642      PutbackRMWord(ModRM,dst);
1643        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri16 : cycles.alu_mi16;
1643        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri16 : timing.alu_mi16;
16441644      break;
16451645    case 0x28:  /* SUB ew,d16 */
16461646        SUBW(dst,src);
16471647        PutbackRMWord(ModRM,dst);
1648        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri16 : cycles.alu_mi16;
1648        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri16 : timing.alu_mi16;
16491649      break;
16501650    case 0x30:  /* XOR ew,d16 */
16511651      XORW(dst,src);
16521652        PutbackRMWord(ModRM,dst);
1653        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri16 : cycles.alu_mi16;
1653        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri16 : timing.alu_mi16;
16541654      break;
16551655    case 0x38:  /* CMP ew,d16 */
16561656        SUBW(dst,src);
1657        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri16 : cycles.alu_mi16_ro;
1657        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri16 : timing.alu_mi16_ro;
16581658      break;
16591659    }
16601660}
r3535r3536
16701670   case 0x00:   /* ADD eb,d8 */
16711671      ADDB(dst,src);
16721672      PutbackRMByte(ModRM,dst);
1673        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1673        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
16741674      break;
16751675   case 0x08:   /* OR eb,d8 */
16761676      ORB(dst,src);
16771677      PutbackRMByte(ModRM,dst);
1678        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1678        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
16791679      break;
16801680   case 0x10:   /* ADC eb,d8 */
16811681      src+=CF;
16821682      ADDB(dst,src);
16831683      PutbackRMByte(ModRM,dst);
1684        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1684        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
16851685      break;
16861686   case 0x18:   /* SBB eb,d8 */
16871687        src+=CF;
16881688      SUBB(dst,src);
16891689      PutbackRMByte(ModRM,dst);
1690        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1690        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
16911691      break;
16921692   case 0x20:   /* AND eb,d8 */
16931693      ANDB(dst,src);
16941694      PutbackRMByte(ModRM,dst);
1695        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1695        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
16961696      break;
16971697   case 0x28:   /* SUB eb,d8 */
16981698      SUBB(dst,src);
16991699      PutbackRMByte(ModRM,dst);
1700        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1700        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
17011701      break;
17021702   case 0x30:   /* XOR eb,d8 */
17031703      XORB(dst,src);
17041704      PutbackRMByte(ModRM,dst);
1705        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8;
1705        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8;
17061706      break;
17071707   case 0x38:   /* CMP eb,d8 */
17081708      SUBB(dst,src);
1709        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8_ro;
1709        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8_ro;
17101710      break;
17111711   }
17121712}
r3535r3536
17221722    case 0x00:  /* ADD ew,d16 */
17231723        ADDW(dst,src);
17241724        PutbackRMWord(ModRM,dst);
1725        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_r16i8 : cycles.alu_m16i8;
1725        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_r16i8 : timing.alu_m16i8;
17261726      break;
17271727    case 0x08:  /* OR ew,d16 */
17281728      ORW(dst,src);
17291729        PutbackRMWord(ModRM,dst);
1730        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_r16i8 : cycles.alu_m16i8;
1730        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_r16i8 : timing.alu_m16i8;
17311731      break;
17321732    case 0x10:  /* ADC ew,d16 */
17331733        src+=CF;
17341734      ADDW(dst,src);
17351735        PutbackRMWord(ModRM,dst);
1736        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_r16i8 : cycles.alu_m16i8;
1736        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_r16i8 : timing.alu_m16i8;
17371737      break;
17381738   case 0x18:   /* SBB ew,d16 */
17391739      src+=CF;
17401740        SUBW(dst,src);
17411741        PutbackRMWord(ModRM,dst);
1742        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_r16i8 : cycles.alu_m16i8;
1742        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_r16i8 : timing.alu_m16i8;
17431743      break;
17441744   case 0x20:   /* AND ew,d16 */
17451745        ANDW(dst,src);
17461746        PutbackRMWord(ModRM,dst);
1747        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_r16i8 : cycles.alu_m16i8;
1747        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_r16i8 : timing.alu_m16i8;
17481748      break;
17491749    case 0x28:  /* SUB ew,d16 */
17501750      SUBW(dst,src);
17511751      PutbackRMWord(ModRM,dst);
1752        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_r16i8 : cycles.alu_m16i8;
1752        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_r16i8 : timing.alu_m16i8;
17531753      break;
17541754    case 0x30:  /* XOR ew,d16 */
17551755      XORW(dst,src);
17561756        PutbackRMWord(ModRM,dst);
1757        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_r16i8 : cycles.alu_m16i8;
1757        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_r16i8 : timing.alu_m16i8;
17581758      break;
17591759    case 0x38:  /* CMP ew,d16 */
17601760        SUBW(dst,src);
1761        ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_r16i8 : cycles.alu_m16i8_ro;
1761        ICOUNT -= (ModRM >= 0xc0) ? timing.alu_r16i8 : timing.alu_m16i8_ro;
17621762      break;
17631763    }
17641764}
r3535r3536
17661766static void PREFIX86(_test_br8)(void)    /* Opcode 0x84 */
17671767{
17681768    DEF_br8(dst,src);
1769   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr8 : cycles.alu_rm8;
1769   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr8 : timing.alu_rm8;
17701770    ANDB(dst,src);
17711771}
17721772
17731773static void PREFIX86(_test_wr16)(void)    /* Opcode 0x85 */
17741774{
17751775    DEF_wr16(dst,src);
1776   ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_rr16 : cycles.alu_rm16;
1776   ICOUNT -= (ModRM >= 0xc0) ? timing.alu_rr16 : timing.alu_rm16;
17771777   ANDW(dst,src);
17781778}
17791779
17801780static void PREFIX86(_xchg_br8)(void)    /* Opcode 0x86 */
17811781{
17821782    DEF_br8(dst,src);
1783   ICOUNT -= (ModRM >= 0xc0) ? cycles.xchg_rr8 : cycles.xchg_rm8;
1783   ICOUNT -= (ModRM >= 0xc0) ? timing.xchg_rr8 : timing.xchg_rm8;
17841784    RegByte(ModRM)=dst;
17851785    PutbackRMByte(ModRM,src);
17861786}
r3535r3536
17881788static void PREFIX86(_xchg_wr16)(void)    /* Opcode 0x87 */
17891789{
17901790    DEF_wr16(dst,src);
1791   ICOUNT -= (ModRM >= 0xc0) ? cycles.xchg_rr16 : cycles.xchg_rm16;
1791   ICOUNT -= (ModRM >= 0xc0) ? timing.xchg_rr16 : timing.xchg_rm16;
17921792    RegWord(ModRM)=dst;
17931793    PutbackRMWord(ModRM,src);
17941794}
r3535r3536
17971797{
17981798   unsigned ModRM = FETCH;
17991799    BYTE src = RegByte(ModRM);
1800   ICOUNT -= (ModRM >= 0xc0) ? cycles.mov_rr8 : cycles.mov_mr8;
1800   ICOUNT -= (ModRM >= 0xc0) ? timing.mov_rr8 : timing.mov_mr8;
18011801    PutRMByte(ModRM,src);
18021802}
18031803
r3535r3536
18051805{
18061806   unsigned ModRM = FETCH;
18071807    WORD src = RegWord(ModRM);
1808   ICOUNT -= (ModRM >= 0xc0) ? cycles.mov_rr16 : cycles.mov_mr16;
1808   ICOUNT -= (ModRM >= 0xc0) ? timing.mov_rr16 : timing.mov_mr16;
18091809    PutRMWord(ModRM,src);
18101810}
18111811
r3535r3536
18131813{
18141814   unsigned ModRM = FETCH;
18151815    BYTE src = GetRMByte(ModRM);
1816   ICOUNT -= (ModRM >= 0xc0) ? cycles.mov_rr8 : cycles.mov_rm8;
1816   ICOUNT -= (ModRM >= 0xc0) ? timing.mov_rr8 : timing.mov_rm8;
18171817    RegByte(ModRM)=src;
18181818}
18191819
r3535r3536
18211821{
18221822   unsigned ModRM = FETCH;
18231823   WORD src = GetRMWord(ModRM);
1824   ICOUNT -= (ModRM >= 0xc0) ? cycles.mov_rr8 : cycles.mov_rm16;
1824   ICOUNT -= (ModRM >= 0xc0) ? timing.mov_rr8 : timing.mov_rm16;
18251825   RegWord(ModRM)=src;
18261826}
18271827
18281828static void PREFIX86(_mov_wsreg)(void)    /* Opcode 0x8c */
18291829{
18301830   unsigned ModRM = FETCH;
1831   ICOUNT -= (ModRM >= 0xc0) ? cycles.mov_rs : cycles.mov_ms;
1831   ICOUNT -= (ModRM >= 0xc0) ? timing.mov_rs : timing.mov_ms;
18321832#ifdef I80286
18331833   if (ModRM & 0x20) {   /* HJB 12/13/98 1xx is invalid */
18341834      i80286_trap2(ILLEGAL_INSTRUCTION);
r3535r3536
18431843static void PREFIX86(_lea)(void)    /* Opcode 0x8d */
18441844{
18451845   unsigned ModRM = FETCH;
1846   ICOUNT -= cycles.lea;
1846   ICOUNT -= timing.lea;
18471847   (void)(*GetEA[ModRM])();
18481848   RegWord(ModRM)=EO;   /* HJB 12/13/98 effective offset (no segment part) */
18491849}
r3535r3536
18531853   unsigned ModRM = FETCH;
18541854    WORD src = GetRMWord(ModRM);
18551855
1856   ICOUNT -= (ModRM >= 0xc0) ? cycles.mov_sr : cycles.mov_sm;
1856   ICOUNT -= (ModRM >= 0xc0) ? timing.mov_sr : timing.mov_sm;
18571857#ifdef I80286
18581858    switch (ModRM & 0x38)
18591859    {
r3535r3536
18971897   unsigned ModRM = FETCH;
18981898    WORD tmp;
18991899   POP(tmp);
1900   ICOUNT -= (ModRM >= 0xc0) ? cycles.pop_r16 : cycles.pop_m16;
1900   ICOUNT -= (ModRM >= 0xc0) ? timing.pop_r16 : timing.pop_m16;
19011901   PutRMWord(ModRM,tmp);
19021902}
19031903
r3535r3536
19081908   tmp = I.regs.w[Reg];          \
19091909   I.regs.w[Reg] = I.regs.w[AX];    \
19101910   I.regs.w[AX] = tmp;          \
1911   ICOUNT -= cycles.xchg_ar16;    \
1911   ICOUNT -= timing.xchg_ar16;    \
19121912}
19131913
19141914
19151915static void PREFIX86(_nop)(void)    /* Opcode 0x90 */
19161916{
19171917    /* this is XchgAXReg(AX); */
1918   ICOUNT -= cycles.nop;
1918   ICOUNT -= timing.nop;
19191919}
19201920
19211921static void PREFIX86(_xchg_axcx)(void)    /* Opcode 0x91 */
r3535r3536
19551955
19561956static void PREFIX86(_cbw)(void)    /* Opcode 0x98 */
19571957{
1958   ICOUNT -= cycles.cbw;
1958   ICOUNT -= timing.cbw;
19591959   I.regs.b[AH] = (I.regs.b[AL] & 0x80) ? 0xff : 0;
19601960}
19611961
19621962static void PREFIX86(_cwd)(void)    /* Opcode 0x99 */
19631963{
1964   ICOUNT -= cycles.cwd;
1964   ICOUNT -= timing.cwd;
19651965   I.regs.w[DX] = (I.regs.b[AH] & 0x80) ? 0xffff : 0;
19661966}
19671967
r3535r3536
19871987   I.base[CS] = SegBase(CS);
19881988   I.pc = (I.base[CS] + (WORD)tmp) & AMASK;
19891989#endif
1990   ICOUNT -= cycles.call_far;
1990   ICOUNT -= timing.call_far;
19911991   CHANGE_PC(I.pc);
19921992}
19931993
r3535r3536
19991999      I.pc--;
20002000   }
20012001   else
2002      ICOUNT -= cycles.wait;
2002      ICOUNT -= timing.wait;
20032003}
20042004
20052005static void PREFIX86(_pushf)(void)    /* Opcode 0x9c */
20062006{
20072007   unsigned tmp;
2008   ICOUNT -= cycles.pushf;
2008   ICOUNT -= timing.pushf;
20092009
20102010   tmp = CompressFlags();
20112011#ifdef I80286
r3535r3536
20192019{
20202020   unsigned tmp;
20212021    POP(tmp);
2022   ICOUNT -= cycles.popf;
2022   ICOUNT -= timing.popf;
20232023    ExpandFlags(tmp);
20242024
20252025   if (I.TF) PREFIX(_trap)();
r3535r3536
20322032static void PREFIX86(_sahf)(void)    /* Opcode 0x9e */
20332033{
20342034   unsigned tmp = (CompressFlags() & 0xff00) | (I.regs.b[AH] & 0xd5);
2035   ICOUNT -= cycles.sahf;
2035   ICOUNT -= timing.sahf;
20362036    ExpandFlags(tmp);
20372037}
20382038
20392039static void PREFIX86(_lahf)(void)    /* Opcode 0x9f */
20402040{
20412041   I.regs.b[AH] = CompressFlags() & 0xff;
2042   ICOUNT -= cycles.lahf;
2042   ICOUNT -= timing.lahf;
20432043}
20442044
20452045
r3535r3536
20502050   addr = FETCH;
20512051   addr += FETCH << 8;
20522052
2053   ICOUNT -= cycles.mov_am8;
2053   ICOUNT -= timing.mov_am8;
20542054   I.regs.b[AL] = GetMemB(DS, addr);
20552055}
20562056
r3535r3536
20612061   addr = FETCH;
20622062   addr += FETCH << 8;
20632063
2064   ICOUNT -= cycles.mov_am16;
2064   ICOUNT -= timing.mov_am16;
20652065   I.regs.w[AX] = GetMemW(DS, addr);
20662066}
20672067
r3535r3536
20722072   addr = FETCH;
20732073   addr += FETCH << 8;
20742074
2075   ICOUNT -= cycles.mov_ma8;
2075   ICOUNT -= timing.mov_ma8;
20762076   PutMemB(DS, addr, I.regs.b[AL]);
20772077}
20782078
r3535r3536
20832083   addr = FETCH;
20842084   addr += FETCH << 8;
20852085
2086   ICOUNT -= cycles.mov_ma16;
2086   ICOUNT -= timing.mov_ma16;
20872087   PutMemW(DS, addr, I.regs.w[AX]);
20882088}
20892089
r3535r3536
20932093   PutMemB(ES,I.regs.w[DI], tmp);
20942094   I.regs.w[DI] += I.DirVal;
20952095   I.regs.w[SI] += I.DirVal;
2096   ICOUNT -= cycles.movs8;
2096   ICOUNT -= timing.movs8;
20972097}
20982098
20992099static void PREFIX86(_movsw)(void)    /* Opcode 0xa5 */
r3535r3536
21022102   PutMemW(ES,I.regs.w[DI], tmp);
21032103   I.regs.w[DI] += 2 * I.DirVal;
21042104   I.regs.w[SI] += 2 * I.DirVal;
2105   ICOUNT -= cycles.movs16;
2105   ICOUNT -= timing.movs16;
21062106}
21072107
21082108static void PREFIX86(_cmpsb)(void)    /* Opcode 0xa6 */
r3535r3536
21122112    SUBB(src,dst); /* opposite of the usual convention */
21132113   I.regs.w[DI] += I.DirVal;
21142114   I.regs.w[SI] += I.DirVal;
2115   ICOUNT -= cycles.cmps8;
2115   ICOUNT -= timing.cmps8;
21162116}
21172117
21182118static void PREFIX86(_cmpsw)(void)    /* Opcode 0xa7 */
r3535r3536
21222122   SUBW(src,dst); /* opposite of the usual convention */
21232123   I.regs.w[DI] += 2 * I.DirVal;
21242124   I.regs.w[SI] += 2 * I.DirVal;
2125   ICOUNT -= cycles.cmps16;
2125   ICOUNT -= timing.cmps16;
21262126}
21272127
21282128static void PREFIX86(_test_ald8)(void)    /* Opcode 0xa8 */
21292129{
21302130    DEF_ald8(dst,src);
2131   ICOUNT -= cycles.alu_ri8;
2131   ICOUNT -= timing.alu_ri8;
21322132    ANDB(dst,src);
21332133}
21342134
21352135static void PREFIX86(_test_axd16)(void)    /* Opcode 0xa9 */
21362136{
21372137    DEF_axd16(dst,src);
2138   ICOUNT -= cycles.alu_ri16;
2138   ICOUNT -= timing.alu_ri16;
21392139    ANDW(dst,src);
21402140}
21412141
r3535r3536
21432143{
21442144   PutMemB(ES,I.regs.w[DI],I.regs.b[AL]);
21452145   I.regs.w[DI] += I.DirVal;
2146   ICOUNT -= cycles.stos8;
2146   ICOUNT -= timing.stos8;
21472147}
21482148
21492149static void PREFIX86(_stosw)(void)    /* Opcode 0xab */
21502150{
21512151   PutMemW(ES,I.regs.w[DI],I.regs.w[AX]);
21522152   I.regs.w[DI] += 2 * I.DirVal;
2153   ICOUNT -= cycles.stos16;
2153   ICOUNT -= timing.stos16;
21542154}
21552155
21562156static void PREFIX86(_lodsb)(void)    /* Opcode 0xac */
21572157{
21582158   I.regs.b[AL] = GetMemB(DS,I.regs.w[SI]);
21592159   I.regs.w[SI] += I.DirVal;
2160   ICOUNT -= cycles.lods8;
2160   ICOUNT -= timing.lods8;
21612161}
21622162
21632163static void PREFIX86(_lodsw)(void)    /* Opcode 0xad */
21642164{
21652165   I.regs.w[AX] = GetMemW(DS,I.regs.w[SI]);
21662166   I.regs.w[SI] += 2 * I.DirVal;
2167   ICOUNT -= cycles.lods16;
2167   ICOUNT -= timing.lods16;
21682168}
21692169
21702170static void PREFIX86(_scasb)(void)    /* Opcode 0xae */
r3535r3536
21732173   unsigned dst = I.regs.b[AL];
21742174    SUBB(dst,src);
21752175   I.regs.w[DI] += I.DirVal;
2176   ICOUNT -= cycles.scas8;
2176   ICOUNT -= timing.scas8;
21772177}
21782178
21792179static void PREFIX86(_scasw)(void)    /* Opcode 0xaf */
r3535r3536
21822182   unsigned dst = I.regs.w[AX];
21832183    SUBW(dst,src);
21842184   I.regs.w[DI] += 2 * I.DirVal;
2185   ICOUNT -= cycles.scas16;
2185   ICOUNT -= timing.scas16;
21862186}
21872187
21882188static void PREFIX86(_mov_ald8)(void)    /* Opcode 0xb0 */
21892189{
21902190   I.regs.b[AL] = FETCH;
2191   ICOUNT -= cycles.mov_ri8;
2191   ICOUNT -= timing.mov_ri8;
21922192}
21932193
21942194static void PREFIX86(_mov_cld8)(void)    /* Opcode 0xb1 */
21952195{
21962196   I.regs.b[CL] = FETCH;
2197   ICOUNT -= cycles.mov_ri8;
2197   ICOUNT -= timing.mov_ri8;
21982198}
21992199
22002200static void PREFIX86(_mov_dld8)(void)    /* Opcode 0xb2 */
22012201{
22022202   I.regs.b[DL] = FETCH;
2203   ICOUNT -= cycles.mov_ri8;
2203   ICOUNT -= timing.mov_ri8;
22042204}
22052205
22062206static void PREFIX86(_mov_bld8)(void)    /* Opcode 0xb3 */
22072207{
22082208   I.regs.b[BL] = FETCH;
2209   ICOUNT -= cycles.mov_ri8;
2209   ICOUNT -= timing.mov_ri8;
22102210}
22112211
22122212static void PREFIX86(_mov_ahd8)(void)    /* Opcode 0xb4 */
22132213{
22142214   I.regs.b[AH] = FETCH;
2215   ICOUNT -= cycles.mov_ri8;
2215   ICOUNT -= timing.mov_ri8;
22162216}
22172217
22182218static void PREFIX86(_mov_chd8)(void)    /* Opcode 0xb5 */
22192219{
22202220   I.regs.b[CH] = FETCH;
2221   ICOUNT -= cycles.mov_ri8;
2221   ICOUNT -= timing.mov_ri8;
22222222}
22232223
22242224static void PREFIX86(_mov_dhd8)(void)    /* Opcode 0xb6 */
22252225{
22262226   I.regs.b[DH] = FETCH;
2227   ICOUNT -= cycles.mov_ri8;
2227   ICOUNT -= timing.mov_ri8;
22282228}
22292229
22302230static void PREFIX86(_mov_bhd8)(void)    /* Opcode 0xb7 */
22312231{
22322232   I.regs.b[BH] = FETCH;
2233   ICOUNT -= cycles.mov_ri8;
2233   ICOUNT -= timing.mov_ri8;
22342234}
22352235
22362236static void PREFIX86(_mov_axd16)(void)    /* Opcode 0xb8 */
22372237{
22382238   I.regs.b[AL] = FETCH;
22392239   I.regs.b[AH] = FETCH;
2240   ICOUNT -= cycles.mov_ri16;
2240   ICOUNT -= timing.mov_ri16;
22412241}
22422242
22432243static void PREFIX86(_mov_cxd16)(void)    /* Opcode 0xb9 */
22442244{
22452245   I.regs.b[CL] = FETCH;
22462246   I.regs.b[CH] = FETCH;
2247   ICOUNT -= cycles.mov_ri16;
2247   ICOUNT -= timing.mov_ri16;
22482248}
22492249
22502250static void PREFIX86(_mov_dxd16)(void)    /* Opcode 0xba */
22512251{
22522252   I.regs.b[DL] = FETCH;
22532253   I.regs.b[DH] = FETCH;
2254   ICOUNT -= cycles.mov_ri16;
2254   ICOUNT -= timing.mov_ri16;
22552255}
22562256
22572257static void PREFIX86(_mov_bxd16)(void)    /* Opcode 0xbb */
22582258{
22592259   I.regs.b[BL] = FETCH;
22602260   I.regs.b[BH] = FETCH;
2261   ICOUNT -= cycles.mov_ri16;
2261   ICOUNT -= timing.mov_ri16;
22622262}
22632263
22642264static void PREFIX86(_mov_spd16)(void)    /* Opcode 0xbc */
22652265{
22662266   I.regs.b[SPL] = FETCH;
22672267   I.regs.b[SPH] = FETCH;
2268   ICOUNT -= cycles.mov_ri16;
2268   ICOUNT -= timing.mov_ri16;
22692269}
22702270
22712271static void PREFIX86(_mov_bpd16)(void)    /* Opcode 0xbd */
22722272{
22732273   I.regs.b[BPL] = FETCH;
22742274   I.regs.b[BPH] = FETCH;
2275   ICOUNT -= cycles.mov_ri16;
2275   ICOUNT -= timing.mov_ri16;
22762276}
22772277
22782278static void PREFIX86(_mov_sid16)(void)    /* Opcode 0xbe */
22792279{
22802280   I.regs.b[SIL] = FETCH;
22812281   I.regs.b[SIH] = FETCH;
2282   ICOUNT -= cycles.mov_ri16;
2282   ICOUNT -= timing.mov_ri16;
22832283}
22842284
22852285static void PREFIX86(_mov_did16)(void)    /* Opcode 0xbf */
22862286{
22872287   I.regs.b[DIL] = FETCH;
22882288   I.regs.b[DIH] = FETCH;
2289   ICOUNT -= cycles.mov_ri16;
2289   ICOUNT -= timing.mov_ri16;
22902290}
22912291
22922292static void PREFIX86(_ret_d16)(void)    /* Opcode 0xc2 */
r3535r3536
22962296   POP(I.pc);
22972297   I.pc = (I.pc + I.base[CS]) & AMASK;
22982298   I.regs.w[SP]+=count;
2299   ICOUNT -= cycles.ret_near_imm;
2299   ICOUNT -= timing.ret_near_imm;
23002300   CHANGE_PC(I.pc);
23012301}
23022302
r3535r3536
23042304{
23052305   POP(I.pc);
23062306   I.pc = (I.pc + I.base[CS]) & AMASK;
2307   ICOUNT -= cycles.ret_near;
2307   ICOUNT -= timing.ret_near;
23082308   CHANGE_PC(I.pc);
23092309}
23102310
r3535r3536
23202320   I.sregs[ES] = GetnextRMWord;
23212321   I.base[ES] = SegBase(ES);
23222322#endif
2323   ICOUNT -= cycles.load_ptr;
2323   ICOUNT -= timing.load_ptr;
23242324}
23252325
23262326static void PREFIX86(_lds_dw)(void)    /* Opcode 0xc5 */
r3535r3536
23352335   I.sregs[DS] = GetnextRMWord;
23362336   I.base[DS] = SegBase(DS);
23372337#endif
2338   ICOUNT -= cycles.load_ptr;
2338   ICOUNT -= timing.load_ptr;
23392339}
23402340
23412341static void PREFIX86(_mov_bd8)(void)    /* Opcode 0xc6 */
23422342{
23432343   unsigned ModRM = FETCH;
2344   ICOUNT -= (ModRM >= 0xc0) ? cycles.mov_ri8 : cycles.mov_mi8;
2344   ICOUNT -= (ModRM >= 0xc0) ? timing.mov_ri8 : timing.mov_mi8;
23452345   PutImmRMByte(ModRM);
23462346}
23472347
23482348static void PREFIX86(_mov_wd16)(void)    /* Opcode 0xc7 */
23492349{
23502350   unsigned ModRM = FETCH;
2351   ICOUNT -= (ModRM >= 0xc0) ? cycles.mov_ri16 : cycles.mov_mi16;
2351   ICOUNT -= (ModRM >= 0xc0) ? timing.mov_ri16 : timing.mov_mi16;
23522352   PutImmRMWord(ModRM);
23532353}
23542354
r3535r3536
23712371   I.pc = (I.pc + I.base[CS]) & AMASK;
23722372#endif
23732373   I.regs.w[SP]+=count;
2374   ICOUNT -= cycles.ret_far_imm;
2374   ICOUNT -= timing.ret_far_imm;
23752375   CHANGE_PC(I.pc);
23762376}
23772377
r3535r3536
23902390   I.base[CS] = SegBase(CS);
23912391   I.pc = (I.pc + I.base[CS]) & AMASK;
23922392#endif
2393   ICOUNT -= cycles.ret_far;
2393   ICOUNT -= timing.ret_far;
23942394   CHANGE_PC(I.pc);
23952395}
23962396
23972397static void PREFIX86(_int3)(void)    /* Opcode 0xcc */
23982398{
2399   ICOUNT -= cycles.int3;
2399   ICOUNT -= timing.int3;
24002400   PREFIX(_interrupt)(3);
24012401}
24022402
24032403static void PREFIX86(_int)(void)    /* Opcode 0xcd */
24042404{
24052405   unsigned int_num = FETCH;
2406   ICOUNT -= cycles.int_imm;
2406   ICOUNT -= timing.int_imm;
24072407   PREFIX(_interrupt)(int_num);
24082408}
24092409
24102410static void PREFIX86(_into)(void)    /* Opcode 0xce */
24112411{
24122412   if (OF) {
2413      ICOUNT -= cycles.into_t;
2413      ICOUNT -= timing.into_t;
24142414      PREFIX(_interrupt)(4);
2415   } else ICOUNT -= cycles.into_nt;
2415   } else ICOUNT -= timing.into_nt;
24162416}
24172417
24182418static void PREFIX86(_iret)(void)    /* Opcode 0xcf */
24192419{
2420   ICOUNT -= cycles.iret;
2420   ICOUNT -= timing.iret;
24212421#ifdef I80286
24222422   {
24232423      int tmp, tmp2;
r3535r3536
24682468{
24692469   unsigned mult = FETCH;
24702470
2471   ICOUNT -= cycles.aam;
2471   ICOUNT -= timing.aam;
24722472   if (mult == 0)
24732473      PREFIX(_interrupt)(0);
24742474   else
r3535r3536
24842484{
24852485   unsigned mult = FETCH;
24862486
2487   ICOUNT -= cycles.aad;
2487   ICOUNT -= timing.aad;
24882488
24892489   I.regs.b[AL] = I.regs.b[AH] * mult + I.regs.b[AL];
24902490   I.regs.b[AH] = 0;
r3535r3536
24992499{
25002500   unsigned dest = I.regs.w[BX]+I.regs.b[AL];
25012501
2502   ICOUNT -= cycles.xlat;
2502   ICOUNT -= timing.xlat;
25032503   I.regs.b[AL] = GetMemB(DS, dest);
25042504}
25052505
25062506static void PREFIX86(_escape)(void)    /* Opcodes 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde and 0xdf */
25072507{
25082508   unsigned ModRM = FETCH;
2509   ICOUNT -= cycles.nop;
2509   ICOUNT -= timing.nop;
25102510    GetRMByte(ModRM);
25112511}
25122512
r3535r3536
25182518   I.regs.w[CX]=tmp;
25192519
25202520    if (!ZF && tmp) {
2521      ICOUNT -= cycles.loop_t;
2521      ICOUNT -= timing.loop_t;
25222522      I.pc += disp;
25232523/* ASG - can probably assume this is safe
25242524        CHANGE_PC(I.pc);*/
2525   } else ICOUNT -= cycles.loop_nt;
2525   } else ICOUNT -= timing.loop_nt;
25262526}
25272527
25282528static void PREFIX86(_loope)(void)    /* Opcode 0xe1 */
r3535r3536
25332533   I.regs.w[CX]=tmp;
25342534
25352535   if (ZF && tmp) {
2536      ICOUNT -= cycles.loope_t;
2536      ICOUNT -= timing.loope_t;
25372537       I.pc += disp;
25382538/* ASG - can probably assume this is safe
25392539         CHANGE_PC(I.pc);*/
2540    } else ICOUNT -= cycles.loope_nt;
2540    } else ICOUNT -= timing.loope_nt;
25412541}
25422542
25432543static void PREFIX86(_loop)(void)    /* Opcode 0xe2 */
r3535r3536
25482548   I.regs.w[CX]=tmp;
25492549
25502550    if (tmp) {
2551      ICOUNT -= cycles.loop_t;
2551      ICOUNT -= timing.loop_t;
25522552      I.pc += disp;
25532553/* ASG - can probably assume this is safe
25542554        CHANGE_PC(I.pc);*/
2555   } else ICOUNT -= cycles.loop_nt;
2555   } else ICOUNT -= timing.loop_nt;
25562556}
25572557
25582558static void PREFIX86(_jcxz)(void)    /* Opcode 0xe3 */
r3535r3536
25602560   int disp = (int)((INT8)FETCH);
25612561
25622562   if (I.regs.w[CX] == 0) {
2563      ICOUNT -= cycles.jcxz_t;
2563      ICOUNT -= timing.jcxz_t;
25642564      I.pc += disp;
25652565/* ASG - can probably assume this is safe
25662566        CHANGE_PC(I.pc);*/
25672567   } else
2568      ICOUNT -= cycles.jcxz_nt;
2568      ICOUNT -= timing.jcxz_nt;
25692569}
25702570
25712571static void PREFIX86(_inal)(void)    /* Opcode 0xe4 */
25722572{
25732573   unsigned port = FETCH;
25742574
2575   ICOUNT -= cycles.in_imm8;
2575   ICOUNT -= timing.in_imm8;
25762576   I.regs.b[AL] = read_port_byte(port);
25772577}
25782578
r3535r3536
25802580{
25812581   unsigned port = FETCH;
25822582
2583   ICOUNT -= cycles.in_imm16;
2583   ICOUNT -= timing.in_imm16;
25842584   I.regs.w[AX] = read_port_word(port);
25852585}
25862586
r3535r3536
25882588{
25892589   unsigned port = FETCH;
25902590
2591   ICOUNT -= cycles.out_imm8;
2591   ICOUNT -= timing.out_imm8;
25922592   write_port_byte(port, I.regs.b[AL]);
25932593}
25942594
r3535r3536
25962596{
25972597   unsigned port = FETCH;
25982598
2599   ICOUNT -= cycles.out_imm16;
2599   ICOUNT -= timing.out_imm16;
26002600   write_port_word(port, I.regs.w[AX]);
26012601}
26022602
r3535r3536
26092609   PUSH(ip);
26102610   ip += tmp;
26112611   I.pc = (ip + I.base[CS]) & AMASK;
2612   ICOUNT -= cycles.call_near;
2612   ICOUNT -= timing.call_near;
26132613   CHANGE_PC(I.pc);
26142614}
26152615
r3535r3536
26202620   FETCHWORD(tmp);
26212621   ip = I.pc - I.base[CS] + tmp;
26222622   I.pc = (ip + I.base[CS]) & AMASK;
2623   ICOUNT -= cycles.jmp_near;
2623   ICOUNT -= timing.jmp_near;
26242624   CHANGE_PC(I.pc);
26252625}
26262626
r3535r3536
26412641   I.base[CS] = SegBase(CS);
26422642   I.pc = (I.base[CS] + tmp) & AMASK;
26432643#endif
2644   ICOUNT -= cycles.jmp_far;
2644   ICOUNT -= timing.jmp_far;
26452645   CHANGE_PC(I.pc);
26462646}
26472647
r3535r3536
26512651   I.pc += tmp;
26522652/* ASG - can probably assume this is safe
26532653    CHANGE_PC(I.pc);*/
2654   ICOUNT -= cycles.jmp_short;
2654   ICOUNT -= timing.jmp_short;
26552655}
26562656
26572657static void PREFIX86(_inaldx)(void)    /* Opcode 0xec */
26582658{
2659   ICOUNT -= cycles.in_dx8;
2659   ICOUNT -= timing.in_dx8;
26602660   I.regs.b[AL] = read_port_byte(I.regs.w[DX]);
26612661}
26622662
r3535r3536
26642664{
26652665   unsigned port = I.regs.w[DX];
26662666
2667   ICOUNT -= cycles.in_dx16;
2667   ICOUNT -= timing.in_dx16;
26682668   I.regs.w[AX] = read_port_word(port);
26692669}
26702670
26712671static void PREFIX86(_outdxal)(void)    /* Opcode 0xee */
26722672{
2673   ICOUNT -= cycles.out_dx8;
2673   ICOUNT -= timing.out_dx8;
26742674   write_port_byte(I.regs.w[DX], I.regs.b[AL]);
26752675}
26762676
r3535r3536
26782678{
26792679   unsigned port = I.regs.w[DX];
26802680
2681   ICOUNT -= cycles.out_dx16;
2681   ICOUNT -= timing.out_dx16;
26822682   write_port_word(port, I.regs.w[AX]);
26832683}
26842684
26852685/* I think thats not a V20 instruction...*/
26862686static void PREFIX86(_lock)(void)    /* Opcode 0xf0 */
26872687{
2688   ICOUNT -= cycles.nop;
2688   ICOUNT -= timing.nop;
26892689   PREFIX(_instruction)[FETCHOP]();  /* un-interruptible */
26902690}
26912691#endif
r3535r3536
27092709
27102710static void PREFIX86(_cmc)(void)    /* Opcode 0xf5 */
27112711{
2712   ICOUNT -= cycles.flag_ops;
2712   ICOUNT -= timing.flag_ops;
27132713   I.CarryVal = !CF;
27142714}
27152715
r3535r3536
27252725    {
27262726    case 0x00:  /* TEST Eb, data8 */
27272727    case 0x08:  /* ??? */
2728      ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri8 : cycles.alu_mi8_ro;
2728      ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri8 : timing.alu_mi8_ro;
27292729      tmp &= FETCH;
27302730
27312731      I.CarryVal = I.OverVal = I.AuxVal = 0;
r3535r3536
27332733      break;
27342734
27352735    case 0x10:  /* NOT Eb */
2736      ICOUNT -= (ModRM >= 0xc0) ? cycles.negnot_r8 : cycles.negnot_m8;
2736      ICOUNT -= (ModRM >= 0xc0) ? timing.negnot_r8 : timing.negnot_m8;
27372737      PutbackRMByte(ModRM,~tmp);
27382738      break;
27392739
27402740    case 0x18:  /* NEG Eb */
2741      ICOUNT -= (ModRM >= 0xc0) ? cycles.negnot_r8 : cycles.negnot_m8;
2741      ICOUNT -= (ModRM >= 0xc0) ? timing.negnot_r8 : timing.negnot_m8;
27422742        tmp2=0;
27432743        SUBB(tmp2,tmp);
27442744        PutbackRMByte(ModRM,tmp2);
27452745      break;
27462746    case 0x20:  /* MUL AL, Eb */
2747      ICOUNT -= (ModRM >= 0xc0) ? cycles.mul_r8 : cycles.mul_m8;
2747      ICOUNT -= (ModRM >= 0xc0) ? timing.mul_r8 : timing.mul_m8;
27482748      {
27492749         UINT16 result;
27502750         tmp2 = I.regs.b[AL];
r3535r3536
27602760      }
27612761      break;
27622762    case 0x28:  /* IMUL AL, Eb */
2763      ICOUNT -= (ModRM >= 0xc0) ? cycles.imul_r8 : cycles.imul_m8;
2763      ICOUNT -= (ModRM >= 0xc0) ? timing.imul_r8 : timing.imul_m8;
27642764      {
27652765         INT16 result;
27662766
r3535r3536
27782778      }
27792779      break;
27802780    case 0x30:  /* DIV AL, Ew */
2781      ICOUNT -= (ModRM >= 0xc0) ? cycles.div_r8 : cycles.div_m8;
2781      ICOUNT -= (ModRM >= 0xc0) ? timing.div_r8 : timing.div_m8;
27822782      {
27832783         UINT16 result;
27842784
r3535r3536
28052805      }
28062806      break;
28072807    case 0x38:  /* IDIV AL, Ew */
2808      ICOUNT -= (ModRM >= 0xc0) ? cycles.idiv_r8 : cycles.idiv_m8;
2808      ICOUNT -= (ModRM >= 0xc0) ? timing.idiv_r8 : timing.idiv_m8;
28092809      {
28102810
28112811         INT16 result;
r3535r3536
28502850    {
28512851    case 0x00:  /* TEST Ew, data16 */
28522852    case 0x08:  /* ??? */
2853      ICOUNT -= (ModRM >= 0xc0) ? cycles.alu_ri16 : cycles.alu_mi16_ro;
2853      ICOUNT -= (ModRM >= 0xc0) ? timing.alu_ri16 : timing.alu_mi16_ro;
28542854      tmp2 = FETCH;
28552855      tmp2 += FETCH << 8;
28562856
r3535r3536
28612861      break;
28622862
28632863    case 0x10:  /* NOT Ew */
2864      ICOUNT -= (ModRM >= 0xc0) ? cycles.negnot_r16 : cycles.negnot_m16;
2864      ICOUNT -= (ModRM >= 0xc0) ? timing.negnot_r16 : timing.negnot_m16;
28652865      tmp = ~tmp;
28662866      PutbackRMWord(ModRM,tmp);
28672867      break;
28682868
28692869    case 0x18:  /* NEG Ew */
2870      ICOUNT -= (ModRM >= 0xc0) ? cycles.negnot_r16 : cycles.negnot_m16;
2870      ICOUNT -= (ModRM >= 0xc0) ? timing.negnot_r16 : timing.negnot_m16;
28712871        tmp2 = 0;
28722872        SUBW(tmp2,tmp);
28732873        PutbackRMWord(ModRM,tmp2);
28742874      break;
28752875    case 0x20:  /* MUL AX, Ew */
2876      ICOUNT -= (ModRM >= 0xc0) ? cycles.mul_r16 : cycles.mul_m16;
2876      ICOUNT -= (ModRM >= 0xc0) ? timing.mul_r16 : timing.mul_m16;
28772877      {
28782878         UINT32 result;
28792879         tmp2 = I.regs.w[AX];
r3535r3536
28922892      break;
28932893
28942894    case 0x28:  /* IMUL AX, Ew */
2895      ICOUNT -= (ModRM >= 0xc0) ? cycles.imul_r16 : cycles.imul_m16;
2895      ICOUNT -= (ModRM >= 0xc0) ? timing.imul_r16 : timing.imul_m16;
28962896      {
28972897         INT32 result;
28982898
r3535r3536
29122912      }
29132913      break;
29142914    case 0x30:  /* DIV AX, Ew */
2915      ICOUNT -= (ModRM >= 0xc0) ? cycles.div_r16 : cycles.div_m16;
2915      ICOUNT -= (ModRM >= 0xc0) ? timing.div_r16 : timing.div_m16;
29162916      {
29172917         UINT32 result;
29182918
r3535r3536
29412941      }
29422942      break;
29432943    case 0x38:  /* IDIV AX, Ew */
2944      ICOUNT -= (ModRM >= 0xc0) ? cycles.idiv_r16 : cycles.idiv_m16;
2944      ICOUNT -= (ModRM >= 0xc0) ? timing.idiv_r16 : timing.idiv_m16;
29452945      {
29462946         INT32 result;
29472947
r3535r3536
29742974
29752975static void PREFIX86(_clc)(void)    /* Opcode 0xf8 */
29762976{
2977   ICOUNT -= cycles.flag_ops;
2977   ICOUNT -= timing.flag_ops;
29782978   I.CarryVal = 0;
29792979}
29802980
29812981static void PREFIX86(_stc)(void)    /* Opcode 0xf9 */
29822982{
2983   ICOUNT -= cycles.flag_ops;
2983   ICOUNT -= timing.flag_ops;
29842984   I.CarryVal = 1;
29852985}
29862986
29872987static void PREFIX86(_cli)(void)    /* Opcode 0xfa */
29882988{
2989   ICOUNT -= cycles.flag_ops;
2989   ICOUNT -= timing.flag_ops;
29902990   SetIF(0);
29912991}
29922992
29932993static void PREFIX86(_sti)(void)    /* Opcode 0xfb */
29942994{
2995   ICOUNT -= cycles.flag_ops;
2995   ICOUNT -= timing.flag_ops;
29962996   SetIF(1);
29972997   PREFIX(_instruction)[FETCHOP](); /* no interrupt before next instruction */
29982998
r3535r3536
30033003
30043004static void PREFIX86(_cld)(void)    /* Opcode 0xfc */
30053005{
3006   ICOUNT -= cycles.flag_ops;
3006   ICOUNT -= timing.flag_ops;
30073007   SetDF(0);
30083008}
30093009
30103010static void PREFIX86(_std)(void)    /* Opcode 0xfd */
30113011{
3012   ICOUNT -= cycles.flag_ops;
3012   ICOUNT -= timing.flag_ops;
30133013   SetDF(1);
30143014}
30153015
r3535r3536
30193019   unsigned tmp = GetRMByte(ModRM);
30203020    unsigned tmp1;
30213021
3022   ICOUNT -= (ModRM >= 0xc0) ? cycles.incdec_r8 : cycles.incdec_m8;
3022   ICOUNT -= (ModRM >= 0xc0) ? timing.incdec_r8 : timing.incdec_m8;
30233023    if ((ModRM & 0x38) == 0)  /* INC eb */
30243024    {
30253025      tmp1 = tmp+1;
r3535r3536
30483048    switch(ModRM & 0x38)
30493049    {
30503050    case 0x00:  /* INC ew */
3051      ICOUNT -= (ModRM >= 0xc0) ? cycles.incdec_r16 : cycles.incdec_m16;
3051      ICOUNT -= (ModRM >= 0xc0) ? timing.incdec_r16 : timing.incdec_m16;
30523052      tmp = GetRMWord(ModRM);
30533053      tmp1 = tmp+1;
30543054
r3535r3536
30603060      break;
30613061
30623062    case 0x08:  /* DEC ew */
3063      ICOUNT -= (ModRM >= 0xc0) ? cycles.incdec_r16 : cycles.incdec_m16;
3063      ICOUNT -= (ModRM >= 0xc0) ? timing.incdec_r16 : timing.incdec_m16;
30643064      tmp = GetRMWord(ModRM);
30653065      tmp1 = tmp-1;
30663066
r3535r3536
30723072      break;
30733073
30743074    case 0x10:  /* CALL ew */
3075      ICOUNT -= (ModRM >= 0xc0) ? cycles.call_r16 : cycles.call_m16;
3075      ICOUNT -= (ModRM >= 0xc0) ? timing.call_r16 : timing.call_m16;
30763076      tmp = GetRMWord(ModRM);
30773077      ip = I.pc - I.base[CS];
30783078      PUSH(ip);
r3535r3536
30813081      break;
30823082
30833083   case 0x18:  /* CALL FAR ea */
3084      ICOUNT -= cycles.call_m32;
3084      ICOUNT -= timing.call_m32;
30853085      tmp = I.sregs[CS];   /* HJB 12/13/98 need to skip displacements of EA */
30863086      tmp1 = GetRMWord(ModRM);
30873087      ip = I.pc - I.base[CS];
r3535r3536
30983098      break;
30993099
31003100    case 0x20:  /* JMP ea */
3101      ICOUNT -= (ModRM >= 0xc0) ? cycles.jmp_r16 : cycles.jmp_m16;
3101      ICOUNT -= (ModRM >= 0xc0) ? timing.jmp_r16 : timing.jmp_m16;
31023102      ip = GetRMWord(ModRM);
31033103      I.pc = (I.base[CS] + ip) & AMASK;
31043104      CHANGE_PC(I.pc);
31053105      break;
31063106
31073107    case 0x28:  /* JMP FAR ea */
3108      ICOUNT -= cycles.jmp_m32;
3108      ICOUNT -= timing.jmp_m32;
31093109
31103110#ifdef I80286
31113111      tmp = GetRMWord(ModRM);
r3535r3536
31203120      break;
31213121
31223122    case 0x30:  /* PUSH ea */
3123      ICOUNT -= (ModRM >= 0xc0) ? cycles.push_r16 : cycles.push_m16;
3123      ICOUNT -= (ModRM >= 0xc0) ? timing.push_r16 : timing.push_m16;
31243124      tmp = GetRMWord(ModRM);
31253125      PUSH(tmp);
31263126      break;
src/emu/cpu/i86/i286intf.h
r3535r3536
4343};
4444
4545/* Public functions */
46void i80286_get_info(UINT32 state, cpuinfo *info);
46CPU_GET_INFO( i80286 );
4747
4848#endif /* __I286INTF_H__ */
src/emu/cpu/i86/i188intf.h
r3535r3536
66#include "i186intf.h"
77
88/* Public functions */
9void i80188_get_info(UINT32 state, cpuinfo *info);
9CPU_GET_INFO( i80188 );
1010
1111#endif /* __I186INTF_H__ */
src/emu/cpu/i86/i286.c
r3535r3536
5858      UINT16 limit;
5959      UINT8 rights;
6060   } ldtr, tr;
61    int     (*irq_callback)(int irqline);
61   cpu_irq_callback irq_callback;
62   const device_config *device;
6263    INT32     AuxVal, OverVal, SignVal, ZeroVal, CarryVal, DirVal; /* 0 or non-0 valued flags */
6364    UINT8   ParityVal;
6465   UINT8   TF, IF;    /* 0 or 1 valued flags */
r3535r3536
8283
8384static UINT8 parity_table[256];
8485
85static struct i80x86_timing cycles;
86static struct i80x86_timing timing;
8687
8788/***************************************************************************/
8889
r3535r3536
134135   I.amask = state ? 0x00ffffff : 0x000fffff;
135136}
136137
137static void i80286_reset (void)
138static CPU_RESET( i80286 )
138139{
139140   static int urinit=1;
140141
r3535r3536
166167
167168/* ASG 971222 -- added these interface functions */
168169
169static void i80286_get_context(void *dst)
170static CPU_GET_CONTEXT( i80286 )
170171{
171172   if( dst )
172173      *(i80286_Regs*)dst = I;
173174}
174175
175static void i80286_set_context(void *src)
176static CPU_SET_CONTEXT( i80286 )
176177{
177178   if( src )
178179   {
r3535r3536
211212   }
212213}
213214
214static int i80286_execute(int num_cycles)
215static CPU_EXECUTE( i80286 )
215216{
216217   /* copy over the cycle counts if they're not correct */
217   if (cycles.id != 80286)
218      cycles = i80286_cycles;
218   if (timing.id != 80286)
219      timing = i80286_cycles;
219220
220221   /* adjust for any interrupts that came in */
221   i80286_ICount = num_cycles;
222   i80286_ICount = cycles;
222223   i80286_ICount -= I.extra_cycles;
223224   I.extra_cycles = 0;
224225
r3535r3536
238239   i80286_ICount -= I.extra_cycles;
239240   I.extra_cycles = 0;
240241
241   return num_cycles - i80286_ICount;
242   return cycles - i80286_ICount;
242243}
243244
244245extern int i386_dasm_one(char *buffer, UINT32 eip, const UINT8 *oprom, int mode);
245246
246static offs_t i80286_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
247static CPU_DISASSEMBLE( i80286 )
247248{
248249   return i386_dasm_one(buffer, pc, oprom, 16);
249250}
250251
251static void i80286_init(int index, int clock, const void *config, int (*irqcallback)(int))
252static CPU_INIT( i80286 )
252253{
253254   static const char type[] = "80286";
254255   state_save_register_item_array(type, index, I.regs.w);
r3535r3536
287288   state_save_register_item(type, index, I.extra_cycles);
288289
289290   I.irq_callback = irqcallback;
291   I.device = device;
290292
291293   /* If a reset parameter is given, take it as pointer to an address mask */
292294   if( config )
r3535r3536
305307 * Generic set_info
306308 **************************************************************************/
307309
308static void i80286_set_info(UINT32 state, cpuinfo *info)
310static CPU_SET_INFO( i80286 )
309311{
310312   switch (state)
311313   {
r3535r3536
376378 * Generic get_info
377379 ****************************************************************************/
378380
379void i80286_get_info(UINT32 state, cpuinfo *info)
381CPU_GET_INFO( i80286 )
380382{
381383   switch (state)
382384   {
r3535r3536
436438      case CPUINFO_INT_REGISTER + I80286_TR_LIMIT:   info->i = I.tr.limit;               break;
437439
438440      /* --- the following bits of info are returned as pointers to data or functions --- */
439      case CPUINFO_PTR_SET_INFO:                  info->setinfo = i80286_set_info;      break;
440      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = i80286_get_context;   break;
441      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = i80286_set_context;   break;
442      case CPUINFO_PTR_INIT:                     info->init = i80286_init;            break;
443      case CPUINFO_PTR_RESET:                     info->reset = i80286_reset;            break;
441      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(i80286);      break;
442      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(i80286);   break;
443      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(i80286);   break;
444      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i80286);            break;
445      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(i80286);            break;
444446      case CPUINFO_PTR_EXIT:                     info->exit = NULL;                  break;
445      case CPUINFO_PTR_EXECUTE:                  info->execute = i80286_execute;         break;
447      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(i80286);         break;
446448      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
447      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = i80286_dasm;      break;
449      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i80286);      break;
448450      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &i80286_ICount;         break;
449451
450452      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/i86/i86intf.h
r3535r3536
2727};
2828
2929/* Public functions */
30void i8086_get_info(UINT32 state, cpuinfo *info);
30CPU_GET_INFO( i8086 );
3131
3232#endif /* __I86INTF_H__ */
src/emu/cpu/i86/v20intf.h
r3535r3536
88#include "v30intrf.h"
99
1010/* Public functions */
11void v20_get_info(UINT32 state, cpuinfo *info);
11CPU_GET_INFO( v20 );
1212
1313#endif /* __V20INTF_H__ */
src/emu/cpu/cubeqcpu/cubeqcpu.c
r3535r3536
257257    CONTEXT SWITCHING
258258***************************************************************************/
259259
260static void cquestsnd_get_context(void *dst)
260static CPU_GET_CONTEXT( cquestsnd )
261261{
262262   /* Copy the context */
263263   if (dst)
r3535r3536
265265}
266266
267267
268static void cquestsnd_set_context(void *src)
268static CPU_SET_CONTEXT( cquestsnd )
269269{
270270   /* Copy the context */
271271   if (src)
r3535r3536
273273}
274274
275275
276static void cquestrot_get_context(void *dst)
276static CPU_GET_CONTEXT( cquestrot )
277277{
278278   /* Copy the context */
279279   if (dst)
r3535r3536
281281}
282282
283283
284static void cquestrot_set_context(void *src)
284static CPU_SET_CONTEXT( cquestrot )
285285{
286286   /* Copy the context */
287287   if (src)
r3535r3536
289289}
290290
291291
292static void cquestlin_get_context(void *dst)
292static CPU_GET_CONTEXT( cquestlin )
293293{
294294   /* Copy the context */
295295   if (dst)
r3535r3536
297297}
298298
299299
300static void cquestlin_set_context(void *src)
300static CPU_SET_CONTEXT( cquestlin )
301301{
302302   /* Copy the context */
303303   if (src)
r3535r3536
335335   state_save_register_postload(Machine, cquestsnd_postload, NULL);
336336}
337337
338static void cquestsnd_init(int index, int clock, const void *config, int (*irqcallback)(int))
338static CPU_INIT( cquestsnd )
339339{
340340   cubeqst_snd_config* _config = (cubeqst_snd_config*)config;
341341
r3535r3536
351351}
352352
353353
354static void cquestsnd_reset(void)
354static CPU_RESET( cquestsnd )
355355{
356356   cquestsnd.pc = 0;
357357}
358358
359359
360static void cquestsnd_exit(void)
360static CPU_EXIT( cquestsnd )
361361{
362362   free(cquestsnd.sram);
363363}
r3535r3536
403403   state_save_register_postload(Machine, cquestrot_postload, NULL);
404404}
405405
406static void cquestrot_init(int index, int clock, const void *_config, int (*irqcallback)(int))
406static CPU_INIT( cquestrot )
407407{
408408   memset(&cquestrot, 0, sizeof(cquestrot));
409409
r3535r3536
415415}
416416
417417
418static void cquestrot_reset(void)
418static CPU_RESET( cquestrot )
419419{
420420   cquestrot.pc = 0;
421421   cquestrot.wc = 0;
r3535r3536
424424}
425425
426426
427static void cquestrot_exit(void)
427static CPU_EXIT( cquestrot )
428428{
429429   free(cquestrot.dram);
430430   free(cquestrot.sram);
r3535r3536
479479   state_save_register_postload(Machine, cquestlin_postload, NULL);
480480}
481481
482static void cquestlin_init(int index, int clock, const void *_config, int (*irqcallback)(int))
482static CPU_INIT( cquestlin )
483483{
484484   memset(&cquestlin, 0, sizeof(cquestlin));
485485
r3535r3536
493493}
494494
495495
496static void cquestlin_reset(void)
496static CPU_RESET( cquestlin )
497497{
498498   cquestlin.clkcnt = 0;
499499   cquestlin.pc[FOREGROUND] = 0;
r3535r3536
501501}
502502
503503
504static void cquestlin_exit(void)
504static CPU_EXIT( cquestlin )
505505{
506506   free(cquestlin.sram);
507507   free(cquestlin.e_stack);
r3535r3536
539539   return 0;
540540}
541541
542static int cquestsnd_execute(int cycles)
542static CPU_EXECUTE( cquestsnd )
543543{
544544   int calldebugger = ((Machine->debug_flags & DEBUG_FLAG_ENABLED) != 0);
545545
r3535r3536
747747    SOUND DISASSEMBLY HOOK
748748***************************************************************************/
749749
750static offs_t cquestsnd_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
750static CPU_DISASSEMBLE( cquestsnd )
751751{
752752   static const char *const jmps[] =
753753   {
r3535r3536
873873#define ROT_SRAM_ADDRESS   ((cquestrot.dsrclatch & 2) ? cquestrot.yrlatch : (cquestrot.rsrclatch | 0x700))
874874
875875
876static int cquestrot_execute(int cycles)
876static CPU_EXECUTE( cquestrot )
877877{
878878   int calldebugger = ((Machine->debug_flags & DEBUG_FLAG_ENABLED) != 0);
879879
r3535r3536
12001200    ROTATE DISASSEMBLY HOOK
12011201***************************************************************************/
12021202
1203static offs_t cquestrot_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
1203static CPU_DISASSEMBLE( cquestrot )
12041204{
12051205   static const char *const jmps[] =
12061206   {
r3535r3536
13771377}
13781378
13791379
1380static int cquestlin_execute(int cycles)
1380static CPU_EXECUTE( cquestlin )
13811381{
13821382#define LINE_PC ((cquestlin.pc[prog] & 0x7f) | ((prog == BACKGROUND) ? 0x80 : 0))
13831383
r3535r3536
17581758    LINE DRAWER DISASSEMBLY HOOK
17591759***************************************************************************/
17601760
1761static offs_t cquestlin_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
1761static CPU_DISASSEMBLE( cquestlin )
17621762{
17631763   static const char *const jmps[] =
17641764   {
r3535r3536
18431843 * Sound set_info
18441844 **************************************************************************/
18451845
1846static void cquestsnd_set_info(UINT32 state, cpuinfo *info)
1846static CPU_SET_INFO( cquestsnd )
18471847{
18481848   switch (state)
18491849   {
r3535r3536
18781878 * Sound get_info
18791879 **************************************************************************/
18801880
1881void cquestsnd_get_info(UINT32 state, cpuinfo *info)
1881CPU_GET_INFO( cquestsnd )
18821882{
18831883   switch (state)
18841884   {
r3535r3536
19081908      case CPUINFO_INT_REGISTER + CQUESTSND_ADRCNTR:      info->i = cquestsnd.adrcntr;      break;
19091909
19101910      /* --- the following bits of info are returned as pointers to data or functions --- */
1911      case CPUINFO_PTR_SET_INFO:                  info->setinfo = cquestsnd_set_info;      break;
1912      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = cquestsnd_get_context;break;
1913      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = cquestsnd_set_context;break;
1914      case CPUINFO_PTR_INIT:                     info->init = cquestsnd_init;         break;
1915      case CPUINFO_PTR_RESET:                     info->reset = cquestsnd_reset;         break;
1916      case CPUINFO_PTR_EXIT:                     info->exit = cquestsnd_exit;         break;
1917      case CPUINFO_PTR_EXECUTE:                  info->execute = cquestsnd_execute;      break;
1911      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(cquestsnd);      break;
1912      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(cquestsnd);break;
1913      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(cquestsnd);break;
1914      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(cquestsnd);         break;
1915      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(cquestsnd);         break;
1916      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(cquestsnd);         break;
1917      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(cquestsnd);      break;
19181918      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1919      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = cquestsnd_dasm;      break;
1919      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(cquestsnd);      break;
19201920      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &cquestsnd_icount;      break;
19211921
19221922      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
19561956 * Rotate set_info
19571957 **************************************************************************/
19581958
1959static void cquestrot_set_info(UINT32 state, cpuinfo *info)
1959static CPU_SET_INFO( cquestrot )
19601960{
19611961   switch (state)
19621962   {
r3535r3536
19961996 * Rotate get_info
19971997 **************************************************************************/
19981998
1999void cquestrot_get_info(UINT32 state, cpuinfo *info)
1999CPU_GET_INFO( cquestrot )
20002000{
20012001   switch (state)
20022002   {
r3535r3536
20242024      case CPUINFO_INT_REGISTER + CQUESTROT_PC:      info->i = cquestrot.pc;               break;
20252025
20262026      /* --- the following bits of info are returned as pointers to data or functions --- */
2027      case CPUINFO_PTR_SET_INFO:                  info->setinfo = cquestrot_set_info;      break;
2028      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = cquestrot_get_context;break;
2029      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = cquestrot_set_context;break;
2030      case CPUINFO_PTR_INIT:                     info->init = cquestrot_init;         break;
2031      case CPUINFO_PTR_RESET:                     info->reset = cquestrot_reset;         break;
2032      case CPUINFO_PTR_EXIT:                     info->exit = cquestrot_exit;         break;
2033      case CPUINFO_PTR_EXECUTE:                  info->execute = cquestrot_execute;      break;
2027      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(cquestrot);      break;
2028      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(cquestrot);break;
2029      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(cquestrot);break;
2030      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(cquestrot);         break;
2031      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(cquestrot);         break;
2032      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(cquestrot);         break;
2033      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(cquestrot);      break;
20342034      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
2035      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = cquestrot_dasm;      break;
2035      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(cquestrot);      break;
20362036      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &cquestrot_icount;      break;
20372037
20382038      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
20812081 * Line drawer set_info
20822082 **************************************************************************/
20832083
2084static void cquestlin_set_info(UINT32 state, cpuinfo *info)
2084static CPU_SET_INFO( cquestlin )
20852085{
20862086   switch (state)
20872087   {
r3535r3536
21142114 * Line drawer get_info
21152115 **************************************************************************/
21162116
2117void cquestlin_get_info(UINT32 state, cpuinfo *info)
2117CPU_GET_INFO( cquestlin )
21182118{
21192119   switch (state)
21202120   {
r3535r3536
21422142      case CPUINFO_INT_REGISTER + CQUESTLIN_FGPC:      info->i = cquestlin.pc[cquestlin.clkcnt & 3 ? BACKGROUND : FOREGROUND];   break;
21432143
21442144      /* --- the following bits of info are returned as pointers to data or functions --- */
2145      case CPUINFO_PTR_SET_INFO:                  info->setinfo = cquestlin_set_info;      break;
2146      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = cquestlin_get_context;break;
2147      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = cquestlin_set_context;break;
2148      case CPUINFO_PTR_INIT:                     info->init = cquestlin_init;         break;
2149      case CPUINFO_PTR_RESET:                     info->reset = cquestlin_reset;         break;
2150      case CPUINFO_PTR_EXIT:                     info->exit = cquestlin_exit;         break;
2151      case CPUINFO_PTR_EXECUTE:                  info->execute = cquestlin_execute;      break;
2145      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(cquestlin);      break;
2146      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(cquestlin);break;
2147      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(cquestlin);break;
2148      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(cquestlin);         break;
2149      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(cquestlin);         break;
2150      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(cquestlin);         break;
2151      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(cquestlin);      break;
21522152      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
2153      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = cquestlin_dasm;      break;
2153      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(cquestlin);      break;
21542154      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &cquestlin_icount;      break;
21552155
21562156      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/upd7810/7810dasm.c
r3535r3536
54425442   return idx | flags | DASMFLAG_SUPPORTED;
54435443}
54445444
5445offs_t upd7810_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram )
5445CPU_DISASSEMBLE( upd7810 )
54465446{
54475447   return Dasm( buffer, pc, dasmXX_7810, oprom, opram, 1 );
54485448}
54495449
5450offs_t upd7807_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram )
5450CPU_DISASSEMBLE( upd7807 )
54515451{
54525452   return Dasm( buffer, pc, dasmXX_7807, oprom, opram, 1 );
54535453}
54545454
5455offs_t upd7801_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram ) {
5455CPU_DISASSEMBLE( upd7801 )
5456{
54565457   return Dasm( buffer, pc, dasmXX_7801, oprom, opram, 0 );
54575458}
54585459
5459offs_t upd78c05_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram ) {
5460CPU_DISASSEMBLE( upd78c05 )
5461{
54605462   return Dasm( buffer, pc, dasmXX_78c05, oprom, opram, 0 );
54615463}
54625464
src/emu/cpu/upd7810/upd7810.c
r3535r3536
835835   {
836836      /* acknowledge external IRQ */
837837      if (irqline)
838         (*upd7810.irq_callback)(irqline);
838         (*upd7810.irq_callback)(upd7810.device, irqline);
839839      SP--;
840840      WM( SP, PSW );
841841      SP--;
r3535r3536
15301530   }
15311531}
15321532
1533static void upd7810_init(int index, int clock, const void *config, int (*irqcallback)(int))
1533static CPU_INIT( upd7810 )
15341534{
15351535   upd7810.config = *(const UPD7810_CONFIG*) config;
15361536   upd7810.irq_callback = irqcallback;
1537   upd7810.device = device;
15371538
15381539   state_save_register_item("upd7810", index, upd7810.ppc.w.l);
15391540   state_save_register_item("upd7810", index, upd7810.pc.w.l);
r3535r3536
16021603#include "7810tbl.c"
16031604#include "7810ops.c"
16041605
1605static void upd7810_reset (void)
1606static CPU_RESET( upd7810 )
16061607{
16071608   UPD7810_CONFIG save_config;
1608   int (*save_irqcallback)(int);
1609   cpu_irq_callback save_irqcallback;
1610   const device_config *save_device;
16091611
16101612   save_config = upd7810.config;
16111613   save_irqcallback = upd7810.irq_callback;
1614   save_device = upd7810.device;
16121615   memset(&upd7810, 0, sizeof(upd7810));
16131616   upd7810.config = save_config;
16141617   upd7810.irq_callback = save_irqcallback;
1618   upd7810.device = save_device;
16151619
16161620   upd7810.opXX = opXX_7810;
16171621   upd7810.op48 = op48;
r3535r3536
16431647   upd7810.handle_timers = upd7810_timers;
16441648}
16451649
1646static void upd7807_reset (void)
1650static CPU_RESET( upd7807 )
16471651{
1648   upd7810_reset();
1652   CPU_RESET_CALL(upd7810);
16491653   upd7810.opXX = opXX_7807;
16501654}
16511655
1652static void upd7801_reset( void ) {
1653   upd7810_reset();
1656static CPU_RESET( upd7801 )
1657{
1658   CPU_RESET_CALL(upd7810);
16541659   upd7810.op48 = op48_7801;
16551660   upd7810.op4C = op4C_7801;
16561661   upd7810.op4D = op4D_7801;
r3535r3536
16611666   upd7810.opXX = opXX_7801;
16621667}
16631668
1664static void upd78c05_reset( void ) {
1665   upd7810_reset();
1669static CPU_RESET( upd78c05 )
1670{
1671   CPU_RESET_CALL(upd7810);
16661672   upd7810.op48 = op48_78c05;
16671673   upd7810.op4C = op4C_78c05;
16681674   upd7810.op4D = op4D_78c05;
r3535r3536
16791685   upd7810.ovc0 = ( ( TMM & 0x04 ) ? 16 * 8 : 8 ) * TM0;
16801686}
16811687
1682static void upd78c06_reset( void ) {
1683   upd78c05_reset();
1688static CPU_RESET( upd78c06 )
1689{
1690   CPU_RESET_CALL(upd7810);
16841691   upd7810.op48 = op48_78c06;
16851692   upd7810.op4C = op4C_78c06;
16861693   upd7810.op4D = op4D_78c06;
r3535r3536
16911698   upd7810.opXX = opXX_78c06;
16921699}
16931700
1694static void upd7810_exit (void)
1701static CPU_EXIT( upd7810 )
16951702{
16961703}
16971704
1698static int upd7810_execute (int cycles)
1705static CPU_EXECUTE( upd7810 )
16991706{
17001707   upd7810_icount = cycles;
17011708
r3535r3536
17781785   return cycles - upd7810_icount;
17791786}
17801787
1781static void upd7810_get_context (void *dst)
1788static CPU_GET_CONTEXT( upd7810 )
17821789{
17831790   if (dst)
17841791      memcpy(dst, &upd7810, sizeof(upd7810));
17851792}
17861793
1787static void upd7810_set_context (void *src)
1794static CPU_SET_CONTEXT( upd7810 )
17881795{
17891796   if (src)
17901797      memcpy(&upd7810, src, sizeof(upd7810));
r3535r3536
18331840 * Generic set_info
18341841 **************************************************************************/
18351842
1836static void upd7810_set_info(UINT32 state, cpuinfo *info)
1843static CPU_SET_INFO( upd7810 )
18371844{
18381845   switch (state)
18391846   {
r3535r3536
19061913 * Generic get_info
19071914 **************************************************************************/
19081915
1909void upd7810_get_info(UINT32 state, cpuinfo *info)
1916CPU_GET_INFO( upd7810 )
19101917{
19111918   switch (state)
19121919   {
r3535r3536
19932000      case CPUINFO_INT_REGISTER + UPD7810_CO1:      info->i = CO1;                     break;
19942001
19952002      /* --- the following bits of info are returned as pointers to data or functions --- */
1996      case CPUINFO_PTR_SET_INFO:                  info->setinfo = upd7810_set_info;      break;
1997      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = upd7810_get_context;   break;
1998      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = upd7810_set_context;   break;
1999      case CPUINFO_PTR_INIT:                     info->init = upd7810_init;            break;
2000      case CPUINFO_PTR_RESET:                     info->reset = upd7810_reset;         break;
2001      case CPUINFO_PTR_EXIT:                     info->exit = upd7810_exit;            break;
2002      case CPUINFO_PTR_EXECUTE:                  info->execute = upd7810_execute;      break;
2003      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(upd7810);      break;
2004      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(upd7810);   break;
2005      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(upd7810);   break;
2006      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(upd7810);            break;
2007      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(upd7810);         break;
2008      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(upd7810);            break;
2009      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(upd7810);      break;
20032010      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
2004      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = upd7810_dasm;      break;
2011      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(upd7810);      break;
20052012      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &upd7810_icount;         break;
20062013
20072014      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
20812088 * CPU-specific set_info
20822089 **************************************************************************/
20832090
2084void upd7807_get_info(UINT32 state, cpuinfo *info)
2091CPU_GET_INFO( upd7807 )
20852092{
20862093   switch (state)
20872094   {
20882095      /* --- the following bits of info are returned as pointers to data or functions --- */
2089      case CPUINFO_PTR_RESET:                     info->reset = upd7807_reset;         break;
2090      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = upd7807_dasm;      break;
2096      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(upd7807);         break;
2097      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(upd7807);      break;
20912098
20922099      /* --- the following bits of info are returned as NULL-terminated strings --- */
20932100      case CPUINFO_STR_NAME:                     strcpy(info->s, "uPD7807");            break;
20942101
2095      default:                              upd7810_get_info(state, info);         break;
2102      default:                              CPU_GET_INFO_CALL(upd7810);            break;
20962103   }
20972104}
20982105
2099void upd7801_get_info(UINT32 state, cpuinfo *info) {
2106CPU_GET_INFO( upd7801 ) {
21002107   switch( state ) {
2101      case CPUINFO_PTR_RESET:                     info->reset = upd7801_reset;         break;
2102      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = upd7801_dasm;      break;
2108      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(upd7801);         break;
2109      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(upd7801);      break;
21032110
21042111      case CPUINFO_STR_NAME:                     strcpy(info->s, "uPD7801");            break;
21052112
2106      default:                              upd7810_get_info(state, info);         break;
2113      default:                              CPU_GET_INFO_CALL(upd7810);            break;
21072114   }
21082115}
21092116
2110void upd78c05_get_info(UINT32 state, cpuinfo *info ) {
2117CPU_GET_INFO( upd78c05 ) {
21112118   switch ( state ) {
21122119      case CPUINFO_INT_CLOCK_DIVIDER:               info->i = 4;                     break;
21132120
2114      case CPUINFO_PTR_RESET:                     info->reset = upd78c05_reset;         break;
2115      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = upd78c05_dasm;      break;
2121      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(upd78c05);         break;
2122      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(upd78c05);      break;
21162123
21172124      case CPUINFO_STR_NAME:                     strcpy(info->s, "uPD78C05");         break;
21182125
r3535r3536
21502157      case CPUINFO_STR_REGISTER + UPD7810_CO0:
21512158      case CPUINFO_STR_REGISTER + UPD7810_CO1:      break;
21522159
2153      default:                              upd7801_get_info(state, info);         break;
2160      default:                              CPU_GET_INFO_CALL(upd7801);            break;
21542161   }
21552162}
21562163
2157void upd78c06_get_info(UINT32 state, cpuinfo *info ) {
2164CPU_GET_INFO( upd78c06 ) {
21582165   switch ( state ) {
2159      case CPUINFO_PTR_RESET:                     info->reset = upd78c06_reset;         break;
2166      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(upd78c06);         break;
21602167
21612168      case CPUINFO_STR_NAME:                     strcpy(info->s, "uPD78C06");         break;
21622169
2163      default:                              upd78c05_get_info(state, info);         break;
2170      default:                              CPU_GET_INFO_CALL(upd78c05);            break;
21642171   }
21652172}
src/emu/cpu/upd7810/upd7810.h
r3535r3536
7171#define UPD7810_INTF2      1
7272#define UPD7810_INTFE1      4
7373
74void upd7810_get_info(UINT32 state, cpuinfo *info);
75void upd7807_get_info(UINT32 state, cpuinfo *info);
76void upd7801_get_info(UINT32 state, cpuinfo *info);
77void upd78c05_get_info(UINT32 state, cpuinfo *info);
78void upd78c06_get_info(UINT32 state, cpuinfo *info);
74CPU_GET_INFO( upd7810 );
75CPU_GET_INFO( upd7807 );
76CPU_GET_INFO( upd7801 );
77CPU_GET_INFO( upd78c05 );
78CPU_GET_INFO( upd78c06 );
7979
8080typedef struct {
8181   PAIR   ppc;   /* previous program counter */
r3535r3536
163163   const struct opcode_s *op74;
164164   void (*handle_timers)(int cycles);
165165   UPD7810_CONFIG config;
166   int (*irq_callback)(int irqline);
166   cpu_irq_callback irq_callback;
167   const device_config *device;
167168}   UPD7810;
168169
169offs_t upd7810_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
170offs_t upd7807_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
171offs_t upd7801_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
172offs_t upd78c05_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
170CPU_DISASSEMBLE( upd7810 );
171CPU_DISASSEMBLE( upd7807 );
172CPU_DISASSEMBLE( upd7801 );
173CPU_DISASSEMBLE( upd78c05 );
173174
174175#endif /* __UPD7810_H__ */
src/emu/cpu/sc61860/sc61860.h
r3535r3536
5151    void (*outc)(int);
5252};
5353
54unsigned sc61860_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
54CPU_DISASSEMBLE( sc61860 );
5555
5656/* this is though for power on/off of the sharps */
5757UINT8 *sc61860_internal_ram(void);
5858
59void sc61860_get_info(UINT32 state, cpuinfo *info);
59CPU_GET_INFO( sc61860 );
6060
6161#endif /* __SC61860_H__ */
src/emu/cpu/sc61860/sc61860.c
r3535r3536
7777#include "scops.c"
7878#include "sctable.c"
7979
80static void sc61860_reset(void)
80static CPU_RESET( sc61860 )
8181{
8282   sc61860.timer.t2ms=0;
8383   sc61860.timer.t512ms=0;
r3535r3536
8686   change_pc(sc61860.pc);
8787}
8888
89static void sc61860_init(int index, int clock, const void *config, int (*irqcallback)(int))
89static CPU_INIT( sc61860 )
9090{
9191   sc61860.config = (sc61860_cpu_core *) config;
9292   timer_pulse(ATTOTIME_IN_HZ(500), NULL, 0, sc61860_2ms_tick);
9393}
9494
95static void sc61860_get_context (void *dst)
95static CPU_GET_CONTEXT( sc61860 )
9696{
9797   if( dst )
9898      *(SC61860_Regs*)dst = sc61860;
9999}
100100
101static void sc61860_set_context (void *src)
101static CPU_SET_CONTEXT( sc61860 )
102102{
103103   if( src )
104104   {
r3535r3536
107107   }
108108}
109109
110static int sc61860_execute(int cycles)
110static CPU_EXECUTE( sc61860 )
111111{
112112   sc61860_ICount = cycles;
113113
r3535r3536
145145 * Generic set_info
146146 **************************************************************************/
147147
148static void sc61860_set_info(UINT32 state, cpuinfo *info)
148static CPU_SET_INFO( sc61860 )
149149{
150150   switch (state)
151151   {
r3535r3536
168168 * Generic get_info
169169 **************************************************************************/
170170
171void sc61860_get_info(UINT32 state, cpuinfo *info)
171CPU_GET_INFO( sc61860 )
172172{
173173   switch (state)
174174   {
r3535r3536
207207      case CPUINFO_INT_REGISTER + SC61860_ZERO:         info->i =  sc61860.zero;               break;
208208
209209      /* --- the following bits of info are returned as pointers to data or functions --- */
210      case CPUINFO_PTR_SET_INFO:                  info->setinfo = sc61860_set_info;            break;
211      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = sc61860_get_context;         break;
212      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = sc61860_set_context;         break;
213      case CPUINFO_PTR_INIT:                     info->init = sc61860_init;                  break;
214      case CPUINFO_PTR_RESET:                     info->reset = sc61860_reset;               break;
215      case CPUINFO_PTR_EXECUTE:                  info->execute = sc61860_execute;            break;
210      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(sc61860);            break;
211      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(sc61860);         break;
212      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(sc61860);         break;
213      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(sc61860);                  break;
214      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(sc61860);               break;
215      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(sc61860);            break;
216216      case CPUINFO_PTR_BURN:                     info->burn = NULL;                        break;
217      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = sc61860_dasm;            break;
217      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(sc61860);            break;
218218      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &sc61860_ICount;               break;
219219
220220      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/sc61860/scdasm.c
r3535r3536
163163   { 0 }, { 0 }, { 0 }, { 0 },  { 0 }, { 0 }, { 0 }, { 0 },
164164};
165165
166unsigned sc61860_dasm(char *dst, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
166CPU_DISASSEMBLE( sc61860 )
167167{
168168   const UINT8 *base_oprom = oprom;
169169   int oper=*(oprom++);
r3535r3536
172172
173173   switch(oper&0xc0) {
174174   case 0x80:
175      sprintf(dst,"%-6s%.2x",table[oper&0x80].mnemonic, oper&0x3f);
175      sprintf(buffer,"%-6s%.2x",table[oper&0x80].mnemonic, oper&0x3f);
176176      break;
177177   default:
178178      switch(oper&0xe0) {
179179      case 0xe0:
180         sprintf(dst,"%-6s%.4x",table[oper&0xe0].mnemonic,
180         sprintf(buffer,"%-6s%.4x",table[oper&0xe0].mnemonic,
181181               *(oprom++)|((oper&0x1f)<<8));
182182         break;
183183      default:
184184         switch (table[oper].adr) {
185         case Ill: sprintf(dst,"?%.2x",oper);break;
186         case Imp: sprintf(dst,"%s",table[oper].mnemonic); break;
187         case Imm: sprintf(dst,"%-6s%.2x",table[oper].mnemonic, *(oprom++)); break;
185         case Ill: sprintf(buffer,"?%.2x",oper);break;
186         case Imp: sprintf(buffer,"%s",table[oper].mnemonic); break;
187         case Imm: sprintf(buffer,"%-6s%.2x",table[oper].mnemonic, *(oprom++)); break;
188188         case ImmW:
189189            adr=(oprom[0]<<8)|oprom[1];oprom+=2;
190            sprintf(dst,"%-6s%.4x",table[oper].mnemonic, adr);
190            sprintf(buffer,"%-6s%.4x",table[oper].mnemonic, adr);
191191            break;
192192         case Abs:
193193            adr=(oprom[0]<<8)|oprom[1];oprom+=2;
194            sprintf(dst,"%-6s%.4x",table[oper].mnemonic, adr);
194            sprintf(buffer,"%-6s%.4x",table[oper].mnemonic, adr);
195195            break;
196196         case RelM:
197197            adr=pc-*(oprom++);
198            sprintf(dst,"%-6s%.4x",table[oper].mnemonic, adr&0xffff);
198            sprintf(buffer,"%-6s%.4x",table[oper].mnemonic, adr&0xffff);
199199            break;
200200         case RelP:
201201            adr=pc+*(oprom++);
202            sprintf(dst,"%-6s%.4x",table[oper].mnemonic, adr&0xffff);
202            sprintf(buffer,"%-6s%.4x",table[oper].mnemonic, adr&0xffff);
203203            break;
204204         case Ptc:
205205            t=*(oprom++);
206206            adr=(oprom[0]<<8)|oprom[1];oprom+=2;
207            sprintf(dst,"%-6s%.2x,%.4x",table[oper].mnemonic,t, adr);
207            sprintf(buffer,"%-6s%.2x,%.4x",table[oper].mnemonic,t, adr);
208208            break;
209209         case Etc:
210            sprintf(dst,"%-6s",table[oper].mnemonic);
210            sprintf(buffer,"%-6s",table[oper].mnemonic);
211211            /*H imm, abs */
212212            /* abs */
213213            break;
src/emu/cpu/minx/minxd.c
r3535r3536
417417case OP:    dst += sprintf( dst, "%c$%02X", fill, op ); break;      \
418418case OP1:   dst += sprintf( dst, "%c$%02X", fill, op1 ); break;
419419
420unsigned minx_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram ) {
420CPU_DISASSEMBLE( minx )
421{
421422   const minxdasm *instr;
422423   UINT8 op, op1;
423424   INT8  ofs8 = 0;
src/emu/cpu/minx/minx.h
r3535r3536
1515        MINX_XI, MINX_YI,
1616};
1717
18extern unsigned minx_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram );
18extern CPU_DISASSEMBLE( minx );
1919
2020#endif /* __MINX_H__ */
src/emu/cpu/minx/minx.c
r3535r3536
8383   UINT8   YI;
8484   UINT8   halted;
8585   UINT8   interrupt_pending;
86   int      (*irq_callback)(int irqline);
86   cpu_irq_callback irq_callback;
87   const device_config *device;
8788} minx_regs;
8889
8990static minx_regs regs;
r3535r3536
107108}
108109
109110
110static void minx_init(int index, int clock, const void *config, int (*irqcallback)(int))
111static CPU_INIT( minx )
111112{
112113   regs.irq_callback = irqcallback;
114   regs.device = device;
113115   if ( config != NULL )
114116   {
115117   }
r3535r3536
119121}
120122
121123
122static void minx_reset( void )
124static CPU_RESET( minx )
123125{
124126   regs.SP = regs.BA = regs.HL = regs.X = regs.Y = 0;
125127   regs.U = regs.V = regs.F = regs.E = regs.I = regs.XI = regs.YI = 0;
r3535r3536
130132}
131133
132134
133static void minx_exit( void )
135static CPU_EXIT( minx )
134136{
135137}
136138
r3535r3536
157159#include "minxops.h"
158160
159161
160static int minx_execute( int cycles )
162static CPU_EXECUTE( minx )
161163{
162164   UINT32   oldpc;
163165   UINT8   op;
r3535r3536
182184            /* Set Interrupt Branch flag */
183185            regs.F |= 0x80;
184186            regs.V = 0;
185            regs.PC = rd16( regs.irq_callback( 0 ) << 1 );
187            regs.PC = rd16( regs.irq_callback( regs.device, 0 ) << 1 );
186188            minx_icount -= 28;      /* This cycle count is a guess */
187189         }
188190      }
r3535r3536
202204}
203205
204206
205static void minx_burn( int cycles )
207static CPU_BURN( minx )
206208{
207209   minx_icount = 0;
208210}
209211
210212
211static void minx_set_context( void *src )
213static CPU_SET_CONTEXT( minx )
212214{
213215}
214216
215217
216static void minx_get_context( void *dst )
218static CPU_GET_CONTEXT( minx )
217219{
218220}
219221
r3535r3536
280282}
281283
282284
283static void minx_set_info( UINT32 state, cpuinfo *info )
285static CPU_SET_INFO( minx )
284286{
285287   switch( state )
286288   {
r3535r3536
306308}
307309
308310
309void minx_get_info( UINT32 state, cpuinfo *info )
311CPU_GET_INFO( minx )
310312{
311313   switch( state )
312314   {
r3535r3536
347349   case CPUINFO_INT_REGISTER + MINX_XI:
348350   case CPUINFO_INT_REGISTER + MINX_YI:                  info->i = minx_get_reg( state - CPUINFO_INT_REGISTER ); break;
349351   case CPUINFO_INT_PREVIOUSPC:                        info->i = 0x0000; break;
350   case CPUINFO_PTR_SET_INFO:                           info->setinfo = minx_set_info; break;
351   case CPUINFO_PTR_GET_CONTEXT:                        info->getcontext = minx_get_context; break;
352   case CPUINFO_PTR_SET_CONTEXT:                        info->setcontext = minx_set_context; break;
353   case CPUINFO_PTR_INIT:                              info->init = minx_init; break;
354   case CPUINFO_PTR_RESET:                              info->reset = minx_reset; break;
355   case CPUINFO_PTR_EXIT:                              info->exit = minx_exit; break;
356   case CPUINFO_PTR_EXECUTE:                           info->execute = minx_execute; break;
357   case CPUINFO_PTR_BURN:                              info->burn = minx_burn; break;
358   case CPUINFO_PTR_DISASSEMBLE:                        info->disassemble = minx_dasm; break;
352   case CPUINFO_PTR_SET_INFO:                           info->setinfo = CPU_SET_INFO_NAME(minx); break;
353   case CPUINFO_PTR_GET_CONTEXT:                        info->getcontext = CPU_GET_CONTEXT_NAME(minx); break;
354   case CPUINFO_PTR_SET_CONTEXT:                        info->setcontext = CPU_SET_CONTEXT_NAME(minx); break;
355   case CPUINFO_PTR_INIT:                              info->init = CPU_INIT_NAME(minx); break;
356   case CPUINFO_PTR_RESET:                              info->reset = CPU_RESET_NAME(minx); break;
357   case CPUINFO_PTR_EXIT:                              info->exit = CPU_EXIT_NAME(minx); break;
358   case CPUINFO_PTR_EXECUTE:                           info->execute = CPU_EXECUTE_NAME(minx); break;
359   case CPUINFO_PTR_BURN:                              info->burn = CPU_BURN_NAME(minx); break;
360   case CPUINFO_PTR_DISASSEMBLE:                        info->disassemble = CPU_DISASSEMBLE_NAME(minx); break;
359361   case CPUINFO_PTR_INSTRUCTION_COUNTER:                  info->icount = &minx_icount; break;
360362   case CPUINFO_STR_NAME:                              strcpy( info->s = cpuintrf_temp_str(), "Minx" ); break;
361363   case CPUINFO_STR_CORE_FAMILY:                        strcpy( info->s = cpuintrf_temp_str(), "Nintendo Minx" ); break;
src/emu/cpu/v60/v60.c
r3535r3536
7474   Flags flags;
7575   UINT8 irq_line;
7676   UINT8 nmi_line;
77   int (*irq_cb)(int irqline);
77   cpu_irq_callback irq_cb;
78   const device_config *device;
7879   UINT32 PPC;
7980} v60;
8081
r3535r3536
294295#include "optable.c"
295296
296297#ifdef UNUSED_FUNCTION
297static int v60_default_irq_cb(int irqline)
298static int v60_default_irq_cb(const device_config *device, int irqline)
298299{
299300   return 0;
300301}
301302#endif
302303
303static void base_init(const char *type, int index, int (*irqcallback)(int))
304static void base_init(const char *type, const device_config *device, int index, cpu_irq_callback irqcallback)
304305{
305306   v60_stall_io = 0;
306307   v60.irq_cb = irqcallback;
308   v60.device = device;
307309   v60.irq_line = CLEAR_LINE;
308310   v60.nmi_line = CLEAR_LINE;
309311
r3535r3536
317319   state_save_register_item(type, index, _Z);
318320}
319321
320static void v60_init(int index, int clock, const void *config, int (*irqcallback)(int))
322static CPU_INIT( v60 )
321323{
322   base_init("v60", index, irqcallback);
324   base_init("v60", device, index, irqcallback);
323325   // Set PIR (Processor ID) for NEC v60. LSB is reserved to NEC,
324326   // so I don't know what it contains.
325327   PIR = 0x00006000;
326328   v60.info = v60_i;
327329}
328330
329static void v70_init(int index, int clock, const void *config, int (*irqcallback)(int))
331static CPU_INIT( v70 )
330332{
331   base_init("v70", index, irqcallback);
333   base_init("v70", device, index, irqcallback);
332334   // Set PIR (Processor ID) for NEC v70. LSB is reserved to NEC,
333335   // so I don't know what it contains.
334336   PIR = 0x00007000;
335337   v60.info = v70_i;
336338}
337339
338static void v60_reset(void)
340static CPU_RESET( v60 )
339341{
340342   PSW      = 0x10000000;
341343   PC      = v60.info.start_pc;
r3535r3536
351353   _Z   = 0;
352354}
353355
354static void v60_exit(void)
356static CPU_EXIT( v60 )
355357{
356358}
357359
r3535r3536
383385      if(v60.irq_line != ASSERT_LINE)
384386         v60.irq_line = CLEAR_LINE;
385387
386      vector = v60.irq_cb(0);
388      vector = v60.irq_cb(v60.device, 0);
387389
388390      v60_do_irq(vector + 0x40);
389391   } else if(v60.irq_line == PULSE_LINE)
r3535r3536
417419
418420// Actual cycles/instruction is unknown
419421
420static int v60_execute(int cycles)
422static CPU_EXECUTE( v60 )
421423{
422424   UINT32 inc;
423425
r3535r3536
437439   return cycles - v60_ICount;
438440}
439441
440static void v60_get_context(void *dst)
442static CPU_GET_CONTEXT( v60 )
441443{
442444   if(dst)
443445      *(struct v60info *)dst = v60;
444446}
445447
446static void v60_set_context(void *src)
448static CPU_SET_CONTEXT( v60 )
447449{
448450   if(src)
449451   {
r3535r3536
453455}
454456
455457
456offs_t v60_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
457offs_t v70_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
458CPU_DISASSEMBLE( v60 );
459CPU_DISASSEMBLE( v70 );
458460
459461
460462/**************************************************************************
461463 * Generic set_info
462464 **************************************************************************/
463465
464static void v60_set_info(UINT32 state, cpuinfo *info)
466static CPU_SET_INFO( v60 )
465467{
466468   switch (state)
467469   {
r3535r3536
539541 * Generic get_info
540542 **************************************************************************/
541543
542void v60_get_info(UINT32 state, cpuinfo *info)
544CPU_GET_INFO( v60 )
543545{
544546   switch (state)
545547   {
r3535r3536
632634      case CPUINFO_INT_REGISTER + V60_ADTMR1:         info->i = ADTMR1;                  break;
633635
634636      /* --- the following bits of info are returned as pointers to data or functions --- */
635      case CPUINFO_PTR_SET_INFO:                  info->setinfo = v60_set_info;         break;
636      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = v60_get_context;      break;
637      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = v60_set_context;      break;
638      case CPUINFO_PTR_INIT:                     info->init = v60_init;               break;
639      case CPUINFO_PTR_RESET:                     info->reset = v60_reset;            break;
640      case CPUINFO_PTR_EXIT:                     info->exit = v60_exit;               break;
641      case CPUINFO_PTR_EXECUTE:                  info->execute = v60_execute;         break;
637      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(v60);         break;
638      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(v60);      break;
639      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(v60);      break;
640      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(v60);               break;
641      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(v60);            break;
642      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(v60);               break;
643      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(v60);         break;
642644      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
643      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = v60_dasm;         break;
645      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(v60);         break;
644646      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &v60_ICount;            break;
645647
646648      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
718720 * CPU-specific set_info
719721 **************************************************************************/
720722
721void v70_get_info(UINT32 state, cpuinfo *info)
723CPU_GET_INFO( v70 )
722724{
723725   switch (state)
724726   {
r3535r3536
728730      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0;               break;
729731
730732      /* --- the following bits of info are returned as pointers to data or functions --- */
731      case CPUINFO_PTR_INIT:                     info->init = v70_init;               break;
732      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = v70_dasm;         break;
733      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(v70);               break;
734      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(v70);         break;
733735
734736      /* --- the following bits of info are returned as NULL-terminated strings --- */
735737      case CPUINFO_STR_NAME:                     strcpy(info->s, "V70");               break;
736738
737      default:                              v60_get_info(state, info);            break;
739      default:                              CPU_GET_INFO_CALL(v60);               break;
738740   }
739741}
src/emu/cpu/v60/v60d.c
r3535r3536
14601460   /* 0xFF */ dopCLRTLB
14611461};
14621462
1463offs_t v60_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
1463CPU_DISASSEMBLE( v60 )
14641464{
14651465   rombase = oprom;
14661466   pcbase = pc;
14671467   return dasm_optable[oprom[0]](pc, pc+1, buffer) | DASMFLAG_SUPPORTED;
14681468}
14691469
1470offs_t v70_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
1470CPU_DISASSEMBLE( v70 )
14711471{
14721472   rombase = oprom;
14731473   pcbase = pc;
src/emu/cpu/v60/v60.h
r3535r3536
8282void v60_stall(void);
8383
8484#if HAS_V60
85void v60_get_info(UINT32 state, cpuinfo *info);
85CPU_GET_INFO( v60 );
8686#endif /* HAS_V60 */
8787
8888#if HAS_V70
89void v70_get_info(UINT32 state, cpuinfo *info);
89CPU_GET_INFO( v70 );
9090#endif /* HAS_V70 */
9191
9292#endif /* __V60_H__ */
src/emu/cpu/dsp56k/dsp56k.h
r3535r3536
7676};
7777typedef enum _parallelMoveType parallelMoveType;
7878
79extern void dsp56k_get_info(UINT32 state, cpuinfo *info);
79extern CPU_GET_INFO( dsp56k );
8080
8181void  dsp56k_host_interface_write(UINT8 offset, UINT8 data);
8282UINT8 dsp56k_host_interface_read(UINT8 offset);
src/emu/cpu/dsp56k/dsp56ops.c
r3535r3536
1818/************************/
1919/* Datatypes and macros */
2020/************************/
21enum addSubOpType { OP_ADD,
22               OP_SUB,
23               OP_OTHER };
24
2125enum dataType { DT_BYTE,
2226            DT_WORD,
2327            DT_DOUBLE_WORD,
r3535r3536
3034};
3135typedef struct _typed_pointer typed_pointer;
3236
33
3437#define WORD(X) (X<<1)
3538#define BITS(CUR,MASK) (Dsp56kOpMask(CUR,MASK))
3639
r3535r3536
3942/*********************/
4043/* Opcode prototypes */
4144/*********************/
42static size_t dsp56k_op_add_2    (const UINT16 op_byte, UINT8* cycles);
43static size_t dsp56k_op_mac_1    (const UINT16 op_byte, UINT8* cycles);
44static size_t dsp56k_op_macr_1    (const UINT16 op_byte, UINT8* cycles);
45static size_t dsp56k_op_move_1    (const UINT16 op_byte, UINT8* cycles);
46static size_t dsp56k_op_mpy_1    (const UINT16 op_byte, UINT8* cycles);
47static size_t dsp56k_op_mpyr_1    (const UINT16 op_byte, UINT8* cycles);
48static size_t dsp56k_op_sub_1    (const UINT16 op_byte, UINT8* cycles);
49static size_t dsp56k_op_tfr_2    (const UINT16 op_byte, UINT8* cycles);
45static size_t dsp56k_op_addsub_2 (const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles);
46static size_t dsp56k_op_mac_1    (const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles);
47static size_t dsp56k_op_macr_1    (const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles);
48static size_t dsp56k_op_move_1    (const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles);
49static size_t dsp56k_op_mpy_1    (const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles);
50static size_t dsp56k_op_mpyr_1    (const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles);
51static size_t dsp56k_op_tfr_2    (const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles);
5052static size_t dsp56k_op_mpy_2    (const UINT16 op_byte, UINT8* cycles);
5153static size_t dsp56k_op_mac_2    (const UINT16 op_byte, UINT8* cycles);
5254static size_t dsp56k_op_clr       (const UINT16 op_byte, typed_pointer* d_register, UINT64* p_accum, UINT8* cycles);
r3535r3536
167169static void execute_address_register_update(const UINT16 op, typed_pointer* d_register, UINT64* prev_accum_value);
168170static void execute_x_memory_data_move (const UINT16 op, typed_pointer* d_register, UINT64* prev_accum_value);
169171static void execute_x_memory_data_move2(const UINT16 op, typed_pointer* d_register);
172static void execute_dual_x_memory_data_read(const UINT16 op, typed_pointer* d_register);
173static void execute_x_memory_data_move_with_short_displacement(const UINT16 op, const UINT16 op2);
170174
171
172175static UINT16   decode_BBB_bitmask(UINT16 BBB, UINT16 *iVal);
173176static int      decode_cccc_table(UINT16 cccc);
174177static void      decode_DDDDD_table(UINT16 DDDDD, typed_pointer* ret);
r3535r3536
177180static void      decode_h0hF_table(UINT16 h0h, UINT16 F, typed_pointer* src_ret, typed_pointer* dst_ret);
178181static void      decode_HH_table(UINT16 HH, typed_pointer* ret);
179182static void      decode_HHH_table(UINT16 HHH, typed_pointer* ret);
180static void      decode_IIII_table(UINT16 IIII, typed_pointer* src_ret, typed_pointer* dst_ret, void *working);
183static void      decode_IIII_table(UINT16 IIII, typed_pointer* src_ret, typed_pointer* dst_ret, void* working);
181184static void      decode_JJJF_table(UINT16 JJJ, UINT16 F, typed_pointer* src_ret, typed_pointer* dst_ret);
182185static void      decode_JJF_table(UINT16 JJ, UINT16 F, typed_pointer* src_ret, typed_pointer* dst_ret);
186static void      decode_KKK_table(UINT16 KKK, typed_pointer* dst_ret1, typed_pointer* dst_ret2, void* working);
187static void      decode_QQF_table(UINT16 QQ, UINT16 F, void **S1, void **S2, void **D);
183188static void      decode_QQF_special_table(UINT16 QQ, UINT16 F, void **S1, void **S2, void **D);
184static void      decode_QQQF_special_table(UINT16 QQQ, UINT16 F, void **S1, void **S2, void **D);
189static void      decode_QQQF_table(UINT16 QQQ, UINT16 F, void **S1, void **S2, void **D);
185190static void      decode_RR_table(UINT16 RR, typed_pointer* ret);
191static void      decode_TT_table(UINT16 TT, typed_pointer* ret);
192static void      decode_uuuuF_table(UINT16 uuuu, UINT16 F, UINT8 add_sub_other, typed_pointer* src_ret, typed_pointer* dst_ret);
186193static void      decode_Z_table(UINT16 Z, typed_pointer* ret);
187194
188195static void      execute_m_table(int x, UINT16 m);
196static void      execute_mm_table(UINT16 rnum, UINT16 mm);
189197static void      execute_MM_table(UINT16 rnum, UINT16 MM);
190198static UINT16   execute_q_table(int RR, UINT16 q);
191199static void      execute_z_table(int RR, UINT16 z);
r3535r3536
233241
234242
235243   /* DECODE */
236   /* Dual X Memory Data Read : 011m mKKK -rr- ---- : A-142*/
244   /* Dual X Memory Data Read : 011m mKKK .rr. .... : A-142*/
237245   if ((op & 0xe000) == 0x6000)
238246   {
247      typed_pointer d_register = {NULL, DT_BYTE};
248
239249      /* Quote: (MOVE, MAC(R), MPY(R), ADD, SUB, TFR) */
240250      UINT16 op_byte = op & 0x00ff;
241251
242252      /* ADD : 011m mKKK 0rru Fuuu : A-22 */
253      /* SUB : 011m mKKK 0rru Fuuu : A-202 */
243254      if ((op & 0xe080) == 0x6000)
244255      {
245         size = dsp56k_op_add_2(op_byte, &cycle_count);
256         size = dsp56k_op_addsub_2(op_byte, &d_register, &cycle_count);
246257      }
247258      /* MAC : 011m mKKK 1xx0 F1QQ : A-122 */
248259      else if ((op & 0xe094) == 0x6084)
249260      {
250         size = dsp56k_op_mac_1(op_byte, &cycle_count);
261         size = dsp56k_op_mac_1(op_byte, &d_register, &cycle_count);
251262      }
252263      /* MACR: 011m mKKK 1--1 F1QQ : A-124 */
253264      else if ((op & 0xe094) == 0x6094)
254265      {
255         size = dsp56k_op_macr_1(op_byte, &cycle_count);
266         size = dsp56k_op_macr_1(op_byte, &d_register, &cycle_count);
256267      }
257268      /* MOVE : 011m mKKK 0rr1 0000 : A-128 */
258269      else if ((op & 0xe09f) == 0x6010)
259270      {
260         size = dsp56k_op_move_1(op_byte, &cycle_count);
271         size = dsp56k_op_move_1(op_byte, &d_register, &cycle_count);
261272      }
262273      /* MPY : 011m mKKK 1xx0 F0QQ : A-160 */
263274      else if ((op & 0xe094) == 0x6080)
264275      {
265         size = dsp56k_op_mpy_1(op_byte, &cycle_count);
276         size = dsp56k_op_mpy_1(op_byte, &d_register, &cycle_count);
266277      }
267278      /* MPYR : 011m mKKK 1--1 F0QQ : A-162 */
268279      else if ((op & 0xe094) == 0x6090)
269280      {
270         size = dsp56k_op_mpyr_1(op_byte, &cycle_count);
281         size = dsp56k_op_mpyr_1(op_byte, &d_register, &cycle_count);
271282      }
272      /* SUB : 011m mKKK 0rru Fuuu : A-202 */
273      else if ((op & 0xe080) == 0x6000)
274      {
275         size = dsp56k_op_sub_1(op_byte, &cycle_count);
276      }
277283      /* TFR : 011m mKKK 0rr1 F0DD : A-212 */
278284      else if ((op & 0xe094) == 0x6010)
279285      {
280         size = dsp56k_op_tfr_2(op_byte, &cycle_count);
286         size = dsp56k_op_tfr_2(op_byte, &d_register, &cycle_count);
281287      }
282288
283289      /* Now evaluate the parallel data move */
284      // TODO // decode_dual_x_memory_data_read(op, parallel_move_str, parallel_move_str2);
285      logerror("DSP56k: Unemulated Dual X Memory Data Move @ 0x%x\n", PC);
290      execute_dual_x_memory_data_read(op, &d_register);
286291   }
287   /* X Memory Data Write and Register Data Move : 0001 011k RRDD ---- : A-140 */
292   /* X Memory Data Write and Register Data Move : 0001 011k RRDD .... : A-140 */
288293   else if ((op & 0xfe00) == 0x1600)
289294   {
290295      /* Quote: (MPY or MAC) */
r3535r3536
326331      UINT64 prev_accum_value = U64(0x0000000000000000);
327332
328333      /* Note: it's important that NPDM comes before RtRDM here */
329      /* No Parallel Data Move : 0100 1010 ---- ---- : A-131 */
334      /* No Parallel Data Move : 0100 1010 .... .... : A-131 */
330335      if ((op & 0xff00) == 0x4a00)
331336      {
332337         op_byte = op & 0x00ff;
333338         parallelType = kNoParallelDataMove;
334339      }
335      /* Register to Register Data Move : 0100 IIII ---- ---- : A-133 */
340      /* Register to Register Data Move : 0100 IIII .... .... : A-133 */
336341      else if ((op & 0xf000) == 0x4000)
337342      {
338343         op_byte = op & 0x00ff;
339344         parallelType = kRegisterToRegister;
340345      }
341      /* Address Register Update : 0011 0zRR ---- ---- : A-135 */
346      /* Address Register Update : 0011 0zRR .... .... : A-135 */
342347      else if ((op & 0xf800) == 0x3000)
343348      {
344349         op_byte = op & 0x00ff;
345350         parallelType = kAddressRegister;
346351      }
347      /* X Memory Data Move : 1mRR HHHW ---- ---- : A-137 */
352      /* X Memory Data Move : 1mRR HHHW .... .... : A-137 */
348353      else if ((op & 0x8000) == 0x8000)
349354      {
350355         op_byte = op & 0x00ff;
351356         parallelType = kXMemoryDataMove;
352357      }
353      /* X Memory Data Move : 0101 HHHW ---- ---- : A-137 */
358      /* X Memory Data Move : 0101 HHHW .... .... : A-137 */
354359      else if ((op & 0xf000) == 0x5000)
355360      {
356361         op_byte = op & 0x00ff;
357362         parallelType = kXMemoryDataMove2;
358363      }
359      /* X Memory Data Move with short displacement : 0000 0101 BBBB BBBB ---- HHHW ---- ---- : A-139 */
364      /* X Memory Data Move with short displacement : 0000 0101 BBBB BBBB ---- HHHW .... .... : A-139 */
360365      else if ((op & 0xff00) == 0x0500)
361366      {
362         /* See notes at top of file! */
363         /* op_byte = op2 & 0x00ff; */
364         /* parallelType = kXMemoryDataMoveWithDisp; */
365         /* DO NOTHING FOR NOW */
367         /* Now check it against all the other potential collisions */
368         /* This is necessary because "don't care bits" get in the way. */
369         /*
370            MOVE(M) :   0000 0101 BBBB BBBB 0000 001W --0- -HHH : A-152
371            MOVE(C) :   0000 0101 BBBB BBBB 0011 1WDD DDD0 ---- : A-144
372            MOVE :      0000 0101 BBBB BBBB ---- HHHW 0001 0001 : A-128
373            */
374         if (((op2 & 0xfe20) != 0x0200) &&
375            ((op2 & 0xf810) != 0x3800) &&
376            ((op2 & 0x00ff) != 0x0011))
377         {
378            op_byte = op2 & 0x00ff;
379            parallelType = kXMemoryDataMoveWithDisp;
380         }
366381      }
367382
368383
r3535r3536
568583            execute_x_memory_data_move2(op, &d_register);
569584            break;
570585         case kXMemoryDataMoveWithDisp:
571            // TODO // decode_x_memory_data_move_with_short_displacement(op, op2, parallel_move_str);
572            logerror("DSP56k: Unemulated Memory Data Move With Disp Parallel move @ 0x%x\n", PC);
586            execute_x_memory_data_move_with_short_displacement(op, op2);
587            size = 2;
573588            break;
574589         }
575590      }
r3535r3536
10861101/*******************************/
10871102
10881103/* ADD : 011m mKKK 0rru Fuuu : A-22 */
1089static size_t dsp56k_op_add_2(const UINT16 op_byte, UINT8* cycles)
1104/* SUB : 011m mKKK 0rru Fuuu : A-202 */
1105static size_t dsp56k_op_addsub_2(const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles)
10901106{
1107   UINT64 useVal = 0;
1108   UINT8 op_type = OP_OTHER;
1109   typed_pointer S = {NULL, DT_BYTE};
1110   typed_pointer D = {NULL, DT_BYTE};
1111
1112   decode_uuuuF_table(BITS(op_byte,0x0017), BITS(op_byte,0x0008), op_type, &S, &D);
1113
1114   /* If you gave an invalid operation type, presume it's a nop and move on with the parallel move */
1115   if (op_type == OP_OTHER)
1116   {
1117      d_register->addr = NULL;
1118      d_register->data_type = DT_BYTE;
1119      cycles += 2;
1120      return 1;
1121   }
1122
1123   /* It's a real operation.  Get on with it. */
1124   switch(S.data_type)
1125   {
1126      case DT_WORD:        useVal = (UINT64)*((UINT16*)S.addr) << 16; break;
1127      case DT_DOUBLE_WORD: useVal = (UINT64)*((UINT32*)S.addr);       break;
1128      case DT_LONG_WORD:   useVal = (UINT64)*((UINT64*)S.addr);       break;
1129   }
1130
1131   /* TODO: Verify : Sign-extend everyone for proper add/sub op */
1132   if (useVal &  U64(0x0000000080000000))
1133      useVal |= U64(0xffffffff00000000);
1134
1135   /* Operate*/
1136   if (op_type == OP_ADD)
1137      *((UINT64*)D.addr) += useVal;
1138   else if (op_type == OP_SUB)
1139      *((UINT64*)D.addr) -= useVal;
1140
1141   d_register->addr = D.addr;
1142   d_register->data_type = D.data_type;
1143
10911144   /* S L E U N Z V C */
10921145   /* * * * * * * * * */
1093   return 0;
1146   /* TODO S, L, E, U, V, C */
1147   if (*((UINT64*)D.addr) & U64(0x0000008000000000)) N_bit_set(1);
1148   if (*((UINT64*)D.addr) == 0) Z_bit_set(1);
1149
1150   cycles += 2;      /* TODO: + mv oscillator cycles */
1151   return 1;
10941152}
10951153
10961154/* MAC : 011m mKKK 1xx0 F1QQ : A-122 */
1097static size_t dsp56k_op_mac_1(const UINT16 op_byte, UINT8* cycles)
1155static size_t dsp56k_op_mac_1(const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles)
10981156{
1157   INT64 opD = 0;
1158   INT64 result = 0;
1159
1160   INT32 s1 = 0;
1161   INT32 s2 = 0;
1162
1163   void* D = NULL;
1164   void* S1 = NULL;
1165   void* S2 = NULL;
1166
1167   decode_QQF_table(BITS(op_byte,0x0003), BITS(op_byte,0x0008), &S1, &S2, &D);
1168
1169   /* Cast both values as being signed */
1170   s1 = *((INT16*)S1);
1171   s2 = *((INT16*)S2);
1172
1173   /* Fixed-point 2's complement multiplication requires a shift */
1174   result = (s1 * s2) << 1;
1175
1176   /* Sign extend D into a temp variable */
1177   opD = (*((UINT64*)D));
1178   if (opD & U64(0x0000008000000000))
1179      opD |= U64(0xffffff0000000000);
1180   else
1181      opD &= U64(0x000000ffffffffff);
1182
1183   /* Accumulate */
1184   opD += result;
1185
1186   /* And out the bits that don't live in the register */
1187   opD &= U64(0x000000ffffffffff);
1188
1189   (*((UINT64*)D)) = (UINT64)opD;
1190
1191   /* For the parallel move */
1192   d_register->addr = D;
1193   d_register->data_type = DT_LONG_WORD;
1194
10991195   /* S L E U N Z V C */
11001196   /* * * * * * * * - */
1101   return 0;
1197   /* TODO: S, L, E, V */
1198   if ( *((UINT64*)D) & U64(0x0000008000000000))      N_bit_set(1);
1199   if ((*((UINT64*)D) & U64(0x000000ffffffffff)) == 0) Z_bit_set(1);
1200
1201   cycles += 2;      /* TODO: +mv oscillator cycles */
1202   return 1;
11021203}
11031204
11041205/* MACR: 011m mKKK 1--1 F1QQ : A-124 */
1105static size_t dsp56k_op_macr_1(const UINT16 op_byte, UINT8* cycles)
1206static size_t dsp56k_op_macr_1(const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles)
11061207{
11071208   /* S L E U N Z V C */
11081209   /* * * * * * * * - */
r3535r3536
11101211}
11111212
11121213/* MOVE : 011m mKKK 0rr1 0000 : A-128 */
1113static size_t dsp56k_op_move_1(const UINT16 op_byte, UINT8* cycles)
1214static size_t dsp56k_op_move_1(const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles)
11141215{
11151216   /* S L E U N Z V C */
11161217   /* * * - - - - - - */
r3535r3536
11181219}
11191220
11201221/* MPY : 011m mKKK 1xx0 F0QQ : A-160 */
1121static size_t dsp56k_op_mpy_1(const UINT16 op_byte, UINT8* cycles)
1222static size_t dsp56k_op_mpy_1(const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles)
11221223{
1224   INT64 result = 0;
1225
1226   INT32 s1 = 0;
1227   INT32 s2 = 0;
1228
1229   void* D = NULL;
1230   void* S1 = NULL;
1231   void* S2 = NULL;
1232
1233   decode_QQF_table(BITS(op_byte,0x0003), BITS(op_byte,0x0008), &S1, &S2, &D);
1234
1235   /* Cast both values as being signed */
1236   s1 = *((INT16*)S1);
1237   s2 = *((INT16*)S2);
1238
1239   /* Fixed-point 2's complement multiplication requires a shift */
1240   result = (s1 * s2) << 1;
1241
1242   /* And out the bits that don't live in the register */
1243   (*((UINT64*)D)) = result & U64(0x000000ffffffffff);
1244
1245   /* For the parallel move */
1246   d_register->addr = D;
1247   d_register->data_type = DT_LONG_WORD;
1248
11231249   /* S L E U N Z V C */
11241250   /* * * * * * * * - */
1125   return 0;
1251   /* TODO: S, L, E, V */
1252   if ( *((UINT64*)D) & U64(0x0000008000000000))      N_bit_set(1);
1253   if ((*((UINT64*)D) & U64(0x000000ffffffffff)) == 0) Z_bit_set(1);
1254
1255   cycles += 2;      /* TODO: +mv oscillator cycles */
1256   return 1;
11261257}
11271258
11281259/* MPYR : 011m mKKK 1--1 F0QQ : A-162 */
1129static size_t dsp56k_op_mpyr_1(const UINT16 op_byte, UINT8* cycles)
1260static size_t dsp56k_op_mpyr_1(const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles)
11301261{
11311262   /* S L E U N Z V C */
11321263   /* * * * * * * * - */
11331264   return 0;
11341265}
11351266
1136/* SUB : 011m mKKK 0rru Fuuu : A-202 */
1137static size_t dsp56k_op_sub_1(const UINT16 op_byte, UINT8* cycles)
1138{
1139   /* S L E U N Z V C */
1140   /* * * * * * * * * */
1141   return 0;
1142}
1143
11441267/* TFR : 011m mKKK 0rr1 F0DD : A-212 */
1145static size_t dsp56k_op_tfr_2(const UINT16 op_byte, UINT8* cycles)
1268static size_t dsp56k_op_tfr_2(const UINT16 op_byte, typed_pointer* d_register, UINT8* cycles)
11461269{
11471270   /* S L E U N Z V C */
11481271   /* - - - - - - - - */
r3535r3536
13071430/* INC : .... .... 0010 F010 : A-104 */
13081431static size_t dsp56k_op_inc(const UINT16 op_byte, typed_pointer* d_register, UINT64* p_accum, UINT8* cycles)
13091432{
1433   typed_pointer D = {NULL, DT_BYTE};
1434   decode_F_table(BITS(op_byte,0x0008), &D);
1435
1436   /* Save some data for the parallel move */
1437   *p_accum = *((UINT64*)D.addr);
1438
1439   /* Increment */
1440   *((UINT64*)D.addr) = *((UINT64*)D.addr) + 1;
1441
1442   /* And out the bits that don't live in the register */
1443   *((UINT64*)D.addr) &= U64(0x000000ffffffffff);
1444
1445   d_register->addr = D.addr;
1446   d_register->data_type = D.data_type;
1447
13101448   /* S L E U N Z V C */
13111449   /* * * * * * * * * */
1312   return 0;
1450   /* TODO: S, L, E, U, V, C */
1451   if ( *((UINT64*)D.addr) & U64(0x0000008000000000))       N_bit_set(1);
1452   if ((*((UINT64*)D.addr) & U64(0x000000ffffff0000)) == 0) Z_bit_set(1);
1453
1454   cycles += 2;   /* TODO: +mv oscillator cycles */
1455   return 1;
13131456}
13141457
13151458/* INC24 : .... .... 0010 F011 : A-106 */
r3535r3536
16711814/* CMPM : .... .... 0111 FJJJ : A-66 */
16721815static size_t dsp56k_op_cmpm(const UINT16 op_byte, typed_pointer* d_register, UINT64* p_accum, UINT8* cycles)
16731816{
1817   INT64 absS;
1818   INT64 absD;
1819   INT64 absResult;
1820
1821   typed_pointer S = {NULL, DT_BYTE};
1822   typed_pointer D = {NULL, DT_BYTE};
1823
1824   decode_JJJF_table(BITS(op_byte,0x0007),BITS(op_byte,0x0008), &S, &D);
1825
1826   *p_accum = *((UINT64*)D.addr);
1827
1828   /* Sign extend and get absolute value of the source */
1829   if (S.addr == &A || S.addr == &B)
1830   {
1831      absS = *((UINT64*)S.addr);
1832      if (absS &  U64(0x0000008000000000))
1833         absS |= U64(0xffffff8000000000);
1834   }
1835   else
1836   {
1837      absS = (*((UINT16*)S.addr)) << 16;
1838      if (absS &  U64(0x0000000080000000))
1839         absS |= U64(0xffffffff80000000);
1840   }
1841   absS = abs(absS);
1842
1843   /* Sign extend and get absolute value of the destination */
1844   if (D.addr == &A || D.addr == &B)
1845   {
1846      absD = *((UINT64*)D.addr);
1847      if (absD &  U64(0x0000008000000000))
1848         absD |= U64(0xffffff8000000000);
1849   }
1850   else
1851   {
1852      absD = (*((UINT16*)D.addr)) << 16;
1853      if (absS &  U64(0x0000000080000000))
1854         absS |= U64(0xffffffff80000000);
1855   }
1856   absD = abs(absD);
1857
1858   /* Compare */
1859   absResult = absD - absS;
1860
1861   d_register->addr = D.addr;
1862   d_register->data_type = D.data_type;
1863
16741864   /* S L E U N Z V C */
16751865   /* * * * * * * * * */
1676   return 0;
1866   /* TODO: S, L, E, U, V, C */
1867   if ( (absResult) & U64(0x0000008000000000))        N_bit_set(1);  else N_bit_set(0);
1868   if (((absResult) & U64(0x000000ffffffffff)) == 0) Z_bit_set(1);  else Z_bit_set(0);
1869
1870   cycles += 2;      /* TODO: +mv oscillator cycles */
1871   return 1;
16771872}
16781873
16791874/* MPY : .... .... 1k00 FQQQ : A-160    -- CONFIRMED TYPO IN DOCS (HHHH vs HHHW) */
r3535r3536
16891884   void* S1 = NULL;
16901885   void* S2 = NULL;
16911886
1692   decode_QQQF_special_table(BITS(op_byte,0x0007), BITS(op_byte,0x0008), &S1, &S2, &D);
1887   decode_QQQF_table(BITS(op_byte,0x0007), BITS(op_byte,0x0008), &S1, &S2, &D);
16931888
16941889   k = BITS(op_byte,0x0040);
16951890
1696   /* Negative sign */
1697   if (!k)
1698      s1 = *((INT16*)S1);
1699   else
1700      s1 = (*((INT16*)S1)) * -1;
1701
1891   /* Cast both values as being signed */
1892   s1 = *((INT16*)S1);
17021893   s2 = *((INT16*)S2);
17031894
17041895   /* Fixed-point 2's complement multiplication requires a shift */
1705   result = ( s1 * s2 ) << 1;
1896   result = (s1 * s2) << 1;
17061897
1898   /* Negate the product if necessary */
1899   if (k)
1900      result *= -1;
1901
17071902   (*((UINT64*)D)) = result & U64(0x000000ffffffffff);
17081903
17091904   /* S L E U N Z V C */
r3535r3536
17271922/* MAC : .... .... 1k10 FQQQ : A-122 */
17281923static size_t dsp56k_op_mac(const UINT16 op_byte, typed_pointer* d_register, UINT64* p_accum, UINT8* cycles)
17291924{
1925   UINT16 k = 0;
1926   INT64 opD = 0;
1927   INT64 result = 0;
1928
1929   INT32 s1 = 0;
1930   INT32 s2 = 0;
1931
1932   void* D = NULL;
1933   void* S1 = NULL;
1934   void* S2 = NULL;
1935
1936   decode_QQQF_table(BITS(op_byte,0x0007), BITS(op_byte,0x0008), &S1, &S2, &D);
1937
1938   k = BITS(op_byte,0x0040);
1939
1940   /* Cast both values as being signed */
1941   s1 = *((INT16*)S1);
1942   s2 = *((INT16*)S2);
1943
1944   /* Fixed-point 2's complement multiplication requires a shift */
1945   result = (s1 * s2) << 1;
1946
1947   /* Sign extend D into a temp variable */
1948   opD = (*((UINT64*)D));
1949   if (opD & U64(0x0000008000000000))
1950      opD |= U64(0xffffff0000000000);
1951   else
1952      opD &= U64(0x000000ffffffffff);
1953
1954   /* Negate if necessary */
1955   if (k)
1956      result *= -1;
1957
1958   /* Accumulate */
1959   opD += result;
1960
1961   /* And out the bits that don't live in the register */
1962   opD &= U64(0x000000ffffffffff);
1963
1964   (*((UINT64*)D)) = (UINT64)opD;
1965
1966   /* For the parallel move */
1967   d_register->addr = D;
1968   d_register->data_type = DT_LONG_WORD;
1969
17301970   /* S L E U N Z V C */
17311971   /* * * * * * * * - */
1732   return 0;
1972   /* TODO: S, L, E, V */
1973   if ( *((UINT64*)D) & U64(0x0000008000000000))      N_bit_set(1);
1974   if ((*((UINT64*)D) & U64(0x000000ffffffffff)) == 0) Z_bit_set(1);
1975
1976   cycles += 2;      /* TODO: +mv oscillator cycles */
1977   return 1;
17331978}
17341979
17351980/* MACR : .... .... 1k11 FQQQ : A-124   -- DRAMA - rr vs xx (805) */
17361981static size_t dsp56k_op_macr(const UINT16 op_byte, typed_pointer* d_register, UINT64* p_accum, UINT8* cycles)
17371982{
1983   UINT16 k = 0;
1984   INT64 opD = 0;
1985   INT64 result = 0;
1986
1987   INT32 s1 = 0;
1988   INT32 s2 = 0;
1989
1990   void* D = NULL;
1991   void* S1 = NULL;
1992   void* S2 = NULL;
1993
1994   decode_QQQF_table(BITS(op_byte,0x0007), BITS(op_byte,0x0008), &S1, &S2, &D);
1995
1996   k = BITS(op_byte,0x0040);
1997
1998   /* Cast both values as being signed */
1999   s1 = *((INT16*)S1);
2000   s2 = *((INT16*)S2);
2001
2002   /* Fixed-point 2's complement multiplication requires a shift */
2003   result = (s1 * s2) << 1;
2004
2005   /* Sign extend D into a temp variable */
2006   opD = (*((UINT64*)D));
2007   if (opD & U64(0x0000008000000000))
2008      opD |= U64(0xffffff0000000000);
2009   else
2010      opD &= U64(0x000000ffffffffff);
2011
2012   /* Negate if necessary */
2013   if (k)
2014      result *= -1;
2015
2016   /* Accumulate */
2017   opD += result;
2018
2019   /* Round the result */
2020   /* WARNING : ROUNDING NOT FULLY IMPLEMENTED YET! */
2021   opD &= U64(0x000000ffffff0000);
2022
2023   /* And out the bits that don't live in the register */
2024   opD &= U64(0x000000ffffffffff);
2025
2026   /* Store the result */
2027   (*((UINT64*)D)) = (UINT64)opD;
2028
2029   /* For the parallel move */
2030   d_register->addr = D;
2031   d_register->data_type = DT_LONG_WORD;
2032
17382033   /* S L E U N Z V C */
17392034   /* * * * * * * * - */
1740   return 0;
2035   /* TODO: S, L, E, V */
2036   if ( *((UINT64*)D) & U64(0x0000008000000000))      N_bit_set(1);
2037   if ((*((UINT64*)D) & U64(0x000000ffffffffff)) == 0) Z_bit_set(1);
2038
2039   cycles += 2;      /* TODO: +mv oscillator cycles */
2040   return 1;
17412041}
17422042
17432043
r3535r3536
18462146/* ASR16 : 0001 0101 0111 F000 : A-36 */
18472147static size_t dsp56k_op_asr16(const UINT16 op, UINT8* cycles)
18482148{
2149   UINT64 backupVal;
2150   typed_pointer D = {NULL, DT_BYTE};
2151
2152   decode_F_table(BITS(op,0x0008), &D);
2153
2154   backupVal = *((UINT64*)D.addr);
2155
2156   *((UINT64*)D.addr) = *((UINT64*)D.addr) >> 16;
2157
2158   if(backupVal & U64(0x0000008000000000))
2159      *((UINT64*)D.addr) |= U64(0x000000ffff000000);
2160   else
2161      *((UINT64*)D.addr) &= U64(0x0000000000ffffff);
2162
18492163   /* S L E U N Z V C */
18502164   /* - * * * * * 0 ? */
1851   /* C - Set if bit 15 of source operand is set. Cleared otherwise. */
1852   return 0;
2165   /* TODO: E, U */
2166   if (*((UINT64*)D.addr) & U64(0x0000008000000000)) N_bit_set(1); else N_bit_set(0);
2167   if (*((UINT64*)D.addr) == 0) Z_bit_set(1); else Z_bit_set(0);
2168   V_bit_set(0);
2169   if (backupVal & U64(0x0000000000008000)) C_bit_set(1); else C_bit_set(0);
2170
2171   cycles += 2;
2172   return 1;
18532173}
18542174
18552175/* BFCHG  : 0001 0100 11Pp pppp BBB1 0010 iiii iiii : A-38 */
r3535r3536
25222842/* JScc : 0000 0110 --01 cccc xxxx xxxx xxxx xxxx : A-112 */
25232843static size_t dsp56k_op_jscc(const UINT16 op, const UINT16 op2, UINT8* cycles)
25242844{
2845   int shouldJump = decode_cccc_table(BITS(op,0x000f));
2846
2847   if(shouldJump)
2848   {
2849      /* TODO: It says "signed" absolute offset.  Weird. */
2850      UINT16 branchOffset = op2;
2851
2852      /* TODO: Verify, since it's not in the docs, but it must be true */
2853      PC += 2;
2854
2855      SP++;
2856      SSH = PC;
2857      SSL = SR;
2858
2859      core.ppc = PC;
2860      PC = branchOffset;
2861      change_pc(PC);
2862
2863      cycles += 4;   /* TODO: +jx oscillator clock cycles */
2864      return 0;
2865   }
2866   else
2867   {
2868      cycles += 4;   /* TODO: +jx oscillator clock cycles */
2869      return 2;
2870   }
2871
25252872   /* S L E U N Z V C */
25262873   /* - - - - - - - - */
25272874   return 0;
r3535r3536
25772924/* LEA : 0000 0001 11TT MMRR : A-116 */
25782925static size_t dsp56k_op_lea(const UINT16 op, UINT8* cycles)
25792926{
2927   UINT16 ea = 0;
2928   UINT16 *rX = NULL;
2929   UINT16 *nX = NULL;
2930   typed_pointer D = {NULL, DT_BYTE};
2931   decode_TT_table(BITS(op,0x0030), &D);
2932
2933   /* TODO: change the execute_mm_functions to return values.  Maybe */
2934   /* Because this calculation isn't applied, do everything locally */
2935   /* RR table */
2936   switch(BITS(op,0x0003))
2937   {
2938      case 0x0: rX = &R0;  nX = &N0;  break;
2939      case 0x1: rX = &R1;  nX = &N1;  break;
2940      case 0x2: rX = &R2;  nX = &N2;  break;
2941      case 0x3: rX = &R3;  nX = &N3;  break;
2942   }
2943
2944   /* MM table */
2945   switch(BITS(op,0x000c))
2946   {
2947      case 0x0: ea = *rX;        break;
2948      case 0x1: ea = *rX + 1;     break;
2949      case 0x2: ea = *rX - 1;     break;
2950      case 0x3: ea = *rX + *nX; break;
2951   }
2952
2953   *((UINT16*)D.addr) = ea;
2954
25802955   /* S L E U N Z V C */
25812956   /* - - - - - - - - */
2582   return 0;
2957   return 1;
25832958}
25842959
25852960/* LEA : 0000 0001 10NN MMRR : A-116 */
r3535r3536
28563231/* MOVE(C) : 0000 0101 BBBB BBBB 0011 1WDD DDD0 ---- : A-144 */
28573232static size_t dsp56k_op_movec_5(const UINT16 op, const UINT16 op2, UINT8* cycles)
28583233{
3234   INT8 xx;
3235   UINT8 W;
3236   UINT16 memOffset;
3237   typed_pointer SD = { NULL, DT_BYTE };
3238
3239   xx = (INT8)(op & 0x00ff);
3240   W = BITS(op2,0x0400);
3241   decode_DDDDD_table(BITS(op2,0x03e0), &SD);
3242
3243   memOffset = R2 + (INT16)xx;
3244
3245   if (W)
3246   {
3247      /* Write D */
3248      UINT16 tempData = data_read_word_16le(WORD(memOffset));
3249      typed_pointer temp_src = { (void*)&tempData, DT_WORD };
3250      SetDestinationValue(temp_src, SD);
3251   }
3252   else
3253   {
3254      /* Read S */
3255      UINT16 tempData = *((UINT16*)SD.addr);
3256      typed_pointer temp_src = { (void*)&tempData, DT_WORD };
3257      SetDataMemoryValue(temp_src, WORD(memOffset));
3258   }
3259
28593260   /* S L E U N Z V C */
28603261   /* * ? ? ? ? ? ? ? */
28613262   /* All ? bits - If SR is specified as a destination operand, set according to the corresponding
28623263       bit of the source operand. If SR is not specified as a destination operand, L is set if data
28633264       limiting occurred. All ? bits are not affected otherwise.*/
2864   return 0;
3265   if (W && (SD.addr != &SR))
3266   {
3267      /* If you're writing to something other than the SR */
3268      /* TODO */
3269   }
3270
3271   cycles += 2;   /* TODO: + mvc oscillator clock cycles */
3272   return 2;
28653273}
28663274
28673275/* MOVE(I) : 0010 00DD BBBB BBBB : A-150 */
r3535r3536
35113919   }
35123920}
35133921
3922static void   decode_KKK_table(UINT16 KKK, typed_pointer* dst_ret1, typed_pointer* dst_ret2, void* working)
3923{
3924   void *opposite = 0x00 ;
3925
3926   if (working == &A) opposite = &B ;
3927   else               opposite = &A ;
3928
3929   switch(KKK)
3930   {
3931      case 0x0: dst_ret1->addr = opposite;  dst_ret1->data_type = DT_LONG_WORD;  dst_ret2->addr = &X0;  dst_ret2->data_type = DT_WORD;  break;
3932      case 0x1: dst_ret1->addr = &Y0;        dst_ret1->data_type = DT_WORD;      dst_ret2->addr = &X0;  dst_ret2->data_type = DT_WORD;  break;
3933      case 0x2: dst_ret1->addr = &X1;        dst_ret1->data_type = DT_WORD;      dst_ret2->addr = &X0;  dst_ret2->data_type = DT_WORD;  break;
3934      case 0x3: dst_ret1->addr = &Y1;        dst_ret1->data_type = DT_WORD;      dst_ret2->addr = &X0;  dst_ret2->data_type = DT_WORD;  break;
3935      case 0x4: dst_ret1->addr = &X0;        dst_ret1->data_type = DT_WORD;      dst_ret2->addr = &X1;  dst_ret2->data_type = DT_WORD;  break;
3936      case 0x5: dst_ret1->addr = &Y0;        dst_ret1->data_type = DT_WORD;      dst_ret2->addr = &X1;  dst_ret2->data_type = DT_WORD;  break;
3937      case 0x6: dst_ret1->addr = opposite;  dst_ret1->data_type = DT_LONG_WORD;  dst_ret2->addr = &Y0;  dst_ret2->data_type = DT_WORD;  break;
3938      case 0x7: dst_ret1->addr = &Y1;        dst_ret1->data_type = DT_WORD;      dst_ret2->addr = &X1;  dst_ret2->data_type = DT_WORD;  break;
3939   }
3940}
3941
3942static void decode_QQF_table(UINT16 QQ, UINT16 F, void **S1, void **S2, void **D)
3943{
3944   UINT16 switchVal = (QQ << 1) | F ;
3945
3946   switch(switchVal)
3947   {
3948      case 0x0: *S1 = &X0;  *S2 = &Y0;  *D = &A;  break;
3949      case 0x1: *S1 = &X0;  *S2 = &Y0;  *D = &B;  break;
3950      case 0x2: *S1 = &X0;  *S2 = &Y1;  *D = &A;  break;
3951      case 0x3: *S1 = &X0;  *S2 = &Y1;  *D = &B;  break;
3952      case 0x4: *S1 = &X1;  *S2 = &Y0;  *D = &A;  break;
3953      case 0x5: *S1 = &X1;  *S2 = &Y0;  *D = &B;  break;
3954      case 0x6: *S1 = &X1;  *S2 = &Y1;  *D = &A;  break;
3955      case 0x7: *S1 = &X1;  *S2 = &Y1;  *D = &B;  break;
3956   }
3957}
3958
35143959static void decode_QQF_special_table(UINT16 QQ, UINT16 F, void **S1, void **S2, void **D)
35153960{
35163961   UINT16 switchVal = (QQ << 1) | F ;
r3535r3536
35283973   }
35293974}
35303975
3531static void decode_QQQF_special_table(UINT16 QQQ, UINT16 F, void **S1, void **S2, void **D)
3976static void decode_QQQF_table(UINT16 QQQ, UINT16 F, void **S1, void **S2, void **D)
35323977{
35333978   UINT16 switchVal = (QQQ << 1) | F;
35343979
r3535r3536
35644009   }
35654010}
35664011
4012static void decode_TT_table(UINT16 TT, typed_pointer* ret)
4013{
4014   switch(TT)
4015   {
4016      case 0x00: ret->addr = &R0;  ret->data_type = DT_WORD;  break;
4017      case 0x01: ret->addr = &R1;  ret->data_type = DT_WORD;  break;
4018      case 0x02: ret->addr = &R2;  ret->data_type = DT_WORD;  break;
4019      case 0x03: ret->addr = &R3;  ret->data_type = DT_WORD;  break;
4020   }
4021}
4022
4023
4024static void decode_uuuuF_table(UINT16 uuuu, UINT16 F, UINT8 add_sub_other, typed_pointer* src_ret, typed_pointer* dst_ret)
4025{
4026   UINT16 switchVal = (uuuu << 1) | F;
4027
4028   /* Unknown uuuuFs have been seen in the wild */
4029   add_sub_other = OP_OTHER;
4030   src_ret->addr = NULL; src_ret->data_type = DT_BYTE;
4031   dst_ret->addr = NULL; dst_ret->data_type = DT_BYTE;
4032
4033   switch(switchVal)
4034   {
4035      case 0x00: add_sub_other = OP_ADD;
4036               src_ret->addr = &X0; src_ret->data_type = DT_WORD;
4037               dst_ret->addr = &A;  dst_ret->data_type = DT_LONG_WORD; break;
4038      case 0x08: add_sub_other = OP_SUB;
4039               src_ret->addr = &X0; src_ret->data_type = DT_WORD;
4040               dst_ret->addr = &A;  dst_ret->data_type = DT_LONG_WORD; break;
4041      case 0x01: add_sub_other = OP_ADD;
4042               src_ret->addr = &X0; src_ret->data_type = DT_WORD;
4043               dst_ret->addr = &B;  dst_ret->data_type = DT_LONG_WORD; break;
4044      case 0x09: add_sub_other = OP_SUB;
4045               src_ret->addr = &X0; src_ret->data_type = DT_WORD;
4046               dst_ret->addr = &B;  dst_ret->data_type = DT_LONG_WORD; break;
4047      case 0x02: add_sub_other = OP_ADD;
4048               src_ret->addr = &Y0; src_ret->data_type = DT_WORD;
4049               dst_ret->addr = &A;  dst_ret->data_type = DT_LONG_WORD; break;
4050      case 0x0a: add_sub_other = OP_SUB;
4051               src_ret->addr = &Y0; src_ret->data_type = DT_WORD;
4052               dst_ret->addr = &A;  dst_ret->data_type = DT_LONG_WORD; break;
4053      case 0x03: add_sub_other = OP_ADD;
4054               src_ret->addr = &Y0; src_ret->data_type = DT_WORD;
4055               dst_ret->addr = &B;  dst_ret->data_type = DT_LONG_WORD; break;
4056      case 0x0b: add_sub_other = OP_SUB;
4057               src_ret->addr = &Y0; src_ret->data_type = DT_WORD;
4058               dst_ret->addr = &B;  dst_ret->data_type = DT_LONG_WORD; break;
4059      case 0x04: add_sub_other = OP_ADD;
4060               src_ret->addr = &X1; src_ret->data_type = DT_WORD;
4061               dst_ret->addr = &A;  dst_ret->data_type = DT_LONG_WORD; break;
4062      case 0x0c: add_sub_other = OP_SUB;
4063               src_ret->addr = &X1; src_ret->data_type = DT_WORD;
4064               dst_ret->addr = &A;  dst_ret->data_type = DT_LONG_WORD; break;
4065      case 0x05: add_sub_other = OP_ADD;
4066               src_ret->addr = &X1; src_ret->data_type = DT_WORD;
4067               dst_ret->addr = &B;  dst_ret->data_type = DT_LONG_WORD; break;
4068      case 0x0d: add_sub_other = OP_SUB;
4069               src_ret->addr = &X1; src_ret->data_type = DT_WORD;
4070               dst_ret->addr = &B;  dst_ret->data_type = DT_LONG_WORD; break;
4071      case 0x06: add_sub_other = OP_ADD;
4072               src_ret->addr = &Y1; src_ret->data_type = DT_WORD;
4073               dst_ret->addr = &A;  dst_ret->data_type = DT_LONG_WORD; break;
4074      case 0x0e: add_sub_other = OP_SUB;
4075               src_ret->addr = &Y1; src_ret->data_type = DT_WORD;
4076               dst_ret->addr = &A;  dst_ret->data_type = DT_LONG_WORD; break;
4077      case 0x07: add_sub_other = OP_ADD;
4078               src_ret->addr = &Y1; src_ret->data_type = DT_WORD;
4079               dst_ret->addr = &B;  dst_ret->data_type = DT_LONG_WORD; break;
4080      case 0x0f: add_sub_other = OP_SUB;
4081               src_ret->addr = &Y1; src_ret->data_type = DT_WORD;
4082               dst_ret->addr = &B;  dst_ret->data_type = DT_LONG_WORD; break;
4083      case 0x18: add_sub_other = OP_ADD;
4084               src_ret->addr = &B;  src_ret->data_type = DT_LONG_WORD;
4085               dst_ret->addr = &A;  dst_ret->data_type = DT_LONG_WORD; break;
4086      case 0x1a: add_sub_other = OP_SUB;
4087               src_ret->addr = &B;  src_ret->data_type = DT_LONG_WORD;
4088               dst_ret->addr = &A;  dst_ret->data_type = DT_LONG_WORD; break;
4089      case 0x19: add_sub_other = OP_ADD;
4090               src_ret->addr = &A;  src_ret->data_type = DT_LONG_WORD;
4091               dst_ret->addr = &B;  dst_ret->data_type = DT_LONG_WORD; break;
4092      case 0x1b: add_sub_other = OP_SUB;
4093               src_ret->addr = &A;  src_ret->data_type = DT_LONG_WORD;
4094               dst_ret->addr = &B;  dst_ret->data_type = DT_LONG_WORD; break;
4095   }
4096}
4097
35674098static void decode_Z_table(UINT16 Z, typed_pointer* ret)
35684099{
35694100   switch(Z)
r3535r3536
35944125   }
35954126}
35964127
4128static void execute_mm_table(UINT16 rnum, UINT16 mm)
4129{
4130   UINT16 *rX = NULL;
4131   UINT16 *nX = NULL;
4132
4133   switch(rnum)
4134   {
4135      case 0x0: rX = &R0;  nX = &N0;  break;
4136      case 0x1: rX = &R1;  nX = &N1;  break;
4137      case 0x2: rX = &R2;  nX = &N2;  break;
4138      case 0x3: fatalerror("Dsp56k: Error. execute_mm_table specified R3 as its first source!");  break;
4139   }
4140
4141   switch(mm)
4142   {
4143      case 0x0: (*rX)++;               R3++;         break;
4144      case 0x1: (*rX)++;               R3 = R3 + N3;   break;
4145      case 0x2: (*rX) = (*rX) + (*nX);   R3++;         break;
4146      case 0x3: (*rX) = (*rX) + (*nX);   R3 = R3 + N3;   break;
4147   }
4148}
4149
35974150static void execute_MM_table(UINT16 rnum, UINT16 MM)
35984151{
35994152   UINT16 *rX = 0x00 ;
r3535r3536
36374190   }
36384191
36394192   /* Should not get here */
3640   exit(1);
3641   return 0x00;
4193   fatalerror("dsp56k: execute_q_table did something impossible!");
4194   return 0;
36424195}
36434196
36444197static void execute_z_table(int RR, UINT16 z)
r3535r3536
37574310/***************************************************************************
37584311    Parallel Memory Ops
37594312***************************************************************************/
3760/* Register to Register Data Move : 0100 IIII ---- ---- : A-132 */
4313/* Register to Register Data Move : 0100 IIII .... .... : A-132 */
37614314static void execute_register_to_register_data_move(const UINT16 op, typed_pointer* d_register, UINT64* prev_accum_value)
37624315{
37634316   typed_pointer S = {NULL, DT_BYTE};
r3535r3536
37794332   }
37804333}
37814334
3782/* Address Register Update : 0011 0zRR ---- ---- : A-135 */
4335/* Address Register Update : 0011 0zRR .... .... : A-135 */
37834336static void execute_address_register_update(const UINT16 op, typed_pointer* d_register, UINT64* prev_accum_value)
37844337{
37854338   execute_z_table(BITS(op,0x0300), BITS(op,0x0400));
37864339}
37874340
3788/* X Memory Data Move : 1mRR HHHW ---- ---- : A-137 */
4341/* X Memory Data Move : 1mRR HHHW .... .... : A-137 */
37894342static void execute_x_memory_data_move(const UINT16 op, typed_pointer* d_register, UINT64* prev_accum_value)
37904343{
37914344   UINT16 W;
r3535r3536
38284381   execute_m_table(BITS(op,0x3000), BITS(op,0x4000));
38294382}
38304383
3831
3832/* X Memory Data Move : 0101 HHHW ---- ---- : A-137 */
4384/* X Memory Data Move : 0101 HHHW .... .... : A-137 */
38334385/* NOTE: previous accumulator value is not needed since ^F1 is always the opposite accumulator */
38344386static void execute_x_memory_data_move2(const UINT16 op, typed_pointer* d_register)
38354387{
r3535r3536
38594411   }
38604412}
38614413
4414/* X Memory Data Move With Short Displacement : 0000 0101 BBBB BBBB ---- HHHW .... .... : A-139 */
4415static void execute_x_memory_data_move_with_short_displacement(const UINT16 op, const UINT16 op2)
4416{
4417   INT8 xx;
4418   UINT8 W;
4419   UINT16 memOffset;
4420   typed_pointer SD = { NULL, DT_BYTE };
38624421
4422   xx = (INT8)(op & 0x00ff);
4423   W = BITS(op2,0x0100);
4424   decode_HHH_table(BITS(op2,0x0e00), &SD);
4425
4426   memOffset = R2 + (INT16)xx;
4427
4428   if (W)
4429   {
4430      /* Write D */
4431      UINT16 tempData = data_read_word_16le(WORD(memOffset));
4432      typed_pointer temp_src = { (void*)&tempData, DT_WORD };
4433      SetDestinationValue(temp_src, SD);
4434   }
4435   else
4436   {
4437      /* Read S */
4438      UINT16 tempData = *((UINT16*)SD.addr);
4439      typed_pointer temp_src = { (void*)&tempData, DT_WORD };
4440      SetDataMemoryValue(temp_src, WORD(memOffset));
4441   }
4442}
4443
4444/* Dual X Memory Data Read : 011m mKKK .rr. .... : A-142*/
4445static void execute_dual_x_memory_data_read(const UINT16 op, typed_pointer* d_register)
4446{
4447   typed_pointer tempV;
4448   UINT16 srcVal1 = 0x0000;
4449   UINT16 srcVal2 = 0x0000;
4450   typed_pointer R = {NULL, DT_BYTE};
4451   typed_pointer D1 = {NULL, DT_BYTE};
4452   typed_pointer D2 = {NULL, DT_BYTE};
4453
4454   decode_RR_table(BITS(op,0x0060), &R);
4455   decode_KKK_table(BITS(op,0x0700), &D1, &D2, d_register->addr);
4456
4457   /* Can't do an R3 for S1 */
4458   if (R.addr == &R3)
4459      fatalerror("Dsp56k: Error. Dual x memory data read specified R3 as its first source!");
4460
4461   /* The note on A-142 is very interesting.
4462       You can effectively access external memory in the last 64 bytes of X data memory! */
4463   if (*((UINT16*)D2.addr) >= 0xffc0)
4464      fatalerror("Dsp56k: Unimplemented access to external X Data Memory >= 0xffc0 in Dual X Memory Data Read.");
4465
4466   /* First memmove */
4467   srcVal1 = data_read_word_16le(WORD(*((UINT16*)R.addr)));
4468   tempV.addr = &srcVal1;
4469   tempV.data_type = DT_WORD;
4470   SetDestinationValue(tempV, D1);
4471
4472   /* Second memmove */
4473   srcVal2 = data_read_word_16le(WORD(R3));
4474   tempV.addr = &srcVal2;
4475   tempV.data_type = DT_WORD;
4476   SetDestinationValue(tempV, D2);
4477
4478   /* Touch up the R regs after all the moves */
4479   execute_mm_table(BITS(op,0x0060), BITS(op,0x1800));
4480}
4481
38634482/***************************************************************************
38644483    Helper Functions
38654484***************************************************************************/
r3535r3536
39094528            case DT_BYTE:        *((UINT16*)dest.addr) = (*((UINT8*) source.addr)) & 0xff; break;
39104529            case DT_WORD:        *((UINT16*)dest.addr) = (*((UINT16*)source.addr)) & 0xffff; break;
39114530            case DT_DOUBLE_WORD: *((UINT16*)dest.addr) = (*((UINT32*)source.addr)) & 0x0000ffff; break;
3912            case DT_LONG_WORD:   *((UINT16*)dest.addr) = (*((UINT64*)source.addr)) & U64(0x000000000000ffff); break;   /* Shift limiter action? */
4531            case DT_LONG_WORD:   *((UINT16*)dest.addr) = (*((UINT64*)source.addr)) & U64(0x000000000000ffff); break;   /* TODO: Shift limiter action! A-147 */
39134532         }
39144533      break ;
39154534
src/emu/cpu/dsp56k/dsp56dsm.c
r3535r3536
77***************************************************************************/
88
99/*
10NOTES:
11*** There seems to be a disagreement in dasm with bytes like this : 0500 0307
12    On one hand, you can dasm it like this :  add      Y1,A          X:(R2+00),Y0
13    On the other, you can dasm it like this : move(m)  P:(R2+00),B0
14    The interesting doc pages for this are the following : move(m) . A-155
15                                                           mem move + short displacement . A-139
16                                                           add . A-23
17    (POSSIBILITY : Maybe Add can't have a mem move + short displacement parallel move?)
18    (CURRENT SOLUTION : I'm completely ignoring mem move + short displacements for now)
19
20*** This disassembler has been 75% tested.  There may remain some bugs, but it disassembles
21    Polygonet Commanders' memtest code 100% accurate (to my knowledge).
10  This disassembler has been 75% tested.  There may remain some bugs, but it disassembles
11  Polygonet Commanders' memtest code 100% accurate (to my knowledge).
2212*/
2313
2414#include "dsp56k.h"
r3535r3536
2616/*******************/
2717/* Dasm prototypes */
2818/*******************/
29static size_t dsp56k_dasm_add_2      (const UINT16 op_byte, char* opcode_str, char* arg_str);
19static size_t dsp56k_dasm_addsub_2   (const UINT16 op_byte, char* opcode_str, char* arg_str);
3020static size_t dsp56k_dasm_mac_1      (const UINT16 op_byte, char* opcode_str, char* arg_str);
3121static size_t dsp56k_dasm_macr_1   (const UINT16 op_byte, char* opcode_str, char* arg_str);
3222static size_t dsp56k_dasm_move_1   (const UINT16 op_byte, char* opcode_str, char* arg_str);
3323static size_t dsp56k_dasm_mpy_1      (const UINT16 op_byte, char* opcode_str, char* arg_str);
3424static size_t dsp56k_dasm_mpyr_1   (const UINT16 op_byte, char* opcode_str, char* arg_str);
35static size_t dsp56k_dasm_sub_1      (const UINT16 op_byte, char* opcode_str, char* arg_str);
3625static size_t dsp56k_dasm_tfr_2      (const UINT16 op_byte, char* opcode_str, char* arg_str);
3726static size_t dsp56k_dasm_mpy_2      (const UINT16 op_byte, char* opcode_str, char* arg_str);
3827static size_t dsp56k_dasm_mac_2      (const UINT16 op_byte, char* opcode_str, char* arg_str);
r3535r3536
189178
190179static void assemble_D_from_P_table(UINT16 P, UINT16 ppppp, char *D);
191180static void assemble_arguments_from_W_table(UINT16 W, char *args, char ma, char *SD, char *ea);
192static void assemble_reg_from_W_table(UINT16 W, char *args, char ma, char *SD, UINT8 xx);
181static void assemble_reg_from_W_table(UINT16 W, char *args, char ma, char *SD, INT8 xx);
193182
194183static void assemble_address_from_IO_short_address(UINT16 pp, char *ea);
195184static INT8 get_6_bit_signed_value(UINT16 bits);
r3535r3536
219208/*****************************/
220209/* Main disassembly function */
221210/*****************************/
222offs_t dsp56k_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
211CPU_DISASSEMBLE( dsp56k )
223212{
224213   /* ORDER: Handle parallel types in the ALU */
225214   /*        Handle the rest */
r3535r3536
240229      UINT16 op_byte = op & 0x00ff;
241230
242231      /* ADD : 011m mKKK 0rru Fuuu : A-22 */
232      /* SUB : 011m mKKK 0rru Fuuu : A-202 */
243233      if ((op & 0xe080) == 0x6000)
244234      {
245         size = dsp56k_dasm_add_2(op_byte, opcode_str, arg_str);
235         size = dsp56k_dasm_addsub_2(op_byte, opcode_str, arg_str);
246236      }
247237      /* MAC : 011m mKKK 1xx0 F1QQ : A-122 */
248238      else if ((op & 0xe094) == 0x6084)
r3535r3536
269259      {
270260         size = dsp56k_dasm_mpyr_1(op_byte, opcode_str, arg_str);
271261      }
272      /* SUB : 011m mKKK 0rru Fuuu : A-202 */
273      else if ((op & 0xe080) == 0x6000)
274      {
275         size = dsp56k_dasm_sub_1(op_byte, opcode_str, arg_str);
276      }
277262      /* TFR : 011m mKKK 0rr1 F0DD : A-212 */
278263      else if ((op & 0xe094) == 0x6010)
279264      {
r3535r3536
356341      /* X Memory Data Move with short displacement : 0000 0101 BBBB BBBB ---- HHHW ---- ---- : A-139 */
357342      else if ((op & 0xff00) == 0x0500)
358343      {
359         /* See notes at top of file! */
360         /* op_byte = op2 & 0x00ff; */
361         /* parallelType = kXMemoryDataMoveWithDisp; */
362         /* DO NOTHING FOR NOW */
344         /* Now check it against all the other potential collisions */
345         /* This is necessary because "don't care bits" get in the way. */
346         /*
347            MOVE(M) :   0000 0101 BBBB BBBB 0000 001W --0- -HHH : A-152
348            MOVE(C) :   0000 0101 BBBB BBBB 0011 1WDD DDD0 ---- : A-144
349            MOVE :      0000 0101 BBBB BBBB ---- HHHW 0001 0001 : A-128
350            */
351         if (((op2 & 0xfe20) != 0x0200) &&
352            ((op2 & 0xf810) != 0x3800) &&
353            ((op2 & 0x00ff) != 0x0011))
354         {
355            op_byte = op2 & 0x00ff;
356            parallelType = kXMemoryDataMoveWithDisp;
357         }
363358      }
364359
365360
r3535r3536
10841079/*******************************/
10851080
10861081/* ADD : 011m mKKK 0rru Fuuu : A-22 */
1087static size_t dsp56k_dasm_add_2(const UINT16 op_byte, char* opcode_str, char* arg_str)
1082/* SUB : 011m mKKK 0rru Fuuu : A-202 */
1083static size_t dsp56k_dasm_addsub_2(const UINT16 op_byte, char* opcode_str, char* arg_str)
10881084{
10891085   /* TODO: How strange.  Same as SUB?  Investigate */
10901086   char D[32];
r3535r3536
11601156   return 1;
11611157}
11621158
1163/* SUB : 011m mKKK 0rru Fuuu : A-202 */
1164static size_t dsp56k_dasm_sub_1(const UINT16 op_byte, char* opcode_str, char* arg_str)
1165{
1166   /* TODO - overlap with ADD (up above) */
1167   char D[32];
1168   char S1[32];
1169   char arg[32];
1170   decode_uuuuF_table(BITS(op_byte,0x17), BITS(op_byte,0x08), arg, S1, D);
1171   sprintf(opcode_str, "%s", arg);
1172   sprintf(arg_str, "%s,%s", S1, D);
1173   return 1;
1174}
1175
11761159/* TFR : 011m mKKK 0rr1 F0DD : A-212 */
11771160static size_t dsp56k_dasm_tfr_2(const UINT16 op_byte, char* opcode_str, char* arg_str)
11781161{
r3535r3536
18201803static size_t dsp56k_dasm_bsr(const UINT16 op, const UINT16 op2, char* opcode_str, char* arg_str, const offs_t pc)
18211804{
18221805   sprintf(opcode_str, "bsr");
1823   sprintf(arg_str, "%x (0x%04x)", (INT16)op2, pc + 2 + (INT16)op2);
1806   sprintf(arg_str, "%d (0x%04x)", (INT16)op2, pc + 2 + (INT16)op2);
18241807   return (2 | DASMFLAG_STEP_OVER);
18251808}
18261809
r3535r3536
21052088/* MOVE : 0000 0101 BBBB BBBB ---- HHHW 0001 0001 : A-128 */
21062089static size_t dsp56k_dasm_move_2(const UINT16 op, const UINT16 op2, char* opcode_str, char* arg_str)
21072090{
2108   UINT8 B;
2091   INT8 B;
21092092   char SD[32];
21102093   char args[32];
21112094   B = BITS(op,0x00ff);
r3535r3536
21942177/* MOVE(C) : 0000 0101 BBBB BBBB 0011 1WDD DDD0 ---- : A-144 */
21952178static size_t dsp56k_dasm_movec_5(const UINT16 op, const UINT16 op2, char* opcode_str, char* arg_str)
21962179{
2197   UINT8 B;
2180   INT8 B;
21982181   char SD[32];
21992182   char args[32];
22002183   B = BITS(op,0x00ff);
r3535r3536
22492232/* MOVE(M) : 0000 0101 BBBB BBBB 0000 001W --0- -HHH : A-152 */
22502233static size_t dsp56k_dasm_movem_2(const UINT16 op, const UINT16 op2, char* opcode_str, char* arg_str)
22512234{
2252   UINT8 B;
2235   INT8 B;
22532236   char SD[32];
22542237   char args[32];
22552238   B = BITS(op,0x00ff);
r3535r3536
29352918
29362919static void decode_KKK_table(UINT16 KKK, char *D1, char *D2)
29372920{
2921   /* TODO: Fix ^Fs */
29382922   switch(KKK)
29392923   {
29402924      case 0x0: sprintf(D1, "^F"); sprintf(D2, "X0"); break;
r3535r3536
30543038{
30553039   UINT16 switchVal = (uuuu << 1) | F;
30563040
3041   /* An invalid uuuuF has been seen in the wild */
3042   sprintf(D, "sub?");
3043   sprintf(S, "add?");
3044   sprintf(arg, "invalid");
3045
30573046   switch(switchVal)
30583047   {
30593048      case 0x00: sprintf(arg, "add"); sprintf(S, "X0"); sprintf(D, "A"); break;
r3535r3536
31753164   }
31763165}
31773166
3178static void assemble_reg_from_W_table(UINT16 W, char *args, char ma, char *SD, UINT8 xx)
3167static void assemble_reg_from_W_table(UINT16 W, char *args, char ma, char *SD, INT8 xx)
31793168{
3169   /* TODO : xx is said to be signed on page A-139.  Nowhere else.  Are they all signed? */
31803170   switch(W)
31813171   {
31823172      case 0x0: sprintf(args, "%s,%c:(R2+%02x)", SD, ma, xx); break;
src/emu/cpu/dsp56k/dsp56k.c
r3535r3536
3838/***************************************************************************
3939    LOCAL DECLARATIONS
4040***************************************************************************/
41static void dsp56k_init(int index, int clock, const void *_config, int (*irqcallback)(int));
42static void dsp56k_reset(void);
43static void dsp56k_exit(void);
41static CPU_INIT( dsp56k );
42static CPU_RESET( dsp56k );
43static CPU_EXIT( dsp56k );
4444
4545/***************************************************************************
4646    MACROS
r3535r3536
208208   UINT32         op;
209209   int            interrupt_cycles;
210210   void         (*output_pins_changed)(UINT32 pins);
211   const device_config *device;
211212} dsp56k_core;
212213
213214
r3535r3536
333334         {
334335            /* If it changes state from asserted to cleared.  Call the reset function. */
335336            if (core.reset_state == TRUE)
336               dsp56k_reset();
337               cpu_reset_dsp56k(core.device);
337338
338339            core.reset_state = FALSE;
339340         }
r3535r3536
357358    CONTEXT SWITCHING
358359***************************************************************************/
359360
360static void dsp56k_get_context(void *dst)
361static CPU_GET_CONTEXT( dsp56k )
361362{
362363   if (dst)
363364      *(dsp56k_core *)dst = core;
364365}
365366
366367
367static void dsp56k_set_context(void *src)
368static CPU_SET_CONTEXT( dsp56k )
368369{
369370   if (src)
370371      core = *(dsp56k_core *)src;
r3535r3536
377378/***************************************************************************
378379    INITIALIZATION AND SHUTDOWN
379380***************************************************************************/
380static void dsp56k_init(int index, int clock, const void *_config, int (*irqcallback)(int))
381static CPU_INIT( dsp56k )
381382{
382383   // Call specific module inits
383384   pcu_init(index);
r3535r3536
399400
400401   //core.config = _config;
401402   //core.irq_callback = irqcallback;
403   core.device = device;
402404}
403405
404406static void agu_reset(void)
r3535r3536
431433}
432434
433435
434static void dsp56k_reset(void)
436static CPU_RESET( dsp56k )
435437{
436438   logerror("Dsp56k reset\n");
437439
r3535r3536
451453}
452454
453455
454static void dsp56k_exit(void)
456static CPU_EXIT( dsp56k )
455457{
456458}
457459
r3535r3536
468470    CORE EXECUTION LOOP
469471***************************************************************************/
470472
471static int dsp56k_execute(int cycles)
473static CPU_EXECUTE( dsp56k )
472474{
473475   /* If reset line is asserted, do nothing */
474476   if (core.reset_state)
r3535r3536
499501/***************************************************************************
500502    DISASSEMBLY HOOK
501503***************************************************************************/
502extern offs_t dsp56k_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
504extern CPU_DISASSEMBLE( dsp56k );
503505
504506
505507/****************************************************************************
r3535r3536
520522 * Generic set_info/get_info
521523 **************************************************************************/
522524
523static void dsp56k_set_info(UINT32 state, cpuinfo *info)
525static CPU_SET_INFO( dsp56k )
524526{
525527   switch (state)
526528   {
r3535r3536
586588}
587589
588590
589void dsp56k_get_info(UINT32 state, cpuinfo *info)
591CPU_GET_INFO( dsp56k )
590592{
591593   switch (state)
592594   {
r3535r3536
596598      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:         info->i = 0x0000;                  break;
597599      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
598600      case CPUINFO_INT_CLOCK_MULTIPLIER:            info->i = 1;                     break;
599      case CPUINFO_INT_CLOCK_DIVIDER:               info->i = 1;                     break;
601      case CPUINFO_INT_CLOCK_DIVIDER:               info->i = 2;                     break;
600602      case CPUINFO_INT_MIN_INSTRUCTION_BYTES:         info->i = 2;                     break;
601603      case CPUINFO_INT_MAX_INSTRUCTION_BYTES:         info->i = 4;                     break;
602604      case CPUINFO_INT_MIN_CYCLES:               info->i = 1;                     break;   // ?
r3535r3536
672674      case CPUINFO_INT_REGISTER + DSP56K_ST15:      info->i = ST15;                     break;
673675
674676      // --- the following bits of info are returned as pointers to data or functions ---
675      case CPUINFO_PTR_SET_INFO:                  info->setinfo = dsp56k_set_info;      break;
676      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = dsp56k_get_context;   break;
677      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = dsp56k_set_context;   break;
678      case CPUINFO_PTR_INIT:                     info->init = dsp56k_init;            break;
679      case CPUINFO_PTR_RESET:                     info->reset = dsp56k_reset;            break;
680      case CPUINFO_PTR_EXIT:                     info->exit = dsp56k_exit;            break;
681      case CPUINFO_PTR_EXECUTE:                  info->execute = dsp56k_execute;         break;
677      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(dsp56k);      break;
678      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(dsp56k);   break;
679      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(dsp56k);   break;
680      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(dsp56k);            break;
681      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(dsp56k);            break;
682      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(dsp56k);            break;
683      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(dsp56k);         break;
682684      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
683      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = dsp56k_dasm;      break;
684      case CPUINFO_PTR_DEBUG_SETUP_COMMANDS:         info->setup_commands = NULL;         break;
685      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(dsp56k);      break;
686      case CPUINFO_PTR_DEBUG_INIT:               info->debug_init = NULL;            break;
685687      case CPUINFO_PTR_TRANSLATE:                  info->translate = NULL;               break;
686688      case CPUINFO_PTR_READ:                     info->read = NULL;                  break;
687689      case CPUINFO_PTR_WRITE:                     info->write = NULL;                  break;
688690      case CPUINFO_PTR_READOP:                  info->readop = NULL;               break;
689691      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &dsp56k_icount;         break;
690692       case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:
691          info->internal_map16 = address_map_dsp56156_x_data_map;                        break;
693          info->internal_map16 = ADDRESS_MAP_NAME(dsp56156_x_data_map);                        break;
692694       case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:
693          info->internal_map16 = address_map_dsp56156_program_map;                     break;
695          info->internal_map16 = ADDRESS_MAP_NAME(dsp56156_program_map);                     break;
694696
695697      // --- the following bits of info are returned as NULL-terminated strings ---
696698      case CPUINFO_STR_NAME:                     strcpy(info->s, "DSP56156");         break;
src/emu/cpu/spc700/spc700.h
r3535r3536
3838/* implementation APIs below.                                       */
3939
4040
41void spc700_init(int index, int clock, const void *config, int (*irqcallback)(int));
41CPU_INIT( spc700 );
4242
4343/* Pulse the RESET pin on the CPU */
44void spc700_reset(void);
44CPU_RESET( spc700 );
4545
4646/* Set the RESET line on the CPU */
4747void spc700_set_reset_line(int state, void* param);
4848
4949/* Clean up after the emulation core - Not used in this core - */
50void spc700_exit(void);
50CPU_EXIT( spc700 );
5151
5252/* Get the current CPU context */
5353unsigned spc700_get_context(void *dst);
5454
5555/* Set the current CPU context */
56void spc700_set_context(void *src);
56CPU_SET_CONTEXT( spc700 );
5757
5858/* Get the current Program Counter */
5959unsigned spc700_get_pc(void);
r3535r3536
8383void spc700_set_irq_line(int line, int state);
8484
8585/* Set the callback that will be called when an interrupt is serviced */
86void spc700_set_irq_callback(int (*callback)(int));
86void spc700_set_irq_callback(cpu_irq_callback callback);
8787
8888/* Save the current CPU state to disk */
8989void spc700_state_save(void *file);
r3535r3536
130130
131131#include "cpuintrf.h"
132132
133extern void spc700_get_info(UINT32 state, cpuinfo *info);
133extern CPU_GET_INFO( spc700 );
134134
135135#define spc700_read_8(addr) program_read_byte_8le(addr)
136136#define spc700_write_8(addr,data) program_write_byte_8le(addr,data)
src/emu/cpu/spc700/spc700ds.c
r3535r3536
344344   return result | (*rombase++ << 8);
345345}
346346
347offs_t spc700_dasm(char *buff, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
347CPU_DISASSEMBLE( spc700 )
348348{
349349   const opcode_struct* opcode;
350350   UINT32 flags = 0;
r3535r3536
356356   rombase = oprom;
357357   opcode = g_opcodes + read_8_immediate();
358358
359   sprintf(buff, "%s ", g_opnames[opcode->name]);
360   ptr = buff + strlen(buff);
359   sprintf(buffer, "%s ", g_opnames[opcode->name]);
360   ptr = buffer + strlen(buffer);
361361
362362   if (opcode->name == CALL)
363363      flags = DASMFLAG_STEP_OVER;
src/emu/cpu/spc700/spc700ds.h
r3535r3536
2121
2222#include "cpuintrf.h"
2323
24offs_t spc700_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
24CPU_DISASSEMBLE( spc700 );
2525
2626#define spc700_read_8_disassembler(addr)            program_read_byte_8(addr)
2727
src/emu/cpu/spc700/spc700.c
r3535r3536
122122   uint line_nmi;   /* Status of the NMI line */
123123   uint line_rst;   /* Status of the RESET line */
124124   uint ir;      /* Instruction Register */
125   int (*int_ack)(int); /* Interrupt Acknowledge */
125   cpu_irq_callback int_ack;
126   const device_config *device;
126127   uint stopped;   /* stopped status */
127128} spc700i_cpu_struct;
128129
r3535r3536
547548   PUSH_8(GET_REG_P_INT());
548549   FLAG_I = IFLAG_SET;
549550   if(INT_ACK)
550      INT_ACK(0);
551      INT_ACK(spc700i_cpu.device, 0);
551552   JUMP(read_16_VEC(VECTOR_IRQ));
552553}
553554#endif
r3535r3536
12561257/* ================================= API ================================== */
12571258/* ======================================================================== */
12581259
1259void spc700_init(int index, int clock, const void *config, int (*irqcallback)(int))
1260CPU_INIT( spc700 )
12601261{
12611262   INT_ACK = irqcallback;
1263   spc700i_cpu.device = device;
12621264}
12631265
12641266
1265void spc700_reset(void)
1267CPU_RESET( spc700 )
12661268{
12671269   CPU_STOPPED = 0;
12681270#if !SPC700_OPTIMIZE_SNES
r3535r3536
12811283}
12821284
12831285/* Exit and clean up */
1284void spc700_exit(void)
1286CPU_EXIT( spc700 )
12851287{
12861288   /* nothing to do yet */
12871289}
12881290
12891291
12901292/* Get the current CPU context */
1291unsigned spc700_get_context(void *dst_context)
1293CPU_GET_CONTEXT( spc700 )
12921294{
1293   if(dst_context)
1294      *(spc700i_cpu_struct*)dst_context = spc700i_cpu;
1295   return sizeof(spc700i_cpu);
1295   if(dst)
1296      *(spc700i_cpu_struct*)dst = spc700i_cpu;
12961297}
12971298
1298static void spc700_get_context_mame(void *dst_context)
1299{
1300   spc700_get_context(dst_context);
1301}
1302
13031299/* Set the current CPU context */
1304void spc700_set_context(void *src_context)
1300CPU_SET_CONTEXT( spc700 )
13051301{
1306   if(src_context)
1302   if(src)
13071303   {
1308      spc700i_cpu = *(spc700i_cpu_struct*)src_context;
1304      spc700i_cpu = *(spc700i_cpu_struct*)src;
13091305      JUMP(REG_PC);
13101306   }
13111307}
r3535r3536
13611357}
13621358
13631359/* Set the callback that is called when servicing an interrupt */
1364void spc700_set_irq_callback(int (*callback)(int))
1360void spc700_set_irq_callback(cpu_irq_callback callback)
13651361{
13661362   INT_ACK = callback;
13671363}
r3535r3536
14091405//int dump_flag = 0;
14101406
14111407/* Execute instructions for <clocks> cycles */
1412int spc700_execute(int clocks)
1408CPU_EXECUTE( spc700 )
14131409{
1414   CLOCKS = CPU_STOPPED ? 0 : clocks;
1410   CLOCKS = CPU_STOPPED ? 0 : cycles;
14151411   while(CLOCKS > 0)
14161412   {
14171413      REG_PPC = REG_PC;
r3535r3536
17051701         case 0xff: OP_STOP  ( 3               ); break; /* STOP          */
17061702      }
17071703   }
1708   return clocks - CLOCKS;
1704   return cycles - CLOCKS;
17091705}
17101706
17111707
r3535r3536
17131709 * Generic set_info
17141710 **************************************************************************/
17151711
1716static void spc700_set_info(UINT32 state, cpuinfo *info)
1712static CPU_SET_INFO( spc700 )
17171713{
17181714   switch (state)
17191715   {
r3535r3536
17381734 * Generic get_info
17391735 **************************************************************************/
17401736
1741void spc700_get_info(UINT32 state, cpuinfo *info)
1737CPU_GET_INFO( spc700 )
17421738{
17431739   uint p = ((spc700i_cpu.flag_n & 0x80)         |
17441740            ((spc700i_cpu.flag_v & 0x80) >> 1)   |
r3535r3536
17871783      case CPUINFO_INT_REGISTER + SPC700_Y:         info->i = REG_Y;                  break;
17881784
17891785      /* --- the following bits of info are returned as pointers to data or functions --- */
1790      case CPUINFO_PTR_SET_INFO:                  info->setinfo = spc700_set_info;      break;
1791      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = spc700_get_context_mame;   break;
1792      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = spc700_set_context;   break;
1793      case CPUINFO_PTR_INIT:                     info->init = spc700_init;            break;
1794      case CPUINFO_PTR_RESET:                     info->reset = spc700_reset;            break;
1795      case CPUINFO_PTR_EXIT:                     info->exit = spc700_exit;            break;
1796      case CPUINFO_PTR_EXECUTE:                  info->execute = spc700_execute;         break;
1786      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(spc700);      break;
1787      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(spc700);   break;
1788      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(spc700);   break;
1789      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(spc700);            break;
1790      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(spc700);            break;
1791      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(spc700);            break;
1792      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(spc700);         break;
17971793      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1798      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = spc700_dasm;      break;
1794      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(spc700);      break;
17991795      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &spc700_ICount;         break;
18001796
18011797      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/hd6309/hd6309.h
r3535r3536
1818
1919
2020/* PUBLIC FUNCTIONS */
21void hd6309_get_info(UINT32 state, cpuinfo *info);
21CPU_GET_INFO( hd6309 );
2222
2323/****************************************************************************/
2424/* Read a byte from given memory location                                   */
src/emu/cpu/hd6309/6309dasm.c
r3535r3536
603603
604604static const char *const tfm_s[] = { "%s+,%s+", "%s-,%s-", "%s+,%s", "%s,%s+" };
605605
606offs_t hd6309_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
606CPU_DISASSEMBLE( hd6309 )
607607{
608608   UINT8 opcode, mode, pb, pbm, reg;
609609   const UINT8 *operandarray;
src/emu/cpu/hd6309/hd6309.c
r3535r3536
118118#define false 0
119119#endif
120120
121extern offs_t hd6309_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
121extern CPU_DISASSEMBLE( hd6309 );
122122
123123/*#define BIG_SWITCH*/
124124
r3535r3536
143143   UINT8   ireg;      /* First opcode */
144144   UINT8   irq_state[2];
145145   int    extra_cycles; /* cycles used up by interrupts */
146   int    (*irq_callback)(int irqline);
146   cpu_irq_callback irq_callback;
147   const device_config *device;
147148   UINT8   int_state;   /* SYNC and CWAI flags */
148149   UINT8   nmi_state;
149150} hd6309_Regs;
r3535r3536
452453      CC |= CC_IF | CC_II;         /* inhibit FIRQ and IRQ */
453454      PCD=RM16(0xfff6);
454455      CHANGE_PC;
455      (void)(*hd6309.irq_callback)(HD6309_FIRQ_LINE);
456      (void)(*hd6309.irq_callback)(hd6309.device, HD6309_FIRQ_LINE);
456457   }
457458   else
458459   if( hd6309.irq_state[HD6309_IRQ_LINE]!=CLEAR_LINE && !(CC & CC_II) )
r3535r3536
486487      CC |= CC_II;               /* inhibit IRQ */
487488      PCD=RM16(0xfff8);
488489      CHANGE_PC;
489      (void)(*hd6309.irq_callback)(HD6309_IRQ_LINE);
490      (void)(*hd6309.irq_callback)(hd6309.device, HD6309_IRQ_LINE);
490491   }
491492}
492493
493494/****************************************************************************
494495 * Get all registers in given buffer
495496 ****************************************************************************/
496static void hd6309_get_context(void *dst)
497static CPU_GET_CONTEXT( hd6309 )
497498{
498499   if( dst )
499500      *(hd6309_Regs*)dst = hd6309;
r3535r3536
502503/****************************************************************************
503504 * Set all registers to given values
504505 ****************************************************************************/
505static void hd6309_set_context(void *src)
506static CPU_SET_CONTEXT( hd6309 )
506507{
507508   if( src )
508509      hd6309 = *(hd6309_Regs*)src;
r3535r3536
517518   UpdateState();
518519}
519520
520static void hd6309_init(int index, int clock, const void *config, int (*irqcallback)(int))
521static CPU_INIT( hd6309 )
521522{
522523   hd6309.irq_callback = irqcallback;
524   hd6309.device = device;
523525
524526   state_save_register_item("hd6309", index, PC);
525527   state_save_register_item("hd6309", index, U);
r3535r3536
540542/****************************************************************************/
541543/* Reset registers to their initial values                                  */
542544/****************************************************************************/
543static void hd6309_reset(void)
545static CPU_RESET( hd6309 )
544546{
545547   hd6309.int_state = 0;
546548   hd6309.nmi_state = CLEAR_LINE;
r3535r3536
558560   UpdateState();
559561}
560562
561static void hd6309_exit(void)
563static CPU_EXIT( hd6309 )
562564{
563565   /* nothing to do ? */
564566}
r3535r3536
623625#include "6309ops.c"
624626
625627/* execute instructions on this CPU until icount expires */
626static int hd6309_execute(int cycles)   /* NS 970908 */
628static CPU_EXECUTE( hd6309 )   /* NS 970908 */
627629{
628630   hd6309_ICount = cycles - hd6309.extra_cycles;
629631   hd6309.extra_cycles = 0;
r3535r3536
12071209 * Generic set_info
12081210 **************************************************************************/
12091211
1210static void hd6309_set_info(UINT32 state, cpuinfo *info)
1212static CPU_SET_INFO( hd6309 )
12111213{
12121214   switch (state)
12131215   {
r3535r3536
12401242 * Generic get_info
12411243 **************************************************************************/
12421244
1243void hd6309_get_info(UINT32 state, cpuinfo *info)
1245CPU_GET_INFO( hd6309 )
12441246{
12451247   switch (state)
12461248   {
r3535r3536
12891291      case CPUINFO_INT_REGISTER + HD6309_DP:         info->i = DP;                     break;
12901292
12911293      /* --- the following bits of info are returned as pointers to data or functions --- */
1292      case CPUINFO_PTR_SET_INFO:                  info->setinfo = hd6309_set_info;      break;
1293      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = hd6309_get_context;   break;
1294      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = hd6309_set_context;   break;
1295      case CPUINFO_PTR_INIT:                     info->init = hd6309_init;            break;
1296      case CPUINFO_PTR_RESET:                     info->reset = hd6309_reset;            break;
1297      case CPUINFO_PTR_EXIT:                     info->exit = hd6309_exit;            break;
1298      case CPUINFO_PTR_EXECUTE:                  info->execute = hd6309_execute;         break;
1294      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(hd6309);      break;
1295      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(hd6309);   break;
1296      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(hd6309);   break;
1297      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(hd6309);            break;
1298      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(hd6309);            break;
1299      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(hd6309);            break;
1300      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(hd6309);         break;
12991301      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1300      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = hd6309_dasm;      break;
1302      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(hd6309);      break;
13011303      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &hd6309_ICount;         break;
13021304
13031305      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/ssp1601/ssp1601.h
r3535r3536
1717};
1818
1919#if (HAS_SSP1601)
20void ssp1601_get_info(UINT32 state, cpuinfo *info);
20CPU_GET_INFO( ssp1601 );
2121#endif
2222
2323extern unsigned dasm_ssp1601(char *buffer, unsigned pc, const UINT8 *oprom);
src/emu/cpu/ssp1601/ssp1601.c
r3535r3536
497497// -----------------------------------------------------
498498
499499
500static void ssp1601_init(int index, int clock, const void *config, int (*irqcallback)(int))
500static CPU_INIT( ssp1601 )
501501{
502502   state_save_register_item(CHIP_NAME, index, rX);
503503   state_save_register_item(CHIP_NAME, index, rY);
r3535r3536
516516   ssp1601.gr[0].w.h = 0xffff; // constant reg
517517}
518518
519static void ssp1601_exit(void)
519static CPU_EXIT( ssp1601 )
520520{
521521   /* nothing to do */
522522}
523523
524static void ssp1601_reset(void)
524static CPU_RESET( ssp1601 )
525525{
526526   rPC = 0x400;
527527   rSTACK = 0; // ? using ascending stack
r3535r3536
529529}
530530
531531
532static int ssp1601_execute(int cycles)
532static CPU_EXECUTE( ssp1601 )
533533{
534534   g_cycles = cycles;
535535
r3535r3536
743743 * MAME interface
744744 **************************************************************************/
745745
746static void ssp1601_get_context(void *regs)
746static CPU_GET_CONTEXT( ssp1601 )
747747{
748748   /* copy the context */
749   if (regs)
750      *(ssp1601_regs *)regs = ssp1601;
749   if (dst)
750      *(ssp1601_regs *)dst = ssp1601;
751751}
752752
753static void ssp1601_set_context(void *regs)
753static CPU_SET_CONTEXT( ssp1601 )
754754{
755755   /* copy the context */
756   if (regs)
757      ssp1601 = *(ssp1601_regs *)regs;
756   if (src)
757      ssp1601 = *(ssp1601_regs *)src;
758758}
759759
760static offs_t ssp1601_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
760static CPU_DISASSEMBLE( ssp1601 )
761761{
762762   return dasm_ssp1601(buffer, pc, oprom);
763763}
764764
765765#if (HAS_SSP1601)
766766
767static void ssp1601_set_info(UINT32 state, cpuinfo *info)
767static CPU_SET_INFO( ssp1601 )
768768{
769769   switch (state)
770770   {
r3535r3536
803803 * Generic get_info
804804 **************************************************************************/
805805
806void ssp1601_get_info(UINT32 state, cpuinfo *info)
806CPU_GET_INFO( ssp1601 )
807807{
808808   switch (state)
809809   {
r3535r3536
858858      case CPUINFO_INT_REGISTER + SSP_PR7:         info->i = ssp1601.r[7];               break;
859859
860860      /* --- the following bits of info are returned as pointers to data or functions --- */
861      case CPUINFO_PTR_SET_INFO:                  info->setinfo = ssp1601_set_info;   break;
862      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = ssp1601_get_context; break;
863      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = ssp1601_set_context; break;
864      case CPUINFO_PTR_INIT:                     info->init = ssp1601_init;         break;
865      case CPUINFO_PTR_RESET:                     info->reset = ssp1601_reset;         break;
866      case CPUINFO_PTR_EXIT:                     info->exit = ssp1601_exit;         break;
867      case CPUINFO_PTR_EXECUTE:                  info->execute = ssp1601_execute;      break;
861      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(ssp1601);   break;
862      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(ssp1601); break;
863      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(ssp1601); break;
864      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ssp1601);         break;
865      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(ssp1601);         break;
866      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(ssp1601);         break;
867      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(ssp1601);      break;
868868      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
869      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = ssp1601_dasm;   break;
869      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(ssp1601);   break;
870870      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &g_cycles;         break;
871871
872872      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map16 = NULL;   break;
src/emu/cpu/tlcs90/tlcs90.c
r3535r3536
1616   PAIR      af2,bc2,de2,hl2;
1717   UINT8      halt, after_EI;
1818   UINT16      irq_state, irq_mask;
19   int         (*irq_callback)(int irqline);
19   cpu_irq_callback irq_callback;
20   const device_config *device;
2021   int         extra_cycles;      // extra cycles for interrupts
2122   UINT8      internal_registers[48];
2223   UINT32      ixbase,iybase;
r3535r3536
988989   return 0;
989990}
990991
991unsigned t90_dasm(char *buffer, UINT32 oldpc, const UINT8 *oprom, const UINT8 *opram)
992CPU_DISASSEMBLE( t90 )
992993{
993994   int len;
994995
995   addr = oldpc;
996   addr = pc;
996997
997998   decode();
998999   op &= ~OP_16;
9991000
10001001   buffer   +=   sprintf      ( buffer,         "%-5s",            op_names[ op ] );   // strlen("callr") == 5
1001   len      =   sprint_arg   ( buffer, oldpc,   " ",            mode1, r1, r1b );
1002   len      =   sprint_arg   ( buffer, pc,      " ",            mode1, r1, r1b );
10021003   buffer   +=   len;
1003   buffer   +=   sprint_arg   ( buffer, oldpc,   (len>1)?",":"",      mode2, r2, r2b );
1004   buffer   +=   sprint_arg   ( buffer, pc,      (len>1)?",":"",      mode2, r2, r2b );
10041005
1005   return (addr - oldpc) | DASMFLAG_SUPPORTED;
1006   return (addr - pc) | DASMFLAG_SUPPORTED;
10061007}
10071008
10081009
r3535r3536
13171318INLINE void Cyc(void)   {   t90_ICount -= cyc_t;   }
13181319INLINE void Cyc_f(void)   {   t90_ICount -= cyc_f;   }
13191320
1320static int t90_execute(int cycles)
1321static CPU_EXECUTE( t90 )
13211322{
13221323   UINT8    a8,b8;
13231324   UINT16   a16,b16;
r3535r3536
19651966   return cycles - t90_ICount;
19661967}
19671968
1968static void t90_reset(void)
1969static CPU_RESET( t90 )
19691970{
19701971   T90.irq_state = 0;
19711972   T90.irq_mask = 0;
r3535r3536
19801981*/
19811982}
19821983
1983static void t90_exit(void)
1984static CPU_EXIT( t90 )
19841985{
19851986}
19861987
1987static void t90_burn(int cycles)
1988static CPU_BURN( t90 )
19881989{
19891990   t90_ICount -= 4 * ((cycles + 3) / 4);
19901991}
19911992
1992static void t90_get_context (void *dst)
1993static CPU_GET_CONTEXT( t90 )
19931994{
19941995   if( dst )
19951996      *(t90_Regs*)dst = T90;
19961997}
19971998
1998static void t90_set_context (void *src)
1999static CPU_SET_CONTEXT( t90 )
19992000{
20002001   if( src )
20012002      T90 = *(t90_Regs*)src;
r3535r3536
26202621   T90.internal_registers[offset] = data;
26212622}
26222623
2623static void t90_init(int index, int clock, const void *config, int (*irqcallback)(int))
2624static CPU_INIT( t90 )
26242625{
26252626   int i, p;
26262627
r3535r3536
26522653
26532654   memset(&T90, 0, sizeof(T90));
26542655   T90.irq_callback = irqcallback;
2656   T90.device = device;
26552657
26562658   T90.timer_period = attotime_mul(ATTOTIME_IN_HZ(cpunum_get_clock(cpu_getactivecpu())), 8);
26572659
r3535r3536
26902692   AM_RANGE(   T90_IOBASE, T90_IOBASE+47   ) AM_READWRITE( t90_internal_registers_r, t90_internal_registers_w )
26912693ADDRESS_MAP_END
26922694
2693static void t90_set_info(UINT32 state, cpuinfo *info)
2695static CPU_SET_INFO( t90 )
26942696{
26952697   switch (state)
26962698   {
r3535r3536
27212723   }
27222724}
27232725
2724void tmp90840_get_info(UINT32 state, cpuinfo *info)
2726CPU_GET_INFO( tmp90840 )
27252727{
27262728   switch (state)
27272729   {
r3535r3536
27762778
27772779      /* --- the following bits of info are returned as pointers to data or functions --- */
27782780
2779      case CPUINFO_PTR_SET_INFO:                           info->setinfo = t90_set_info;      break;
2780      case CPUINFO_PTR_GET_CONTEXT:                        info->getcontext = t90_get_context;   break;
2781      case CPUINFO_PTR_SET_CONTEXT:                        info->setcontext = t90_set_context;   break;
2782      case CPUINFO_PTR_INIT:                              info->init = t90_init;            break;
2783      case CPUINFO_PTR_RESET:                              info->reset = t90_reset;         break;
2784      case CPUINFO_PTR_EXIT:                              info->exit = t90_exit;            break;
2785      case CPUINFO_PTR_EXECUTE:                           info->execute = t90_execute;      break;
2786      case CPUINFO_PTR_BURN:                              info->burn = t90_burn;            break;
2787      case CPUINFO_PTR_DISASSEMBLE:                        info->disassemble = t90_dasm;      break;
2781      case CPUINFO_PTR_SET_INFO:                           info->setinfo = CPU_SET_INFO_NAME(t90);      break;
2782      case CPUINFO_PTR_GET_CONTEXT:                        info->getcontext = CPU_GET_CONTEXT_NAME(t90);   break;
2783      case CPUINFO_PTR_SET_CONTEXT:                        info->setcontext = CPU_SET_CONTEXT_NAME(t90);   break;
2784      case CPUINFO_PTR_INIT:                              info->init = CPU_INIT_NAME(t90);            break;
2785      case CPUINFO_PTR_RESET:                              info->reset = CPU_RESET_NAME(t90);         break;
2786      case CPUINFO_PTR_EXIT:                              info->exit = CPU_EXIT_NAME(t90);            break;
2787      case CPUINFO_PTR_EXECUTE:                           info->execute = CPU_EXECUTE_NAME(t90);      break;
2788      case CPUINFO_PTR_BURN:                              info->burn = CPU_BURN_NAME(t90);            break;
2789      case CPUINFO_PTR_DISASSEMBLE:                        info->disassemble = CPU_DISASSEMBLE_NAME(t90);      break;
27882790      case CPUINFO_PTR_INSTRUCTION_COUNTER:                  info->icount = &t90_ICount;         break;
2789      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = address_map_tmp90840_mem; break;
2791      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tmp90840_mem); break;
27902792
27912793      /* --- the following bits of info are returned as NULL-terminated strings --- */
27922794
r3535r3536
28262828   }
28272829}
28282830
2829void tmp90841_get_info(UINT32 state, cpuinfo *info)
2831CPU_GET_INFO( tmp90841 )
28302832{
28312833   switch (state)
28322834   {
28332835      /* --- the following bits of info are returned as 64-bit signed integers --- */
28342836
2835      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = address_map_tmp90841_mem; return;
2837      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tmp90841_mem); return;
28362838
28372839      /* --- the following bits of info are returned as NULL-terminated strings --- */
28382840
28392841      case CPUINFO_STR_NAME:            strcpy(info->s = cpuintrf_temp_str(), "TMP90841");         return;
28402842   }
28412843
2842   tmp90840_get_info(state,info);
2844   CPU_GET_INFO_CALL(tmp90840);
28432845}
28442846
2845void tmp91640_get_info(UINT32 state, cpuinfo *info)
2847CPU_GET_INFO( tmp91640 )
28462848{
28472849   switch (state)
28482850   {
28492851      /* --- the following bits of info are returned as 64-bit signed integers --- */
28502852
2851      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = address_map_tmp91640_mem; return;
2853      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tmp91640_mem); return;
28522854
28532855      /* --- the following bits of info are returned as NULL-terminated strings --- */
28542856
28552857      case CPUINFO_STR_NAME:            strcpy(info->s = cpuintrf_temp_str(), "TMP91640");         return;
28562858   }
28572859
2858   tmp90840_get_info(state,info);
2860   CPU_GET_INFO_CALL(tmp90840);
28592861}
28602862
2861void tmp91641_get_info(UINT32 state, cpuinfo *info)
2863CPU_GET_INFO( tmp91641 )
28622864{
28632865   switch (state)
28642866   {
28652867      /* --- the following bits of info are returned as 64-bit signed integers --- */
28662868
2867      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = address_map_tmp91641_mem; return;
2869      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tmp91641_mem); return;
28682870
28692871      /* --- the following bits of info are returned as NULL-terminated strings --- */
28702872
28712873      case CPUINFO_STR_NAME:            strcpy(info->s = cpuintrf_temp_str(), "TMP91641");         return;
28722874   }
28732875
2874   tmp90840_get_info(state,info);
2876   CPU_GET_INFO_CALL(tmp90840);
28752877}
src/emu/cpu/tlcs90/tlcs90.h
r3535r3536
1010void tmp91640_get_info(UINT32, cpuinfo*);
1111void tmp91641_get_info(UINT32, cpuinfo*);
1212
13unsigned t90_dasm(char *buffer, UINT32 oldpc, const UINT8 *oprom, const UINT8 *opram);
13CPU_DISASSEMBLE( t90 );
1414
1515#define T90_IOBASE   0xffc0
1616
src/emu/cpu/s2650/s2650.c
r3535r3536
4040    UINT8   ir;     /* instruction register */
4141    UINT16  ras[8]; /* 8 return address stack entries */
4242   UINT8   irq_state;
43    int     (*irq_callback)(int irqline);
43   cpu_irq_callback irq_callback;
44   const device_config *device;
4445}   s2650_Regs;
4546
4647static s2650_Regs S;
r3535r3536
127128            S.halt = 0;                            \
128129            S.iar = (S.iar + 1) & PMSK;                \
129130         }                                       \
130         vector = (*S.irq_callback)(0) & 0xff;            \
131         vector = (*S.irq_callback)(S.device, 0) & 0xff;      \
131132         /* build effective address within first 8K page */   \
132133         S.ea = S2650_relative[vector] & PMSK;            \
133134         if (vector & 0x80)      /* indirect bit set ? */   \
r3535r3536
766767static void BRA_EA(void) _BRA_EA()
767768#endif
768769
769static void s2650_init(int index, int clock, const void *config, int (*irqcallback)(int))
770static CPU_INIT( s2650 )
770771{
771772   S.irq_callback = irqcallback;
773   S.device = device;
772774
773775   state_save_register_item("s2650", index, S.ppc);
774776   state_save_register_item("s2650", index, S.page);
r3535r3536
784786   state_save_register_item("s2650", index, S.irq_state);
785787}
786788
787static void s2650_reset(void)
789static CPU_RESET( s2650 )
788790{
789   int (*save_irqcallback)(int) = S.irq_callback;
791   cpu_irq_callback save_irqcallback = S.irq_callback;
792   const device_config *save_device = S.device;
790793   memset(&S, 0, sizeof(S));
791794   S.irq_callback = save_irqcallback;
795   S.device = save_device;
792796   S.psl = COM | WC;
793797   S.psu = 0;
794798}
795799
796static void s2650_exit(void)
800static CPU_EXIT( s2650 )
797801{
798802   /* nothing to do */
799803}
800804
801static void s2650_get_context(void *dst)
805static CPU_GET_CONTEXT( s2650 )
802806{
803807   if( dst )
804808      *(s2650_Regs*)dst = S;
805809}
806810
807static void s2650_set_context(void *src)
811static CPU_SET_CONTEXT( s2650 )
808812{
809813   if( src )
810814   {
r3535r3536
858862    return (((S.psu & SI) ? 1 : 0) | ((io_read_byte_8le(S2650_SENSE_PORT) & SI) ? 1 : 0));
859863}
860864
861static int s2650_execute(int cycles)
865static CPU_EXECUTE( s2650 )
862866{
863867   s2650_ICount = cycles;
864868   do
r3535r3536
14751479 * Generic set_info
14761480 **************************************************************************/
14771481
1478static void s2650_set_info(UINT32 state, cpuinfo *info)
1482static CPU_SET_INFO( s2650 )
14791483{
14801484   switch (state)
14811485   {
r3535r3536
15111515 * Generic get_info
15121516 **************************************************************************/
15131517
1514void s2650_get_info(UINT32 state, cpuinfo *info)
1518CPU_GET_INFO( s2650 )
15151519{
15161520   switch (state)
15171521   {
r3535r3536
15611565      case CPUINFO_INT_REGISTER + S2650_FO:         info->i = s2650_get_flag();            break;
15621566
15631567      /* --- the following bits of info are returned as pointers to data or functions --- */
1564      case CPUINFO_PTR_SET_INFO:                  info->setinfo = s2650_set_info;         break;
1565      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = s2650_get_context;   break;
1566      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = s2650_set_context;   break;
1567      case CPUINFO_PTR_INIT:                     info->init = s2650_init;            break;
1568      case CPUINFO_PTR_RESET:                     info->reset = s2650_reset;            break;
1569      case CPUINFO_PTR_EXIT:                     info->exit = s2650_exit;            break;
1570      case CPUINFO_PTR_EXECUTE:                  info->execute = s2650_execute;         break;
1568      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(s2650);         break;
1569      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(s2650);   break;
1570      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(s2650);   break;
1571      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(s2650);            break;
1572      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(s2650);            break;
1573      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(s2650);            break;
1574      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(s2650);         break;
15711575      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1572      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = s2650_dasm;         break;
1576      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(s2650);         break;
15731577      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &s2650_ICount;         break;
15741578
15751579      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/s2650/2650dasm.c
r3535r3536
221221}
222222
223223/* disassemble one instruction at PC into buff. return byte size of instr */
224offs_t s2650_dasm(char *buff, offs_t PC, const UINT8 *oprom, const UINT8 *opram)
224CPU_DISASSEMBLE( s2650 )
225225{
226226   UINT32 flags = 0;
227   int pc = PC;
227   int PC = pc;
228228   int op = oprom[0];
229229   int rv = op & 3;
230230
r3535r3536
236236   {
237237      case 0x00: case 0x01: case 0x02: case 0x03:
238238#if HJB
239         sprintf(buff, "ld   r0,r%d", rv);
239         sprintf(buffer, "ld   r0,r%d", rv);
240240#else
241         sprintf(buff, "lodz,%d", rv);
241         sprintf(buffer, "lodz,%d", rv);
242242#endif
243243            break;
244244      case 0x04: case 0x05: case 0x06: case 0x07:
245245#if HJB
246         sprintf(buff, "ld   r%d,%s", rv, IMM(pc));
246         sprintf(buffer, "ld   r%d,%s", rv, IMM(pc));
247247#else
248         sprintf(buff, "lodi,%d %s", rv, IMM(pc));
248         sprintf(buffer, "lodi,%d %s", rv, IMM(pc));
249249#endif
250250            pc+=1;
251251         break;
252252      case 0x08: case 0x09: case 0x0a: case 0x0b:
253253#if HJB
254         sprintf(buff, "ld   r%d,(%s)", rv, REL(pc));
254         sprintf(buffer, "ld   r%d,(%s)", rv, REL(pc));
255255#else
256            sprintf(buff, "lodr,%d %s", rv, REL(pc));
256            sprintf(buffer, "lodr,%d %s", rv, REL(pc));
257257#endif
258258            pc+=1;
259259         break;
260260      case 0x0c: case 0x0d: case 0x0e: case 0x0f:
261261#if HJB
262         sprintf(buff, "ld   %s", ABS(1,rv,pc));
262         sprintf(buffer, "ld   %s", ABS(1,rv,pc));
263263#else
264         sprintf(buff, "loda,%s", ABS(1,rv,pc));
264         sprintf(buffer, "loda,%s", ABS(1,rv,pc));
265265#endif
266266            pc+=2;
267267         break;
268268      case 0x10: case 0x11:
269269#if HJB
270         sprintf(buff, "**** $%02X",op);
270         sprintf(buffer, "**** $%02X",op);
271271#else
272         sprintf(buff, "****   $%02X",op);
272         sprintf(buffer, "****   $%02X",op);
273273#endif
274274         break;
275275      case 0x12:
276276#if HJB
277         sprintf(buff, "ld   psu,r0");
277         sprintf(buffer, "ld   psu,r0");
278278#else
279            sprintf(buff, "spsu");
279            sprintf(buffer, "spsu");
280280#endif
281281            break;
282282      case 0x13:
283283#if HJB
284         sprintf(buff, "ld   psl,r0");
284         sprintf(buffer, "ld   psl,r0");
285285#else
286            sprintf(buff, "spsl");
286            sprintf(buffer, "spsl");
287287#endif
288288            break;
289289      case 0x14: case 0x15: case 0x16: case 0x17:
290290#if HJB
291291         if (rv == 3)
292            sprintf(buff, "ret");
292            sprintf(buffer, "ret");
293293            else
294            sprintf(buff, "ret  %c", cc[rv]);
294            sprintf(buffer, "ret  %c", cc[rv]);
295295#else
296            sprintf(buff, "retc   %c", cc[rv]);
296            sprintf(buffer, "retc   %c", cc[rv]);
297297#endif
298298            flags = DASMFLAG_STEP_OUT;
299299            break;
300300      case 0x18: case 0x19: case 0x1a: case 0x1b:
301301#if HJB
302302         if (rv == 3)
303            sprintf(buff, "jr   %s", REL(pc));
303            sprintf(buffer, "jr   %s", REL(pc));
304304         else
305            sprintf(buff, "jr   %c,%s", cc[rv], REL(pc));
305            sprintf(buffer, "jr   %c,%s", cc[rv], REL(pc));
306306#else
307            sprintf(buff, "bctr,%c %s", cc[rv], REL(pc));
307            sprintf(buffer, "bctr,%c %s", cc[rv], REL(pc));
308308#endif
309309            pc+=1;
310310         break;
311311      case 0x1c: case 0x1d: case 0x1e: case 0x1f:
312312#if HJB
313313         if (rv == 3)
314            sprintf(buff, "jp   %s", ADR(pc));
314            sprintf(buffer, "jp   %s", ADR(pc));
315315         else
316            sprintf(buff, "jp   %c,%s", cc[rv], ADR(pc));
316            sprintf(buffer, "jp   %c,%s", cc[rv], ADR(pc));
317317#else
318            sprintf(buff, "bcta,%c %s", cc[rv], ADR(pc));
318            sprintf(buffer, "bcta,%c %s", cc[rv], ADR(pc));
319319#endif
320320            pc+=2;
321321         break;
322322      case 0x20: case 0x21: case 0x22: case 0x23:
323323#if HJB
324         sprintf(buff, "xor  r0,r%d", rv);
324         sprintf(buffer, "xor  r0,r%d", rv);
325325#else
326            sprintf(buff, "eorz,%d", rv);
326            sprintf(buffer, "eorz,%d", rv);
327327#endif
328328            break;
329329      case 0x24: case 0x25: case 0x26: case 0x27:
330330#if HJB
331         sprintf(buff, "xor  r%d,%s", rv, IMM(pc));
331         sprintf(buffer, "xor  r%d,%s", rv, IMM(pc));
332332#else
333            sprintf(buff, "eori,%d %s", rv, IMM(pc));
333            sprintf(buffer, "eori,%d %s", rv, IMM(pc));
334334#endif
335335            pc+=1;
336336         break;
337337      case 0x28: case 0x29: case 0x2a: case 0x2b:
338338#if HJB
339         sprintf(buff, "xor  r%d,(%s)", rv, REL(pc));
339         sprintf(buffer, "xor  r%d,(%s)", rv, REL(pc));
340340#else
341            sprintf(buff, "eorr,%d %s", rv, REL(pc));
341            sprintf(buffer, "eorr,%d %s", rv, REL(pc));
342342#endif
343343            pc+=1;
344344         break;
345345      case 0x2c: case 0x2d: case 0x2e: case 0x2f:
346346#if HJB
347         sprintf(buff, "xor  %s", ABS(1,rv,pc));
347         sprintf(buffer, "xor  %s", ABS(1,rv,pc));
348348#else
349         sprintf(buff, "eora,%s", ABS(1,rv,pc));
349         sprintf(buffer, "eora,%s", ABS(1,rv,pc));
350350#endif
351351            pc+=2;
352352         break;
353353      case 0x30: case 0x31: case 0x32: case 0x33:
354354#if HJB
355         sprintf(buff, "in   r%d,(ctrl)", rv);
355         sprintf(buffer, "in   r%d,(ctrl)", rv);
356356#else
357            sprintf(buff, "redc,%d", rv);
357            sprintf(buffer, "redc,%d", rv);
358358#endif
359359            break;
360360      case 0x34: case 0x35: case 0x36: case 0x37:
361361#if HJB
362362         if (rv == 3)
363            sprintf(buff, "iret");
363            sprintf(buffer, "iret");
364364            else
365            sprintf(buff, "iret %c", cc[rv]);
365            sprintf(buffer, "iret %c", cc[rv]);
366366#else
367            sprintf(buff, "rete   %c", cc[rv]);
367            sprintf(buffer, "rete   %c", cc[rv]);
368368#endif
369369            flags = DASMFLAG_STEP_OUT;
370370            break;
371371      case 0x38: case 0x39: case 0x3a: case 0x3b:
372372#if HJB
373373         if (rv == 3)
374            sprintf(buff, "calr %s", REL(pc));
374            sprintf(buffer, "calr %s", REL(pc));
375375         else
376            sprintf(buff, "calr %c,%s", cc[rv], REL(pc));
376            sprintf(buffer, "calr %c,%s", cc[rv], REL(pc));
377377#else
378            sprintf(buff, "bstr,%c %s", cc[rv], REL(pc));
378            sprintf(buffer, "bstr,%c %s", cc[rv], REL(pc));
379379#endif
380380            pc+=1;
381381            flags = DASMFLAG_STEP_OVER;
r3535r3536
383383      case 0x3c: case 0x3d: case 0x3e: case 0x3f:
384384#if HJB
385385         if (rv == 3)
386            sprintf(buff, "call %s", ADR(pc));
386            sprintf(buffer, "call %s", ADR(pc));
387387         else
388            sprintf(buff, "call %c,%s", cc[rv], ADR(pc));
388            sprintf(buffer, "call %c,%s", cc[rv], ADR(pc));
389389#else
390            sprintf(buff, "bsta,%c %s", cc[rv], ADR(pc));
390            sprintf(buffer, "bsta,%c %s", cc[rv], ADR(pc));
391391#endif
392392            pc+=2;
393393            flags = DASMFLAG_STEP_OVER;
394394         break;
395395      case 0x40:
396         sprintf(buff, "halt");
396         sprintf(buffer, "halt");
397397         break;
398398      case 0x41: case 0x42: case 0x43:
399399#if HJB
400         sprintf(buff, "and  r0,r%d", rv);
400         sprintf(buffer, "and  r0,r%d", rv);
401401#else
402            sprintf(buff, "andz,%d", rv);
402            sprintf(buffer, "andz,%d", rv);
403403#endif
404404            break;
405405      case 0x44: case 0x45: case 0x46: case 0x47:
406406#if HJB
407         sprintf(buff, "and  r%d,%s", rv, IMM(pc));
407         sprintf(buffer, "and  r%d,%s", rv, IMM(pc));
408408#else
409            sprintf(buff, "andi,%d %s", rv, IMM(pc));
409            sprintf(buffer, "andi,%d %s", rv, IMM(pc));
410410#endif
411411            pc+=1;
412412         break;
413413      case 0x48: case 0x49: case 0x4a: case 0x4b:
414414#if HJB
415         sprintf(buff, "and  r%d,(%s)", rv, REL(pc));
415         sprintf(buffer, "and  r%d,(%s)", rv, REL(pc));
416416#else
417            sprintf(buff, "andr,%d %s", rv, REL(pc));
417            sprintf(buffer, "andr,%d %s", rv, REL(pc));
418418#endif
419419            pc+=1;
420420         break;
421421      case 0x4c: case 0x4d: case 0x4e: case 0x4f:
422422#if HJB
423         sprintf(buff, "and  %s", ABS(1,rv,pc));
423         sprintf(buffer, "and  %s", ABS(1,rv,pc));
424424#else
425         sprintf(buff, "anda,%s", ABS(1,rv,pc));
425         sprintf(buffer, "anda,%s", ABS(1,rv,pc));
426426#endif
427427            pc+=2;
428428         break;
429429      case 0x50: case 0x51: case 0x52: case 0x53:
430430#if HJB
431         sprintf(buff, "ror  r%d", rv);
431         sprintf(buffer, "ror  r%d", rv);
432432#else
433            sprintf(buff, "rrr,%d", rv);
433            sprintf(buffer, "rrr,%d", rv);
434434#endif
435435            break;
436436      case 0x54: case 0x55: case 0x56: case 0x57:
437437#if HJB
438         sprintf(buff, "in   r%d,(%s)", rv, IMM(pc));
438         sprintf(buffer, "in   r%d,(%s)", rv, IMM(pc));
439439#else
440            sprintf(buff, "rede,%d %s", rv, IMM(pc));
440            sprintf(buffer, "rede,%d %s", rv, IMM(pc));
441441#endif
442442            pc+=1;
443443         break;
444444      case 0x58: case 0x59: case 0x5a: case 0x5b:
445445#if HJB
446         sprintf(buff, "jrnz r%d,%s", rv, REL(pc));
446         sprintf(buffer, "jrnz r%d,%s", rv, REL(pc));
447447#else
448            sprintf(buff, "brnr,%d %s", rv, REL(pc));
448            sprintf(buffer, "brnr,%d %s", rv, REL(pc));
449449#endif
450450            pc+=1;
451451         break;
452452      case 0x5c: case 0x5d: case 0x5e: case 0x5f:
453453#if HJB
454         sprintf(buff, "jpnz r%d,%s", rv, ADR(pc));
454         sprintf(buffer, "jpnz r%d,%s", rv, ADR(pc));
455455#else
456            sprintf(buff, "brna,%d %s", rv, ADR(pc));
456            sprintf(buffer, "brna,%d %s", rv, ADR(pc));
457457#endif
458458            pc+=2;
459459         break;
460460      case 0x60: case 0x61: case 0x62: case 0x63:
461461#if HJB
462         sprintf(buff, "or   r0,r%d", rv);
462         sprintf(buffer, "or   r0,r%d", rv);
463463#else
464            sprintf(buff, "iorz,%d", rv);
464            sprintf(buffer, "iorz,%d", rv);
465465#endif
466466            break;
467467      case 0x64: case 0x65: case 0x66: case 0x67:
468468#if HJB
469         sprintf(buff, "or   r%d,%s", rv, IMM(pc));
469         sprintf(buffer, "or   r%d,%s", rv, IMM(pc));
470470#else
471            sprintf(buff, "iori,%d %s", rv, IMM(pc));
471            sprintf(buffer, "iori,%d %s", rv, IMM(pc));
472472#endif
473473            pc+=1;
474474         break;
475475      case 0x68: case 0x69: case 0x6a: case 0x6b:
476476#if HJB
477         sprintf(buff, "or   r%d,(%s)", rv, REL(pc));
477         sprintf(buffer, "or   r%d,(%s)", rv, REL(pc));
478478#else
479            sprintf(buff, "iorr,%d %s", rv, REL(pc));
479            sprintf(buffer, "iorr,%d %s", rv, REL(pc));
480480#endif
481481            pc+=1;
482482         break;
483483      case 0x6c: case 0x6d: case 0x6e: case 0x6f:
484484#if HJB
485         sprintf(buff, "or   %s", ABS(1,rv,pc));
485         sprintf(buffer, "or   %s", ABS(1,rv,pc));
486486#else
487         sprintf(buff, "iora,%s", ABS(1,rv,pc));
487         sprintf(buffer, "iora,%s", ABS(1,rv,pc));
488488#endif
489489            pc+=2;
490490         break;
491491      case 0x70: case 0x71: case 0x72: case 0x73:
492492#if HJB
493         sprintf(buff, "in   r%d,(data)", rv);
493         sprintf(buffer, "in   r%d,(data)", rv);
494494#else
495            sprintf(buff, "redd,%d", rv);
495            sprintf(buffer, "redd,%d", rv);
496496#endif
497497            break;
498498      case 0x74:
499499#if HJB
500         sprintf(buff, "res  psu,%s", IMM_PSU(pc));
500         sprintf(buffer, "res  psu,%s", IMM_PSU(pc));
501501#else
502            sprintf(buff, "cpsu   %s", IMM_PSU(pc));
502            sprintf(buffer, "cpsu   %s", IMM_PSU(pc));
503503#endif
504504            pc+=1;
505505         break;
506506      case 0x75:
507507#if HJB
508         sprintf(buff, "res  psl,%s", IMM_PSL(pc));
508         sprintf(buffer, "res  psl,%s", IMM_PSL(pc));
509509#else
510            sprintf(buff, "cpsl   %s", IMM_PSL(pc));
510            sprintf(buffer, "cpsl   %s", IMM_PSL(pc));
511511#endif
512512            pc+=1;
513513         break;
514514      case 0x76:
515515#if HJB
516         sprintf(buff, "set  psu,%s", IMM_PSU(pc));
516         sprintf(buffer, "set  psu,%s", IMM_PSU(pc));
517517#else
518            sprintf(buff, "ppsu   %s", IMM_PSU(pc));
518            sprintf(buffer, "ppsu   %s", IMM_PSU(pc));
519519#endif
520520            pc+=1;
521521         break;
522522      case 0x77:
523523#if HJB
524         sprintf(buff, "set  psl,%s", IMM_PSL(pc));
524         sprintf(buffer, "set  psl,%s", IMM_PSL(pc));
525525#else
526            sprintf(buff, "ppsl   %s", IMM_PSL(pc));
526            sprintf(buffer, "ppsl   %s", IMM_PSL(pc));
527527#endif
528528            pc+=1;
529529         break;
530530      case 0x78: case 0x79: case 0x7a: case 0x7b:
531531#if HJB
532         sprintf(buff, "call r%d-nz,%s", rv, REL(pc));
532         sprintf(buffer, "call r%d-nz,%s", rv, REL(pc));
533533#else
534            sprintf(buff, "bsnr,%d %s", rv, REL(pc));
534            sprintf(buffer, "bsnr,%d %s", rv, REL(pc));
535535#endif
536536            pc+=1;
537537            flags = DASMFLAG_STEP_OVER;
538538         break;
539539      case 0x7c: case 0x7d: case 0x7e: case 0x7f:
540540#if HJB
541         sprintf(buff, "call r%d-nz,%s", rv, ADR(pc));
541         sprintf(buffer, "call r%d-nz,%s", rv, ADR(pc));
542542#else
543            sprintf(buff, "bsna,%d %s", rv, ADR(pc));
543            sprintf(buffer, "bsna,%d %s", rv, ADR(pc));
544544#endif
545545            pc+=2;
546546            flags = DASMFLAG_STEP_OVER;
547547         break;
548548      case 0x80: case 0x81: case 0x82: case 0x83:
549549#if HJB
550         sprintf(buff, "add  r0,r%d", rv);
550         sprintf(buffer, "add  r0,r%d", rv);
551551#else
552            sprintf(buff, "addz,%d", rv);
552            sprintf(buffer, "addz,%d", rv);
553553#endif
554554            break;
555555      case 0x84: case 0x85: case 0x86: case 0x87:
556556#if HJB
557         sprintf(buff, "add  r%d,%s", rv, IMM(pc));
557         sprintf(buffer, "add  r%d,%s", rv, IMM(pc));
558558#else
559            sprintf(buff, "addi,%d %s", rv, IMM(pc));
559            sprintf(buffer, "addi,%d %s", rv, IMM(pc));
560560#endif
561561            pc+=1;
562562         break;
563563      case 0x88: case 0x89: case 0x8a: case 0x8b:
564564#if HJB
565         sprintf(buff, "add  r%d,(%s)", rv, REL(pc));
565         sprintf(buffer, "add  r%d,(%s)", rv, REL(pc));
566566#else
567            sprintf(buff, "addr,%d %s", rv, REL(pc));
567            sprintf(buffer, "addr,%d %s", rv, REL(pc));
568568#endif
569569            pc+=1;
570570         break;
571571      case 0x8c: case 0x8d: case 0x8e: case 0x8f:
572572#if HJB
573         sprintf(buff, "add  %s", ABS(1,rv,pc));
573         sprintf(buffer, "add  %s", ABS(1,rv,pc));
574574#else
575         sprintf(buff, "adda,%s", ABS(1,rv,pc));
575         sprintf(buffer, "adda,%s", ABS(1,rv,pc));
576576#endif
577577            pc+=2;
578578         break;
579579      case 0x90: case 0x91:
580580#if HJB
581         sprintf(buff, "**** $%02X",op);
581         sprintf(buffer, "**** $%02X",op);
582582#else
583         sprintf(buff, "****   $%02X",op);
583         sprintf(buffer, "****   $%02X",op);
584584#endif
585585         break;
586586      case 0x92:
587587#if HJB
588         sprintf(buff, "ld   r0,psu");
588         sprintf(buffer, "ld   r0,psu");
589589#else
590            sprintf(buff, "lpsu");
590            sprintf(buffer, "lpsu");
591591#endif
592592            break;
593593      case 0x93:
594594#if HJB
595         sprintf(buff, "ld   r0,psl");
595         sprintf(buffer, "ld   r0,psl");
596596#else
597            sprintf(buff, "lpsl");
597            sprintf(buffer, "lpsl");
598598#endif
599599            break;
600600      case 0x94: case 0x95: case 0x96: case 0x97:
601601#if HJB
602         sprintf(buff, "daa  r%d", rv);
602         sprintf(buffer, "daa  r%d", rv);
603603#else
604            sprintf(buff, "dar,%d", rv);
604            sprintf(buffer, "dar,%d", rv);
605605#endif
606606            break;
607607      case 0x98: case 0x99: case 0x9a:
608608#if HJB
609         sprintf(buff, "jr   n%c,%s", cc[rv], REL(pc));
609         sprintf(buffer, "jr   n%c,%s", cc[rv], REL(pc));
610610#else
611            sprintf(buff, "bcfr,%c %s", cc[rv], REL(pc));
611            sprintf(buffer, "bcfr,%c %s", cc[rv], REL(pc));
612612#endif
613613            pc+=1;
614614         break;
615615      case 0x9b:
616616#if HJB
617         sprintf(buff, "jr0  %s", REL0(pc));
617         sprintf(buffer, "jr0  %s", REL0(pc));
618618#else
619         sprintf(buff, "zbrr   %s", REL0(pc));
619         sprintf(buffer, "zbrr   %s", REL0(pc));
620620#endif
621621            pc+=1;
622622         break;
623623      case 0x9c: case 0x9d: case 0x9e:
624624#if HJB
625         sprintf(buff, "jp   n%c,%s", cc[rv], ADR(pc));
625         sprintf(buffer, "jp   n%c,%s", cc[rv], ADR(pc));
626626#else
627            sprintf(buff, "bcfa,%c %s", cc[rv], ADR(pc));
627            sprintf(buffer, "bcfa,%c %s", cc[rv], ADR(pc));
628628#endif
629629            pc+=2;
630630         break;
631631      case 0x9f:
632632#if HJB
633         sprintf(buff, "jp   %s+r3", ADR(pc));
633         sprintf(buffer, "jp   %s+r3", ADR(pc));
634634#else
635            sprintf(buff, "bxa    %s", ADR(pc));
635            sprintf(buffer, "bxa    %s", ADR(pc));
636636#endif
637637            pc+=2;
638638         break;
639639      case 0xa0: case 0xa1: case 0xa2: case 0xa3:
640640#if HJB
641         sprintf(buff, "sub  r0,r%d", rv);
641         sprintf(buffer, "sub  r0,r%d", rv);
642642#else
643            sprintf(buff, "subz,%d", rv);
643            sprintf(buffer, "subz,%d", rv);
644644#endif
645645            break;
646646      case 0xa4: case 0xa5: case 0xa6: case 0xa7:
647647#if HJB
648         sprintf(buff, "sub  r%d,%s", rv, IMM(pc));
648         sprintf(buffer, "sub  r%d,%s", rv, IMM(pc));
649649#else
650            sprintf(buff, "subi,%d %s", rv, IMM(pc));
650            sprintf(buffer, "subi,%d %s", rv, IMM(pc));
651651#endif
652652            pc+=1;
653653         break;
654654      case 0xa8: case 0xa9: case 0xaa: case 0xab:
655655#if HJB
656         sprintf(buff, "sub  r%d,(%s)", rv, REL(pc));
656         sprintf(buffer, "sub  r%d,(%s)", rv, REL(pc));
657657#else
658            sprintf(buff, "subr,%d %s", rv, REL(pc));
658            sprintf(buffer, "subr,%d %s", rv, REL(pc));
659659#endif
660660            pc+=1;
661661         break;
662662      case 0xac: case 0xad: case 0xae: case 0xaf:
663663#if HJB
664         sprintf(buff, "sub  %s", ABS(1,rv,pc));
664         sprintf(buffer, "sub  %s", ABS(1,rv,pc));
665665#else
666         sprintf(buff, "suba,%s", ABS(1,rv,pc));
666         sprintf(buffer, "suba,%s", ABS(1,rv,pc));
667667#endif
668668            pc+=2;
669669         break;
670670      case 0xb0: case 0xb1: case 0xb2: case 0xb3:
671671#if HJB
672         sprintf(buff, "out  (ctrl),r%d", rv);
672         sprintf(buffer, "out  (ctrl),r%d", rv);
673673#else
674            sprintf(buff, "wrtc,%d", rv);
674            sprintf(buffer, "wrtc,%d", rv);
675675#endif
676676            break;
677677      case 0xb4:
678678#if HJB
679         sprintf(buff, "bit  psu,%s", IMM_PSU(pc));
679         sprintf(buffer, "bit  psu,%s", IMM_PSU(pc));
680680#else
681            sprintf(buff, "tpsu   %s", IMM_PSU(pc));
681            sprintf(buffer, "tpsu   %s", IMM_PSU(pc));
682682#endif
683683            pc+=1;
684684         break;
685685      case 0xb5:
686686#if HJB
687         sprintf(buff, "bit  psl,%s", IMM_PSL(pc));
687         sprintf(buffer, "bit  psl,%s", IMM_PSL(pc));
688688#else
689            sprintf(buff, "tpsl   %s", IMM_PSL(pc));
689            sprintf(buffer, "tpsl   %s", IMM_PSL(pc));
690690#endif
691691            pc+=1;
692692         break;
693693      case 0xb6: case 0xb7:
694694#if HJB
695         sprintf(buff, "**** $%02X",op);
695         sprintf(buffer, "**** $%02X",op);
696696#else
697         sprintf(buff, "****   $%02X",op);
697         sprintf(buffer, "****   $%02X",op);
698698#endif
699699         break;
700700      case 0xb8: case 0xb9: case 0xba:
701701#if HJB
702         sprintf(buff, "calr n%c,%s", cc[rv], REL(pc));
702         sprintf(buffer, "calr n%c,%s", cc[rv], REL(pc));
703703#else
704            sprintf(buff, "bsfr,%c %s", cc[rv], REL(pc));
704            sprintf(buffer, "bsfr,%c %s", cc[rv], REL(pc));
705705#endif
706706            pc+=1;
707707            flags = DASMFLAG_STEP_OVER;
708708         break;
709709      case 0xbb:
710710#if HJB
711         sprintf(buff, "cal0 %s", REL0(pc));
711         sprintf(buffer, "cal0 %s", REL0(pc));
712712#else
713            sprintf(buff, "zbsr   %s", REL0(pc));
713            sprintf(buffer, "zbsr   %s", REL0(pc));
714714#endif
715715            pc+=1;
716716            flags = DASMFLAG_STEP_OVER;
717717         break;
718718      case 0xbc: case 0xbd: case 0xbe:
719719#if HJB
720         sprintf(buff, "call n%c,%s", cc[rv], ADR(pc));
720         sprintf(buffer, "call n%c,%s", cc[rv], ADR(pc));
721721#else
722            sprintf(buff, "bsfa,%c %s", cc[rv], ADR(pc));
722            sprintf(buffer, "bsfa,%c %s", cc[rv], ADR(pc));
723723#endif
724724            pc+=2;
725725            flags = DASMFLAG_STEP_OVER;
726726         break;
727727      case 0xbf:
728728#if HJB
729         sprintf(buff, "call %s+r3", ADR(pc));
729         sprintf(buffer, "call %s+r3", ADR(pc));
730730#else
731            sprintf(buff, "bsxa   %s", ADR(pc));
731            sprintf(buffer, "bsxa   %s", ADR(pc));
732732#endif
733733            pc+=2;
734734            flags = DASMFLAG_STEP_OVER;
735735         break;
736736      case 0xc0:
737         sprintf(buff, "nop");
737         sprintf(buffer, "nop");
738738         break;
739739      case 0xc1: case 0xc2: case 0xc3:
740740#if HJB
741         sprintf(buff, "ld   r%d,r0", rv);
741         sprintf(buffer, "ld   r%d,r0", rv);
742742#else
743            sprintf(buff, "strz,%d", rv);
743            sprintf(buffer, "strz,%d", rv);
744744#endif
745745            break;
746746      case 0xc4: case 0xc5: case 0xc6: case 0xc7:
747747#if HJB
748         sprintf(buff, "**** $%02X",op);
748         sprintf(buffer, "**** $%02X",op);
749749#else
750         sprintf(buff, "****   $%02X",op);
750         sprintf(buffer, "****   $%02X",op);
751751#endif
752752         break;
753753      case 0xc8: case 0xc9: case 0xca: case 0xcb:
754754#if HJB
755         sprintf(buff, "ld   (%s),r%d", REL(pc), rv);
755         sprintf(buffer, "ld   (%s),r%d", REL(pc), rv);
756756#else
757            sprintf(buff, "strr,%d %s", rv, REL(pc));
757            sprintf(buffer, "strr,%d %s", rv, REL(pc));
758758#endif
759759            pc+=1;
760760         break;
761761      case 0xcc: case 0xcd: case 0xce: case 0xcf:
762762#if HJB
763         sprintf(buff, "ld   %s", ABS(0,rv,pc));
763         sprintf(buffer, "ld   %s", ABS(0,rv,pc));
764764#else
765         sprintf(buff, "stra,%s", ABS(1,rv,pc));
765         sprintf(buffer, "stra,%s", ABS(1,rv,pc));
766766#endif
767767         pc+=2;
768768         break;
769769      case 0xd0: case 0xd1: case 0xd2: case 0xd3:
770770#if HJB
771         sprintf(buff, "rol  r%d", rv);
771         sprintf(buffer, "rol  r%d", rv);
772772#else
773            sprintf(buff, "rrl,%d", rv);
773            sprintf(buffer, "rrl,%d", rv);
774774#endif
775775            break;
776776      case 0xd4: case 0xd5: case 0xd6: case 0xd7:
777777#if HJB
778         sprintf(buff, "out  (%s),r%d", IMM(pc), rv);
778         sprintf(buffer, "out  (%s),r%d", IMM(pc), rv);
779779#else
780            sprintf(buff, "wrte,%d %s", rv, IMM(pc));
780            sprintf(buffer, "wrte,%d %s", rv, IMM(pc));
781781#endif
782782            pc+=1;
783783         break;
784784      case 0xd8: case 0xd9: case 0xda: case 0xdb:
785785#if HJB
786         sprintf(buff, "ijnz r%d,%s", rv, REL(pc));
786         sprintf(buffer, "ijnz r%d,%s", rv, REL(pc));
787787#else
788            sprintf(buff, "birr,%d %s", rv, REL(pc));
788            sprintf(buffer, "birr,%d %s", rv, REL(pc));
789789#endif
790790            pc+=1;
791791            flags = DASMFLAG_STEP_OVER;
792792         break;
793793      case 0xdc: case 0xdd: case 0xde: case 0xdf:
794794#if HJB
795         sprintf(buff, "ijnz r%d,%s", rv, ADR(pc));
795         sprintf(buffer, "ijnz r%d,%s", rv, ADR(pc));
796796#else
797            sprintf(buff, "bira,%d %s", rv, ADR(pc));
797            sprintf(buffer, "bira,%d %s", rv, ADR(pc));
798798#endif
799799            pc+=2;
800800            flags = DASMFLAG_STEP_OVER;
801801         break;
802802      case 0xe0: case 0xe1: case 0xe2: case 0xe3:
803803#if HJB
804         sprintf(buff, "cp   r0,%d", rv);
804         sprintf(buffer, "cp   r0,%d", rv);
805805#else
806            sprintf(buff, "comz,%d", rv);
806            sprintf(buffer, "comz,%d", rv);
807807#endif
808808            break;
809809      case 0xe4: case 0xe5: case 0xe6: case 0xe7:
810810#if HJB
811         sprintf(buff, "cp   r%d,%s", rv, IMM(pc));
811         sprintf(buffer, "cp   r%d,%s", rv, IMM(pc));
812812#else
813            sprintf(buff, "comi,%d %s", rv, IMM(pc));
813            sprintf(buffer, "comi,%d %s", rv, IMM(pc));
814814#endif
815815            pc+=1;
816816         break;
817817      case 0xe8: case 0xe9: case 0xea: case 0xeb:
818818#if HJB
819         sprintf(buff, "cp   r%d,(%s)", rv, REL(pc));
819         sprintf(buffer, "cp   r%d,(%s)", rv, REL(pc));
820820#else
821            sprintf(buff, "comr,%d %s", rv, REL(pc));
821            sprintf(buffer, "comr,%d %s", rv, REL(pc));
822822#endif
823823            pc+=1;
824824         break;
825825      case 0xec: case 0xed: case 0xee: case 0xef:
826826#if HJB
827         sprintf(buff, "cp   %s", ABS(1,rv,pc));
827         sprintf(buffer, "cp   %s", ABS(1,rv,pc));
828828#else
829         sprintf(buff, "coma,%s", ABS(1,rv,pc));
829         sprintf(buffer, "coma,%s", ABS(1,rv,pc));
830830#endif
831831            pc+=2;
832832         break;
833833      case 0xf0: case 0xf1: case 0xf2: case 0xf3:
834834#if HJB
835         sprintf(buff, "out  (data),r%d", rv);
835         sprintf(buffer, "out  (data),r%d", rv);
836836#else
837            sprintf(buff, "wrtd,%d", rv);
837            sprintf(buffer, "wrtd,%d", rv);
838838#endif
839839            break;
840840      case 0xf4: case 0xf5: case 0xf6: case 0xf7:
841841#if HJB
842         sprintf(buff, "test r%d,%s", rv, IMM(pc));
842         sprintf(buffer, "test r%d,%s", rv, IMM(pc));
843843#else
844            sprintf(buff, "tmi,%d  %s", rv, IMM(pc));
844            sprintf(buffer, "tmi,%d  %s", rv, IMM(pc));
845845#endif
846846            pc+=1;
847847         break;
848848      case 0xf8: case 0xf9: case 0xfa: case 0xfb:
849849#if HJB
850         sprintf(buff, "djnz r%d,%s", rv, REL(pc));
850         sprintf(buffer, "djnz r%d,%s", rv, REL(pc));
851851#else
852            sprintf(buff, "bdrr,%d %s", rv, REL(pc));
852            sprintf(buffer, "bdrr,%d %s", rv, REL(pc));
853853#endif
854854            pc+=1;
855855            flags = DASMFLAG_STEP_OVER;
856856         break;
857857      case 0xfc: case 0xfd: case 0xfe: case 0xff:
858858#if HJB
859         sprintf(buff, "djnz r%d,%s", rv, ADR(pc));
859         sprintf(buffer, "djnz r%d,%s", rv, ADR(pc));
860860#else
861            sprintf(buff, "bdra,%d %s", rv, ADR(pc));
861            sprintf(buffer, "bdra,%d %s", rv, ADR(pc));
862862#endif
863863            pc+=2;
864864            flags = DASMFLAG_STEP_OVER;
src/emu/cpu/s2650/s2650.h
r3535r3536
2424/* Fake Sense Line */
2525#define S2650_SENSE_PORT 0x102
2626
27extern void s2650_get_info(UINT32 state, cpuinfo *info);
27extern CPU_GET_INFO( s2650 );
2828
29extern offs_t s2650_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
29extern CPU_DISASSEMBLE( s2650 );
3030
3131#endif /* __S2650_H__ */
src/emu/cpu/cdp1802/1802dasm.c
r3535r3536
9696
9797};
9898
99offs_t cdp1802_dasm(char *dst, offs_t oldpc, const UINT8 *oprom, const UINT8 *opram)
99CPU_DISASSEMBLE( cdp1802 )
100100{
101101   UINT32 flags = 0;
102   int pc;
102   int oldpc = pc;
103103   int oper;
104104   UINT16 absolut;
105105   oldpc&=0xffff;
r3535r3536
109109   switch(oper&0xf0) {
110110   case 0:
111111      if (oper==0) {
112         sprintf(dst,"%-5s",table[oper].mnemonic);
112         sprintf(buffer,"%-5s",table[oper].mnemonic);
113113      } else {
114         sprintf(dst,"%-5sR%.1x",table[(oper&0xf0)|1].mnemonic, oper&0x0f);
114         sprintf(buffer,"%-5sR%.1x",table[(oper&0xf0)|1].mnemonic, oper&0x0f);
115115      }
116116      break;
117117   case 0xd0:
r3535r3536
126126   case 0xa0:
127127   case 0xb0:
128128   case 0xe0:
129      sprintf(dst,"%-5sR%.1x",table[oper&0xf0].mnemonic, oper&0x0f);
129      sprintf(buffer,"%-5sR%.1x",table[oper&0xf0].mnemonic, oper&0x0f);
130130      break;
131131   default:
132132      switch(oper&0xf8) {
133133      case 0x60:
134134         if (oper==0x60) {
135            sprintf(dst,"%-5s",table[oper].mnemonic);
135            sprintf(buffer,"%-5s",table[oper].mnemonic);
136136         } else {
137            sprintf(dst,"%-5s%d",table[(oper&0xf8)|1].mnemonic, oper&0x7);
137            sprintf(buffer,"%-5s%d",table[(oper&0xf8)|1].mnemonic, oper&0x7);
138138         }
139139         break;
140140      case 0x68:
141         sprintf(dst,"%-5s%d",table[(oper&0xf8)|1].mnemonic, oper&0x7);
141         sprintf(buffer,"%-5s%d",table[(oper&0xf8)|1].mnemonic, oper&0x7);
142142         break;
143143      default:
144144         switch (table[oper].adr) {
145145         case Imp:
146            sprintf(dst,"%-5s",table[oper].mnemonic);
146            sprintf(buffer,"%-5s",table[oper].mnemonic);
147147            if (oper == 0x70 || oper == 0x71)
148148               flags = DASMFLAG_STEP_OUT;
149149            break;
150150         case Imm:
151            sprintf(dst,"%-5s#%.2x",table[oper].mnemonic,oprom[pc++ - oldpc]);
151            sprintf(buffer,"%-5s#%.2x",table[oper].mnemonic,oprom[pc++ - oldpc]);
152152            break;
153153         case Low:
154154            absolut=oprom[pc++ - oldpc];
155155            absolut|=pc&0xff00;
156            sprintf(dst,"%-5s%.4x",table[oper].mnemonic,absolut);
156            sprintf(buffer,"%-5s%.4x",table[oper].mnemonic,absolut);
157157            break;
158158         case Abs:
159159            absolut=oprom[pc++ - oldpc]<<8;
160160            absolut|=oprom[pc++ - oldpc];
161            sprintf(dst,"%-5s%.4x",table[oper].mnemonic,absolut);
161            sprintf(buffer,"%-5s%.4x",table[oper].mnemonic,absolut);
162162            break;
163163         default:
164            sprintf(dst,"%-5s%.2x","ill",oper);
164            sprintf(buffer,"%-5s%.2x","ill",oper);
165165            break;
166166         }
167167         break;
src/emu/cpu/cdp1802/cdp1802.c
r3535r3536
5555
5656static CDP1802_Regs cdp1802;
5757
58static void cdp1802_get_context (void *dst)
58static CPU_GET_CONTEXT( cdp1802 )
5959{
6060   *(CDP1802_Regs *)dst = cdp1802;
6161}
6262
63static void cdp1802_set_context (void *src)
63static CPU_SET_CONTEXT( cdp1802 )
6464{
6565   cdp1802 = *(CDP1802_Regs *)src;
6666}
6767
68static void cdp1802_init(int index, int clock, const void *config, int (*irqcallback)(int))
68static CPU_INIT( cdp1802 )
6969{
7070   cdp1802.intf = (cdp1802_interface *) config;
7171
r3535r3536
829829   }
830830}
831831
832static int cdp1802_execute(int cycles)
832static CPU_EXECUTE( cdp1802 )
833833{
834834   running_machine *machine = Machine;
835835
r3535r3536
905905   cdp1802.dmaout = state;
906906}
907907
908static void cdp1802_reset(void)
908static CPU_RESET( cdp1802 )
909909{
910910   cdp1802.mode = CDP1802_MODE_RESET;
911911}
r3535r3536
914914 * Generic set_info
915915 **************************************************************************/
916916
917static void cdp1802_set_info(UINT32 state, cpuinfo *info)
917static CPU_SET_INFO( cdp1802 )
918918{
919919   switch (state)
920920   {
r3535r3536
956956/****************************************************************************
957957 * Return a formatted string for a register
958958 ****************************************************************************/
959void cdp1802_get_info(UINT32 state, cpuinfo *info)
959CPU_GET_INFO( cdp1802 )
960960{
961961   switch(state)
962962   {
r3535r3536
10191019      case CPUINFO_INT_REGISTER + CDP1802_PC:         info->i = cdp1802.r[cdp1802.p];         break;
10201020
10211021      /* --- the following bits of info are returned as pointers to data or functions --- */
1022      case CPUINFO_PTR_SET_INFO:                  info->setinfo = cdp1802_set_info;      break;
1023      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = cdp1802_get_context;   break;
1024      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = cdp1802_set_context;   break;
1025      case CPUINFO_PTR_INIT:                     info->init = cdp1802_init;            break;
1026      case CPUINFO_PTR_RESET:                     info->reset = cdp1802_reset;         break;
1027      case CPUINFO_PTR_EXECUTE:                  info->execute = cdp1802_execute;      break;
1022      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(cdp1802);      break;
1023      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(cdp1802);   break;
1024      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(cdp1802);   break;
1025      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(cdp1802);            break;
1026      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(cdp1802);         break;
1027      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(cdp1802);      break;
10281028      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1029      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = cdp1802_dasm;      break;
1029      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(cdp1802);      break;
10301030      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &cdp1802_ICount;         break;
10311031
10321032      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/cdp1802/cdp1802.h
r3535r3536
7171   CDP1802_I,      // Holds High-Order Instruction Digit
7272};
7373
74void cdp1802_get_info(UINT32 state, cpuinfo *info);
74CPU_GET_INFO( cdp1802 );
7575
7676typedef cdp1802_control_mode (*cdp1802_mode_read_func)(running_machine *machine);
7777#define CDP1802_MODE_READ(name) cdp1802_control_mode name(running_machine *machine)
r3535r3536
115115};
116116#define CDP1802_INTERFACE(name) const cdp1802_interface (name) =
117117
118offs_t cdp1802_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
118CPU_DISASSEMBLE( cdp1802 );
119119
120120#endif /* __CDP1802_H__ */
src/emu/cpu/se3208/se3208.c
r3535r3536
2121   UINT32 ER;
2222   UINT32 PPC;
2323
24   int (*irq_callback)(int irqline);
24   cpu_irq_callback irq_callback;
25   const device_config *device;
2526   UINT8 IRQ;
2627   UINT8 NMI;
2728} _SE3208Context;
r3535r3536
17211722      OpTable[i]=DecodeOp(i);
17221723}
17231724
1724static void SE3208_Reset(void)
1725static CPU_RESET( SE3208 )
17251726{
1726   int (*save_irqcallback)(int) = Context.irq_callback;
1727   cpu_irq_callback save_irqcallback = Context.irq_callback;
1728   const device_config *save_device = Context.device;
17271729   memset(&Context,0,sizeof(_SE3208Context));
17281730   Context.irq_callback = save_irqcallback;
1731   Context.device = save_device;
17291732   Context.PC=SE3208_Read32(0);
17301733   Context.SR=0;
17311734   Context.IRQ=CLEAR_LINE;
r3535r3536
17581761   if(!(TESTFLAG(FLAG_AUT)))
17591762      Context.PC=SE3208_Read32(8);
17601763   else
1761      Context.PC=SE3208_Read32(4*Context.irq_callback(0));
1764      Context.PC=SE3208_Read32(4*Context.irq_callback(Context.device, 0));
17621765   change_pc(Context.PC+2);
17631766}
17641767
17651768
1766static int SE3208_Run(int cycles)
1769static CPU_EXECUTE( SE3208 )
17671770{
17681771   SE3208_ICount=cycles;
17691772   do
r3535r3536
17911794   return cycles-SE3208_ICount;
17921795}
17931796
1794static void SE3208_Init(int index, int clock, const void *config, int (*irqcallback)(int))
1797static CPU_INIT( SE3208 )
17951798{
17961799   BuildTable();
17971800
17981801   Context.irq_callback = irqcallback;
1802   Context.device = device;
17991803}
18001804
1801static void SE3208_Exit(void)
1805static CPU_EXIT( SE3208 )
18021806{
18031807   if(OpTable)
18041808      free(OpTable);
18051809}
18061810
18071811
1808static void SE3208_get_context(void *dst)
1812static CPU_GET_CONTEXT( SE3208 )
18091813{
18101814   if(dst)
18111815      memcpy(dst,&Context,sizeof(Context));
18121816}
18131817
1814static void SE3208_set_context(void *src)
1818static CPU_SET_CONTEXT( SE3208 )
18151819{
18161820   if(src)
18171821      memcpy(&Context,src,sizeof(Context));
r3535r3536
18261830}
18271831
18281832
1829static void SE3208_set_info(UINT32 state, cpuinfo *info)
1833static CPU_SET_INFO( SE3208 )
18301834{
18311835   switch (state)
18321836   {
r3535r3536
18521856}
18531857
18541858
1855void SE3208_get_info(UINT32 state, cpuinfo *info)
1859CPU_GET_INFO( SE3208 )
18561860{
18571861   switch (state)
18581862   {
r3535r3536
18991903      case CPUINFO_INT_REGISTER + SE3208_R7:         info->i = Context.R[ 7];            break;
19001904
19011905      /* --- the following bits of info are returned as pointers to data or functions --- */
1902      case CPUINFO_PTR_SET_INFO:                  info->setinfo = SE3208_set_info;      break;
1903      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = SE3208_get_context;   break;
1904      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = SE3208_set_context;   break;
1905      case CPUINFO_PTR_INIT:                     info->init = SE3208_Init;            break;
1906      case CPUINFO_PTR_RESET:                     info->reset = SE3208_Reset;            break;
1907      case CPUINFO_PTR_EXIT:                     info->exit = SE3208_Exit;            break;
1908      case CPUINFO_PTR_EXECUTE:                  info->execute = SE3208_Run;            break;
1906      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(SE3208);      break;
1907      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(SE3208);   break;
1908      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(SE3208);   break;
1909      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(SE3208);      break;
1910      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(SE3208);   break;
1911      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(SE3208);      break;
1912      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(SE3208);break;
19091913      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1910      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = SE3208_Dasm;      break;
1914      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(SE3208);      break;
19111915      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &SE3208_ICount;         break;
19121916
19131917      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/se3208/se3208dis.c
r3535r3536
14001400}
14011401
14021402
1403offs_t SE3208_Dasm(char *Buffer, offs_t PC, const UINT8 *oprom, const UINT8 *opram)
1403CPU_DISASSEMBLE( SE3208 )
14041404{
14051405   UINT16 Opcode;
14061406
14071407   CLRFLAG(FLAG_E);
14081408   Context.ER=0;
14091409
1410   Context.PC=PC;
1410   Context.PC=pc;
14111411   Opcode=oprom[0] | (oprom[1] << 8);
1412   return 2 | ((*DecodeOp(Opcode))(Opcode,Buffer)) | DASMFLAG_SUPPORTED;
1412   return 2 | ((*DecodeOp(Opcode))(Opcode,buffer)) | DASMFLAG_SUPPORTED;
14131413}
src/emu/cpu/se3208/se3208.h
r3535r3536
88
99#define SE3208_INT   0
1010
11extern void SE3208_get_info(UINT32 state, cpuinfo *info);
11extern CPU_GET_INFO( SE3208 );
1212
13offs_t SE3208_Dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
13CPU_DISASSEMBLE( SE3208 );
src/emu/cpu/e132xs/e132xs.c
r3535r3536
331331
332332   struct _delay delay;
333333
334   int   (*irq_callback)(int irqline);
334   cpu_irq_callback irq_callback;
335   const device_config *device;
335336
336337   INT32 instruction_length;
337338   INT32 intblock;
r3535r3536
14711472   if (IO3_LINE_STATE && (FCR & 0x00000500) == 0x00000400)
14721473   {
14731474      execute_int(get_trap_addr(TRAPNO_IO3));
1474      (*hyperstone.irq_callback)(IRQ_IO3);
1475      (*hyperstone.irq_callback)(hyperstone.device, IRQ_IO3);
14751476      return;
14761477   }
14771478
r3535r3536
14871488   if (INT1_LINE_STATE && (FCR & 0x10000000) == 0x00000000)
14881489   {
14891490      execute_int(get_trap_addr(TRAPNO_INT1));
1490      (*hyperstone.irq_callback)(IRQ_INT1);
1491      (*hyperstone.irq_callback)(hyperstone.device, IRQ_INT1);
14911492      return;
14921493   }
14931494
r3535r3536
15031504   if (INT2_LINE_STATE && (FCR & 0x20000000) == 0x00000000)
15041505   {
15051506      execute_int(get_trap_addr(TRAPNO_INT2));
1506      (*hyperstone.irq_callback)(IRQ_INT2);
1507      (*hyperstone.irq_callback)(hyperstone.device, IRQ_INT2);
15071508      return;
15081509   }
15091510
r3535r3536
15191520   if (INT3_LINE_STATE && (FCR & 0x40000000) == 0x00000000)
15201521   {
15211522      execute_int(get_trap_addr(TRAPNO_INT3));
1522      (*hyperstone.irq_callback)(IRQ_INT3);
1523      (*hyperstone.irq_callback)(hyperstone.device, IRQ_INT3);
15231524      return;
15241525   }
15251526
r3535r3536
15351536   if (INT4_LINE_STATE && (FCR & 0x80000000) == 0x00000000)
15361537   {
15371538      execute_int(get_trap_addr(TRAPNO_INT4));
1538      (*hyperstone.irq_callback)(IRQ_INT4);
1539      (*hyperstone.irq_callback)(hyperstone.device, IRQ_INT4);
15391540      return;
15401541   }
15411542
r3535r3536
15431544   if (IO1_LINE_STATE && (FCR & 0x00000005) == 0x00000004)
15441545   {
15451546      execute_int(get_trap_addr(TRAPNO_IO1));
1546      (*hyperstone.irq_callback)(IRQ_IO1);
1547      (*hyperstone.irq_callback)(hyperstone.device, IRQ_IO1);
15471548      return;
15481549   }
15491550
r3535r3536
15511552   if (IO2_LINE_STATE && (FCR & 0x00000050) == 0x00000040)
15521553   {
15531554      execute_int(get_trap_addr(TRAPNO_IO2));
1554      (*hyperstone.irq_callback)(IRQ_IO2);
1555      (*hyperstone.irq_callback)(hyperstone.device, IRQ_IO2);
15551556      return;
15561557   }
15571558}
r3535r3536
15641565      ISR &= ~(1 << irqline);
15651566}
15661567
1567static void hyperstone_init(int index, int clock, const void *config, int (*irqcallback)(int), int scale_mask)
1568static void hyperstone_init(const device_config *device, int index, int clock, const void *config, cpu_irq_callback irqcallback, int scale_mask)
15681569{
15691570   state_save_register_item_array("E132XS", index, hyperstone.global_regs);
15701571   state_save_register_item_array("E132XS", index, hyperstone.local_regs);
r3535r3536
15771578   state_save_register_item("E132XS", index, hyperstone.tr_clocks_per_tick);
15781579
15791580   hyperstone.irq_callback = irqcallback;
1581   hyperstone.device = device;
15801582   hyperstone.timer = timer_alloc(e132xs_timer_callback, NULL);
15811583   hyperstone.clock_scale_mask = scale_mask;
15821584}
15831585
15841586#if (HAS_E116T || HAS_E116XT || HAS_E116XS || HAS_E116XSR || HAS_GMS30C2116 || HAS_GMS30C2216)
1585static void e116_init(int index, int clock, const void *config, int (*irqcallback)(int), int scale_mask)
1587static void e116_init(const device_config *device, int index, int clock, const void *config, cpu_irq_callback irqcallback, int scale_mask)
15861588{
15871589   hyp_cpu_read_byte      = program_read_byte_16be;
15881590   hyp_cpu_read_half_word = program_read_word_16be;
r3535r3536
15961598
15971599   hyp_type_16bit = 1;
15981600
1599   hyperstone_init(index, clock, config, irqcallback, scale_mask);
1601   hyperstone_init(device, index, clock, config, irqcallback, scale_mask);
16001602}
16011603#endif
16021604
16031605#if (HAS_E116T)
1604static void e116t_init(int index, int clock, const void *config, int (*irqcallback)(int))
1606static CPU_INIT( e116t )
16051607{
1606   e116_init(index, clock, config, irqcallback, 0);
1608   e116_init(device, index, clock, config, irqcallback, 0);
16071609}
16081610#endif
16091611
16101612#if (HAS_E116XT)
1611static void e116xt_init(int index, int clock, const void *config, int (*irqcallback)(int))
1613static CPU_INIT( e116xt )
16121614{
1613   e116_init(index, clock, config, irqcallback, 3);
1615   e116_init(device, index, clock, config, irqcallback, 3);
16141616}
16151617#endif
16161618
16171619#if (HAS_E116XS)
1618static void e116xs_init(int index, int clock, const void *config, int (*irqcallback)(int))
1620static CPU_INIT( e116xs )
16191621{
1620   e116_init(index, clock, config, irqcallback, 7);
1622   e116_init(device, index, clock, config, irqcallback, 7);
16211623}
16221624#endif
16231625
16241626#if (HAS_E116XSR)
1625static void e116xsr_init(int index, int clock, const void *config, int (*irqcallback)(int))
1627static CPU_INIT( e116xsr )
16261628{
1627   e116_init(index, clock, config, irqcallback, 7);
1629   e116_init(device, index, clock, config, irqcallback, 7);
16281630}
16291631#endif
16301632
16311633#if (HAS_GMS30C2116)
1632static void gms30c2116_init(int index, int clock, const void *config, int (*irqcallback)(int))
1634static CPU_INIT( gms30c2116 )
16331635{
1634   e116_init(index, clock, config, irqcallback, 0);
1636   e116_init(device, index, clock, config, irqcallback, 0);
16351637}
16361638#endif
16371639
16381640#if (HAS_GMS30C2216)
1639static void gms30c2216_init(int index, int clock, const void *config, int (*irqcallback)(int))
1641static CPU_INIT( gms30c2216 )
16401642{
1641   e116_init(index, clock, config, irqcallback, 0);
1643   e116_init(device, index, clock, config, irqcallback, 0);
16421644}
16431645#endif
16441646
16451647#if (HAS_E132N || HAS_E132T || HAS_E132XN || HAS_E132XT || HAS_E132XS || HAS_E132XSR || HAS_GMS30C2132 || HAS_GMS30C2232)
1646static void e132_init(int index, int clock, const void *config, int (*irqcallback)(int), int scale_mask)
1648static void e132_init(const device_config *device, int index, int clock, const void *config, cpu_irq_callback irqcallback, int scale_mask)
16471649{
16481650   hyp_cpu_read_byte      = program_read_byte_32be;
16491651   hyp_cpu_read_half_word = program_read_word_32be;
r3535r3536
16571659
16581660   hyp_type_16bit = 0;
16591661
1660   hyperstone_init(index, clock, config, irqcallback, scale_mask);
1662   hyperstone_init(device, index, clock, config, irqcallback, scale_mask);
16611663}
16621664#endif
16631665
16641666#if (HAS_E132N)
1665static void e132n_init(int index, int clock, const void *config, int (*irqcallback)(int))
1667static CPU_INIT( e132n )
16661668{
1667   e132_init(index, clock, config, irqcallback, 0);
1669   e132_init(device, index, clock, config, irqcallback, 0);
16681670}
16691671#endif
16701672
16711673#if (HAS_E132T)
1672static void e132t_init(int index, int clock, const void *config, int (*irqcallback)(int))
1674static CPU_INIT( e132t )
16731675{
1674   e132_init(index, clock, config, irqcallback, 0);
1676   e132_init(device, index, clock, config, irqcallback, 0);
16751677}
16761678#endif
16771679
16781680#if (HAS_E132XN)
1679static void e132xn_init(int index, int clock, const void *config, int (*irqcallback)(int))
1681static CPU_INIT( e132xn )
16801682{
1681   e132_init(index, clock, config, irqcallback, 3);
1683   e132_init(device, index, clock, config, irqcallback, 3);
16821684}
16831685#endif
16841686
16851687#if (HAS_E132XT)
1686static void e132xt_init(int index, int clock, const void *config, int (*irqcallback)(int))
1688static CPU_INIT( e132xt )
16871689{
1688   e132_init(index, clock, config, irqcallback, 3);
1690   e132_init(device, index, clock, config, irqcallback, 3);
16891691}
16901692#endif
16911693
16921694#if (HAS_E132XS)
1693static void e132xs_init(int index, int clock, const void *config, int (*irqcallback)(int))
1695static CPU_INIT( e132xs )
16941696{
1695   e132_init(index, clock, config, irqcallback, 7);
1697   e132_init(device, index, clock, config, irqcallback, 7);
16961698}
16971699#endif
16981700
16991701#if (HAS_E132XSR)
1700static void e132xsr_init(int index, int clock, const void *config, int (*irqcallback)(int))
1702static CPU_INIT( e132xsr )
17011703{
1702   e132_init(index, clock, config, irqcallback, 7);
1704   e132_init(device, index, clock, config, irqcallback, 7);
17031705}
17041706#endif
17051707
17061708#if (HAS_GMS30C2132)
1707static void gms30c2132_init(int index, int clock, const void *config, int (*irqcallback)(int))
1709static CPU_INIT( gms30c2132 )
17081710{
1709   e132_init(index, clock, config, irqcallback, 0);
1711   e132_init(device, index, clock, config, irqcallback, 0);
17101712}
17111713#endif
17121714
17131715#if (HAS_GMS30C2232)
1714static void gms30c2232_init(int index, int clock, const void *config, int (*irqcallback)(int))
1716static CPU_INIT( gms30c2232 )
17151717{
1716   e132_init(index, clock, config, irqcallback, 0);
1718   e132_init(device, index, clock, config, irqcallback, 0);
17171719}
17181720#endif
17191721
1720static void hyperstone_reset(void)
1722static CPU_RESET( hyperstone )
17211723{
17221724   //TODO: Add different reset initializations for BCR, MCR, FCR, TPR
17231725
17241726   emu_timer *save_timer;
1725   int (*save_irqcallback)(int);
1727   const device_config *save_device;
1728   cpu_irq_callback save_irqcallback;
17261729
17271730   save_timer = hyperstone.timer;
17281731   save_irqcallback = hyperstone.irq_callback;
1732   save_device = hyperstone.device;
17291733   memset(&hyperstone, 0, sizeof(hyperstone_regs));
17301734   hyperstone.irq_callback = save_irqcallback;
1735   hyperstone.device = save_device;
17311736   hyperstone.timer = save_timer;
17321737
17331738   hyperstone.tr_clocks_per_tick = 2;
r3535r3536
17561761   hyperstone_ICount -= hyperstone.clock_cycles_2;
17571762}
17581763
1759static void hyperstone_exit(void)
1764static CPU_EXIT( hyperstone )
17601765{
17611766   // nothing to do
17621767}
17631768
1764static void hyperstone_get_context(void *regs)
1769static CPU_GET_CONTEXT( hyperstone )
17651770{
17661771   /* copy the context */
1767   if( regs )
1768      *(hyperstone_regs *)regs = hyperstone;
1772   if( dst )
1773      *(hyperstone_regs *)dst = hyperstone;
17691774}
17701775
1771static void hyperstone_set_context(void *regs)
1776static CPU_SET_CONTEXT( hyperstone )
17721777{
17731778   /* copy the context */
1774   if (regs)
1775      hyperstone = *(hyperstone_regs *)regs;
1779   if (src)
1780      hyperstone = *(hyperstone_regs *)src;
17761781}
17771782
1778static offs_t hyperstone_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
1783static CPU_DISASSEMBLE( hyperstone )
17791784{
17801785   return dasm_hyperstone( buffer, pc, oprom, GET_H, GET_FP );
17811786}
r3535r3536
47474752#include "e132xsop.c"
47484753
47494754
4750static int hyperstone_execute(int cycles)
4755static CPU_EXECUTE( hyperstone )
47514756{
47524757   hyperstone_ICount = cycles;
47534758
r3535r3536
47954800 * Generic set_info
47964801 **************************************************************************/
47974802
4798static void hyperstone_set_info(UINT32 state, cpuinfo *info)
4803static CPU_SET_INFO( hyperstone )
47994804{
48004805   switch (state)
48014806   {
r3535r3536
49314936 * Generic get_info
49324937 **************************************************************************/
49334938
4934static void hyperstone_get_info(UINT32 state, cpuinfo *info)
4939static CPU_GET_INFO( hyperstone )
49354940{
49364941   switch (state)
49374942   {
r3535r3536
50755080      case CPUINFO_INT_REGISTER + E132XS_L63:         info->i =  hyperstone.local_regs[63];   break;
50765081
50775082      /* --- the following bits of info are returned as pointers to data or functions --- */
5078      case CPUINFO_PTR_SET_INFO:                  info->setinfo = hyperstone_set_info;   break;
5079      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = hyperstone_get_context; break;
5080      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = hyperstone_set_context; break;
5083      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(hyperstone);   break;
5084      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(hyperstone); break;
5085      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(hyperstone); break;
50815086      case CPUINFO_PTR_INIT:                     info->init = NULL;                  break;
5082      case CPUINFO_PTR_RESET:                     info->reset = hyperstone_reset;         break;
5083      case CPUINFO_PTR_EXIT:                     info->exit = hyperstone_exit;         break;
5084      case CPUINFO_PTR_EXECUTE:                  info->execute = hyperstone_execute;      break;
5087      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(hyperstone);         break;
5088      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(hyperstone);         break;
5089      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(hyperstone);      break;
50855090      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
5086      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = hyperstone_dasm;   break;
5091      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(hyperstone);   break;
50875092      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &hyperstone_ICount;      break;
50885093
50895094      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map16 = NULL;   break;
r3535r3536
52335238
52345239
52355240#if (HAS_E116T)
5236void e116t_get_info(UINT32 state, cpuinfo *info)
5241CPU_GET_INFO( e116t )
52375242{
52385243   switch (state)
52395244   {
r3535r3536
52415246      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 16;               break;
52425247      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 16;               break;
52435248
5244      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = address_map_e116_4k_iram_map; break;
5249      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_4k_iram_map); break;
52455250
52465251      /* --- the following bits of info are returned as pointers to data or functions --- */
5247      case CPUINFO_PTR_INIT:                     info->init = e116t_init;               break;
5252      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(e116t);               break;
52485253
52495254      /* --- the following bits of info are returned as NULL-terminated strings --- */
52505255      case CPUINFO_STR_NAME:                     strcpy(info->s, "E1-16T");            break;
52515256
52525257      default:
5253         hyperstone_get_info(state, info);
5258         CPU_GET_INFO_CALL(hyperstone);
52545259   }
52555260}
52565261#endif
52575262
52585263#if (HAS_E116XT)
5259void e116xt_get_info(UINT32 state, cpuinfo *info)
5264CPU_GET_INFO( e116xt )
52605265{
52615266   switch (state)
52625267   {
r3535r3536
52645269      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 16;               break;
52655270      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 16;               break;
52665271
5267      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = address_map_e116_8k_iram_map; break;
5272      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_8k_iram_map); break;
52685273
52695274      /* --- the following bits of info are returned as pointers to data or functions --- */
5270      case CPUINFO_PTR_INIT:                     info->init = e116xt_init;               break;
5275      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(e116xt);               break;
52715276
52725277      /* --- the following bits of info are returned as NULL-terminated strings --- */
52735278      case CPUINFO_STR_NAME:                     strcpy(info->s, "E1-16XT");            break;
52745279
52755280      default:
5276         hyperstone_get_info(state, info);
5281         CPU_GET_INFO_CALL(hyperstone);
52775282   }
52785283}
52795284#endif
52805285
52815286#if (HAS_E116XS)
5282void e116xs_get_info(UINT32 state, cpuinfo *info)
5287CPU_GET_INFO( e116xs )
52835288{
52845289   switch (state)
52855290   {
r3535r3536
52875292      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 16;               break;
52885293      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 16;               break;
52895294
5290      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = address_map_e116_16k_iram_map; break;
5295      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_16k_iram_map); break;
52915296
52925297      /* --- the following bits of info are returned as pointers to data or functions --- */
5293      case CPUINFO_PTR_INIT:                     info->init = e116xs_init;               break;
5298      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(e116xs);               break;
52945299
52955300      /* --- the following bits of info are returned as NULL-terminated strings --- */
52965301      case CPUINFO_STR_NAME:                     strcpy(info->s, "E1-16XS");            break;
52975302
52985303      default:
5299         hyperstone_get_info(state, info);
5304         CPU_GET_INFO_CALL(hyperstone);
53005305   }
53015306}
53025307#endif
53035308
53045309#if (HAS_E116XSR)
5305void e116xsr_get_info(UINT32 state, cpuinfo *info)
5310CPU_GET_INFO( e116xsr )
53065311{
53075312   switch (state)
53085313   {
r3535r3536
53105315      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 16;               break;
53115316      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 16;               break;
53125317
5313      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = address_map_e116_16k_iram_map; break;
5318      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_16k_iram_map); break;
53145319
53155320      /* --- the following bits of info are returned as pointers to data or functions --- */
5316      case CPUINFO_PTR_INIT:                     info->init = e116xsr_init;               break;
5321      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(e116xsr);               break;
53175322
53185323      /* --- the following bits of info are returned as NULL-terminated strings --- */
53195324      case CPUINFO_STR_NAME:                     strcpy(info->s, "E1-16XSR");         break;
53205325
53215326      default:
5322         hyperstone_get_info(state, info);
5327         CPU_GET_INFO_CALL(hyperstone);
53235328   }
53245329}
53255330#endif
53265331
53275332#if (HAS_E132N)
5328void e132n_get_info(UINT32 state, cpuinfo *info)
5333CPU_GET_INFO( e132n )
53295334{
53305335   switch (state)
53315336   {
r3535r3536
53335338      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 32;               break;
53345339      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 32;               break;
53355340
5336      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_e132_4k_iram_map; break;
5341      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_4k_iram_map); break;
53375342
53385343      /* --- the following bits of info are returned as pointers to data or functions --- */
5339      case CPUINFO_PTR_INIT:                     info->init = e132n_init;               break;
5344      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(e132n);               break;
53405345
53415346      /* --- the following bits of info are returned as NULL-terminated strings --- */
53425347      case CPUINFO_STR_NAME:                     strcpy(info->s, "E1-32N");            break;
53435348
53445349      default:
5345         hyperstone_get_info(state, info);
5350         CPU_GET_INFO_CALL(hyperstone);
53465351   }
53475352}
53485353#endif
53495354
53505355#if (HAS_E132T)
5351void e132t_get_info(UINT32 state, cpuinfo *info)
5356CPU_GET_INFO( e132t )
53525357{
53535358   switch (state)
53545359   {
r3535r3536
53565361      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 32;               break;
53575362      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 32;               break;
53585363
5359      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_e132_4k_iram_map; break;
5364      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_4k_iram_map); break;
53605365
53615366      /* --- the following bits of info are returned as pointers to data or functions --- */
5362      case CPUINFO_PTR_INIT:                     info->init = e132t_init;               break;
5367      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(e132t);               break;
53635368
53645369      /* --- the following bits of info are returned as NULL-terminated strings --- */
53655370      case CPUINFO_STR_NAME:                     strcpy(info->s, "E1-32T");            break;
53665371
53675372      default:
5368         hyperstone_get_info(state, info);
5373         CPU_GET_INFO_CALL(hyperstone);
53695374   }
53705375}
53715376#endif
53725377
53735378#if (HAS_E132XN)
5374void e132xn_get_info(UINT32 state, cpuinfo *info)
5379CPU_GET_INFO( e132xn )
53755380{
53765381   switch (state)
53775382   {
r3535r3536
53795384      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 32;               break;
53805385      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 32;               break;
53815386
5382      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_e132_8k_iram_map; break;
5387      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_8k_iram_map); break;
53835388
53845389      /* --- the following bits of info are returned as pointers to data or functions --- */
5385      case CPUINFO_PTR_INIT:                     info->init = e132xn_init;               break;
5390      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(e132xn);               break;
53865391
53875392      /* --- the following bits of info are returned as NULL-terminated strings --- */
53885393      case CPUINFO_STR_NAME:                     strcpy(info->s, "E1-32XN");            break;
53895394
53905395      default:
5391         hyperstone_get_info(state, info);
5396         CPU_GET_INFO_CALL(hyperstone);
53925397   }
53935398}
53945399#endif
53955400
53965401#if (HAS_E132XT)
5397void e132xt_get_info(UINT32 state, cpuinfo *info)
5402CPU_GET_INFO( e132xt )
53985403{
53995404   switch (state)
54005405   {
r3535r3536
54025407      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 32;               break;
54035408      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 32;               break;
54045409
5405      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_e132_8k_iram_map; break;
5410      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_8k_iram_map); break;
54065411
54075412      /* --- the following bits of info are returned as pointers to data or functions --- */
5408      case CPUINFO_PTR_INIT:                     info->init = e132xt_init;               break;
5413      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(e132xt);               break;
54095414
54105415      /* --- the following bits of info are returned as NULL-terminated strings --- */
54115416      case CPUINFO_STR_NAME:                     strcpy(info->s, "E1-32XT");            break;
54125417
54135418      default:
5414         hyperstone_get_info(state, info);
5419         CPU_GET_INFO_CALL(hyperstone);
54155420   }
54165421}
54175422#endif
54185423
54195424#if (HAS_E132XS)
5420void e132xs_get_info(UINT32 state, cpuinfo *info)
5425CPU_GET_INFO( e132xs )
54215426{
54225427   switch (state)
54235428   {
r3535r3536
54255430      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 32;               break;
54265431      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 32;               break;
54275432
5428      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_e132_16k_iram_map; break;
5433      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_16k_iram_map); break;
54295434
54305435      /* --- the following bits of info are returned as pointers to data or functions --- */
5431      case CPUINFO_PTR_INIT:                     info->init = e132xs_init;               break;
5436      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(e132xs);               break;
54325437
54335438      /* --- the following bits of info are returned as NULL-terminated strings --- */
54345439      case CPUINFO_STR_NAME:                     strcpy(info->s, "E1-32XS");            break;
54355440
54365441      default:
5437         hyperstone_get_info(state, info);
5442         CPU_GET_INFO_CALL(hyperstone);
54385443   }
54395444}
54405445#endif
54415446
54425447#if (HAS_E132XSR)
5443void e132xsr_get_info(UINT32 state, cpuinfo *info)
5448CPU_GET_INFO( e132xsr )
54445449{
54455450   switch (state)
54465451   {
r3535r3536
54485453      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 32;               break;
54495454      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 32;               break;
54505455
5451      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_e132_16k_iram_map; break;
5456      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_16k_iram_map); break;
54525457
54535458      /* --- the following bits of info are returned as pointers to data or functions --- */
5454      case CPUINFO_PTR_INIT:                     info->init = e132xsr_init;               break;
5459      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(e132xsr);               break;
54555460
54565461      /* --- the following bits of info are returned as NULL-terminated strings --- */
54575462      case CPUINFO_STR_NAME:                     strcpy(info->s, "E1-32XSR");         break;
54585463
54595464      default:
5460         hyperstone_get_info(state, info);
5465         CPU_GET_INFO_CALL(hyperstone);
54615466   }
54625467}
54635468#endif
54645469
54655470#if (HAS_GMS30C2116)
5466void gms30c2116_get_info(UINT32 state, cpuinfo *info)
5471CPU_GET_INFO( gms30c2116 )
54675472{
54685473   switch (state)
54695474   {
r3535r3536
54715476      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 16;               break;
54725477      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 16;               break;
54735478
5474      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = address_map_e116_4k_iram_map; break;
5479      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_4k_iram_map); break;
54755480
54765481      /* --- the following bits of info are returned as pointers to data or functions --- */
5477      case CPUINFO_PTR_INIT:                     info->init = gms30c2116_init;               break;
5482      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(gms30c2116);               break;
54785483
54795484      /* --- the following bits of info are returned as NULL-terminated strings --- */
54805485      case CPUINFO_STR_NAME:                     strcpy(info->s, "GMS30C2116");         break;
54815486
54825487      default:
5483         hyperstone_get_info(state, info);
5488         CPU_GET_INFO_CALL(hyperstone);
54845489   }
54855490}
54865491#endif
54875492
54885493#if (HAS_GMS30C2132)
5489void gms30c2132_get_info(UINT32 state, cpuinfo *info)
5494CPU_GET_INFO( gms30c2132 )
54905495{
54915496   switch (state)
54925497   {
r3535r3536
54945499      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 32;               break;
54955500      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 32;               break;
54965501
5497      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_e132_4k_iram_map; break;
5502      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_4k_iram_map); break;
54985503
54995504      /* --- the following bits of info are returned as pointers to data or functions --- */
5500      case CPUINFO_PTR_INIT:                     info->init = gms30c2132_init;               break;
5505      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(gms30c2132);               break;
55015506
55025507      /* --- the following bits of info are returned as NULL-terminated strings --- */
55035508      case CPUINFO_STR_NAME:                     strcpy(info->s, "GMS30C2132");         break;
55045509
55055510      default:
5506         hyperstone_get_info(state, info);
5511         CPU_GET_INFO_CALL(hyperstone);
55075512   }
55085513}
55095514#endif
55105515
55115516#if (HAS_GMS30C2216)
5512void gms30c2216_get_info(UINT32 state, cpuinfo *info)
5517CPU_GET_INFO( gms30c2216 )
55135518{
55145519   switch (state)
55155520   {
r3535r3536
55175522      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 16;               break;
55185523      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 16;               break;
55195524
5520      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = address_map_e116_8k_iram_map; break;
5525      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_8k_iram_map); break;
55215526
55225527      /* --- the following bits of info are returned as pointers to data or functions --- */
5523      case CPUINFO_PTR_INIT:                     info->init = gms30c2216_init;               break;
5528      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(gms30c2216);               break;
55245529
55255530      /* --- the following bits of info are returned as NULL-terminated strings --- */
55265531      case CPUINFO_STR_NAME:                     strcpy(info->s, "GMS30C2216");         break;
55275532
55285533      default:
5529         hyperstone_get_info(state, info);
5534         CPU_GET_INFO_CALL(hyperstone);
55305535   }
55315536}
55325537#endif
55335538
55345539#if (HAS_GMS30C2232)
5535void gms30c2232_get_info(UINT32 state, cpuinfo *info)
5540CPU_GET_INFO( gms30c2232 )
55365541{
55375542   switch (state)
55385543   {
r3535r3536
55405545      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 32;               break;
55415546      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 32;               break;
55425547
5543      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_e132_8k_iram_map; break;
5548      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_8k_iram_map); break;
55445549
55455550      /* --- the following bits of info are returned as pointers to data or functions --- */
5546      case CPUINFO_PTR_INIT:                     info->init = gms30c2232_init;               break;
5551      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(gms30c2232);               break;
55475552
55485553      /* --- the following bits of info are returned as NULL-terminated strings --- */
55495554      case CPUINFO_STR_NAME:                     strcpy(info->s, "GMS30C2232");         break;
55505555
55515556      default:
5552         hyperstone_get_info(state, info);
5557         CPU_GET_INFO_CALL(hyperstone);
55535558   }
55545559}
55555560#endif
src/emu/cpu/e132xs/e132xs.h
r3535r3536
2424/* Functions */
2525
2626#if (HAS_E116T)
27void e116t_get_info(UINT32 state, cpuinfo *info);
27CPU_GET_INFO( e116t );
2828#endif
2929
3030#if (HAS_E116XT)
31void e116xt_get_info(UINT32 state, cpuinfo *info);
31CPU_GET_INFO( e116xt );
3232#endif
3333
3434#if (HAS_E116XS)
35void e116xs_get_info(UINT32 state, cpuinfo *info);
35CPU_GET_INFO( e116xs );
3636#endif
3737
3838#if (HAS_E116XSR)
39void e116xsr_get_info(UINT32 state, cpuinfo *info);
39CPU_GET_INFO( e116xsr );
4040#endif
4141
4242#if (HAS_E132N)
43void e132n_get_info(UINT32 state, cpuinfo *info);
43CPU_GET_INFO( e132n );
4444#endif
4545
4646#if (HAS_E132T)
47void e132t_get_info(UINT32 state, cpuinfo *info);
47CPU_GET_INFO( e132t );
4848#endif
4949
5050#if (HAS_E132XN)
51void e132xn_get_info(UINT32 state, cpuinfo *info);
51CPU_GET_INFO( e132xn );
5252#endif
5353
5454#if (HAS_E132XT)
55void e132xt_get_info(UINT32 state, cpuinfo *info);
55CPU_GET_INFO( e132xt );
5656#endif
5757
5858#if (HAS_E132XS)
59void e132xs_get_info(UINT32 state, cpuinfo *info);
59CPU_GET_INFO( e132xs );
6060#endif
6161
6262#if (HAS_E132XSR)
63void e132xsr_get_info(UINT32 state, cpuinfo *info);
63CPU_GET_INFO( e132xsr );
6464#endif
6565
6666#if (HAS_GMS30C2116)
67void gms30c2116_get_info(UINT32 state, cpuinfo *info);
67CPU_GET_INFO( gms30c2116 );
6868#endif
6969
7070#if (HAS_GMS30C2132)
71void gms30c2132_get_info(UINT32 state, cpuinfo *info);
71CPU_GET_INFO( gms30c2132 );
7272#endif
7373
7474#if (HAS_GMS30C2216)
75void gms30c2216_get_info(UINT32 state, cpuinfo *info);
75CPU_GET_INFO( gms30c2216 );
7676#endif
7777
7878#if (HAS_GMS30C2232)
79void gms30c2232_get_info(UINT32 state, cpuinfo *info);
79CPU_GET_INFO( gms30c2232 );
8080#endif
8181
8282extern unsigned dasm_hyperstone(char *buffer, unsigned pc, const UINT8 *oprom, unsigned h_flag, int private_fp);
src/emu/cpu/mcs51/mcs51.c
r3535r3536
3030 *
3131 *****************************************************************************/
3232
33/*****************************************************************************
34 *   DS5002FP emulator by Manuel Abadia
35 *
36 *   October 2008, couriersud: Merged back in mcs51
37 *
38 *   What has been added?
39 *      - Extra SFRs
40 *      - Bytewide Bus Support
41 *      - Memory Partition and Memory Range
42 *      - Bootstrap Configuration
43 *      - Power Fail Interrupt
44 *      - Timed Access
45 *      - Stop Mode
46 *      - Idle Mode
47 *
48 *   What is not implemented?
49 *      - Peripherals and Reprogrammable Peripheral Controller
50 *      - CRC-16
51 *      - Watchdog timer
52 *
53 *   The main features of the DS5002FP are:
54 *      - 100% code-compatible with 8051
55 *      - Directly addresses 64kB program/64kB data memory
56 *      - Nonvolatile memory control circuitry
57 *      - 10-year data retention in the absence of power
58 *      - In-system reprogramming via serial port
59 *      - Dedicated memory bus, preserving four 8-bit ports for general purpose I/O
60 *      - Power-fail reset
61 *      - Early warning power-fail interrupt
62 *      - Watchdog timer
63 *      - Accesses up to 128kB on the bytewide bus
64 *      - Decodes memory for 32kB x 8 or 128kB x 8 SRAMs
65 *      - Four additional decoded peripheral-chip enables
66 *      - CRC hardware for checking memory validity
67 *      - Optionally emulates an 8042-style slave interface
68 *      - Memory encryption using an 80-bit encryption key
69 *      - Automatic random generation of encryption keys
70 *      - Self-destruct input for tamper protection
71 *      - Optional top-coating prevents microprobe
72 *
73 *****************************************************************************/
74
3375/******************************************************************************
3476 *  Notes:
35 *        *Important*: Internal ROM needs to be treated the same as external rom by the programmer
36 *                     creating the driver (ie, use standard cpu rom region)
3777 *
3878 *        The term cycles is used here to really refer to clock oscilations, because 1 machine cycle
3979 *        actually takes 12 oscilations.
r3535r3536
5393 *        July 28,2004: Fixed MOVX command and added External Ram Paging Support
5494 *        July 31,2004: Added Serial Mode 0 Support & Fixed Interrupt Flags for Serial Port
5595 *
56 *        NOW Implemented: RAM paging using hardware configured addressing...
57 *        (July 28,2004)   the "MOVX a,@R0/R1" and "MOVX @R0/R1,a" commands can use any of the other ports
58 *                 to output a page offset into external ram, but it is totally based on the hardware setup.
59 *
60 *        Timing needs to be implemented via MAME timers perhaps?
61 *
6296 *        October, 2008, Couriersud - Major rewrite
6397 *
6498 *****************************************************************************/
r3535r3536
69103 *  - T0 output clock ?
70104 *
71105 * - Implement 80C52 extended serial capabilities
72 * - Full Timer support (all modes)
73106 * - Fix serial communication - This is a big hack (but working) right now.
74107 * - Implement 83C751 in sslam.c
75108 * - Fix cardline.c
76 * - Fix sslam.c and cardline.c
77109 *      most likely due to different behaviour of I/O pins. The boards
78110 *      actually use 80CXX, i.e. CMOS versions.
79111 *      "Normal" 805X will return a 0 if reading from a output port which has
80112 *      a 0 written to it's latch. At least cardline expects a 1 here.
81113 *
82 * Done:
114 * Done: (Couriersud)
115 * - Merged DS5002FP
116 * - Disassembler now uses type specific memory names
117 * - Merged DS5002FP disasm
118 * - added 83C751 memory names to disassembler
119 * - Pointer-ified
83120 * - Implemented cmos features
84121 * - Implemented 80C52 interrupt handling
85122 * - Fix segas18.c (segaic16.c) memory handling.
r3535r3536
231268   UINT8   irq_active;         /* mask which irq levels are serviced */
232269   UINT8   irq_prio[8];      /* interrupt priority */
233270
271   int      icount;
272
234273   mcs51_uart uart;         /* internal uart */
235274
236275   /* Internal Ram */
r3535r3536
238277   UINT8   *sfr_ram;         /* 128 SFR - these are in 0x80 - 0xFF */
239278
240279   /* SFR Callbacks */
241   void    (*sfr_write)(size_t offset, UINT8 data);
242   UINT8   (*sfr_read)(size_t offset);
280   void    (*sfr_write)(mcs51_regs *mcs51, size_t offset, UINT8 data);
281   UINT8   (*sfr_read)(mcs51_regs *mcs51, size_t offset);
243282
244283   /* Interrupt Callback */
245   int    (*irq_callback)(int irqline);
284   cpu_irq_callback irq_callback;
285   const device_config *device;
246286
247287   /* Serial Port TX/RX Callbacks */
248288   // TODO: Move to special port r/w
r3535r3536
282322
283323/* Read/Write a byte from/to the Internal RAM */
284324
285#define IRAM_R(a)      iram_read(a)
286#define IRAM_W(a, d)   iram_write(a, d)
325#define IRAM_R(a)      iram_read(mcs51, a)
326#define IRAM_W(a, d)   iram_write(mcs51, a, d)
287327
288328/* Read/Write a byte from/to the Internal RAM indirectly */
289329/* (called from indirect addressing)                     */
290#define IRAM_IR(a)       data_read_byte_8le((a) & mcs51.ram_mask)
291#define IRAM_IW(a, d)    data_write_byte_8le((a) & mcs51.ram_mask, d)
330#define IRAM_IR(a)       data_read_byte_8le((a) & mcs51->ram_mask)
331#define IRAM_IW(a, d)    data_write_byte_8le((a) & mcs51->ram_mask, d)
292332
293333/* Form an Address to Read/Write to External RAM indirectly */
294334/* (called from indirect addressing)                        */
295#define ERAM_ADDR(a,m)   external_ram_iaddr(a,m)
335#define ERAM_ADDR(a,m)   external_ram_iaddr(mcs51, a,m)
296336
297337/* Read/Write a bit from Bit Addressable Memory */
298#define BIT_R(a)      bit_address_r(a)
299#define BIT_W(a,v)      bit_address_w(a,v)
338#define BIT_R(a)      bit_address_r(mcs51, a)
339#define BIT_W(a,v)      bit_address_w(mcs51, a, v)
300340
301341/* Input/Output a byte from given I/O port */
302342#define IN(port)      ((UINT8)io_read_byte(port))
r3535r3536
307347    SHORTCUTS
308348***************************************************************************/
309349
310#define PPC    mcs51.ppc
311#define PC      mcs51.pc
312#define RWM      mcs51.rwm
350#define PPC    mcs51->ppc
351#define PC      mcs51->pc
352#define RWM      mcs51->rwm
313353
314354/* SFR Registers - These are accessed directly for speed on read */
315355/* Read accessors                                                */
316356
317#define SFR_A(a)      mcs51.sfr_ram[(a)]
357#define SFR_A(a)      mcs51->sfr_ram[(a)]
318358#define SET_SFR_A(a,v)   do { SFR_A(a) = (v); } while (0)
319359
320360#define ACC         ((const UINT8) SFR_A(ADDR_ACC))
r3535r3536
341381#define B         SFR_A(ADDR_B)
342382#define SBUF      SFR_A(ADDR_SBUF)
343383
344#define R_REG(r)   mcs51.internal_ram[(r) | (PSW & 0x18)]
384#define R_REG(r)   mcs51->internal_ram[(r) | (PSW & 0x18)]
345385#define DPTR      ((DPH<<8) | DPL)
346386
347387/* 8052 Only registers */
r3535r3536
400440#define SET_SBUF(v)   SET_SFR_A(ADDR_SBUF, v)
401441
402442/* No actions triggered on write */
403#define SET_REG(r, v)   do { mcs51.internal_ram[(r) | (PSW & 0x18)] = (v); } while (0)
443#define SET_REG(r, v)   do { mcs51->internal_ram[(r) | (PSW & 0x18)] = (v); } while (0)
404444
405445#define SET_DPTR(n)      do { DPH = ((n) >> 8) & 0xff; DPL = (n) & 0xff; } while (0)
406446
r3535r3536
582622
583623
584624/*Add and Subtract Flag settings*/
585#define DO_ADD_FLAGS(a,d,c)   do_add_flags(a,d,c)
586#define DO_SUB_FLAGS(a,d,c)   do_sub_flags(a,d,c)
625#define DO_ADD_FLAGS(a,d,c)   do_add_flags(mcs51, a, d, c)
626#define DO_SUB_FLAGS(a,d,c)   do_sub_flags(mcs51, a, d, c)
587627
588#define SET_PARITY()   do {mcs51.recalc_parity |= 1;} while (0)
589#define PUSH_PC()      push_pc()
590#define POP_PC()      pop_pc()
628#define SET_PARITY()   do {mcs51->recalc_parity |= 1;} while (0)
629#define PUSH_PC()      push_pc(mcs51)
630#define POP_PC()      pop_pc(mcs51)
591631
592#if 0
593/* Any pending IRQ */
594#define SERIALPORT_IRQ    ((R_SCON & 0x03) && GET_ES)
595#define TIMERS_IRQ        ((GET_TF0 && GET_ET0) || (GET_TF1 && GET_ET1))
596#define EXTERNAL_IRQ      ((GET_IE0 && GET_EX0) || (GET_IE1 && GET_EX1))
597
598#if (HAS_I8052 || HAS_I8752)
599#define NO_PENDING_IRQ  !(TIMERS_IRQ) && !(EXTERNAL_IRQ) && !(SERIALPORT_IRQ) && !(GET_ET2 && (GET_TF2 || GET_EXF2))
600#else
601#define NO_PENDING_IRQ  !(TIMERS_IRQ) && !(EXTERNAL_IRQ) && !(SERIALPORT_IRQ)
602#endif
603#endif
604
605632/* Clear Current IRQ  */
606#define CLEAR_CURRENT_IRQ() clear_current_irq()
633#define CLEAR_CURRENT_IRQ() clear_current_irq(mcs51)
607634
608635/***************************************************************************
609636    GLOBAL VARIABLES
610637***************************************************************************/
611638
612static int mcs51_icount;
639static void *token;
613640
614static mcs51_regs mcs51;
641static void (*hold_serial_tx_callback)(int data);
642static int (*hold_serial_rx_callback)(void);
615643
616
617644/***************************************************************************
618645    FUNCTION PROTOTYPES
619646***************************************************************************/
620647
621static void check_irqs(void);
622INLINE void serial_transmit(UINT8 data);
648static void check_irqs(mcs51_regs *mcs51);
649INLINE void serial_transmit(mcs51_regs *mcs51, UINT8 data);
623650
624651/* Hold callback functions so they can be set by caller (before the cpu reset) */
625652
626static void (*hold_serial_tx_callback)(int data);
627static int (*hold_serial_rx_callback)(void);
628
629653/***************************************************************************
630654    INLINE FUNCTIONS
631655***************************************************************************/
632656
633INLINE void clear_current_irq(void)
657INLINE void clear_current_irq(mcs51_regs *mcs51)
634658{
635   //printf("reti cip %d, act %02x\n",mcs51.cur_irq_prio,  mcs51.irq_active);
636   //assert(mcs51.cur_irq_prio >= 0 && mcs51.irq_active);
637
638   if (mcs51.cur_irq_prio >= 0)
639      mcs51.irq_active &= ~(1 << mcs51.cur_irq_prio);
640   if (mcs51.irq_active & 4)
641      mcs51.cur_irq_prio = 2;
642   else if (mcs51.irq_active & 2)
643      mcs51.cur_irq_prio = 1;
644   else if (mcs51.irq_active & 1)
645      mcs51.cur_irq_prio = 0;
659   if (mcs51->cur_irq_prio >= 0)
660      mcs51->irq_active &= ~(1 << mcs51->cur_irq_prio);
661   if (mcs51->irq_active & 4)
662      mcs51->cur_irq_prio = 2;
663   else if (mcs51->irq_active & 2)
664      mcs51->cur_irq_prio = 1;
665   else if (mcs51->irq_active & 1)
666      mcs51->cur_irq_prio = 0;
646667   else
647      mcs51.cur_irq_prio = -1;
648   LOG(("New: %d %02x\n", mcs51.cur_irq_prio, mcs51.irq_active));
668      mcs51->cur_irq_prio = -1;
669   LOG(("New: %d %02x\n", mcs51->cur_irq_prio, mcs51->irq_active));
649670}
650671
651INLINE UINT8 r_acc(void) { return SFR_A(ADDR_ACC); }
672INLINE UINT8 r_acc(mcs51_regs *mcs51) { return SFR_A(ADDR_ACC); }
652673
653INLINE UINT8 r_psw(void) { return SFR_A(ADDR_PSW); }
674INLINE UINT8 r_psw(mcs51_regs *mcs51) { return SFR_A(ADDR_PSW); }
654675
655INLINE void update_ptrs(void)
676INLINE void update_ptrs(mcs51_regs *mcs51)
656677{
657   mcs51.internal_ram = memory_get_write_ptr(cpu_getactivecpu(), ADDRESS_SPACE_DATA, 0x00);
658   mcs51.sfr_ram = memory_get_write_ptr(cpu_getactivecpu(), ADDRESS_SPACE_DATA, 0x100);
678   mcs51->internal_ram = memory_get_write_ptr(cpu_getactivecpu(), ADDRESS_SPACE_DATA, 0x00);
679   mcs51->sfr_ram = memory_get_write_ptr(cpu_getactivecpu(), ADDRESS_SPACE_DATA, 0x100);
659680}
660681
661682
662683/* Generate an external ram address for read/writing using indirect addressing mode */
684
663685/*The lowest 8 bits of the address are passed in (from the R0/R1 register), however
664686  the hardware can be configured to set the rest of the address lines to any available output port pins, which
665687  means the only way we can implement this is to allow the driver to setup a callback to generate the
r3535r3536
675697  provide it's own mapping.
676698*/
677699
678INLINE offs_t external_ram_iaddr(offs_t offset, offs_t mem_mask)
700/*
701    The DS5002FP has 2 16 bits data address buses (the byte-wide bus and the expanded bus). The exact memory position accessed depends on the
702    partition mode, the memory range and the expanded bus select. The partition mode and the expanded bus select can be changed at any time.
703
704    In order to simplify memory mapping to the data address bus, the following address map is assumed for partitioned mode:
705
706    0x00000-0x0ffff -> data memory on the expanded bus
707    0x10000-0x1ffff -> data memory on the byte-wide bus
708
709    For non-partitioned mode the following memory map is assumed:
710
711    0x0000-0xffff -> data memory (the bus used to access it does not matter)
712*/
713
714INLINE offs_t external_ram_iaddr(mcs51_regs *mcs51, offs_t offset, offs_t mem_mask)
679715{
680   if (mem_mask == 0x00ff)
681      return (offset & mem_mask) | (P2 << 8);
682#if 0
683    if(mcs51.eram_iaddr_callback)
684        return mcs51.eram_iaddr_callback(machine,offset,mem_mask);
685    else
686        if (mem_mask <= 0x100) LOG(("mcs51 #%d: external ram address requested (8 bit offset=%02x), but no callback available! at PC:%04x\n", cpu_getactivecpu(), offset, PC));
687#endif
716   /* Memory Range (RG1 and RG0 @ MCON and RPCTL registers) */
717   static const UINT16 ds5002fp_ranges[4] = { 0x1fff, 0x3fff, 0x7fff, 0xffff };
718   /* Memory Partition Table (RG1 & RG0 @ MCON & RPCTL registers) */
719   static const UINT32 ds5002fp_partitions[16] = {
720      0x0000, 0x1000, 0x2000, 0x3000, 0x4000, 0x5000, 0x6000,  0x7000,
721      0x8000, 0x9000, 0xa000, 0xb000, 0xc000, 0xd000, 0xe000,   0x10000 };
722
723   /* if partition mode is set, adjust offset based on the bus */
724   if (mcs51->features & FEATURE_DS5002FP)
725   {
726      if (!GET_PM) {
727         if (!GET_EXBS) {
728            if ((offset >= ds5002fp_partitions[GET_PA]) && (offset <= ds5002fp_ranges[mcs51->ds5002fp.range])) {
729               offset += 0x10000;
730            }
731         }
732      }
733   }
734   else
735   {
736      if (mem_mask == 0x00ff)
737         return (offset & mem_mask) | (P2 << 8);
738   }
688739   return offset;
689740}
690741
691742/* Internal ram read/write */
692743
693INLINE UINT8 iram_read(size_t offset)
744INLINE UINT8 iram_read(mcs51_regs *mcs51, size_t offset)
694745{
695   return (((offset) < 0x80) ? data_read_byte_8le(offset) : mcs51.sfr_read(offset));
746   return (((offset) < 0x80) ? data_read_byte_8le(offset) : mcs51->sfr_read(mcs51, offset));
696747}
697748
698INLINE void iram_write(size_t offset, UINT8 data)
749INLINE void iram_write(mcs51_regs *mcs51, size_t offset, UINT8 data)
699750{
700751   if ((offset) < 0x80)
701752      data_write_byte_8le(offset, data);
702753   else
703      mcs51.sfr_write(offset, data);
754      mcs51->sfr_write(mcs51, offset, data);
704755}
705756
706757/*Push the current PC to the stack*/
707INLINE void push_pc(void)
758INLINE void push_pc(mcs51_regs *mcs51)
708759{
709760   UINT8 tmpSP = SP+1;                  //Grab and Increment Stack Pointer
710761   IRAM_IW(tmpSP, (PC & 0xff));            //Store low byte of PC to Internal Ram (Use IRAM_IW to store stack above 128 bytes)
r3535r3536
714765}
715766
716767/*Pop the current PC off the stack and into the pc*/
717INLINE void pop_pc(void)
768INLINE void pop_pc(mcs51_regs *mcs51)
718769{
719770   UINT8 tmpSP = SP;                     //Grab Stack Pointer
720771   PC = (IRAM_IR(tmpSP--) & 0xff) << 8;      //Store hi byte to PC (must use IRAM_IR to access stack pointing above 128 bytes)
r3535r3536
724775}
725776
726777//Set the PSW Parity Flag
727INLINE void set_parity(void)
778INLINE void set_parity(mcs51_regs *mcs51)
728779{
729780   //This flag will be set when the accumulator contains an odd # of bits set..
730781   UINT8 p = 0;
r3535r3536
739790   SET_P(p & 1);
740791}
741792
742INLINE UINT8 bit_address_r(UINT8 offset)
793INLINE UINT8 bit_address_r(mcs51_regs *mcs51, UINT8 offset)
743794{
744795   UINT8   word;
745796   UINT8   mask;
r3535r3536
766817}
767818
768819
769INLINE void bit_address_w(UINT8 offset, UINT8 bit)
820INLINE void bit_address_w(mcs51_regs *mcs51, UINT8 offset, UINT8 bit)
770821{
771822   int   word;
772823   UINT8   mask;
r3535r3536
798849   }
799850}
800851
801INLINE void do_add_flags(UINT8 a, UINT8 data, UINT8 c)
852INLINE void do_add_flags(mcs51_regs *mcs51, UINT8 a, UINT8 data, UINT8 c)
802853{
803854   UINT16 result = a+data+c;
804855   INT16 result1 = (INT8)a+(INT8)data+c;
r3535r3536
809860   SET_OV(result1 < -128 || result1 > 127);
810861}
811862
812INLINE void do_sub_flags(UINT8 a, UINT8 data, UINT8 c)
863INLINE void do_sub_flags(mcs51_regs *mcs51, UINT8 a, UINT8 data, UINT8 c)
813864{
814865   UINT16 result = a-(data+c);
815866   INT16 result1 = (INT8)a-(INT8)(data+c);
r3535r3536
820871   SET_OV((result1 < -128 || result1 > 127));
821872}
822873
823INLINE void transmit_receive(int source)
874INLINE void transmit_receive(mcs51_regs *mcs51, int source)
824875{
825876   int mode = (GET_SM0<<1) | GET_SM1;
826877
827878   if (source == 1) /* timer1 */
828      mcs51.uart.smod_div = (mcs51.uart.smod_div + 1) & (2-GET_SMOD);
879      mcs51->uart.smod_div = (mcs51->uart.smod_div + 1) & (2-GET_SMOD);
829880
830881   switch(mode) {
831882      //8 bit shifter ( + start,stop bit ) - baud set by clock freq / 12
832883      case 0:
833         mcs51.uart.rx_clk += (source == 0) ? 16 : 0; /* clock / 12 */
834         mcs51.uart.tx_clk += (source == 0) ? 16 : 0; /* clock / 12 */
884         mcs51->uart.rx_clk += (source == 0) ? 16 : 0; /* clock / 12 */
885         mcs51->uart.tx_clk += (source == 0) ? 16 : 0; /* clock / 12 */
835886         break;
836887      //8 bit uart ( + start,stop bit ) - baud set by timer1 or timer2
837888      case 1:
838889      case 3:
839890         if (source == 1)
840891         {
841            mcs51.uart.tx_clk += (GET_TCLK ? 0 : !mcs51.uart.smod_div);
842            mcs51.uart.rx_clk += (GET_RCLK ? 0 : !mcs51.uart.smod_div);
892            mcs51->uart.tx_clk += (GET_TCLK ? 0 : !mcs51->uart.smod_div);
893            mcs51->uart.rx_clk += (GET_RCLK ? 0 : !mcs51->uart.smod_div);
843894         }
844895         if (source == 2)
845896         {
846            mcs51.uart.tx_clk += (GET_TCLK ? 1 : 0);
847            mcs51.uart.rx_clk += (GET_RCLK ? 1 : 0);
897            mcs51->uart.tx_clk += (GET_TCLK ? 1 : 0);
898            mcs51->uart.rx_clk += (GET_RCLK ? 1 : 0);
848899         }
849900         break;
850901      //9 bit uart
851902      case 2:
852         mcs51.uart.rx_clk += (source == 0) ? (GET_SMOD ? 6 : 3) : 0; /* clock / 12 * 3 / 8 (16) = clock / 32 (64)*/
853         mcs51.uart.tx_clk += (source == 0) ? (GET_SMOD ? 6 : 3) : 0; /* clock / 12 */
903         mcs51->uart.rx_clk += (source == 0) ? (GET_SMOD ? 6 : 3) : 0; /* clock / 12 * 3 / 8 (16) = clock / 32 (64)*/
904         mcs51->uart.tx_clk += (source == 0) ? (GET_SMOD ? 6 : 3) : 0; /* clock / 12 */
854905         break;
855906   }
856907   /* transmit ? */
857   if (mcs51.uart.tx_clk >= 16)
908   if (mcs51->uart.tx_clk >= 16)
858909   {
859      mcs51.uart.tx_clk &= 0x0f;
860      if(mcs51.uart.bits_to_send)
910      mcs51->uart.tx_clk &= 0x0f;
911      if(mcs51->uart.bits_to_send)
861912      {
862         mcs51.uart.bits_to_send--;
863         if(mcs51.uart.bits_to_send == 0) {
864            //printf("Here1 %d\n",  mcs51.uart.bits_to_send);
913         mcs51->uart.bits_to_send--;
914         if(mcs51->uart.bits_to_send == 0) {
865915            //Call the callback function
866            if(mcs51.serial_tx_callback)
867               mcs51.serial_tx_callback(mcs51.uart.data_out);
916            if(mcs51->serial_tx_callback)
917               mcs51->serial_tx_callback(mcs51->uart.data_out);
868918            //Set Interrupt Flag
869919            SET_TI(1);
870            //Note: we'll let the main loop catch the interrupt
871920         }
872921      }
873922
874923   }
875924   /* receive */
876   if (mcs51.uart.rx_clk >= 16)
925   if (mcs51->uart.rx_clk >= 16)
877926   {
878      mcs51.uart.rx_clk &= 0x0f;
879      if (mcs51.uart.delay_cycles>0)
927      mcs51->uart.rx_clk &= 0x0f;
928      if (mcs51->uart.delay_cycles>0)
880929      {
881         mcs51.uart.delay_cycles--;
882         if (mcs51.uart.delay_cycles == 0)
930         mcs51->uart.delay_cycles--;
931         if (mcs51->uart.delay_cycles == 0)
883932         {
884933            int data = 0;
885934            //Call our callball function to retrieve the data
886            if(mcs51.serial_rx_callback)
887               data = mcs51.serial_rx_callback();
888            //printf("RX Deliver %d\n", data);
935            if(mcs51->serial_rx_callback)
936               data = mcs51->serial_rx_callback();
937            LOG(("RX Deliver %d\n", data));
889938            SET_SBUF(data);
890939            //Flag the IRQ
891940            SET_RI(1);
r3535r3536
895944}
896945
897946
898INLINE void update_timer_t0(int cycles)
947INLINE void update_timer_t0(mcs51_regs *mcs51, int cycles)
899948{
900949   int mode = (GET_M0_1<<1) | GET_M0_0;
901950   UINT32 count = 0;
r3535r3536
905954      UINT32 delta;
906955
907956      /* counter / external input */
908      delta = GET_CT0 ? mcs51.t0_cnt : cycles;
957      delta = GET_CT0 ? mcs51->t0_cnt : cycles;
909958      /* taken, reset */
910      mcs51.t0_cnt = 0;
959      mcs51->t0_cnt = 0;
911960      /* TODO: Not sure about IE0. The manual specifies INT0=high,
912961         * which in turn means CLEAR_LINE.
913962         * IE0 may be edge triggered depending on IT0 */
r3535r3536
9811030 * overflow flag
9821031 */
9831032
984INLINE void update_timer_t1(int cycles)
1033INLINE void update_timer_t1(mcs51_regs *mcs51, int cycles)
9851034{
9861035   UINT8 mode = (GET_M1_1<<1) | GET_M1_0;
9871036   UINT8 mode_0 = (GET_M0_1<<1) | GET_M0_0;
r3535r3536
9951044         UINT32 overflow = 0;
9961045
9971046         /* counter / external input */
998         delta = GET_CT1 ? mcs51.t1_cnt : cycles;
1047         delta = GET_CT1 ? mcs51->t1_cnt : cycles;
9991048         /* taken, reset */
1000         mcs51.t1_cnt = 0;
1049         mcs51->t1_cnt = 0;
10011050         /* TODO: Not sure about IE0. The manual specifies INT0=high,
10021051             * which in turn means CLEAR_LINE. Change to access last_state?
10031052             * IE0 may be edge triggered depending on IT0 */
10041053         if (GET_GATE1 && !GET_IE1)
10051054            delta = 0;
10061055
1007         //printf("mode: %d\n", mode);
10081056         switch(mode) {
10091057            case 0:         /* 13 Bit Timer Mode */
10101058               count = ((TH1<<5) | ( TL1 & 0x1f ) );
r3535r3536
10371085         if (overflow)
10381086         {
10391087            SET_TF1(1);
1040            transmit_receive(1);
1088            transmit_receive(mcs51, 1);
10411089         }
10421090      }
10431091   }
r3535r3536
10481096
10491097      delta =  cycles;
10501098      /* taken, reset */
1051      mcs51.t1_cnt = 0;
1099      mcs51->t1_cnt = 0;
10521100      switch(mode) {
10531101         case 0:         /* 13 Bit Timer Mode */
10541102            count = ((TH1<<5) | ( TL1 & 0x1f ) );
r3535r3536
10801128      }
10811129      if (overflow)
10821130      {
1083         transmit_receive(1);
1131         transmit_receive(mcs51, 1);
10841132      }
10851133   }
10861134}
10871135
1088INLINE void update_timer_t2(int cycles)
1136INLINE void update_timer_t2(mcs51_regs *mcs51, int cycles)
10891137{
10901138   /* Update Timer 2 */
10911139   if(GET_TR2) {
10921140      int mode = ((GET_TCLK | GET_RCLK) << 1) | GET_CP;
1093      int delta = GET_CT2 ? mcs51.t2_cnt : (mode & 2) ? cycles * (12/2) : cycles;
1141      int delta = GET_CT2 ? mcs51->t2_cnt : (mode & 2) ? cycles * (12/2) : cycles;
10941142
10951143      UINT32 count = ((TH2<<8) | TL2) + delta;
1096      mcs51.t2_cnt = 0;
1144      mcs51->t2_cnt = 0;
10971145
10981146      switch (mode)
10991147      {
r3535r3536
11031151               SET_TF2(1);
11041152               count += ((RCAP2H<<8) | RCAP2L);
11051153            }
1106            else if (GET_EXEN2 && mcs51.t2ex_cnt>0)
1154            else if (GET_EXEN2 && mcs51->t2ex_cnt>0)
11071155            {
11081156               count += ((RCAP2H<<8) | RCAP2L);
1109               mcs51.t2ex_cnt = 0;
1157               mcs51->t2ex_cnt = 0;
11101158            }
11111159            TH2 = (count>>8) & 0xff;
11121160            TL2 =  count & 0xff;
r3535r3536
11171165            TH2 = (count>>8) & 0xff;
11181166            TL2 =  count & 0xff;
11191167
1120            if (GET_EXEN2 && mcs51.t2ex_cnt>0)
1168            if (GET_EXEN2 && mcs51->t2ex_cnt>0)
11211169            {
11221170               RCAP2H = TH2;
11231171               RCAP2L = TL2;
1124               mcs51.t2ex_cnt = 0;
1172               mcs51->t2ex_cnt = 0;
11251173            }
11261174            break;
11271175         case 2:
r3535r3536
11291177            if ( count & 0xffff0000 )
11301178            {
11311179               count += ((RCAP2H<<8) | RCAP2L);
1132               transmit_receive(2);
1180               transmit_receive(mcs51, 2);
11331181            }
11341182            TH2 = (count>>8) & 0xff;
11351183            TL2 =  count & 0xff;
r3535r3536
11381186   }
11391187}
11401188
1141INLINE void update_timers(int cycles)
1189INLINE void update_timers(mcs51_regs *mcs51, int cycles)
11421190{
11431191   /* Update Timer 0 */
1144   update_timer_t0(cycles);
1145   update_timer_t1(cycles);
1192   update_timer_t0(mcs51, cycles);
1193   update_timer_t1(mcs51, cycles);
11461194
1147   if (mcs51.features & FEATURE_I8052)
1195   if (mcs51->features & FEATURE_I8052)
11481196   {
1149      update_timer_t2(cycles);
1197      update_timer_t2(mcs51, cycles);
11501198   }
11511199}
11521200
11531201//Set up to transmit data out of serial port
11541202//NOTE: Enable Serial Port Interrupt bit is NOT required to send/receive data!
11551203
1156INLINE void serial_transmit(UINT8 data)
1204INLINE void serial_transmit(mcs51_regs *mcs51, UINT8 data)
11571205{
11581206   int mode = (GET_SM0<<1) | GET_SM1;
11591207
11601208   //Flag that we're sending data
1161   mcs51.uart.data_out = data;
1162   //printf("serial_tansmit: %x %x\n", mode, data);
1209   mcs51->uart.data_out = data;
1210   LOG(("serial_tansmit: %x %x\n", mode, data));
11631211   switch(mode) {
11641212      //8 bit shifter ( + start,stop bit ) - baud set by clock freq / 12
11651213      case 0:
1166         mcs51.uart.bits_to_send = 8+2;
1214         mcs51->uart.bits_to_send = 8+2;
11671215         break;
11681216      //8 bit uart ( + start,stop bit ) - baud set by timer1 or timer2
11691217      case 1:
1170         mcs51.uart.bits_to_send = 8+2;
1218         mcs51->uart.bits_to_send = 8+2;
11711219         break;
11721220      //9 bit uart
11731221      case 2:
r3535r3536
11771225   }
11781226}
11791227
1180INLINE void serial_receive(void)
1228INLINE void serial_receive(mcs51_regs *mcs51)
11811229{
11821230   int mode = (GET_SM0<<1) | GET_SM1;
11831231
r3535r3536
11851233      switch(mode) {
11861234         //8 bit shifter ( + start,stop bit ) - baud set by clock freq / 12
11871235         case 0:
1188            mcs51.uart.delay_cycles = 8+2;
1236            mcs51->uart.delay_cycles = 8+2;
11891237            break;
11901238         //8 bit uart ( + start,stop bit ) - baud set by timer1 or timer2
11911239         case 1:
1192            mcs51.uart.delay_cycles = 8+2;
1240            mcs51->uart.delay_cycles = 8+2;
11931241            break;
11941242         //9 bit uart
11951243         case 2:
r3535r3536
12011249}
12021250
12031251/* Check and update status of serial port */
1204INLINE void   update_serial(int cycles)
1252INLINE void   update_serial(mcs51_regs *mcs51, int cycles)
12051253{
12061254   while (--cycles>=0)
1207      transmit_receive(0);
1255      transmit_receive(mcs51, 0);
12081256}
12091257
12101258/* Check and update status of serial port */
1211INLINE void   update_irq_prio(UINT8 ipl, UINT8 iph)
1259INLINE void   update_irq_prio(mcs51_regs *mcs51, UINT8 ipl, UINT8 iph)
12121260{
12131261   int i;
12141262   for (i=0; i<8; i++)
1215      mcs51.irq_prio[i] = ((ipl >> i) & 1) | (((iph >>i ) & 1) << 1);
1263      mcs51->irq_prio[i] = ((ipl >> i) & 1) | (((iph >>i ) & 1) << 1);
12161264}
12171265
12181266/***************************************************************************
r3535r3536
12361284    OPCODES
12371285***************************************************************************/
12381286
1287#define OPHANDLER( _name ) INLINE void _name (mcs51_regs *mcs51, UINT8 r)
1288
12391289#include "mcs51ops.c"
12401290
12411291
1242static void execute_op(UINT8 op)
1292static void execute_op(mcs51_regs *mcs51, UINT8 op)
12431293{
1244   if (mcs51.recalc_parity)
1294   if (mcs51->recalc_parity)
12451295   {
1246      set_parity();
1247      mcs51.recalc_parity = 0;
1296      set_parity(mcs51);
1297      mcs51->recalc_parity = 0;
12481298   }
12491299
12501300   switch( op )
12511301   {
12521302
1253      case 0x00:   nop();                     break;   //NOP
1254      case 0x01:   ajmp(op);                  break;   //AJMP code addr
1255      case 0x02:   ljmp();                     break;   //LJMP code addr
1256      case 0x03:   rr_a();                     break;   //RR A
1257      case 0x04:   inc_a();                  break;   //INC A
1258      case 0x05:   RWM=1; inc_mem(); RWM=0;      break;   //INC data addr
1303      case 0x00:   nop(mcs51, op);                     break;   //NOP
1304      case 0x01:   ajmp(mcs51, op);                  break;   //AJMP code addr
1305      case 0x02:   ljmp(mcs51, op);                  break;   //LJMP code addr
1306      case 0x03:   rr_a(mcs51, op);                  break;   //RR A
1307      case 0x04:   inc_a(mcs51, op);                  break;   //INC A
1308      case 0x05:   RWM=1; inc_mem(mcs51, op); RWM=0;      break;   //INC data addr
12591309
12601310      case 0x06:
1261      case 0x07:   inc_ir(op&1);               break;   //INC @R0/@R1
1311      case 0x07:   inc_ir(mcs51,op&1);                  break;   //INC @R0/@R1
12621312
12631313      case 0x08:
12641314      case 0x09:
r3535r3536
12671317      case 0x0c:
12681318      case 0x0d:
12691319      case 0x0e:
1270      case 0x0f:   inc_r(op&7);               break;   //INC R0 to R7
1320      case 0x0f:   inc_r(mcs51, op&7);                  break;   //INC R0 to R7
12711321
1272      case 0x10:   RWM=1; jbc(); RWM=0;          break;    //JBC bit addr, code addr
1273      case 0x11:    acall(op);                  break;   //ACALL code addr
1274      case 0x12:   lcall();                   break;   //LCALL code addr
1275      case 0x13:   rrc_a();                  break;   //RRC A
1276      case 0x14:   dec_a();                  break;   //DEC A
1277      case 0x15:   RWM=1; dec_mem(); RWM=0;      break;   //DEC data addr
1322      case 0x10:   RWM=1; jbc(mcs51, op); RWM=0;          break;    //JBC bit addr, code addr
1323      case 0x11:    acall(mcs51, op);                  break;   //ACALL code addr
1324      case 0x12:   lcall(mcs51, op);                   break;   //LCALL code addr
1325      case 0x13:   rrc_a(mcs51, op);                  break;   //RRC A
1326      case 0x14:   dec_a(mcs51, op);                  break;   //DEC A
1327      case 0x15:   RWM=1; dec_mem(mcs51, op); RWM=0;      break;   //DEC data addr
12781328
12791329      case 0x16:
1280      case 0x17:   dec_ir(op&1);                break;   //DEC @R0/@R1
1330      case 0x17:   dec_ir(mcs51, op&1);                break;   //DEC @R0/@R1
12811331
12821332      case 0x18:
12831333      case 0x19:
r3535r3536
12861336      case 0x1c:
12871337      case 0x1d:
12881338      case 0x1e:
1289      case 0x1f:   dec_r(op&7);                break;   //DEC R0 to R7
1339      case 0x1f:   dec_r(mcs51, op&7);                break;   //DEC R0 to R7
12901340
1291      case 0x20:   jb();                     break;   //JB  bit addr, code addr
1292      case 0x21:   ajmp(op);                  break;   //AJMP code addr
1293      case 0x22:   ret();                     break;   //RET
1294      case 0x23:   rl_a();                     break;   //RL A
1295      case 0x24:   add_a_byte();               break;   //ADD A, #data
1296      case 0x25:   add_a_mem();               break;   //ADD A, data addr
1341      case 0x20:   jb(mcs51, op);                     break;   //JB  bit addr, code addr
1342      case 0x21:   ajmp(mcs51, op);                  break;   //AJMP code addr
1343      case 0x22:   ret(mcs51, op);                     break;   //RET
1344      case 0x23:   rl_a(mcs51, op);                  break;   //RL A
1345      case 0x24:   add_a_byte(mcs51, op);               break;   //ADD A, #data
1346      case 0x25:   add_a_mem(mcs51, op);               break;   //ADD A, data addr
12971347
12981348      case 0x26:
1299      case 0x27:   add_a_ir(op&1);               break;   //ADD A, @R0/@R1
1349      case 0x27:   add_a_ir(mcs51, op&1);               break;   //ADD A, @R0/@R1
13001350
13011351      case 0x28:
13021352      case 0x29:
r3535r3536
13051355      case 0x2c:
13061356      case 0x2d:
13071357      case 0x2e:
1308      case 0x2f:   add_a_r(op&7);               break;   //ADD A, R0 to R7
1358      case 0x2f:   add_a_r(mcs51, op&7);               break;   //ADD A, R0 to R7
13091359
1310      case 0x30:   jnb();                     break;   //JNB bit addr, code addr
1311      case 0x31:   acall(op);                  break;   //ACALL code addr
1312      case 0x32:   reti();                     break;   //RETI
1313      case 0x33:   rlc_a();                  break;   //RLC A
1314      case 0x34:   addc_a_byte();               break;   //ADDC A, #data
1315      case 0x35:   addc_a_mem();               break;   //ADDC A, data addr
1360      case 0x30:   jnb(mcs51, op);                     break;   //JNB bit addr, code addr
1361      case 0x31:   acall(mcs51, op);                  break;   //ACALL code addr
1362      case 0x32:   reti(mcs51, op);                  break;   //RETI
1363      case 0x33:   rlc_a(mcs51, op);                  break;   //RLC A
1364      case 0x34:   addc_a_byte(mcs51, op);               break;   //ADDC A, #data
1365      case 0x35:   addc_a_mem(mcs51, op);               break;   //ADDC A, data addr
13161366
13171367      case 0x36:
1318      case 0x37:  addc_a_ir(op&1);            break;   //ADDC A, @R0/@R1
1368      case 0x37:  addc_a_ir(mcs51, op&1);               break;   //ADDC A, @R0/@R1
13191369
13201370      case 0x38:
13211371      case 0x39:
r3535r3536
13241374      case 0x3c:
13251375      case 0x3d:
13261376      case 0x3e:
1327      case 0x3f:   addc_a_r(op&7);               break;   //ADDC A, R0 to R7
1377      case 0x3f:   addc_a_r(mcs51, op&7);               break;   //ADDC A, R0 to R7
13281378
1329      case 0x40:   jc();                     break;   //JC code addr
1330      case 0x41:   ajmp(op);                  break;   //AJMP code addr
1331      case 0x42:   RWM=1; orl_mem_a();   RWM=0;      break;   //ORL data addr, A
1332      case 0x43:   RWM=1; orl_mem_byte(); RWM=0;   break;   //ORL data addr, #data
1333      case 0x44:   orl_a_byte();               break;
1334      case 0x45:   orl_a_mem();               break;   //ORL A, data addr
1379      case 0x40:   jc(mcs51, op);                     break;   //JC code addr
1380      case 0x41:   ajmp(mcs51, op);                  break;   //AJMP code addr
1381      case 0x42:   RWM=1; orl_mem_a(mcs51, op);   RWM=0;   break;   //ORL data addr, A
1382      case 0x43:   RWM=1; orl_mem_byte(mcs51, op); RWM=0;   break;   //ORL data addr, #data
1383      case 0x44:   orl_a_byte(mcs51, op);               break;
1384      case 0x45:   orl_a_mem(mcs51, op);               break;   //ORL A, data addr
13351385
13361386      case 0x46:
1337      case 0x47:   orl_a_ir(op&1);             break;   //ORL A, @RO/@R1
1387      case 0x47:   orl_a_ir(mcs51, op&1);                break;   //ORL A, @RO/@R1
13381388
13391389      case 0x48:
13401390      case 0x49:
r3535r3536
13431393      case 0x4c:
13441394      case 0x4d:
13451395      case 0x4e:
1346      case 0x4f:    orl_a_r(op&7);                break;   //ORL A, RO to R7
1396      case 0x4f:    orl_a_r(mcs51, op&7);                break;   //ORL A, RO to R7
13471397
1348      case 0x50:   jnc();                      break;   //JNC code addr
1349      case 0x51:  acall(op);                  break;   //ACALL code addr
1350      case 0x52:   RWM=1; anl_mem_a(); RWM=0;      break;   //ANL data addr, A
1351      case 0x53:   RWM=1; anl_mem_byte(); RWM=0;   break;   //ANL data addr, #data
1352      case 0x54:   anl_a_byte();               break;   //ANL A, #data
1353      case 0x55:   anl_a_mem();               break;   //ANL A, data addr
1398      case 0x50:   jnc(mcs51, op);                   break;   //JNC code addr
1399      case 0x51:  acall(mcs51, op);                  break;   //ACALL code addr
1400      case 0x52:   RWM=1; anl_mem_a(mcs51, op); RWM=0;      break;   //ANL data addr, A
1401      case 0x53:   RWM=1; anl_mem_byte(mcs51, op); RWM=0;   break;   //ANL data addr, #data
1402      case 0x54:   anl_a_byte(mcs51, op);               break;   //ANL A, #data
1403      case 0x55:   anl_a_mem(mcs51, op);               break;   //ANL A, data addr
13541404
13551405      case 0x56:
1356      case 0x57:   anl_a_ir(op&1);               break;   //ANL A, @RO/@R1
1406      case 0x57:   anl_a_ir(mcs51, op&1);               break;   //ANL A, @RO/@R1
13571407
13581408      case 0x58:
13591409      case 0x59:
r3535r3536
13621412      case 0x5c:
13631413      case 0x5d:
13641414      case 0x5e:
1365      case 0x5f:   anl_a_r(op&7);               break;   //ANL A, RO to R7
1415      case 0x5f:   anl_a_r(mcs51, op&7);               break;   //ANL A, RO to R7
13661416
1367      case 0x60:   jz();                     break;   //JZ code addr
1368      case 0x61:   ajmp(op);                   break;   //AJMP code addr
1369      case 0x62:   RWM=1; xrl_mem_a(); RWM=0;      break;   //XRL data addr, A
1370      case 0x63:   RWM=1; xrl_mem_byte(); RWM=0;   break;   //XRL data addr, #data
1371      case 0x64:   xrl_a_byte();               break;   //XRL A, #data
1372      case 0x65:   xrl_a_mem();               break;   //XRL A, data addr
1417      case 0x60:   jz(mcs51, op);                     break;   //JZ code addr
1418      case 0x61:   ajmp(mcs51, op);                   break;   //AJMP code addr
1419      case 0x62:   RWM=1; xrl_mem_a(mcs51, op); RWM=0;      break;   //XRL data addr, A
1420      case 0x63:   RWM=1; xrl_mem_byte(mcs51, op); RWM=0;   break;   //XRL data addr, #data
1421      case 0x64:   xrl_a_byte(mcs51, op);               break;   //XRL A, #data
1422      case 0x65:   xrl_a_mem(mcs51, op);               break;   //XRL A, data addr
13731423
13741424      case 0x66:
1375      case 0x67:   xrl_a_ir(op&1);               break;   //XRL A, @R0/@R1
1425      case 0x67:   xrl_a_ir(mcs51, op&1);               break;   //XRL A, @R0/@R1
13761426
13771427      case 0x68:
13781428      case 0x69:
r3535r3536
13811431      case 0x6c:
13821432      case 0x6d:
13831433      case 0x6e:
1384      case 0x6f:   xrl_a_r(op&7);               break;   //XRL A, R0 to R7
1434      case 0x6f:   xrl_a_r(mcs51, op&7);               break;   //XRL A, R0 to R7
13851435
1386      case 0x70:   jnz();                     break;   //JNZ code addr
1387      case 0x71:   acall(op);                  break;   //ACALL code addr
1388      case 0x72:   orl_c_bitaddr();            break;   //ORL C, bit addr
1389      case 0x73:   jmp_iadptr();               break;   //JMP @A+DPTR
1390      case 0x74:   mov_a_byte();               break;   //MOV A, #data
1391      case 0x75:   mov_mem_byte();               break;   //MOV data addr, #data
1436      case 0x70:   jnz(mcs51, op);                     break;   //JNZ code addr
1437      case 0x71:   acall(mcs51, op);                  break;   //ACALL code addr
1438      case 0x72:   orl_c_bitaddr(mcs51, op);            break;   //ORL C, bit addr
1439      case 0x73:   jmp_iadptr(mcs51, op);               break;   //JMP @A+DPTR
1440      case 0x74:   mov_a_byte(mcs51, op);               break;   //MOV A, #data
1441      case 0x75:   mov_mem_byte(mcs51, op);            break;   //MOV data addr, #data
13921442
13931443      case 0x76:
1394      case 0x77:   mov_ir_byte(op&1);            break;   //MOV @R0/@R1, #data
1444      case 0x77:   mov_ir_byte(mcs51, op&1);            break;   //MOV @R0/@R1, #data
13951445
13961446      case 0x78:
13971447      case 0x79:
r3535r3536
14001450      case 0x7c:
14011451      case 0x7d:
14021452      case 0x7e:
1403      case 0x7f:   mov_r_byte(op&7);            break;   //MOV R0 to R7, #data
1453      case 0x7f:   mov_r_byte(mcs51, op&7);            break;   //MOV R0 to R7, #data
14041454
1405      case 0x80:   sjmp();                     break;   //SJMP code addr
1406      case 0x81:   ajmp(op);                  break;   //AJMP code addr
1407      case 0x82:   anl_c_bitaddr();            break;   //ANL C, bit addr
1408      case 0x83:   movc_a_iapc();               break;   //MOVC A, @A + PC
1409      case 0x84:   div_ab();                  break;   //DIV AB
1410      case 0x85:   mov_mem_mem();               break;   //MOV data addr, data addr
1455      case 0x80:   sjmp(mcs51, op);                  break;   //SJMP code addr
1456      case 0x81:   ajmp(mcs51, op);                  break;   //AJMP code addr
1457      case 0x82:   anl_c_bitaddr(mcs51, op);            break;   //ANL C, bit addr
1458      case 0x83:   movc_a_iapc(mcs51, op);               break;   //MOVC A, @A + PC
1459      case 0x84:   div_ab(mcs51, op);                  break;   //DIV AB
1460      case 0x85:   mov_mem_mem(mcs51, op);               break;   //MOV data addr, data addr
14111461
14121462      case 0x86:
1413      case 0x87:   mov_mem_ir(op&1);            break;   //MOV data addr, @R0/@R1
1463      case 0x87:   mov_mem_ir(mcs51, op&1);            break;   //MOV data addr, @R0/@R1
14141464
14151465      case 0x88:
14161466      case 0x89:
r3535r3536
14191469      case 0x8c:
14201470      case 0x8d:
14211471      case 0x8e:
1422      case 0x8f:   mov_mem_r(op&7);            break;   //MOV data addr,R0 to R7
1472      case 0x8f:   mov_mem_r(mcs51, op&7);               break;   //MOV data addr,R0 to R7
14231473
1424      case 0x90:   mov_dptr_byte();            break;   //MOV DPTR, #data
1425      case 0x91:   acall(op);                  break;   //ACALL code addr
1426      case 0x92:   RWM = 1; mov_bitaddr_c(); RWM = 0; break;   //MOV bit addr, C
1427      case 0x93:   movc_a_iadptr();            break;   //MOVC A, @A + DPTR
1428      case 0x94:   subb_a_byte();               break;   //SUBB A, #data
1429      case 0x95:   subb_a_mem();               break;   //SUBB A, data addr
1474      case 0x90:   mov_dptr_byte(mcs51, op);            break;   //MOV DPTR, #data
1475      case 0x91:   acall(mcs51, op);                  break;   //ACALL code addr
1476      case 0x92:   RWM = 1; mov_bitaddr_c(mcs51, op); RWM = 0; break;   //MOV bit addr, C
1477      case 0x93:   movc_a_iadptr(mcs51, op);            break;   //MOVC A, @A + DPTR
1478      case 0x94:   subb_a_byte(mcs51, op);               break;   //SUBB A, #data
1479      case 0x95:   subb_a_mem(mcs51, op);               break;   //SUBB A, data addr
14301480
14311481      case 0x96:
1432      case 0x97:   subb_a_ir(op&1);            break;   //SUBB A, @R0/@R1
1482      case 0x97:   subb_a_ir(mcs51, op&1);               break;   //SUBB A, @R0/@R1
14331483
14341484      case 0x98:
14351485      case 0x99:
r3535r3536
14381488      case 0x9c:
14391489      case 0x9d:
14401490      case 0x9e:
1441      case 0x9f:   subb_a_r(op&7);               break;   //SUBB A, R0 to R7
1491      case 0x9f:   subb_a_r(mcs51, op&7);               break;   //SUBB A, R0 to R7
14421492
1443      case 0xa0:   orl_c_nbitaddr();            break;   //ORL C, /bit addr
1444      case 0xa1:   ajmp(op);                  break;   //AJMP code addr
1445      case 0xa2:   mov_c_bitaddr();            break;   //MOV C, bit addr
1446      case 0xa3:   inc_dptr();                  break;   //INC DPTR
1447      case 0xa4:   mul_ab();                  break;   //MUL AB
1448      case 0xa5:   illegal(op);               break;   //reserved
1493      case 0xa0:   orl_c_nbitaddr(mcs51, op);            break;   //ORL C, /bit addr
1494      case 0xa1:   ajmp(mcs51, op);                  break;   //AJMP code addr
1495      case 0xa2:   mov_c_bitaddr(mcs51, op);            break;   //MOV C, bit addr
1496      case 0xa3:   inc_dptr(mcs51, op);               break;   //INC DPTR
1497      case 0xa4:   mul_ab(mcs51, op);                  break;   //MUL AB
1498      case 0xa5:   illegal(mcs51, op);                  break;   //reserved
14491499
14501500      case 0xa6:
1451      case 0xa7:   mov_ir_mem(op&1);            break;   //MOV @R0/@R1, data addr
1501      case 0xa7:   mov_ir_mem(mcs51, op&1);            break;   //MOV @R0/@R1, data addr
14521502
14531503      case 0xa8:
14541504      case 0xa9:
r3535r3536
14571507      case 0xac:
14581508      case 0xad:
14591509      case 0xae:
1460      case 0xaf:   mov_r_mem(op&7);            break;   //MOV R0 to R7, data addr
1510      case 0xaf:   mov_r_mem(mcs51, op&7);               break;   //MOV R0 to R7, data addr
14611511
1462      case 0xb0:   anl_c_nbitaddr();            break;   //ANL C,/bit addr
1463      case 0xb1:   acall(op);                  break;   //ACALL code addr
1464      case 0xb2:   RWM=1; cpl_bitaddr(); RWM=0;    break;   //CPL bit addr
1465      case 0xb3:   cpl_c();                  break;   //CPL C
1466      case 0xb4:   cjne_a_byte();               break;   //CJNE A, #data, code addr
1467      case 0xb5:   cjne_a_mem();               break;   //CJNE A, data addr, code addr
1512      case 0xb0:   anl_c_nbitaddr(mcs51, op);            break;   //ANL C,/bit addr
1513      case 0xb1:   acall(mcs51, op);                  break;   //ACALL code addr
1514      case 0xb2:   RWM=1; cpl_bitaddr(mcs51, op); RWM=0;    break;   //CPL bit addr
1515      case 0xb3:   cpl_c(mcs51, op);                  break;   //CPL C
1516      case 0xb4:   cjne_a_byte(mcs51, op);               break;   //CJNE A, #data, code addr
1517      case 0xb5:   cjne_a_mem(mcs51, op);               break;   //CJNE A, data addr, code addr
14681518
14691519      case 0xb6:
1470      case 0xb7:   cjne_ir_byte(op&1);          break;   //CJNE @R0/@R1, #data, code addr
1520      case 0xb7:   cjne_ir_byte(mcs51, op&1);             break;   //CJNE @R0/@R1, #data, code addr
14711521
14721522      case 0xb8:
14731523      case 0xb9:
r3535r3536
14761526      case 0xbc:
14771527      case 0xbd:
14781528      case 0xbe:
1479      case 0xbf:   cjne_r_byte(op&7);             break;   //CJNE R0 to R7, #data, code addr
1529      case 0xbf:   cjne_r_byte(mcs51, op&7);             break;   //CJNE R0 to R7, #data, code addr
14801530
1481      case 0xc0:   push();                     break;   //PUSH data addr
1482      case 0xc1:   ajmp(op);                  break;   //AJMP code addr
1483      case 0xc2:   RWM=1; clr_bitaddr(); RWM=0;   break;   //CLR bit addr
1484      case 0xc3:   clr_c();                   break;   //CLR C
1485      case 0xc4:   swap_a();                  break;   //SWAP A
1486      case 0xc5:   xch_a_mem();               break;   //XCH A, data addr
1531      case 0xc0:   push(mcs51, op);                  break;   //PUSH data addr
1532      case 0xc1:   ajmp(mcs51, op);                  break;   //AJMP code addr
1533      case 0xc2:   RWM=1; clr_bitaddr(mcs51, op); RWM=0;   break;   //CLR bit addr
1534      case 0xc3:   clr_c(mcs51, op);                   break;   //CLR C
1535      case 0xc4:   swap_a(mcs51, op);                  break;   //SWAP A
1536      case 0xc5:   xch_a_mem(mcs51, op);               break;   //XCH A, data addr
14871537
14881538      case 0xc6:
1489      case 0xc7:  xch_a_ir(op&1);               break;   //XCH A, @RO/@R1
1539      case 0xc7:  xch_a_ir(mcs51, op&1);               break;   //XCH A, @RO/@R1
14901540
14911541      case 0xc8:
14921542      case 0xc9:
r3535r3536
14951545      case 0xcc:
14961546      case 0xcd:
14971547      case 0xce:
1498      case 0xcf:   xch_a_r(op&7);               break;   //XCH A, RO to R7
1548      case 0xcf:   xch_a_r(mcs51, op&7);               break;   //XCH A, RO to R7
14991549
1500      case 0xd0:   pop();                     break;   //POP data addr
1501      case 0xd1:   acall(op);                  break;   //ACALL code addr
1502      case 0xd2:   RWM=1; setb_bitaddr(); RWM=0;   break;   //SETB bit addr
1503      case 0xd3:   setb_c();                  break;   //SETB C
1504      case 0xd4:   da_a();                   break;   //DA A
1505      case 0xd5:   RWM=1; djnz_mem(); RWM=0;      break;   //DJNZ data addr, code addr
1550      case 0xd0:   pop(mcs51, op);                     break;   //POP data addr
1551      case 0xd1:   acall(mcs51, op);                  break;   //ACALL code addr
1552      case 0xd2:   RWM=1; setb_bitaddr(mcs51, op); RWM=0;   break;   //SETB bit addr
1553      case 0xd3:   setb_c(mcs51, op);                  break;   //SETB C
1554      case 0xd4:   da_a(mcs51, op);                   break;   //DA A
1555      case 0xd5:   RWM=1; djnz_mem(mcs51, op); RWM=0;      break;   //DJNZ data addr, code addr
15061556
15071557      case 0xd6:
1508      case 0xd7:  xchd_a_ir(op&1);            break;   //XCHD A, @R0/@R1
1558      case 0xd7:  xchd_a_ir(mcs51, op&1);               break;   //XCHD A, @R0/@R1
15091559
15101560      case 0xd8:
15111561      case 0xd9:
r3535r3536
15141564      case 0xdc:
15151565      case 0xdd:
15161566      case 0xde:
1517      case 0xdf:   djnz_r(op&7);               break;   //DJNZ R0 to R7,code addr
1567      case 0xdf:   djnz_r(mcs51, op&7);               break;   //DJNZ R0 to R7,code addr
15181568
1519      case 0xe0:   movx_a_idptr();               break;   //MOVX A,@DPTR
1520      case 0xe1:   ajmp(op);                  break;   //AJMP code addr
1569      case 0xe0:   movx_a_idptr(mcs51, op);            break;   //MOVX A,@DPTR
1570      case 0xe1:   ajmp(mcs51, op);                  break;   //AJMP code addr
15211571
15221572      case 0xe2:
1523      case 0xe3:   movx_a_ir(op&1);            break;   //MOVX A, @R0/@R1
1573      case 0xe3:   movx_a_ir(mcs51, op&1);               break;   //MOVX A, @R0/@R1
15241574
1525      case 0xe4:   clr_a();                  break;   //CLR A
1526      case 0xe5:   mov_a_mem();               break;   //MOV A, data addr
1575      case 0xe4:   clr_a(mcs51, op);                  break;   //CLR A
1576      case 0xe5:   mov_a_mem(mcs51, op);               break;   //MOV A, data addr
15271577      case 0xe6:
1528      case 0xe7:   mov_a_ir(op&1);               break;   //MOV A,@RO/@R1
1578      case 0xe7:   mov_a_ir(mcs51, op&1);               break;   //MOV A,@RO/@R1
15291579
15301580      case 0xe8:
15311581      case 0xe9:
r3535r3536
15341584      case 0xec:
15351585      case 0xed:
15361586      case 0xee:
1537      case 0xef:   mov_a_r(op&7);               break;   //MOV A,R0 to R7
1587      case 0xef:   mov_a_r(mcs51, op&7);               break;   //MOV A,R0 to R7
15381588
1539      case 0xf0:   movx_idptr_a();               break;   //MOVX @DPTR,A
1540      case 0xf1:   acall(op);                  break;   //ACALL code addr
1589      case 0xf0:   movx_idptr_a(mcs51, op);            break;   //MOVX @DPTR,A
1590      case 0xf1:   acall(mcs51, op);                  break;   //ACALL code addr
15411591
15421592      case 0xf2:
1543      case 0xf3:   movx_ir_a(op&1);            break;   //MOVX @R0/@R1,A
1593      case 0xf3:   movx_ir_a(mcs51, op&1);               break;   //MOVX @R0/@R1,A
15441594
1545      case 0xf4:   cpl_a();                  break;   //CPL A
1546      case 0xf5:   mov_mem_a();               break;   //MOV data addr, A
1595      case 0xf4:   cpl_a(mcs51, op);                  break;   //CPL A
1596      case 0xf5:   mov_mem_a(mcs51, op);               break;   //MOV data addr, A
15471597
15481598      case 0xf6:
1549      case 0xf7:   mov_ir_a(op&1);               break;   //MOV @R0/@R1, A
1599      case 0xf7:   mov_ir_a(mcs51, op&1);               break;   //MOV @R0/@R1, A
15501600
15511601      case 0xf8:
15521602      case 0xf9:
r3535r3536
15551605      case 0xfc:
15561606      case 0xfd:
15571607      case 0xfe:
1558      case 0xff:   mov_r_a(op&7);               break;   //MOV R0 to R7, A
1608      case 0xff:   mov_r_a(mcs51, op&7);               break;   //MOV R0 to R7, A
15591609      default:
1560         illegal(op);
1610         illegal(mcs51, op);
15611611   }
15621612}
15631613
r3535r3536
16021652        e) RI+TI
16031653        f) TF2+EXF2
16041654 **********************************************************************************/
1605static void check_irqs(void)
1655static void check_irqs(mcs51_regs *mcs51)
16061656{
16071657   UINT8 ints = (GET_IE0 | (GET_TF0<<1) | (GET_IE1<<2) | (GET_TF1<<3)
16081658         | ((GET_RI|GET_TI)<<4));
r3535r3536
16141664   //If All Inerrupts Disabled or no pending abort..
16151665   int_mask = (GET_EA ? IE : 0x00);
16161666
1617   if (mcs51.features & FEATURE_I8052)
1667   if (mcs51->features & FEATURE_I8052)
16181668      ints |= ((GET_TF2|GET_EXF2)<<5);
16191669
1620   if (mcs51.features & FEATURE_DS5002FP)
1670   if (mcs51->features & FEATURE_DS5002FP)
16211671   {
1622      printf("Here\n");
16231672      ints |= ((GET_PFW)<<5);
1624      mcs51.irq_prio[6] = 3;   /* force highest priority */
1673      mcs51->irq_prio[6] = 3;   /* force highest priority */
16251674      /* mask out interrupts not enabled */
16261675      ints &= ((int_mask & 0x1f) | ((GET_EPFW)<<5));
16271676   }
r3535r3536
16341683   if (!ints)   return;
16351684
16361685   /* CLear IDL - got enabled interrupt */
1637   if (mcs51.features & FEATURE_CMOS)
1686   if (mcs51->features & FEATURE_CMOS)
16381687   {
16391688      /* any interrupt terminates idle mode */
16401689      SET_IDL(0);
16411690      /* external interrupt wakes up */
16421691      if (ints & (GET_IE0 | GET_IE1))
16431692         /* but not the DS5002FP */
1644         if (!(mcs51.features & FEATURE_DS5002FP))
1693         if (!(mcs51->features & FEATURE_DS5002FP))
16451694            SET_PD(0);
16461695   }
16471696
1648   for (i=0; i<mcs51.num_interrupts; i++)
1697   for (i=0; i<mcs51->num_interrupts; i++)
16491698   {
16501699      if (ints & (1<<i))
16511700      {
1652         if (mcs51.irq_prio[i] > priority_request)
1701         if (mcs51->irq_prio[i] > priority_request)
16531702         {
1654            priority_request = mcs51.irq_prio[i];
1703            priority_request = mcs51->irq_prio[i];
16551704            int_vec = (i<<3) | 3;
16561705         }
16571706      }
r3535r3536
16621711     */
16631712
16641713   LOG(("Request: %d\n", priority_request));
1665   if (mcs51.irq_active && (priority_request <= mcs51.cur_irq_prio))
1714   if (mcs51->irq_active && (priority_request <= mcs51->cur_irq_prio))
16661715   {
16671716      LOG(("higher or equal priority irq in progress already, skipping ...\n"));
16681717      return;
16691718   }
16701719
16711720    //Save current pc to stack, set pc to new interrupt vector
1672   push_pc();
1721   push_pc(mcs51);
16731722   PC = int_vec;
16741723   change_pc(PC);
16751724
16761725   /* interrupts take 24 cycles */
1677   mcs51.inst_cycles += 2;
1726   mcs51->inst_cycles += 2;
16781727
16791728   //Set current Irq & Priority being serviced
1680   mcs51.cur_irq_prio = priority_request;
1681   mcs51.irq_active |= (1 << priority_request);
1729   mcs51->cur_irq_prio = priority_request;
1730   mcs51->irq_active |= (1 << priority_request);
16821731
1683   LOG(("Take: %d %02x\n", mcs51.cur_irq_prio, mcs51.irq_active));
1732   LOG(("Take: %d %02x\n", mcs51->cur_irq_prio, mcs51->irq_active));
16841733
1685   //printf("irq cip %d, act %02x\n",mcs51.cur_irq_prio,  mcs51.irq_active);
1686
16871734   //Clear any interrupt flags that should be cleared since we're servicing the irq!
16881735   switch(int_vec) {
16891736      case V_IE0:
r3535r3536
16921739            SET_IE0(0);
16931740
16941741         /* indicate we took the external IRQ */
1695         if (mcs51.irq_callback != NULL)
1696            (*mcs51.irq_callback)(0);
1742         if (mcs51->irq_callback != NULL)
1743            (*mcs51->irq_callback)(mcs51->device, 0);
16971744
16981745         break;
16991746      case V_TF0:
r3535r3536
17051752         if(GET_IT1)  /* for some reason having this, breaks alving dmd games */
17061753            SET_IE1(0);
17071754         /* indicate we took the external IRQ */
1708         if (mcs51.irq_callback != NULL)
1709            (*mcs51.irq_callback)(1);
1755         if (mcs51->irq_callback != NULL)
1756            (*mcs51->irq_callback)(mcs51->device, 1);
17101757
17111758         break;
17121759      case V_TF1:
r3535r3536
17291776   }
17301777}
17311778
1732INLINE void burn_cycles(int cycles)
1779INLINE void burn_cycles(mcs51_regs *mcs51, int cycles)
17331780{
17341781   /* Update Timer (if any timers are running) */
1735   update_timers(cycles);
1782   update_timers(mcs51, cycles);
17361783
17371784   /* Update Serial (only for mode 0) */
1738   update_serial(cycles);
1785   update_serial(mcs51, cycles);
17391786
17401787   /* check_irqs */
1741   check_irqs();
1788   check_irqs(mcs51);
17421789}
17431790
1744static void mcs51_set_irq_line(int irqline, int state)
1791static void mcs51_set_irq_line(mcs51_regs *mcs51, int irqline, int state)
17451792{
17461793   /* From the manual:
17471794     *
r3535r3536
17541801     * for at least one cycle (12 states)
17551802     *
17561803     */
1757   UINT32 new_state = (mcs51.last_line_state & ~(1 << irqline)) | ((state != CLEAR_LINE) << irqline);
1804   UINT32 new_state = (mcs51->last_line_state & ~(1 << irqline)) | ((state != CLEAR_LINE) << irqline);
17581805   /* detect 0->1 transistions */
1759   UINT32 tr_state = (~mcs51.last_line_state) & new_state;
1806   UINT32 tr_state = (~mcs51->last_line_state) & new_state;
17601807
17611808   switch( irqline )
17621809   {
r3535r3536
18021849
18031850      case MCS51_T0_LINE:
18041851         if (GET_BIT(tr_state, MCS51_T0_LINE))
1805            mcs51.t0_cnt++;
1852            mcs51->t0_cnt++;
18061853         break;
18071854
18081855      case MCS51_T1_LINE:
18091856         if (GET_BIT(tr_state, MCS51_T1_LINE))
1810            mcs51.t1_cnt++;
1857            mcs51->t1_cnt++;
18111858         break;
18121859
18131860      case MCS51_T2_LINE:
1814         if (mcs51.features & FEATURE_I8052)
1861         if (mcs51->features & FEATURE_I8052)
18151862         {
18161863            if (GET_BIT(tr_state, MCS51_T2_LINE))
1817               mcs51.t2_cnt++;
1864               mcs51->t2_cnt++;
18181865         }
18191866         else
18201867            fatalerror("mcs51: Trying to set T2_LINE on a non I8052 type cpu.\n");
18211868         break;
18221869
18231870      case MCS51_T2EX_LINE:
1824         if (mcs51.features & FEATURE_I8052)
1871         if (mcs51->features & FEATURE_I8052)
18251872         {
18261873            if (GET_BIT(tr_state, MCS51_T2EX_LINE))
18271874            {
18281875               SET_EXF2(1);
1829               mcs51.t2ex_cnt++;
1876               mcs51->t2ex_cnt++;
18301877            }
18311878         }
18321879         else
r3535r3536
18371884         /* Is the enable flags for this interrupt set? */
18381885         if (state != CLEAR_LINE)
18391886         {
1840            serial_receive();
1887            serial_receive(mcs51);
18411888         }
18421889         break;
18431890
18441891      /* Power Fail Interrupt */
18451892      case DS5002FP_PFI_LINE:
1846         if (mcs51.features & FEATURE_DS5002FP)
1893         if (mcs51->features & FEATURE_DS5002FP)
18471894         {
18481895            /* Need cleared->active line transition? (Logical 1-0 Pulse on the line) - CLEAR->ASSERT Transition since INT1 active lo! */
18491896            if (GET_BIT(tr_state, MCS51_INT1_LINE))
r3535r3536
18531900            fatalerror("mcs51: Trying to set DS5002FP_PFI_LINE on a non DS5002FP type cpu.\n");
18541901         break;
18551902   }
1856   mcs51.last_line_state = new_state;
1903   mcs51->last_line_state = new_state;
18571904}
18581905
18591906/* Execute cycles - returns number of cycles actually run */
1860static int mcs51_execute(int cycles)
1907static CPU_EXECUTE( mcs51 )
18611908{
1909   mcs51_regs *mcs51 = device->token;
18621910   UINT8 op;
18631911
1864   mcs51_icount = cycles;
1912   mcs51->icount = cycles;
18651913
18661914   /* external interrupts may have been set since we last checked */
1867   mcs51.inst_cycles = 0;
1868   check_irqs();
1915   mcs51->inst_cycles = 0;
1916   check_irqs(mcs51);
18691917
18701918   /* if in powerdown, just return */
1871   if ((mcs51.features & FEATURE_CMOS) && GET_PD)
1919   if ((mcs51->features & FEATURE_CMOS) && GET_PD)
18721920   {
1873      mcs51_icount = 0;
1921      mcs51->icount = 0;
18741922      return cycles;
18751923   }
18761924
1877   mcs51_icount -= mcs51.inst_cycles;
1878   burn_cycles(mcs51.inst_cycles);
1925   mcs51->icount -= mcs51->inst_cycles;
1926   burn_cycles(mcs51, mcs51->inst_cycles);
18791927
1880   if ((mcs51.features & FEATURE_CMOS) && GET_IDL)
1928   if ((mcs51->features & FEATURE_CMOS) && GET_IDL)
18811929   {
18821930      do
18831931      {
18841932         /* burn the cycles */
1885         mcs51_icount--;
1886         burn_cycles(1);
1887      } while( mcs51_icount > 0 );
1888      return cycles - mcs51_icount;
1933         mcs51->icount--;
1934         burn_cycles(mcs51, 1);
1935      } while( mcs51->icount > 0 );
1936      return cycles - mcs51->icount;
18891937   }
18901938
18911939   do
r3535r3536
18961944      op = cpu_readop(PC++);
18971945
18981946      /* process opcode and count cycles */
1899      mcs51.inst_cycles = mcs51_cycles[op];
1900      execute_op(op);
1947      mcs51->inst_cycles = mcs51_cycles[op];
1948      execute_op(mcs51, op);
19011949
19021950      /* burn the cycles */
1903      mcs51_icount -= mcs51.inst_cycles;
1951      mcs51->icount -= mcs51->inst_cycles;
19041952
19051953      /* if in powerdown, just return */
1906      if ((mcs51.features & FEATURE_CMOS) && GET_PD)
1907         return cycles - mcs51_icount;
1954      if ((mcs51->features & FEATURE_CMOS) && GET_PD)
1955         return cycles - mcs51->icount;
19081956
1909      burn_cycles(mcs51.inst_cycles);
1957      burn_cycles(mcs51, mcs51->inst_cycles);
19101958
19111959      /* decrement the timed access window */
1912      if (mcs51.features & FEATURE_DS5002FP)
1913         mcs51.ds5002fp.ta_window = (mcs51.ds5002fp.ta_window ? mcs51.ds5002fp.ta_window-- : 0x00);
1960      if (mcs51->features & FEATURE_DS5002FP)
1961         mcs51->ds5002fp.ta_window = (mcs51->ds5002fp.ta_window ? mcs51->ds5002fp.ta_window-- : 0x00);
19141962
19151963      /* If the chip entered in idle mode, end the loop */
1916      if ((mcs51.features & FEATURE_CMOS) && GET_IDL)
1917         return cycles - mcs51_icount;
1964      if ((mcs51->features & FEATURE_CMOS) && GET_IDL)
1965         return cycles - mcs51->icount;
19181966
1919   } while( mcs51_icount > 0 );
1967   } while( mcs51->icount > 0 );
19201968
1921   return cycles - mcs51_icount;
1969   return cycles - mcs51->icount;
19221970}
19231971
19241972
r3535r3536
19261974 * MCS51/8051 Section
19271975 ****************************************************************************/
19281976
1929static void mcs51_sfr_write(size_t offset, UINT8 data)
1977static void mcs51_sfr_write(mcs51_regs *mcs51, size_t offset, UINT8 data)
19301978{
19311979   /* update register */
19321980   assert(offset >= 0x80 && offset <= 0xff);
19331981
1934   /* TODO: Move to memory map */
19351982   switch (offset)
19361983   {
1937      case ADDR_P0:   OUT(MCS51_PORT_P0,data);   break;
1938      case ADDR_P1:   OUT(MCS51_PORT_P1,data);   break;
1939      case ADDR_P2:   OUT(MCS51_PORT_P2,data);   break;
1940      case ADDR_P3:   OUT(MCS51_PORT_P3,data);   break;
1941      case ADDR_SBUF:   serial_transmit(data);      break;
1942      case ADDR_PSW:   SET_PARITY();            break;
1943      case ADDR_ACC:   SET_PARITY();            break;
1944      case ADDR_IP:   update_irq_prio(data, 0);   break;
1984      case ADDR_P0:   OUT(MCS51_PORT_P0,data);         break;
1985      case ADDR_P1:   OUT(MCS51_PORT_P1,data);         break;
1986      case ADDR_P2:   OUT(MCS51_PORT_P2,data);         break;
1987      case ADDR_P3:   OUT(MCS51_PORT_P3,data);         break;
1988      case ADDR_SBUF:   serial_transmit(mcs51, data);       break;
1989      case ADDR_PSW:   SET_PARITY();                  break;
1990      case ADDR_ACC:   SET_PARITY();                  break;
1991      case ADDR_IP:   update_irq_prio(mcs51, data, 0);   break;
19451992      /* R_SBUF = data;        //This register is used only for "Receiving data coming in!" */
19461993
19471994      case ADDR_B:
r3535r3536
19662013   data_write_byte_8le((size_t)offset | 0x100, data);
19672014}
19682015
1969static UINT8 mcs51_sfr_read(size_t offset)
2016static UINT8 mcs51_sfr_read(mcs51_regs *mcs51, size_t offset)
19702017{
19712018   assert(offset >= 0x80 && offset <= 0xff);
19722019
r3535r3536
20062053}
20072054
20082055
2009static void mcs51_init(int index, int clock, const void *config, int (*irqcallback)(int))
2056static CPU_INIT( mcs51 )
20102057{
2011   mcs51.irq_callback = irqcallback;
2058   mcs51_regs *mcs51 = device->token;
20122059
2013   mcs51.features = FEATURE_NONE;
2014   mcs51.ram_mask = 0x7F;           /* 128 bytes of ram */
2015   mcs51.num_interrupts = 5;         /* 5 interrupts */
2016   mcs51.sfr_read = mcs51_sfr_read;
2017   mcs51.sfr_write = mcs51_sfr_write;
2060   token = device->token;   // temporary
20182061
2062   mcs51->irq_callback = irqcallback;
2063   mcs51->device = device;
2064
2065   mcs51->features = FEATURE_NONE;
2066   mcs51->ram_mask = 0x7F;           /* 128 bytes of ram */
2067   mcs51->num_interrupts = 5;         /* 5 interrupts */
2068   mcs51->sfr_read = mcs51_sfr_read;
2069   mcs51->sfr_write = mcs51_sfr_write;
2070
20192071   /* Save states */
2020   state_save_register_item("mcs51", index, mcs51.ppc);
2021   state_save_register_item("mcs51", index, mcs51.pc);
2022   state_save_register_item("mcs51", index, mcs51.rwm );
2023   state_save_register_item("mcs51", index, mcs51.cur_irq_prio );
2024   state_save_register_item("mcs51", index, mcs51.last_line_state );
2025   state_save_register_item("mcs51", index, mcs51.t0_cnt );
2026   state_save_register_item("mcs51", index, mcs51.t1_cnt );
2027   state_save_register_item("mcs51", index, mcs51.t2_cnt );
2028   state_save_register_item("mcs51", index, mcs51.t2ex_cnt );
2029   state_save_register_item("mcs51", index, mcs51.recalc_parity );
2030   state_save_register_item_array("mcs51", index, mcs51.irq_prio );
2031   state_save_register_item("mcs51", index, mcs51.irq_active );
2072   state_save_register_item("mcs51", index, mcs51->ppc);
2073   state_save_register_item("mcs51", index, mcs51->pc);
2074   state_save_register_item("mcs51", index, mcs51->rwm );
2075   state_save_register_item("mcs51", index, mcs51->cur_irq_prio );
2076   state_save_register_item("mcs51", index, mcs51->last_line_state );
2077   state_save_register_item("mcs51", index, mcs51->t0_cnt );
2078   state_save_register_item("mcs51", index, mcs51->t1_cnt );
2079   state_save_register_item("mcs51", index, mcs51->t2_cnt );
2080   state_save_register_item("mcs51", index, mcs51->t2ex_cnt );
2081   state_save_register_item("mcs51", index, mcs51->recalc_parity );
2082   state_save_register_item_array("mcs51", index, mcs51->irq_prio );
2083   state_save_register_item("mcs51", index, mcs51->irq_active );
20322084}
20332085
2034static void i80c51_init(int index, int clock, const void *config, int (*irqcallback)(int))
2086static CPU_INIT( i80c51 )
20352087{
2036   mcs51_init(index, clock, config, irqcallback);
2037
2038   mcs51.features |= FEATURE_CMOS;
2088   mcs51_regs *mcs51 = device->token;
2089   CPU_INIT_CALL(mcs51);
2090   mcs51->features |= FEATURE_CMOS;
20392091}
20402092
20412093/* Reset registers to the initial values */
2042static void mcs51_reset(void)
2094static CPU_RESET( mcs51 )
20432095{
2044   update_ptrs();
2096   mcs51_regs *mcs51 = device->token;
2097
2098   update_ptrs(mcs51);
20452099   //Set up serial call back handlers
2046   mcs51.serial_tx_callback = hold_serial_tx_callback;
2100   mcs51->serial_tx_callback = hold_serial_tx_callback;
20472101   hold_serial_tx_callback = NULL;
2048   mcs51.serial_rx_callback = hold_serial_rx_callback;
2102   mcs51->serial_rx_callback = hold_serial_rx_callback;
20492103   hold_serial_rx_callback = NULL;
20502104
2051   mcs51.last_line_state = 0;
2052   mcs51.t0_cnt = 0;
2053   mcs51.t1_cnt = 0;
2054   mcs51.t2_cnt = 0;
2055   mcs51.t2ex_cnt = 0;
2105   mcs51->last_line_state = 0;
2106   mcs51->t0_cnt = 0;
2107   mcs51->t1_cnt = 0;
2108   mcs51->t2_cnt = 0;
2109   mcs51->t2ex_cnt = 0;
20562110   /* Flag as NO IRQ in Progress */
2057   mcs51.irq_active = 0;
2058   mcs51.cur_irq_prio = -1;
2111   mcs51->irq_active = 0;
2112   mcs51->cur_irq_prio = -1;
20592113
20602114   /* these are all defined reset states */
20612115   PC = 0;
r3535r3536
20662120   DPL = 0;
20672121   B = 0;
20682122   IP = 0;
2069   update_irq_prio(IP, 0);
2123   update_irq_prio(mcs51, IP, 0);
20702124   IE = 0;
20712125   SCON = 0;
20722126   TCON = 0;
r3535r3536
20832137   SET_P0(0xff);
20842138
20852139   /* 8052 Only registers */
2086   if (mcs51.features & FEATURE_I8052)
2140   if (mcs51->features & FEATURE_I8052)
20872141   {
20882142      T2CON = 0;
20892143      RCAP2L = 0;
r3535r3536
20932147   }
20942148
20952149   /* 80C52 Only registers */
2096   if (mcs51.features & FEATURE_I80C52)
2150   if (mcs51->features & FEATURE_I80C52)
20972151   {
20982152      IPH = 0;
2099      update_irq_prio(IP, IPH);
2153      update_irq_prio(mcs51, IP, IPH);
21002154      SADDR = 0;
21012155      SADEN = 0;
21022156   }
21032157
21042158   /* DS5002FP Only registers */
2105   if (mcs51.features & FEATURE_DS5002FP)
2159   if (mcs51->features & FEATURE_DS5002FP)
21062160   {
21072161      // set initial values (some of them are set using the bootstrap loader)
21082162      PCON = 0;
2109      MCON = mcs51.ds5002fp.config->mcon & 0xfb;
2110      RPCTL = mcs51.ds5002fp.config->rpctl & 0x01;
2163      MCON = mcs51->ds5002fp.config->mcon & 0xfb;
2164      RPCTL = mcs51->ds5002fp.config->rpctl & 0x01;
21112165      RPS = 0;
21122166      RNR = 0;
2113      CRCR = mcs51.ds5002fp.config->crc & 0xf0;
2167      CRCR = mcs51->ds5002fp.config->crc & 0xf0;
21142168      CRCL = 0;
21152169      CRCH = 0;
21162170      TA = 0;
21172171
21182172      // set internal CPU state
2119      mcs51.ds5002fp.previous_ta = 0;
2120      mcs51.ds5002fp.ta_window = 0;
2121      mcs51.ds5002fp.range = (GET_RG1 << 1) | GET_RG0;
2173      mcs51->ds5002fp.previous_ta = 0;
2174      mcs51->ds5002fp.ta_window = 0;
2175      mcs51->ds5002fp.range = (GET_RG1 << 1) | GET_RG0;
21222176   }
21232177
21242178}
21252179
21262180/* Shut down CPU core */
2127static void mcs51_exit(void)
2181static CPU_EXIT( mcs51 )
21282182{
21292183   /* nothing to do */
21302184}
r3535r3536
21332187 * 8052 Section
21342188 ****************************************************************************/
21352189
2136static void i8052_sfr_write(size_t offset, UINT8 data)
2190static void i8052_sfr_write(mcs51_regs *mcs51, size_t offset, UINT8 data)
21372191{
21382192   switch (offset)
21392193   {
r3535r3536
21472201         break;
21482202
21492203      default:
2150         mcs51_sfr_write(offset, data);
2204         mcs51_sfr_write(mcs51, offset, data);
21512205   }
21522206}
21532207
2154static UINT8 i8052_sfr_read(size_t offset)
2208static UINT8 i8052_sfr_read(mcs51_regs *mcs51, size_t offset)
21552209{
21562210   switch (offset)
21572211   {
r3535r3536
21632217      case ADDR_TH2:
21642218         return data_read_byte_8le((size_t) offset | 0x100);
21652219      default:
2166         return mcs51_sfr_read(offset);
2220         return mcs51_sfr_read(mcs51, offset);
21672221   }
21682222}
21692223
2170static void i8052_init (int index, int clock, const void *config, int (*irqcallback)(int))
2224static CPU_INIT( i8052 )
21712225{
2172   mcs51_init(index, clock, config, irqcallback);
2226   mcs51_regs *mcs51 = device->token;
2227   CPU_INIT_CALL(mcs51);
21732228
2174   mcs51.ram_mask = 0xFF;           /* 256 bytes of ram */
2175   mcs51.num_interrupts = 6;         /* 6 interrupts */
2229   mcs51->ram_mask = 0xFF;           /* 256 bytes of ram */
2230   mcs51->num_interrupts = 6;         /* 6 interrupts */
21762231
2177   mcs51.features |= FEATURE_I8052;
2178   mcs51.sfr_read = i8052_sfr_read;
2179   mcs51.sfr_write = i8052_sfr_write;
2232   mcs51->features |= FEATURE_I8052;
2233   mcs51->sfr_read = i8052_sfr_read;
2234   mcs51->sfr_write = i8052_sfr_write;
21802235}
21812236
21822237/****************************************************************************
21832238 * 80C52 Section
21842239 ****************************************************************************/
21852240
2186static void i80c52_sfr_write(size_t offset, UINT8 data)
2241static void i80c52_sfr_write(mcs51_regs *mcs51, size_t offset, UINT8 data)
21872242{
21882243   switch (offset)
21892244   {
21902245      /* 80c52 family specific */
21912246      case ADDR_IP:
2192         update_irq_prio(data, IPH);
2247         update_irq_prio(mcs51, data, IPH);
21932248         break;
21942249      case ADDR_IPH:
2195         update_irq_prio(IP, data);
2250         update_irq_prio(mcs51, IP, data);
21962251         break;
21972252      case ADDR_SADDR:
21982253      case ADDR_SADEN:
21992254         break;
22002255
22012256      default:
2202         i8052_sfr_write(offset, data);
2257         i8052_sfr_write(mcs51, offset, data);
22032258         return;
22042259   }
22052260   data_write_byte_8le((size_t) offset | 0x100, data);
22062261}
22072262
2208static UINT8 i80c52_sfr_read(size_t offset)
2263static UINT8 i80c52_sfr_read(mcs51_regs *mcs51, size_t offset)
22092264{
22102265   switch (offset)
22112266   {
r3535r3536
22152270      case ADDR_SADEN:
22162271         return data_read_byte_8le((size_t) offset | 0x100);
22172272      default:
2218         return i8052_sfr_read(offset);
2273         return i8052_sfr_read(mcs51, offset);
22192274   }
22202275}
22212276
2222static void i80c52_init(int index, int clock, const void *config, int (*irqcallback)(int))
2277static CPU_INIT( i80c52 )
22232278{
2224   i8052_init(index, clock, config, irqcallback);
2279   mcs51_regs *mcs51 = device->token;
2280   CPU_INIT_CALL(i8052);
22252281
2226   mcs51.features |= (FEATURE_I80C52 | FEATURE_CMOS);
2227   mcs51.sfr_read = i80c52_sfr_read;
2228   mcs51.sfr_write = i80c52_sfr_write;
2282   mcs51->features |= (FEATURE_I80C52 | FEATURE_CMOS);
2283   mcs51->sfr_read = i80c52_sfr_read;
2284   mcs51->sfr_write = i80c52_sfr_write;
22292285}
22302286
2231static void i80c31_init(int index, int clock, const void *config, int (*irqcallback)(int))
2287static CPU_INIT( i80c31 )
22322288{
2233   i80c52_init(index, clock, config, irqcallback);
2289   mcs51_regs *mcs51 = device->token;
2290   CPU_INIT_CALL(i8052);
22342291
2235   mcs51.ram_mask = 0x7F;           /* 128 bytes of ram */
2292   mcs51->ram_mask = 0x7F;           /* 128 bytes of ram */
22362293}
22372294
22382295/****************************************************************************
22392296 * DS5002FP Section
22402297 ****************************************************************************/
2241#if 0
2298#if 1 //#ifdef MCS51_TO_BE_ENABLED_LATER
22422299
2300
22432301#define DS5_LOGW(a, d)    LOG(("ds5002fp #%d: write to  " # a " register at 0x%04x, data=%x\n", cpu_getactivecpu(), PC, d))
22442302#define DS5_LOGR(a, d)    LOG(("ds5002fp #%d: read from " # a " register at 0x%04x\n", cpu_getactivecpu(), PC))
22452303
2246INLINE UINT8 ds5002fp_protected(size_t offset, UINT8 data, UINT8 ta_mask, UINT8 mask)
2304INLINE UINT8 ds5002fp_protected(mcs51_regs *mcs51, size_t offset, UINT8 data, UINT8 ta_mask, UINT8 mask)
22472305{
22482306   UINT8 is_timed_access;
22492307
2250   is_timed_access = (mcs51.ds5002fp.ta_window > 0) && (TA == 0x55);
2308   is_timed_access = (mcs51->ds5002fp.ta_window > 0) && (TA == 0x55);
22512309   if (is_timed_access)
22522310   {
22532311      ta_mask = 0xff;
22542312   }
2255   data = (mcs51.sfr_ram[offset] & (~ta_mask)) | (data & ta_mask);
2256   return (mcs51.sfr_ram[offset] & (~mask)) | (data & mask);
2313   data = (mcs51->sfr_ram[offset] & (~ta_mask)) | (data & ta_mask);
2314   return (mcs51->sfr_ram[offset] & (~mask)) | (data & mask);
22572315}
22582316
2259static void ds5002fp_sfr_write(size_t offset, UINT8 data)
2317static void ds5002fp_sfr_write(mcs51_regs *mcs51, size_t offset, UINT8 data)
22602318{
22612319   switch (offset)
22622320   {
22632321
22642322      case ADDR_TA:
2265         mcs51.ds5002fp.previous_ta = TA;
2323         mcs51->ds5002fp.previous_ta = TA;
22662324         /*  init the time window after having wrote 0xaa */
2267         if ((data == 0xaa) && (mcs51.ds5002fp.ta_window == 0))
2325         if ((data == 0xaa) && (mcs51->ds5002fp.ta_window == 0))
22682326         {
2269            mcs51.ds5002fp.ta_window = 6; /* 4*12 + 2*12 */
2327            mcs51->ds5002fp.ta_window = 6; /* 4*12 + 2*12 */
22702328            LOG(("ds5002fp #%d: TA window initiated at 0x%04x\n", cpu_getactivecpu(), PC));
22712329         }
22722330         break;
2273      case ADDR_MCON:    data = ds5002fp_protected(ADDR_MCON, data, 0x0f, 0xf7);   DS5_LOGW(MCON, data); break;
2274      case ADDR_RPCTL:   data = ds5002fp_protected(ADDR_RPCTL, data, 0xef, 0xfe); DS5_LOGW(RPCTL, data); break;
2275      case ADDR_CRCR:      data = ds5002fp_protected(ADDR_CRCR, data, 0xff, 0x0f);   DS5_LOGW(CRCR, data);   break;
2276      case ADDR_PCON:      data = ds5002fp_protected(ADDR_PCON, data, 0xb9, 0xff); break;
2277      case ADDR_IP:       data = ds5002fp_protected(ADDR_IP, data, 0x7f, 0xff);   break;
2331      case ADDR_MCON:    data = ds5002fp_protected(mcs51, ADDR_MCON, data, 0x0f, 0xf7);   DS5_LOGW(MCON, data); break;
2332      case ADDR_RPCTL:   data = ds5002fp_protected(mcs51, ADDR_RPCTL, data, 0xef, 0xfe); DS5_LOGW(RPCTL, data); break;
2333      case ADDR_CRCR:      data = ds5002fp_protected(mcs51, ADDR_CRCR, data, 0xff, 0x0f);   DS5_LOGW(CRCR, data);   break;
2334      case ADDR_PCON:      data = ds5002fp_protected(mcs51, ADDR_PCON, data, 0xb9, 0xff); break;
2335      case ADDR_IP:       data = ds5002fp_protected(mcs51, ADDR_IP, data, 0x7f, 0xff);   break;
22782336      case ADDR_CRCL:      DS5_LOGW(CRCL, data);                            break;
22792337      case ADDR_CRCH:      DS5_LOGW(CRCH, data);                            break;
22802338      case ADDR_RNR:      DS5_LOGW(RNR, data);                            break;
22812339      case ADDR_RPS:      DS5_LOGW(RPS, data);                           break;
22822340      default:
2283         mcs51_sfr_write(offset, data);
2341         mcs51_sfr_write(mcs51, offset, data);
22842342         return;
22852343   }
22862344   data_write_byte_8le((size_t) offset | 0x100, data);
22872345}
22882346
2289static UINT8 ds5002fp_sfr_read(size_t offset)
2347static UINT8 ds5002fp_sfr_read(mcs51_regs *mcs51, size_t offset)
22902348{
22912349   switch (offset)
22922350   {
2293      case ADDR_CRCR:    DS5_LOGR(CRCR, data);    break;
2351      case ADDR_CRCR:    DS5_LOGR(CRCR, data);       break;
22942352      case ADDR_CRCL:    DS5_LOGR(CRCL, data);      break;
2295      case ADDR_CRCH:    DS5_LOGR(CRCH, data);    break;
2353      case ADDR_CRCH:    DS5_LOGR(CRCH, data);       break;
22962354      case ADDR_MCON:    DS5_LOGR(MCON, data);      break;
2297      case ADDR_TA:       DS5_LOGR(TA, data);      break;
2355      case ADDR_TA:       DS5_LOGR(TA, data);         break;
22982356      case ADDR_RNR:       DS5_LOGR(RNR, data);      break;
2299      case ADDR_RPCTL:    DS5_LOGR(RPCTL, data);   break;
2357      case ADDR_RPCTL:    DS5_LOGR(RPCTL, data);      break;
23002358      case ADDR_RPS:       DS5_LOGR(RPS, data);      break;
23012359      case ADDR_PCON:
23022360         SET_PFW(0);      /* reset PFW flag */
2303         return mcs51_sfr_read(offset); /* FIXME: cmos features ??? */
2361         return mcs51_sfr_read(mcs51, offset);
23042362      default:
2305         return mcs51_sfr_read(offset); /* FIXME: cmos features ??? */
2363         return mcs51_sfr_read(mcs51, offset);
23062364   }
23072365   return data_read_byte_8le((size_t) offset | 0x100);
23082366}
23092367
2310static void ds5002fp_init(int index, int clock, const void *config, int (*irqcallback)(int))
2368static CPU_INIT( ds5002fp )
23112369{
23122370   /* default configuration */
23132371   static const ds5002fp_config default_config = { 0x00, 0x00, 0x00 };
23142372   const ds5002fp_config *sconfig = config ? config : &default_config;
2373   mcs51_regs *mcs51 = device->token;
23152374
2316   mcs51_init(index, clock, config, irqcallback);
2375   CPU_INIT_CALL( mcs51 );
23172376
2318   mcs51.ds5002fp.config = sconfig;
2319   mcs51.features |= (FEATURE_DS5002FP | FEATURE_CMOS);
2320   mcs51.sfr_read = ds5002fp_sfr_read;
2321   mcs51.sfr_write = ds5002fp_sfr_write;
2377   mcs51->ds5002fp.config = sconfig;
2378   mcs51->features |= (FEATURE_DS5002FP | FEATURE_CMOS);
2379   mcs51->sfr_read = ds5002fp_sfr_read;
2380   mcs51->sfr_write = ds5002fp_sfr_write;
23222381
2323   state_save_register_item("mcs51", index, mcs51.ds5002fp.previous_ta );
2324   state_save_register_item("mcs51", index, mcs51.ds5002fp.ta_window );
2325   state_save_register_item("mcs51", index, mcs51.ds5002fp.range );
2382   state_save_register_item("mcs51", index, mcs51->ds5002fp.previous_ta );
2383   state_save_register_item("mcs51", index, mcs51->ds5002fp.ta_window );
2384   state_save_register_item("mcs51", index, mcs51->ds5002fp.range );
23262385
23272386}
23282387#endif
r3535r3536
23312390    ADDRESS MAPS
23322391***************************************************************************/
23332392
2334
2335/* FIXME: the memory maps should probably support rom banking for EA */
23362393static ADDRESS_MAP_START(program_12bit, ADDRESS_SPACE_PROGRAM, 8)
23372394   AM_RANGE(0x00, 0x0fff) AM_ROM
23382395ADDRESS_MAP_END
r3535r3536
23562413    GENERAL CONTEXT ACCESS
23572414***************************************************************************/
23582415
2359static void mcs51_get_context(void *dst)
2416static CPU_GET_CONTEXT( mcs51 )
23602417{
2361   if( dst )
2362      memcpy(dst, &mcs51, sizeof(mcs51_regs));
23632418}
23642419
2365static void mcs51_set_context(void *src)
2420static CPU_SET_CONTEXT( mcs51 )
23662421{
2422   mcs51_regs *mcs51;
2423
23672424   if( src )
2368      memcpy(&mcs51, src, sizeof(mcs51_regs));
2369      change_pc(PC);
2370      update_ptrs();
2425      token = src;
2426
2427   mcs51 = token;
2428   change_pc(PC);
2429   update_ptrs(mcs51);
23712430}
23722431
23732432/**************************************************************************
23742433 * Generic set_info
23752434 **************************************************************************/
23762435
2377static void mcs51_set_info(UINT32 state, cpuinfo *info)
2436static CPU_SET_INFO( mcs51 )
23782437{
2438   mcs51_regs *mcs51 = token;
2439
23792440   switch (state)
23802441   {
23812442      /* --- the following bits of info are set as 64-bit signed integers --- */
23822443      case CPUINFO_INT_PC:                     PC = info->i;                     break;
23832444      case CPUINFO_INT_SP:                     SP = info->i;                       break;
23842445
2385      case CPUINFO_INT_INPUT_STATE + MCS51_INT0_LINE:   mcs51_set_irq_line(MCS51_INT0_LINE, info->i); break;
2386      case CPUINFO_INT_INPUT_STATE + MCS51_INT1_LINE:   mcs51_set_irq_line(MCS51_INT1_LINE, info->i); break;
2387      case CPUINFO_INT_INPUT_STATE + MCS51_T0_LINE:   mcs51_set_irq_line(MCS51_T0_LINE, info->i); break;
2388      case CPUINFO_INT_INPUT_STATE + MCS51_T1_LINE:   mcs51_set_irq_line(MCS51_T1_LINE, info->i); break;
2389      case CPUINFO_INT_INPUT_STATE + MCS51_RX_LINE:   mcs51_set_irq_line(MCS51_RX_LINE, info->i); break;
2446      case CPUINFO_INT_INPUT_STATE + MCS51_INT0_LINE:   mcs51_set_irq_line(mcs51, MCS51_INT0_LINE, info->i); break;
2447      case CPUINFO_INT_INPUT_STATE + MCS51_INT1_LINE:   mcs51_set_irq_line(mcs51, MCS51_INT1_LINE, info->i); break;
2448      case CPUINFO_INT_INPUT_STATE + MCS51_T0_LINE:   mcs51_set_irq_line(mcs51, MCS51_T0_LINE, info->i); break;
2449      case CPUINFO_INT_INPUT_STATE + MCS51_T1_LINE:   mcs51_set_irq_line(mcs51, MCS51_T1_LINE, info->i); break;
2450      case CPUINFO_INT_INPUT_STATE + MCS51_RX_LINE:   mcs51_set_irq_line(mcs51, MCS51_RX_LINE, info->i); break;
23902451
23912452      case CPUINFO_INT_REGISTER + MCS51_PC:          PC = info->i;                        break;
23922453      case CPUINFO_INT_REGISTER + MCS51_SP:          SP = info->i;                     break;
r3535r3536
24142475 * Generic get_info
24152476 **************************************************************************/
24162477
2417static void mcs51_get_info(UINT32 state, cpuinfo *info)
2478static CPU_GET_INFO( mcs51 )
24182479{
2419   mcs51_regs *r = &mcs51;
2480   mcs51_regs *mcs51 = token;
24202481
24212482   switch (state)
24222483   {
24232484      /* --- the following bits of info are returned as 64-bit signed integers --- */
2424      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(mcs51);            break;
2425      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:         info->i = 0;                     break;
2426      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
2427      case CPUINFO_INT_CLOCK_MULTIPLIER:            info->i = 1;                     break;
2428      case CPUINFO_INT_CLOCK_DIVIDER:               info->i = 12;                     break;
2429      case CPUINFO_INT_MIN_INSTRUCTION_BYTES:         info->i = 1;                     break;
2430      case CPUINFO_INT_MAX_INSTRUCTION_BYTES:         info->i = 5;                     break;
2431      case CPUINFO_INT_MIN_CYCLES:               info->i = 1;                     break;
2432      case CPUINFO_INT_MAX_CYCLES:               info->i = 20; /* rough guess */         break;
2433      case CPUINFO_INT_INPUT_LINES:                 info->i = 3;                     break;
2485      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(mcs51_regs);            break;
2486      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:         info->i = 0;                        break;
2487      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;                  break;
2488      case CPUINFO_INT_CLOCK_MULTIPLIER:            info->i = 1;                        break;
2489      case CPUINFO_INT_CLOCK_DIVIDER:               info->i = 12;                        break;
2490      case CPUINFO_INT_MIN_INSTRUCTION_BYTES:         info->i = 1;                        break;
2491      case CPUINFO_INT_MAX_INSTRUCTION_BYTES:         info->i = 5;                        break;
2492      case CPUINFO_INT_MIN_CYCLES:               info->i = 1;                        break;
2493      case CPUINFO_INT_MAX_CYCLES:               info->i = 20; /* rough guess */            break;
2494      case CPUINFO_INT_INPUT_LINES:                 info->i = 3;                        break;
24342495
2435      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 8;               break;
2436      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16;               break;
2437      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0;               break;
2438      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA:   info->i = 8;               break;
2496      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 8;                  break;
2497      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16;                  break;
2498      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0;                  break;
2499      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA:   info->i = 8;                  break;
24392500      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:    info->i = 9; /* due to sfr mapping */               break;
2440      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA:    info->i = 0;               break;
2441      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:   info->i = 8;                  break;
2442      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:    info->i = 17;                  break;
2443      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:    info->i = 0;                  break;
2501      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA:    info->i = 0;                  break;
2502      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:   info->i = 8;                     break;
2503      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:    info->i = 18; /* 128k for ds5002fp */                     break;
2504      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:    info->i = 0;                     break;
24442505
2445      case CPUINFO_INT_PREVIOUSPC:               info->i = PPC;                     break;
2446      case CPUINFO_INT_PC:                      info->i = PC;                     break;
2447      case CPUINFO_INT_SP:                     info->i = SP;                     break;
2506      case CPUINFO_INT_PREVIOUSPC:               info->i = PPC;                        break;
2507      case CPUINFO_INT_PC:                      info->i = PC;                        break;
2508      case CPUINFO_INT_SP:                     info->i = SP;                        break;
24482509
2449      case CPUINFO_INT_REGISTER + MCS51_PC:          info->i = PC;                     break;
2450      case CPUINFO_INT_REGISTER + MCS51_SP:          info->i = SP;                     break;
2451      case CPUINFO_INT_REGISTER + MCS51_PSW:         info->i = PSW;                     break;
2452      case CPUINFO_INT_REGISTER + MCS51_ACC:         info->i = ACC;                     break;
2453      case CPUINFO_INT_REGISTER + MCS51_B:           info->i = B;                     break;
2454      case CPUINFO_INT_REGISTER + MCS51_DPH:         info->i = DPH;                     break;
2455      case CPUINFO_INT_REGISTER + MCS51_DPL:         info->i = DPL;                     break;
2456      case CPUINFO_INT_REGISTER + MCS51_IE:          info->i = IE;                     break;
2457      case CPUINFO_INT_REGISTER + MCS51_R0:          info->i = R_REG(0);                   break;
2458      case CPUINFO_INT_REGISTER + MCS51_R1:          info->i = R_REG(1);                break;
2459      case CPUINFO_INT_REGISTER + MCS51_R2:          info->i = R_REG(2);                break;
2460      case CPUINFO_INT_REGISTER + MCS51_R3:          info->i = R_REG(3);                break;
2461      case CPUINFO_INT_REGISTER + MCS51_R4:          info->i = R_REG(4);                break;
2462      case CPUINFO_INT_REGISTER + MCS51_R5:          info->i = R_REG(5);                break;
2463      case CPUINFO_INT_REGISTER + MCS51_R6:          info->i = R_REG(6);                break;
2464      case CPUINFO_INT_REGISTER + MCS51_R7:          info->i = R_REG(7);                break;
2465      case CPUINFO_INT_REGISTER + MCS51_RB:          info->i = R_REG(8);                break;
2510      case CPUINFO_INT_REGISTER + MCS51_PC:          info->i = PC;                        break;
2511      case CPUINFO_INT_REGISTER + MCS51_SP:          info->i = SP;                        break;
2512      case CPUINFO_INT_REGISTER + MCS51_PSW:         info->i = PSW;                        break;
2513      case CPUINFO_INT_REGISTER + MCS51_ACC:         info->i = ACC;                        break;
2514      case CPUINFO_INT_REGISTER + MCS51_B:           info->i = B;                        break;
2515      case CPUINFO_INT_REGISTER + MCS51_DPH:         info->i = DPH;                        break;
2516      case CPUINFO_INT_REGISTER + MCS51_DPL:         info->i = DPL;                        break;
2517      case CPUINFO_INT_REGISTER + MCS51_IE:          info->i = IE;                        break;
2518      case CPUINFO_INT_REGISTER + MCS51_R0:          info->i = R_REG(0);                      break;
2519      case CPUINFO_INT_REGISTER + MCS51_R1:          info->i = R_REG(1);                   break;
2520      case CPUINFO_INT_REGISTER + MCS51_R2:          info->i = R_REG(2);                   break;
2521      case CPUINFO_INT_REGISTER + MCS51_R3:          info->i = R_REG(3);                   break;
2522      case CPUINFO_INT_REGISTER + MCS51_R4:          info->i = R_REG(4);                   break;
2523      case CPUINFO_INT_REGISTER + MCS51_R5:          info->i = R_REG(5);                   break;
2524      case CPUINFO_INT_REGISTER + MCS51_R6:          info->i = R_REG(6);                   break;
2525      case CPUINFO_INT_REGISTER + MCS51_R7:          info->i = R_REG(7);                   break;
2526      case CPUINFO_INT_REGISTER + MCS51_RB:          info->i = R_REG(8);                   break;
24662527
24672528      /* --- the following bits of info are returned as pointers to data or functions --- */
2468      case CPUINFO_PTR_SET_INFO:                  info->setinfo = mcs51_set_info;         break;
2469      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = mcs51_get_context;   break;
2470      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = mcs51_set_context;   break;
2471      case CPUINFO_PTR_INIT:                     info->init = mcs51_init;            break;
2472      case CPUINFO_PTR_RESET:                     info->reset = mcs51_reset;            break;
2473      case CPUINFO_PTR_EXIT:                     info->exit = mcs51_exit;            break;
2474      case CPUINFO_PTR_EXECUTE:                  info->execute = mcs51_execute;         break;
2475      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
2476      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = i8051_dasm;         break;
2477      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &mcs51_icount;         break;
2529      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(mcs51);            break;
2530      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(mcs51);      break;
2531      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(mcs51);      break;
2532      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(mcs51);         break;
2533      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(mcs51);      break;
2534      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(mcs51);         break;
2535      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(mcs51);   break;
2536      case CPUINFO_PTR_BURN:                     info->burn = NULL;                     break;
2537      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i8051);            break;
2538      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &mcs51->icount;            break;
24782539
24792540      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = NULL;   break;
24802541      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = NULL;   break;
24812542      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO:      info->internal_map8 = NULL;   break;
24822543
2483      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8051");            break;
2484      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "MCS-51");            break;
2485      case CPUINFO_STR_CORE_VERSION:               strcpy(info->s, "1.0");               break;
2486      case CPUINFO_STR_CORE_FILE:                  strcpy(info->s, __FILE__);            break;
2544      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8051");               break;
2545      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "MCS-51");               break;
2546      case CPUINFO_STR_CORE_VERSION:               strcpy(info->s, "1.0");                  break;
2547      case CPUINFO_STR_CORE_FILE:                  strcpy(info->s, __FILE__);               break;
24872548      case CPUINFO_STR_CORE_CREDITS:               strcpy(info->s, "Copyright Steve Ellenoff"); break;
24882549
24892550      case CPUINFO_STR_FLAGS:
r3535r3536
24982559            PSW & 0x01 ? 'P':'.');
24992560         break;
25002561
2501      case CPUINFO_STR_REGISTER + MCS51_PC:           sprintf(info->s, "PC:%04X", r->pc);      break;
2502      case CPUINFO_STR_REGISTER + MCS51_SP:           sprintf(info->s, "SP:%02X", SP);      break;
2503      case CPUINFO_STR_REGISTER + MCS51_PSW:          sprintf(info->s, "PSW:%02X", PSW);      break;
2504      case CPUINFO_STR_REGISTER + MCS51_ACC:          sprintf(info->s, "A:%02X", ACC);      break;
2505      case CPUINFO_STR_REGISTER + MCS51_B:            sprintf(info->s, "B:%02X", B);         break;
2506      case CPUINFO_STR_REGISTER + MCS51_DPH:          sprintf(info->s, "DPH:%02X", DPH);      break;
2507      case CPUINFO_STR_REGISTER + MCS51_DPL:          sprintf(info->s, "DPL:%02X", DPL);      break;
2508      case CPUINFO_STR_REGISTER + MCS51_IE:           sprintf(info->s, "IE:%02X", IE);      break;
2509      case CPUINFO_STR_REGISTER + MCS51_R0:           sprintf(info->s, "R0:%02X", R_REG(0));    break;
2510      case CPUINFO_STR_REGISTER + MCS51_R1:           sprintf(info->s, "R1:%02X", R_REG(1));    break;
2511      case CPUINFO_STR_REGISTER + MCS51_R2:           sprintf(info->s, "R2:%02X", R_REG(2));    break;
2512      case CPUINFO_STR_REGISTER + MCS51_R3:         sprintf(info->s, "R3:%02X", R_REG(3));    break;
2513      case CPUINFO_STR_REGISTER + MCS51_R4:          sprintf(info->s, "R4:%02X", R_REG(4));    break;
2514      case CPUINFO_STR_REGISTER + MCS51_R5:          sprintf(info->s, "R5:%02X", R_REG(5));    break;
2515      case CPUINFO_STR_REGISTER + MCS51_R6:          sprintf(info->s, "R6:%02X", R_REG(6));    break;
2516      case CPUINFO_STR_REGISTER + MCS51_R7:          sprintf(info->s, "R7:%02X", R_REG(7));    break;
2562      case CPUINFO_STR_REGISTER + MCS51_PC:           sprintf(info->s, "PC:%04X", mcs51->pc);      break;
2563      case CPUINFO_STR_REGISTER + MCS51_SP:           sprintf(info->s, "SP:%02X", SP);         break;
2564      case CPUINFO_STR_REGISTER + MCS51_PSW:          sprintf(info->s, "PSW:%02X", PSW);         break;
2565      case CPUINFO_STR_REGISTER + MCS51_ACC:          sprintf(info->s, "A:%02X", ACC);         break;
2566      case CPUINFO_STR_REGISTER + MCS51_B:            sprintf(info->s, "B:%02X", B);            break;
2567      case CPUINFO_STR_REGISTER + MCS51_DPH:          sprintf(info->s, "DPH:%02X", DPH);         break;
2568      case CPUINFO_STR_REGISTER + MCS51_DPL:          sprintf(info->s, "DPL:%02X", DPL);         break;
2569      case CPUINFO_STR_REGISTER + MCS51_IE:           sprintf(info->s, "IE:%02X", IE);         break;
2570      case CPUINFO_STR_REGISTER + MCS51_R0:           sprintf(info->s, "R0:%02X", R_REG(0));       break;
2571      case CPUINFO_STR_REGISTER + MCS51_R1:           sprintf(info->s, "R1:%02X", R_REG(1));       break;
2572      case CPUINFO_STR_REGISTER + MCS51_R2:           sprintf(info->s, "R2:%02X", R_REG(2));       break;
2573      case CPUINFO_STR_REGISTER + MCS51_R3:         sprintf(info->s, "R3:%02X", R_REG(3));       break;
2574      case CPUINFO_STR_REGISTER + MCS51_R4:          sprintf(info->s, "R4:%02X", R_REG(4));       break;
2575      case CPUINFO_STR_REGISTER + MCS51_R5:          sprintf(info->s, "R5:%02X", R_REG(5));       break;
2576      case CPUINFO_STR_REGISTER + MCS51_R6:          sprintf(info->s, "R6:%02X", R_REG(6));       break;
2577      case CPUINFO_STR_REGISTER + MCS51_R7:          sprintf(info->s, "R7:%02X", R_REG(7));       break;
25172578      case CPUINFO_STR_REGISTER + MCS51_RB:          sprintf(info->s, "RB:%02X", ((PSW & 0x18)>>3)); break;
25182579   }
25192580}
r3535r3536
25222583 * Specific get_info
25232584 **************************************************************************/
25242585
2525void i8031_get_info(UINT32 state, cpuinfo *info)
2586CPU_GET_INFO( i8031 )
25262587{
25272588   switch (state)
25282589   {
2529      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = address_map_data_7bit;   break;
2530
2531      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8031");            break;
2532      default:                              mcs51_get_info(state, info);         break;
2590      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = ADDRESS_MAP_NAME(data_7bit);   break;
2591      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8031");               break;
2592      default:                              CPU_GET_INFO_CALL(mcs51);               break;
25332593   }
25342594   /* --- the following bits of info are returned as NULL-terminated strings --- */
25352595}
25362596
2537void i8051_get_info(UINT32 state, cpuinfo *info)
2597CPU_GET_INFO( i8051 )
25382598{
25392599   switch (state)
25402600   {
2541      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = address_map_program_12bit;   break;
2542      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = address_map_data_7bit;   break;
2543
2544      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8051");            break;
2545      default:                              mcs51_get_info(state, info);         break;
2601      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_12bit);   break;
2602      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = ADDRESS_MAP_NAME(data_7bit);   break;
2603      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8051");               break;
2604      default:                              CPU_GET_INFO_CALL(mcs51);               break;
25462605   }
25472606   /* --- the following bits of info are returned as NULL-terminated strings --- */
25482607}
25492608
2550void i8032_get_info(UINT32 state, cpuinfo *info)
2609CPU_GET_INFO( i8032 )
25512610{
25522611   switch (state)
25532612   {
2554      case CPUINFO_PTR_INIT:                     info->init = i8052_init;            break;
2555
2556      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = address_map_data_8bit;   break;
2557
2558      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8032");            break;
2559
2560      default:                              mcs51_get_info(state, info);         break;
2613      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i8052);         break;
2614      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = ADDRESS_MAP_NAME(data_8bit);   break;
2615      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i8052);            break;
2616      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8032");               break;
2617      default:                              CPU_GET_INFO_CALL(mcs51);               break;
25612618   }
25622619}
25632620
2564void i8052_get_info(UINT32 state, cpuinfo *info)
2621CPU_GET_INFO( i8052 )
25652622{
25662623   switch (state)
25672624   {
2568      case CPUINFO_PTR_INIT:                     info->init = i8052_init;            break;
2569
2570      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = address_map_program_13bit;   break;
2571      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = address_map_data_8bit;   break;
2572
2573      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8052");            break;
2574
2575      default:                              mcs51_get_info(state, info);         break;
2625      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i8052);         break;
2626      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_13bit);   break;
2627      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = ADDRESS_MAP_NAME(data_8bit);   break;
2628      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i8052);            break;
2629      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8052");               break;
2630      default:                              CPU_GET_INFO_CALL(mcs51);               break;
25762631   }
25772632}
25782633
2579void i8751_get_info(UINT32 state, cpuinfo *info)
2634CPU_GET_INFO( i8751 )
25802635{
25812636   switch (state)
25822637   {
2583      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = address_map_program_12bit;   break;
2584      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = address_map_data_7bit;   break;
2585
2586      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8751");            break;
2587
2588      default:                              mcs51_get_info(state, info);         break;
2638      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_12bit);   break;
2639      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = ADDRESS_MAP_NAME(data_7bit);   break;
2640      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8751");               break;
2641      default:                              CPU_GET_INFO_CALL(mcs51);               break;
25892642   }
25902643}
25912644
2592void i8752_get_info(UINT32 state, cpuinfo *info)
2645CPU_GET_INFO( i8752 )
25932646{
25942647   switch (state)
25952648   {
2596      case CPUINFO_PTR_INIT:                     info->init = i8052_init;            break;
2597
2598      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = address_map_program_13bit;   break;
2599      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = address_map_data_8bit;   break;
2600
2601      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8752");            break;
2602
2603      default:                              mcs51_get_info(state, info);         break;
2649      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i8052);         break;
2650      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_13bit);   break;
2651      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = ADDRESS_MAP_NAME(data_8bit);   break;
2652      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i8052);            break;
2653      case CPUINFO_STR_NAME:                     strcpy(info->s, "I8752");               break;
2654      default:                              CPU_GET_INFO_CALL(mcs51);               break;
26042655   }
26052656}
26062657
r3535r3536
26082659 * CMOS get_info
26092660 **************************************************************************/
26102661
2611void i80c31_get_info(UINT32 state, cpuinfo *info)
2662CPU_GET_INFO( i80c31 )
26122663{
26132664   /* according to PHILIPS datasheet this is a stripped down version
26142665     * of i80c52 with 128 bytes internal ram */
26152666   switch (state)
26162667   {
2617      case CPUINFO_PTR_INIT:                     info->init = i80c31_init;            break;
2618
2668      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i80c31);         break;
26192669      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = NULL;   break;
2620      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = address_map_data_7bit;   break;
2621
2622      case CPUINFO_STR_NAME:                     strcpy(info->s, "I80C31");            break;
2623      default:                              i8031_get_info(state, info);         break;
2670      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map8 = ADDRESS_MAP_NAME(data_7bit);   break;
2671      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i80c51);         break;
2672      case CPUINFO_STR_NAME:                     strcpy(info->s, "I80C31");               break;
2673      default:                              CPU_GET_INFO_CALL(i8031);               break;
26242674   }
26252675}
26262676
2627void i80c51_get_info(UINT32 state, cpuinfo *info)
2677CPU_GET_INFO( i80c51 )
26282678{
26292679   switch (state)
26302680   {
2631      case CPUINFO_PTR_INIT:                     info->init = i80c51_init;            break;
2632      case CPUINFO_STR_NAME:                     strcpy(info->s, "I80C51");            break;
2633      default:                              i8051_get_info(state, info);         break;
2681      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i80c51);         break;
2682      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i80c51);         break;
2683      case CPUINFO_STR_NAME:                     strcpy(info->s, "I80C51");               break;
2684      default:                              CPU_GET_INFO_CALL(i8051);               break;
26342685   }
26352686}
26362687
2637void i80c32_get_info(UINT32 state, cpuinfo *info)
2688CPU_GET_INFO( i80c32 )
26382689{
26392690   switch (state)
26402691   {
2641      case CPUINFO_PTR_INIT:                     info->init = i80c52_init;            break;
2642      case CPUINFO_STR_NAME:                     strcpy(info->s, "I80C32");            break;
2643      default:                              i8032_get_info(state, info);         break;
2692      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i80c52);         break;
2693      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i80c52);         break;
2694      case CPUINFO_STR_NAME:                     strcpy(info->s, "I80C32");               break;
2695      default:                              CPU_GET_INFO_CALL(i8032);               break;
26442696   }
26452697}
26462698
2647void i80c52_get_info(UINT32 state, cpuinfo *info)
2699CPU_GET_INFO( i80c52 )
26482700{
26492701   switch (state)
26502702   {
2651      case CPUINFO_PTR_INIT:                     info->init = i80c52_init;            break;
2652      case CPUINFO_STR_NAME:                     strcpy(info->s, "I80C52");            break;
2653      default:                              i8052_get_info(state, info);         break;
2703      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i80c52);         break;
2704      case CPUINFO_STR_NAME:                     strcpy(info->s, "I80C52");               break;
2705      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i80c52);         break;
2706      default:                              CPU_GET_INFO_CALL(i8052);               break;
26542707   }
26552708}
26562709
2657void i87c51_get_info(UINT32 state, cpuinfo *info)
2710CPU_GET_INFO( i87c51 )
26582711{
26592712   switch (state)
26602713   {
2661      case CPUINFO_PTR_INIT:                     info->init = i80c51_init;            break;
2662      case CPUINFO_STR_NAME:                     strcpy(info->s, "I87C51");            break;
2663      default:                              i8751_get_info(state, info);         break;
2714      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i80c51);         break;
2715      case CPUINFO_STR_NAME:                     strcpy(info->s, "I87C51");               break;
2716      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i80c51);         break;
2717      default:                              CPU_GET_INFO_CALL(i8751);               break;
26642718   }
26652719}
26662720
2667void i87c52_get_info(UINT32 state, cpuinfo *info)
2721CPU_GET_INFO( i87c52 )
26682722{
26692723   switch (state)
26702724   {
2671      case CPUINFO_PTR_INIT:                     info->init = i80c52_init;            break;
2672      case CPUINFO_STR_NAME:                     strcpy(info->s, "I87C52");            break;
2673      default:                              i8752_get_info(state, info);         break;
2725      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i80c52);         break;
2726      case CPUINFO_STR_NAME:                     strcpy(info->s, "I87C52");               break;
2727      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i80c52);         break;
2728      default:                              CPU_GET_INFO_CALL(i8752);               break;
26742729   }
26752730}
26762731
r3535r3536
26782733 * Other variants get_info
26792734 **************************************************************************/
26802735
2681void at89c4051_get_info(UINT32 state, cpuinfo *info)
2736CPU_GET_INFO( at89c4051 )
26822737{
26832738   switch (state)
26842739   {
2685      case CPUINFO_PTR_INIT:                     info->init = i80c51_init;            break;
2740      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i80c51);         break;
26862741      case CPUINFO_STR_NAME:                     strcpy(info->s, "AT89C4051");            break;
2687      default:                              i8051_get_info(state, info);         break;
2742      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i80c51);         break;
2743      default:                              CPU_GET_INFO_CALL(i8051);               break;
26882744   }
26892745}
2746
2747CPU_GET_INFO( ds5002fp )
2748{
2749   switch (state)
2750   {
2751      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ds5002fp);      break;
2752      case CPUINFO_STR_NAME:                     strcpy(info->s, "DS5002FP");            break;
2753      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "Dallas");               break;
2754      case CPUINFO_STR_CORE_VERSION:               strcpy(info->s, "1.0");                  break;
2755      case CPUINFO_STR_CORE_FILE:                  strcpy(info->s, __FILE__);               break;
2756      case CPUINFO_STR_CORE_CREDITS:               strcpy(info->s, "Copyright Manuel Abadia"); break;
2757      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(ds5002fp);         break;
2758      default:                              CPU_GET_INFO_CALL(i8051);               break;
2759   }
2760}
src/emu/cpu/mcs51/mcs51ops.c
r3535r3536
55********************************************************************************************/
66
77//ACALL code addr                           /* 1: aaa1 0001 */
8INLINE void acall(UINT8 op)
8OPHANDLER( acall )
99{
1010   UINT8 addr = ROP_ARG(PC++);            //Grab code address byte
1111   PUSH_PC();                        //Save PC to the stack
1212   //Thanks Gerrit for help with this! :)
13   PC = (PC & 0xf800) | ((op & 0xe0) << 3) | addr;
13   PC = (PC & 0xf800) | ((r & 0xe0) << 3) | addr;
1414   change_pc(PC);
1515}
1616
1717//ADD A, #data                              /* 1: 0010 0100 */
18INLINE void add_a_byte(void)
18OPHANDLER( add_a_byte )
1919{
2020   UINT8 data = ROP_ARG(PC++);            //Grab data
2121   UINT8 result = ACC + data;         //Add data to accumulator
r3535r3536
2424}
2525
2626//ADD A, data addr                          /* 1: 0010 0101 */
27INLINE void add_a_mem(void)
27OPHANDLER( add_a_mem )
2828{
2929   UINT8 addr = ROP_ARG(PC++);            //Grab data address
3030   UINT8 data = IRAM_R(addr);            //Grab data from data address
r3535r3536
3434}
3535
3636//ADD A, @R0/@R1                            /* 1: 0010 011i */
37INLINE void add_a_ir(int r)
37OPHANDLER( add_a_ir )
3838{
3939   UINT8 data = IRAM_IR(R_REG(r));         //Grab data from memory pointed to by R0 or R1
4040   UINT8 result = ACC + data;         //Add data to accumulator
r3535r3536
4343}
4444
4545//ADD A, R0 to R7                           /* 1: 0010 1rrr */
46INLINE void add_a_r(int r)
46OPHANDLER( add_a_r )
4747{
4848   UINT8 data = R_REG(r);               //Grab data from R0 - R7
4949   UINT8 result = ACC + data;         //Add data to accumulator
r3535r3536
5252}
5353
5454//ADDC A, #data                             /* 1: 0011 0100 */
55INLINE void addc_a_byte(void)
55OPHANDLER( addc_a_byte )
5656{
5757   UINT8 data = ROP_ARG(PC++);            //Grab data
5858   UINT8 result = ACC + data + GET_CY;   //Add data + carry flag to accumulator
r3535r3536
6161}
6262
6363//ADDC A, data addr                         /* 1: 0011 0101 */
64INLINE void addc_a_mem(void)
64OPHANDLER( addc_a_mem )
6565{
6666   UINT8 addr = ROP_ARG(PC++);            //Grab data address
6767   UINT8 data = IRAM_R(addr);            //Grab data from data address
r3535r3536
7171}
7272
7373//ADDC A, @R0/@R1                           /* 1: 0011 011i */
74INLINE void addc_a_ir(int r)
74OPHANDLER( addc_a_ir )
7575{
7676   UINT8 data = IRAM_IR(R_REG(r));         //Grab data from memory pointed to by R0 or R1
7777   UINT8 result = ACC + data + GET_CY;   //Add data + carry flag to accumulator
r3535r3536
8080}
8181
8282//ADDC A, R0 to R7                          /* 1: 0011 1rrr */
83INLINE void addc_a_r(int r)
83OPHANDLER( addc_a_r )
8484{
8585   UINT8 data = R_REG(r);               //Grab data from R0 - R7
8686   UINT8 result = ACC + data + GET_CY;   //Add data + carry flag to accumulator
r3535r3536
8989}
9090
9191//AJMP code addr                            /* 1: aaa0 0001 */
92INLINE void ajmp(UINT8 op)
92OPHANDLER( ajmp )
9393{
9494   UINT8 addr = ROP_ARG(PC++);            //Grab code address byte
9595   //Thanks Gerrit for help with this! :)
96   PC = (PC & 0xf800) | ((op & 0xe0) << 3) | addr;
96   PC = (PC & 0xf800) | ((r & 0xe0) << 3) | addr;
9797   change_pc(PC);
9898}
9999
100100//ANL data addr, A                          /* 1: 0101 0010 */
101INLINE void anl_mem_a(void)
101OPHANDLER( anl_mem_a )
102102{
103103   UINT8 addr = ROP_ARG(PC++);            //Grab data address
104104   UINT8 data = IRAM_R(addr);            //Grab data from data address
r3535r3536
106106}
107107
108108//ANL data addr, #data                      /* 1: 0101 0011 */
109INLINE void anl_mem_byte(void)
109OPHANDLER( anl_mem_byte )
110110{
111111   UINT8 addr = ROP_ARG(PC++);            //Grab data address
112112   UINT8 data = ROP_ARG(PC++);            //Grab data
r3535r3536
115115}
116116
117117//ANL A, #data                              /* 1: 0101 0100 */
118INLINE void anl_a_byte(void)
118OPHANDLER( anl_a_byte )
119119{
120120   UINT8 data = ROP_ARG(PC++);            //Grab data
121121   SET_ACC(ACC & data);            //Set ACC to value of ACC Logical AND with Data
122122}
123123
124124//ANL A, data addr                          /* 1: 0101 0101 */
125INLINE void anl_a_mem(void)
125OPHANDLER( anl_a_mem )
126126{
127127   UINT8 addr = ROP_ARG(PC++);            //Grab data address
128128   UINT8 data = IRAM_R(addr);            //Grab data from data address
r3535r3536
130130}
131131
132132//ANL A, @RO/@R1                            /* 1: 0101 011i */
133INLINE void anl_a_ir(int r)
133OPHANDLER( anl_a_ir )
134134{
135135   UINT8 data = IRAM_IR(R_REG(r));         //Grab data from address R0 or R1 points to
136136   SET_ACC(ACC & data);            //Set ACC to value of ACC Logical AND with Data
137137}
138138
139139//ANL A, RO to R7                           /* 1: 0101 1rrr */
140INLINE void anl_a_r(int r)
140OPHANDLER( anl_a_r )
141141{
142142   UINT8 data = R_REG(r);               //Grab data from R0 - R7
143143   SET_ACC(ACC & data);            //Set ACC to value of ACC Logical AND with Data
144144}
145145
146146//ANL C, bit addr                           /* 1: 1000 0010 */
147INLINE void anl_c_bitaddr(void)
147OPHANDLER( anl_c_bitaddr )
148148{
149149   int cy = GET_CY;
150150   UINT8 addr = ROP_ARG(PC++);            //Grab bit address
r3535r3536
153153}
154154
155155//ANL C,/bit addr                           /* 1: 1011 0000 */
156INLINE void anl_c_nbitaddr(void)
156OPHANDLER( anl_c_nbitaddr )
157157{
158158   int cy = GET_CY;
159159   UINT8 addr = ROP_ARG(PC++);            //Grab bit address
r3535r3536
163163}
164164
165165//CJNE A, #data, code addr                  /* 1: 1011 0100 */
166INLINE void cjne_a_byte(void)
166OPHANDLER( cjne_a_byte )
167167{
168168   UINT8 data = ROP_ARG(PC++);            //Grab data
169169   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
r3535r3536
179179}
180180
181181//CJNE A, data addr, code addr              /* 1: 1011 0101 */
182INLINE void cjne_a_mem(void)
182OPHANDLER( cjne_a_mem )
183183{
184184   UINT8 addr = ROP_ARG(PC++);            //Grab data address
185185   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
r3535r3536
196196}
197197
198198//CJNE @R0/@R1, #data, code addr            /* 1: 1011 011i */
199INLINE void cjne_ir_byte(int r)
199OPHANDLER( cjne_ir_byte )
200200{
201201   UINT8 data = ROP_ARG(PC++);            //Grab data
202202   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
r3535r3536
213213}
214214
215215//CJNE R0 to R7, #data, code addr           /* 1: 1011 1rrr */
216INLINE void cjne_r_byte(int r)
216OPHANDLER( cjne_r_byte )
217217{
218218   UINT8 data = ROP_ARG(PC++);            //Grab data
219219   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
r3535r3536
230230}
231231
232232//CLR bit addr                              /* 1: 1100 0010 */
233INLINE void clr_bitaddr(void)
233OPHANDLER( clr_bitaddr )
234234{
235235   UINT8 addr = ROP_ARG(PC++);            //Grab bit address
236236   BIT_W(addr,0);                     //Clear bit at specified bit address
237237}
238238
239239//CLR C                                     /* 1: 1100 0011 */
240INLINE void clr_c(void)
240OPHANDLER( clr_c )
241241{
242242   SET_CY(0);                        //Clear Carry Flag
243243}
244244
245245//CLR A                                     /* 1: 1110 0100 */
246INLINE void clr_a(void)
246OPHANDLER( clr_a )
247247{
248248   SET_ACC(0);                     //Clear Accumulator
249249}
250250
251251//CPL bit addr                              /* 1: 1011 0010 */
252INLINE void cpl_bitaddr(void)
252OPHANDLER( cpl_bitaddr )
253253{
254254   UINT8 addr = ROP_ARG(PC++);            //Grab bit address
255255   UINT8 data = (~BIT_R(addr))&1;
r3535r3536
257257}
258258
259259//CPL C                                     /* 1: 1011 0011 */
260INLINE void cpl_c(void)
260OPHANDLER( cpl_c )
261261{
262262   UINT8 bit = (~GET_CY)&1;            //Complement Carry Flag
263263   SET_CY(bit);
264264}
265265
266266//CPL A                                     /* 1: 1111 0100 */
267INLINE void cpl_a(void)
267OPHANDLER( cpl_a )
268268{
269269   UINT8 data = ((~ACC)&0xff);
270270   SET_ACC(data);                  //Complement Accumulator
271271}
272272
273273//DA A                                      /* 1: 1101 0100 */
274INLINE void da_a(void)
274OPHANDLER( da_a )
275275{
276276/*From several sources, since none said the same thing:
277277 The decimal adjust instruction is associated with the use of the ADD and ADDC instructions.
r3535r3536
292292}
293293
294294//DEC A                                     /* 1: 0001 0100 */
295INLINE void dec_a(void)
295OPHANDLER( dec_a )
296296{
297297   SET_ACC(ACC-1);
298298}
299299
300300//DEC data addr                             /* 1: 0001 0101 */
301INLINE void dec_mem(void)
301OPHANDLER( dec_mem )
302302{
303303   UINT8 addr = ROP_ARG(PC++);            //Grab data address
304304   UINT8 data = IRAM_R(addr);
r3535r3536
306306}
307307
308308//DEC @R0/@R1                               /* 1: 0001 011i */
309INLINE void dec_ir(int r)
309OPHANDLER( dec_ir )
310310{
311311   UINT8 data = IRAM_IR(R_REG(r));
312312   IRAM_W(R_REG(r),data-1);
313313}
314314
315315//DEC R0 to R7                              /* 1: 0001 1rrr */
316INLINE void dec_r(int r)
316OPHANDLER( dec_r )
317317{
318318   SET_REG(r, R_REG(r) - 1);
319319}
320320
321321//DIV AB                                    /* 1: 1000 0100 */
322INLINE void div_ab(void)
322OPHANDLER( div_ab )
323323{
324324   if( B == 0 ) {
325325      //Overflow flag is set!
r3535r3536
342342}
343343
344344//DJNZ data addr, code addr                 /* 1: 1101 0101 */
345INLINE void djnz_mem(void)
345OPHANDLER( djnz_mem )
346346{
347347   UINT8 addr = ROP_ARG(PC++);            //Grab data address
348348   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
r3535r3536
355355}
356356
357357//DJNZ R0 to R7,code addr                   /* 1: 1101 1rrr */
358INLINE void djnz_r(int r)
358OPHANDLER( djnz_r )
359359{
360360   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
361361   SET_REG(r ,R_REG(r) - 1);               //Decrement value
r3535r3536
367367}
368368
369369//INC A                                     /* 1: 0000 0100 */
370INLINE void inc_a(void)
370OPHANDLER( inc_a )
371371{
372372   SET_ACC(ACC+1);
373373}
374374
375375//INC data addr                             /* 1: 0000 0101 */
376INLINE void inc_mem(void)
376OPHANDLER( inc_mem )
377377{
378378   UINT8 addr = ROP_ARG(PC++);            //Grab data address
379379   UINT8 data = IRAM_R(addr);
r3535r3536
381381}
382382
383383//INC @R0/@R1                               /* 1: 0000 011i */
384INLINE void inc_ir(int r)
384OPHANDLER( inc_ir )
385385{
386386   UINT8 data = IRAM_IR(R_REG(r));
387387   IRAM_W(R_REG(r),data+1);
388388}
389389
390390//INC R0 to R7                              /* 1: 0000 1rrr */
391INLINE void inc_r(int r)
391OPHANDLER( inc_r )
392392{
393393   UINT8 data = R_REG(r);
394394   SET_REG(r, data + 1);
395395}
396396
397397//INC DPTR                                  /* 1: 1010 0011 */
398INLINE void inc_dptr(void)
398OPHANDLER( inc_dptr )
399399{
400400   UINT16 dptr = (DPTR)+1;
401401   SET_DPTR(dptr);
402402}
403403
404404//JB  bit addr, code addr                   /* 1: 0010 0000 */
405INLINE void jb(void)
405OPHANDLER( jb )
406406{
407407   UINT8 addr = ROP_ARG(PC++);            //Grab bit address
408408   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
r3535r3536
414414}
415415
416416//JBC bit addr, code addr                   /* 1: 0001 0000 */
417INLINE void jbc(void)
417OPHANDLER( jbc )
418418{
419419   UINT8 addr = ROP_ARG(PC++);            //Grab bit address
420420   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
r3535r3536
426426}
427427
428428//JC code addr                              /* 1: 0100 0000 */
429INLINE void jc(void)
429OPHANDLER( jc )
430430{
431431   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
432432   if(GET_CY)                        //Jump if Carry Flag Set
r3535r3536
437437}
438438
439439//JMP @A+DPTR                               /* 1: 0111 0011 */
440INLINE void jmp_iadptr(void)
440OPHANDLER( jmp_iadptr )
441441{
442442   PC = ACC + DPTR;
443443   change_pc(PC);
444444}
445445
446446//JNB bit addr, code addr                   /* 1: 0011 0000 */
447INLINE void jnb(void)
447OPHANDLER( jnb )
448448{
449449   UINT8 addr = ROP_ARG(PC++);            //Grab bit address
450450   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
r3535r3536
456456}
457457
458458//JNC code addr                             /* 1: 0101 0000 */
459INLINE void jnc(void)
459OPHANDLER( jnc )
460460{
461461   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
462462   if(!GET_CY)                        //Jump if Carry Flag not set
r3535r3536
467467}
468468
469469//JNZ code addr                             /* 1: 0111 0000 */
470INLINE void jnz(void)
470OPHANDLER( jnz )
471471{
472472   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
473473   if(ACC != 0)                     //Branch if ACC is not 0
r3535r3536
478478}
479479
480480//JZ code addr                              /* 1: 0110 0000 */
481INLINE void jz(void)
481OPHANDLER( jz )
482482{
483483   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
484484   if(ACC == 0)                     //Branch if ACC is 0
r3535r3536
489489}
490490
491491//LCALL code addr                           /* 1: 0001 0010 */
492INLINE void lcall(void)
492OPHANDLER( lcall )
493493{
494494   UINT8 addr_hi, addr_lo;
495495   addr_hi = ROP_ARG(PC++);
r3535r3536
500500}
501501
502502//LJMP code addr                            /* 1: 0000 0010 */
503INLINE void ljmp(void)
503OPHANDLER( ljmp )
504504{
505505   UINT8 addr_hi, addr_lo;
506506   addr_hi = ROP_ARG(PC++);
r3535r3536
510510}
511511
512512//MOV A, #data                              /* 1: 0111 0100 */
513INLINE void mov_a_byte(void)
513OPHANDLER( mov_a_byte )
514514{
515515   UINT8 data = ROP_ARG(PC++);            //Grab data
516516   SET_ACC(data);                  //Store data to ACC
517517}
518518
519519//MOV A, data addr                          /* 1: 1110 0101 */
520INLINE void mov_a_mem(void)
520OPHANDLER( mov_a_mem )
521521{
522522   UINT8 addr = ROP_ARG(PC++);            //Grab data address
523523   SET_ACC(IRAM_R(addr));            //Store contents of data address to ACC
524524}
525525
526526//MOV A,@RO/@R1                             /* 1: 1110 011i */
527INLINE void mov_a_ir(int r)
527OPHANDLER( mov_a_ir )
528528{
529529   SET_ACC(IRAM_IR(R_REG(r)));            //Store contents of address pointed by R0 or R1 to ACC
530530}
531531
532532//MOV A,R0 to R7                            /* 1: 1110 1rrr */
533INLINE void mov_a_r(int r)
533OPHANDLER( mov_a_r )
534534{
535535   SET_ACC(R_REG(r));                  //Store contents of R0 - R7 to ACC
536536}
537537
538538//MOV data addr, #data                      /* 1: 0111 0101 */
539INLINE void mov_mem_byte(void)
539OPHANDLER( mov_mem_byte )
540540{
541541   UINT8 addr = ROP_ARG(PC++);            //Grab data address
542542   UINT8 data = ROP_ARG(PC++);            //Grab data
r3535r3536
544544}
545545
546546//MOV data addr, data addr                  /* 1: 1000 0101 */
547INLINE void mov_mem_mem(void)
547OPHANDLER( mov_mem_mem )
548548{
549549   //1st address is src, 2nd is dst, but the mov command works as mov dst,src)
550550   UINT8 src,dst;
r3535r3536
554554}
555555
556556//MOV @R0/@R1, #data                        /* 1: 0111 011i */
557INLINE void mov_ir_byte(int r)
557OPHANDLER( mov_ir_byte )
558558{
559559   UINT8 data = ROP_ARG(PC++);            //Grab data
560560   IRAM_IW(R_REG(r),data);               //Store data to address pointed by R0 or R1
561561}
562562
563563//MOV R0 to R7, #data                       /* 1: 0111 1rrr */
564INLINE void mov_r_byte(int r)
564OPHANDLER( mov_r_byte )
565565{
566566   UINT8 data = ROP_ARG(PC++);            //Grab data
567567   SET_REG(r, data);                     //Store to R0 - R7
568568}
569569
570570//MOV data addr, @R0/@R1                    /* 1: 1000 011i */
571INLINE void mov_mem_ir(int r)
571OPHANDLER( mov_mem_ir )
572572{
573573   UINT8 addr = ROP_ARG(PC++);            //Grab data address
574574   IRAM_W(addr,IRAM_IR(R_REG(r)));         //Store contents pointed to by R0 or R1 to data address
575575}
576576
577577//MOV data addr,R0 to R7                    /* 1: 1000 1rrr */
578INLINE void mov_mem_r(int r)
578OPHANDLER( mov_mem_r )
579579{
580580   UINT8 addr = ROP_ARG(PC++);            //Grab data address
581581   IRAM_W(addr,R_REG(r));               //Store contents of R0 - R7 to data address
582582}
583583
584584//MOV DPTR, #data16                         /* 1: 1001 0000 */
585INLINE void mov_dptr_byte(void)
585OPHANDLER( mov_dptr_byte )
586586{
587587   UINT8 data_hi, data_lo;
588588   data_hi = ROP_ARG(PC++);            //Grab hi byte
r3535r3536
591591}
592592
593593//MOV bit addr, C                           /* 1: 1001 0010 */
594INLINE void mov_bitaddr_c(void)
594OPHANDLER( mov_bitaddr_c )
595595{
596596   UINT8 addr = ROP_ARG(PC++);            //Grab bit address
597597   BIT_W(addr,GET_CY);                  //Store Carry Flag to Bit Address
598598}
599599
600600//MOV @R0/@R1, data addr                    /* 1: 1010 011i */
601INLINE void mov_ir_mem(int r)
601OPHANDLER( mov_ir_mem )
602602{
603603   UINT8 addr = ROP_ARG(PC++);            //Grab data address
604604   IRAM_IW(R_REG(r),IRAM_R(addr));         //Store data from data address to address pointed to by R0 or R1
605605}
606606
607607//MOV R0 to R7, data addr                   /* 1: 1010 1rrr */
608INLINE void mov_r_mem(int r)
608OPHANDLER( mov_r_mem )
609609{
610610   UINT8 addr = ROP_ARG(PC++);            //Grab data address
611611   SET_REG(r, IRAM_R(addr));            //Store to R0 - R7
612612}
613613
614614//MOV data addr, A                          /* 1: 1111 0101 */
615INLINE void mov_mem_a(void)
615OPHANDLER( mov_mem_a )
616616{
617617   UINT8 addr = ROP_ARG(PC++);            //Grab data address
618618   IRAM_W(addr,ACC);                  //Store A to data address
619619}
620620
621621//MOV @R0/@R1, A                            /* 1: 1111 011i */
622INLINE void mov_ir_a(int r)
622OPHANDLER( mov_ir_a )
623623{
624624   IRAM_IW(R_REG(r),ACC);               //Store A to location pointed to by R0 or R1
625625}
626626
627627//MOV R0 to R7, A                           /* 1: 1111 1rrr */
628INLINE void mov_r_a(int r)
628OPHANDLER( mov_r_a )
629629{
630630   SET_REG(r, ACC);                  //Store A to R0-R7
631631}
632632
633633//MOVC A, @A + PC                           /* 1: 1000 0011 */
634INLINE void movc_a_iapc(void)
634OPHANDLER( movc_a_iapc )
635635{
636636   UINT8 data;
637637   data = CODEMEM_R(ACC+PC);            //Move a byte from CODE(Program) Memory and store to ACC
r3535r3536
639639}
640640
641641//MOV C, bit addr                           /* 1: 1010 0010 */
642INLINE void mov_c_bitaddr(void)
642OPHANDLER( mov_c_bitaddr )
643643{
644644   UINT8 addr = ROP_ARG(PC++);            //Grab bit address
645645   SET_CY( (BIT_R(addr)) );            //Store Bit from Bit Address to Carry Flag
646646}
647647
648648//MOVC A, @A + DPTR                         /* 1: 1001 0011 */
649INLINE void movc_a_iadptr(void)
649OPHANDLER( movc_a_iadptr )
650650{
651651   UINT8 data;
652652   data = CODEMEM_R(ACC + DPTR);         //Move a byte from CODE(Program) Memory and store to ACC
r3535r3536
655655
656656//MOVX A,@DPTR                              /* 1: 1110 0000 */
657657//(Move External Ram 16 bit address to A)
658INLINE void movx_a_idptr(void)
658OPHANDLER( movx_a_idptr )
659659{
660660//  UINT8 byte = DATAMEM_R(R_DPTR);         //Grab 1 byte from External DATA memory pointed to by dptr
661661   UINT32 addr = ERAM_ADDR(DPTR, 0xFFFF);
r3535r3536
665665
666666//MOVX A, @R0/@R1                           /* 1: 1110 001i */
667667//(Move External Ram 8 bit address to A)
668INLINE void movx_a_ir(int r)
668OPHANDLER( movx_a_ir )
669669{
670670   UINT32 addr = ERAM_ADDR(R_REG(r),0xFF);   //Grab address by reading location pointed to by R0 or R1
671671   UINT8 byte = DATAMEM_R(addr);         //Grab 1 byte from External DATA memory pointed to by address
r3535r3536
674674
675675//MOVX @DPTR,A                              /* 1: 1111 0000 */
676676//(Move A to External Ram 16 bit address)
677INLINE void movx_idptr_a(void)
677OPHANDLER( movx_idptr_a )
678678{
679679//  DATAMEM_W(R_DPTR, ACC);               //Store ACC to External DATA memory address pointed to by DPTR
680680   UINT32 addr = ERAM_ADDR(DPTR, 0xFFFF);
r3535r3536
683683
684684//MOVX @R0/@R1,A                            /* 1: 1111 001i */
685685//(Move A to External Ram 8 bit address)
686INLINE void movx_ir_a(int r)
686OPHANDLER( movx_ir_a )
687687{
688688   UINT32 addr = ERAM_ADDR(R_REG(r),0xFF);   //Grab address by reading location pointed to by R0 or R1
689689   DATAMEM_W(addr, ACC);               //Store ACC to External DATA memory address
690690}
691691
692692//MUL AB                                    /* 1: 1010 0100 */
693INLINE void mul_ab(void)
693OPHANDLER( mul_ab )
694694{
695695   UINT16 result = ACC * B;
696696   //A gets lo bits, B gets hi bits of result
r3535r3536
702702}
703703
704704//NOP                                       /* 1: 0000 0000 */
705INLINE void nop(void)
705OPHANDLER( nop )
706706{
707707}
708708
709709//ORL data addr, A                          /* 1: 0100 0010 */
710INLINE void orl_mem_a(void)
710OPHANDLER( orl_mem_a )
711711{
712712   UINT8 addr = ROP_ARG(PC++);            //Grab data address
713713   UINT8 data = IRAM_R(addr);            //Grab data from data address
r3535r3536
715715}
716716
717717//ORL data addr, #data                      /* 1: 0100 0011 */
718INLINE void orl_mem_byte(void)
718OPHANDLER( orl_mem_byte )
719719{
720720   UINT8 addr = ROP_ARG(PC++);            //Grab data address
721721   UINT8 data = ROP_ARG(PC++);            //Grab data
r3535r3536
724724}
725725
726726//ORL A, #data                              /* 1: 0100 0100 */
727INLINE void orl_a_byte(void)
727OPHANDLER( orl_a_byte )
728728{
729729   UINT8 data = ROP_ARG(PC++);            //Grab data
730730   SET_ACC(ACC | data);            //Set ACC to value of ACC Logical OR with Data
731731}
732732
733733//ORL A, data addr                          /* 1: 0100 0101 */
734INLINE void orl_a_mem(void)
734OPHANDLER( orl_a_mem )
735735{
736736   UINT8 addr = ROP_ARG(PC++);            //Grab data address
737737   UINT8 data = IRAM_R(addr);            //Grab data from data address
r3535r3536
739739}
740740
741741//ORL A, @RO/@R1                            /* 1: 0100 011i */
742INLINE void orl_a_ir(int r)
742OPHANDLER( orl_a_ir )
743743{
744744   UINT8 data = IRAM_IR(R_REG(r));         //Grab data from address R0 or R1 points to
745745   SET_ACC(ACC | data);            //Set ACC to value of ACC Logical OR with Data
746746}
747747
748748//ORL A, RO to R7                           /* 1: 0100 1rrr */
749INLINE void orl_a_r(int r)
749OPHANDLER( orl_a_r )
750750{
751751   UINT8 data = R_REG(r);               //Grab data from R0 - R7
752752   SET_ACC(ACC | data);            //Set ACC to value of ACC Logical OR with Data
753753}
754754
755755//ORL C, bit addr                           /* 1: 0111 0010 */
756INLINE void orl_c_bitaddr(void)
756OPHANDLER( orl_c_bitaddr )
757757{
758758   int cy = GET_CY;
759759   UINT8 addr = ROP_ARG(PC++);            //Grab bit address
r3535r3536
762762}
763763
764764//ORL C, /bit addr                          /* 1: 1010 0000 */
765INLINE void orl_c_nbitaddr(void)
765OPHANDLER( orl_c_nbitaddr )
766766{
767767   int cy = GET_CY;
768768   UINT8 addr = ROP_ARG(PC++);            //Grab bit address
r3535r3536
772772}
773773
774774//POP data addr                             /* 1: 1101 0000 */
775INLINE void pop(void)
775OPHANDLER( pop )
776776{
777777   UINT8 addr = ROP_ARG(PC++);            //Grab data address
778778   IRAM_W(addr, IRAM_IR(SP));            //Store to contents of data addr, data pointed to by Stack - IRAM_IR needed to access upper 128 bytes of stack
r3535r3536
781781}
782782
783783//PUSH data addr                            /* 1: 1100 0000 */
784INLINE void push(void)
784OPHANDLER( push )
785785{
786786   UINT8 addr = ROP_ARG(PC++);            //Grab data address
787787   UINT8 tmpSP = SP+1;               //Grab and Increment Stack Pointer
r3535r3536
790790}
791791
792792//RET                                       /* 1: 0010 0010 */
793INLINE void ret(void)
793OPHANDLER( ret )
794794{
795795   POP_PC();
796796}
797797
798798//RETI                                      /* 1: 0011 0010 */
799INLINE void reti(void)
799OPHANDLER( reti )
800800{
801801   POP_PC();
802802   CLEAR_CURRENT_IRQ();
803803}
804804
805805//RL A                                      /* 1: 0010 0011 */
806INLINE void rl_a(void)
806OPHANDLER( rl_a )
807807{
808808   //Left Shift A, Bit 7 carries to Bit 0
809809   int carry = ((ACC & 0x80) >> 7);
r3535r3536
812812}
813813
814814//RLC A                                     /* 1: 0011 0011 */
815INLINE void rlc_a(void)
815OPHANDLER( rlc_a )
816816{
817817   //Left Shift A, Bit 7 goes to Carry Flag, Original Carry Flag goes to Bit 0 of ACC
818818   int carry = ((ACC & 0x80) >> 7);
r3535r3536
822822}
823823
824824//RR A                                      /* 1: 0000 0011 */
825INLINE void rr_a(void)
825OPHANDLER( rr_a )
826826{
827827   //Right Shift A, Bit 0 carries to Bit 7
828828   int carry = ((ACC & 1) << 7);
r3535r3536
831831}
832832
833833//RRC A                                     /* 1: 0001 0011 */
834INLINE void rrc_a(void)
834OPHANDLER( rrc_a )
835835{
836836   //Right Shift A, Bit 0 goes to Carry Flag, Bit 7 of ACC gets set to original Carry Flag
837837   int carry = (ACC & 1);
r3535r3536
841841}
842842
843843//SETB C                                    /* 1: 1101 0011 */
844INLINE void setb_c(void)
844OPHANDLER( setb_c )
845845{
846846   SET_CY(1);      //Set Carry Flag
847847}
848848
849849//SETB bit addr                             /* 1: 1101 0010 */
850INLINE void setb_bitaddr(void)
850OPHANDLER( setb_bitaddr )
851851{
852852   UINT8 addr = ROP_ARG(PC++);            //Grab bit address
853853   BIT_W(addr,1);                     //Set Bit at Bit Address
854854}
855855
856856//SJMP code addr                            /* 1: 1000 0000 */
857INLINE void sjmp(void)
857OPHANDLER( sjmp )
858858{
859859   INT8 rel_addr = ROP_ARG(PC++);         //Grab relative code address
860860   PC = PC + rel_addr;                  //Update PC
r3535r3536
862862}
863863
864864//SUBB A, #data                             /* 1: 1001 0100 */
865INLINE void subb_a_byte(void)
865OPHANDLER( subb_a_byte )
866866{
867867   UINT8 data = ROP_ARG(PC++);            //Grab data
868868   UINT8 result = ACC - data - GET_CY;   //Subtract data & carry flag from accumulator
r3535r3536
872872}
873873
874874//SUBB A, data addr                         /* 1: 1001 0101 */
875INLINE void subb_a_mem(void)
875OPHANDLER( subb_a_mem )
876876{
877877   UINT8 addr = ROP_ARG(PC++);            //Grab data address
878878   UINT8 data = IRAM_R(addr);            //Grab data from data address
r3535r3536
882882}
883883
884884//SUBB A, @R0/@R1                           /* 1: 1001 011i */
885INLINE void subb_a_ir(int r)
885OPHANDLER( subb_a_ir )
886886{
887887   UINT8 data = IRAM_IR(R_REG(r));         //Grab data from memory pointed to by R0 or R1
888888   UINT8 result = ACC - data - GET_CY;   //Subtract data & carry flag from accumulator
r3535r3536
891891}
892892
893893//SUBB A, R0 to R7                          /* 1: 1001 1rrr */
894INLINE void subb_a_r(int r)
894OPHANDLER( subb_a_r )
895895{
896896   UINT8 data = R_REG(r);               //Grab data from R0 - R7
897897   UINT8 result = ACC - data - GET_CY;   //Subtract data & carry flag from accumulator
r3535r3536
900900}
901901
902902//SWAP A                                    /* 1: 1100 0100 */
903INLINE void swap_a(void)
903OPHANDLER( swap_a )
904904{
905905   UINT8 a_nib_lo, a_nib_hi;
906906   a_nib_hi = (ACC & 0x0f) << 4;         //Grab lo byte of ACC and move to hi
r3535r3536
909909}
910910
911911//XCH A, data addr                          /* 1: 1100 0101 */
912INLINE void xch_a_mem(void)
912OPHANDLER( xch_a_mem )
913913{
914914   UINT8 addr = ROP_ARG(PC++);            //Grab data address
915915   UINT8 data = IRAM_R(addr);            //Grab data
r3535r3536
919919}
920920
921921//XCH A, @RO/@R1                            /* 1: 1100 011i */
922INLINE void xch_a_ir(int r)
922OPHANDLER( xch_a_ir )
923923{
924924   UINT8 data = IRAM_IR(R_REG(r));         //Grab data pointed to by R0 or R1
925925   UINT8 oldACC = ACC;               //Hold value of ACC
r3535r3536
928928}
929929
930930//XCH A, RO to R7                           /* 1: 1100 1rrr */
931INLINE void xch_a_r(int r)
931OPHANDLER( xch_a_r )
932932{
933933   UINT8 data = R_REG(r);               //Grab data from R0-R7
934934   UINT8 oldACC = ACC;               //Hold value of ACC
r3535r3536
937937}
938938
939939//XCHD A, @R0/@R1                           /* 1: 1101 011i */
940INLINE void xchd_a_ir(int r)
940OPHANDLER( xchd_a_ir )
941941{
942942   UINT8 acc, ir_data;
943943   ir_data = IRAM_IR(R_REG(r));            //Grab data pointed to by R0 or R1
r3535r3536
947947}
948948
949949//XRL data addr, A                          /* 1: 0110 0010 */
950INLINE void xrl_mem_a(void)
950OPHANDLER( xrl_mem_a )
951951{
952952   UINT8 addr = ROP_ARG(PC++);            //Grab data address
953953   UINT8 data = IRAM_R(addr);            //Grab data from data address
r3535r3536
955955}
956956
957957//XRL data addr, #data                      /* 1: 0110 0011 */
958INLINE void xrl_mem_byte(void)
958OPHANDLER( xrl_mem_byte )
959959{
960960   UINT8 addr = ROP_ARG(PC++);            //Grab data address
961961   UINT8 data = ROP_ARG(PC++);            //Grab data
r3535r3536
964964}
965965
966966//XRL A, #data                              /* 1: 0110 0100 */
967INLINE void xrl_a_byte(void)
967OPHANDLER( xrl_a_byte )
968968{
969969   UINT8 data = ROP_ARG(PC++);            //Grab data
970970   SET_ACC(ACC ^ data);            //Set ACC to value of ACC Logical XOR with Data
971971}
972972
973973//XRL A, data addr                          /* 1: 0110 0101 */
974INLINE void xrl_a_mem(void)
974OPHANDLER( xrl_a_mem )
975975{
976976   UINT8 addr = ROP_ARG(PC++);            //Grab data address
977977   UINT8 data = IRAM_R(addr);            //Grab data from data address
r3535r3536
979979}
980980
981981//XRL A, @R0/@R1                            /* 1: 0110 011i */
982INLINE void xrl_a_ir(int r)
982OPHANDLER( xrl_a_ir )
983983{
984984   UINT8 data = IRAM_IR(R_REG(r));         //Grab data from address R0 or R1 points to
985985   SET_ACC(ACC ^ data);            //Set ACC to value of ACC Logical XOR with Data
986986}
987987
988988//XRL A, R0 to R7                           /* 1: 0110 1rrr */
989INLINE void xrl_a_r(int r)
989OPHANDLER( xrl_a_r )
990990{
991991   UINT8 data = R_REG(r);               //Grab data from R0 - R7
992992   SET_ACC(ACC ^ data);            //Set ACC to value of ACC Logical XOR with Data
993993}
994994
995995//illegal opcodes
996INLINE void illegal(UINT8 op)
996OPHANDLER( illegal )
997997{
998   LOG(("i8051 #%d: illegal opcode at 0x%03x: %02x\n", cpu_getactivecpu(), PC-1, op));
998   LOG(("i8051 #%d: illegal opcode at 0x%03x: %02x\n", cpu_getactivecpu(), PC-1, r));
999999}
src/emu/cpu/mcs51/mcs51.h
r3535r3536
6666
6767enum
6868{
69   MCS51_PORT_P0   = 0x10000,
70   MCS51_PORT_P1   = 0x10001,
71   MCS51_PORT_P2   = 0x10002,
72   MCS51_PORT_P3   = 0x10003,
73   MCS51_PORT_TX   = 0x10004,   /* P3.1 */
69   MCS51_PORT_P0   = 0x20000,
70   MCS51_PORT_P1   = 0x20001,
71   MCS51_PORT_P2   = 0x20002,
72   MCS51_PORT_P3   = 0x20003,
73   MCS51_PORT_TX   = 0x20004,   /* P3.1 */
7474};
7575
7676/***************************************************************************
r3535r3536
9494extern void i8051_set_serial_rx_callback(int (*callback)(void));
9595
9696/* variants with no internal rom and 128 byte internal memory */
97void i8031_get_info(UINT32 state, cpuinfo *info);
97CPU_GET_INFO( i8031 );
9898
9999/* variants with no internal rom and 256 byte internal memory */
100void i8032_get_info(UINT32 state, cpuinfo *info);
100CPU_GET_INFO( i8032 );
101101
102102/* variants 4k internal rom and 128 byte internal memory */
103void i8051_get_info(UINT32 state, cpuinfo *info);
104void i8751_get_info(UINT32 state, cpuinfo *info);
103CPU_GET_INFO( i8051 );
104CPU_GET_INFO( i8751 );
105105
106106/* variants 8k internal rom and 256 byte internal memory and more registers */
107void i8052_get_info(UINT32 state, cpuinfo *info);
108void i8752_get_info(UINT32 state, cpuinfo *info);
107CPU_GET_INFO( i8052 );
108CPU_GET_INFO( i8752 );
109109
110110/* cmos variants */
111void i80c31_get_info(UINT32 state, cpuinfo *info);
112void i80c51_get_info(UINT32 state, cpuinfo *info);
113void i87c51_get_info(UINT32 state, cpuinfo *info);
111CPU_GET_INFO( i80c31 );
112CPU_GET_INFO( i80c51 );
113CPU_GET_INFO( i87c51 );
114114
115void i80c32_get_info(UINT32 state, cpuinfo *info);
116void i80c52_get_info(UINT32 state, cpuinfo *info);
117void i87c52_get_info(UINT32 state, cpuinfo *info);
115CPU_GET_INFO( i80c32 );
116CPU_GET_INFO( i80c52 );
117CPU_GET_INFO( i87c52 );
118118
119119/* 4k internal perom and 128 internal ram and 2 analog comparators */
120void at89c4051_get_info(UINT32 state, cpuinfo *info);
120CPU_GET_INFO( at89c4051 );
121121
122/*
123 * The DS5002FP has 2 16 bits data address buses (the byte-wide bus and the expanded bus). The exact memory position accessed depends on the
124 * partition mode, the memory range and the expanded bus select. The partition mode and the expanded bus select can be changed at any time.
125 *
126 * In order to simplify memory mapping to the data address bus, the following address map is assumed for partitioned mode:
127
128 * 0x00000-0x0ffff -> data memory on the expanded bus
129 * 0x10000-0x1ffff -> data memory on the byte-wide bus
130
131 * For non-partitioned mode the following memory map is assumed:
132
133 * 0x0000-0xffff -> data memory (the bus used to access it does not matter)
134 *
135 * Internal ram 128k and security features
136 */
137
138CPU_GET_INFO( ds5002fp );
139
140
122141/****************************************************************************
123142 * Disassembler
124143 ****************************************************************************/
125144
126offs_t i8051_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
145CPU_DISASSEMBLE( i8051 );
146CPU_DISASSEMBLE( i80c51 );
147CPU_DISASSEMBLE( i8052 );
148CPU_DISASSEMBLE( i80c52 );
149CPU_DISASSEMBLE( ds5002fp );
127150
128151#endif /* __MCS51_H__ */
src/emu/cpu/mcs51/mcs51dasm.c
r3535r3536
3636#include "debugger.h"
3737#include "mcs51.h"
3838
39enum
40{
41   FEATURE_NONE         = 0x00,
42   FEATURE_I8052         = 0x01,
43   FEATURE_CMOS         = 0x02,
44   FEATURE_I80C52         = 0x04,
45   FEATURE_DS5002FP      = 0x08,
46   FEATURE_I83C751         = 0x08,
47};
48
49
3950#define SHOW_MEMORY_NAMES   1
4051
4152#ifdef SHOW_MEMORY_NAMES
r3535r3536
4354/*Display the memory address names for data & bit address access*/
4455
4556//SFR Names
46static const char sfr[128][7] = {
47    "p0",     "sp",     "dpl",    "dph",    /* 80 - 83 */
48    "adat",   "85h",    "86h",    "pcon",   /* 84 - 87 */
49    "tcon",   "tmod",   "tl0",    "tl1",    /* 88 - 8b */
50    "th0",    "th1",    "pwcm",   "pwmp",   /* 8a - 8f */
51    "p1",     "91h",    "92h",    "93h",    /* 90 - 93 */
52    "94h",    "95h",    "96h",    "97h",    /* 94 - 97 */
53    "scon",   "sbuf",   "9ah",    "9bh",    /* 98 - 9b */
54    "9ch",    "9dh",    "9eh",    "9fh",    /* 9c - 9f */
55    "p2",     "0a1h",   "0a2h",   "0a3h",   /* a0 - a3 */
56    "0a4h",   "0a5h",   "0a6h",   "0a7h",   /* a4 - a7 */
57    "ie",     "cml0",   "cml1",   "cml2",   /* a8 - ab */
58    "ctl0",   "ctl1",   "ctl2",   "ctl3",   /* ac - af */
59    "p3",     "0b1h",   "0b2h",   "0b3h",   /* b0 - b3 */
60    "0b4h",   "0b5h",   "0b6h",   "0b7h",   /* b4 - b7 */
61    "ip",     "0b9h",   "0bah",   "0bbh",   /* b8 - bb */
62    "0bch",   "0bdh",   "0beh",   "0bfh",   /* bc - bf */
63    "p4",     "0c1h",   "0c2h",   "0c3h",   /* c0 - c3 */
64    "p5",     "adcon",  "adch",   "0c7h",   /* c4 - c7 */
65    "t2con",  "cmh0",   "rcap2l", "rcap2h", /* c8 - cb */
66    "tl2",    "th2",    "cth2",   "cth3",   /* cc - cf */
67    "psw",    "0d1h",   "0d2h",   "0d3h",   /* d0 - d3 */
68    "0d4h",   "0d5h",   "0d6h",   "0d7h",   /* d4 - d7 */
69    "i2cfg",  "s1sta",  "s1dat",  "s1adr",  /* d8 - db */
70    "0dch",   "0ddh",   "0deh",   "0dfh",   /* dc - df */
71    "acc",    "0e1h",   "0e2h",   "0e3h",   /* e0 - e3 */
72    "0e4h",   "0e5h",   "0e6h",   "0e7h",   /* e4 - e7 */
73    "csr",    "0e9h",   "tm2con", "ctcon",  /* e8 - eb */
74    "tml2",   "tmh2",   "ste",    "rte",    /* ec - ef */
75    "b",      "0f1h",   "0f2h",   "0f3h",   /* f0 - f3 */
76    "0f4h",   "0f5h",   "0f6h",   "0f7h",   /* f4 - f7 */
77    "i2sta",  "0f9h",   "0fah",   "0fbh",   /* f8 - fb */
78    "pwm0",   "pwm1",   "pwena",  "t3"      /* fc - ff */
79};
8057
81//SFR Addressable bits
82static const char sfrbits[128][8] = {
83    "p0.0",   "p0.1",   "p0.2",   "p0.3",   /* 80 - 83 */
84    "p0.4",   "p0.5",   "p0.6",   "p0.7",   /* 84 - 87 */
85    "it0",    "ie0",    "it1",    "ie1",    /* 88 - 8b */
86    "tr0",    "tf0",    "tr1",    "tf1",    /* 8c - 8f */
87    "p1.0",   "p1.1",   "p1.2",   "p1.3",   /* 90 - 93 */
88    "p1.4",   "p1.5",   "p1.6",   "p1.7",   /* 94 - 97 */
89    "ri",     "ti",     "rb8",    "tb8",    /* 98 - 9b */
90    "ren",    "sm2",    "sm1",    "sm0",    /* 9c - 9f */
91    "p2.0",   "p2.1",   "p2.2",   "p2.3",   /* a0 - a3 */
92    "p2.4",   "p2.5",   "p2.6",   "p2.7",   /* a4 - a7 */
93    "ex0",    "et0",    "ex1",    "et1",    /* a8 - ab */
94    "es",     "ie.5",   "ie.6",   "ea",     /* ac - af */
95    "rxd",    "txd",    "int0",   "int1",   /* b0 - b3 */
96    "t0",     "t1",     "wr",     "rd",     /* b4 - b7 */
97    "px0",    "pt0",    "px1",    "pt1",    /* b8 - bb */
98    "ps",     "ip.5",   "ip.6",   "ip.7",   /* bc - bf */
99    "0c0h.0", "0c0h.1", "0c0h.2", "0c0h.3", /* c0 - c3 */
100    "0c0h.4", "0c0h.5", "0c0h.6", "0c0h.7", /* c4 - c7 */
101    "cprl2",  "ct2",    "tr2",    "exen2",  /* c8 - cb */
102    "tclk",   "rclk",   "exf2",   "tf2",    /* cc - cf */
103    "p",      "psw.1",  "ov",     "rs0",    /* d0 - d3 */
104    "rs1",    "f0",     "ac",     "cy",     /* d4 - d7 */
105    "ct0",    "ct1",    "i2cfg.2","i2cfg.3",/* d8 - db */
106    "tirun",  "clrti",  "mastrq", "slaven", /* dc - df */
107    "acc.0",  "acc.1",  "acc.2",  "acc.3",  /* e0 - e3 */
108    "acc.4",  "acc.5",  "acc.6",  "acc.7",  /* e4 - e7 */
109    "ibf",    "obf",    "idsm",   "obfc",   /* e8 - eb */
110    "ma0",    "ma1",    "mb0",    "mb1",    /* ec - ef */
111    "b.0",    "b.1",    "b.2",    "b.3",    /* f0 - f3 */
112    "b.4",    "b.5",    "b.6",    "b.7",    /* f4 - f7 */
113    "xstp",   "xstr",   "makstp", "makstr", /* f8 - fb */
114    "xactv",  "xdata",  "idle",   "i2sta.7" /* fc - ff */
115} ;
58static struct {
59   int feature;
60   int addr;
61   const char *name;
62} mem_name_feature[] =
63{
64   { FEATURE_NONE, 0x00, "rb0r0" },
65   { FEATURE_NONE, 0x01, "rb0r1" },
66   { FEATURE_NONE, 0x02, "rb0r2" },
67   { FEATURE_NONE, 0x03, "rb0r3" },
68   { FEATURE_NONE, 0x04, "rb0r4" },
69   { FEATURE_NONE, 0x05, "rb0r5" },
70   { FEATURE_NONE, 0x06, "rb0r6" },
71   { FEATURE_NONE, 0x07, "rb0r7" },
72   { FEATURE_NONE, 0x08, "rb1r0" },
73   { FEATURE_NONE, 0x09, "rb1r1" },
74   { FEATURE_NONE, 0x0a, "rb1r2" },
75   { FEATURE_NONE, 0x0b, "rb1r3" },
76   { FEATURE_NONE, 0x0c, "rb1r4" },
77   { FEATURE_NONE, 0x0d, "rb1r5" },
78   { FEATURE_NONE, 0x0e, "rb1r6" },
79   { FEATURE_NONE, 0x0f, "rb1r7" },
80   { FEATURE_NONE, 0x10, "rb2r0" },
81   { FEATURE_NONE, 0x11, "rb2r1" },
82   { FEATURE_NONE, 0x12, "rb2r2" },
83   { FEATURE_NONE, 0x13, "rb2r3" },
84   { FEATURE_NONE, 0x14, "rb2r4" },
85   { FEATURE_NONE, 0x15, "rb2r5" },
86   { FEATURE_NONE, 0x16, "rb2r6" },
87   { FEATURE_NONE, 0x17, "rb2r7" },
88   { FEATURE_NONE, 0x18, "rb3r0" },
89   { FEATURE_NONE, 0x19, "rb3r1" },
90   { FEATURE_NONE, 0x1a, "rb3r2" },
91   { FEATURE_NONE, 0x1b, "rb3r3" },
92   { FEATURE_NONE, 0x1c, "rb3r4" },
93   { FEATURE_NONE, 0x1d, "rb3r5" },
94   { FEATURE_NONE, 0x1e, "rb3r6" },
95   { FEATURE_NONE, 0x1f, "rb3r7" },
11696
117//Names for bit addressable memory
118static const char membits[128][6] = {
119    "20h.0",  "20h.1",  "20h.2",  "20h.3",
120    "20h.4",  "20h.5",  "20h.6",  "20h.7",
121    "21h.0",  "21h.1",  "21h.2",  "21h.3",
122    "21h.4",  "21h.5",  "21h.6",  "21h.7",
123    "22h.0",  "22h.1",  "22h.2",  "22h.3",
124    "22h.4",  "22h.5",  "22h.6",  "22h.7",
125    "23h.0",  "23h.1",  "23h.2",  "23h.3",
126    "23h.4",  "23h.5",  "23h.6",  "23h.7",
127    "24h.0",  "24h.1",  "24h.2",  "24h.3",
128    "24h.4",  "24h.5",  "24h.6",  "24h.7",
129    "25h.0",  "25h.1",  "25h.2",  "25h.3",
130    "25h.4",  "25h.5",  "25h.6",  "25h.7",
131    "26h.0",  "26h.1",  "26h.2",  "26h.3",
132    "26h.4",  "26h.5",  "26h.6",  "26h.7",
133    "27h.0",  "27h.1",  "27h.2",  "27h.3",
134    "27h.4",  "27h.5",  "27h.6",  "27h.7",
135    "28h.0",  "28h.1",  "28h.2",  "28h.3",
136    "28h.4",  "28h.5",  "28h.6",  "28h.7",
137    "29h.0",  "29h.1",  "29h.2",  "29h.3",
138    "29h.4",  "29h.5",  "29h.6",  "29h.7",
139    "2ah.0",  "2ah.1",  "2ah.2",  "2ah.3",
140    "2ah.4",  "2ah.5",  "2ah.6",  "2ah.7",
141    "2bh.0",  "2bh.1",  "2bh.2",  "2bh.3",
142    "2bh.4",  "2bh.5",  "2bh.6",  "2bh.7",
143    "2ch.0",  "2ch.1",  "2ch.2",  "2ch.3",
144    "2ch.4",  "2ch.5",  "2ch.6",  "2ch.7",
145    "2dh.0",  "2dh.1",  "2dh.2",  "2dh.3",
146    "2dh.4",  "2dh.5",  "2dh.6",  "2dh.7",
147    "2eh.0",  "2eh.1",  "2eh.2",  "2eh.3",
148    "2eh.4",  "2eh.5",  "2eh.6",  "2eh.7",
149    "2fh.0",  "2fh.1",  "2fh.2",  "2fh.3",
150    "2fh.4",  "2fh.5",  "2fh.6",  "2fh.7"
151};
97   { FEATURE_NONE, 0x80, "p0"      },
98   { FEATURE_NONE, 0x81, "sp"      },
99   { FEATURE_NONE, 0x82, "dpl"      },
100   { FEATURE_NONE, 0x83, "dph"      },
101   { FEATURE_NONE, 0x87, "pcon"   },
102   { FEATURE_NONE, 0x88, "tcon"   },
103   { FEATURE_NONE, 0x89, "tmod"   },
104   { FEATURE_NONE, 0x8a, "tl0"      },
105   { FEATURE_NONE, 0x8b, "tl1"      },
106   { FEATURE_NONE, 0x8c, "th0"      },
107   { FEATURE_NONE, 0x8d, "th1"      },
108   { FEATURE_NONE, 0x90, "p1"      },
109   { FEATURE_NONE, 0x98, "scon"   },
110   { FEATURE_NONE, 0x99, "sbuf"   },
111   { FEATURE_NONE, 0xa0, "p2"      },
112   { FEATURE_NONE, 0xa8, "ie"      },
113   { FEATURE_NONE, 0xb0, "p3"      },
114   { FEATURE_NONE, 0xb8, "ip"      },
115   { FEATURE_NONE, 0xd0, "psw"      },
116   { FEATURE_NONE, 0xe0, "acc"      },
117   { FEATURE_NONE, 0xf0, "b"      },
152118
153//Regiser Bank memory names
154static const char regbank[][6] = {
155    "rb0r0",  "rb0r1",  "rb0r2",  "rb0r3",
156    "rb0r4",  "rb0r5",  "rb0r6",  "rb0r7",
157    "rb1r0",  "rb1r1",  "rb1r2",  "rb1r3",
158    "rb1r4",  "rb1r5",  "rb1r6",  "rb1r7",
159    "rb2r0",  "rb2r1",  "rb2r2",  "rb2r3",
160    "rb2r4",  "rb2r5",  "rb2r6",  "rb2r7",
161    "rb3r0",  "rb3r1",  "rb3r2",  "rb3r3",
162    "rb3r4",  "rb3r5",  "rb3r6",  "rb3r7"
119   { FEATURE_I8052, 0xc8, "t2con"   },
120   { FEATURE_I8052, 0xca, "rcap2l"   },
121   { FEATURE_I8052, 0xcb, "rcap2h"   },
122   { FEATURE_I8052, 0xcc, "tl2"   },
123   { FEATURE_I8052, 0xcd, "th2"   },
124
125   { FEATURE_I80C52, 0xb7, "iph"   },
126   { FEATURE_I80C52, 0xa9, "saddr"   },
127   { FEATURE_I80C52, 0xb9, "saden"   },
128
129   { FEATURE_DS5002FP, 0x8e, "pwcm"   },
130   { FEATURE_DS5002FP, 0x8f, "pwmp"   },
131   { FEATURE_DS5002FP, 0xc1, "crcr"   },
132   { FEATURE_DS5002FP, 0xc2, "crcl"   },
133   { FEATURE_DS5002FP, 0xc3, "crch"   },
134   { FEATURE_DS5002FP, 0xc6, "mcon"   },
135   { FEATURE_DS5002FP, 0xc7, "ta"      },
136   { FEATURE_DS5002FP, 0xcf, "rnr"      },
137   { FEATURE_DS5002FP, 0xd8, "rpctl"   },
138   { FEATURE_DS5002FP, 0xd9, "rps"      },
139
140   { FEATURE_I83C751,    0x98, "i2con"   },
141   { FEATURE_I83C751,    0x99, "i2dat"   },
142   { FEATURE_I83C751,    0xd8, "i2cfg"   },
143   { FEATURE_I83C751,    0xf8, "i2sta"   },   /* read only */
144
145   /* bit addresses */
146
147   { FEATURE_NONE, 0x188, "it0"      },
148   { FEATURE_NONE, 0x189, "ie0"      },
149   { FEATURE_NONE, 0x18a, "it1"      },
150   { FEATURE_NONE, 0x18b, "ie1"      },
151   { FEATURE_NONE, 0x18c, "tr0"      },
152   { FEATURE_NONE, 0x18d, "tf0"      },
153   { FEATURE_NONE, 0x18e, "tr1"      },
154   { FEATURE_NONE, 0x18f, "tf1"      },
155
156   { FEATURE_NONE, 0x198, "ri"         },
157   { FEATURE_NONE, 0x199, "ti"         },
158   { FEATURE_NONE, 0x19a, "rb8"      },
159   { FEATURE_NONE, 0x19b, "tb8"      },
160   { FEATURE_NONE, 0x19c, "ren"      },
161   { FEATURE_NONE, 0x19d, "sm2"      },
162   { FEATURE_NONE, 0x19e, "sm1"      },
163   { FEATURE_NONE, 0x19f, "sm0"      },
164
165   { FEATURE_I83C751, 0x198, "xstp"      }, /* read: no function */
166   { FEATURE_I83C751, 0x199, "xstr"      }, /* read: MASTER */
167   { FEATURE_I83C751, 0x19a, "cstp"      }, /* read: STP */
168   { FEATURE_I83C751, 0x19b, "cstr"      }, /* read: STR */
169   { FEATURE_I83C751, 0x19c, "carl"      }, /* read: ARL */
170   { FEATURE_I83C751, 0x19d, "cdr"      }, /* read: DRDY */
171   { FEATURE_I83C751, 0x19e, "idle"      }, /* read: ATN */
172   { FEATURE_I83C751, 0x19f, "cxa"      }, /* read: RDAT */
173
174   { FEATURE_NONE, 0x1a8, "ex0"      },
175   { FEATURE_NONE, 0x1a9, "et0"      },
176   { FEATURE_NONE, 0x1aa, "ex1"      },
177   { FEATURE_NONE, 0x1ab, "et1"      },
178   { FEATURE_NONE, 0x1ac, "es"         },
179   { FEATURE_NONE, 0x1ad, "ie.5"      },
180   { FEATURE_NONE, 0x1ae, "ie.6"      },
181   { FEATURE_NONE, 0x1af, "ea"         },
182
183   { FEATURE_I83C751, 0x1ac, "ei2"      },
184   { FEATURE_I8052, 0x1ad, "et2"      },
185
186   /* FIXME: port 3 - depends on external circuits and not really
187     * implemented in the core. TBD */
188   { FEATURE_NONE, 0x1b0, "rxd"      },
189   { FEATURE_NONE, 0x1b1, "txd"      },
190   { FEATURE_NONE, 0x1b2, "int0"      },
191   { FEATURE_NONE, 0x1b3, "int1"      },
192   { FEATURE_NONE, 0x1b4, "t0"         },
193   { FEATURE_NONE, 0x1b5, "t1"         },
194   { FEATURE_NONE, 0x1b6, "wr"         },
195   { FEATURE_NONE, 0x1b7, "rd"         },
196
197   { FEATURE_NONE, 0x1b8, "px0"      },
198   { FEATURE_NONE, 0x1b9, "pt0"      },
199   { FEATURE_NONE, 0x1ba, "px1"      },
200   { FEATURE_NONE, 0x1bb, "pt1"      },
201   { FEATURE_NONE, 0x1bc, "ps"         },
202   { FEATURE_NONE, 0x1bd, "ip.5"      },
203   { FEATURE_NONE, 0x1be, "ip.6"      },
204   { FEATURE_NONE, 0x1bf, "ip.7"      },
205
206   { FEATURE_I8052, 0x1bd, "pt2"      },
207   { FEATURE_I83C751, 0x1bc, "pi2"      },
208
209   { FEATURE_I8052, 0x1c8, "cprl2"      },
210   { FEATURE_I8052, 0x1c9, "ct2"      },
211   { FEATURE_I8052, 0x1ca, "tr2"      },
212   { FEATURE_I8052, 0x1cb, "exen2"      },
213   { FEATURE_I8052, 0x1cc, "tclk"      },
214   { FEATURE_I8052, 0x1cd, "rclk"      },
215   { FEATURE_I8052, 0x1ce, "exf2"      },
216   { FEATURE_I8052, 0x1cf, "tf2"      },
217
218   { FEATURE_NONE, 0x1d0, "p"         },
219   { FEATURE_NONE, 0x1d1, "psw.1"      },
220   { FEATURE_NONE, 0x1d2, "ov"         },
221   { FEATURE_NONE, 0x1d3, "rs0"      },
222   { FEATURE_NONE, 0x1d4, "rs1"      },
223   { FEATURE_NONE, 0x1d5, "f0"         },
224   { FEATURE_NONE, 0x1d6, "ac"         },
225   { FEATURE_NONE, 0x1d7, "cy"         },
226
227   { FEATURE_DS5002FP, 0x1d8, "rg0"   },
228   { FEATURE_DS5002FP, 0x1d9, "rpc"   },
229   { FEATURE_DS5002FP, 0x1da, "dma"   },
230   { FEATURE_DS5002FP, 0x1db, "ibi"   },
231   { FEATURE_DS5002FP, 0x1dc, "ae"      },
232   { FEATURE_DS5002FP, 0x1dd, "exbs"   },
233   { FEATURE_DS5002FP, 0x1de, "d8.6"   },
234   { FEATURE_DS5002FP, 0x1df, "rnr"   },
235
236   { FEATURE_I83C751, 0x1d8, "ct0"      },
237   { FEATURE_I83C751, 0x1d9, "ct1"      },
238   { FEATURE_I83C751, 0x1da, "i2cfg.2"   },
239   { FEATURE_I83C751, 0x1db, "i2cfg.3"   },
240   { FEATURE_I83C751, 0x1dc, "tirun"   },
241   { FEATURE_I83C751, 0x1dd, "clrti"   },
242   { FEATURE_I83C751, 0x1de, "masterq"   },
243   { FEATURE_I83C751, 0x1df, "slaven"   },
244
245   { FEATURE_I83C751, 0x1f8, "xstp"   },
246   { FEATURE_I83C751, 0x1f9, "xstr"   },
247   { FEATURE_I83C751, 0x1fa, "makstp"   },
248   { FEATURE_I83C751, 0x1fb, "makstr"   },
249   { FEATURE_I83C751, 0x1fc, "xactv"   },
250   { FEATURE_I83C751, 0x1fd, "xdata"   },
251   { FEATURE_I83C751, 0x1fe, "idle"   },
252   { FEATURE_I83C751, 0x1ff, "i2sta.7"   },
253
254   /* unkown
255     * "ibf",    "obf",    "idsm",   "obfc",    e8 - eb
256     * "ma0",    "ma1",    "mb0",    "mb1",     ec - ef
257     */
258
259   { -1 }
163260};
164261
165static const char *get_data_address( UINT8 arg )
262static void init_mem_names(int feature_set, const char **mem_names)
166263{
167   char *buffer = cpuintrf_temp_str();
264   int i;
265   int feature;
168266
169   if(arg < 0x80)
267   /* Set defaults / i8051 */
268   for (i = 0; feature = mem_name_feature[i].feature, feature >= 0; i++)
170269   {
171      //Ram locations 0-0x1F are considered register access in 3 banks
172      if(arg < 0x1f)
173         sprintf(buffer,"%s",regbank[arg]);
174      else
175         sprintf(buffer,"$%02X",arg);
270      if ( feature == FEATURE_NONE )
271         mem_names[mem_name_feature[i].addr] = mem_name_feature[i].name;
176272   }
273
274   /* Set specific memory names */
275   for (i = 0; feature = mem_name_feature[i].feature, feature >= 0; i++)
276   {
277      if (feature & feature_set)
278         mem_names[mem_name_feature[i].addr] = mem_name_feature[i].name;
279   }
280
281}
282
283static const char *get_data_address( const char **mem_names, UINT8 arg )
284{
285   char *buffer = cpuintrf_temp_str();
286
287   if (mem_names[arg] == NULL)
288      sprintf(buffer,"$%02X",arg);
177289   else
178      sprintf(buffer,"%s",sfr[arg-0x80]);
290      sprintf(buffer,"%s", mem_names[arg]);
179291   return buffer;
180292}
181293
182static const char *get_bit_address( UINT8 arg )
294static const char *get_bit_address( const char **mem_names, UINT8 arg )
183295{
184296   char *buffer = cpuintrf_temp_str();
185297
r3535r3536
187299   {
188300      //Bit address 0-7F can be referred to as 20.0, 20.1, to 20.7 for address 0, and 2f.0,2f.1 to 2f.7 for address 7f
189301      if(arg < 0x7f)
190         sprintf(buffer,"%s",membits[arg]);
302         sprintf(buffer,"$%02X.%d",(arg >> 3) | 0x20, arg & 0x07);
191303      else
192304         sprintf(buffer,"$%02X",arg);
193305   }
194306   else
195      sprintf(buffer,"%s",sfrbits[arg-0x80]);
307   {
308      if (mem_names[arg | 0x100] == NULL)
309      {
310         if (mem_names[arg & 0xf8] == NULL)
311            sprintf(buffer,"$%02X.%d", arg & 0xf8, arg & 0x07);
312         else
313            sprintf(buffer,"%s.%d", mem_names[arg & 0xf8], arg & 0x07);
314      }
315      else
316         sprintf(buffer,"%s", mem_names[arg | 0x100]);
317   }
196318   return buffer;
197319}
198320
r3535r3536
216338
217339#endif
218340
219
220unsigned i8051_dasm(char *dst, unsigned pc, const UINT8 *oprom, const UINT8 *opram)
341static offs_t mcs51_dasm( const char **mem_names, char *dst, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
221342{
222343   UINT32 flags = 0;
223344   unsigned PC = pc;
r3535r3536
267388
268389      //INC data addr
269390      case 0x05:            /* 1: 0000 0101 */
270         sym = get_data_address(opram[PC++ - pc]);
391         sym = get_data_address(mem_names, opram[PC++ - pc]);
271392         sprintf(dst, "inc   %s", sym);
272393         break;
273394
r3535r3536
291412
292413      //JBC bit addr, code addr
293414      case 0x10:            /* 1: 0001 0000 */
294         sym = get_bit_address(opram[PC++ - pc]);
415         sym = get_bit_address(mem_names, opram[PC++ - pc]);
295416         rel  = opram[PC++ - pc];
296417         sprintf(dst, "jbc   %s,$%04X", sym, PC + rel);
297418         break;
r3535r3536
330451
331452      //DEC data addr
332453      case 0x15:            /* 1: 0001 0101 */
333         sym = get_data_address(opram[PC++ - pc]);
454         sym = get_data_address(mem_names, opram[PC++ - pc]);
334455         sprintf(dst, "dec   %s", sym);
335456         break;
336457
r3535r3536
355476
356477      //JB  bit addr, code addr
357478      case 0x20:            /* 1: 0010 0000 */
358         sym = get_bit_address(opram[PC++ - pc]);
479         sym = get_bit_address(mem_names, opram[PC++ - pc]);
359480         rel  = opram[PC++ - pc];
360481         sprintf(dst, "jb    %s,$%04X", sym, (PC + rel));
361482         break;
r3535r3536
378499
379500      //ADD A, data addr
380501      case 0x25:            /* 1: 0010 0101 */
381         sym = get_data_address(opram[PC++ - pc]);
502         sym = get_data_address(mem_names, opram[PC++ - pc]);
382503         sprintf(dst, "add   a,%s", sym);
383504         break;
384505
r3535r3536
403524
404525      //JNB bit addr, code addr
405526      case 0x30:            /* 1: 0011 0000 */
406         sym = get_bit_address(opram[PC++ - pc]);
527         sym = get_bit_address(mem_names, opram[PC++ - pc]);
407528         rel  = opram[PC++ - pc];
408529         sprintf(dst, "jnb   %s,$%04X", sym, (PC + rel));
409530         break;
r3535r3536
426547
427548      //ADDC A, data addr
428549      case 0x35:            /* 1: 0011 0101 */
429         sym = get_data_address(opram[PC++ - pc]);
550         sym = get_data_address(mem_names, opram[PC++ - pc]);
430551         sprintf(dst, "addc  a,%s", sym);
431552         break;
432553
r3535r3536
456577
457578      //ORL data addr, A
458579      case 0x42:            /* 1: 0100 0010 */
459         sym = get_data_address(opram[PC++ - pc]);
580         sym = get_data_address(mem_names, opram[PC++ - pc]);
460581         sprintf(dst, "orl   %s,a", sym);
461582         break;
462583
463584      //ORL data addr, #data
464585      case 0x43:            /* 1: 0100 0011 */
465         sym = get_data_address(opram[PC++ - pc]);
586         sym = get_data_address(mem_names, opram[PC++ - pc]);
466587         sprintf(dst, "orl   %s,#$%02X", sym, opram[PC++ - pc]);
467588         break;
468589
r3535r3536
474595
475596      //ORL A, data addr
476597      case 0x45:            /* 1: 0100 0101 */
477         sym = get_data_address(opram[PC++ - pc]);
598         sym = get_data_address(mem_names, opram[PC++ - pc]);
478599         sprintf(dst, "orl   a,%s", sym);
479600         break;
480601
r3535r3536
505626      //Unable to test
506627      //ANL data addr, A
507628      case 0x52:            /* 1: 0101 0010 */
508         sym = get_data_address(opram[PC++ - pc]);
629         sym = get_data_address(mem_names, opram[PC++ - pc]);
509630         sprintf(dst, "anl   %s,a", sym);
510631         break;
511632
512633      //Unable to test
513634      //ANL data addr, #data
514635      case 0x53:            /* 1: 0101 0011 */
515         sym = get_data_address(opram[PC++ - pc]);
636         sym = get_data_address(mem_names, opram[PC++ - pc]);
516637         sprintf(dst, "anl   %s,#$%02X", sym, opram[PC++ - pc]);
517638         break;
518639
r3535r3536
523644
524645      //ANL A, data addr
525646      case 0x55:            /* 1: 0101 0101 */
526         sym = get_data_address(opram[PC++ - pc]);
647         sym = get_data_address(mem_names, opram[PC++ - pc]);
527648         sprintf(dst, "anl   a,%s", sym);
528649         break;
529650
r3535r3536
555676      //Unable to test
556677      //XRL data addr, A
557678      case 0x62:            /* 1: 0110 0010 */
558         sym = get_data_address(opram[PC++ - pc]);
679         sym = get_data_address(mem_names, opram[PC++ - pc]);
559680         sprintf(dst, "xrl   %s,a", sym);
560681         break;
561682
562683      //XRL data addr, #data
563684      case 0x63:            /* 1: 0110 0011 */
564         sym = get_data_address(opram[PC++ - pc]);
685         sym = get_data_address(mem_names, opram[PC++ - pc]);
565686         sprintf(dst, "xrl   %s,#$%02X", sym, opram[PC++ - pc]);
566687         break;
567688
r3535r3536
572693
573694      //XRL A, data addr
574695      case 0x65:            /* 1: 0110 0101 */
575         sym = get_data_address(opram[PC++ - pc]);
696         sym = get_data_address(mem_names, opram[PC++ - pc]);
576697         sprintf(dst, "xrl   a,%s", sym);
577698         break;
578699
r3535r3536
604725      //Unable to test
605726      //ORL C, bit addr
606727      case 0x72:            /* 1: 0111 0010 */
607         sym = get_bit_address(opram[PC++ - pc]);
728         sym = get_bit_address(mem_names, opram[PC++ - pc]);
608729         sprintf(dst, "orl   c,%s", sym);
609730         break;
610731
r3535r3536
621742
622743      //MOV data addr, #data
623744      case 0x75:            /* 1: 0111 0101 */
624         sym = get_data_address(opram[PC++ - pc]);
745         sym = get_data_address(mem_names, opram[PC++ - pc]);
625746         sprintf(dst, "mov   %s,#$%02X", sym, opram[PC++ - pc]);
626747         break;
627748
r3535r3536
652773
653774      //ANL C, bit addr
654775      case 0x82:            /* 1: 1000 0010 */
655         sym = get_bit_address(opram[PC++ - pc]);
776         sym = get_bit_address(mem_names, opram[PC++ - pc]);
656777         sprintf(dst, "anl   c,%s", sym);
657778         break;
658779
r3535r3536
668789
669790      //MOV data addr, data addr  (Note: 1st address is src, 2nd is dst, but the mov command works as mov dst,src)
670791      case 0x85:            /* 1: 1000 0101 */
671         sym  = get_data_address(opram[PC++ - pc]);
672         sym2 = get_data_address(opram[PC++ - pc]);
792         sym  = get_data_address(mem_names, opram[PC++ - pc]);
793         sym2 = get_data_address(mem_names, opram[PC++ - pc]);
673794         sprintf(dst, "mov   %s,%s", sym2, sym);
674795         break;
675796
r3535r3536
677798      //MOV data addr, @R0/@R1/* 1: 1000 011i */
678799      case 0x86:
679800      case 0x87:
680         sym = get_data_address(opram[PC++ - pc]);
801         sym = get_data_address(mem_names, opram[PC++ - pc]);
681802         sprintf(dst, "mov   %s,@r%d", sym, op&1);
682803         break;
683804
r3535r3536
690811      case 0x8d:
691812      case 0x8e:
692813      case 0x8f:
693         sym = get_data_address(opram[PC++ - pc]);
814         sym = get_data_address(mem_names, opram[PC++ - pc]);
694815         sprintf(dst, "mov   %s,r%d", sym, op&7);
695816         break;
696817
r3535r3536
703824
704825      //MOV bit addr, C
705826      case 0x92:            /* 1: 1001 0010 */
706         sym = get_bit_address(opram[PC++ - pc]);
827         sym = get_bit_address(mem_names, opram[PC++ - pc]);
707828         sprintf(dst, "mov   %s,c", sym);
708829         break;
709830
r3535r3536
719840
720841      //SUBB A, data addr
721842      case 0x95:            /* 1: 1001 0101 */
722         sym = get_data_address(opram[PC++ - pc]);
843         sym = get_data_address(mem_names, opram[PC++ - pc]);
723844         sprintf(dst, "subb  a,%s", sym);
724845         break;
725846
r3535r3536
745866      //Unable to test
746867      //ORL C, /bit addr
747868      case 0xa0:              /* 1: 1010 0000 */
748         sym = get_bit_address(opram[PC++ - pc]);
869         sym = get_bit_address(mem_names, opram[PC++ - pc]);
749870         sprintf(dst, "orl   c,/%s", sym);
750871         break;
751872
752873      //MOV C, bit addr
753874      case 0xa2:              /* 1: 1010 0010 */
754         sym = get_bit_address(opram[PC++ - pc]);
875         sym = get_bit_address(mem_names, opram[PC++ - pc]);
755876         sprintf(dst, "mov   c,%s", sym);
756877         break;
757878
r3535r3536
774895      //MOV @R0/@R1, data addr  /* 1: 1010 011i */
775896      case 0xa6:
776897      case 0xa7:
777         sym = get_data_address(opram[PC++ - pc]);
898         sym = get_data_address(mem_names, opram[PC++ - pc]);
778899         sprintf(dst, "mov   @r%d,%s", op&1, sym);
779900         break;
780901
r3535r3536
787908      case 0xad:
788909      case 0xae:
789910      case 0xaf:
790         sym = get_data_address(opram[PC++ - pc]);
911         sym = get_data_address(mem_names, opram[PC++ - pc]);
791912         sprintf(dst, "mov   r%d,%s", op&7, sym);
792913         break;
793914
794915      //ANL C,/bit addr
795916      case 0xb0:                   /* 1: 1011 0000 */
796         sym = get_bit_address(opram[PC++ - pc]);
917         sym = get_bit_address(mem_names, opram[PC++ - pc]);
797918         sprintf(dst, "anl   c,/%s", sym);
798919         break;
799920
800921      //CPL bit addr
801922      case 0xb2:                   /* 1: 1011 0010 */
802         sym = get_bit_address(opram[PC++ - pc]);
923         sym = get_bit_address(mem_names, opram[PC++ - pc]);
803924         sprintf(dst, "cpl   %s", sym);
804925         break;
805926
r3535r3536
818939
819940      //CJNE A, data addr, code addr
820941      case 0xb5:                   /* 1: 1011 0101 */
821         sym = get_data_address(opram[PC++ - pc]);
942         sym = get_data_address(mem_names, opram[PC++ - pc]);
822943         rel  = opram[PC++ - pc];
823944         sprintf(dst, "cjne  a,%s,$%04X", sym, PC + rel);
824945         break;
r3535r3536
848969
849970      //PUSH data addr
850971      case 0xc0:                  /* 1: 1100 0000 */
851         sym = get_data_address(opram[PC++ - pc]);
972         sym = get_data_address(mem_names, opram[PC++ - pc]);
852973         sprintf(dst, "push  %s", sym);
853974         break;
854975
855976      //CLR bit addr
856977      case 0xc2:                  /* 1: 1100 0010 */
857         sym = get_bit_address(opram[PC++ - pc]);
978         sym = get_bit_address(mem_names, opram[PC++ - pc]);
858979         sprintf(dst, "clr   %s", sym);
859980         break;
860981
r3535r3536
870991
871992      //XCH A, data addr
872993      case 0xc5:                  /* 1: 1100 0101 */
873         sym = get_data_address(opram[PC++ - pc]);
994         sym = get_data_address(mem_names, opram[PC++ - pc]);
874995         sprintf(dst, "xch   a,%s", sym);
875996         break;
876997
r3535r3536
8941015
8951016      //POP data addr
8961017      case 0xd0:                  /* 1: 1101 0000 */
897         sym = get_data_address(opram[PC++ - pc]);
1018         sym = get_data_address(mem_names, opram[PC++ - pc]);
8981019         sprintf(dst, "pop   %s", sym);
8991020         break;
9001021
9011022      //SETB bit addr
9021023      case 0xd2:                  /* 1: 1101 0010 */
903         sym = get_bit_address(opram[PC++ - pc]);
1024         sym = get_bit_address(mem_names, opram[PC++ - pc]);
9041025         sprintf(dst, "setb  %s", sym);
9051026         break;
9061027
r3535r3536
9171038
9181039      //DJNZ data addr, code addr
9191040      case 0xd5:                  /* 1: 1101 0101 */
920         sym = get_data_address(opram[PC++ - pc]);
1041         sym = get_data_address(mem_names, opram[PC++ - pc]);
9211042         rel  = opram[PC++ - pc];
9221043         sprintf(dst, "djnz  %s,$%04X", sym, PC + rel);
9231044         flags = DASMFLAG_STEP_OVER;
r3535r3536
9621083
9631084      //MOV A, data addr
9641085      case 0xe5:                  /* 1: 1110 0101 */
965         sym = get_data_address(opram[PC++ - pc]);
1086         sym = get_data_address(mem_names, opram[PC++ - pc]);
9661087         sprintf(dst, "mov   a,%s", sym);
9671088         break;
9681089
r3535r3536
10041125
10051126      //MOV data addr, A
10061127      case 0xf5:                  /* 1: 1111 0101 */
1007         sym = get_data_address(opram[PC++ - pc]);
1128         sym = get_data_address(mem_names, opram[PC++ - pc]);
10081129         sprintf(dst, "mov   %s,a", sym);
10091130         break;
10101131
r3535r3536
10301151         sprintf(dst, "illegal");
10311152    }
10321153   return (PC - pc) | flags | DASMFLAG_SUPPORTED;
1154
10331155}
1156
1157CPU_DISASSEMBLE( i8051 )
1158{
1159   static const char *mem_names[0x200];
1160   static int mem_names_initialized = 0;
1161
1162   if (!mem_names_initialized)
1163   {
1164        init_mem_names(   FEATURE_NONE, mem_names);
1165       mem_names_initialized = 1;
1166   }
1167   return mcs51_dasm(mem_names, buffer, pc, oprom, opram);
1168}
1169
1170CPU_DISASSEMBLE( i8052 )
1171{
1172   static const char *mem_names[0x200];
1173   static int mem_names_initialized = 0;
1174
1175   if (!mem_names_initialized)
1176   {
1177        init_mem_names(   FEATURE_I8052, mem_names);
1178       mem_names_initialized = 1;
1179   }
1180   return mcs51_dasm(mem_names, buffer, pc, oprom, opram);
1181}
1182
1183CPU_DISASSEMBLE( i80c51 )
1184{
1185   static const char *mem_names[0x200];
1186   static int mem_names_initialized = 0;
1187
1188   if (!mem_names_initialized)
1189   {
1190        init_mem_names(   FEATURE_CMOS, mem_names);
1191       mem_names_initialized = 1;
1192   }
1193   return mcs51_dasm(mem_names, buffer, pc, oprom, opram);
1194}
1195
1196CPU_DISASSEMBLE( i80c52 )
1197{
1198   static const char *mem_names[0x200];
1199   static int mem_names_initialized = 0;
1200
1201   if (!mem_names_initialized)
1202   {
1203        init_mem_names(   FEATURE_I8052 | FEATURE_CMOS | FEATURE_I80C52, mem_names);
1204       mem_names_initialized = 1;
1205   }
1206   return mcs51_dasm(mem_names, buffer, pc, oprom, opram);
1207}
1208
1209CPU_DISASSEMBLE( ds5002fp )
1210{
1211   static const char *mem_names[0x200];
1212   static int mem_names_initialized = 0;
1213
1214   if (!mem_names_initialized)
1215   {
1216        init_mem_names(   FEATURE_DS5002FP | FEATURE_CMOS, mem_names);
1217       mem_names_initialized = 1;
1218   }
1219   return mcs51_dasm(mem_names, buffer, pc, oprom, opram);
1220}
src/emu/cpu/i386/i386.h
r3535r3536
249249   UINT8 opcode;
250250
251251   UINT8 irq_state;
252   int (*irq_callback)(int);
252   cpu_irq_callback irq_callback;
253   const device_config *device;
253254   UINT32 a20_mask;
254255
255256   int cpuid_max_input_value_eax;
src/emu/cpu/i386/i386.c
r3535r3536
1717
1818#include "debug/debugcpu.h"
1919
20/* seems to be defined on mingw-gcc */
21#undef i386
22
2023int i386_parity_table[256];
2124MODRM_TABLE i386_MODRM_table[256];
2225
r3535r3536
340343   if ( (I.irq_state) && I.IF )
341344   {
342345      I.cycles -= 2;
343      i386_trap(I.irq_callback(0), 1);
346      i386_trap(I.irq_callback(I.device, 0), 1);
344347   }
345348}
346349
r3535r3536
475478   return result;
476479}
477480
478static void i386_debug_setup(void)
481static CPU_DEBUG_INIT( i386 )
479482{
480483   symtable_add_function(global_symtable, "segbase", NULL, 1, 1, i386_debug_segbase);
481484   symtable_add_function(global_symtable, "seglimit", NULL, 1, 1, i386_debug_seglimit);
r3535r3536
491494   CHANGE_PC(I.eip);
492495}
493496
494static void i386_init(int index, int clock, const void *config, int (*irqcallback)(int))
497static CPU_INIT( i386 )
495498{
496499   int i, j;
497500   static const int regs8[8] = {AL,CL,DL,BL,AH,CH,DH,BH};
r3535r3536
521524   }
522525
523526   I.irq_callback = irqcallback;
527   I.device = device;
524528
525529   state_save_register_item_array(state_type, index,   I.reg.d);
526530   state_save_register_item(state_type, index, I.sreg[ES].selector);
r3535r3536
609613   }
610614}
611615
612static void i386_reset(void)
616static CPU_RESET( i386 )
613617{
614   int (*save_irqcallback)(int);
618   cpu_irq_callback save_irqcallback;
619   const device_config *save_device;
615620
616621   save_irqcallback = I.irq_callback;
622   save_device = I.device;
617623   memset( &I, 0, sizeof(I386_REGS) );
618624   I.irq_callback = save_irqcallback;
625   I.device = save_device;
619626
620627   I.sreg[CS].selector = 0xf000;
621628   I.sreg[CS].base      = 0xffff0000;
r3535r3536
644651   CHANGE_PC(I.eip);
645652}
646653
647static void i386_get_context(void *dst)
654static CPU_GET_CONTEXT( i386 )
648655{
649656   if(dst) {
650657      *(I386_REGS *)dst = I;
651658   }
652659}
653660
654static void i386_set_context(void *src)
661static CPU_SET_CONTEXT( i386 )
655662{
656663   if(src) {
657664      I = *(I386_REGS *)src;
r3535r3536
691698   }
692699}
693700
694static int i386_execute(int num_cycles)
701static CPU_EXECUTE( i386 )
695702{
696   I.cycles = num_cycles;
697   I.base_cycles = num_cycles;
703   I.cycles = cycles;
704   I.base_cycles = cycles;
698705   CHANGE_PC(I.eip);
699706
700707   if (I.halted)
701708   {
702      I.tsc += num_cycles;
703      return num_cycles;
709      I.tsc += cycles;
710      return cycles;
704711   }
705712
706713   while( I.cycles > 0 )
r3535r3536
716723      i386_check_irq_line();
717724      I386OP(decode_opcode)();
718725   }
719   I.tsc += (num_cycles - I.cycles);
726   I.tsc += (cycles - I.cycles);
720727
721   return num_cycles - I.cycles;
728   return cycles - I.cycles;
722729}
723730
724731/*************************************************************************/
725732
726static int translate_address_cb(int space, int intention, offs_t *addr)
733static CPU_TRANSLATE( i386 )
727734{
728735   int result = 1;
729736   if (space == ADDRESS_SPACE_PROGRAM)
730737   {
731738      if (I.cr[0] & 0x80000000)
732         result = translate_address(addr);
733      *addr &= I.a20_mask;
739         result = translate_address(address);
740      *address &= I.a20_mask;
734741   }
735742   return result;
736743}
737744
738static offs_t i386_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
745static CPU_DISASSEMBLE( i386 )
739746{
740747   return i386_dasm_one(buffer, pc, oprom, I.sreg[CS].d ? 32 : 16);
741748}
742749
743static void i386_set_info(UINT32 state, cpuinfo *info)
750static CPU_SET_INFO( i386 )
744751{
745752   if (state == CPUINFO_INT_INPUT_STATE+INPUT_LINE_A20)
746753   {
r3535r3536
839846   }
840847}
841848
842void i386_get_info(UINT32 state, cpuinfo *info)
849CPU_GET_INFO( i386 )
843850{
844851   switch (state)
845852   {
r3535r3536
952959      case CPUINFO_INT_REGISTER + I386_LDTR_FLAGS:   info->i = I.ldtr.flags;               break;
953960
954961      /* --- the following bits of info are returned as pointers to data or functions --- */
955      case CPUINFO_PTR_SET_INFO:                     info->setinfo = i386_set_info;         break;
956      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = i386_get_context;   break;
957      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = i386_set_context;   break;
958      case CPUINFO_PTR_INIT:                        info->init = i386_init;               break;
959      case CPUINFO_PTR_RESET:                        info->reset = i386_reset;            break;
960      case CPUINFO_PTR_EXECUTE:                     info->execute = i386_execute;         break;
962      case CPUINFO_PTR_SET_INFO:                     info->setinfo = CPU_SET_INFO_NAME(i386);         break;
963      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(i386);   break;
964      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(i386);   break;
965      case CPUINFO_PTR_INIT:                        info->init = CPU_INIT_NAME(i386);               break;
966      case CPUINFO_PTR_RESET:                        info->reset = CPU_RESET_NAME(i386);            break;
967      case CPUINFO_PTR_EXECUTE:                     info->execute = CPU_EXECUTE_NAME(i386);         break;
961968      case CPUINFO_PTR_BURN:                        info->burn = NULL;                  break;
962969      case CPUINFO_PTR_INSTRUCTION_COUNTER:          info->icount = &I.cycles;            break;
963      case CPUINFO_PTR_TRANSLATE:                  info->translate = translate_address_cb;   break;
964      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = i386_dasm;         break;
965      case CPUINFO_PTR_DEBUG_SETUP_COMMANDS:         info->setup_commands = i386_debug_setup; break;
970      case CPUINFO_PTR_TRANSLATE:                  info->translate = CPU_TRANSLATE_NAME(i386);   break;
971      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i386);         break;
972      case CPUINFO_PTR_DEBUG_INIT:               info->debug_init = CPU_DEBUG_INIT_NAME(i386);    break;
966973
967974      /* --- the following bits of info are returned as NULL-terminated strings --- */
968975      case CPUINFO_STR_NAME:                     strcpy(info->s, "I386");            break;
r3535r3536
10591066
10601067#if (HAS_I486)
10611068
1062static void i486_init(int index, int clock, const void *config, int (*irqcallback)(int))
1069static CPU_INIT( i486 )
10631070{
1064   i386_init(index, clock, config, irqcallback);
1071   CPU_INIT_CALL(i386);
10651072}
10661073
1067static void i486_reset(void)
1074static CPU_RESET( i486 )
10681075{
1069   int (*save_irqcallback)(int);
1076   cpu_irq_callback save_irqcallback;
1077   const device_config *save_device;
10701078
10711079   save_irqcallback = I.irq_callback;
1080   save_device = I.device;
10721081   memset( &I, 0, sizeof(I386_REGS) );
10731082   I.irq_callback = save_irqcallback;
1083   I.device = save_device;
1084
10741085   I.sreg[CS].selector = 0xf000;
10751086   I.sreg[CS].base      = 0xffff0000;
10761087   I.sreg[CS].limit   = 0xffff;
r3535r3536
10991110   CHANGE_PC(I.eip);
11001111}
11011112
1102static void i486_exit(void)
1113static CPU_EXIT( i486 )
11031114{
11041115}
11051116
1106static void i486_set_info(UINT32 state, cpuinfo *info)
1117static CPU_SET_INFO( i486 )
11071118{
11081119   switch (state)
11091120   {
r3535r3536
11181129      case CPUINFO_INT_REGISTER + X87_ST6:         ST(6).f = info->i;                  break;
11191130      case CPUINFO_INT_REGISTER + X87_ST7:         ST(7).f = info->i;                  break;
11201131
1121      default: i386_set_info(state, info); break;
1132      default:                               CPU_SET_INFO_CALL(i386);             break;
11221133   }
11231134}
11241135
1125void i486_get_info(UINT32 state, cpuinfo *info)
1136CPU_GET_INFO( i486 )
11261137{
11271138   switch (state)
11281139   {
1129      case CPUINFO_PTR_SET_INFO:                     info->setinfo = i486_set_info;         break;
1130      case CPUINFO_PTR_INIT:                        info->init = i486_init;               break;
1131      case CPUINFO_PTR_RESET:                        info->reset = i486_reset;            break;
1132      case CPUINFO_PTR_EXIT:                        info->exit = i486_exit;               break;
1140      case CPUINFO_PTR_SET_INFO:                     info->setinfo = CPU_SET_INFO_NAME(i486);break;
1141      case CPUINFO_PTR_INIT:                        info->init = CPU_INIT_NAME(i486);      break;
1142      case CPUINFO_PTR_RESET:                        info->reset = CPU_RESET_NAME(i486);      break;
1143      case CPUINFO_PTR_EXIT:                        info->exit = CPU_EXIT_NAME(i486);      break;
11331144
11341145      case CPUINFO_INT_REGISTER + X87_CTRL:         info->i = I.fpu_control_word;         break;
11351146      case CPUINFO_INT_REGISTER + X87_STATUS:         info->i = I.fpu_status_word;         break;
r3535r3536
11551166      case CPUINFO_STR_REGISTER + X87_ST6:         sprintf(info->s, "ST6: %f", ST(6).f);   break;
11561167      case CPUINFO_STR_REGISTER + X87_ST7:         sprintf(info->s, "ST7: %f", ST(7).f);   break;
11571168
1158      default:                              i386_get_info(state, info);            break;
1169      default:                               CPU_GET_INFO_CALL(i386);             break;
11591170   }
11601171}
11611172#endif
r3535r3536
11651176
11661177#if (HAS_PENTIUM)
11671178
1168static void pentium_init(int index, int clock, const void *config, int (*irqcallback)(int))
1179static CPU_INIT( pentium )
11691180{
1170   i386_init(index, clock, config, irqcallback);
1181   CPU_INIT_CALL(i386);
11711182}
11721183
1173static void pentium_reset(void)
1184static CPU_RESET( pentium )
11741185{
1175   int (*save_irqcallback)(int);
1186   cpu_irq_callback save_irqcallback;
1187   const device_config *save_device;
11761188
11771189   save_irqcallback = I.irq_callback;
1190   save_device = I.device;
11781191   memset( &I, 0, sizeof(I386_REGS) );
11791192   I.irq_callback = save_irqcallback;
1193   I.device = save_device;
1194
11801195   I.sreg[CS].selector = 0xf000;
11811196   I.sreg[CS].base      = 0xffff0000;
11821197   I.sreg[CS].limit   = 0xffff;
r3535r3536
12251240   CHANGE_PC(I.eip);
12261241}
12271242
1228static void pentium_exit(void)
1243static CPU_EXIT( pentium )
12291244{
12301245}
12311246
1232static void pentium_set_info(UINT32 state, cpuinfo *info)
1247static CPU_SET_INFO( pentium )
12331248{
12341249   switch (state)
12351250   {
r3535r3536
12441259      case CPUINFO_INT_REGISTER + X87_ST6:         ST(6).f = info->i;                  break;
12451260      case CPUINFO_INT_REGISTER + X87_ST7:         ST(7).f = info->i;                  break;
12461261
1247      default:                              i386_set_info(state, info);            break;
1262      default:                               CPU_SET_INFO_CALL(i386);             break;
12481263   }
12491264}
12501265
1251void pentium_get_info(UINT32 state, cpuinfo *info)
1266CPU_GET_INFO( pentium )
12521267{
12531268   switch (state)
12541269   {
1255      case CPUINFO_PTR_SET_INFO:                     info->setinfo = pentium_set_info;      break;
1256      case CPUINFO_PTR_INIT:                        info->init = pentium_init;            break;
1257      case CPUINFO_PTR_RESET:                        info->reset = pentium_reset;         break;
1258      case CPUINFO_PTR_EXIT:                        info->exit = pentium_exit;            break;
1270      case CPUINFO_PTR_SET_INFO:                     info->setinfo = CPU_SET_INFO_NAME(pentium);   break;
1271      case CPUINFO_PTR_INIT:                        info->init = CPU_INIT_NAME(pentium);   break;
1272      case CPUINFO_PTR_RESET:                        info->reset = CPU_RESET_NAME(pentium);   break;
1273      case CPUINFO_PTR_EXIT:                        info->exit = CPU_EXIT_NAME(pentium);   break;
12591274
12601275      case CPUINFO_INT_REGISTER + X87_CTRL:         info->i = I.fpu_control_word;         break;
12611276      case CPUINFO_INT_REGISTER + X87_STATUS:         info->i = I.fpu_status_word;         break;
r3535r3536
12811296      case CPUINFO_STR_REGISTER + X87_ST6:         sprintf(info->s, "ST6: %f", ST(6).f);   break;
12821297      case CPUINFO_STR_REGISTER + X87_ST7:         sprintf(info->s, "ST7: %f", ST(7).f);   break;
12831298
1284      default:                              i386_get_info(state, info);            break;
1299      default:                               CPU_GET_INFO_CALL(i386);             break;
12851300   }
12861301}
12871302#endif
r3535r3536
12911306
12921307#if (HAS_MEDIAGX)
12931308
1294static void mediagx_init(int index, int clock, const void *config, int (*irqcallback)(int))
1309static CPU_INIT( mediagx )
12951310{
1296   i386_init(index, clock, config, irqcallback);
1311   CPU_INIT_CALL(i386);
12971312}
12981313
1299static void mediagx_reset(void)
1314static CPU_RESET( mediagx )
13001315{
1301   int (*save_irqcallback)(int);
1316   cpu_irq_callback save_irqcallback;
1317   const device_config *save_device;
13021318
13031319   save_irqcallback = I.irq_callback;
1320   save_device = I.device;
13041321   memset( &I, 0, sizeof(I386_REGS) );
13051322   I.irq_callback = save_irqcallback;
1323   I.device = save_device;
1324
13061325   I.sreg[CS].selector = 0xf000;
13071326   I.sreg[CS].base      = 0xffff0000;
13081327   I.sreg[CS].limit   = 0xffff;
r3535r3536
13511370   CHANGE_PC(I.eip);
13521371}
13531372
1354static void mediagx_exit(void)
1373static CPU_EXIT( mediagx )
13551374{
13561375}
13571376
1358static void mediagx_set_info(UINT32 state, cpuinfo *info)
1377static CPU_SET_INFO( mediagx )
13591378{
13601379   switch (state)
13611380   {
r3535r3536
13701389      case CPUINFO_INT_REGISTER + X87_ST6:         ST(6).f = info->i;                  break;
13711390      case CPUINFO_INT_REGISTER + X87_ST7:         ST(7).f = info->i;                  break;
13721391
1373      default:                              i386_set_info(state, info);            break;
1392      default:                               CPU_SET_INFO_CALL(i386);             break;
13741393   }
13751394}
13761395
1377void mediagx_get_info(UINT32 state, cpuinfo *info)
1396CPU_GET_INFO( mediagx )
13781397{
13791398   switch (state)
13801399   {
1381      case CPUINFO_PTR_SET_INFO:                     info->setinfo = mediagx_set_info;      break;
1382      case CPUINFO_PTR_INIT:                        info->init = mediagx_init;            break;
1383      case CPUINFO_PTR_RESET:                        info->reset = mediagx_reset;         break;
1384      case CPUINFO_PTR_EXIT:                        info->exit = mediagx_exit;            break;
1400      case CPUINFO_PTR_SET_INFO:                     info->setinfo = CPU_SET_INFO_NAME(mediagx);   break;
1401      case CPUINFO_PTR_INIT:                        info->init = CPU_INIT_NAME(mediagx);   break;
1402      case CPUINFO_PTR_RESET:                        info->reset = CPU_RESET_NAME(mediagx);   break;
1403      case CPUINFO_PTR_EXIT:                        info->exit = CPU_EXIT_NAME(mediagx);   break;
13851404
13861405      case CPUINFO_INT_REGISTER + X87_CTRL:         info->i = I.fpu_control_word;         break;
13871406      case CPUINFO_INT_REGISTER + X87_STATUS:         info->i = I.fpu_status_word;         break;
r3535r3536
14071426      case CPUINFO_STR_REGISTER + X87_ST6:         sprintf(info->s, "ST6: %f", ST(6).f);   break;
14081427      case CPUINFO_STR_REGISTER + X87_ST7:         sprintf(info->s, "ST7: %f", ST(7).f);   break;
14091428
1410      default:                              i386_get_info(state, info);            break;
1429      default:                               CPU_GET_INFO_CALL(i386);             break;
14111430   }
14121431}
14131432#endif
src/emu/cpu/mc68hc11/mc68hc11.h
r3535r3536
77
88offs_t hc11_disasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
99
10void mc68hc11_get_info(UINT32 state, cpuinfo *info);
10CPU_GET_INFO( mc68hc11 );
1111
1212
1313#define MC68HC11_IO_PORTA         0x00
src/emu/cpu/mc68hc11/mc68hc11.c
r3535r3536
5252   UINT8 adctl;
5353   int ad_channel;
5454
55   int (*irq_callback)(int irqline);
55   cpu_irq_callback irq_callback;
56   const device_config *device;
5657   int icount;
5758   int ram_position;
5859   int reg_position;
r3535r3536
313314#include "hc11ops.c"
314315#include "hc11ops.h"
315316
316static void hc11_init(int index, int clock, const void *config, int (*irqcallback)(int))
317static CPU_INIT( hc11 )
317318{
318319   int i;
319320
r3535r3536
350351   hc11.reg_position = 0;
351352   hc11.ram_position = 0x100;
352353   hc11.irq_callback = irqcallback;
354   hc11.device = device;
353355}
354356
355static void hc11_reset(void)
357static CPU_RESET( hc11 )
356358{
357359   hc11.pc = READ16(0xfffe);
358360}
359361
360static void hc11_exit(void)
362static CPU_EXIT( hc11 )
361363{
362364
363365}
364366
365static void hc11_get_context(void *dst)
367static CPU_GET_CONTEXT( hc11 )
366368{
367369   if (dst) {
368370      *(HC11_REGS*)dst = hc11;
369371   }
370372}
371373
372static void hc11_set_context(void *src)
374static CPU_SET_CONTEXT( hc11 )
373375{
374376   if (src) {
375377      hc11 = *(HC11_REGS*)src;
r3535r3536
377379   change_pc(hc11.pc);
378380}
379381
380static int hc11_execute(int cycles)
382static CPU_EXECUTE( hc11 )
381383{
382384   hc11.icount = cycles;
383385
r3535r3536
397399
398400/*****************************************************************************/
399401
400static void mc68hc11_set_info(UINT32 state, cpuinfo *info)
402static CPU_SET_INFO( mc68hc11 )
401403{
402404   switch (state)
403405   {
r3535r3536
412414   }
413415}
414416
415void mc68hc11_get_info(UINT32 state, cpuinfo *info)
417CPU_GET_INFO( mc68hc11 )
416418{
417419   switch(state)
418420   {
r3535r3536
451453      case CPUINFO_INT_REGISTER + HC11_IY:         info->i = hc11.iy;                  break;
452454
453455      /* --- the following bits of info are returned as pointers to data or functions --- */
454      case CPUINFO_PTR_SET_INFO:                  info->setinfo = mc68hc11_set_info;      break;
455      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = hc11_get_context;   break;
456      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = hc11_set_context;   break;
457      case CPUINFO_PTR_INIT:                     info->init = hc11_init;               break;
458      case CPUINFO_PTR_RESET:                     info->reset = hc11_reset;            break;
459      case CPUINFO_PTR_EXIT:                     info->exit = hc11_exit;               break;
460      case CPUINFO_PTR_EXECUTE:                  info->execute = hc11_execute;         break;
456      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(mc68hc11);      break;
457      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(hc11);   break;
458      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(hc11);   break;
459      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(hc11);               break;
460      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(hc11);            break;
461      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(hc11);               break;
462      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(hc11);         break;
461463      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
462464      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = hc11_disasm;      break;
463465      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &hc11.icount;         break;
src/emu/cpu/adsp2100/adsp2100.h
r3535r3536
6666#define ADSP2100_IRQ3      3      /* IRQ3 */
6767
6868#if (HAS_ADSP2100)
69extern void adsp2100_get_info(UINT32 state, cpuinfo *info);
69extern CPU_GET_INFO( adsp2100 );
7070#endif
7171
7272/**************************************************************************
r3535r3536
8383#define ADSP2101_TIMER      5      /* internal timer IRQ */
8484
8585#if (HAS_ADSP2101)
86extern void adsp2101_get_info(UINT32 state, cpuinfo *info);
86extern CPU_GET_INFO( adsp2101 );
8787#endif
8888
8989#if (HAS_ADSP2104)
r3535r3536
100100#define ADSP2104_SPORT0_TX   4      /* SPORT0 transmit IRQ */
101101#define ADSP2104_TIMER      5      /* internal timer IRQ */
102102
103extern void adsp2104_get_info(UINT32 state, cpuinfo *info);
103extern CPU_GET_INFO( adsp2104 );
104104extern void adsp2104_load_boot_data(UINT8 *srcdata, UINT32 *dstdata);
105105#endif /* (HAS_ADSP2104) */
106106
r3535r3536
116116#define ADSP2105_IRQ2      2      /* IRQ2 */
117117#define ADSP2105_TIMER      5      /* internal timer IRQ */
118118
119extern void adsp2105_get_info(UINT32 state, cpuinfo *info);
119extern CPU_GET_INFO( adsp2105 );
120120extern void adsp2105_load_boot_data(UINT8 *srcdata, UINT32 *dstdata);
121121#endif /* (HAS_ADSP2105) */
122122
r3535r3536
134134#define ADSP2115_SPORT0_TX   4      /* SPORT0 transmit IRQ */
135135#define ADSP2115_TIMER      5      /* internal timer IRQ */
136136
137extern void adsp2115_get_info(UINT32 state, cpuinfo *info);
137extern CPU_GET_INFO( adsp2115 );
138138extern void adsp2115_load_boot_data(UINT8 *srcdata, UINT32 *dstdata);
139139#endif /* (HAS_ADSP2115) */
140140
r3535r3536
155155#define ADSP2181_IRQL1      7      /* IRQL1 */
156156#define ADSP2181_IRQL2      8      /* IRQL2 */
157157
158extern void adsp2181_get_info(UINT32 state, cpuinfo *info);
158extern CPU_GET_INFO( adsp2181 );
159159extern void adsp2181_load_boot_data(UINT8 *srcdata, UINT32 *dstdata);
160160extern void adsp2181_idma_addr_w(UINT16 data);
161161extern UINT16 adsp2181_idma_addr_r(void);
src/emu/cpu/adsp2100/2100ops.c
r3535r3536
1313#define ZFLAG         0x01
1414
1515/* extracts flags */
16#define GET_SS         (adsp2100.astat & SSFLAG)
17#define GET_MV         (adsp2100.astat & MVFLAG)
18#define GET_Q         (adsp2100.astat &  QFLAG)
19#define GET_S         (adsp2100.astat &  SFLAG)
20#define GET_C         (adsp2100.astat &  CFLAG)
21#define GET_V         (adsp2100.astat &  VFLAG)
22#define GET_N         (adsp2100.astat &  NFLAG)
23#define GET_Z         (adsp2100.astat &  ZFLAG)
16#define GET_SS         (adsp->astat & SSFLAG)
17#define GET_MV         (adsp->astat & MVFLAG)
18#define GET_Q         (adsp->astat &  QFLAG)
19#define GET_S         (adsp->astat &  SFLAG)
20#define GET_C         (adsp->astat &  CFLAG)
21#define GET_V         (adsp->astat &  VFLAG)
22#define GET_N         (adsp->astat &  NFLAG)
23#define GET_Z         (adsp->astat &  ZFLAG)
2424
2525/* clears flags */
26#define CLR_SS         (adsp2100.astat &= ~SSFLAG)
27#define CLR_MV         (adsp2100.astat &= ~MVFLAG)
28#define CLR_Q         (adsp2100.astat &=  ~QFLAG)
29#define CLR_S         (adsp2100.astat &=  ~SFLAG)
30#define CLR_C         (adsp2100.astat &=  ~CFLAG)
31#define CLR_V         (adsp2100.astat &=  ~VFLAG)
32#define CLR_N         (adsp2100.astat &=  ~NFLAG)
33#define CLR_Z         (adsp2100.astat &=  ~ZFLAG)
26#define CLR_SS         (adsp->astat &= ~SSFLAG)
27#define CLR_MV         (adsp->astat &= ~MVFLAG)
28#define CLR_Q         (adsp->astat &=  ~QFLAG)
29#define CLR_S         (adsp->astat &=  ~SFLAG)
30#define CLR_C         (adsp->astat &=  ~CFLAG)
31#define CLR_V         (adsp->astat &=  ~VFLAG)
32#define CLR_N         (adsp->astat &=  ~NFLAG)
33#define CLR_Z         (adsp->astat &=  ~ZFLAG)
3434
3535/* sets flags */
36#define SET_SS         (adsp2100.astat |= SSFLAG)
37#define SET_MV         (adsp2100.astat |= MVFLAG)
38#define SET_Q         (adsp2100.astat |=  QFLAG)
39#define SET_S         (adsp2100.astat |=  SFLAG)
40#define SET_C         (adsp2100.astat |=  CFLAG)
41#define SET_V         (adsp2100.astat |=  VFLAG)
42#define SET_Z         (adsp2100.astat |=  ZFLAG)
43#define SET_N         (adsp2100.astat |=  NFLAG)
36#define SET_SS         (adsp->astat |= SSFLAG)
37#define SET_MV         (adsp->astat |= MVFLAG)
38#define SET_Q         (adsp->astat |=  QFLAG)
39#define SET_S         (adsp->astat |=  SFLAG)
40#define SET_C         (adsp->astat |=  CFLAG)
41#define SET_V         (adsp->astat |=  VFLAG)
42#define SET_Z         (adsp->astat |=  ZFLAG)
43#define SET_N         (adsp->astat |=  NFLAG)
4444
4545/* flag clearing; must be done before setting */
46#define CLR_FLAGS      (adsp2100.astat &= adsp2100.astat_clear)
46#define CLR_FLAGS      (adsp->astat &= adsp->astat_clear)
4747
4848/* compute flags */
49#define CALC_Z(r)      (adsp2100.astat |= ((r & 0xffff) == 0))
50#define CALC_N(r)      (adsp2100.astat |= (r >> 14) & 0x02)
51#define CALC_V(s,d,r)   (adsp2100.astat |= ((s ^ d ^ r ^ (r >> 1)) >> 13) & 0x04)
52#define CALC_C(r)      (adsp2100.astat |= (r >> 13) & 0x08)
53#define CALC_C_SUB(r)   (adsp2100.astat |= (~r >> 13) & 0x08)
49#define CALC_Z(r)      (adsp->astat |= ((r & 0xffff) == 0))
50#define CALC_N(r)      (adsp->astat |= (r >> 14) & 0x02)
51#define CALC_V(s,d,r)   (adsp->astat |= ((s ^ d ^ r ^ (r >> 1)) >> 13) & 0x04)
52#define CALC_C(r)      (adsp->astat |= (r >> 13) & 0x08)
53#define CALC_C_SUB(r)   (adsp->astat |= (~r >> 13) & 0x08)
5454#define CALC_NZ(r)       CLR_FLAGS; CALC_N(r); CALC_Z(r)
5555#define CALC_NZV(s,d,r) CLR_FLAGS; CALC_N(r); CALC_Z(r); CALC_V(s,d,r)
5656#define CALC_NZVC(s,d,r) CLR_FLAGS; CALC_N(r); CALC_Z(r); CALC_V(s,d,r); CALC_C(r)
r3535r3536
8181#define MSTAT_GOMODE   0x40         /* go mode enable */
8282
8383/* you must call this in order to change MSTAT */
84INLINE void set_mstat(int new_value)
84INLINE void set_mstat(adsp2100_state *adsp, int new_value)
8585{
86   if ((new_value ^ adsp2100.mstat) & MSTAT_BANK)
86   if ((new_value ^ adsp->mstat) & MSTAT_BANK)
8787   {
88      ADSPCORE temp = adsp2100.core;
89      adsp2100.core = adsp2100.alt;
90      adsp2100.alt = temp;
88      ADSPCORE temp = adsp->core;
89      adsp->core = adsp->alt;
90      adsp->alt = temp;
9191   }
92   if ((new_value ^ adsp2100.mstat) & MSTAT_TIMER)
93      if (adsp2100.timer_fired_func)
94         (*adsp2100.timer_fired_func)((new_value & MSTAT_TIMER) != 0);
92   if ((new_value ^ adsp->mstat) & MSTAT_TIMER)
93      if (adsp->timer_fired_func)
94         (*adsp->timer_fired_func)((new_value & MSTAT_TIMER) != 0);
9595   if (new_value & MSTAT_STICKYV)
96      adsp2100.astat_clear = ~(CFLAG | NFLAG | ZFLAG);
96      adsp->astat_clear = ~(CFLAG | NFLAG | ZFLAG);
9797   else
98      adsp2100.astat_clear = ~(CFLAG | VFLAG | NFLAG | ZFLAG);
99   adsp2100.mstat = new_value;
98      adsp->astat_clear = ~(CFLAG | VFLAG | NFLAG | ZFLAG);
99   adsp->mstat = new_value;
100100}
101101
102102
r3535r3536
120120    PC stack handlers
121121===========================================================================*/
122122
123INLINE UINT32 pc_stack_top(void)
123INLINE UINT32 pc_stack_top(adsp2100_state *adsp)
124124{
125   if (adsp2100.pc_sp > 0)
126      return adsp2100.pc_stack[adsp2100.pc_sp - 1];
125   if (adsp->pc_sp > 0)
126      return adsp->pc_stack[adsp->pc_sp - 1];
127127   else
128      return adsp2100.pc_stack[0];
128      return adsp->pc_stack[0];
129129}
130130
131INLINE void set_pc_stack_top(UINT32 top)
131INLINE void set_pc_stack_top(adsp2100_state *adsp, UINT32 top)
132132{
133   if (adsp2100.pc_sp > 0)
134      adsp2100.pc_stack[adsp2100.pc_sp - 1] = top;
133   if (adsp->pc_sp > 0)
134      adsp->pc_stack[adsp->pc_sp - 1] = top;
135135   else
136      adsp2100.pc_stack[0] = top;
136      adsp->pc_stack[0] = top;
137137}
138138
139INLINE void pc_stack_push(void)
139INLINE void pc_stack_push(adsp2100_state *adsp)
140140{
141   if (adsp2100.pc_sp < PC_STACK_DEPTH)
141   if (adsp->pc_sp < PC_STACK_DEPTH)
142142   {
143      adsp2100.pc_stack[adsp2100.pc_sp] = adsp2100.pc;
144      adsp2100.pc_sp++;
145      adsp2100.sstat &= ~PC_EMPTY;
143      adsp->pc_stack[adsp->pc_sp] = adsp->pc;
144      adsp->pc_sp++;
145      adsp->sstat &= ~PC_EMPTY;
146146   }
147147   else
148      adsp2100.sstat |= PC_OVER;
148      adsp->sstat |= PC_OVER;
149149}
150150
151INLINE void pc_stack_push_val(UINT32 val)
151INLINE void pc_stack_push_val(adsp2100_state *adsp, UINT32 val)
152152{
153   if (adsp2100.pc_sp < PC_STACK_DEPTH)
153   if (adsp->pc_sp < PC_STACK_DEPTH)
154154   {
155      adsp2100.pc_stack[adsp2100.pc_sp] = val;
156      adsp2100.pc_sp++;
157      adsp2100.sstat &= ~PC_EMPTY;
155      adsp->pc_stack[adsp->pc_sp] = val;
156      adsp->pc_sp++;
157      adsp->sstat &= ~PC_EMPTY;
158158   }
159159   else
160      adsp2100.sstat |= PC_OVER;
160      adsp->sstat |= PC_OVER;
161161}
162162
163INLINE void pc_stack_pop(void)
163INLINE void pc_stack_pop(adsp2100_state *adsp)
164164{
165   if (adsp2100.pc_sp > 0)
165   if (adsp->pc_sp > 0)
166166   {
167      adsp2100.pc_sp--;
168      if (adsp2100.pc_sp == 0)
169         adsp2100.sstat |= PC_EMPTY;
167      adsp->pc_sp--;
168      if (adsp->pc_sp == 0)
169         adsp->sstat |= PC_EMPTY;
170170   }
171   adsp2100.pc = adsp2100.pc_stack[adsp2100.pc_sp];
172   CHANGEPC();
171   adsp->pc = adsp->pc_stack[adsp->pc_sp];
172   CHANGEPC(adsp);
173173}
174174
175INLINE UINT32 pc_stack_pop_val(void)
175INLINE UINT32 pc_stack_pop_val(adsp2100_state *adsp)
176176{
177   if (adsp2100.pc_sp > 0)
177   if (adsp->pc_sp > 0)
178178   {
179      adsp2100.pc_sp--;
180      if (adsp2100.pc_sp == 0)
181         adsp2100.sstat |= PC_EMPTY;
179      adsp->pc_sp--;
180      if (adsp->pc_sp == 0)
181         adsp->sstat |= PC_EMPTY;
182182   }
183   return adsp2100.pc_stack[adsp2100.pc_sp];
183   return adsp->pc_stack[adsp->pc_sp];
184184}
185185
186186
r3535r3536
188188    CNTR stack handlers
189189===========================================================================*/
190190
191INLINE UINT32 cntr_stack_top(void)
191INLINE UINT32 cntr_stack_top(adsp2100_state *adsp)
192192{
193   if (adsp2100.cntr_sp > 0)
194      return adsp2100.cntr_stack[adsp2100.cntr_sp - 1];
193   if (adsp->cntr_sp > 0)
194      return adsp->cntr_stack[adsp->cntr_sp - 1];
195195   else
196      return adsp2100.cntr_stack[0];
196      return adsp->cntr_stack[0];
197197}
198198
199INLINE void cntr_stack_push(void)
199INLINE void cntr_stack_push(adsp2100_state *adsp)
200200{
201   if (adsp2100.cntr_sp < CNTR_STACK_DEPTH)
201   if (adsp->cntr_sp < CNTR_STACK_DEPTH)
202202   {
203      adsp2100.cntr_stack[adsp2100.cntr_sp] = adsp2100.cntr;
204      adsp2100.cntr_sp++;
205      adsp2100.sstat &= ~COUNT_EMPTY;
203      adsp->cntr_stack[adsp->cntr_sp] = adsp->cntr;
204      adsp->cntr_sp++;
205      adsp->sstat &= ~COUNT_EMPTY;
206206   }
207207   else
208      adsp2100.sstat |= COUNT_OVER;
208      adsp->sstat |= COUNT_OVER;
209209}
210210
211INLINE void cntr_stack_pop(void)
211INLINE void cntr_stack_pop(adsp2100_state *adsp)
212212{
213   if (adsp2100.cntr_sp > 0)
213   if (adsp->cntr_sp > 0)
214214   {
215      adsp2100.cntr_sp--;
216      if (adsp2100.cntr_sp == 0)
217         adsp2100.sstat |= COUNT_EMPTY;
215      adsp->cntr_sp--;
216      if (adsp->cntr_sp == 0)
217         adsp->sstat |= COUNT_EMPTY;
218218   }
219   adsp2100.cntr = adsp2100.cntr_stack[adsp2100.cntr_sp];
219   adsp->cntr = adsp->cntr_stack[adsp->cntr_sp];
220220}
221221
222222
r3535r3536
224224    LOOP stack handlers
225225===========================================================================*/
226226
227INLINE UINT32 loop_stack_top(void)
227INLINE UINT32 loop_stack_top(adsp2100_state *adsp)
228228{
229   if (adsp2100.loop_sp > 0)
230      return adsp2100.loop_stack[adsp2100.loop_sp - 1];
229   if (adsp->loop_sp > 0)
230      return adsp->loop_stack[adsp->loop_sp - 1];
231231   else
232      return adsp2100.loop_stack[0];
232      return adsp->loop_stack[0];
233233}
234234
235INLINE void loop_stack_push(UINT32 value)
235INLINE void loop_stack_push(adsp2100_state *adsp, UINT32 value)
236236{
237   if (adsp2100.loop_sp < LOOP_STACK_DEPTH)
237   if (adsp->loop_sp < LOOP_STACK_DEPTH)
238238   {
239      adsp2100.loop_stack[adsp2100.loop_sp] = value;
240      adsp2100.loop_sp++;
241      adsp2100.loop = value >> 4;
242      adsp2100.loop_condition = value & 15;
243      adsp2100.sstat &= ~LOOP_EMPTY;
239      adsp->loop_stack[adsp->loop_sp] = value;
240      adsp->loop_sp++;
241      adsp->loop = value >> 4;
242      adsp->loop_condition = value & 15;
243      adsp->sstat &= ~LOOP_EMPTY;
244244   }
245245   else
246      adsp2100.sstat |= LOOP_OVER;
246      adsp->sstat |= LOOP_OVER;
247247}
248248
249INLINE void loop_stack_pop(void)
249INLINE void loop_stack_pop(adsp2100_state *adsp)
250250{
251   if (adsp2100.loop_sp > 0)
251   if (adsp->loop_sp > 0)
252252   {
253      adsp2100.loop_sp--;
254      if (adsp2100.loop_sp == 0)
253      adsp->loop_sp--;
254      if (adsp->loop_sp == 0)
255255      {
256         adsp2100.loop = 0xffff;
257         adsp2100.loop_condition = 0;
258         adsp2100.sstat |= LOOP_EMPTY;
256         adsp->loop = 0xffff;
257         adsp->loop_condition = 0;
258         adsp->sstat |= LOOP_EMPTY;
259259      }
260260      else
261261      {
262         adsp2100.loop = adsp2100.loop_stack[adsp2100.loop_sp -1] >> 4;
263         adsp2100.loop_condition = adsp2100.loop_stack[adsp2100.loop_sp - 1] & 15;
262         adsp->loop = adsp->loop_stack[adsp->loop_sp -1] >> 4;
263         adsp->loop_condition = adsp->loop_stack[adsp->loop_sp - 1] & 15;
264264      }
265265   }
266266}
r3535r3536
270270    STAT stack handlers
271271===========================================================================*/
272272
273INLINE void stat_stack_push(void)
273INLINE void stat_stack_push(adsp2100_state *adsp)
274274{
275   if (adsp2100.stat_sp < STAT_STACK_DEPTH)
275   if (adsp->stat_sp < STAT_STACK_DEPTH)
276276   {
277      adsp2100.stat_stack[adsp2100.stat_sp][0] = adsp2100.mstat;
278      adsp2100.stat_stack[adsp2100.stat_sp][1] = adsp2100.imask;
279      adsp2100.stat_stack[adsp2100.stat_sp][2] = adsp2100.astat;
280      adsp2100.stat_sp++;
281      adsp2100.sstat &= ~STATUS_EMPTY;
277      adsp->stat_stack[adsp->stat_sp][0] = adsp->mstat;
278      adsp->stat_stack[adsp->stat_sp][1] = adsp->imask;
279      adsp->stat_stack[adsp->stat_sp][2] = adsp->astat;
280      adsp->stat_sp++;
281      adsp->sstat &= ~STATUS_EMPTY;
282282   }
283283   else
284      adsp2100.sstat |= STATUS_OVER;
284      adsp->sstat |= STATUS_OVER;
285285}
286286
287INLINE void stat_stack_pop(void)
287INLINE void stat_stack_pop(adsp2100_state *adsp)
288288{
289   if (adsp2100.stat_sp > 0)
289   if (adsp->stat_sp > 0)
290290   {
291      adsp2100.stat_sp--;
292      if (adsp2100.stat_sp == 0)
293         adsp2100.sstat |= STATUS_EMPTY;
291      adsp->stat_sp--;
292      if (adsp->stat_sp == 0)
293         adsp->sstat |= STATUS_EMPTY;
294294   }
295   set_mstat(adsp2100.stat_stack[adsp2100.stat_sp][0]);
296   adsp2100.imask = adsp2100.stat_stack[adsp2100.stat_sp][1];
297   adsp2100.astat = adsp2100.stat_stack[adsp2100.stat_sp][2];
298    check_irqs();
295   set_mstat(adsp, adsp->stat_stack[adsp->stat_sp][0]);
296   adsp->imask = adsp->stat_stack[adsp->stat_sp][1];
297   adsp->astat = adsp->stat_stack[adsp->stat_sp][2];
298    check_irqs(adsp);
299299}
300300
301301
r3535r3536
304304    condition code checking
305305===========================================================================*/
306306
307INLINE int CONDITION(int c)
307INLINE int CONDITION(adsp2100_state *adsp, int c)
308308{
309309   if (c != 14)
310      return condition_table[((c) << 8) | adsp2100.astat];
311   else if ((INT32)--adsp2100.cntr > 0)
310      return condition_table[((c) << 8) | adsp->astat];
311   else if ((INT32)--adsp->cntr > 0)
312312      return 1;
313313   else
314314   {
315      cntr_stack_pop();
315      cntr_stack_pop(adsp);
316316      return 0;
317317   }
318318}
r3535r3536
323323    register writing
324324===========================================================================*/
325325
326static void wr_inval(INT32 val) { logerror( "ADSP %04x: Writing to an invalid register!\n", adsp2100.ppc ); }
327static void wr_ax0(INT32 val)   { adsp2100.core.ax0.s = val; }
328static void wr_ax1(INT32 val)   { adsp2100.core.ax1.s = val; }
329static void wr_mx0(INT32 val)   { adsp2100.core.mx0.s = val; }
330static void wr_mx1(INT32 val)   { adsp2100.core.mx1.s = val; }
331static void wr_ay0(INT32 val)   { adsp2100.core.ay0.s = val; }
332static void wr_ay1(INT32 val)   { adsp2100.core.ay1.s = val; }
333static void wr_my0(INT32 val)   { adsp2100.core.my0.s = val; }
334static void wr_my1(INT32 val)   { adsp2100.core.my1.s = val; }
335static void wr_si(INT32 val)    { adsp2100.core.si.s = val; }
336static void wr_se(INT32 val)    { adsp2100.core.se.s = (INT8)val; }
337static void wr_ar(INT32 val)    { adsp2100.core.ar.s = val; }
338static void wr_mr0(INT32 val)   { adsp2100.core.mr.mrx.mr0.s = val; }
339static void wr_mr1(INT32 val)   { adsp2100.core.mr.mrx.mr1.s = val; adsp2100.core.mr.mrx.mr2.s = (INT16)val >> 15; }
340static void wr_mr2(INT32 val)   { adsp2100.core.mr.mrx.mr2.s = (INT8)val; }
341static void wr_sr0(INT32 val)   { adsp2100.core.sr.srx.sr0.s = val; }
342static void wr_sr1(INT32 val)   { adsp2100.core.sr.srx.sr1.s = val; }
343static void wr_i0(INT32 val)    { adsp2100.i[0] = val & 0x3fff; adsp2100.base[0] = val & adsp2100.lmask[0]; }
344static void wr_i1(INT32 val)    { adsp2100.i[1] = val & 0x3fff; adsp2100.base[1] = val & adsp2100.lmask[1]; }
345static void wr_i2(INT32 val)    { adsp2100.i[2] = val & 0x3fff; adsp2100.base[2] = val & adsp2100.lmask[2]; }
346static void wr_i3(INT32 val)    { adsp2100.i[3] = val & 0x3fff; adsp2100.base[3] = val & adsp2100.lmask[3]; }
347static void wr_i4(INT32 val)    { adsp2100.i[4] = val & 0x3fff; adsp2100.base[4] = val & adsp2100.lmask[4]; }
348static void wr_i5(INT32 val)    { adsp2100.i[5] = val & 0x3fff; adsp2100.base[5] = val & adsp2100.lmask[5]; }
349static void wr_i6(INT32 val)    { adsp2100.i[6] = val & 0x3fff; adsp2100.base[6] = val & adsp2100.lmask[6]; }
350static void wr_i7(INT32 val)    { adsp2100.i[7] = val & 0x3fff; adsp2100.base[7] = val & adsp2100.lmask[7]; }
351static void wr_m0(INT32 val)    { adsp2100.m[0] = (INT32)(val << 18) >> 18; }
352static void wr_m1(INT32 val)    { adsp2100.m[1] = (INT32)(val << 18) >> 18; }
353static void wr_m2(INT32 val)    { adsp2100.m[2] = (INT32)(val << 18) >> 18; }
354static void wr_m3(INT32 val)    { adsp2100.m[3] = (INT32)(val << 18) >> 18; }
355static void wr_m4(INT32 val)    { adsp2100.m[4] = (INT32)(val << 18) >> 18; }
356static void wr_m5(INT32 val)    { adsp2100.m[5] = (INT32)(val << 18) >> 18; }
357static void wr_m6(INT32 val)    { adsp2100.m[6] = (INT32)(val << 18) >> 18; }
358static void wr_m7(INT32 val)    { adsp2100.m[7] = (INT32)(val << 18) >> 18; }
359static void wr_l0(INT32 val)    { adsp2100.l[0] = val & 0x3fff; adsp2100.lmask[0] = mask_table[val & 0x3fff]; adsp2100.base[0] = adsp2100.i[0] & adsp2100.lmask[0]; }
360static void wr_l1(INT32 val)    { adsp2100.l[1] = val & 0x3fff; adsp2100.lmask[1] = mask_table[val & 0x3fff]; adsp2100.base[1] = adsp2100.i[1] & adsp2100.lmask[1]; }
361static void wr_l2(INT32 val)    { adsp2100.l[2] = val & 0x3fff; adsp2100.lmask[2] = mask_table[val & 0x3fff]; adsp2100.base[2] = adsp2100.i[2] & adsp2100.lmask[2]; }
362static void wr_l3(INT32 val)    { adsp2100.l[3] = val & 0x3fff; adsp2100.lmask[3] = mask_table[val & 0x3fff]; adsp2100.base[3] = adsp2100.i[3] & adsp2100.lmask[3]; }
363static void wr_l4(INT32 val)    { adsp2100.l[4] = val & 0x3fff; adsp2100.lmask[4] = mask_table[val & 0x3fff]; adsp2100.base[4] = adsp2100.i[4] & adsp2100.lmask[4]; }
364static void wr_l5(INT32 val)    { adsp2100.l[5] = val & 0x3fff; adsp2100.lmask[5] = mask_table[val & 0x3fff]; adsp2100.base[5] = adsp2100.i[5] & adsp2100.lmask[5]; }
365static void wr_l6(INT32 val)    { adsp2100.l[6] = val & 0x3fff; adsp2100.lmask[6] = mask_table[val & 0x3fff]; adsp2100.base[6] = adsp2100.i[6] & adsp2100.lmask[6]; }
366static void wr_l7(INT32 val)    { adsp2100.l[7] = val & 0x3fff; adsp2100.lmask[7] = mask_table[val & 0x3fff]; adsp2100.base[7] = adsp2100.i[7] & adsp2100.lmask[7]; }
367static void wr_astat(INT32 val) { adsp2100.astat = val & 0x00ff; }
368static void wr_mstat(INT32 val) { set_mstat(val & mstat_mask); }
369static void wr_sstat(INT32 val) { adsp2100.sstat = val & 0x00ff; }
370static void wr_imask(INT32 val) { adsp2100.imask = val & imask_mask; check_irqs(); }
371static void wr_icntl(INT32 val) { adsp2100.icntl = val & 0x001f; check_irqs(); }
372static void wr_cntr(INT32 val)  { cntr_stack_push(); adsp2100.cntr = val & 0x3fff; }
373static void wr_sb(INT32 val)    { adsp2100.core.sb.s = (INT32)(val << 27) >> 27; }
374static void wr_px(INT32 val)    { adsp2100.px = val; }
375static void wr_ifc(INT32 val)
326static void wr_inval(adsp2100_state *adsp, INT32 val) { logerror( "ADSP %04x: Writing to an invalid register!\n", adsp->ppc ); }
327static void wr_ax0(adsp2100_state *adsp, INT32 val)   { adsp->core.ax0.s = val; }
328static void wr_ax1(adsp2100_state *adsp, INT32 val)   { adsp->core.ax1.s = val; }
329static void wr_mx0(adsp2100_state *adsp, INT32 val)   { adsp->core.mx0.s = val; }
330static void wr_mx1(adsp2100_state *adsp, INT32 val)   { adsp->core.mx1.s = val; }
331static void wr_ay0(adsp2100_state *adsp, INT32 val)   { adsp->core.ay0.s = val; }
332static void wr_ay1(adsp2100_state *adsp, INT32 val)   { adsp->core.ay1.s = val; }
333static void wr_my0(adsp2100_state *adsp, INT32 val)   { adsp->core.my0.s = val; }
334static void wr_my1(adsp2100_state *adsp, INT32 val)   { adsp->core.my1.s = val; }
335static void wr_si(adsp2100_state *adsp, INT32 val)    { adsp->core.si.s = val; }
336static void wr_se(adsp2100_state *adsp, INT32 val)    { adsp->core.se.s = (INT8)val; }
337static void wr_ar(adsp2100_state *adsp, INT32 val)    { adsp->core.ar.s = val; }
338static void wr_mr0(adsp2100_state *adsp, INT32 val)   { adsp->core.mr.mrx.mr0.s = val; }
339static void wr_mr1(adsp2100_state *adsp, INT32 val)   { adsp->core.mr.mrx.mr1.s = val; adsp->core.mr.mrx.mr2.s = (INT16)val >> 15; }
340static void wr_mr2(adsp2100_state *adsp, INT32 val)   { adsp->core.mr.mrx.mr2.s = (INT8)val; }
341static void wr_sr0(adsp2100_state *adsp, INT32 val)   { adsp->core.sr.srx.sr0.s = val; }
342static void wr_sr1(adsp2100_state *adsp, INT32 val)   { adsp->core.sr.srx.sr1.s = val; }
343static void wr_i0(adsp2100_state *adsp, INT32 val)    { adsp->i[0] = val & 0x3fff; adsp->base[0] = val & adsp->lmask[0]; }
344static void wr_i1(adsp2100_state *adsp, INT32 val)    { adsp->i[1] = val & 0x3fff; adsp->base[1] = val & adsp->lmask[1]; }
345static void wr_i2(adsp2100_state *adsp, INT32 val)    { adsp->i[2] = val & 0x3fff; adsp->base[2] = val & adsp->lmask[2]; }
346static void wr_i3(adsp2100_state *adsp, INT32 val)    { adsp->i[3] = val & 0x3fff; adsp->base[3] = val & adsp->lmask[3]; }
347static void wr_i4(adsp2100_state *adsp, INT32 val)    { adsp->i[4] = val & 0x3fff; adsp->base[4] = val & adsp->lmask[4]; }
348static void wr_i5(adsp2100_state *adsp, INT32 val)    { adsp->i[5] = val & 0x3fff; adsp->base[5] = val & adsp->lmask[5]; }
349static void wr_i6(adsp2100_state *adsp, INT32 val)    { adsp->i[6] = val & 0x3fff; adsp->base[6] = val & adsp->lmask[6]; }
350static void wr_i7(adsp2100_state *adsp, INT32 val)    { adsp->i[7] = val & 0x3fff; adsp->base[7] = val & adsp->lmask[7]; }
351static void wr_m0(adsp2100_state *adsp, INT32 val)    { adsp->m[0] = (INT32)(val << 18) >> 18; }
352static void wr_m1(adsp2100_state *adsp, INT32 val)    { adsp->m[1] = (INT32)(val << 18) >> 18; }
353static void wr_m2(adsp2100_state *adsp, INT32 val)    { adsp->m[2] = (INT32)(val << 18) >> 18; }
354static void wr_m3(adsp2100_state *adsp, INT32 val)    { adsp->m[3] = (INT32)(val << 18) >> 18; }
355static void wr_m4(adsp2100_state *adsp, INT32 val)    { adsp->m[4] = (INT32)(val << 18) >> 18; }
356static void wr_m5(adsp2100_state *adsp, INT32 val)    { adsp->m[5] = (INT32)(val << 18) >> 18; }
357static void wr_m6(adsp2100_state *adsp, INT32 val)    { adsp->m[6] = (INT32)(val << 18) >> 18; }
358static void wr_m7(adsp2100_state *adsp, INT32 val)    { adsp->m[7] = (INT32)(val << 18) >> 18; }
359static void wr_l0(adsp2100_state *adsp, INT32 val)    { adsp->l[0] = val & 0x3fff; adsp->lmask[0] = mask_table[val & 0x3fff]; adsp->base[0] = adsp->i[0] & adsp->lmask[0]; }
360static void wr_l1(adsp2100_state *adsp, INT32 val)    { adsp->l[1] = val & 0x3fff; adsp->lmask[1] = mask_table[val & 0x3fff]; adsp->base[1] = adsp->i[1] & adsp->lmask[1]; }
361static void wr_l2(adsp2100_state *adsp, INT32 val)    { adsp->l[2] = val & 0x3fff; adsp->lmask[2] = mask_table[val & 0x3fff]; adsp->base[2] = adsp->i[2] & adsp->lmask[2]; }
362static void wr_l3(adsp2100_state *adsp, INT32 val)    { adsp->l[3] = val & 0x3fff; adsp->lmask[3] = mask_table[val & 0x3fff]; adsp->base[3] = adsp->i[3] & adsp->lmask[3]; }
363static void wr_l4(adsp2100_state *adsp, INT32 val)    { adsp->l[4] = val & 0x3fff; adsp->lmask[4] = mask_table[val & 0x3fff]; adsp->base[4] = adsp->i[4] & adsp->lmask[4]; }
364static void wr_l5(adsp2100_state *adsp, INT32 val)    { adsp->l[5] = val & 0x3fff; adsp->lmask[5] = mask_table[val & 0x3fff]; adsp->base[5] = adsp->i[5] & adsp->lmask[5]; }
365static void wr_l6(adsp2100_state *adsp, INT32 val)    { adsp->l[6] = val & 0x3fff; adsp->lmask[6] = mask_table[val & 0x3fff]; adsp->base[6] = adsp->i[6] & adsp->lmask[6]; }
366static void wr_l7(adsp2100_state *adsp, INT32 val)    { adsp->l[7] = val & 0x3fff; adsp->lmask[7] = mask_table[val & 0x3fff]; adsp->base[7] = adsp->i[7] & adsp->lmask[7]; }
367static void wr_astat(adsp2100_state *adsp, INT32 val) { adsp->astat = val & 0x00ff; }
368static void wr_mstat(adsp2100_state *adsp, INT32 val) { set_mstat(adsp, val & adsp->mstat_mask); }
369static void wr_sstat(adsp2100_state *adsp, INT32 val) { adsp->sstat = val & 0x00ff; }
370static void wr_imask(adsp2100_state *adsp, INT32 val) { adsp->imask = val & adsp->imask_mask; check_irqs(adsp); }
371static void wr_icntl(adsp2100_state *adsp, INT32 val) { adsp->icntl = val & 0x001f; check_irqs(adsp); }
372static void wr_cntr(adsp2100_state *adsp, INT32 val)  { cntr_stack_push(adsp); adsp->cntr = val & 0x3fff; }
373static void wr_sb(adsp2100_state *adsp, INT32 val)    { adsp->core.sb.s = (INT32)(val << 27) >> 27; }
374static void wr_px(adsp2100_state *adsp, INT32 val)    { adsp->px = val; }
375static void wr_ifc(adsp2100_state *adsp, INT32 val)
376376{
377   adsp2100.ifc = val;
377   adsp->ifc = val;
378378#if (HAS_ADSP2181)
379   if (chip_type >= CHIP_TYPE_ADSP2181)
379   if (adsp->chip_type >= CHIP_TYPE_ADSP2181)
380380   {
381381      /* clear timer */
382      if (val & 0x0002) adsp2100.irq_latch[ADSP2181_IRQ0] = 0;
383      if (val & 0x0004) adsp2100.irq_latch[ADSP2181_IRQ1] = 0;
382      if (val & 0x0002) adsp->irq_latch[ADSP2181_IRQ0] = 0;
383      if (val & 0x0004) adsp->irq_latch[ADSP2181_IRQ1] = 0;
384384      /* clear BDMA */
385      if (val & 0x0010) adsp2100.irq_latch[ADSP2181_IRQE] = 0;
386      if (val & 0x0020) adsp2100.irq_latch[ADSP2181_SPORT0_RX] = 0;
387      if (val & 0x0040) adsp2100.irq_latch[ADSP2181_SPORT0_TX] = 0;
388      if (val & 0x0080) adsp2100.irq_latch[ADSP2181_IRQ2] = 0;
385      if (val & 0x0010) adsp->irq_latch[ADSP2181_IRQE] = 0;
386      if (val & 0x0020) adsp->irq_latch[ADSP2181_SPORT0_RX] = 0;
387      if (val & 0x0040) adsp->irq_latch[ADSP2181_SPORT0_TX] = 0;
388      if (val & 0x0080) adsp->irq_latch[ADSP2181_IRQ2] = 0;
389389      /* force timer */
390      if (val & 0x0200) adsp2100.irq_latch[ADSP2181_IRQ0] = 1;
391      if (val & 0x0400) adsp2100.irq_latch[ADSP2181_IRQ1] = 1;
390      if (val & 0x0200) adsp->irq_latch[ADSP2181_IRQ0] = 1;
391      if (val & 0x0400) adsp->irq_latch[ADSP2181_IRQ1] = 1;
392392      /* force BDMA */
393      if (val & 0x1000) adsp2100.irq_latch[ADSP2181_IRQE] = 1;
394      if (val & 0x2000) adsp2100.irq_latch[ADSP2181_SPORT0_RX] = 1;
395      if (val & 0x4000) adsp2100.irq_latch[ADSP2181_SPORT0_TX] = 1;
396      if (val & 0x8000) adsp2100.irq_latch[ADSP2181_IRQ2] = 1;
393      if (val & 0x1000) adsp->irq_latch[ADSP2181_IRQE] = 1;
394      if (val & 0x2000) adsp->irq_latch[ADSP2181_SPORT0_RX] = 1;
395      if (val & 0x4000) adsp->irq_latch[ADSP2181_SPORT0_TX] = 1;
396      if (val & 0x8000) adsp->irq_latch[ADSP2181_IRQ2] = 1;
397397   }
398398   else
399399#endif
400400   {
401401      /* clear timer */
402      if (val & 0x002) adsp2100.irq_latch[ADSP2101_IRQ0] = 0;
403      if (val & 0x004) adsp2100.irq_latch[ADSP2101_IRQ1] = 0;
404      if (val & 0x008) adsp2100.irq_latch[ADSP2101_SPORT0_RX] = 0;
405      if (val & 0x010) adsp2100.irq_latch[ADSP2101_SPORT0_TX] = 0;
406      if (val & 0x020) adsp2100.irq_latch[ADSP2101_IRQ2] = 0;
402      if (val & 0x002) adsp->irq_latch[ADSP2101_IRQ0] = 0;
403      if (val & 0x004) adsp->irq_latch[ADSP2101_IRQ1] = 0;
404      if (val & 0x008) adsp->irq_latch[ADSP2101_SPORT0_RX] = 0;
405      if (val & 0x010) adsp->irq_latch[ADSP2101_SPORT0_TX] = 0;
406      if (val & 0x020) adsp->irq_latch[ADSP2101_IRQ2] = 0;
407407      /* set timer */
408      if (val & 0x080) adsp2100.irq_latch[ADSP2101_IRQ0] = 1;
409      if (val & 0x100) adsp2100.irq_latch[ADSP2101_IRQ1] = 1;
410      if (val & 0x200) adsp2100.irq_latch[ADSP2101_SPORT0_RX] = 1;
411      if (val & 0x400) adsp2100.irq_latch[ADSP2101_SPORT0_TX] = 1;
412      if (val & 0x800) adsp2100.irq_latch[ADSP2101_IRQ2] = 1;
408      if (val & 0x080) adsp->irq_latch[ADSP2101_IRQ0] = 1;
409      if (val & 0x100) adsp->irq_latch[ADSP2101_IRQ1] = 1;
410      if (val & 0x200) adsp->irq_latch[ADSP2101_SPORT0_RX] = 1;
411      if (val & 0x400) adsp->irq_latch[ADSP2101_SPORT0_TX] = 1;
412      if (val & 0x800) adsp->irq_latch[ADSP2101_IRQ2] = 1;
413413   }
414   check_irqs();
414   check_irqs(adsp);
415415}
416static void wr_tx0(INT32 val)   { if (adsp2100.sport_tx_callback) (*adsp2100.sport_tx_callback)(0, val); }
417static void wr_tx1(INT32 val)   { if (adsp2100.sport_tx_callback) (*adsp2100.sport_tx_callback)(1, val); }
418static void wr_owrctr(INT32 val) { adsp2100.cntr = val & 0x3fff; }
419static void wr_topstack(INT32 val) { pc_stack_push_val(val & 0x3fff); }
416static void wr_tx0(adsp2100_state *adsp, INT32 val)   { if (adsp->sport_tx_callback) (*adsp->sport_tx_callback)(0, val); }
417static void wr_tx1(adsp2100_state *adsp, INT32 val)   { if (adsp->sport_tx_callback) (*adsp->sport_tx_callback)(1, val); }
418static void wr_owrctr(adsp2100_state *adsp, INT32 val) { adsp->cntr = val & 0x3fff; }
419static void wr_topstack(adsp2100_state *adsp, INT32 val) { pc_stack_push_val(adsp, val & 0x3fff); }
420420
421#define WRITE_REG(grp,reg,val) ((*wr_reg[grp][reg])(val))
421#define WRITE_REG(adsp,grp,reg,val) ((*wr_reg[grp][reg])(adsp,val))
422422
423static void (*const wr_reg[4][16])(INT32) =
423static void (*const wr_reg[4][16])(adsp2100_state*, INT32) =
424424{
425425   {
426426      wr_ax0, wr_ax1, wr_mx0, wr_mx1, wr_ay0, wr_ay1, wr_my0, wr_my1,
r3535r3536
446446    register reading
447447===========================================================================*/
448448
449static INT32 rd_inval(void) { logerror( "ADSP %04x: Writing to an invalid register!\n", adsp2100.ppc ); return 0; }
450static INT32 rd_ax0(void)   { return adsp2100.core.ax0.s; }
451static INT32 rd_ax1(void)   { return adsp2100.core.ax1.s; }
452static INT32 rd_mx0(void)   { return adsp2100.core.mx0.s; }
453static INT32 rd_mx1(void)   { return adsp2100.core.mx1.s; }
454static INT32 rd_ay0(void)   { return adsp2100.core.ay0.s; }
455static INT32 rd_ay1(void)   { return adsp2100.core.ay1.s; }
456static INT32 rd_my0(void)   { return adsp2100.core.my0.s; }
457static INT32 rd_my1(void)   { return adsp2100.core.my1.s; }
458static INT32 rd_si(void)    { return adsp2100.core.si.s; }
459static INT32 rd_se(void)    { return adsp2100.core.se.s; }
460static INT32 rd_ar(void)    { return adsp2100.core.ar.s; }
461static INT32 rd_mr0(void)   { return adsp2100.core.mr.mrx.mr0.s; }
462static INT32 rd_mr1(void)   { return adsp2100.core.mr.mrx.mr1.s; }
463static INT32 rd_mr2(void)   { return adsp2100.core.mr.mrx.mr2.s; }
464static INT32 rd_sr0(void)   { return adsp2100.core.sr.srx.sr0.s; }
465static INT32 rd_sr1(void)   { return adsp2100.core.sr.srx.sr1.s; }
466static INT32 rd_i0(void)    { return adsp2100.i[0]; }
467static INT32 rd_i1(void)    { return adsp2100.i[1]; }
468static INT32 rd_i2(void)    { return adsp2100.i[2]; }
469static INT32 rd_i3(void)    { return adsp2100.i[3]; }
470static INT32 rd_i4(void)    { return adsp2100.i[4]; }
471static INT32 rd_i5(void)    { return adsp2100.i[5]; }
472static INT32 rd_i6(void)    { return adsp2100.i[6]; }
473static INT32 rd_i7(void)    { return adsp2100.i[7]; }
474static INT32 rd_m0(void)    { return adsp2100.m[0]; }
475static INT32 rd_m1(void)    { return adsp2100.m[1]; }
476static INT32 rd_m2(void)    { return adsp2100.m[2]; }
477static INT32 rd_m3(void)    { return adsp2100.m[3]; }
478static INT32 rd_m4(void)    { return adsp2100.m[4]; }
479static INT32 rd_m5(void)    { return adsp2100.m[5]; }
480static INT32 rd_m6(void)    { return adsp2100.m[6]; }
481static INT32 rd_m7(void)    { return adsp2100.m[7]; }
482static INT32 rd_l0(void)    { return adsp2100.l[0]; }
483static INT32 rd_l1(void)    { return adsp2100.l[1]; }
484static INT32 rd_l2(void)    { return adsp2100.l[2]; }
485static INT32 rd_l3(void)    { return adsp2100.l[3]; }
486static INT32 rd_l4(void)    { return adsp2100.l[4]; }
487static INT32 rd_l5(void)    { return adsp2100.l[5]; }
488static INT32 rd_l6(void)    { return adsp2100.l[6]; }
489static INT32 rd_l7(void)    { return adsp2100.l[7]; }
490static INT32 rd_astat(void) { return adsp2100.astat; }
491static INT32 rd_mstat(void) { return adsp2100.mstat; }
492static INT32 rd_sstat(void) { return adsp2100.sstat; }
493static INT32 rd_imask(void) { return adsp2100.imask; }
494static INT32 rd_icntl(void) { return adsp2100.icntl; }
495static INT32 rd_cntr(void)  { return adsp2100.cntr; }
496static INT32 rd_sb(void)    { return adsp2100.core.sb.s; }
497static INT32 rd_px(void)    { return adsp2100.px; }
498static INT32 rd_rx0(void)   { if (adsp2100.sport_rx_callback) return (*adsp2100.sport_rx_callback)(0); else return 0; }
499static INT32 rd_rx1(void)   { if (adsp2100.sport_rx_callback) return (*adsp2100.sport_rx_callback)(1); else return 0; }
500static INT32 rd_stacktop(void)   { return pc_stack_pop_val(); }
449static INT32 rd_inval(adsp2100_state *adsp) { logerror( "ADSP %04x: Writing to an invalid register!\n", adsp->ppc ); return 0; }
450static INT32 rd_ax0(adsp2100_state *adsp)   { return adsp->core.ax0.s; }
451static INT32 rd_ax1(adsp2100_state *adsp)   { return adsp->core.ax1.s; }
452static INT32 rd_mx0(adsp2100_state *adsp)   { return adsp->core.mx0.s; }
453static INT32 rd_mx1(adsp2100_state *adsp)   { return adsp->core.mx1.s; }
454static INT32 rd_ay0(adsp2100_state *adsp)   { return adsp->core.ay0.s; }
455static INT32 rd_ay1(adsp2100_state *adsp)   { return adsp->core.ay1.s; }
456static INT32 rd_my0(adsp2100_state *adsp)   { return adsp->core.my0.s; }
457static INT32 rd_my1(adsp2100_state *adsp)   { return adsp->core.my1.s; }
458static INT32 rd_si(adsp2100_state *adsp)    { return adsp->core.si.s; }
459static INT32 rd_se(adsp2100_state *adsp)    { return adsp->core.se.s; }
460static INT32 rd_ar(adsp2100_state *adsp)    { return adsp->core.ar.s; }
461static INT32 rd_mr0(adsp2100_state *adsp)   { return adsp->core.mr.mrx.mr0.s; }
462static INT32 rd_mr1(adsp2100_state *adsp)   { return adsp->core.mr.mrx.mr1.s; }
463static INT32 rd_mr2(adsp2100_state *adsp)   { return adsp->core.mr.mrx.mr2.s; }
464static INT32 rd_sr0(adsp2100_state *adsp)   { return adsp->core.sr.srx.sr0.s; }
465static INT32 rd_sr1(adsp2100_state *adsp)   { return adsp->core.sr.srx.sr1.s; }
466static INT32 rd_i0(adsp2100_state *adsp)    { return adsp->i[0]; }
467static INT32 rd_i1(adsp2100_state *adsp)    { return adsp->i[1]; }
468static INT32 rd_i2(adsp2100_state *adsp)    { return adsp->i[2]; }
469static INT32 rd_i3(adsp2100_state *adsp)    { return adsp->i[3]; }
470static INT32 rd_i4(adsp2100_state *adsp)    { return adsp->i[4]; }
471static INT32 rd_i5(adsp2100_state *adsp)    { return adsp->i[5]; }
472static INT32 rd_i6(adsp2100_state *adsp)    { return adsp->i[6]; }
473static INT32 rd_i7(adsp2100_state *adsp)    { return adsp->i[7]; }
474static INT32 rd_m0(adsp2100_state *adsp)    { return adsp->m[0]; }
475static INT32 rd_m1(adsp2100_state *adsp)    { return adsp->m[1]; }
476static INT32 rd_m2(adsp2100_state *adsp)    { return adsp->m[2]; }
477static INT32 rd_m3(adsp2100_state *adsp)    { return adsp->m[3]; }
478static INT32 rd_m4(adsp2100_state *adsp)    { return adsp->m[4]; }
479static INT32 rd_m5(adsp2100_state *adsp)    { return adsp->m[5]; }
480static INT32 rd_m6(adsp2100_state *adsp)    { return adsp->m[6]; }
481static INT32 rd_m7(adsp2100_state *adsp)    { return adsp->m[7]; }
482static INT32 rd_l0(adsp2100_state *adsp)    { return adsp->l[0]; }
483static INT32 rd_l1(adsp2100_state *adsp)    { return adsp->l[1]; }
484static INT32 rd_l2(adsp2100_state *adsp)    { return adsp->l[2]; }
485static INT32 rd_l3(adsp2100_state *adsp)    { return adsp->l[3]; }
486static INT32 rd_l4(adsp2100_state *adsp)    { return adsp->l[4]; }
487static INT32 rd_l5(adsp2100_state *adsp)    { return adsp->l[5]; }
488static INT32 rd_l6(adsp2100_state *adsp)    { return adsp->l[6]; }
489static INT32 rd_l7(adsp2100_state *adsp)    { return adsp->l[7]; }
490static INT32 rd_astat(adsp2100_state *adsp) { return adsp->astat; }
491static INT32 rd_mstat(adsp2100_state *adsp) { return adsp->mstat; }
492static INT32 rd_sstat(adsp2100_state *adsp) { return adsp->sstat; }
493static INT32 rd_imask(adsp2100_state *adsp) { return adsp->imask; }
494static INT32 rd_icntl(adsp2100_state *adsp) { return adsp->icntl; }
495static INT32 rd_cntr(adsp2100_state *adsp)  { return adsp->cntr; }
496static INT32 rd_sb(adsp2100_state *adsp)    { return adsp->core.sb.s; }
497static INT32 rd_px(adsp2100_state *adsp)    { return adsp->px; }
498static INT32 rd_rx0(adsp2100_state *adsp)   { if (adsp->sport_rx_callback) return (*adsp->sport_rx_callback)(0); else return 0; }
499static INT32 rd_rx1(adsp2100_state *adsp)   { if (adsp->sport_rx_callback) return (*adsp->sport_rx_callback)(1); else return 0; }
500static INT32 rd_stacktop(adsp2100_state *adsp)   { return pc_stack_pop_val(adsp); }
501501
502#define READ_REG(grp,reg) ((*rd_reg[grp][reg])())
502#define READ_REG(adsp,grp,reg) ((*rd_reg[grp][reg])(adsp))
503503
504static INT32 (*const rd_reg[4][16])(void) =
504static INT32 (*const rd_reg[4][16])(adsp2100_state *adsp) =
505505{
506506   {
507507      rd_ax0, rd_ax1, rd_mx0, rd_mx1, rd_ay0, rd_ay1, rd_my0, rd_my1,
r3535r3536
527527    Modulus addressing logic
528528===========================================================================*/
529529
530INLINE void modify_address(UINT32 ireg, UINT32 mreg)
530INLINE void modify_address(adsp2100_state *adsp, UINT32 ireg, UINT32 mreg)
531531{
532   UINT32 base = adsp2100.base[ireg];
533   UINT32 i = adsp2100.i[ireg];
534   UINT32 l = adsp2100.l[ireg];
532   UINT32 base = adsp->base[ireg];
533   UINT32 i = adsp->i[ireg];
534   UINT32 l = adsp->l[ireg];
535535
536   i += adsp2100.m[mreg];
536   i += adsp->m[mreg];
537537   if (i < base) i += l;
538538   else if (i >= base + l) i -= l;
539   adsp2100.i[ireg] = i;
539   adsp->i[ireg] = i;
540540}
541541
542542
r3535r3536
545545    Data memory accessors
546546===========================================================================*/
547547
548INLINE void data_write_dag1(UINT32 op, INT32 val)
548INLINE void data_write_dag1(adsp2100_state *adsp, UINT32 op, INT32 val)
549549{
550550   UINT32 ireg = (op >> 2) & 3;
551551   UINT32 mreg = op & 3;
552   UINT32 base = adsp2100.base[ireg];
553   UINT32 i = adsp2100.i[ireg];
554   UINT32 l = adsp2100.l[ireg];
552   UINT32 base = adsp->base[ireg];
553   UINT32 i = adsp->i[ireg];
554   UINT32 l = adsp->l[ireg];
555555
556   if ( adsp2100.mstat & MSTAT_REVERSE )
556   if ( adsp->mstat & MSTAT_REVERSE )
557557   {
558558      UINT32 ir = reverse_table[ i & 0x3fff ];
559559      WWORD_DATA(ir, val);
r3535r3536
561561   else
562562      WWORD_DATA(i, val);
563563
564   i += adsp2100.m[mreg];
564   i += adsp->m[mreg];
565565   if (i < base) i += l;
566566   else if (i >= base + l) i -= l;
567   adsp2100.i[ireg] = i;
567   adsp->i[ireg] = i;
568568}
569569
570570
571INLINE UINT32 data_read_dag1(UINT32 op)
571INLINE UINT32 data_read_dag1(adsp2100_state *adsp, UINT32 op)
572572{
573573   UINT32 ireg = (op >> 2) & 3;
574574   UINT32 mreg = op & 3;
575   UINT32 base = adsp2100.base[ireg];
576   UINT32 i = adsp2100.i[ireg];
577   UINT32 l = adsp2100.l[ireg];
575   UINT32 base = adsp->base[ireg];
576   UINT32 i = adsp->i[ireg];
577   UINT32 l = adsp->l[ireg];
578578   UINT32 res;
579579
580   if (adsp2100.mstat & MSTAT_REVERSE)
580   if (adsp->mstat & MSTAT_REVERSE)
581581   {
582582      UINT32 ir = reverse_table[i & 0x3fff];
583583      res = RWORD_DATA(ir);
r3535r3536
585585   else
586586      res = RWORD_DATA(i);
587587
588   i += adsp2100.m[mreg];
588   i += adsp->m[mreg];
589589   if (i < base) i += l;
590590   else if (i >= base + l) i -= l;
591   adsp2100.i[ireg] = i;
591   adsp->i[ireg] = i;
592592
593593   return res;
594594}
595595
596INLINE void data_write_dag2(UINT32 op, INT32 val)
596INLINE void data_write_dag2(adsp2100_state *adsp, UINT32 op, INT32 val)
597597{
598598   UINT32 ireg = 4 + ((op >> 2) & 3);
599599   UINT32 mreg = 4 + (op & 3);
600   UINT32 base = adsp2100.base[ireg];
601   UINT32 i = adsp2100.i[ireg];
602   UINT32 l = adsp2100.l[ireg];
600   UINT32 base = adsp->base[ireg];
601   UINT32 i = adsp->i[ireg];
602   UINT32 l = adsp->l[ireg];
603603
604604   WWORD_DATA(i, val);
605605
606   i += adsp2100.m[mreg];
606   i += adsp->m[mreg];
607607   if (i < base) i += l;
608608   else if (i >= base + l) i -= l;
609   adsp2100.i[ireg] = i;
609   adsp->i[ireg] = i;
610610}
611611
612612
613INLINE UINT32 data_read_dag2(UINT32 op)
613INLINE UINT32 data_read_dag2(adsp2100_state *adsp, UINT32 op)
614614{
615615   UINT32 ireg = 4 + ((op >> 2) & 3);
616616   UINT32 mreg = 4 + (op & 3);
617   UINT32 base = adsp2100.base[ireg];
618   UINT32 i = adsp2100.i[ireg];
619   UINT32 l = adsp2100.l[ireg];
617   UINT32 base = adsp->base[ireg];
618   UINT32 i = adsp->i[ireg];
619   UINT32 l = adsp->l[ireg];
620620
621621   UINT32 res = RWORD_DATA(i);
622622
623   i += adsp2100.m[mreg];
623   i += adsp->m[mreg];
624624   if (i < base) i += l;
625625   else if (i >= base + l) i -= l;
626   adsp2100.i[ireg] = i;
626   adsp->i[ireg] = i;
627627
628628   return res;
629629}
r3535r3536
632632    Program memory accessors
633633===========================================================================*/
634634
635INLINE void pgm_write_dag2(UINT32 op, INT32 val)
635INLINE void pgm_write_dag2(adsp2100_state *adsp, UINT32 op, INT32 val)
636636{
637637   UINT32 ireg = 4 + ((op >> 2) & 3);
638638   UINT32 mreg = 4 + (op & 3);
639   UINT32 base = adsp2100.base[ireg];
640   UINT32 i = adsp2100.i[ireg];
641   UINT32 l = adsp2100.l[ireg];
639   UINT32 base = adsp->base[ireg];
640   UINT32 i = adsp->i[ireg];
641   UINT32 l = adsp->l[ireg];
642642
643   WWORD_PGM(i, (val << 8) | adsp2100.px);
643   WWORD_PGM(i, (val << 8) | adsp->px);
644644
645   i += adsp2100.m[mreg];
645   i += adsp->m[mreg];
646646   if (i < base) i += l;
647647   else if (i >= base + l) i -= l;
648   adsp2100.i[ireg] = i;
648   adsp->i[ireg] = i;
649649}
650650
651651
652INLINE UINT32 pgm_read_dag2(UINT32 op)
652INLINE UINT32 pgm_read_dag2(adsp2100_state *adsp, UINT32 op)
653653{
654654   UINT32 ireg = 4 + ((op >> 2) & 3);
655655   UINT32 mreg = 4 + (op & 3);
656   UINT32 base = adsp2100.base[ireg];
657   UINT32 i = adsp2100.i[ireg];
658   UINT32 l = adsp2100.l[ireg];
656   UINT32 base = adsp->base[ireg];
657   UINT32 i = adsp->i[ireg];
658   UINT32 l = adsp->l[ireg];
659659   UINT32 res;
660660
661661   res = RWORD_PGM(i);
662   adsp2100.px = res;
662   adsp->px = res;
663663   res >>= 8;
664664
665   i += adsp2100.m[mreg];
665   i += adsp->m[mreg];
666666   if (i < base) i += l;
667667   else if (i >= base + l) i -= l;
668   adsp2100.i[ireg] = i;
668   adsp->i[ireg] = i;
669669
670670   return res;
671671}
r3535r3536
673673
674674
675675/*===========================================================================
676    ALU register reading
676    register reading
677677===========================================================================*/
678678
679#define ALU_GETXREG_UNSIGNED(x) (*(UINT16 *)alu_xregs[x])
680#define ALU_GETXREG_SIGNED(x)   (*( INT16 *)alu_xregs[x])
681#define ALU_GETYREG_UNSIGNED(y) (*(UINT16 *)alu_yregs[y])
682#define ALU_GETYREG_SIGNED(y)   (*( INT16 *)alu_yregs[y])
679#define ALU_GETXREG_UNSIGNED(a,x) (*(UINT16 *)(a)->alu_xregs[x])
680#define ALU_GETYREG_UNSIGNED(a,y) (*(UINT16 *)(a)->alu_yregs[y])
683681
684static const void *const alu_xregs[8] =
685{
686   &adsp2100.core.ax0,
687   &adsp2100.core.ax1,
688   &adsp2100.core.ar,
689   &adsp2100.core.mr.mrx.mr0,
690   &adsp2100.core.mr.mrx.mr1,
691   &adsp2100.core.mr.mrx.mr2,
692   &adsp2100.core.sr.srx.sr0,
693   &adsp2100.core.sr.srx.sr1
694};
682#define MAC_GETXREG_UNSIGNED(a,x) (*(UINT16 *)(a)->mac_xregs[x])
683#define MAC_GETXREG_SIGNED(a,x)   (*( INT16 *)(a)->mac_xregs[x])
684#define MAC_GETYREG_UNSIGNED(a,y) (*(UINT16 *)(a)->mac_yregs[y])
685#define MAC_GETYREG_SIGNED(a,y)   (*( INT16 *)(a)->mac_yregs[y])
695686
696static const void *const alu_yregs[4] =
697{
698   &adsp2100.core.ay0,
699   &adsp2100.core.ay1,
700   &adsp2100.core.af,
701   &adsp2100.core.zero
702};
687#define SHIFT_GETXREG_UNSIGNED(a,x) (*(UINT16 *)(a)->shift_xregs[x])
688#define SHIFT_GETXREG_SIGNED(a,x)   (*( INT16 *)(a)->shift_xregs[x])
703689
704690
705691
706692/*===========================================================================
707    MAC register reading
708===========================================================================*/
709
710#define MAC_GETXREG_UNSIGNED(x) (*(UINT16 *)mac_xregs[x])
711#define MAC_GETXREG_SIGNED(x)   (*( INT16 *)mac_xregs[x])
712#define MAC_GETYREG_UNSIGNED(y) (*(UINT16 *)mac_yregs[y])
713#define MAC_GETYREG_SIGNED(y)   (*( INT16 *)mac_yregs[y])
714
715static const void *const mac_xregs[8] =
716{
717   &adsp2100.core.mx0,
718   &adsp2100.core.mx1,
719   &adsp2100.core.ar,
720   &adsp2100.core.mr.mrx.mr0,
721   &adsp2100.core.mr.mrx.mr1,
722   &adsp2100.core.mr.mrx.mr2,
723   &adsp2100.core.sr.srx.sr0,
724   &adsp2100.core.sr.srx.sr1
725};
726
727static const void *const mac_yregs[4] =
728{
729   &adsp2100.core.my0,
730   &adsp2100.core.my1,
731   &adsp2100.core.mf,
732   &adsp2100.core.zero
733};
734
735
736
737/*===========================================================================
738    SHIFT register reading
739===========================================================================*/
740
741#define SHIFT_GETXREG_UNSIGNED(x) (*(UINT16 *)shift_xregs[x])
742#define SHIFT_GETXREG_SIGNED(x)   (*( INT16 *)shift_xregs[x])
743
744static const void *const shift_xregs[8] =
745{
746   &adsp2100.core.si,
747   &adsp2100.core.si,
748   &adsp2100.core.ar,
749   &adsp2100.core.mr.mrx.mr0,
750   &adsp2100.core.mr.mrx.mr1,
751   &adsp2100.core.mr.mrx.mr2,
752   &adsp2100.core.sr.srx.sr0,
753   &adsp2100.core.sr.srx.sr1
754};
755
756
757
758/*===========================================================================
759693    ALU operations (result in AR)
760694===========================================================================*/
761695
762static void alu_op_ar(int op)
696static void alu_op_ar(adsp2100_state *adsp, int op)
763697{
764698   INT32 xop = (op >> 8) & 7;
765699   INT32 yop = (op >> 11) & 3;
r3535r3536
769703   {
770704      case 0x00<<13:
771705         /* Y                Clear when y = 0 */
772         res = ALU_GETYREG_UNSIGNED(yop);
706         res = ALU_GETYREG_UNSIGNED(adsp, yop);
773707         CALC_NZ(res);
774708         break;
775709      case 0x01<<13:
776710         /* Y + 1            PASS 1 when y = 0 */
777         yop = ALU_GETYREG_UNSIGNED(yop);
711         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
778712         res = yop + 1;
779713         CALC_NZ(res);
780714         if (yop == 0x7fff) SET_V;
r3535r3536
782716         break;
783717      case 0x02<<13:
784718         /* X + Y + C */
785         xop = ALU_GETXREG_UNSIGNED(xop);
786         yop = ALU_GETYREG_UNSIGNED(yop);
719         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
720         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
787721         yop += GET_C >> 3;
788722         res = xop + yop;
789723         CALC_NZVC(xop, yop, res);
790724         break;
791725      case 0x03<<13:
792726         /* X + Y            X when y = 0 */
793         xop = ALU_GETXREG_UNSIGNED(xop);
794         yop = ALU_GETYREG_UNSIGNED(yop);
727         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
728         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
795729         res = xop + yop;
796730         CALC_NZVC(xop, yop, res);
797731         break;
798732      case 0x04<<13:
799733         /* NOT Y */
800         res = ALU_GETYREG_UNSIGNED(yop) ^ 0xffff;
734         res = ALU_GETYREG_UNSIGNED(adsp, yop) ^ 0xffff;
801735         CALC_NZ(res);
802736         break;
803737      case 0x05<<13:
804738         /* -Y */
805         yop = ALU_GETYREG_UNSIGNED(yop);
739         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
806740         res = -yop;
807741         CALC_NZ(res);
808742         if (yop == 0x8000) SET_V;
r3535r3536
810744         break;
811745      case 0x06<<13:
812746         /* X - Y + C - 1    X + C - 1 when y = 0 */
813         xop = ALU_GETXREG_UNSIGNED(xop);
814         yop = ALU_GETYREG_UNSIGNED(yop);
747         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
748         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
815749         res = xop - yop + (GET_C >> 3) - 1;
816750         CALC_NZVC_SUB(xop, yop, res);
817751         break;
818752      case 0x07<<13:
819753         /* X - Y */
820         xop = ALU_GETXREG_UNSIGNED(xop);
821         yop = ALU_GETYREG_UNSIGNED(yop);
754         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
755         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
822756         res = xop - yop;
823757         CALC_NZVC_SUB(xop, yop, res);
824758         break;
825759      case 0x08<<13:
826760         /* Y - 1            PASS -1 when y = 0 */
827         yop = ALU_GETYREG_UNSIGNED(yop);
761         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
828762         res = yop - 1;
829763         CALC_NZ(res);
830764         if (yop == 0x8000) SET_V;
r3535r3536
832766         break;
833767      case 0x09<<13:
834768         /* Y - X            -X when y = 0 */
835         xop = ALU_GETXREG_UNSIGNED(xop);
836         yop = ALU_GETYREG_UNSIGNED(yop);
769         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
770         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
837771         res = yop - xop;
838772         CALC_NZVC_SUB(yop, xop, res);
839773         break;
840774      case 0x0a<<13:
841775         /* Y - X + C - 1    -X + C - 1 when y = 0 */
842         xop = ALU_GETXREG_UNSIGNED(xop);
843         yop = ALU_GETYREG_UNSIGNED(yop);
776         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
777         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
844778         res = yop - xop + (GET_C >> 3) - 1;
845779         CALC_NZVC_SUB(yop, xop, res);
846780         break;
847781      case 0x0b<<13:
848782         /* NOT X */
849         res = ALU_GETXREG_UNSIGNED(xop) ^ 0xffff;
783         res = ALU_GETXREG_UNSIGNED(adsp, xop) ^ 0xffff;
850784         CALC_NZ(res);
851785         break;
852786      case 0x0c<<13:
853787         /* X AND Y */
854         xop = ALU_GETXREG_UNSIGNED(xop);
855         yop = ALU_GETYREG_UNSIGNED(yop);
788         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
789         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
856790         res = xop & yop;
857791         CALC_NZ(res);
858792         break;
859793      case 0x0d<<13:
860794         /* X OR Y */
861         xop = ALU_GETXREG_UNSIGNED(xop);
862         yop = ALU_GETYREG_UNSIGNED(yop);
795         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
796         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
863797         res = xop | yop;
864798         CALC_NZ(res);
865799         break;
866800      case 0x0e<<13:
867801         /* X XOR Y */
868         xop = ALU_GETXREG_UNSIGNED(xop);
869         yop = ALU_GETYREG_UNSIGNED(yop);
802         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
803         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
870804         res = xop ^ yop;
871805         CALC_NZ(res);
872806         break;
873807      case 0x0f<<13:
874808         /* ABS X */
875         xop = ALU_GETXREG_UNSIGNED(xop);
809         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
876810         res = (xop & 0x8000) ? -xop : xop;
877811         if (xop == 0) SET_Z;
878812         if (xop == 0x8000) SET_N, SET_V;
r3535r3536
885819   }
886820
887821   /* saturate */
888   if ((adsp2100.mstat & MSTAT_SATURATE) && GET_V) res = GET_C ? -32768 : 32767;
822   if ((adsp->mstat & MSTAT_SATURATE) && GET_V) res = GET_C ? -32768 : 32767;
889823
890824   /* set the final value */
891   adsp2100.core.ar.u = res;
825   adsp->core.ar.u = res;
892826}
893827
894828
r3535r3536
897831    ALU operations (result in AR, constant yop)
898832===========================================================================*/
899833
900static void alu_op_ar_const(int op)
834static void alu_op_ar_const(adsp2100_state *adsp, int op)
901835{
902836   INT32 xop = (op >> 8) & 7;
903837   INT32 yop = constants[((op >> 5) & 0x07) | ((op >> 8) & 0x18)];
r3535r3536
919853         break;
920854      case 0x02<<13:
921855         /* X + Y + C */
922         xop = ALU_GETXREG_UNSIGNED(xop);
856         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
923857         yop += GET_C >> 3;
924858         res = xop + yop;
925859         CALC_NZVC(xop, yop, res);
926860         break;
927861      case 0x03<<13:
928862         /* X + Y            X when y = 0 */
929         xop = ALU_GETXREG_UNSIGNED(xop);
863         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
930864         res = xop + yop;
931865         CALC_NZVC(xop, yop, res);
932866         break;
r3535r3536
944878         break;
945879      case 0x06<<13:
946880         /* X - Y + C - 1    X + C - 1 when y = 0 */
947         xop = ALU_GETXREG_UNSIGNED(xop);
881         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
948882         res = xop - yop + (GET_C >> 3) - 1;
949883         CALC_NZVC_SUB(xop, yop, res);
950884         break;
951885      case 0x07<<13:
952886         /* X - Y */
953         xop = ALU_GETXREG_UNSIGNED(xop);
887         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
954888         res = xop - yop;
955889         CALC_NZVC_SUB(xop, yop, res);
956890         break;
r3535r3536
963897         break;
964898      case 0x09<<13:
965899         /* Y - X            -X when y = 0 */
966         xop = ALU_GETXREG_UNSIGNED(xop);
900         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
967901         res = yop - xop;
968902         CALC_NZVC_SUB(yop, xop, res);
969903         break;
970904      case 0x0a<<13:
971905         /* Y - X + C - 1    -X + C - 1 when y = 0 */
972         xop = ALU_GETXREG_UNSIGNED(xop);
906         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
973907         res = yop - xop + (GET_C >> 3) - 1;
974908         CALC_NZVC_SUB(yop, xop, res);
975909         break;
976910      case 0x0b<<13:
977911         /* NOT X */
978         res = ALU_GETXREG_UNSIGNED(xop) ^ 0xffff;
912         res = ALU_GETXREG_UNSIGNED(adsp, xop) ^ 0xffff;
979913         CALC_NZ(res);
980914         break;
981915      case 0x0c<<13:
982916         /* X AND Y */
983         xop = ALU_GETXREG_UNSIGNED(xop);
917         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
984918         res = xop & yop;
985919         CALC_NZ(res);
986920         break;
987921      case 0x0d<<13:
988922         /* X OR Y */
989         xop = ALU_GETXREG_UNSIGNED(xop);
923         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
990924         res = xop | yop;
991925         CALC_NZ(res);
992926         break;
993927      case 0x0e<<13:
994928         /* X XOR Y */
995         xop = ALU_GETXREG_UNSIGNED(xop);
929         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
996930         res = xop ^ yop;
997931         CALC_NZ(res);
998932         break;
999933      case 0x0f<<13:
1000934         /* ABS X */
1001         xop = ALU_GETXREG_UNSIGNED(xop);
935         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1002936         res = (xop & 0x8000) ? -xop : xop;
1003937         if (xop == 0) SET_Z;
1004938         if (xop == 0x8000) SET_N, SET_V;
r3535r3536
1011945   }
1012946
1013947   /* saturate */
1014   if ((adsp2100.mstat & MSTAT_SATURATE) && GET_V) res = GET_C ? -32768 : 32767;
948   if ((adsp->mstat & MSTAT_SATURATE) && GET_V) res = GET_C ? -32768 : 32767;
1015949
1016950   /* set the final value */
1017   adsp2100.core.ar.u = res;
951   adsp->core.ar.u = res;
1018952}
1019953
1020954
r3535r3536
1023957    ALU operations (result in AF)
1024958===========================================================================*/
1025959
1026static void alu_op_af(int op)
960static void alu_op_af(adsp2100_state *adsp, int op)
1027961{
1028962   INT32 xop = (op >> 8) & 7;
1029963   INT32 yop = (op >> 11) & 3;
r3535r3536
1033967   {
1034968      case 0x00<<13:
1035969         /* Y                Clear when y = 0 */
1036         res = ALU_GETYREG_UNSIGNED(yop);
970         res = ALU_GETYREG_UNSIGNED(adsp, yop);
1037971         CALC_NZ(res);
1038972         break;
1039973      case 0x01<<13:
1040974         /* Y + 1            PASS 1 when y = 0 */
1041         yop = ALU_GETYREG_UNSIGNED(yop);
975         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
1042976         res = yop + 1;
1043977         CALC_NZ(res);
1044978         if (yop == 0x7fff) SET_V;
r3535r3536
1046980         break;
1047981      case 0x02<<13:
1048982         /* X + Y + C */
1049         xop = ALU_GETXREG_UNSIGNED(xop);
1050         yop = ALU_GETYREG_UNSIGNED(yop);
983         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
984         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
1051985         yop += GET_C >> 3;
1052986         res = xop + yop;
1053987         CALC_NZVC(xop, yop, res);
1054988         break;
1055989      case 0x03<<13:
1056990         /* X + Y            X when y = 0 */
1057         xop = ALU_GETXREG_UNSIGNED(xop);
1058         yop = ALU_GETYREG_UNSIGNED(yop);
991         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
992         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
1059993         res = xop + yop;
1060994         CALC_NZVC(xop, yop, res);
1061995         break;
1062996      case 0x04<<13:
1063997         /* NOT Y */
1064         res = ALU_GETYREG_UNSIGNED(yop) ^ 0xffff;
998         res = ALU_GETYREG_UNSIGNED(adsp, yop) ^ 0xffff;
1065999         CALC_NZ(res);
10661000         break;
10671001      case 0x05<<13:
10681002         /* -Y */
1069         yop = ALU_GETYREG_UNSIGNED(yop);
1003         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
10701004         res = -yop;
10711005         CALC_NZ(res);
10721006         if (yop == 0x8000) SET_V;
r3535r3536
10741008         break;
10751009      case 0x06<<13:
10761010         /* X - Y + C - 1    X + C - 1 when y = 0 */
1077         xop = ALU_GETXREG_UNSIGNED(xop);
1078         yop = ALU_GETYREG_UNSIGNED(yop);
1011         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1012         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
10791013         res = xop - yop + (GET_C >> 3) - 1;
10801014         CALC_NZVC_SUB(xop, yop, res);
10811015         break;
10821016      case 0x07<<13:
10831017         /* X - Y */
1084         xop = ALU_GETXREG_UNSIGNED(xop);
1085         yop = ALU_GETYREG_UNSIGNED(yop);
1018         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1019         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
10861020         res = xop - yop;
10871021         CALC_NZVC_SUB(xop, yop, res);
10881022         break;
10891023      case 0x08<<13:
10901024         /* Y - 1            PASS -1 when y = 0 */
1091         yop = ALU_GETYREG_UNSIGNED(yop);
1025         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
10921026         res = yop - 1;
10931027         CALC_NZ(res);
10941028         if (yop == 0x8000) SET_V;
r3535r3536
10961030         break;
10971031      case 0x09<<13:
10981032         /* Y - X            -X when y = 0 */
1099         xop = ALU_GETXREG_UNSIGNED(xop);
1100         yop = ALU_GETYREG_UNSIGNED(yop);
1033         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1034         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
11011035         res = yop - xop;
11021036         CALC_NZVC_SUB(yop, xop, res);
11031037         break;
11041038      case 0x0a<<13:
11051039         /* Y - X + C - 1    -X + C - 1 when y = 0 */
1106         xop = ALU_GETXREG_UNSIGNED(xop);
1107         yop = ALU_GETYREG_UNSIGNED(yop);
1040         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1041         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
11081042         res = yop - xop + (GET_C >> 3) - 1;
11091043         CALC_NZVC_SUB(yop, xop, res);
11101044         break;
11111045      case 0x0b<<13:
11121046         /* NOT X */
1113         res = ALU_GETXREG_UNSIGNED(xop) ^ 0xffff;
1047         res = ALU_GETXREG_UNSIGNED(adsp, xop) ^ 0xffff;
11141048         CALC_NZ(res);
11151049         break;
11161050      case 0x0c<<13:
11171051         /* X AND Y */
1118         xop = ALU_GETXREG_UNSIGNED(xop);
1119         yop = ALU_GETYREG_UNSIGNED(yop);
1052         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1053         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
11201054         res = xop & yop;
11211055         CALC_NZ(res);
11221056         break;
11231057      case 0x0d<<13:
11241058         /* X OR Y */
1125         xop = ALU_GETXREG_UNSIGNED(xop);
1126         yop = ALU_GETYREG_UNSIGNED(yop);
1059         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1060         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
11271061         res = xop | yop;
11281062         CALC_NZ(res);
11291063         break;
11301064      case 0x0e<<13:
11311065         /* X XOR Y */
1132         xop = ALU_GETXREG_UNSIGNED(xop);
1133         yop = ALU_GETYREG_UNSIGNED(yop);
1066         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1067         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
11341068         res = xop ^ yop;
11351069         CALC_NZ(res);
11361070         break;
11371071      case 0x0f<<13:
11381072         /* ABS X */
1139         xop = ALU_GETXREG_UNSIGNED(xop);
1073         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
11401074         res = (xop & 0x8000) ? -xop : xop;
11411075         if (xop == 0) SET_Z;
11421076         if (xop == 0x8000) SET_N, SET_V;
r3535r3536
11491083   }
11501084
11511085   /* set the final value */
1152   adsp2100.core.af.u = res;
1086   adsp->core.af.u = res;
11531087}
11541088
11551089
r3535r3536
11581092    ALU operations (result in AF, constant yop)
11591093===========================================================================*/
11601094
1161static void alu_op_af_const(int op)
1095static void alu_op_af_const(adsp2100_state *adsp, int op)
11621096{
11631097   INT32 xop = (op >> 8) & 7;
11641098   INT32 yop = constants[((op >> 5) & 0x07) | ((op >> 8) & 0x18)];
r3535r3536
11801114         break;
11811115      case 0x02<<13:
11821116         /* X + Y + C */
1183         xop = ALU_GETXREG_UNSIGNED(xop);
1117         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
11841118         yop += GET_C >> 3;
11851119         res = xop + yop;
11861120         CALC_NZVC(xop, yop, res);
11871121         break;
11881122      case 0x03<<13:
11891123         /* X + Y            X when y = 0 */
1190         xop = ALU_GETXREG_UNSIGNED(xop);
1124         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
11911125         res = xop + yop;
11921126         CALC_NZVC(xop, yop, res);
11931127         break;
r3535r3536
12051139         break;
12061140      case 0x06<<13:
12071141         /* X - Y + C - 1    X + C - 1 when y = 0 */
1208         xop = ALU_GETXREG_UNSIGNED(xop);
1142         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
12091143         res = xop - yop + (GET_C >> 3) - 1;
12101144         CALC_NZVC_SUB(xop, yop, res);
12111145         break;
12121146      case 0x07<<13:
12131147         /* X - Y */
1214         xop = ALU_GETXREG_UNSIGNED(xop);
1148         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
12151149         res = xop - yop;
12161150         CALC_NZVC_SUB(xop, yop, res);
12171151         break;
r3535r3536
12241158         break;
12251159      case 0x09<<13:
12261160         /* Y - X            -X when y = 0 */
1227         xop = ALU_GETXREG_UNSIGNED(xop);
1161         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
12281162         res = yop - xop;
12291163         CALC_NZVC_SUB(yop, xop, res);
12301164         break;
12311165      case 0x0a<<13:
12321166         /* Y - X + C - 1    -X + C - 1 when y = 0 */
1233         xop = ALU_GETXREG_UNSIGNED(xop);
1167         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
12341168         res = yop - xop + (GET_C >> 3) - 1;
12351169         CALC_NZVC_SUB(yop, xop, res);
12361170         break;
12371171      case 0x0b<<13:
12381172         /* NOT X */
1239         res = ALU_GETXREG_UNSIGNED(xop) ^ 0xffff;
1173         res = ALU_GETXREG_UNSIGNED(adsp, xop) ^ 0xffff;
12401174         CALC_NZ(res);
12411175         break;
12421176      case 0x0c<<13:
12431177         /* X AND Y */
1244         xop = ALU_GETXREG_UNSIGNED(xop);
1178         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
12451179         res = xop & yop;
12461180         CALC_NZ(res);
12471181         break;
12481182      case 0x0d<<13:
12491183         /* X OR Y */
1250         xop = ALU_GETXREG_UNSIGNED(xop);
1184         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
12511185         res = xop | yop;
12521186         CALC_NZ(res);
12531187         break;
12541188      case 0x0e<<13:
12551189         /* X XOR Y */
1256         xop = ALU_GETXREG_UNSIGNED(xop);
1190         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
12571191         res = xop ^ yop;
12581192         CALC_NZ(res);
12591193         break;
12601194      case 0x0f<<13:
12611195         /* ABS X */
1262         xop = ALU_GETXREG_UNSIGNED(xop);
1196         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
12631197         res = (xop & 0x8000) ? -xop : xop;
12641198         if (xop == 0) SET_Z;
12651199         if (xop == 0x8000) SET_N, SET_V;
r3535r3536
12721206   }
12731207
12741208   /* set the final value */
1275   adsp2100.core.af.u = res;
1209   adsp->core.af.u = res;
12761210}
12771211
12781212
r3535r3536
12811215    ALU operations (no result)
12821216===========================================================================*/
12831217
1284static void alu_op_none(int op)
1218static void alu_op_none(adsp2100_state *adsp, int op)
12851219{
12861220   INT32 xop = (op >> 8) & 7;
12871221   INT32 yop = (op >> 11) & 3;
r3535r3536
12911225   {
12921226      case 0x00<<13:
12931227         /* Y                Clear when y = 0 */
1294         res = ALU_GETYREG_UNSIGNED(yop);
1228         res = ALU_GETYREG_UNSIGNED(adsp, yop);
12951229         CALC_NZ(res);
12961230         break;
12971231      case 0x01<<13:
12981232         /* Y + 1            PASS 1 when y = 0 */
1299         yop = ALU_GETYREG_UNSIGNED(yop);
1233         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
13001234         res = yop + 1;
13011235         CALC_NZ(res);
13021236         if (yop == 0x7fff) SET_V;
r3535r3536
13041238         break;
13051239      case 0x02<<13:
13061240         /* X + Y + C */
1307         xop = ALU_GETXREG_UNSIGNED(xop);
1308         yop = ALU_GETYREG_UNSIGNED(yop);
1241         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1242         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
13091243         yop += GET_C >> 3;
13101244         res = xop + yop;
13111245         CALC_NZVC(xop, yop, res);
13121246         break;
13131247      case 0x03<<13:
13141248         /* X + Y            X when y = 0 */
1315         xop = ALU_GETXREG_UNSIGNED(xop);
1316         yop = ALU_GETYREG_UNSIGNED(yop);
1249         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1250         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
13171251         res = xop + yop;
13181252         CALC_NZVC(xop, yop, res);
13191253         break;
13201254      case 0x04<<13:
13211255         /* NOT Y */
1322         res = ALU_GETYREG_UNSIGNED(yop) ^ 0xffff;
1256         res = ALU_GETYREG_UNSIGNED(adsp, yop) ^ 0xffff;
13231257         CALC_NZ(res);
13241258         break;
13251259      case 0x05<<13:
13261260         /* -Y */
1327         yop = ALU_GETYREG_UNSIGNED(yop);
1261         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
13281262         res = -yop;
13291263         CALC_NZ(res);
13301264         if (yop == 0x8000) SET_V;
r3535r3536
13321266         break;
13331267      case 0x06<<13:
13341268         /* X - Y + C - 1    X + C - 1 when y = 0 */
1335         xop = ALU_GETXREG_UNSIGNED(xop);
1336         yop = ALU_GETYREG_UNSIGNED(yop);
1269         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1270         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
13371271         res = xop - yop + (GET_C >> 3) - 1;
13381272         CALC_NZVC_SUB(xop, yop, res);
13391273         break;
13401274      case 0x07<<13:
13411275         /* X - Y */
1342         xop = ALU_GETXREG_UNSIGNED(xop);
1343         yop = ALU_GETYREG_UNSIGNED(yop);
1276         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1277         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
13441278         res = xop - yop;
13451279         CALC_NZVC_SUB(xop, yop, res);
13461280         break;
13471281      case 0x08<<13:
13481282         /* Y - 1            PASS -1 when y = 0 */
1349         yop = ALU_GETYREG_UNSIGNED(yop);
1283         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
13501284         res = yop - 1;
13511285         CALC_NZ(res);
13521286         if (yop == 0x8000) SET_V;
r3535r3536
13541288         break;
13551289      case 0x09<<13:
13561290         /* Y - X            -X when y = 0 */
1357         xop = ALU_GETXREG_UNSIGNED(xop);
1358         yop = ALU_GETYREG_UNSIGNED(yop);
1291         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1292         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
13591293         res = yop - xop;
13601294         CALC_NZVC_SUB(yop, xop, res);
13611295         break;
13621296      case 0x0a<<13:
13631297         /* Y - X + C - 1    -X + C - 1 when y = 0 */
1364         xop = ALU_GETXREG_UNSIGNED(xop);
1365         yop = ALU_GETYREG_UNSIGNED(yop);
1298         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1299         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
13661300         res = yop - xop + (GET_C >> 3) - 1;
13671301         CALC_NZVC_SUB(yop, xop, res);
13681302         break;
13691303      case 0x0b<<13:
13701304         /* NOT X */
1371         res = ALU_GETXREG_UNSIGNED(xop) ^ 0xffff;
1305         res = ALU_GETXREG_UNSIGNED(adsp, xop) ^ 0xffff;
13721306         CALC_NZ(res);
13731307         break;
13741308      case 0x0c<<13:
13751309         /* X AND Y */
1376         xop = ALU_GETXREG_UNSIGNED(xop);
1377         yop = ALU_GETYREG_UNSIGNED(yop);
1310         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1311         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
13781312         res = xop & yop;
13791313         CALC_NZ(res);
13801314         break;
13811315      case 0x0d<<13:
13821316         /* X OR Y */
1383         xop = ALU_GETXREG_UNSIGNED(xop);
1384         yop = ALU_GETYREG_UNSIGNED(yop);
1317         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1318         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
13851319         res = xop | yop;
13861320         CALC_NZ(res);
13871321         break;
13881322      case 0x0e<<13:
13891323         /* X XOR Y */
1390         xop = ALU_GETXREG_UNSIGNED(xop);
1391         yop = ALU_GETYREG_UNSIGNED(yop);
1324         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1325         yop = ALU_GETYREG_UNSIGNED(adsp, yop);
13921326         res = xop ^ yop;
13931327         CALC_NZ(res);
13941328         break;
13951329      case 0x0f<<13:
13961330         /* ABS X */
1397         xop = ALU_GETXREG_UNSIGNED(xop);
1331         xop = ALU_GETXREG_UNSIGNED(adsp, xop);
13981332         res = (xop & 0x8000) ? -xop : xop;
13991333         if (xop == 0) SET_Z;
14001334         if (xop == 0x8000) SET_N, SET_V;
r3535r3536
14101344    MAC operations (result in MR)
14111345===========================================================================*/
14121346
1413static void mac_op_mr(int op)
1347static void mac_op_mr(adsp2100_state *adsp, int op)
14141348{
1415   INT8 shift = ((adsp2100.mstat & MSTAT_INTEGER) >> 4) ^ 1;
1349   INT8 shift = ((adsp->mstat & MSTAT_INTEGER) >> 4) ^ 1;
14161350   INT32 xop = (op >> 8) & 7;
14171351   INT32 yop = (op >> 11) & 3;
14181352   INT32 temp;
r3535r3536
14251359         return;
14261360      case 0x01<<13:
14271361         /* X * Y (RND) */
1428         xop = MAC_GETXREG_SIGNED(xop);
1429         yop = MAC_GETYREG_SIGNED(yop);
1362         xop = MAC_GETXREG_SIGNED(adsp, xop);
1363         yop = MAC_GETYREG_SIGNED(adsp, yop);
14301364         temp = (xop * yop) << shift;
14311365         res = (INT64)temp;
14321366#if 0
r3535r3536
14411375         break;
14421376      case 0x02<<13:
14431377         /* MR + X * Y (RND) */
1444         xop = MAC_GETXREG_SIGNED(xop);
1445         yop = MAC_GETYREG_SIGNED(yop);
1378         xop = MAC_GETXREG_SIGNED(adsp, xop);
1379         yop = MAC_GETYREG_SIGNED(adsp, yop);
14461380         temp = (xop * yop) << shift;
1447         res = adsp2100.core.mr.mr + (INT64)temp;
1381         res = adsp->core.mr.mr + (INT64)temp;
14481382#if 0
14491383         if ((res & 0xffff) == 0x8000) res &= ~((UINT64)0x10000);
14501384         else res += (res & 0x8000) << 1;
r3535r3536
14571391         break;
14581392      case 0x03<<13:
14591393         /* MR - X * Y (RND) */
1460         xop = MAC_GETXREG_SIGNED(xop);
1461         yop = MAC_GETYREG_SIGNED(yop);
1394         xop = MAC_GETXREG_SIGNED(adsp, xop);
1395         yop = MAC_GETYREG_SIGNED(adsp, yop);
14621396         temp = (xop * yop) << shift;
1463         res = adsp2100.core.mr.mr - (INT64)temp;
1397         res = adsp->core.mr.mr - (INT64)temp;
14641398#if 0
14651399         if ((res & 0xffff) == 0x8000) res &= ~((UINT64)0x10000);
14661400         else res += (res & 0x8000) << 1;
r3535r3536
14731407         break;
14741408      case 0x04<<13:
14751409         /* X * Y (SS)       Clear when y = 0 */
1476         xop = MAC_GETXREG_SIGNED(xop);
1477         yop = MAC_GETYREG_SIGNED(yop);
1410         xop = MAC_GETXREG_SIGNED(adsp, xop);
1411         yop = MAC_GETYREG_SIGNED(adsp, yop);
14781412         temp = (xop * yop) << shift;
14791413         res = (INT64)temp;
14801414         break;
14811415      case 0x05<<13:
14821416         /* X * Y (SU) */
1483         xop = MAC_GETXREG_SIGNED(xop);
1484         yop = MAC_GETYREG_UNSIGNED(yop);
1417         xop = MAC_GETXREG_SIGNED(adsp, xop);
1418         yop = MAC_GETYREG_UNSIGNED(adsp, yop);
14851419         temp = (xop * yop) << shift;
14861420         res = (INT64)temp;
14871421         break;
14881422      case 0x06<<13:
14891423         /* X * Y (US) */
1490         xop = MAC_GETXREG_UNSIGNED(xop);
1491         yop = MAC_GETYREG_SIGNED(yop);
1424         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
1425         yop = MAC_GETYREG_SIGNED(adsp, yop);
14921426         temp = (xop * yop) << shift;
14931427         res = (INT64)temp;
14941428         break;
14951429      case 0x07<<13:
14961430         /* X * Y (UU) */
1497         xop = MAC_GETXREG_UNSIGNED(xop);
1498         yop = MAC_GETYREG_UNSIGNED(yop);
1431         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
1432         yop = MAC_GETYREG_UNSIGNED(adsp, yop);
14991433         temp = (xop * yop) << shift;
15001434         res = (INT64)temp;
15011435         break;
15021436      case 0x08<<13:
15031437         /* MR + X * Y (SS) */
1504         xop = MAC_GETXREG_SIGNED(xop);
1505         yop = MAC_GETYREG_SIGNED(yop);
1438         xop = MAC_GETXREG_SIGNED(adsp, xop);
1439         yop = MAC_GETYREG_SIGNED(adsp, yop);
15061440         temp = (xop * yop) << shift;
1507         res = adsp2100.core.mr.mr + (INT64)temp;
1441         res = adsp->core.mr.mr + (INT64)temp;
15081442         break;
15091443      case 0x09<<13:
15101444         /* MR + X * Y (SU) */
1511         xop = MAC_GETXREG_SIGNED(xop);
1512         yop = MAC_GETYREG_UNSIGNED(yop);
1445         xop = MAC_GETXREG_SIGNED(adsp, xop);
1446         yop = MAC_GETYREG_UNSIGNED(adsp, yop);
15131447         temp = (xop * yop) << shift;
1514         res = adsp2100.core.mr.mr + (INT64)temp;
1448         res = adsp->core.mr.mr + (INT64)temp;
15151449         break;
15161450      case 0x0a<<13:
15171451         /* MR + X * Y (US) */
1518         xop = MAC_GETXREG_UNSIGNED(xop);
1519         yop = MAC_GETYREG_SIGNED(yop);
1452         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
1453         yop = MAC_GETYREG_SIGNED(adsp, yop);
15201454         temp = (xop * yop) << shift;
1521         res = adsp2100.core.mr.mr + (INT64)temp;
1455         res = adsp->core.mr.mr + (INT64)temp;
15221456         break;
15231457      case 0x0b<<13:
15241458         /* MR + X * Y (UU) */
1525         xop = MAC_GETXREG_UNSIGNED(xop);
1526         yop = MAC_GETYREG_UNSIGNED(yop);
1459         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
1460         yop = MAC_GETYREG_UNSIGNED(adsp, yop);
15271461         temp = (xop * yop) << shift;
1528         res = adsp2100.core.mr.mr + (INT64)temp;
1462         res = adsp->core.mr.mr + (INT64)temp;
15291463         break;
15301464      case 0x0c<<13:
15311465         /* MR - X * Y (SS) */
1532         xop = MAC_GETXREG_SIGNED(xop);
1533         yop = MAC_GETYREG_SIGNED(yop);
1466         xop = MAC_GETXREG_SIGNED(adsp, xop);
1467         yop = MAC_GETYREG_SIGNED(adsp, yop);
15341468         temp = (xop * yop) << shift;
1535         res = adsp2100.core.mr.mr - (INT64)temp;
1469         res = adsp->core.mr.mr - (INT64)temp;
15361470         break;
15371471      case 0x0d<<13:
15381472         /* MR - X * Y (SU) */
1539         xop = MAC_GETXREG_SIGNED(xop);
1540         yop = MAC_GETYREG_UNSIGNED(yop);
1473         xop = MAC_GETXREG_SIGNED(adsp, xop);
1474         yop = MAC_GETYREG_UNSIGNED(adsp, yop);
15411475         temp = (xop * yop) << shift;
1542         res = adsp2100.core.mr.mr - (INT64)temp;
1476         res = adsp->core.mr.mr - (INT64)temp;
15431477         break;
15441478      case 0x0e<<13:
15451479         /* MR - X * Y (US) */
1546         xop = MAC_GETXREG_UNSIGNED(xop);
1547         yop = MAC_GETYREG_SIGNED(yop);
1480         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
1481         yop = MAC_GETYREG_SIGNED(adsp, yop);
15481482         temp = (xop * yop) << shift;
1549         res = adsp2100.core.mr.mr - (INT64)temp;
1483         res = adsp->core.mr.mr - (INT64)temp;
15501484         break;
15511485      case 0x0f<<13:
15521486         /* MR - X * Y (UU) */
1553         xop = MAC_GETXREG_UNSIGNED(xop);
1554         yop = MAC_GETYREG_UNSIGNED(yop);
1487         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
1488         yop = MAC_GETYREG_UNSIGNED(adsp, yop);
15551489         temp = (xop * yop) << shift;
1556         res = adsp2100.core.mr.mr - (INT64)temp;
1490         res = adsp->core.mr.mr - (INT64)temp;
15571491         break;
15581492      default:
15591493         res = 0;   /* just to keep the compiler happy */
r3535r3536
15641498   temp = (res >> 31) & 0x1ff;
15651499   CLR_MV;
15661500   if (temp != 0x000 && temp != 0x1ff) SET_MV;
1567   adsp2100.core.mr.mr = res;
1501   adsp->core.mr.mr = res;
15681502}
15691503
15701504
r3535r3536
15731507    MAC operations (result in MR, yop == xop)
15741508===========================================================================*/
15751509
1576static void mac_op_mr_xop(int op)
1510static void mac_op_mr_xop(adsp2100_state *adsp, int op)
15771511{
1578   INT8 shift = ((adsp2100.mstat & MSTAT_INTEGER) >> 4) ^ 1;
1512   INT8 shift = ((adsp->mstat & MSTAT_INTEGER) >> 4) ^ 1;
15791513   INT32 xop = (op >> 8) & 7;
15801514   INT32 temp;
15811515   INT64 res;
r3535r3536
15871521         return;
15881522      case 0x01<<13:
15891523         /* X * Y (RND) */
1590         xop = MAC_GETXREG_SIGNED(xop);
1524         xop = MAC_GETXREG_SIGNED(adsp, xop);
15911525         temp = (xop * xop) << shift;
15921526         res = (INT64)temp;
15931527#if 0
r3535r3536
16021536         break;
16031537      case 0x02<<13:
16041538         /* MR + X * Y (RND) */
1605         xop = MAC_GETXREG_SIGNED(xop);
1539         xop = MAC_GETXREG_SIGNED(adsp, xop);
16061540         temp = (xop * xop) << shift;
1607         res = adsp2100.core.mr.mr + (INT64)temp;
1541         res = adsp->core.mr.mr + (INT64)temp;
16081542#if 0
16091543         if ((res & 0xffff) == 0x8000) res &= ~((UINT64)0x10000);
16101544         else res += (res & 0x8000) << 1;
r3535r3536
16171551         break;
16181552      case 0x03<<13:
16191553         /* MR - X * Y (RND) */
1620         xop = MAC_GETXREG_SIGNED(xop);
1554         xop = MAC_GETXREG_SIGNED(adsp, xop);
16211555         temp = (xop * xop) << shift;
1622         res = adsp2100.core.mr.mr - (INT64)temp;
1556         res = adsp->core.mr.mr - (INT64)temp;
16231557#if 0
16241558         if ((res & 0xffff) == 0x8000) res &= ~((UINT64)0x10000);
16251559         else res += (res & 0x8000) << 1;
r3535r3536
16321566         break;
16331567      case 0x04<<13:
16341568         /* X * Y (SS)       Clear when y = 0 */
1635         xop = MAC_GETXREG_SIGNED(xop);
1569         xop = MAC_GETXREG_SIGNED(adsp, xop);
16361570         temp = (xop * xop) << shift;
16371571         res = (INT64)temp;
16381572         break;
16391573      case 0x05<<13:
16401574         /* X * Y (SU) */
1641         xop = MAC_GETXREG_SIGNED(xop);
1575         xop = MAC_GETXREG_SIGNED(adsp, xop);
16421576         temp = (xop * xop) << shift;
16431577         res = (INT64)temp;
16441578         break;
16451579      case 0x06<<13:
16461580         /* X * Y (US) */
1647         xop = MAC_GETXREG_UNSIGNED(xop);
1581         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
16481582         temp = (xop * xop) << shift;
16491583         res = (INT64)temp;
16501584         break;
16511585      case 0x07<<13:
16521586         /* X * Y (UU) */
1653         xop = MAC_GETXREG_UNSIGNED(xop);
1587         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
16541588         temp = (xop * xop) << shift;
16551589         res = (INT64)temp;
16561590         break;
16571591      case 0x08<<13:
16581592         /* MR + X * Y (SS) */
1659         xop = MAC_GETXREG_SIGNED(xop);
1593         xop = MAC_GETXREG_SIGNED(adsp, xop);
16601594         temp = (xop * xop) << shift;
1661         res = adsp2100.core.mr.mr + (INT64)temp;
1595         res = adsp->core.mr.mr + (INT64)temp;
16621596         break;
16631597      case 0x09<<13:
16641598         /* MR + X * Y (SU) */
1665         xop = MAC_GETXREG_SIGNED(xop);
1599         xop = MAC_GETXREG_SIGNED(adsp, xop);
16661600         temp = (xop * xop) << shift;
1667         res = adsp2100.core.mr.mr + (INT64)temp;
1601         res = adsp->core.mr.mr + (INT64)temp;
16681602         break;
16691603      case 0x0a<<13:
16701604         /* MR + X * Y (US) */
1671         xop = MAC_GETXREG_UNSIGNED(xop);
1605         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
16721606         temp = (xop * xop) << shift;
1673         res = adsp2100.core.mr.mr + (INT64)temp;
1607         res = adsp->core.mr.mr + (INT64)temp;
16741608         break;
16751609      case 0x0b<<13:
16761610         /* MR + X * Y (UU) */
1677         xop = MAC_GETXREG_UNSIGNED(xop);
1611         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
16781612         temp = (xop * xop) << shift;
1679         res = adsp2100.core.mr.mr + (INT64)temp;
1613         res = adsp->core.mr.mr + (INT64)temp;
16801614         break;
16811615      case 0x0c<<13:
16821616         /* MR - X * Y (SS) */
1683         xop = MAC_GETXREG_SIGNED(xop);
1617         xop = MAC_GETXREG_SIGNED(adsp, xop);
16841618         temp = (xop * xop) << shift;
1685         res = adsp2100.core.mr.mr - (INT64)temp;
1619         res = adsp->core.mr.mr - (INT64)temp;
16861620         break;
16871621      case 0x0d<<13:
16881622         /* MR - X * Y (SU) */
1689         xop = MAC_GETXREG_SIGNED(xop);
1623         xop = MAC_GETXREG_SIGNED(adsp, xop);
16901624         temp = (xop * xop) << shift;
1691         res = adsp2100.core.mr.mr - (INT64)temp;
1625         res = adsp->core.mr.mr - (INT64)temp;
16921626         break;
16931627      case 0x0e<<13:
16941628         /* MR - X * Y (US) */
1695         xop = MAC_GETXREG_UNSIGNED(xop);
1629         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
16961630         temp = (xop * xop) << shift;
1697         res = adsp2100.core.mr.mr - (INT64)temp;
1631         res = adsp->core.mr.mr - (INT64)temp;
16981632         break;
16991633      case 0x0f<<13:
17001634         /* MR - X * Y (UU) */
1701         xop = MAC_GETXREG_UNSIGNED(xop);
1635         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
17021636         temp = (xop * xop) << shift;
1703         res = adsp2100.core.mr.mr - (INT64)temp;
1637         res = adsp->core.mr.mr - (INT64)temp;
17041638         break;
17051639      default:
17061640         res = 0;   /* just to keep the compiler happy */
r3535r3536
17111645   temp = (res >> 31) & 0x1ff;
17121646   CLR_MV;
17131647   if (temp != 0x000 && temp != 0x1ff) SET_MV;
1714   adsp2100.core.mr.mr = res;
1648   adsp->core.mr.mr = res;
17151649}
17161650
17171651
r3535r3536
17201654    MAC operations (result in MF)
17211655===========================================================================*/
17221656
1723static void mac_op_mf(int op)
1657static void mac_op_mf(adsp2100_state *adsp, int op)
17241658{
1725   INT8 shift = ((adsp2100.mstat & MSTAT_INTEGER) >> 4) ^ 1;
1659   INT8 shift = ((adsp->mstat & MSTAT_INTEGER) >> 4) ^ 1;
17261660   INT32 xop = (op >> 8) & 7;
17271661   INT32 yop = (op >> 11) & 3;
17281662   INT32 temp;
r3535r3536
17351669         return;
17361670      case 0x01<<13:
17371671         /* X * Y (RND) */
1738         xop = MAC_GETXREG_SIGNED(xop);
1739         yop = MAC_GETYREG_SIGNED(yop);
1672         xop = MAC_GETXREG_SIGNED(adsp, xop);
1673         yop = MAC_GETYREG_SIGNED(adsp, yop);
17401674         temp = (xop * yop) << shift;
17411675         res = (INT64)temp;
17421676#if 0
r3535r3536
17511685         break;
17521686      case 0x02<<13:
17531687         /* MR + X * Y (RND) */
1754         xop = MAC_GETXREG_SIGNED(xop);
1755         yop = MAC_GETYREG_SIGNED(yop);
1688         xop = MAC_GETXREG_SIGNED(adsp, xop);
1689         yop = MAC_GETYREG_SIGNED(adsp, yop);
17561690         temp = (xop * yop) << shift;
1757         res = adsp2100.core.mr.mr + (INT64)temp;
1691         res = adsp->core.mr.mr + (INT64)temp;
17581692#if 0
17591693         if ((res & 0xffff) == 0x8000) res &= ~((UINT64)0x10000);
17601694         else res += (res & 0x8000) << 1;
r3535r3536
17671701         break;
17681702      case 0x03<<13:
17691703         /* MR - X * Y (RND) */
1770         xop = MAC_GETXREG_SIGNED(xop);
1771         yop = MAC_GETYREG_SIGNED(yop);
1704         xop = MAC_GETXREG_SIGNED(adsp, xop);
1705         yop = MAC_GETYREG_SIGNED(adsp, yop);
17721706         temp = (xop * yop) << shift;
1773         res = adsp2100.core.mr.mr - (INT64)temp;
1707         res = adsp->core.mr.mr - (INT64)temp;
17741708#if 0
17751709         if ((res & 0xffff) == 0x8000) res &= ~((UINT64)0x10000);
17761710         else res += (res & 0x8000) << 1;
r3535r3536
17831717         break;
17841718      case 0x04<<13:
17851719         /* X * Y (SS)       Clear when y = 0 */
1786         xop = MAC_GETXREG_SIGNED(xop);
1787         yop = MAC_GETYREG_SIGNED(yop);
1720         xop = MAC_GETXREG_SIGNED(adsp, xop);
1721         yop = MAC_GETYREG_SIGNED(adsp, yop);
17881722         temp = (xop * yop) << shift;
17891723         res = (INT64)temp;
17901724         break;
17911725      case 0x05<<13:
17921726         /* X * Y (SU) */
1793         xop = MAC_GETXREG_SIGNED(xop);
1794         yop = MAC_GETYREG_UNSIGNED(yop);
1727         xop = MAC_GETXREG_SIGNED(adsp, xop);
1728         yop = MAC_GETYREG_UNSIGNED(adsp, yop);
17951729         temp = (xop * yop) << shift;
17961730         res = (INT64)temp;
17971731         break;
17981732      case 0x06<<13:
17991733         /* X * Y (US) */
1800         xop = MAC_GETXREG_UNSIGNED(xop);
1801         yop = MAC_GETYREG_SIGNED(yop);
1734         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
1735         yop = MAC_GETYREG_SIGNED(adsp, yop);
18021736         temp = (xop * yop) << shift;
18031737         res = (INT64)temp;
18041738         break;
18051739      case 0x07<<13:
18061740         /* X * Y (UU) */
1807         xop = MAC_GETXREG_UNSIGNED(xop);
1808         yop = MAC_GETYREG_UNSIGNED(yop);
1741         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
1742         yop = MAC_GETYREG_UNSIGNED(adsp, yop);
18091743         temp = (xop * yop) << shift;
18101744         res = (INT64)temp;
18111745         break;
18121746      case 0x08<<13:
18131747         /* MR + X * Y (SS) */
1814         xop = MAC_GETXREG_SIGNED(xop);
1815         yop = MAC_GETYREG_SIGNED(yop);
1748         xop = MAC_GETXREG_SIGNED(adsp, xop);
1749         yop = MAC_GETYREG_SIGNED(adsp, yop);
18161750         temp = (xop * yop) << shift;
1817         res = adsp2100.core.mr.mr + (INT64)temp;
1751         res = adsp->core.mr.mr + (INT64)temp;
18181752         break;
18191753      case 0x09<<13:
18201754         /* MR + X * Y (SU) */
1821         xop = MAC_GETXREG_SIGNED(xop);
1822         yop = MAC_GETYREG_UNSIGNED(yop);
1755         xop = MAC_GETXREG_SIGNED(adsp, xop);
1756         yop = MAC_GETYREG_UNSIGNED(adsp, yop);
18231757         temp = (xop * yop) << shift;
1824         res = adsp2100.core.mr.mr + (INT64)temp;
1758         res = adsp->core.mr.mr + (INT64)temp;
18251759         break;
18261760      case 0x0a<<13:
18271761         /* MR + X * Y (US) */
1828         xop = MAC_GETXREG_UNSIGNED(xop);
1829         yop = MAC_GETYREG_SIGNED(yop);
1762         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
1763         yop = MAC_GETYREG_SIGNED(adsp, yop);
18301764         temp = (xop * yop) << shift;
1831         res = adsp2100.core.mr.mr + (INT64)temp;
1765         res = adsp->core.mr.mr + (INT64)temp;
18321766         break;
18331767      case 0x0b<<13:
18341768         /* MR + X * Y (UU) */
1835         xop = MAC_GETXREG_UNSIGNED(xop);
1836         yop = MAC_GETYREG_UNSIGNED(yop);
1769         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
1770         yop = MAC_GETYREG_UNSIGNED(adsp, yop);
18371771         temp = (xop * yop) << shift;
1838         res = adsp2100.core.mr.mr + (INT64)temp;
1772         res = adsp->core.mr.mr + (INT64)temp;
18391773         break;
18401774      case 0x0c<<13:
18411775         /* MR - X * Y (SS) */
1842         xop = MAC_GETXREG_SIGNED(xop);
1843         yop = MAC_GETYREG_SIGNED(yop);
1776         xop = MAC_GETXREG_SIGNED(adsp, xop);
1777         yop = MAC_GETYREG_SIGNED(adsp, yop);
18441778         temp = (xop * yop) << shift;
1845         res = adsp2100.core.mr.mr - (INT64)temp;
1779         res = adsp->core.mr.mr - (INT64)temp;
18461780         break;
18471781      case 0x0d<<13:
18481782         /* MR - X * Y (SU) */
1849         xop = MAC_GETXREG_SIGNED(xop);
1850         yop = MAC_GETYREG_UNSIGNED(yop);
1783         xop = MAC_GETXREG_SIGNED(adsp, xop);
1784         yop = MAC_GETYREG_UNSIGNED(adsp, yop);
18511785         temp = (xop * yop) << shift;
1852         res = adsp2100.core.mr.mr - (INT64)temp;
1786         res = adsp->core.mr.mr - (INT64)temp;
18531787         break;
18541788      case 0x0e<<13:
18551789         /* MR - X * Y (US) */
1856         xop = MAC_GETXREG_UNSIGNED(xop);
1857         yop = MAC_GETYREG_SIGNED(yop);
1790         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
1791         yop = MAC_GETYREG_SIGNED(adsp, yop);
18581792         temp = (xop * yop) << shift;
1859         res = adsp2100.core.mr.mr - (INT64)temp;
1793         res = adsp->core.mr.mr - (INT64)temp;
18601794         break;
18611795      case 0x0f<<13:
18621796         /* MR - X * Y (UU) */
1863         xop = MAC_GETXREG_UNSIGNED(xop);
1864         yop = MAC_GETYREG_UNSIGNED(yop);
1797         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
1798         yop = MAC_GETYREG_UNSIGNED(adsp, yop);
18651799         temp = (xop * yop) << shift;
1866         res = adsp2100.core.mr.mr - (INT64)temp;
1800         res = adsp->core.mr.mr - (INT64)temp;
18671801         break;
18681802      default:
18691803         res = 0;   /* just to keep the compiler happy */
r3535r3536
18711805   }
18721806
18731807   /* set the final value */
1874   adsp2100.core.mf.u = (UINT32)res >> 16;
1808   adsp->core.mf.u = (UINT32)res >> 16;
18751809}
18761810
18771811
r3535r3536
18801814    MAC operations (result in MF, yop == xop)
18811815===========================================================================*/
18821816
1883static void mac_op_mf_xop(int op)
1817static void mac_op_mf_xop(adsp2100_state *adsp, int op)
18841818{
1885   INT8 shift = ((adsp2100.mstat & MSTAT_INTEGER) >> 4) ^ 1;
1819   INT8 shift = ((adsp->mstat & MSTAT_INTEGER) >> 4) ^ 1;
18861820   INT32 xop = (op >> 8) & 7;
18871821   INT32 temp;
18881822   INT64 res;
r3535r3536
18941828         return;
18951829      case 0x01<<13:
18961830         /* X * Y (RND) */
1897         xop = MAC_GETXREG_SIGNED(xop);
1831         xop = MAC_GETXREG_SIGNED(adsp, xop);
18981832         temp = (xop * xop) << shift;
18991833         res = (INT64)temp;
19001834#if 0
r3535r3536
19091843         break;
19101844      case 0x02<<13:
19111845         /* MR + X * Y (RND) */
1912         xop = MAC_GETXREG_SIGNED(xop);
1846         xop = MAC_GETXREG_SIGNED(adsp, xop);
19131847         temp = (xop * xop) << shift;
1914         res = adsp2100.core.mr.mr + (INT64)temp;
1848         res = adsp->core.mr.mr + (INT64)temp;
19151849#if 0
19161850         if ((res & 0xffff) == 0x8000) res &= ~((UINT64)0x10000);
19171851         else res += (res & 0x8000) << 1;
r3535r3536
19241858         break;
19251859      case 0x03<<13:
19261860         /* MR - X * Y (RND) */
1927         xop = MAC_GETXREG_SIGNED(xop);
1861         xop = MAC_GETXREG_SIGNED(adsp, xop);
19281862         temp = (xop * xop) << shift;
1929         res = adsp2100.core.mr.mr - (INT64)temp;
1863         res = adsp->core.mr.mr - (INT64)temp;
19301864#if 0
19311865         if ((res & 0xffff) == 0x8000) res &= ~((UINT64)0x10000);
19321866         else res += (res & 0x8000) << 1;
r3535r3536
19391873         break;
19401874      case 0x04<<13:
19411875         /* X * Y (SS)       Clear when y = 0 */
1942         xop = MAC_GETXREG_SIGNED(xop);
1876         xop = MAC_GETXREG_SIGNED(adsp, xop);
19431877         temp = (xop * xop) << shift;
19441878         res = (INT64)temp;
19451879         break;
19461880      case 0x05<<13:
19471881         /* X * Y (SU) */
1948         xop = MAC_GETXREG_SIGNED(xop);
1882         xop = MAC_GETXREG_SIGNED(adsp, xop);
19491883         temp = (xop * xop) << shift;
19501884         res = (INT64)temp;
19511885         break;
19521886      case 0x06<<13:
19531887         /* X * Y (US) */
1954         xop = MAC_GETXREG_UNSIGNED(xop);
1888         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
19551889         temp = (xop * xop) << shift;
19561890         res = (INT64)temp;
19571891         break;
19581892      case 0x07<<13:
19591893         /* X * Y (UU) */
1960         xop = MAC_GETXREG_UNSIGNED(xop);
1894         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
19611895         temp = (xop * xop) << shift;
19621896         res = (INT64)temp;
19631897         break;
19641898      case 0x08<<13:
19651899         /* MR + X * Y (SS) */
1966         xop = MAC_GETXREG_SIGNED(xop);
1900         xop = MAC_GETXREG_SIGNED(adsp, xop);
19671901         temp = (xop * xop) << shift;
1968         res = adsp2100.core.mr.mr + (INT64)temp;
1902         res = adsp->core.mr.mr + (INT64)temp;
19691903         break;
19701904      case 0x09<<13:
19711905         /* MR + X * Y (SU) */
1972         xop = MAC_GETXREG_SIGNED(xop);
1906         xop = MAC_GETXREG_SIGNED(adsp, xop);
19731907         temp = (xop * xop) << shift;
1974         res = adsp2100.core.mr.mr + (INT64)temp;
1908         res = adsp->core.mr.mr + (INT64)temp;
19751909         break;
19761910      case 0x0a<<13:
19771911         /* MR + X * Y (US) */
1978         xop = MAC_GETXREG_UNSIGNED(xop);
1912         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
19791913         temp = (xop * xop) << shift;
1980         res = adsp2100.core.mr.mr + (INT64)temp;
1914         res = adsp->core.mr.mr + (INT64)temp;
19811915         break;
19821916      case 0x0b<<13:
19831917         /* MR + X * Y (UU) */
1984         xop = MAC_GETXREG_UNSIGNED(xop);
1918         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
19851919         temp = (xop * xop) << shift;
1986         res = adsp2100.core.mr.mr + (INT64)temp;
1920         res = adsp->core.mr.mr + (INT64)temp;
19871921         break;
19881922      case 0x0c<<13:
19891923         /* MR - X * Y (SS) */
1990         xop = MAC_GETXREG_SIGNED(xop);
1924         xop = MAC_GETXREG_SIGNED(adsp, xop);
19911925         temp = (xop * xop) << shift;
1992         res = adsp2100.core.mr.mr - (INT64)temp;
1926         res = adsp->core.mr.mr - (INT64)temp;
19931927         break;
19941928      case 0x0d<<13:
19951929         /* MR - X * Y (SU) */
1996         xop = MAC_GETXREG_SIGNED(xop);
1930         xop = MAC_GETXREG_SIGNED(adsp, xop);
19971931         temp = (xop * xop) << shift;
1998         res = adsp2100.core.mr.mr - (INT64)temp;
1932         res = adsp->core.mr.mr - (INT64)temp;
19991933         break;
20001934      case 0x0e<<13:
20011935         /* MR - X * Y (US) */
2002         xop = MAC_GETXREG_UNSIGNED(xop);
1936         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
20031937         temp = (xop * xop) << shift;
2004         res = adsp2100.core.mr.mr - (INT64)temp;
1938         res = adsp->core.mr.mr - (INT64)temp;
20051939         break;
20061940      case 0x0f<<13:
20071941         /* MR - X * Y (UU) */
2008         xop = MAC_GETXREG_UNSIGNED(xop);
1942         xop = MAC_GETXREG_UNSIGNED(adsp, xop);
20091943         temp = (xop * xop) << shift;
2010         res = adsp2100.core.mr.mr - (INT64)temp;
1944         res = adsp->core.mr.mr - (INT64)temp;
20111945         break;
20121946      default:
20131947         res = 0;   /* just to keep the compiler happy */
r3535r3536
20151949   }
20161950
20171951   /* set the final value */
2018   adsp2100.core.mf.u = (UINT32)res >> 16;
1952   adsp->core.mf.u = (UINT32)res >> 16;
20191953}
20201954
20211955
r3535r3536
20241958    SHIFT operations (result in SR/SE/SB)
20251959===========================================================================*/
20261960
2027static void shift_op(int op)
1961static void shift_op(adsp2100_state *adsp, int op)
20281962{
2029   INT8 sc = adsp2100.core.se.s;
1963   INT8 sc = adsp->core.se.s;
20301964   INT32 xop = (op >> 8) & 7;
20311965   UINT32 res;
20321966
r3535r3536
20341968   {
20351969      case 0x00<<11:
20361970         /* LSHIFT (HI) */
2037         xop = SHIFT_GETXREG_UNSIGNED(xop) << 16;
1971         xop = SHIFT_GETXREG_UNSIGNED(adsp, xop) << 16;
20381972         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
20391973         else res = (sc > -32) ? ((UINT32)xop >> -sc) : 0;
2040         adsp2100.core.sr.sr = res;
1974         adsp->core.sr.sr = res;
20411975         break;
20421976      case 0x01<<11:
20431977         /* LSHIFT (HI, OR) */
2044         xop = SHIFT_GETXREG_UNSIGNED(xop) << 16;
1978         xop = SHIFT_GETXREG_UNSIGNED(adsp, xop) << 16;
20451979         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
20461980         else res = (sc > -32) ? ((UINT32)xop >> -sc) : 0;
2047         adsp2100.core.sr.sr |= res;
1981         adsp->core.sr.sr |= res;
20481982         break;
20491983      case 0x02<<11:
20501984         /* LSHIFT (LO) */
2051         xop = SHIFT_GETXREG_UNSIGNED(xop);
1985         xop = SHIFT_GETXREG_UNSIGNED(adsp, xop);
20521986         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
20531987         else res = (sc > -32) ? (xop >> -sc) : 0;
2054         adsp2100.core.sr.sr = res;
1988         adsp->core.sr.sr = res;
20551989         break;
20561990      case 0x03<<11:
20571991         /* LSHIFT (LO, OR) */
2058         xop = SHIFT_GETXREG_UNSIGNED(xop);
1992         xop = SHIFT_GETXREG_UNSIGNED(adsp, xop);
20591993         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
20601994         else res = (sc > -32) ? (xop >> -sc) : 0;
2061         adsp2100.core.sr.sr |= res;
1995         adsp->core.sr.sr |= res;
20621996         break;
20631997      case 0x04<<11:
20641998         /* ASHIFT (HI) */
2065         xop = SHIFT_GETXREG_SIGNED(xop) << 16;
1999         xop = SHIFT_GETXREG_SIGNED(adsp, xop) << 16;
20662000         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
20672001         else res = (sc > -32) ? (xop >> -sc) : (xop >> 31);
2068         adsp2100.core.sr.sr = res;
2002         adsp->core.sr.sr = res;
20692003         break;
20702004      case 0x05<<11:
20712005         /* ASHIFT (HI, OR) */
2072         xop = SHIFT_GETXREG_SIGNED(xop) << 16;
2006         xop = SHIFT_GETXREG_SIGNED(adsp, xop) << 16;
20732007         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
20742008         else res = (sc > -32) ? (xop >> -sc) : (xop >> 31);
2075         adsp2100.core.sr.sr |= res;
2009         adsp->core.sr.sr |= res;
20762010         break;
20772011      case 0x06<<11:
20782012         /* ASHIFT (LO) */
2079         xop = SHIFT_GETXREG_SIGNED(xop);
2013         xop = SHIFT_GETXREG_SIGNED(adsp, xop);
20802014         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
20812015         else res = (sc > -32) ? (xop >> -sc) : (xop >> 31);
2082         adsp2100.core.sr.sr = res;
2016         adsp->core.sr.sr = res;
20832017         break;
20842018      case 0x07<<11:
20852019         /* ASHIFT (LO, OR) */
2086         xop = SHIFT_GETXREG_SIGNED(xop);
2020         xop = SHIFT_GETXREG_SIGNED(adsp, xop);
20872021         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
20882022         else res = (sc > -32) ? (xop >> -sc) : (xop >> 31);
2089         adsp2100.core.sr.sr |= res;
2023         adsp->core.sr.sr |= res;
20902024         break;
20912025      case 0x08<<11:
20922026         /* NORM (HI) */
2093         xop = SHIFT_GETXREG_SIGNED(xop) << 16;
2027         xop = SHIFT_GETXREG_SIGNED(adsp, xop) << 16;
20942028         if (sc > 0)
20952029         {
2096            xop = ((UINT32)xop >> 1) | ((adsp2100.astat & CFLAG) << 28);
2030            xop = ((UINT32)xop >> 1) | ((adsp->astat & CFLAG) << 28);
20972031            res = xop >> (sc - 1);
20982032         }
20992033         else res = (sc > -32) ? (xop << -sc) : 0;
2100         adsp2100.core.sr.sr = res;
2034         adsp->core.sr.sr = res;
21012035         break;
21022036      case 0x09<<11:
21032037         /* NORM (HI, OR) */
2104         xop = SHIFT_GETXREG_SIGNED(xop) << 16;
2038         xop = SHIFT_GETXREG_SIGNED(adsp, xop) << 16;
21052039         if (sc > 0)
21062040         {
2107            xop = ((UINT32)xop >> 1) | ((adsp2100.astat & CFLAG) << 28);
2041            xop = ((UINT32)xop >> 1) | ((adsp->astat & CFLAG) << 28);
21082042            res = xop >> (sc - 1);
21092043         }
21102044         else res = (sc > -32) ? (xop << -sc) : 0;
2111         adsp2100.core.sr.sr |= res;
2045         adsp->core.sr.sr |= res;
21122046         break;
21132047      case 0x0a<<11:
21142048         /* NORM (LO) */
2115         xop = SHIFT_GETXREG_UNSIGNED(xop);
2049         xop = SHIFT_GETXREG_UNSIGNED(adsp, xop);
21162050         if (sc > 0) res = (sc < 32) ? (xop >> sc) : 0;
21172051         else res = (sc > -32) ? (xop << -sc) : 0;
2118         adsp2100.core.sr.sr = res;
2052         adsp->core.sr.sr = res;
21192053         break;
21202054      case 0x0b<<11:
21212055         /* NORM (LO, OR) */
2122         xop = SHIFT_GETXREG_UNSIGNED(xop);
2056         xop = SHIFT_GETXREG_UNSIGNED(adsp, xop);
21232057         if (sc > 0) res = (sc < 32) ? (xop >> sc) : 0;
21242058         else res = (sc > -32) ? (xop << -sc) : 0;
2125         adsp2100.core.sr.sr |= res;
2059         adsp->core.sr.sr |= res;
21262060         break;
21272061      case 0x0c<<11:
21282062         /* EXP (HI) */
2129         xop = SHIFT_GETXREG_SIGNED(xop) << 16;
2063         xop = SHIFT_GETXREG_SIGNED(adsp, xop) << 16;
21302064         res = 0;
21312065         if (xop < 0)
21322066         {
r3535r3536
21392073            xop |= 0x8000;
21402074            while ((xop & 0x40000000) == 0) res++, xop <<= 1;
21412075         }
2142         adsp2100.core.se.s = -res;
2076         adsp->core.se.s = -res;
21432077         break;
21442078      case 0x0d<<11:
21452079         /* EXP (HIX) */
2146         xop = SHIFT_GETXREG_SIGNED(xop) << 16;
2080         xop = SHIFT_GETXREG_SIGNED(adsp, xop) << 16;
21472081         if (GET_V)
21482082         {
2149            adsp2100.core.se.s = 1;
2083            adsp->core.se.s = 1;
21502084            if (xop < 0) CLR_SS;
21512085            else SET_SS;
21522086         }
r3535r3536
21642098               xop |= 0x8000;
21652099               while ((xop & 0x40000000) == 0) res++, xop <<= 1;
21662100            }
2167            adsp2100.core.se.s = -res;
2101            adsp->core.se.s = -res;
21682102         }
21692103         break;
21702104      case 0x0e<<11:
21712105         /* EXP (LO) */
2172         if (adsp2100.core.se.s == -15)
2106         if (adsp->core.se.s == -15)
21732107         {
2174            xop = SHIFT_GETXREG_SIGNED(xop);
2108            xop = SHIFT_GETXREG_SIGNED(adsp, xop);
21752109            res = 15;
21762110            if (GET_SS)
21772111               while ((xop & 0x8000) != 0) res++, xop <<= 1;
r3535r3536
21802114               xop = (xop << 1) | 1;
21812115               while ((xop & 0x10000) == 0) res++, xop <<= 1;
21822116            }
2183            adsp2100.core.se.s = -res;
2117            adsp->core.se.s = -res;
21842118         }
21852119         break;
21862120      case 0x0f<<11:
21872121         /* EXPADJ */
2188         xop = SHIFT_GETXREG_SIGNED(xop) << 16;
2122         xop = SHIFT_GETXREG_SIGNED(adsp, xop) << 16;
21892123         res = 0;
21902124         if (xop < 0)
21912125            while ((xop & 0x40000000) != 0) res++, xop <<= 1;
r3535r3536
21942128            xop |= 0x8000;
21952129            while ((xop & 0x40000000) == 0) res++, xop <<= 1;
21962130         }
2197         if (res < -adsp2100.core.sb.s)
2198            adsp2100.core.sb.s = -res;
2131         if (res < -adsp->core.sb.s)
2132            adsp->core.sb.s = -res;
21992133         break;
22002134   }
22012135}
r3535r3536
22062140    Immediate SHIFT operations (result in SR/SE/SB)
22072141===========================================================================*/
22082142
2209static void shift_op_imm(int op)
2143static void shift_op_imm(adsp2100_state *adsp, int op)
22102144{
22112145   INT8 sc = (INT8)op;
22122146   INT32 xop = (op >> 8) & 7;
r3535r3536
22162150   {
22172151      case 0x00<<11:
22182152         /* LSHIFT (HI) */
2219         xop = SHIFT_GETXREG_UNSIGNED(xop) << 16;
2153         xop = SHIFT_GETXREG_UNSIGNED(adsp, xop) << 16;
22202154         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
22212155         else res = (sc > -32) ? ((UINT32)xop >> -sc) : 0;
2222         adsp2100.core.sr.sr = res;
2156         adsp->core.sr.sr = res;
22232157         break;
22242158      case 0x01<<11:
22252159         /* LSHIFT (HI, OR) */
2226         xop = SHIFT_GETXREG_UNSIGNED(xop) << 16;
2160         xop = SHIFT_GETXREG_UNSIGNED(adsp, xop) << 16;
22272161         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
22282162         else res = (sc > -32) ? ((UINT32)xop >> -sc) : 0;
2229         adsp2100.core.sr.sr |= res;
2163         adsp->core.sr.sr |= res;
22302164         break;
22312165      case 0x02<<11:
22322166         /* LSHIFT (LO) */
2233         xop = SHIFT_GETXREG_UNSIGNED(xop);
2167         xop = SHIFT_GETXREG_UNSIGNED(adsp, xop);
22342168         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
22352169         else res = (sc > -32) ? (xop >> -sc) : 0;
2236         adsp2100.core.sr.sr = res;
2170         adsp->core.sr.sr = res;
22372171         break;
22382172      case 0x03<<11:
22392173         /* LSHIFT (LO, OR) */
2240         xop = SHIFT_GETXREG_UNSIGNED(xop);
2174         xop = SHIFT_GETXREG_UNSIGNED(adsp, xop);
22412175         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
22422176         else res = (sc > -32) ? (xop >> -sc) : 0;
2243         adsp2100.core.sr.sr |= res;
2177         adsp->core.sr.sr |= res;
22442178         break;
22452179      case 0x04<<11:
22462180         /* ASHIFT (HI) */
2247         xop = SHIFT_GETXREG_SIGNED(xop) << 16;
2181         xop = SHIFT_GETXREG_SIGNED(adsp, xop) << 16;
22482182         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
22492183         else res = (sc > -32) ? (xop >> -sc) : (xop >> 31);
2250         adsp2100.core.sr.sr = res;
2184         adsp->core.sr.sr = res;
22512185         break;
22522186      case 0x05<<11:
22532187         /* ASHIFT (HI, OR) */
2254         xop = SHIFT_GETXREG_SIGNED(xop) << 16;
2188         xop = SHIFT_GETXREG_SIGNED(adsp, xop) << 16;
22552189         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
22562190         else res = (sc > -32) ? (xop >> -sc) : (xop >> 31);
2257         adsp2100.core.sr.sr |= res;
2191         adsp->core.sr.sr |= res;
22582192         break;
22592193      case 0x06<<11:
22602194         /* ASHIFT (LO) */
2261         xop = SHIFT_GETXREG_SIGNED(xop);
2195         xop = SHIFT_GETXREG_SIGNED(adsp, xop);
22622196         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
22632197         else res = (sc > -32) ? (xop >> -sc) : (xop >> 31);
2264         adsp2100.core.sr.sr = res;
2198         adsp->core.sr.sr = res;
22652199         break;
22662200      case 0x07<<11:
22672201         /* ASHIFT (LO, OR) */
2268         xop = SHIFT_GETXREG_SIGNED(xop);
2202         xop = SHIFT_GETXREG_SIGNED(adsp, xop);
22692203         if (sc > 0) res = (sc < 32) ? (xop << sc) : 0;
22702204         else res = (sc > -32) ? (xop >> -sc) : (xop >> 31);
2271         adsp2100.core.sr.sr |= res;
2205         adsp->core.sr.sr |= res;
22722206         break;
22732207      case 0x08<<11:
22742208         /* NORM (HI) */
2275         xop = SHIFT_GETXREG_SIGNED(xop) << 16;
2209         xop = SHIFT_GETXREG_SIGNED(adsp, xop) << 16;
22762210         if (sc > 0)
22772211         {
2278            xop = ((UINT32)xop >> 1) | ((adsp2100.astat & CFLAG) << 28);
2212            xop = ((UINT32)xop >> 1) | ((adsp->astat & CFLAG) << 28);
22792213            res = xop >> (sc - 1);
22802214         }
22812215         else res = (sc > -32) ? (xop << -sc) : 0;
2282         adsp2100.core.sr.sr = res;
2216         adsp->core.sr.sr = res;
22832217         break;
22842218      case 0x09<<11:
22852219         /* NORM (HI, OR) */
2286         xop = SHIFT_GETXREG_SIGNED(xop) << 16;
2220         xop = SHIFT_GETXREG_SIGNED(adsp, xop) << 16;
22872221         if (sc > 0)
22882222         {
2289            xop = ((UINT32)xop >> 1) | ((adsp2100.astat & CFLAG) << 28);
2223            xop = ((UINT32)xop >> 1) | ((adsp->astat & CFLAG) << 28);
22902224            res = xop >> (sc - 1);
22912225         }
22922226         else res = (sc > -32) ? (xop << -sc) : 0;
2293         adsp2100.core.sr.sr |= res;
2227         adsp->core.sr.sr |= res;
22942228         break;
22952229      case 0x0a<<11:
22962230         /* NORM (LO) */
2297         xop = SHIFT_GETXREG_UNSIGNED(xop);
2231         xop = SHIFT_GETXREG_UNSIGNED(adsp, xop);
22982232         if (sc > 0) res = (sc < 32) ? (xop >> sc) : 0;
22992233         else res = (sc > -32) ? (xop << -sc) : 0;
2300         adsp2100.core.sr.sr = res;
2234         adsp->core.sr.sr = res;
23012235         break;
23022236      case 0x0b<<11:
23032237         /* NORM (LO, OR) */
2304         xop = SHIFT_GETXREG_UNSIGNED(xop);
2238         xop = SHIFT_GETXREG_UNSIGNED(adsp, xop);
23052239         if (sc > 0) res = (sc < 32) ? (xop >> sc) : 0;
23062240         else res = (sc > -32) ? (xop << -sc) : 0;
2307         adsp2100.core.sr.sr |= res;
2241         adsp->core.sr.sr |= res;
23082242         break;
23092243   }
23102244}
src/emu/cpu/adsp2100/2100dasm.c
r3535r3536
230230
231231
232232/* execute instructions on this CPU until icount expires */
233offs_t adsp2100_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
233CPU_DISASSEMBLE( adsp21xx )
234234{
235235   unsigned int op = oprom[0] | (oprom[1] << 8) | (oprom[2] << 16);
236236   unsigned dasmflags = 0;
src/emu/cpu/adsp2100/adsp2100.c
r3535r3536
241241   UINT16      ifc;
242242    UINT8       irq_state[9];
243243    UINT8       irq_latch[9];
244    int         (*irq_callback)(int irqline);
244    cpu_irq_callback irq_callback;
245    const device_config *device;
245246
247   /* other internal states */
248    int         icount;
249   int         chip_type;
250   int         mstat_mask;
251   int         imask_mask;
252
253   /* register maps */
254   void *      alu_xregs[8];
255   void *      alu_yregs[4];
256   void *      mac_xregs[8];
257   void *      mac_yregs[4];
258   void *      shift_xregs[8];
259
246260    /* other callbacks */
247261   RX_CALLBACK sport_rx_callback;
248262   TX_CALLBACK sport_tx_callback;
249263   ADSP2100_TIMER_CALLBACK timer_fired_func;
250} adsp2100_Regs;
264} adsp2100_state;
251265
252266
253267
254268/***************************************************************************
255    PUBLIC GLOBAL VARIABLES
256***************************************************************************/
257
258static int   adsp2100_icount;
259
260
261/***************************************************************************
262269    PRIVATE GLOBAL VARIABLES
263270***************************************************************************/
264271
265static adsp2100_Regs adsp2100;
272static void *token;
266273
267static int chip_type = CHIP_TYPE_ADSP2100;
268static int mstat_mask;
269static int imask_mask;
270
271274static UINT16 *reverse_table = 0;
272275static UINT16 *mask_table = 0;
273276static UINT8 *condition_table = 0;
r3535r3536
282285***************************************************************************/
283286
284287static int create_tables(void);
285static void check_irqs(void);
288static void check_irqs(adsp2100_state *adsp);
286289
287290
288291/***************************************************************************
r3535r3536
319322   program_write_dword_32le(addr << 2, data & 0xffffff);
320323}
321324
322#define ROPCODE() cpu_readop32(adsp2100.pc << 2)
325#define ROPCODE(a) cpu_readop32((a)->pc << 2)
323326
324#define CHANGEPC() change_pc(adsp2100.pc << 2)
327#define CHANGEPC(a) change_pc((a)->pc << 2)
325328
326329
327330/***************************************************************************
328    OTHER INLINES
329***************************************************************************/
330
331#if (HAS_ADSP2100)
332INLINE void set_core_2100(void)
333{
334   chip_type = CHIP_TYPE_ADSP2100;
335   mstat_mask = 0x0f;
336   imask_mask = 0x0f;
337}
338#endif
339
340#if (HAS_ADSP2101)
341INLINE void set_core_2101(void)
342{
343   chip_type = CHIP_TYPE_ADSP2101;
344   mstat_mask = 0x7f;
345   imask_mask = 0x3f;
346}
347#endif
348
349#if (HAS_ADSP2104)
350INLINE void set_core_2104(void)
351{
352   chip_type = CHIP_TYPE_ADSP2104;
353   mstat_mask = 0x7f;
354   imask_mask = 0x3f;
355}
356#endif
357
358#if (HAS_ADSP2105)
359INLINE void set_core_2105(void)
360{
361   chip_type = CHIP_TYPE_ADSP2105;
362   mstat_mask = 0x7f;
363   imask_mask = 0x3f;
364}
365#endif
366
367#if (HAS_ADSP2115)
368INLINE void set_core_2115(void)
369{
370   chip_type = CHIP_TYPE_ADSP2115;
371   mstat_mask = 0x7f;
372   imask_mask = 0x3f;
373}
374#endif
375
376#if (HAS_ADSP2181)
377INLINE void set_core_2181(void)
378{
379   chip_type = CHIP_TYPE_ADSP2181;
380   mstat_mask = 0x7f;
381   imask_mask = 0x3ff;
382}
383#endif
384
385
386/***************************************************************************
387331    IMPORT CORE UTILITIES
388332***************************************************************************/
389333
r3535r3536
395339    IRQ HANDLING
396340***************************************************************************/
397341
398INLINE int adsp2100_generate_irq(int which)
342INLINE int adsp2100_generate_irq(adsp2100_state *adsp, int which)
399343{
400344   /* skip if masked */
401   if (!(adsp2100.imask & (1 << which)))
345   if (!(adsp->imask & (1 << which)))
402346      return 0;
403347
404348   /* clear the latch */
405   adsp2100.irq_latch[which] = 0;
349   adsp->irq_latch[which] = 0;
406350
407351   /* push the PC and the status */
408   pc_stack_push();
409   stat_stack_push();
352   pc_stack_push(adsp);
353   stat_stack_push(adsp);
410354
411355   /* vector to location & stop idling */
412   adsp2100.pc = which;
413   CHANGEPC();
414   adsp2100.idle = 0;
356   adsp->pc = which;
357   CHANGEPC(adsp);
358   adsp->idle = 0;
415359
416360   /* mask other interrupts based on the nesting bit */
417   if (adsp2100.icntl & 0x10) adsp2100.imask &= ~((2 << which) - 1);
418   else adsp2100.imask &= ~0xf;
361   if (adsp->icntl & 0x10) adsp->imask &= ~((2 << which) - 1);
362   else adsp->imask &= ~0xf;
419363
420364   return 1;
421365}
422366
423367
424INLINE int adsp2101_generate_irq(int which, int indx)
368INLINE int adsp2101_generate_irq(adsp2100_state *adsp, int which, int indx)
425369{
426370   /* skip if masked */
427   if (!(adsp2100.imask & (0x20 >> indx)))
371   if (!(adsp->imask & (0x20 >> indx)))
428372      return 0;
429373
430374   /* clear the latch */
431   adsp2100.irq_latch[which] = 0;
375   adsp->irq_latch[which] = 0;
432376
433377   /* push the PC and the status */
434   pc_stack_push();
435   stat_stack_push();
378   pc_stack_push(adsp);
379   stat_stack_push(adsp);
436380
437381   /* vector to location & stop idling */
438   adsp2100.pc = 0x04 + indx * 4;
439   CHANGEPC();
440   adsp2100.idle = 0;
382   adsp->pc = 0x04 + indx * 4;
383   CHANGEPC(adsp);
384   adsp->idle = 0;
441385
442386   /* mask other interrupts based on the nesting bit */
443   if (adsp2100.icntl & 0x10) adsp2100.imask &= ~(0x3f >> indx);
444   else adsp2100.imask &= ~0x3f;
387   if (adsp->icntl & 0x10) adsp->imask &= ~(0x3f >> indx);
388   else adsp->imask &= ~0x3f;
445389
446390   return 1;
447391}
448392
449393
450INLINE int adsp2181_generate_irq(int which, int indx)
394INLINE int adsp2181_generate_irq(adsp2100_state *adsp, int which, int indx)
451395{
452396   /* skip if masked */
453   if (!(adsp2100.imask & (0x200 >> indx)))
397   if (!(adsp->imask & (0x200 >> indx)))
454398      return 0;
455399
456400   /* clear the latch */
457   adsp2100.irq_latch[which] = 0;
401   adsp->irq_latch[which] = 0;
458402
459403   /* push the PC and the status */
460   pc_stack_push();
461   stat_stack_push();
404   pc_stack_push(adsp);
405   stat_stack_push(adsp);
462406
463407   /* vector to location & stop idling */
464   adsp2100.pc = 0x04 + indx * 4;
465   CHANGEPC();
466   adsp2100.idle = 0;
408   adsp->pc = 0x04 + indx * 4;
409   CHANGEPC(adsp);
410   adsp->idle = 0;
467411
468412   /* mask other interrupts based on the nesting bit */
469   if (adsp2100.icntl & 0x10) adsp2100.imask &= ~(0x3ff >> indx);
470   else adsp2100.imask &= ~0x3ff;
413   if (adsp->icntl & 0x10) adsp->imask &= ~(0x3ff >> indx);
414   else adsp->imask &= ~0x3ff;
471415
472416   return 1;
473417}
474418
475419
476static void check_irqs(void)
420static void check_irqs(adsp2100_state *adsp)
477421{
478422   UINT8 check;
479423
480424#if (HAS_ADSP2181)
481   if (chip_type >= CHIP_TYPE_ADSP2181)
425   if (adsp->chip_type >= CHIP_TYPE_ADSP2181)
482426   {
483427      /* check IRQ2 */
484      check = (adsp2100.icntl & 4) ? adsp2100.irq_latch[ADSP2181_IRQ2] : adsp2100.irq_state[ADSP2181_IRQ2];
485      if (check && adsp2181_generate_irq(ADSP2181_IRQ2, 0))
428      check = (adsp->icntl & 4) ? adsp->irq_latch[ADSP2181_IRQ2] : adsp->irq_state[ADSP2181_IRQ2];
429      if (check && adsp2181_generate_irq(adsp, ADSP2181_IRQ2, 0))
486430         return;
487431
488432      /* check IRQL1 */
489      check = adsp2100.irq_state[ADSP2181_IRQL1];
490      if (check && adsp2181_generate_irq(ADSP2181_IRQL1, 1))
433      check = adsp->irq_state[ADSP2181_IRQL1];
434      if (check && adsp2181_generate_irq(adsp, ADSP2181_IRQL1, 1))
491435         return;
492436
493437      /* check IRQL2 */
494      check = adsp2100.irq_state[ADSP2181_IRQL2];
495      if (check && adsp2181_generate_irq(ADSP2181_IRQL2, 2))
438      check = adsp->irq_state[ADSP2181_IRQL2];
439      if (check && adsp2181_generate_irq(adsp, ADSP2181_IRQL2, 2))
496440         return;
497441
498442      /* check SPORT0 transmit */
499      check = adsp2100.irq_latch[ADSP2181_SPORT0_TX];
500      if (check && adsp2181_generate_irq(ADSP2181_SPORT0_TX, 3))
443      check = adsp->irq_latch[ADSP2181_SPORT0_TX];
444      if (check && adsp2181_generate_irq(adsp, ADSP2181_SPORT0_TX, 3))
501445         return;
502446
503447      /* check SPORT0 receive */
504      check = adsp2100.irq_latch[ADSP2181_SPORT0_RX];
505      if (check && adsp2181_generate_irq(ADSP2181_SPORT0_RX, 4))
448      check = adsp->irq_latch[ADSP2181_SPORT0_RX];
449      if (check && adsp2181_generate_irq(adsp, ADSP2181_SPORT0_RX, 4))
506450         return;
507451
508452      /* check IRQE */
509      check = adsp2100.irq_latch[ADSP2181_IRQE];
510      if (check && adsp2181_generate_irq(ADSP2181_IRQE, 5))
453      check = adsp->irq_latch[ADSP2181_IRQE];
454      if (check && adsp2181_generate_irq(adsp, ADSP2181_IRQE, 5))
511455         return;
512456
513457      /* check BDMA interrupt */
514458
515459      /* check IRQ1/SPORT1 transmit */
516      check = (adsp2100.icntl & 2) ? adsp2100.irq_latch[ADSP2181_IRQ1] : adsp2100.irq_state[ADSP2181_IRQ1];
517      if (check && adsp2181_generate_irq(ADSP2181_IRQ1, 7))
460      check = (adsp->icntl & 2) ? adsp->irq_latch[ADSP2181_IRQ1] : adsp->irq_state[ADSP2181_IRQ1];
461      if (check && adsp2181_generate_irq(adsp, ADSP2181_IRQ1, 7))
518462         return;
519463
520464      /* check IRQ0/SPORT1 receive */
521      check = (adsp2100.icntl & 1) ? adsp2100.irq_latch[ADSP2181_IRQ0] : adsp2100.irq_state[ADSP2181_IRQ0];
522      if (check && adsp2181_generate_irq(ADSP2181_IRQ0, 8))
465      check = (adsp->icntl & 1) ? adsp->irq_latch[ADSP2181_IRQ0] : adsp->irq_state[ADSP2181_IRQ0];
466      if (check && adsp2181_generate_irq(adsp, ADSP2181_IRQ0, 8))
523467         return;
524468
525469      /* check timer */
526      check = adsp2100.irq_latch[ADSP2181_TIMER];
527      if (check && adsp2181_generate_irq(ADSP2181_TIMER, 9))
470      check = adsp->irq_latch[ADSP2181_TIMER];
471      if (check && adsp2181_generate_irq(adsp, ADSP2181_TIMER, 9))
528472         return;
529473   }
530474   else
531475#endif
532   if (chip_type >= CHIP_TYPE_ADSP2101)
476   if (adsp->chip_type >= CHIP_TYPE_ADSP2101)
533477   {
534478      /* check IRQ2 */
535      check = (adsp2100.icntl & 4) ? adsp2100.irq_latch[ADSP2101_IRQ2] : adsp2100.irq_state[ADSP2101_IRQ2];
536      if (check && adsp2101_generate_irq(ADSP2101_IRQ2, 0))
479      check = (adsp->icntl & 4) ? adsp->irq_latch[ADSP2101_IRQ2] : adsp->irq_state[ADSP2101_IRQ2];
480      if (check && adsp2101_generate_irq(adsp, ADSP2101_IRQ2, 0))
537481         return;
538482
539483      /* check SPORT0 transmit */
540      check = adsp2100.irq_latch[ADSP2101_SPORT0_TX];
541      if (check && adsp2101_generate_irq(ADSP2101_SPORT0_TX, 1))
484      check = adsp->irq_latch[ADSP2101_SPORT0_TX];
485      if (check && adsp2101_generate_irq(adsp, ADSP2101_SPORT0_TX, 1))
542486         return;
543487
544488      /* check SPORT0 receive */
545      check = adsp2100.irq_latch[ADSP2101_SPORT0_RX];
546      if (check && adsp2101_generate_irq(ADSP2101_SPORT0_RX, 2))
489      check = adsp->irq_latch[ADSP2101_SPORT0_RX];
490      if (check && adsp2101_generate_irq(adsp, ADSP2101_SPORT0_RX, 2))
547491         return;
548492
549493      /* check IRQ1/SPORT1 transmit */
550      check = (adsp2100.icntl & 2) ? adsp2100.irq_latch[ADSP2101_IRQ1] : adsp2100.irq_state[ADSP2101_IRQ1];
551      if (check && adsp2101_generate_irq(ADSP2101_IRQ1, 3))
494      check = (adsp->icntl & 2) ? adsp->irq_latch[ADSP2101_IRQ1] : adsp->irq_state[ADSP2101_IRQ1];
495      if (check && adsp2101_generate_irq(adsp, ADSP2101_IRQ1, 3))
552496         return;
553497
554498      /* check IRQ0/SPORT1 receive */
555      check = (adsp2100.icntl & 1) ? adsp2100.irq_latch[ADSP2101_IRQ0] : adsp2100.irq_state[ADSP2101_IRQ0];
556      if (check && adsp2101_generate_irq(ADSP2101_IRQ0, 4))
499      check = (adsp->icntl & 1) ? adsp->irq_latch[ADSP2101_IRQ0] : adsp->irq_state[ADSP2101_IRQ0];
500      if (check && adsp2101_generate_irq(adsp, ADSP2101_IRQ0, 4))
557501         return;
558502
559503      /* check timer */
560      check = adsp2100.irq_latch[ADSP2101_TIMER];
561      if (check && adsp2101_generate_irq(ADSP2101_TIMER, 5))
504      check = adsp->irq_latch[ADSP2101_TIMER];
505      if (check && adsp2101_generate_irq(adsp, ADSP2101_TIMER, 5))
562506         return;
563507   }
564508   else
565509   {
566510      /* check IRQ3 */
567      check = (adsp2100.icntl & 8) ? adsp2100.irq_latch[ADSP2100_IRQ3] : adsp2100.irq_state[ADSP2100_IRQ3];
568      if (check && adsp2100_generate_irq(ADSP2100_IRQ3))
511      check = (adsp->icntl & 8) ? adsp->irq_latch[ADSP2100_IRQ3] : adsp->irq_state[ADSP2100_IRQ3];
512      if (check && adsp2100_generate_irq(adsp, ADSP2100_IRQ3))
569513         return;
570514
571515      /* check IRQ2 */
572      check = (adsp2100.icntl & 4) ? adsp2100.irq_latch[ADSP2100_IRQ2] : adsp2100.irq_state[ADSP2100_IRQ2];
573      if (check && adsp2100_generate_irq(ADSP2100_IRQ2))
516      check = (adsp->icntl & 4) ? adsp->irq_latch[ADSP2100_IRQ2] : adsp->irq_state[ADSP2100_IRQ2];
517      if (check && adsp2100_generate_irq(adsp, ADSP2100_IRQ2))
574518         return;
575519
576520      /* check IRQ1 */
577      check = (adsp2100.icntl & 2) ? adsp2100.irq_latch[ADSP2100_IRQ1] : adsp2100.irq_state[ADSP2100_IRQ1];
578      if (check && adsp2100_generate_irq(ADSP2100_IRQ1))
521      check = (adsp->icntl & 2) ? adsp->irq_latch[ADSP2100_IRQ1] : adsp->irq_state[ADSP2100_IRQ1];
522      if (check && adsp2100_generate_irq(adsp, ADSP2100_IRQ1))
579523         return;
580524
581525      /* check IRQ0 */
582      check = (adsp2100.icntl & 1) ? adsp2100.irq_latch[ADSP2100_IRQ0] : adsp2100.irq_state[ADSP2100_IRQ0];
583      if (check && adsp2100_generate_irq(ADSP2100_IRQ0))
526      check = (adsp->icntl & 1) ? adsp->irq_latch[ADSP2100_IRQ0] : adsp->irq_state[ADSP2100_IRQ0];
527      if (check && adsp2100_generate_irq(adsp, ADSP2100_IRQ0))
584528         return;
585529   }
586530}
587531
588532
589static void set_irq_line(int irqline, int state)
533static void set_irq_line(adsp2100_state *adsp, int irqline, int state)
590534{
591535   /* update the latched state */
592   if (state != CLEAR_LINE && adsp2100.irq_state[irqline] == CLEAR_LINE)
593       adsp2100.irq_latch[irqline] = 1;
536   if (state != CLEAR_LINE && adsp->irq_state[irqline] == CLEAR_LINE)
537       adsp->irq_latch[irqline] = 1;
594538
595539    /* update the absolute state */
596    adsp2100.irq_state[irqline] = state;
540    adsp->irq_state[irqline] = state;
597541
598542   /* check for IRQs */
599543    if (state != CLEAR_LINE)
600       check_irqs();
544       check_irqs(adsp);
601545}
602546
603547
r3535r3536
606550    CONTEXT SWITCHING
607551***************************************************************************/
608552
609static void adsp2100_get_context(void *dst)
553static CPU_GET_CONTEXT( adsp21xx )
610554{
611   /* copy the context */
612   if (dst)
613      *(adsp2100_Regs *)dst = adsp2100;
614555}
615556
616557
617#if (HAS_ADSP2100)
618static void adsp2100_set_context(void *src)
558static CPU_SET_CONTEXT( adsp21xx )
619559{
620560   /* copy the context */
621561   if (src)
622562   {
623      adsp2100 = *(adsp2100_Regs *)src;
624      CHANGEPC();
563      adsp2100_state *adsp;
564      token = src;
565      adsp = token;
566      CHANGEPC(adsp);
567      check_irqs(adsp);
625568   }
626
627   /* reset the chip type */
628   set_core_2100();
629
630   /* check for IRQs */
631   check_irqs();
632569}
633#endif
634570
635571
636572
r3535r3536
638574    INITIALIZATION AND SHUTDOWN
639575***************************************************************************/
640576
641static void adsp2100_init(int index, int clock, const void *config, int (*irqcallback)(int))
577static adsp2100_state *adsp21xx_init(const device_config *device, int index, int clock, const void *config, cpu_irq_callback irqcallback)
642578{
579   adsp2100_state *adsp = device->token;
580
581   token = device->token;   // temporary
582
643583   /* create the tables */
644584   if (!create_tables())
645585      fatalerror("creating adsp2100 tables failed");
646586
647587   /* set the IRQ callback */
648   adsp2100.irq_callback = irqcallback;
588   adsp->irq_callback = irqcallback;
589   adsp->device = device;
649590
591   /* set up ALU register pointers */
592   adsp->alu_xregs[0] = &adsp->core.ax0;
593   adsp->alu_xregs[1] = &adsp->core.ax1;
594   adsp->alu_xregs[2] = &adsp->core.ar;
595   adsp->alu_xregs[3] = &adsp->core.mr.mrx.mr0;
596   adsp->alu_xregs[4] = &adsp->core.mr.mrx.mr1;
597   adsp->alu_xregs[5] = &adsp->core.mr.mrx.mr2;
598   adsp->alu_xregs[6] = &adsp->core.sr.srx.sr0;
599   adsp->alu_xregs[7] = &adsp->core.sr.srx.sr1;
600   adsp->alu_yregs[0] = &adsp->core.ay0;
601   adsp->alu_yregs[1] = &adsp->core.ay1;
602   adsp->alu_yregs[2] = &adsp->core.af;
603   adsp->alu_yregs[3] = &adsp->core.zero;
604
605   /* set up MAC register pointers */
606   adsp->mac_xregs[0] = &adsp->core.mx0;
607   adsp->mac_xregs[1] = &adsp->core.mx1;
608   adsp->mac_xregs[2] = &adsp->core.ar;
609   adsp->mac_xregs[3] = &adsp->core.mr.mrx.mr0;
610   adsp->mac_xregs[4] = &adsp->core.mr.mrx.mr1;
611   adsp->mac_xregs[5] = &adsp->core.mr.mrx.mr2;
612   adsp->mac_xregs[6] = &adsp->core.sr.srx.sr0;
613   adsp->mac_xregs[7] = &adsp->core.sr.srx.sr1;
614   adsp->mac_yregs[0] = &adsp->core.my0;
615   adsp->mac_yregs[1] = &adsp->core.my1;
616   adsp->mac_yregs[2] = &adsp->core.mf;
617   adsp->mac_yregs[3] = &adsp->core.zero;
618
619   /* set up shift register pointers */
620   adsp->shift_xregs[0] = &adsp->core.si;
621   adsp->shift_xregs[1] = &adsp->core.si;
622   adsp->shift_xregs[2] = &adsp->core.ar;
623   adsp->shift_xregs[3] = &adsp->core.mr.mrx.mr0;
624   adsp->shift_xregs[4] = &adsp->core.mr.mrx.mr1;
625   adsp->shift_xregs[5] = &adsp->core.mr.mrx.mr2;
626   adsp->shift_xregs[6] = &adsp->core.sr.srx.sr0;
627   adsp->shift_xregs[7] = &adsp->core.sr.srx.sr1;
628
650629   /* "core" */
651   state_save_register_item("adsp2100", index, adsp2100.core.ax0.u);
652   state_save_register_item("adsp2100", index, adsp2100.core.ax1.u);
653   state_save_register_item("adsp2100", index, adsp2100.core.ay0.u);
654   state_save_register_item("adsp2100", index, adsp2100.core.ay1.u);
655   state_save_register_item("adsp2100", index, adsp2100.core.ar.u);
656   state_save_register_item("adsp2100", index, adsp2100.core.af.u);
657   state_save_register_item("adsp2100", index, adsp2100.core.mx0.u);
658   state_save_register_item("adsp2100", index, adsp2100.core.mx1.u);
659   state_save_register_item("adsp2100", index, adsp2100.core.my0.u);
660   state_save_register_item("adsp2100", index, adsp2100.core.my1.u);
661   state_save_register_item("adsp2100", index, adsp2100.core.mr.mr);
662   state_save_register_item("adsp2100", index, adsp2100.core.mf.u);
663   state_save_register_item("adsp2100", index, adsp2100.core.si.u);
664   state_save_register_item("adsp2100", index, adsp2100.core.se.u);
665   state_save_register_item("adsp2100", index, adsp2100.core.sb.u);
666   state_save_register_item("adsp2100", index, adsp2100.core.sr.sr);
667   state_save_register_item("adsp2100", index, adsp2100.core.zero.u);
630   state_save_register_item("adsp2100", index, adsp->core.ax0.u);
631   state_save_register_item("adsp2100", index, adsp->core.ax1.u);
632   state_save_register_item("adsp2100", index, adsp->core.ay0.u);
633   state_save_register_item("adsp2100", index, adsp->core.ay1.u);
634   state_save_register_item("adsp2100", index, adsp->core.ar.u);
635   state_save_register_item("adsp2100", index, adsp->core.af.u);
636   state_save_register_item("adsp2100", index, adsp->core.mx0.u);
637   state_save_register_item("adsp2100", index, adsp->core.mx1.u);
638   state_save_register_item("adsp2100", index, adsp->core.my0.u);
639   state_save_register_item("adsp2100", index, adsp->core.my1.u);
640   state_save_register_item("adsp2100", index, adsp->core.mr.mr);
641   state_save_register_item("adsp2100", index, adsp->core.mf.u);
642   state_save_register_item("adsp2100", index, adsp->core.si.u);
643   state_save_register_item("adsp2100", index, adsp->core.se.u);
644   state_save_register_item("adsp2100", index, adsp->core.sb.u);
645   state_save_register_item("adsp2100", index, adsp->core.sr.sr);
646   state_save_register_item("adsp2100", index, adsp->core.zero.u);
668647
669648   /* "alt" */
670   state_save_register_item("adsp2100", index, adsp2100.alt.ax0.u);
671   state_save_register_item("adsp2100", index, adsp2100.alt.ax1.u);
672   state_save_register_item("adsp2100", index, adsp2100.alt.ay0.u);
673   state_save_register_item("adsp2100", index, adsp2100.alt.ay1.u);
674   state_save_register_item("adsp2100", index, adsp2100.alt.ar.u);
675   state_save_register_item("adsp2100", index, adsp2100.alt.af.u);
676   state_save_register_item("adsp2100", index, adsp2100.alt.mx0.u);
677   state_save_register_item("adsp2100", index, adsp2100.alt.mx1.u);
678   state_save_register_item("adsp2100", index, adsp2100.alt.my0.u);
679   state_save_register_item("adsp2100", index, adsp2100.alt.my1.u);
680   state_save_register_item("adsp2100", index, adsp2100.alt.mr.mr);
681   state_save_register_item("adsp2100", index, adsp2100.alt.mf.u);
682   state_save_register_item("adsp2100", index, adsp2100.alt.si.u);
683   state_save_register_item("adsp2100", index, adsp2100.alt.se.u);
684   state_save_register_item("adsp2100", index, adsp2100.alt.sb.u);
685   state_save_register_item("adsp2100", index, adsp2100.alt.sr.sr);
686   state_save_register_item("adsp2100", index, adsp2100.alt.zero.u);
649   state_save_register_item("adsp2100", index, adsp->alt.ax0.u);
650   state_save_register_item("adsp2100", index, adsp->alt.ax1.u);
651   state_save_register_item("adsp2100", index, adsp->alt.ay0.u);
652   state_save_register_item("adsp2100", index, adsp->alt.ay1.u);
653   state_save_register_item("adsp2100", index, adsp->alt.ar.u);
654   state_save_register_item("adsp2100", index, adsp->alt.af.u);
655   state_save_register_item("adsp2100", index, adsp->alt.mx0.u);
656   state_save_register_item("adsp2100", index, adsp->alt.mx1.u);
657   state_save_register_item("adsp2100", index, adsp->alt.my0.u);
658   state_save_register_item("adsp2100", index, adsp->alt.my1.u);
659   state_save_register_item("adsp2100", index, adsp->alt.mr.mr);
660   state_save_register_item("adsp2100", index, adsp->alt.mf.u);
661   state_save_register_item("adsp2100", index, adsp->alt.si.u);
662   state_save_register_item("adsp2100", index, adsp->alt.se.u);
663   state_save_register_item("adsp2100", index, adsp->alt.sb.u);
664   state_save_register_item("adsp2100", index, adsp->alt.sr.sr);
665   state_save_register_item("adsp2100", index, adsp->alt.zero.u);
687666
688   state_save_register_item_array("adsp2100", index, adsp2100.i);
689   state_save_register_item_array("adsp2100", index, adsp2100.m);
690   state_save_register_item_array("adsp2100", index, adsp2100.l);
691   state_save_register_item_array("adsp2100", index, adsp2100.lmask);
692   state_save_register_item_array("adsp2100", index, adsp2100.base);
693   state_save_register_item("adsp2100", index, adsp2100.px);
667   state_save_register_item_array("adsp2100", index, adsp->i);
668   state_save_register_item_array("adsp2100", index, adsp->m);
669   state_save_register_item_array("adsp2100", index, adsp->l);
670   state_save_register_item_array("adsp2100", index, adsp->lmask);
671   state_save_register_item_array("adsp2100", index, adsp->base);
672   state_save_register_item("adsp2100", index, adsp->px);
694673
695   state_save_register_item("adsp2100", index, adsp2100.pc);
696   state_save_register_item("adsp2100", index, adsp2100.ppc);
697   state_save_register_item("adsp2100", index, adsp2100.loop);
698   state_save_register_item("adsp2100", index, adsp2100.loop_condition);
699   state_save_register_item("adsp2100", index, adsp2100.cntr);
700   state_save_register_item("adsp2100", index, adsp2100.astat);
701   state_save_register_item("adsp2100", index, adsp2100.sstat);
702   state_save_register_item("adsp2100", index, adsp2100.mstat);
703   state_save_register_item("adsp2100", index, adsp2100.astat_clear);
704   state_save_register_item("adsp2100", index, adsp2100.idle);
674   state_save_register_item("adsp2100", index, adsp->pc);
675   state_save_register_item("adsp2100", index, adsp->ppc);
676   state_save_register_item("adsp2100", index, adsp->loop);
677   state_save_register_item("adsp2100", index, adsp->loop_condition);
678   state_save_register_item("adsp2100", index, adsp->cntr);
679   state_save_register_item("adsp2100", index, adsp->astat);
680   state_save_register_item("adsp2100", index, adsp->sstat);
681   state_save_register_item("adsp2100", index, adsp->mstat);
682   state_save_register_item("adsp2100", index, adsp->astat_clear);
683   state_save_register_item("adsp2100", index, adsp->idle);
705684
706   state_save_register_item_array("adsp2100", index, adsp2100.loop_stack);
707   state_save_register_item_array("adsp2100", index, adsp2100.cntr_stack);
708   state_save_register_item_array("adsp2100", index, adsp2100.pc_stack);
709   state_save_register_item_2d_array("adsp2100", index, adsp2100.stat_stack);
685   state_save_register_item_array("adsp2100", index, adsp->loop_stack);
686   state_save_register_item_array("adsp2100", index, adsp->cntr_stack);
687   state_save_register_item_array("adsp2100", index, adsp->pc_stack);
688   state_save_register_item_2d_array("adsp2100", index, adsp->stat_stack);
710689
711   state_save_register_item("adsp2100", index, adsp2100.pc_sp);
712   state_save_register_item("adsp2100", index, adsp2100.cntr_sp);
713   state_save_register_item("adsp2100", index, adsp2100.stat_sp);
714   state_save_register_item("adsp2100", index, adsp2100.loop_sp);
690   state_save_register_item("adsp2100", index, adsp->pc_sp);
691   state_save_register_item("adsp2100", index, adsp->cntr_sp);
692   state_save_register_item("adsp2100", index, adsp->stat_sp);
693   state_save_register_item("adsp2100", index, adsp->loop_sp);
715694
716   state_save_register_item("adsp2100", index, adsp2100.flagout);
717   state_save_register_item("adsp2100", index, adsp2100.flagin);
718   state_save_register_item("adsp2100", index, adsp2100.fl0);
719   state_save_register_item("adsp2100", index, adsp2100.fl1);
720   state_save_register_item("adsp2100", index, adsp2100.fl2);
721   state_save_register_item("adsp2100", index, adsp2100.idma_addr);
722   state_save_register_item("adsp2100", index, adsp2100.idma_cache);
723   state_save_register_item("adsp2100", index, adsp2100.idma_offs);
695   state_save_register_item("adsp2100", index, adsp->flagout);
696   state_save_register_item("adsp2100", index, adsp->flagin);
697   state_save_register_item("adsp2100", index, adsp->fl0);
698   state_save_register_item("adsp2100", index, adsp->fl1);
699   state_save_register_item("adsp2100", index, adsp->fl2);
700   state_save_register_item("adsp2100", index, adsp->idma_addr);
701   state_save_register_item("adsp2100", index, adsp->idma_cache);
702   state_save_register_item("adsp2100", index, adsp->idma_offs);
724703
725   state_save_register_item("adsp2100", index, adsp2100.imask);
726   state_save_register_item("adsp2100", index, adsp2100.icntl);
727   state_save_register_item("adsp2100", index, adsp2100.ifc);
728   state_save_register_item_array("adsp2100", index, adsp2100.irq_state);
729   state_save_register_item_array("adsp2100", index, adsp2100.irq_latch);
704   state_save_register_item("adsp2100", index, adsp->imask);
705   state_save_register_item("adsp2100", index, adsp->icntl);
706   state_save_register_item("adsp2100", index, adsp->ifc);
707   state_save_register_item_array("adsp2100", index, adsp->irq_state);
708   state_save_register_item_array("adsp2100", index, adsp->irq_latch);
709
710   return adsp;
730711}
731712
732713
733static void adsp2100_reset(void)
714static CPU_RESET( adsp21xx )
734715{
716   adsp2100_state *adsp = device->token;
735717   int irq;
736718
737719   /* ensure that zero is zero */
738   adsp2100.core.zero.u = adsp2100.alt.zero.u = 0;
720   adsp->core.zero.u = adsp->alt.zero.u = 0;
739721
740722   /* recompute the memory registers with their current values */
741   wr_l0(adsp2100.l[0]);  wr_i0(adsp2100.i[0]);
742   wr_l1(adsp2100.l[1]);  wr_i1(adsp2100.i[1]);
743   wr_l2(adsp2100.l[2]);  wr_i2(adsp2100.i[2]);
744   wr_l3(adsp2100.l[3]);  wr_i3(adsp2100.i[3]);
745   wr_l4(adsp2100.l[4]);  wr_i4(adsp2100.i[4]);
746   wr_l5(adsp2100.l[5]);  wr_i5(adsp2100.i[5]);
747   wr_l6(adsp2100.l[6]);  wr_i6(adsp2100.i[6]);
748   wr_l7(adsp2100.l[7]);  wr_i7(adsp2100.i[7]);
723   wr_l0(adsp, adsp->l[0]);  wr_i0(adsp, adsp->i[0]);
724   wr_l1(adsp, adsp->l[1]);  wr_i1(adsp, adsp->i[1]);
725   wr_l2(adsp, adsp->l[2]);  wr_i2(adsp, adsp->i[2]);
726   wr_l3(adsp, adsp->l[3]);  wr_i3(adsp, adsp->i[3]);
727   wr_l4(adsp, adsp->l[4]);  wr_i4(adsp, adsp->i[4]);
728   wr_l5(adsp, adsp->l[5]);  wr_i5(adsp, adsp->i[5]);
729   wr_l6(adsp, adsp->l[6]);  wr_i6(adsp, adsp->i[6]);
730   wr_l7(adsp, adsp->l[7]);  wr_i7(adsp, adsp->i[7]);
749731
750732   /* reset PC and loops */
751   switch (chip_type)
733   switch (adsp->chip_type)
752734   {
753735      case CHIP_TYPE_ADSP2100:
754         adsp2100.pc = 4;
736         adsp->pc = 4;
755737         break;
756738
757739      case CHIP_TYPE_ADSP2101:
r3535r3536
759741      case CHIP_TYPE_ADSP2105:
760742      case CHIP_TYPE_ADSP2115:
761743      case CHIP_TYPE_ADSP2181:
762         adsp2100.pc = 0;
744         adsp->pc = 0;
763745         break;
764746
765747      default:
766         logerror( "ADSP2100 core: Unknown chip type!. Defaulting to ADSP2100.\n" );
767         adsp2100.pc = 4;
768         chip_type = CHIP_TYPE_ADSP2100;
748         logerror( "ADSP2100 core: Unknown chip type!. Defaulting to adsp->\n" );
749         adsp->pc = 4;
750         adsp->chip_type = CHIP_TYPE_ADSP2100;
769751         break;
770752   }
771   CHANGEPC();
753   CHANGEPC(adsp);
772754
773   adsp2100.ppc = -1;
774   adsp2100.loop = 0xffff;
775   adsp2100.loop_condition = 0;
755   adsp->ppc = -1;
756   adsp->loop = 0xffff;
757   adsp->loop_condition = 0;
776758
777759   /* reset status registers */
778   adsp2100.astat_clear = ~(CFLAG | VFLAG | NFLAG | ZFLAG);
779   adsp2100.mstat = 0;
780   adsp2100.sstat = 0x55;
781   adsp2100.idle = 0;
760   adsp->astat_clear = ~(CFLAG | VFLAG | NFLAG | ZFLAG);
761   adsp->mstat = 0;
762   adsp->sstat = 0x55;
763   adsp->idle = 0;
782764
783765   /* reset stacks */
784   adsp2100.pc_sp = 0;
785   adsp2100.cntr_sp = 0;
786   adsp2100.stat_sp = 0;
787   adsp2100.loop_sp = 0;
766   adsp->pc_sp = 0;
767   adsp->cntr_sp = 0;
768   adsp->stat_sp = 0;
769   adsp->loop_sp = 0;
788770
789771   /* reset external I/O */
790   adsp2100.flagout = 0;
791   adsp2100.flagin = 0;
792   adsp2100.fl0 = 0;
793   adsp2100.fl1 = 0;
794   adsp2100.fl2 = 0;
772   adsp->flagout = 0;
773   adsp->flagin = 0;
774   adsp->fl0 = 0;
775   adsp->fl1 = 0;
776   adsp->fl2 = 0;
795777
796778   /* reset interrupts */
797   adsp2100.imask = 0;
779   adsp->imask = 0;
798780   for (irq = 0; irq < 8; irq++)
799      adsp2100.irq_state[irq] = adsp2100.irq_latch[irq] = CLEAR_LINE;
781      adsp->irq_state[irq] = adsp->irq_latch[irq] = CLEAR_LINE;
800782}
801783
802784
r3535r3536
813795      condition_table = (UINT8 *)malloc(0x1000 * sizeof(UINT8));
814796
815797   /* handle errors */
816   if (!reverse_table || !mask_table || !condition_table)
798   if (reverse_table == NULL || mask_table == NULL || condition_table == NULL)
817799      return 0;
818800
819801   /* initialize the bit reversing table */
r3535r3536
889871}
890872
891873
892static void adsp2100_exit(void)
874static CPU_EXIT( adsp21xx )
893875{
894   if (reverse_table)
876   if (reverse_table != NULL)
895877      free(reverse_table);
896878   reverse_table = NULL;
897879
898   if (mask_table)
880   if (mask_table != NULL)
899881      free(mask_table);
900882   mask_table = NULL;
901883
902   if (condition_table)
884   if (condition_table != NULL)
903885      free(condition_table);
904886   condition_table = NULL;
905887
r3535r3536
930912***************************************************************************/
931913
932914/* execute instructions on this CPU until icount expires */
933static int adsp2100_execute(int cycles)
915static CPU_EXECUTE( adsp21xx )
934916{
935917   int check_debugger = ((Machine->debug_flags & DEBUG_FLAG_ENABLED) != 0);
918   adsp2100_state *adsp = device->token;
936919
937920   /* reset the core */
938   set_mstat(adsp2100.mstat);
921   set_mstat(adsp, adsp->mstat);
939922
940923   /* count cycles and interrupt cycles */
941   adsp2100_icount = cycles;
924   adsp->icount = cycles;
942925
943   CHANGEPC();
926   CHANGEPC(adsp);
944927
945928   do
946929   {
r3535r3536
948931      UINT32 op;
949932
950933      /* debugging */
951      adsp2100.ppc = adsp2100.pc;   /* copy PC to previous PC */
934      adsp->ppc = adsp->pc;   /* copy PC to previous PC */
952935      if (check_debugger)
953         debugger_instruction_hook(Machine, adsp2100.pc);
936         debugger_instruction_hook(Machine, adsp->pc);
954937
955938#if TRACK_HOTSPOTS
956      pcbucket[adsp2100.pc & 0x3fff]++;
939      pcbucket[adsp->pc & 0x3fff]++;
957940#endif
958941
959942      /* instruction fetch */
960      op = ROPCODE();
943      op = ROPCODE(adsp);
961944
962945      /* advance to the next instruction */
963      if (adsp2100.pc != adsp2100.loop)
964         adsp2100.pc++;
946      if (adsp->pc != adsp->loop)
947         adsp->pc++;
965948
966949      /* handle looping */
967950      else
968951      {
969952         /* condition not met, keep looping */
970         if (CONDITION(adsp2100.loop_condition))
971            adsp2100.pc = pc_stack_top();
953         if (CONDITION(adsp, adsp->loop_condition))
954            adsp->pc = pc_stack_top(adsp);
972955
973956         /* condition met; pop the PC and loop stacks and fall through */
974957         else
975958         {
976            loop_stack_pop();
977            pc_stack_pop_val();
978            adsp2100.pc++;
959            loop_stack_pop(adsp);
960            pc_stack_pop_val(adsp);
961            adsp->pc++;
979962         }
980963      }
981964
r3535r3536
989972            /* 00000000 0xxxxxxx xxxxxxxx  dst = IO(x) */
990973            /* 00000000 1xxxxxxx xxxxxxxx  IO(x) = dst */
991974            /* ADSP-218x only */
992            if (chip_type >= CHIP_TYPE_ADSP2181)
975            if (adsp->chip_type >= CHIP_TYPE_ADSP2181)
993976            {
994977               if ((op & 0x008000) == 0x000000)
995                  WRITE_REG(0, op & 15, RWORD_IO((op >> 4) & 0x7ff));
978                  WRITE_REG(adsp, 0, op & 15, RWORD_IO((op >> 4) & 0x7ff));
996979               else
997                  WWORD_IO((op >> 4) & 0x7ff, READ_REG(0, op & 15));
980                  WWORD_IO((op >> 4) & 0x7ff, READ_REG(adsp, 0, op & 15));
998981            }
999982            break;
1000983         case 0x02:
r3535r3536
1003986            /* 00000010 10000000 0000xxxx  idle (n) */
1004987            if (op & 0x008000)
1005988            {
1006               adsp2100.idle = 1;
1007               adsp2100_icount = 0;
989               adsp->idle = 1;
990               adsp->icount = 0;
1008991            }
1009992            else
1010993            {
1011               if (CONDITION(op & 15))
994               if (CONDITION(adsp, op & 15))
1012995               {
1013                  if (op & 0x020) adsp2100.flagout = 0;
1014                  if (op & 0x010) adsp2100.flagout ^= 1;
1015                  if (chip_type >= CHIP_TYPE_ADSP2101)
996                  if (op & 0x020) adsp->flagout = 0;
997                  if (op & 0x010) adsp->flagout ^= 1;
998                  if (adsp->chip_type >= CHIP_TYPE_ADSP2101)
1016999                  {
1017                     if (op & 0x080) adsp2100.fl0 = 0;
1018                     if (op & 0x040) adsp2100.fl0 ^= 1;
1019                     if (op & 0x200) adsp2100.fl1 = 0;
1020                     if (op & 0x100) adsp2100.fl1 ^= 1;
1021                     if (op & 0x800) adsp2100.fl2 = 0;
1022                     if (op & 0x400) adsp2100.fl2 ^= 1;
1000                     if (op & 0x080) adsp->fl0 = 0;
1001                     if (op & 0x040) adsp->fl0 ^= 1;
1002                     if (op & 0x200) adsp->fl1 = 0;
1003                     if (op & 0x100) adsp->fl1 ^= 1;
1004                     if (op & 0x800) adsp->fl2 = 0;
1005                     if (op & 0x400) adsp->fl2 ^= 1;
10231006                  }
10241007               }
10251008            }
r3535r3536
10281011            /* 00000011 xxxxxxxx xxxxxxxx  call or jump on flag in */
10291012            if (op & 0x000002)
10301013            {
1031               if (adsp2100.flagin)
1014               if (adsp->flagin)
10321015               {
10331016                  if (op & 0x000001)
1034                     pc_stack_push();
1035                  adsp2100.pc = ((op >> 4) & 0x0fff) | ((op << 10) & 0x3000);
1036                  CHANGEPC();
1017                     pc_stack_push(adsp);
1018                  adsp->pc = ((op >> 4) & 0x0fff) | ((op << 10) & 0x3000);
1019                  CHANGEPC(adsp);
10371020               }
10381021            }
10391022            else
10401023            {
1041               if (!adsp2100.flagin)
1024               if (!adsp->flagin)
10421025               {
10431026                  if (op & 0x000001)
1044                     pc_stack_push();
1045                  adsp2100.pc = ((op >> 4) & 0x0fff) | ((op << 10) & 0x3000);
1046                  CHANGEPC();
1027                     pc_stack_push(adsp);
1028                  adsp->pc = ((op >> 4) & 0x0fff) | ((op << 10) & 0x3000);
1029                  CHANGEPC(adsp);
10471030               }
10481031            }
10491032            break;
10501033         case 0x04:
10511034            /* 00000100 00000000 000xxxxx  stack control */
1052            if (op & 0x000010) pc_stack_pop_val();
1053            if (op & 0x000008) loop_stack_pop();
1054            if (op & 0x000004) cntr_stack_pop();
1035            if (op & 0x000010) pc_stack_pop_val(adsp);
1036            if (op & 0x000008) loop_stack_pop(adsp);
1037            if (op & 0x000004) cntr_stack_pop(adsp);
10551038            if (op & 0x000002)
10561039            {
1057               if (op & 0x000001) stat_stack_pop();
1058               else stat_stack_push();
1040               if (op & 0x000001) stat_stack_pop(adsp);
1041               else stat_stack_push(adsp);
10591042            }
10601043            break;
10611044         case 0x05:
10621045            /* 00000101 00000000 00000000  saturate MR */
10631046            if (GET_MV)
10641047            {
1065               if (adsp2100.core.mr.mrx.mr2.u & 0x80)
1066                  adsp2100.core.mr.mrx.mr2.u = 0xffff, adsp2100.core.mr.mrx.mr1.u = 0x8000, adsp2100.core.mr.mrx.mr0.u = 0x0000;
1048               if (adsp->core.mr.mrx.mr2.u & 0x80)
1049                  adsp->core.mr.mrx.mr2.u = 0xffff, adsp->core.mr.mrx.mr1.u = 0x8000, adsp->core.mr.mrx.mr0.u = 0x0000;
10671050               else
1068                  adsp2100.core.mr.mrx.mr2.u = 0x0000, adsp2100.core.mr.mrx.mr1.u = 0x7fff, adsp2100.core.mr.mrx.mr0.u = 0xffff;
1051                  adsp->core.mr.mrx.mr2.u = 0x0000, adsp->core.mr.mrx.mr1.u = 0x7fff, adsp->core.mr.mrx.mr0.u = 0xffff;
10691052            }
10701053            break;
10711054         case 0x06:
r3535r3536
10741057               int xop = (op >> 8) & 7;
10751058               int yop = (op >> 11) & 3;
10761059
1077               xop = ALU_GETXREG_UNSIGNED(xop);
1078               yop = ALU_GETYREG_UNSIGNED(yop);
1060               xop = ALU_GETXREG_UNSIGNED(adsp, xop);
1061               yop = ALU_GETYREG_UNSIGNED(adsp, yop);
10791062
10801063               temp = xop ^ yop;
1081               adsp2100.astat = (adsp2100.astat & ~QFLAG) | ((temp >> 10) & QFLAG);
1082               adsp2100.core.af.u = (yop << 1) | (adsp2100.core.ay0.u >> 15);
1083               adsp2100.core.ay0.u = (adsp2100.core.ay0.u << 1) | (temp >> 15);
1064               adsp->astat = (adsp->astat & ~QFLAG) | ((temp >> 10) & QFLAG);
1065               adsp->core.af.u = (yop << 1) | (adsp->core.ay0.u >> 15);
1066               adsp->core.ay0.u = (adsp->core.ay0.u << 1) | (temp >> 15);
10841067            }
10851068            break;
10861069         case 0x07:
r3535r3536
10891072               int xop = (op >> 8) & 7;
10901073               int res;
10911074
1092               xop = ALU_GETXREG_UNSIGNED(xop);
1075               xop = ALU_GETXREG_UNSIGNED(adsp, xop);
10931076
10941077               if (GET_Q)
1095                  res = adsp2100.core.af.u + xop;
1078                  res = adsp->core.af.u + xop;
10961079               else
1097                  res = adsp2100.core.af.u - xop;
1080                  res = adsp->core.af.u - xop;
10981081
10991082               temp = res ^ xop;
1100               adsp2100.astat = (adsp2100.astat & ~QFLAG) | ((temp >> 10) & QFLAG);
1101               adsp2100.core.af.u = (res << 1) | (adsp2100.core.ay0.u >> 15);
1102               adsp2100.core.ay0.u = (adsp2100.core.ay0.u << 1) | ((~temp >> 15) & 0x0001);
1083               adsp->astat = (adsp->astat & ~QFLAG) | ((temp >> 10) & QFLAG);
1084               adsp->core.af.u = (res << 1) | (adsp->core.ay0.u >> 15);
1085               adsp->core.ay0.u = (adsp->core.ay0.u << 1) | ((~temp >> 15) & 0x0001);
11031086            }
11041087            break;
11051088         case 0x08:
r3535r3536
11081091         case 0x09:
11091092            /* 00001001 00000000 000xxxxx  modify address register */
11101093            temp = (op >> 2) & 4;
1111            modify_address(temp + ((op >> 2) & 3), temp + (op & 3));
1094            modify_address(adsp, temp + ((op >> 2) & 3), temp + (op & 3));
11121095            break;
11131096         case 0x0a:
11141097            /* 00001010 00000000 000xxxxx  conditional return */
1115            if (CONDITION(op & 15))
1098            if (CONDITION(adsp, op & 15))
11161099            {
1117               pc_stack_pop();
1100               pc_stack_pop(adsp);
11181101
11191102               /* RTI case */
11201103               if (op & 0x000010)
1121                  stat_stack_pop();
1104                  stat_stack_pop(adsp);
11221105            }
11231106            break;
11241107         case 0x0b:
11251108            /* 00001011 00000000 xxxxxxxx  conditional jump (indirect address) */
1126            if (CONDITION(op & 15))
1109            if (CONDITION(adsp, op & 15))
11271110            {
11281111               if (op & 0x000010)
1129                  pc_stack_push();
1130               adsp2100.pc = adsp2100.i[4 + ((op >> 6) & 3)] & 0x3fff;
1131               CHANGEPC();
1112                  pc_stack_push(adsp);
1113               adsp->pc = adsp->i[4 + ((op >> 6) & 3)] & 0x3fff;
1114               CHANGEPC(adsp);
11321115            }
11331116            break;
11341117         case 0x0c:
11351118            /* 00001100 xxxxxxxx xxxxxxxx  mode control */
1136            temp = adsp2100.mstat;
1137            if (chip_type >= CHIP_TYPE_ADSP2101)
1119            temp = adsp->mstat;
1120            if (adsp->chip_type >= CHIP_TYPE_ADSP2101)
11381121            {
11391122               if (op & 0x000008) temp = (temp & ~MSTAT_GOMODE) | ((op << 5) & MSTAT_GOMODE);
11401123               if (op & 0x002000) temp = (temp & ~MSTAT_INTEGER) | ((op >> 8) & MSTAT_INTEGER);
r3535r3536
11441127            if (op & 0x000080) temp = (temp & ~MSTAT_REVERSE) | ((op >> 5) & MSTAT_REVERSE);
11451128            if (op & 0x000200) temp = (temp & ~MSTAT_STICKYV) | ((op >> 6) & MSTAT_STICKYV);
11461129            if (op & 0x000800) temp = (temp & ~MSTAT_SATURATE) | ((op >> 7) & MSTAT_SATURATE);
1147            set_mstat(temp);
1130            set_mstat(adsp, temp);
11481131            break;
11491132         case 0x0d:
11501133            /* 00001101 0000xxxx xxxxxxxx  internal data move */
1151            WRITE_REG((op >> 10) & 3, (op >> 4) & 15, READ_REG((op >> 8) & 3, op & 15));
1134            WRITE_REG(adsp, (op >> 10) & 3, (op >> 4) & 15, READ_REG(adsp, (op >> 8) & 3, op & 15));
11521135            break;
11531136         case 0x0e:
11541137            /* 00001110 0xxxxxxx xxxxxxxx  conditional shift */
1155            if (CONDITION(op & 15)) shift_op(op);
1138            if (CONDITION(adsp, op & 15)) shift_op(adsp, op);
11561139            break;
11571140         case 0x0f:
11581141            /* 00001111 0xxxxxxx xxxxxxxx  shift immediate */
1159            shift_op_imm(op);
1142            shift_op_imm(adsp, op);
11601143            break;
11611144         case 0x10:
11621145            /* 00010000 0xxxxxxx xxxxxxxx  shift with internal data register move */
1163            shift_op(op);
1164            temp = READ_REG(0, op & 15);
1165            WRITE_REG(0, (op >> 4) & 15, temp);
1146            shift_op(adsp, op);
1147            temp = READ_REG(adsp, 0, op & 15);
1148            WRITE_REG(adsp, 0, (op >> 4) & 15, temp);
11661149            break;
11671150         case 0x11:
11681151            /* 00010001 xxxxxxxx xxxxxxxx  shift with pgm memory read/write */
11691152            if (op & 0x8000)
11701153            {
1171               pgm_write_dag2(op, READ_REG(0, (op >> 4) & 15));
1172               shift_op(op);
1154               pgm_write_dag2(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1155               shift_op(adsp, op);
11731156            }
11741157            else
11751158            {
1176               shift_op(op);
1177               WRITE_REG(0, (op >> 4) & 15, pgm_read_dag2(op));
1159               shift_op(adsp, op);
1160               WRITE_REG(adsp, 0, (op >> 4) & 15, pgm_read_dag2(adsp, op));
11781161            }
11791162            break;
11801163         case 0x12:
11811164            /* 00010010 xxxxxxxx xxxxxxxx  shift with data memory read/write DAG1 */
11821165            if (op & 0x8000)
11831166            {
1184               data_write_dag1(op, READ_REG(0, (op >> 4) & 15));
1185               shift_op(op);
1167               data_write_dag1(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1168               shift_op(adsp, op);
11861169            }
11871170            else
11881171            {
1189               shift_op(op);
1190               WRITE_REG(0, (op >> 4) & 15, data_read_dag1(op));
1172               shift_op(adsp, op);
1173               WRITE_REG(adsp, 0, (op >> 4) & 15, data_read_dag1(adsp, op));
11911174            }
11921175            break;
11931176         case 0x13:
11941177            /* 00010011 xxxxxxxx xxxxxxxx  shift with data memory read/write DAG2 */
11951178            if (op & 0x8000)
11961179            {
1197               data_write_dag2(op, READ_REG(0, (op >> 4) & 15));
1198               shift_op(op);
1180               data_write_dag2(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1181               shift_op(adsp, op);
11991182            }
12001183            else
12011184            {
1202               shift_op(op);
1203               WRITE_REG(0, (op >> 4) & 15, data_read_dag2(op));
1185               shift_op(adsp, op);
1186               WRITE_REG(adsp, 0, (op >> 4) & 15, data_read_dag2(adsp, op));
12041187            }
12051188            break;
12061189         case 0x14: case 0x15: case 0x16: case 0x17:
12071190            /* 000101xx xxxxxxxx xxxxxxxx  do until */
1208            loop_stack_push(op & 0x3ffff);
1209            pc_stack_push();
1191            loop_stack_push(adsp, op & 0x3ffff);
1192            pc_stack_push(adsp);
12101193            break;
12111194         case 0x18: case 0x19: case 0x1a: case 0x1b:
12121195            /* 000110xx xxxxxxxx xxxxxxxx  conditional jump (immediate addr) */
1213            if (CONDITION(op & 15))
1196            if (CONDITION(adsp, op & 15))
12141197            {
1215               adsp2100.pc = (op >> 4) & 0x3fff;
1216               CHANGEPC();
1198               adsp->pc = (op >> 4) & 0x3fff;
1199               CHANGEPC(adsp);
12171200               /* check for a busy loop */
1218               if (adsp2100.pc == adsp2100.ppc)
1219                  adsp2100_icount = 0;
1201               if (adsp->pc == adsp->ppc)
1202                  adsp->icount = 0;
12201203            }
12211204            break;
12221205         case 0x1c: case 0x1d: case 0x1e: case 0x1f:
12231206            /* 000111xx xxxxxxxx xxxxxxxx  conditional call (immediate addr) */
1224            if (CONDITION(op & 15))
1207            if (CONDITION(adsp, op & 15))
12251208            {
1226               pc_stack_push();
1227               adsp2100.pc = (op >> 4) & 0x3fff;
1228               CHANGEPC();
1209               pc_stack_push(adsp);
1210               adsp->pc = (op >> 4) & 0x3fff;
1211               CHANGEPC(adsp);
12291212            }
12301213            break;
12311214         case 0x20: case 0x21:
12321215            /* 0010000x xxxxxxxx xxxxxxxx  conditional MAC to MR */
1233            if (CONDITION(op & 15))
1216            if (CONDITION(adsp, op & 15))
12341217            {
1235               if (chip_type >= CHIP_TYPE_ADSP2181 && (op & 0x0018f0) == 0x000010)
1236                  mac_op_mr_xop(op);
1218               if (adsp->chip_type >= CHIP_TYPE_ADSP2181 && (op & 0x0018f0) == 0x000010)
1219                  mac_op_mr_xop(adsp, op);
12371220               else
1238                  mac_op_mr(op);
1221                  mac_op_mr(adsp, op);
12391222            }
12401223            break;
12411224         case 0x22: case 0x23:
12421225            /* 0010001x xxxxxxxx xxxxxxxx  conditional ALU to AR */
1243            if (CONDITION(op & 15))
1226            if (CONDITION(adsp, op & 15))
12441227            {
1245               if (chip_type >= CHIP_TYPE_ADSP2181 && (op & 0x000010) == 0x000010)
1246                  alu_op_ar_const(op);
1228               if (adsp->chip_type >= CHIP_TYPE_ADSP2181 && (op & 0x000010) == 0x000010)
1229                  alu_op_ar_const(adsp, op);
12471230               else
1248                  alu_op_ar(op);
1231                  alu_op_ar(adsp, op);
12491232            }
12501233            break;
12511234         case 0x24: case 0x25:
12521235            /* 0010010x xxxxxxxx xxxxxxxx  conditional MAC to MF */
1253            if (CONDITION(op & 15))
1236            if (CONDITION(adsp, op & 15))
12541237            {
1255               if (chip_type >= CHIP_TYPE_ADSP2181 && (op & 0x0018f0) == 0x000010)
1256                  mac_op_mf_xop(op);
1238               if (adsp->chip_type >= CHIP_TYPE_ADSP2181 && (op & 0x0018f0) == 0x000010)
1239                  mac_op_mf_xop(adsp, op);
12571240               else
1258                  mac_op_mf(op);
1241                  mac_op_mf(adsp, op);
12591242            }
12601243            break;
12611244         case 0x26: case 0x27:
12621245            /* 0010011x xxxxxxxx xxxxxxxx  conditional ALU to AF */
1263            if (CONDITION(op & 15))
1246            if (CONDITION(adsp, op & 15))
12641247            {
1265               if (chip_type >= CHIP_TYPE_ADSP2181 && (op & 0x000010) == 0x000010)
1266                  alu_op_af_const(op);
1248               if (adsp->chip_type >= CHIP_TYPE_ADSP2181 && (op & 0x000010) == 0x000010)
1249                  alu_op_af_const(adsp, op);
12671250               else
1268                  alu_op_af(op);
1251                  alu_op_af(adsp, op);
12691252            }
12701253            break;
12711254         case 0x28: case 0x29:
12721255            /* 0010100x xxxxxxxx xxxxxxxx  MAC to MR with internal data register move */
1273            temp = READ_REG(0, op & 15);
1274            mac_op_mr(op);
1275            WRITE_REG(0, (op >> 4) & 15, temp);
1256            temp = READ_REG(adsp, 0, op & 15);
1257            mac_op_mr(adsp, op);
1258            WRITE_REG(adsp, 0, (op >> 4) & 15, temp);
12761259            break;
12771260         case 0x2a: case 0x2b:
12781261            /* 0010101x xxxxxxxx xxxxxxxx  ALU to AR with internal data register move */
1279            if (chip_type >= CHIP_TYPE_ADSP2181 && (op & 0x0000ff) == 0x0000aa)
1280               alu_op_none(op);
1262            if (adsp->chip_type >= CHIP_TYPE_ADSP2181 && (op & 0x0000ff) == 0x0000aa)
1263               alu_op_none(adsp, op);
12811264            else
12821265            {
1283               temp = READ_REG(0, op & 15);
1284               alu_op_ar(op);
1285               WRITE_REG(0, (op >> 4) & 15, temp);
1266               temp = READ_REG(adsp, 0, op & 15);
1267               alu_op_ar(adsp, op);
1268               WRITE_REG(adsp, 0, (op >> 4) & 15, temp);
12861269            }
12871270            break;
12881271         case 0x2c: case 0x2d:
12891272            /* 0010110x xxxxxxxx xxxxxxxx  MAC to MF with internal data register move */
1290            temp = READ_REG(0, op & 15);
1291            mac_op_mf(op);
1292            WRITE_REG(0, (op >> 4) & 15, temp);
1273            temp = READ_REG(adsp, 0, op & 15);
1274            mac_op_mf(adsp, op);
1275            WRITE_REG(adsp, 0, (op >> 4) & 15, temp);
12931276            break;
12941277         case 0x2e: case 0x2f:
12951278            /* 0010111x xxxxxxxx xxxxxxxx  ALU to AF with internal data register move */
1296            temp = READ_REG(0, op & 15);
1297            alu_op_af(op);
1298            WRITE_REG(0, (op >> 4) & 15, temp);
1279            temp = READ_REG(adsp, 0, op & 15);
1280            alu_op_af(adsp, op);
1281            WRITE_REG(adsp, 0, (op >> 4) & 15, temp);
12991282            break;
13001283         case 0x30: case 0x31: case 0x32: case 0x33:
13011284            /* 001100xx xxxxxxxx xxxxxxxx  load non-data register immediate (group 0) */
1302            WRITE_REG(0, op & 15, (INT32)(op << 14) >> 18);
1285            WRITE_REG(adsp, 0, op & 15, (INT32)(op << 14) >> 18);
13031286            break;
13041287         case 0x34: case 0x35: case 0x36: case 0x37:
13051288            /* 001101xx xxxxxxxx xxxxxxxx  load non-data register immediate (group 1) */
1306            WRITE_REG(1, op & 15, (INT32)(op << 14) >> 18);
1289            WRITE_REG(adsp, 1, op & 15, (INT32)(op << 14) >> 18);
13071290            break;
13081291         case 0x38: case 0x39: case 0x3a: case 0x3b:
13091292            /* 001110xx xxxxxxxx xxxxxxxx  load non-data register immediate (group 2) */
1310            WRITE_REG(2, op & 15, (INT32)(op << 14) >> 18);
1293            WRITE_REG(adsp, 2, op & 15, (INT32)(op << 14) >> 18);
13111294            break;
13121295         case 0x3c: case 0x3d: case 0x3e: case 0x3f:
13131296            /* 001111xx xxxxxxxx xxxxxxxx  load non-data register immediate (group 3) */
1314            WRITE_REG(3, op & 15, (INT32)(op << 14) >> 18);
1297            WRITE_REG(adsp, 3, op & 15, (INT32)(op << 14) >> 18);
13151298            break;
13161299         case 0x40: case 0x41: case 0x42: case 0x43: case 0x44: case 0x45: case 0x46: case 0x47:
13171300         case 0x48: case 0x49: case 0x4a: case 0x4b: case 0x4c: case 0x4d: case 0x4e: case 0x4f:
13181301            /* 0100xxxx xxxxxxxx xxxxxxxx  load data register immediate */
1319            WRITE_REG(0, op & 15, (op >> 4) & 0xffff);
1302            WRITE_REG(adsp, 0, op & 15, (op >> 4) & 0xffff);
13201303            break;
13211304         case 0x50: case 0x51:
13221305            /* 0101000x xxxxxxxx xxxxxxxx  MAC to MR with pgm memory read */
1323            mac_op_mr(op);
1324            WRITE_REG(0, (op >> 4) & 15, pgm_read_dag2(op));
1306            mac_op_mr(adsp, op);
1307            WRITE_REG(adsp, 0, (op >> 4) & 15, pgm_read_dag2(adsp, op));
13251308            break;
13261309         case 0x52: case 0x53:
13271310            /* 0101001x xxxxxxxx xxxxxxxx  ALU to AR with pgm memory read */
1328            alu_op_ar(op);
1329            WRITE_REG(0, (op >> 4) & 15, pgm_read_dag2(op));
1311            alu_op_ar(adsp, op);
1312            WRITE_REG(adsp, 0, (op >> 4) & 15, pgm_read_dag2(adsp, op));
13301313            break;
13311314         case 0x54: case 0x55:
13321315            /* 0101010x xxxxxxxx xxxxxxxx  MAC to MF with pgm memory read */
1333            mac_op_mf(op);
1334            WRITE_REG(0, (op >> 4) & 15, pgm_read_dag2(op));
1316            mac_op_mf(adsp, op);
1317            WRITE_REG(adsp, 0, (op >> 4) & 15, pgm_read_dag2(adsp, op));
13351318            break;
13361319         case 0x56: case 0x57:
13371320            /* 0101011x xxxxxxxx xxxxxxxx  ALU to AF with pgm memory read */
1338            alu_op_af(op);
1339            WRITE_REG(0, (op >> 4) & 15, pgm_read_dag2(op));
1321            alu_op_af(adsp, op);
1322            WRITE_REG(adsp, 0, (op >> 4) & 15, pgm_read_dag2(adsp, op));
13401323            break;
13411324         case 0x58: case 0x59:
13421325            /* 0101100x xxxxxxxx xxxxxxxx  MAC to MR with pgm memory write */
1343            pgm_write_dag2(op, READ_REG(0, (op >> 4) & 15));
1344            mac_op_mr(op);
1326            pgm_write_dag2(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1327            mac_op_mr(adsp, op);
13451328            break;
13461329         case 0x5a: case 0x5b:
13471330            /* 0101101x xxxxxxxx xxxxxxxx  ALU to AR with pgm memory write */
1348            pgm_write_dag2(op, READ_REG(0, (op >> 4) & 15));
1349            alu_op_ar(op);
1331            pgm_write_dag2(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1332            alu_op_ar(adsp, op);
13501333            break;
13511334         case 0x5c: case 0x5d:
13521335            /* 0101110x xxxxxxxx xxxxxxxx  ALU to MR with pgm memory write */
1353            pgm_write_dag2(op, READ_REG(0, (op >> 4) & 15));
1354            mac_op_mf(op);
1336            pgm_write_dag2(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1337            mac_op_mf(adsp, op);
13551338            break;
13561339         case 0x5e: case 0x5f:
13571340            /* 0101111x xxxxxxxx xxxxxxxx  ALU to MF with pgm memory write */
1358            pgm_write_dag2(op, READ_REG(0, (op >> 4) & 15));
1359            alu_op_af(op);
1341            pgm_write_dag2(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1342            alu_op_af(adsp, op);
13601343            break;
13611344         case 0x60: case 0x61:
13621345            /* 0110000x xxxxxxxx xxxxxxxx  MAC to MR with data memory read DAG1 */
1363            mac_op_mr(op);
1364            WRITE_REG(0, (op >> 4) & 15, data_read_dag1(op));
1346            mac_op_mr(adsp, op);
1347            WRITE_REG(adsp, 0, (op >> 4) & 15, data_read_dag1(adsp, op));
13651348            break;
13661349         case 0x62: case 0x63:
13671350            /* 0110001x xxxxxxxx xxxxxxxx  ALU to AR with data memory read DAG1 */
1368            alu_op_ar(op);
1369            WRITE_REG(0, (op >> 4) & 15, data_read_dag1(op));
1351            alu_op_ar(adsp, op);
1352            WRITE_REG(adsp, 0, (op >> 4) & 15, data_read_dag1(adsp, op));
13701353            break;
13711354         case 0x64: case 0x65:
13721355            /* 0110010x xxxxxxxx xxxxxxxx  MAC to MF with data memory read DAG1 */
1373            mac_op_mf(op);
1374            WRITE_REG(0, (op >> 4) & 15, data_read_dag1(op));
1356            mac_op_mf(adsp, op);
1357            WRITE_REG(adsp, 0, (op >> 4) & 15, data_read_dag1(adsp, op));
13751358            break;
13761359         case 0x66: case 0x67:
13771360            /* 0110011x xxxxxxxx xxxxxxxx  ALU to AF with data memory read DAG1 */
1378            alu_op_af(op);
1379            WRITE_REG(0, (op >> 4) & 15, data_read_dag1(op));
1361            alu_op_af(adsp, op);
1362            WRITE_REG(adsp, 0, (op >> 4) & 15, data_read_dag1(adsp, op));
13801363            break;
13811364         case 0x68: case 0x69:
13821365            /* 0110100x xxxxxxxx xxxxxxxx  MAC to MR with data memory write DAG1 */
1383            data_write_dag1(op, READ_REG(0, (op >> 4) & 15));
1384            mac_op_mr(op);
1366            data_write_dag1(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1367            mac_op_mr(adsp, op);
13851368            break;
13861369         case 0x6a: case 0x6b:
13871370            /* 0110101x xxxxxxxx xxxxxxxx  ALU to AR with data memory write DAG1 */
1388            data_write_dag1(op, READ_REG(0, (op >> 4) & 15));
1389            alu_op_ar(op);
1371            data_write_dag1(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1372            alu_op_ar(adsp, op);
13901373            break;
13911374         case 0x6c: case 0x6d:
13921375            /* 0111110x xxxxxxxx xxxxxxxx  MAC to MF with data memory write DAG1 */
1393            data_write_dag1(op, READ_REG(0, (op >> 4) & 15));
1394            mac_op_mf(op);
1376            data_write_dag1(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1377            mac_op_mf(adsp, op);
13951378            break;
13961379         case 0x6e: case 0x6f:
13971380            /* 0111111x xxxxxxxx xxxxxxxx  ALU to AF with data memory write DAG1 */
1398            data_write_dag1(op, READ_REG(0, (op >> 4) & 15));
1399            alu_op_af(op);
1381            data_write_dag1(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1382            alu_op_af(adsp, op);
14001383            break;
14011384         case 0x70: case 0x71:
14021385            /* 0111000x xxxxxxxx xxxxxxxx  MAC to MR with data memory read DAG2 */
1403            mac_op_mr(op);
1404            WRITE_REG(0, (op >> 4) & 15, data_read_dag2(op));
1386            mac_op_mr(adsp, op);
1387            WRITE_REG(adsp, 0, (op >> 4) & 15, data_read_dag2(adsp, op));
14051388            break;
14061389         case 0x72: case 0x73:
14071390            /* 0111001x xxxxxxxx xxxxxxxx  ALU to AR with data memory read DAG2 */
1408            alu_op_ar(op);
1409            WRITE_REG(0, (op >> 4) & 15, data_read_dag2(op));
1391            alu_op_ar(adsp, op);
1392            WRITE_REG(adsp, 0, (op >> 4) & 15, data_read_dag2(adsp, op));
14101393            break;
14111394         case 0x74: case 0x75:
14121395            /* 0111010x xxxxxxxx xxxxxxxx  MAC to MF with data memory read DAG2 */
1413            mac_op_mf(op);
1414            WRITE_REG(0, (op >> 4) & 15, data_read_dag2(op));
1396            mac_op_mf(adsp, op);
1397            WRITE_REG(adsp, 0, (op >> 4) & 15, data_read_dag2(adsp, op));
14151398            break;
14161399         case 0x76: case 0x77:
14171400            /* 0111011x xxxxxxxx xxxxxxxx  ALU to AF with data memory read DAG2 */
1418            alu_op_af(op);
1419            WRITE_REG(0, (op >> 4) & 15, data_read_dag2(op));
1401            alu_op_af(adsp, op);
1402            WRITE_REG(adsp, 0, (op >> 4) & 15, data_read_dag2(adsp, op));
14201403            break;
14211404         case 0x78: case 0x79:
14221405            /* 0111100x xxxxxxxx xxxxxxxx  MAC to MR with data memory write DAG2 */
1423            data_write_dag2(op, READ_REG(0, (op >> 4) & 15));
1424            mac_op_mr(op);
1406            data_write_dag2(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1407            mac_op_mr(adsp, op);
14251408            break;
14261409         case 0x7a: case 0x7b:
14271410            /* 0111101x xxxxxxxx xxxxxxxx  ALU to AR with data memory write DAG2 */
1428            data_write_dag2(op, READ_REG(0, (op >> 4) & 15));
1429            alu_op_ar(op);
1411            data_write_dag2(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1412            alu_op_ar(adsp, op);
14301413            break;
14311414         case 0x7c: case 0x7d:
14321415            /* 0111110x xxxxxxxx xxxxxxxx  MAC to MF with data memory write DAG2 */
1433            data_write_dag2(op, READ_REG(0, (op >> 4) & 15));
1434            mac_op_mf(op);
1416            data_write_dag2(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1417            mac_op_mf(adsp, op);
14351418            break;
14361419         case 0x7e: case 0x7f:
14371420            /* 0111111x xxxxxxxx xxxxxxxx  ALU to AF with data memory write DAG2 */
1438            data_write_dag2(op, READ_REG(0, (op >> 4) & 15));
1439            alu_op_af(op);
1421            data_write_dag2(adsp, op, READ_REG(adsp, 0, (op >> 4) & 15));
1422            alu_op_af(adsp, op);
14401423            break;
14411424         case 0x80: case 0x81: case 0x82: case 0x83:
14421425            /* 100000xx xxxxxxxx xxxxxxxx  read data memory (immediate addr) to reg group 0 */
1443            WRITE_REG(0, op & 15, RWORD_DATA((op >> 4) & 0x3fff));
1426            WRITE_REG(adsp, 0, op & 15, RWORD_DATA((op >> 4) & 0x3fff));
14441427            break;
14451428         case 0x84: case 0x85: case 0x86: case 0x87:
14461429            /* 100001xx xxxxxxxx xxxxxxxx  read data memory (immediate addr) to reg group 1 */
1447            WRITE_REG(1, op & 15, RWORD_DATA((op >> 4) & 0x3fff));
1430            WRITE_REG(adsp, 1, op & 15, RWORD_DATA((op >> 4) & 0x3fff));
14481431            break;
14491432         case 0x88: case 0x89: case 0x8a: case 0x8b:
14501433            /* 100010xx xxxxxxxx xxxxxxxx  read data memory (immediate addr) to reg group 2 */
1451            WRITE_REG(2, op & 15, RWORD_DATA((op >> 4) & 0x3fff));
1434            WRITE_REG(adsp, 2, op & 15, RWORD_DATA((op >> 4) & 0x3fff));
14521435            break;
14531436         case 0x8c: case 0x8d: case 0x8e: case 0x8f:
14541437            /* 100011xx xxxxxxxx xxxxxxxx  read data memory (immediate addr) to reg group 3 */
1455            WRITE_REG(3, op & 15, RWORD_DATA((op >> 4) & 0x3fff));
1438            WRITE_REG(adsp, 3, op & 15, RWORD_DATA((op >> 4) & 0x3fff));
14561439            break;
14571440         case 0x90: case 0x91: case 0x92: case 0x93:
14581441            /* 1001xxxx xxxxxxxx xxxxxxxx  write data memory (immediate addr) from reg group 0 */
1459            WWORD_DATA((op >> 4) & 0x3fff, READ_REG(0, op & 15));
1442            WWORD_DATA((op >> 4) & 0x3fff, READ_REG(adsp, 0, op & 15));
14601443            break;
14611444         case 0x94: case 0x95: case 0x96: case 0x97:
14621445            /* 1001xxxx xxxxxxxx xxxxxxxx  write data memory (immediate addr) from reg group 1 */
1463            WWORD_DATA((op >> 4) & 0x3fff, READ_REG(1, op & 15));
1446            WWORD_DATA((op >> 4) & 0x3fff, READ_REG(adsp, 1, op & 15));
14641447            break;
14651448         case 0x98: case 0x99: case 0x9a: case 0x9b:
14661449            /* 1001xxxx xxxxxxxx xxxxxxxx  write data memory (immediate addr) from reg group 2 */
1467            WWORD_DATA((op >> 4) & 0x3fff, READ_REG(2, op & 15));
1450            WWORD_DATA((op >> 4) & 0x3fff, READ_REG(adsp, 2, op & 15));
14681451            break;
14691452         case 0x9c: case 0x9d: case 0x9e: case 0x9f:
14701453            /* 1001xxxx xxxxxxxx xxxxxxxx  write data memory (immediate addr) from reg group 3 */
1471            WWORD_DATA((op >> 4) & 0x3fff, READ_REG(3, op & 15));
1454            WWORD_DATA((op >> 4) & 0x3fff, READ_REG(adsp, 3, op & 15));
14721455            break;
14731456         case 0xa0: case 0xa1: case 0xa2: case 0xa3: case 0xa4: case 0xa5: case 0xa6: case 0xa7:
14741457         case 0xa8: case 0xa9: case 0xaa: case 0xab: case 0xac: case 0xad: case 0xae: case 0xaf:
14751458            /* 1010xxxx xxxxxxxx xxxxxxxx  data memory write (immediate) DAG1 */
1476            data_write_dag1(op, (op >> 4) & 0xffff);
1459            data_write_dag1(adsp, op, (op >> 4) & 0xffff);
14771460            break;
14781461         case 0xb0: case 0xb1: case 0xb2: case 0xb3: case 0xb4: case 0xb5: case 0xb6: case 0xb7:
14791462         case 0xb8: case 0xb9: case 0xba: case 0xbb: case 0xbc: case 0xbd: case 0xbe: case 0xbf:
14801463            /* 1011xxxx xxxxxxxx xxxxxxxx  data memory write (immediate) DAG2 */
1481            data_write_dag2(op, (op >> 4) & 0xffff);
1464            data_write_dag2(adsp, op, (op >> 4) & 0xffff);
14821465            break;
14831466         case 0xc0: case 0xc1:
14841467            /* 1100000x xxxxxxxx xxxxxxxx  MAC to MR with data read to AX0 & pgm read to AY0 */
1485            mac_op_mr(op);
1486            adsp2100.core.ax0.u = data_read_dag1(op);
1487            adsp2100.core.ay0.u = pgm_read_dag2(op >> 4);
1468            mac_op_mr(adsp, op);
1469            adsp->core.ax0.u = data_read_dag1(adsp, op);
1470            adsp->core.ay0.u = pgm_read_dag2(adsp, op >> 4);
14881471            break;
14891472         case 0xc2: case 0xc3:
14901473            /* 1100001x xxxxxxxx xxxxxxxx  ALU to AR with data read to AX0 & pgm read to AY0 */
1491            alu_op_ar(op);
1492            adsp2100.core.ax0.u = data_read_dag1(op);
1493            adsp2100.core.ay0.u = pgm_read_dag2(op >> 4);
1474            alu_op_ar(adsp, op);
1475            adsp->core.ax0.u = data_read_dag1(adsp, op);
1476            adsp->core.ay0.u = pgm_read_dag2(adsp, op >> 4);
14941477            break;
14951478         case 0xc4: case 0xc5:
14961479            /* 1100010x xxxxxxxx xxxxxxxx  MAC to MR with data read to AX1 & pgm read to AY0 */
1497            mac_op_mr(op);
1498            adsp2100.core.ax1.u = data_read_dag1(op);
1499            adsp2100.core.ay0.u = pgm_read_dag2(op >> 4);
1480            mac_op_mr(adsp, op);
1481            adsp->core.ax1.u = data_read_dag1(adsp, op);
1482            adsp->core.ay0.u = pgm_read_dag2(adsp, op >> 4);
15001483            break;
15011484         case 0xc6: case 0xc7:
15021485            /* 1100011x xxxxxxxx xxxxxxxx  ALU to AR with data read to AX1 & pgm read to AY0 */
1503            alu_op_ar(op);
1504            adsp2100.core.ax1.u = data_read_dag1(op);
1505            adsp2100.core.ay0.u = pgm_read_dag2(op >> 4);
1486            alu_op_ar(adsp, op);
1487            adsp->core.ax1.u = data_read_dag1(adsp, op);
1488            adsp->core.ay0.u = pgm_read_dag2(adsp, op >> 4);
15061489            break;
15071490         case 0xc8: case 0xc9:
15081491            /* 1100100x xxxxxxxx xxxxxxxx  MAC to MR with data read to MX0 & pgm read to AY0 */
1509            mac_op_mr(op);
1510            adsp2100.core.mx0.u = data_read_dag1(op);
1511            adsp2100.core.ay0.u = pgm_read_dag2(op >> 4);
1492            mac_op_mr(adsp, op);
1493            adsp->core.mx0.u = data_read_dag1(adsp, op);
1494            adsp->core.ay0.u = pgm_read_dag2(adsp, op >> 4);
15121495            break;
15131496         case 0xca: case 0xcb:
15141497            /* 1100101x xxxxxxxx xxxxxxxx  ALU to AR with data read to MX0 & pgm read to AY0 */
1515            alu_op_ar(op);
1516            adsp2100.core.mx0.u = data_read_dag1(op);
1517            adsp2100.core.ay0.u = pgm_read_dag2(op >> 4);
1498            alu_op_ar(adsp, op);
1499            adsp->core.mx0.u = data_read_dag1(adsp, op);
1500            adsp->core.ay0.u = pgm_read_dag2(adsp, op >> 4);
15181501            break;
15191502         case 0xcc: case 0xcd:
15201503            /* 1100110x xxxxxxxx xxxxxxxx  MAC to MR with data read to MX1 & pgm read to AY0 */
1521            mac_op_mr(op);
1522            adsp2100.core.mx1.u = data_read_dag1(op);
1523            adsp2100.core.ay0.u = pgm_read_dag2(op >> 4);
1504            mac_op_mr(adsp, op);
1505            adsp->core.mx1.u = data_read_dag1(adsp, op);
1506            adsp->core.ay0.u = pgm_read_dag2(adsp, op >> 4);
15241507            break;
15251508         case 0xce: case 0xcf:
15261509            /* 1100111x xxxxxxxx xxxxxxxx  ALU to AR with data read to MX1 & pgm read to AY0 */
1527            alu_op_ar(op);
1528            adsp2100.core.mx1.u = data_read_dag1(op);
1529            adsp2100.core.ay0.u = pgm_read_dag2(op >> 4);
1510            alu_op_ar(adsp, op);
1511            adsp->core.mx1.u = data_read_dag1(adsp, op);
1512            adsp->core.ay0.u = pgm_read_dag2(adsp, op >> 4);
15301513            break;
15311514         case 0xd0: case 0xd1:
15321515            /* 1101000x xxxxxxxx xxxxxxxx  MAC to MR with data read to AX0 & pgm read to AY1 */
1533            mac_op_mr(op);
1534            adsp2100.core.ax0.u = data_read_dag1(op);
1535            adsp2100.core.ay1.u = pgm_read_dag2(op >> 4);
1516            mac_op_mr(adsp, op);
1517            adsp->core.ax0.u = data_read_dag1(adsp, op);
1518            adsp->core.ay1.u = pgm_read_dag2(adsp, op >> 4);
15361519            break;
15371520         case 0xd2: case 0xd3:
15381521            /* 1101001x xxxxxxxx xxxxxxxx  ALU to AR with data read to AX0 & pgm read to AY1 */
1539            alu_op_ar(op);
1540            adsp2100.core.ax0.u = data_read_dag1(op);
1541            adsp2100.core.ay1.u = pgm_read_dag2(op >> 4);
1522            alu_op_ar(adsp, op);
1523            adsp->core.ax0.u = data_read_dag1(adsp, op);
1524            adsp->core.ay1.u = pgm_read_dag2(adsp, op >> 4);
15421525            break;
15431526         case 0xd4: case 0xd5:
15441527            /* 1101010x xxxxxxxx xxxxxxxx  MAC to MR with data read to AX1 & pgm read to AY1 */
1545            mac_op_mr(op);
1546            adsp2100.core.ax1.u = data_read_dag1(op);
1547            adsp2100.core.ay1.u = pgm_read_dag2(op >> 4);
1528            mac_op_mr(adsp, op);
1529            adsp->core.ax1.u = data_read_dag1(adsp, op);
1530            adsp->core.ay1.u = pgm_read_dag2(adsp, op >> 4);
15481531            break;
15491532         case 0xd6: case 0xd7:
15501533            /* 1101011x xxxxxxxx xxxxxxxx  ALU to AR with data read to AX1 & pgm read to AY1 */
1551            alu_op_ar(op);
1552            adsp2100.core.ax1.u = data_read_dag1(op);
1553            adsp2100.core.ay1.u = pgm_read_dag2(op >> 4);
1534            alu_op_ar(adsp, op);
1535            adsp->core.ax1.u = data_read_dag1(adsp, op);
1536            adsp->core.ay1.u = pgm_read_dag2(adsp, op >> 4);
15541537            break;
15551538         case 0xd8: case 0xd9:
15561539            /* 1101100x xxxxxxxx xxxxxxxx  MAC to MR with data read to MX0 & pgm read to AY1 */
1557            mac_op_mr(op);
1558            adsp2100.core.mx0.u = data_read_dag1(op);
1559            adsp2100.core.ay1.u = pgm_read_dag2(op >> 4);
1540            mac_op_mr(adsp, op);
1541            adsp->core.mx0.u = data_read_dag1(adsp, op);
1542            adsp->core.ay1.u = pgm_read_dag2(adsp, op >> 4);
15601543            break;
15611544         case 0xda: case 0xdb:
15621545            /* 1101101x xxxxxxxx xxxxxxxx  ALU to AR with data read to MX0 & pgm read to AY1 */
1563            alu_op_ar(op);
1564            adsp2100.core.mx0.u = data_read_dag1(op);
1565            adsp2100.core.ay1.u = pgm_read_dag2(op >> 4);
1546            alu_op_ar(adsp, op);
1547            adsp->core.mx0.u = data_read_dag1(adsp, op);
1548            adsp->core.ay1.u = pgm_read_dag2(adsp, op >> 4);
15661549            break;
15671550         case 0xdc: case 0xdd:
15681551            /* 1101110x xxxxxxxx xxxxxxxx  MAC to MR with data read to MX1 & pgm read to AY1 */
1569            mac_op_mr(op);
1570            adsp2100.core.mx1.u = data_read_dag1(op);
1571            adsp2100.core.ay1.u = pgm_read_dag2(op >> 4);
1552            mac_op_mr(adsp, op);
1553            adsp->core.mx1.u = data_read_dag1(adsp, op);
1554            adsp->core.ay1.u = pgm_read_dag2(adsp, op >> 4);
15721555            break;
15731556         case 0xde: case 0xdf:
15741557            /* 1101111x xxxxxxxx xxxxxxxx  ALU to AR with data read to MX1 & pgm read to AY1 */
1575            alu_op_ar(op);
1576            adsp2100.core.mx1.u = data_read_dag1(op);
1577            adsp2100.core.ay1.u = pgm_read_dag2(op >> 4);
1558            alu_op_ar(adsp, op);
1559            adsp->core.mx1.u = data_read_dag1(adsp, op);
1560            adsp->core.ay1.u = pgm_read_dag2(adsp, op >> 4);
15781561            break;
15791562         case 0xe0: case 0xe1:
15801563            /* 1110000x xxxxxxxx xxxxxxxx  MAC to MR with data read to AX0 & pgm read to MY0 */
1581            mac_op_mr(op);
1582            adsp2100.core.ax0.u = data_read_dag1(op);
1583            adsp2100.core.my0.u = pgm_read_dag2(op >> 4);
1564            mac_op_mr(adsp, op);
1565            adsp->core.ax0.u = data_read_dag1(adsp, op);
1566            adsp->core.my0.u = pgm_read_dag2(adsp, op >> 4);
15841567            break;
15851568         case 0xe2: case 0xe3:
15861569            /* 1110001x xxxxxxxx xxxxxxxx  ALU to AR with data read to AX0 & pgm read to MY0 */
1587            alu_op_ar(op);
1588            adsp2100.core.ax0.u = data_read_dag1(op);
1589            adsp2100.core.my0.u = pgm_read_dag2(op >> 4);
1570            alu_op_ar(adsp, op);
1571            adsp->core.ax0.u = data_read_dag1(adsp, op);
1572            adsp->core.my0.u = pgm_read_dag2(adsp, op >> 4);
15901573            break;
15911574         case 0xe4: case 0xe5:
15921575            /* 1110010x xxxxxxxx xxxxxxxx  MAC to MR with data read to AX1 & pgm read to MY0 */
1593            mac_op_mr(op);
1594            adsp2100.core.ax1.u = data_read_dag1(op);
1595            adsp2100.core.my0.u = pgm_read_dag2(op >> 4);
1576            mac_op_mr(adsp, op);
1577            adsp->core.ax1.u = data_read_dag1(adsp, op);
1578            adsp->core.my0.u = pgm_read_dag2(adsp, op >> 4);
15961579            break;
15971580         case 0xe6: case 0xe7:
15981581            /* 1110011x xxxxxxxx xxxxxxxx  ALU to AR with data read to AX1 & pgm read to MY0 */
1599            alu_op_ar(op);
1600            adsp2100.core.ax1.u = data_read_dag1(op);
1601            adsp2100.core.my0.u = pgm_read_dag2(op >> 4);
1582            alu_op_ar(adsp, op);
1583            adsp->core.ax1.u = data_read_dag1(adsp, op);
1584            adsp->core.my0.u = pgm_read_dag2(adsp, op >> 4);
16021585            break;
16031586         case 0xe8: case 0xe9:
16041587            /* 1110100x xxxxxxxx xxxxxxxx  MAC to MR with data read to MX0 & pgm read to MY0 */
1605            mac_op_mr(op);
1606            adsp2100.core.mx0.u = data_read_dag1(op);
1607            adsp2100.core.my0.u = pgm_read_dag2(op >> 4);
1588            mac_op_mr(adsp, op);
1589            adsp->core.mx0.u = data_read_dag1(adsp, op);
1590            adsp->core.my0.u = pgm_read_dag2(adsp, op >> 4);
16081591            break;
16091592         case 0xea: case 0xeb:
16101593            /* 1110101x xxxxxxxx xxxxxxxx  ALU to AR with data read to MX0 & pgm read to MY0 */
1611            alu_op_ar(op);
1612            adsp2100.core.mx0.u = data_read_dag1(op);
1613            adsp2100.core.my0.u = pgm_read_dag2(op >> 4);
1594            alu_op_ar(adsp, op);
1595            adsp->core.mx0.u = data_read_dag1(adsp, op);
1596            adsp->core.my0.u = pgm_read_dag2(adsp, op >> 4);
16141597            break;
16151598         case 0xec: case 0xed:
16161599            /* 1110110x xxxxxxxx xxxxxxxx  MAC to MR with data read to MX1 & pgm read to MY0 */
1617            mac_op_mr(op);
1618            adsp2100.core.mx1.u = data_read_dag1(op);
1619            adsp2100.core.my0.u = pgm_read_dag2(op >> 4);
1600            mac_op_mr(adsp, op);
1601            adsp->core.mx1.u = data_read_dag1(adsp, op);
1602            adsp->core.my0.u = pgm_read_dag2(adsp, op >> 4);
16201603            break;
16211604         case 0xee: case 0xef:
16221605            /* 1110111x xxxxxxxx xxxxxxxx  ALU to AR with data read to MX1 & pgm read to MY0 */
1623            alu_op_ar(op);
1624            adsp2100.core.mx1.u = data_read_dag1(op);
1625            adsp2100.core.my0.u = pgm_read_dag2(op >> 4);
1606            alu_op_ar(adsp, op);
1607            adsp->core.mx1.u = data_read_dag1(adsp, op);
1608            adsp->core.my0.u = pgm_read_dag2(adsp, op >> 4);
16261609            break;
16271610         case 0xf0: case 0xf1:
16281611            /* 1111000x xxxxxxxx xxxxxxxx  MAC to MR with data read to AX0 & pgm read to MY1 */
1629            mac_op_mr(op);
1630            adsp2100.core.ax0.u = data_read_dag1(op);
1631            adsp2100.core.my1.u = pgm_read_dag2(op >> 4);
1612            mac_op_mr(adsp, op);
1613            adsp->core.ax0.u = data_read_dag1(adsp, op);
1614            adsp->core.my1.u = pgm_read_dag2(adsp, op >> 4);
16321615            break;
16331616         case 0xf2: case 0xf3:
16341617            /* 1111001x xxxxxxxx xxxxxxxx  ALU to AR with data read to AX0 & pgm read to MY1 */
1635            alu_op_ar(op);
1636            adsp2100.core.ax0.u = data_read_dag1(op);
1637            adsp2100.core.my1.u = pgm_read_dag2(op >> 4);
1618            alu_op_ar(adsp, op);
1619            adsp->core.ax0.u = data_read_dag1(adsp, op);
1620            adsp->core.my1.u = pgm_read_dag2(adsp, op >> 4);
16381621            break;
16391622         case 0xf4: case 0xf5:
16401623            /* 1111010x xxxxxxxx xxxxxxxx  MAC to MR with data read to AX1 & pgm read to MY1 */
1641            mac_op_mr(op);
1642            adsp2100.core.ax1.u = data_read_dag1(op);
1643            adsp2100.core.my1.u = pgm_read_dag2(op >> 4);
1624            mac_op_mr(adsp, op);
1625            adsp->core.ax1.u = data_read_dag1(adsp, op);
1626            adsp->core.my1.u = pgm_read_dag2(adsp, op >> 4);
16441627            break;
16451628         case 0xf6: case 0xf7:
16461629            /* 1111011x xxxxxxxx xxxxxxxx  ALU to AR with data read to AX1 & pgm read to MY1 */
1647            alu_op_ar(op);
1648            adsp2100.core.ax1.u = data_read_dag1(op);
1649            adsp2100.core.my1.u = pgm_read_dag2(op >> 4);
1630            alu_op_ar(adsp, op);
1631            adsp->core.ax1.u = data_read_dag1(adsp, op);
1632            adsp->core.my1.u = pgm_read_dag2(adsp, op >> 4);
16501633            break;
16511634         case 0xf8: case 0xf9:
16521635            /* 1111100x xxxxxxxx xxxxxxxx  MAC to MR with data read to MX0 & pgm read to MY1 */
1653            mac_op_mr(op);
1654            adsp2100.core.mx0.u = data_read_dag1(op);
1655            adsp2100.core.my1.u = pgm_read_dag2(op >> 4);
1636            mac_op_mr(adsp, op);
1637            adsp->core.mx0.u = data_read_dag1(adsp, op);
1638            adsp->core.my1.u = pgm_read_dag2(adsp, op >> 4);
16561639            break;
16571640         case 0xfa: case 0xfb:
16581641            /* 1111101x xxxxxxxx xxxxxxxx  ALU to AR with data read to MX0 & pgm read to MY1 */
1659            alu_op_ar(op);
1660            adsp2100.core.mx0.u = data_read_dag1(op);
1661            adsp2100.core.my1.u = pgm_read_dag2(op >> 4);
1642            alu_op_ar(adsp, op);
1643            adsp->core.mx0.u = data_read_dag1(adsp, op);
1644            adsp->core.my1.u = pgm_read_dag2(adsp, op >> 4);
16621645            break;
16631646         case 0xfc: case 0xfd:
16641647            /* 1111110x xxxxxxxx xxxxxxxx  MAC to MR with data read to MX1 & pgm read to MY1 */
1665            mac_op_mr(op);
1666            adsp2100.core.mx1.u = data_read_dag1(op);
1667            adsp2100.core.my1.u = pgm_read_dag2(op >> 4);
1648            mac_op_mr(adsp, op);
1649            adsp->core.mx1.u = data_read_dag1(adsp, op);
1650            adsp->core.my1.u = pgm_read_dag2(adsp, op >> 4);
16681651            break;
16691652         case 0xfe: case 0xff:
16701653            /* 1111111x xxxxxxxx xxxxxxxx  ALU to AR with data read to MX1 & pgm read to MY1 */
1671            alu_op_ar(op);
1672            adsp2100.core.mx1.u = data_read_dag1(op);
1673            adsp2100.core.my1.u = pgm_read_dag2(op >> 4);
1654            alu_op_ar(adsp, op);
1655            adsp->core.mx1.u = data_read_dag1(adsp, op);
1656            adsp->core.my1.u = pgm_read_dag2(adsp, op >> 4);
16741657            break;
16751658      }
16761659
1677      adsp2100_icount--;
1678   } while (adsp2100_icount > 0);
1660      adsp->icount--;
1661   } while (adsp->icount > 0);
16791662
1680   return cycles - adsp2100_icount;
1663   return cycles - adsp->icount;
16811664}
16821665
16831666
r3535r3536
16861669    DEBUGGER DEFINITIONS
16871670***************************************************************************/
16881671
1689extern offs_t adsp2100_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
1672extern CPU_DISASSEMBLE( adsp21xx );
16901673
16911674
16921675
r3535r3536
16941677 * Generic set_info
16951678 **************************************************************************/
16961679
1697static void adsp21xx_set_info(UINT32 state, cpuinfo *info)
1680static CPU_SET_INFO( adsp21xx )
16981681{
1682   adsp2100_state *adsp = token;
16991683   switch (state)
17001684   {
17011685      /* --- the following bits of info are set as 64-bit signed integers --- */
17021686      case CPUINFO_INT_PC:
1703      case CPUINFO_INT_REGISTER + ADSP2100_PC:      adsp2100.pc = info->i;               break;
1687      case CPUINFO_INT_REGISTER + ADSP2100_PC:      adsp->pc = info->i;               break;
17041688
1705      case CPUINFO_INT_REGISTER + ADSP2100_AX0:      wr_ax0(info->i);                  break;
1706      case CPUINFO_INT_REGISTER + ADSP2100_AX1:      wr_ax1(info->i);                  break;
1707      case CPUINFO_INT_REGISTER + ADSP2100_AY0:      wr_ay0(info->i);                  break;
1708      case CPUINFO_INT_REGISTER + ADSP2100_AY1:      wr_ay1(info->i);                  break;
1709      case CPUINFO_INT_REGISTER + ADSP2100_AR:      wr_ar(info->i);                     break;
1710      case CPUINFO_INT_REGISTER + ADSP2100_AF:      adsp2100.core.af.u = info->i;         break;
1689      case CPUINFO_INT_REGISTER + ADSP2100_AX0:      wr_ax0(adsp, info->i);            break;
1690      case CPUINFO_INT_REGISTER + ADSP2100_AX1:      wr_ax1(adsp, info->i);            break;
1691      case CPUINFO_INT_REGISTER + ADSP2100_AY0:      wr_ay0(adsp, info->i);            break;
1692      case CPUINFO_INT_REGISTER + ADSP2100_AY1:      wr_ay1(adsp, info->i);            break;
1693      case CPUINFO_INT_REGISTER + ADSP2100_AR:      wr_ar(adsp, info->i);            break;
1694      case CPUINFO_INT_REGISTER + ADSP2100_AF:      adsp->core.af.u = info->i;         break;
17111695
1712      case CPUINFO_INT_REGISTER + ADSP2100_MX0:      wr_mx0(info->i);                  break;
1713      case CPUINFO_INT_REGISTER + ADSP2100_MX1:      wr_mx1(info->i);                  break;
1714      case CPUINFO_INT_REGISTER + ADSP2100_MY0:      wr_my0(info->i);                  break;
1715      case CPUINFO_INT_REGISTER + ADSP2100_MY1:      wr_my1(info->i);                  break;
1716      case CPUINFO_INT_REGISTER + ADSP2100_MR0:      wr_mr0(info->i);                  break;
1717      case CPUINFO_INT_REGISTER + ADSP2100_MR1:      wr_mr1(info->i);                  break;
1718      case CPUINFO_INT_REGISTER + ADSP2100_MR2:      wr_mr2(info->i);                  break;
1719      case CPUINFO_INT_REGISTER + ADSP2100_MF:      adsp2100.core.mf.u = info->i;         break;
1696      case CPUINFO_INT_REGISTER + ADSP2100_MX0:      wr_mx0(adsp, info->i);            break;
1697      case CPUINFO_INT_REGISTER + ADSP2100_MX1:      wr_mx1(adsp, info->i);            break;
1698      case CPUINFO_INT_REGISTER + ADSP2100_MY0:      wr_my0(adsp, info->i);            break;
1699      case CPUINFO_INT_REGISTER + ADSP2100_MY1:      wr_my1(adsp, info->i);            break;
1700      case CPUINFO_INT_REGISTER + ADSP2100_MR0:      wr_mr0(adsp, info->i);            break;
1701      case CPUINFO_INT_REGISTER + ADSP2100_MR1:      wr_mr1(adsp, info->i);            break;
1702      case CPUINFO_INT_REGISTER + ADSP2100_MR2:      wr_mr2(adsp, info->i);            break;
1703      case CPUINFO_INT_REGISTER + ADSP2100_MF:      adsp->core.mf.u = info->i;         break;
17201704
1721      case CPUINFO_INT_REGISTER + ADSP2100_SI:      wr_si(info->i);                     break;
1722      case CPUINFO_INT_REGISTER + ADSP2100_SE:      wr_se(info->i);                     break;
1723      case CPUINFO_INT_REGISTER + ADSP2100_SB:      wr_sb(info->i);                     break;
1724      case CPUINFO_INT_REGISTER + ADSP2100_SR0:      wr_sr0(info->i);                  break;
1725      case CPUINFO_INT_REGISTER + ADSP2100_SR1:      wr_sr1(info->i);                  break;
1705      case CPUINFO_INT_REGISTER + ADSP2100_SI:      wr_si(adsp, info->i);            break;
1706      case CPUINFO_INT_REGISTER + ADSP2100_SE:      wr_se(adsp, info->i);            break;
1707      case CPUINFO_INT_REGISTER + ADSP2100_SB:      wr_sb(adsp, info->i);            break;
1708      case CPUINFO_INT_REGISTER + ADSP2100_SR0:      wr_sr0(adsp, info->i);            break;
1709      case CPUINFO_INT_REGISTER + ADSP2100_SR1:      wr_sr1(adsp, info->i);            break;
17261710
1727      case CPUINFO_INT_REGISTER + ADSP2100_AX0_SEC:   adsp2100.alt.ax0.s = info->i;         break;
1728      case CPUINFO_INT_REGISTER + ADSP2100_AX1_SEC:   adsp2100.alt.ax1.s = info->i;         break;
1729      case CPUINFO_INT_REGISTER + ADSP2100_AY0_SEC:   adsp2100.alt.ay0.s = info->i;         break;
1730      case CPUINFO_INT_REGISTER + ADSP2100_AY1_SEC:   adsp2100.alt.ay1.s = info->i;         break;
1731      case CPUINFO_INT_REGISTER + ADSP2100_AR_SEC:   adsp2100.alt.ar.s = info->i;         break;
1732      case CPUINFO_INT_REGISTER + ADSP2100_AF_SEC:   adsp2100.alt.af.u = info->i;         break;
1711      case CPUINFO_INT_REGISTER + ADSP2100_AX0_SEC:   adsp->alt.ax0.s = info->i;         break;
1712      case CPUINFO_INT_REGISTER + ADSP2100_AX1_SEC:   adsp->alt.ax1.s = info->i;         break;
1713      case CPUINFO_INT_REGISTER + ADSP2100_AY0_SEC:   adsp->alt.ay0.s = info->i;         break;
1714      case CPUINFO_INT_REGISTER + ADSP2100_AY1_SEC:   adsp->alt.ay1.s = info->i;         break;
1715      case CPUINFO_INT_REGISTER + ADSP2100_AR_SEC:   adsp->alt.ar.s = info->i;         break;
1716      case CPUINFO_INT_REGISTER + ADSP2100_AF_SEC:   adsp->alt.af.u = info->i;         break;
17331717
1734      case CPUINFO_INT_REGISTER + ADSP2100_MX0_SEC:   adsp2100.alt.mx0.s = info->i;         break;
1735      case CPUINFO_INT_REGISTER + ADSP2100_MX1_SEC:   adsp2100.alt.mx1.s = info->i;         break;
1736      case CPUINFO_INT_REGISTER + ADSP2100_MY0_SEC:   adsp2100.alt.my0.s = info->i;         break;
1737      case CPUINFO_INT_REGISTER + ADSP2100_MY1_SEC:   adsp2100.alt.my1.s = info->i;         break;
1738      case CPUINFO_INT_REGISTER + ADSP2100_MR0_SEC:   adsp2100.alt.mr.mrx.mr0.s = info->i;   break;
1739      case CPUINFO_INT_REGISTER + ADSP2100_MR1_SEC:   adsp2100.alt.mr.mrx.mr1.s = info->i; adsp2100.alt.mr.mrx.mr2.s = (INT16)info->i >> 15; break;
1740      case CPUINFO_INT_REGISTER + ADSP2100_MR2_SEC:   adsp2100.alt.mr.mrx.mr2.s = (INT8)info->i; break;
1741      case CPUINFO_INT_REGISTER + ADSP2100_MF_SEC:   adsp2100.alt.mf.u = info->i;         break;
1718      case CPUINFO_INT_REGISTER + ADSP2100_MX0_SEC:   adsp->alt.mx0.s = info->i;         break;
1719      case CPUINFO_INT_REGISTER + ADSP2100_MX1_SEC:   adsp->alt.mx1.s = info->i;         break;
1720      case CPUINFO_INT_REGISTER + ADSP2100_MY0_SEC:   adsp->alt.my0.s = info->i;         break;
1721      case CPUINFO_INT_REGISTER + ADSP2100_MY1_SEC:   adsp->alt.my1.s = info->i;         break;
1722      case CPUINFO_INT_REGISTER + ADSP2100_MR0_SEC:   adsp->alt.mr.mrx.mr0.s = info->i;   break;
1723      case CPUINFO_INT_REGISTER + ADSP2100_MR1_SEC:   adsp->alt.mr.mrx.mr1.s = info->i; adsp->alt.mr.mrx.mr2.s = (INT16)info->i >> 15; break;
1724      case CPUINFO_INT_REGISTER + ADSP2100_MR2_SEC:   adsp->alt.mr.mrx.mr2.s = (INT8)info->i; break;
1725      case CPUINFO_INT_REGISTER + ADSP2100_MF_SEC:   adsp->alt.mf.u = info->i;         break;
17421726
1743      case CPUINFO_INT_REGISTER + ADSP2100_SI_SEC:   adsp2100.alt.si.s = info->i;         break;
1744      case CPUINFO_INT_REGISTER + ADSP2100_SE_SEC:   adsp2100.alt.se.s = (INT8)info->i;      break;
1745      case CPUINFO_INT_REGISTER + ADSP2100_SB_SEC:   adsp2100.alt.sb.s = (INT32)(info->i << 27) >> 27; break;
1746      case CPUINFO_INT_REGISTER + ADSP2100_SR0_SEC:   adsp2100.alt.sr.srx.sr0.s = info->i;   break;
1747      case CPUINFO_INT_REGISTER + ADSP2100_SR1_SEC:   adsp2100.alt.sr.srx.sr1.s = info->i;   break;
1727      case CPUINFO_INT_REGISTER + ADSP2100_SI_SEC:   adsp->alt.si.s = info->i;         break;
1728      case CPUINFO_INT_REGISTER + ADSP2100_SE_SEC:   adsp->alt.se.s = (INT8)info->i;      break;
1729      case CPUINFO_INT_REGISTER + ADSP2100_SB_SEC:   adsp->alt.sb.s = (INT32)(info->i << 27) >> 27; break;
1730      case CPUINFO_INT_REGISTER + ADSP2100_SR0_SEC:   adsp->alt.sr.srx.sr0.s = info->i;   break;
1731      case CPUINFO_INT_REGISTER + ADSP2100_SR1_SEC:   adsp->alt.sr.srx.sr1.s = info->i;   break;
17481732
1749      case CPUINFO_INT_REGISTER + ADSP2100_I0:      wr_i0(info->i);                   break;
1750      case CPUINFO_INT_REGISTER + ADSP2100_I1:      wr_i1(info->i);                   break;
1751      case CPUINFO_INT_REGISTER + ADSP2100_I2:      wr_i2(info->i);                   break;
1752      case CPUINFO_INT_REGISTER + ADSP2100_I3:      wr_i3(info->i);                   break;
1753      case CPUINFO_INT_REGISTER + ADSP2100_I4:      wr_i4(info->i);                   break;
1754      case CPUINFO_INT_REGISTER + ADSP2100_I5:      wr_i5(info->i);                   break;
1755      case CPUINFO_INT_REGISTER + ADSP2100_I6:      wr_i6(info->i);                   break;
1756      case CPUINFO_INT_REGISTER + ADSP2100_I7:      wr_i7(info->i);                   break;
1733      case CPUINFO_INT_REGISTER + ADSP2100_I0:      wr_i0(adsp, info->i);             break;
1734      case CPUINFO_INT_REGISTER + ADSP2100_I1:      wr_i1(adsp, info->i);             break;
1735      case CPUINFO_INT_REGISTER + ADSP2100_I2:      wr_i2(adsp, info->i);             break;
1736      case CPUINFO_INT_REGISTER + ADSP2100_I3:      wr_i3(adsp, info->i);             break;
1737      case CPUINFO_INT_REGISTER + ADSP2100_I4:      wr_i4(adsp, info->i);             break;
1738      case CPUINFO_INT_REGISTER + ADSP2100_I5:      wr_i5(adsp, info->i);             break;
1739      case CPUINFO_INT_REGISTER + ADSP2100_I6:      wr_i6(adsp, info->i);             break;
1740      case CPUINFO_INT_REGISTER + ADSP2100_I7:      wr_i7(adsp, info->i);             break;
17571741
1758      case CPUINFO_INT_REGISTER + ADSP2100_L0:      wr_l0(info->i);                   break;
1759      case CPUINFO_INT_REGISTER + ADSP2100_L1:      wr_l1(info->i);                   break;
1760      case CPUINFO_INT_REGISTER + ADSP2100_L2:      wr_l2(info->i);                   break;
1761      case CPUINFO_INT_REGISTER + ADSP2100_L3:      wr_l3(info->i);                   break;
1762      case CPUINFO_INT_REGISTER + ADSP2100_L4:      wr_l4(info->i);                   break;
1763      case CPUINFO_INT_REGISTER + ADSP2100_L5:      wr_l5(info->i);                   break;
1764      case CPUINFO_INT_REGISTER + ADSP2100_L6:      wr_l6(info->i);                   break;
1765      case CPUINFO_INT_REGISTER + ADSP2100_L7:      wr_l7(info->i);                   break;
1742      case CPUINFO_INT_REGISTER + ADSP2100_L0:      wr_l0(adsp, info->i);             break;
1743      case CPUINFO_INT_REGISTER + ADSP2100_L1:      wr_l1(adsp, info->i);             break;
1744      case CPUINFO_INT_REGISTER + ADSP2100_L2:      wr_l2(adsp, info->i);             break;
1745      case CPUINFO_INT_REGISTER + ADSP2100_L3:      wr_l3(adsp, info->i);             break;
1746      case CPUINFO_INT_REGISTER + ADSP2100_L4:      wr_l4(adsp, info->i);             break;
1747      case CPUINFO_INT_REGISTER + ADSP2100_L5:      wr_l5(adsp, info->i);             break;
1748      case CPUINFO_INT_REGISTER + ADSP2100_L6:      wr_l6(adsp, info->i);             break;
1749      case CPUINFO_INT_REGISTER + ADSP2100_L7:      wr_l7(adsp, info->i);             break;
17661750
1767      case CPUINFO_INT_REGISTER + ADSP2100_M0:      wr_m0(info->i);                   break;
1768      case CPUINFO_INT_REGISTER + ADSP2100_M1:      wr_m1(info->i);                   break;
1769      case CPUINFO_INT_REGISTER + ADSP2100_M2:      wr_m2(info->i);                   break;
1770      case CPUINFO_INT_REGISTER + ADSP2100_M3:      wr_m3(info->i);                   break;
1771      case CPUINFO_INT_REGISTER + ADSP2100_M4:      wr_m4(info->i);                   break;
1772      case CPUINFO_INT_REGISTER + ADSP2100_M5:      wr_m5(info->i);                   break;
1773      case CPUINFO_INT_REGISTER + ADSP2100_M6:      wr_m6(info->i);                   break;
1774      case CPUINFO_INT_REGISTER + ADSP2100_M7:      wr_m7(info->i);                   break;
1751      case CPUINFO_INT_REGISTER + ADSP2100_M0:      wr_m0(adsp, info->i);             break;
1752      case CPUINFO_INT_REGISTER + ADSP2100_M1:      wr_m1(adsp, info->i);             break;
1753      case CPUINFO_INT_REGISTER + ADSP2100_M2:      wr_m2(adsp, info->i);             break;
1754      case CPUINFO_INT_REGISTER + ADSP2100_M3:      wr_m3(adsp, info->i);             break;
1755      case CPUINFO_INT_REGISTER + ADSP2100_M4:      wr_m4(adsp, info->i);             break;
1756      case CPUINFO_INT_REGISTER + ADSP2100_M5:      wr_m5(adsp, info->i);             break;
1757      case CPUINFO_INT_REGISTER + ADSP2100_M6:      wr_m6(adsp, info->i);             break;
1758      case CPUINFO_INT_REGISTER + ADSP2100_M7:      wr_m7(adsp, info->i);             break;
17751759
1776      case CPUINFO_INT_REGISTER + ADSP2100_PX:      wr_px(info->i);                   break;
1777      case CPUINFO_INT_REGISTER + ADSP2100_CNTR:      adsp2100.cntr = info->i;             break;
1778      case CPUINFO_INT_REGISTER + ADSP2100_ASTAT:      wr_astat(info->i);                   break;
1779      case CPUINFO_INT_REGISTER + ADSP2100_SSTAT:      wr_sstat(info->i);                   break;
1780      case CPUINFO_INT_REGISTER + ADSP2100_MSTAT:      wr_mstat(info->i);                   break;
1760      case CPUINFO_INT_REGISTER + ADSP2100_PX:      wr_px(adsp, info->i);             break;
1761      case CPUINFO_INT_REGISTER + ADSP2100_CNTR:      adsp->cntr = info->i;             break;
1762      case CPUINFO_INT_REGISTER + ADSP2100_ASTAT:      wr_astat(adsp, info->i);          break;
1763      case CPUINFO_INT_REGISTER + ADSP2100_SSTAT:      wr_sstat(adsp, info->i);          break;
1764      case CPUINFO_INT_REGISTER + ADSP2100_MSTAT:      wr_mstat(adsp, info->i);          break;
17811765
17821766      case CPUINFO_INT_SP:
1783      case CPUINFO_INT_REGISTER + ADSP2100_PCSP:      adsp2100.pc_sp = info->i;             break;
1784      case CPUINFO_INT_REGISTER + ADSP2100_CNTRSP:   adsp2100.cntr_sp = info->i;          break;
1785      case CPUINFO_INT_REGISTER + ADSP2100_STATSP:   adsp2100.stat_sp = info->i;          break;
1786      case CPUINFO_INT_REGISTER + ADSP2100_LOOPSP:   adsp2100.loop_sp = info->i;          break;
1767      case CPUINFO_INT_REGISTER + ADSP2100_PCSP:      adsp->pc_sp = info->i;             break;
1768      case CPUINFO_INT_REGISTER + ADSP2100_CNTRSP:   adsp->cntr_sp = info->i;          break;
1769      case CPUINFO_INT_REGISTER + ADSP2100_STATSP:   adsp->stat_sp = info->i;          break;
1770      case CPUINFO_INT_REGISTER + ADSP2100_LOOPSP:   adsp->loop_sp = info->i;          break;
17871771
1788      case CPUINFO_INT_REGISTER + ADSP2100_IMASK:      wr_imask(info->i);                   break;
1789      case CPUINFO_INT_REGISTER + ADSP2100_ICNTL:      wr_icntl(info->i);                   break;
1790      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE0:   adsp2100.irq_state[0] = info->i;       break;
1791      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE1:   adsp2100.irq_state[1] = info->i;       break;
1792      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE2:   adsp2100.irq_state[2] = info->i;       break;
1793      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE3:   adsp2100.irq_state[3] = info->i;       break;
1772      case CPUINFO_INT_REGISTER + ADSP2100_IMASK:      wr_imask(adsp, info->i);          break;
1773      case CPUINFO_INT_REGISTER + ADSP2100_ICNTL:      wr_icntl(adsp, info->i);          break;
1774      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE0:   adsp->irq_state[0] = info->i;       break;
1775      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE1:   adsp->irq_state[1] = info->i;       break;
1776      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE2:   adsp->irq_state[2] = info->i;       break;
1777      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE3:   adsp->irq_state[3] = info->i;       break;
17941778
1795      case CPUINFO_INT_REGISTER + ADSP2100_FLAGIN:   adsp2100.flagin = info->i;             break;
1796      case CPUINFO_INT_REGISTER + ADSP2100_FLAGOUT:   adsp2100.flagout = info->i;          break;
1797      case CPUINFO_INT_REGISTER + ADSP2100_FL0:      adsp2100.fl0 = info->i;             break;
1798      case CPUINFO_INT_REGISTER + ADSP2100_FL1:      adsp2100.fl1 = info->i;             break;
1799      case CPUINFO_INT_REGISTER + ADSP2100_FL2:       adsp2100.fl2 = info->i;             break;
1779      case CPUINFO_INT_REGISTER + ADSP2100_FLAGIN:   adsp->flagin = info->i;          break;
1780      case CPUINFO_INT_REGISTER + ADSP2100_FLAGOUT:   adsp->flagout = info->i;          break;
1781      case CPUINFO_INT_REGISTER + ADSP2100_FL0:      adsp->fl0 = info->i;             break;
1782      case CPUINFO_INT_REGISTER + ADSP2100_FL1:      adsp->fl1 = info->i;             break;
1783      case CPUINFO_INT_REGISTER + ADSP2100_FL2:       adsp->fl2 = info->i;             break;
18001784   }
18011785}
18021786
r3535r3536
18061790 * Generic get_info
18071791 **************************************************************************/
18081792
1809static void adsp21xx_get_info(UINT32 state, cpuinfo *info)
1793static CPU_GET_INFO( adsp21xx )
18101794{
1795   adsp2100_state *adsp = token;
18111796   switch (state)
18121797   {
18131798      /* --- the following bits of info are returned as 64-bit signed integers --- */
1814      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(adsp2100);            break;
1799      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(adsp2100_state);      break;
18151800      case CPUINFO_INT_INPUT_LINES:               /* set per CPU */                  break;
18161801      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:         info->i = 0;                     break;
18171802      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
r3535r3536
18321817      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 0;               break;
18331818      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = 0;               break;
18341819
1835      case CPUINFO_INT_PREVIOUSPC:               info->i = adsp2100.ppc;               break;
1820      case CPUINFO_INT_PREVIOUSPC:               info->i = adsp->ppc;               break;
18361821      case CPUINFO_INT_PC:
1837      case CPUINFO_INT_REGISTER + ADSP2100_PC:      info->i = adsp2100.pc;               break;
1822      case CPUINFO_INT_REGISTER + ADSP2100_PC:      info->i = adsp->pc;                  break;
18381823
1839      case CPUINFO_INT_REGISTER + ADSP2100_AX0:      info->i = adsp2100.core.ax0.u;         break;
1840      case CPUINFO_INT_REGISTER + ADSP2100_AX1:      info->i = adsp2100.core.ax1.u;         break;
1841      case CPUINFO_INT_REGISTER + ADSP2100_AY0:      info->i = adsp2100.core.ay0.u;         break;
1842      case CPUINFO_INT_REGISTER + ADSP2100_AY1:      info->i = adsp2100.core.ay1.u;         break;
1843      case CPUINFO_INT_REGISTER + ADSP2100_AR:      info->i = adsp2100.core.ar.u;         break;
1844      case CPUINFO_INT_REGISTER + ADSP2100_AF:      info->i = adsp2100.core.af.u;         break;
1824      case CPUINFO_INT_REGISTER + ADSP2100_AX0:      info->i = adsp->core.ax0.u;            break;
1825      case CPUINFO_INT_REGISTER + ADSP2100_AX1:      info->i = adsp->core.ax1.u;            break;
1826      case CPUINFO_INT_REGISTER + ADSP2100_AY0:      info->i = adsp->core.ay0.u;            break;
1827      case CPUINFO_INT_REGISTER + ADSP2100_AY1:      info->i = adsp->core.ay1.u;            break;
1828      case CPUINFO_INT_REGISTER + ADSP2100_AR:      info->i = adsp->core.ar.u;            break;
1829      case CPUINFO_INT_REGISTER + ADSP2100_AF:      info->i = adsp->core.af.u;            break;
18451830
1846      case CPUINFO_INT_REGISTER + ADSP2100_MX0:      info->i = adsp2100.core.mx0.u;         break;
1847      case CPUINFO_INT_REGISTER + ADSP2100_MX1:      info->i = adsp2100.core.mx1.u;         break;
1848      case CPUINFO_INT_REGISTER + ADSP2100_MY0:      info->i = adsp2100.core.my0.u;         break;
1849      case CPUINFO_INT_REGISTER + ADSP2100_MY1:      info->i = adsp2100.core.my1.u;         break;
1850      case CPUINFO_INT_REGISTER + ADSP2100_MR0:      info->i = adsp2100.core.mr.mrx.mr0.u;   break;
1851      case CPUINFO_INT_REGISTER + ADSP2100_MR1:      info->i = adsp2100.core.mr.mrx.mr1.u;   break;
1852      case CPUINFO_INT_REGISTER + ADSP2100_MR2:      info->i = adsp2100.core.mr.mrx.mr2.u;   break;
1853      case CPUINFO_INT_REGISTER + ADSP2100_MF:      info->i = adsp2100.core.mf.u;         break;
1831      case CPUINFO_INT_REGISTER + ADSP2100_MX0:      info->i = adsp->core.mx0.u;            break;
1832      case CPUINFO_INT_REGISTER + ADSP2100_MX1:      info->i = adsp->core.mx1.u;            break;
1833      case CPUINFO_INT_REGISTER + ADSP2100_MY0:      info->i = adsp->core.my0.u;            break;
1834      case CPUINFO_INT_REGISTER + ADSP2100_MY1:      info->i = adsp->core.my1.u;            break;
1835      case CPUINFO_INT_REGISTER + ADSP2100_MR0:      info->i = adsp->core.mr.mrx.mr0.u;      break;
1836      case CPUINFO_INT_REGISTER + ADSP2100_MR1:      info->i = adsp->core.mr.mrx.mr1.u;      break;
1837      case CPUINFO_INT_REGISTER + ADSP2100_MR2:      info->i = adsp->core.mr.mrx.mr2.u;      break;
1838      case CPUINFO_INT_REGISTER + ADSP2100_MF:      info->i = adsp->core.mf.u;            break;
18541839
1855      case CPUINFO_INT_REGISTER + ADSP2100_SI:      info->i = adsp2100.core.si.u;         break;
1856      case CPUINFO_INT_REGISTER + ADSP2100_SE:      info->i = adsp2100.core.se.u;         break;
1857      case CPUINFO_INT_REGISTER + ADSP2100_SB:      info->i = adsp2100.core.sb.u;         break;
1858      case CPUINFO_INT_REGISTER + ADSP2100_SR0:      info->i = adsp2100.core.sr.srx.sr0.u;   break;
1859      case CPUINFO_INT_REGISTER + ADSP2100_SR1:      info->i = adsp2100.core.sr.srx.sr1.u;   break;
1840      case CPUINFO_INT_REGISTER + ADSP2100_SI:      info->i = adsp->core.si.u;            break;
1841      case CPUINFO_INT_REGISTER + ADSP2100_SE:      info->i = adsp->core.se.u;            break;
1842      case CPUINFO_INT_REGISTER + ADSP2100_SB:      info->i = adsp->core.sb.u;            break;
1843      case CPUINFO_INT_REGISTER + ADSP2100_SR0:      info->i = adsp->core.sr.srx.sr0.u;      break;
1844      case CPUINFO_INT_REGISTER + ADSP2100_SR1:      info->i = adsp->core.sr.srx.sr1.u;      break;
18601845
1861      case CPUINFO_INT_REGISTER + ADSP2100_AX0_SEC:   info->i = adsp2100.alt.ax0.u;         break;
1862      case CPUINFO_INT_REGISTER + ADSP2100_AX1_SEC:   info->i = adsp2100.alt.ax1.u;         break;
1863      case CPUINFO_INT_REGISTER + ADSP2100_AY0_SEC:   info->i = adsp2100.alt.ay0.u;         break;
1864      case CPUINFO_INT_REGISTER + ADSP2100_AY1_SEC:   info->i = adsp2100.alt.ay1.u;         break;
1865      case CPUINFO_INT_REGISTER + ADSP2100_AR_SEC:   info->i = adsp2100.alt.ar.u;         break;
1866      case CPUINFO_INT_REGISTER + ADSP2100_AF_SEC:   info->i = adsp2100.alt.af.u;         break;
1846      case CPUINFO_INT_REGISTER + ADSP2100_AX0_SEC:   info->i = adsp->alt.ax0.u;            break;
1847      case CPUINFO_INT_REGISTER + ADSP2100_AX1_SEC:   info->i = adsp->alt.ax1.u;            break;
1848      case CPUINFO_INT_REGISTER + ADSP2100_AY0_SEC:   info->i = adsp->alt.ay0.u;            break;
1849      case CPUINFO_INT_REGISTER + ADSP2100_AY1_SEC:   info->i = adsp->alt.ay1.u;            break;
1850      case CPUINFO_INT_REGISTER + ADSP2100_AR_SEC:   info->i = adsp->alt.ar.u;            break;
1851      case CPUINFO_INT_REGISTER + ADSP2100_AF_SEC:   info->i = adsp->alt.af.u;            break;
18671852
1868      case CPUINFO_INT_REGISTER + ADSP2100_MX0_SEC:   info->i = adsp2100.alt.mx0.u;         break;
1869      case CPUINFO_INT_REGISTER + ADSP2100_MX1_SEC:   info->i = adsp2100.alt.mx1.u;         break;
1870      case CPUINFO_INT_REGISTER + ADSP2100_MY0_SEC:   info->i = adsp2100.alt.my0.u;         break;
1871      case CPUINFO_INT_REGISTER + ADSP2100_MY1_SEC:   info->i = adsp2100.alt.my1.u;         break;
1872      case CPUINFO_INT_REGISTER + ADSP2100_MR0_SEC:   info->i = adsp2100.alt.mr.mrx.mr0.u;   break;
1873      case CPUINFO_INT_REGISTER + ADSP2100_MR1_SEC:   info->i = adsp2100.alt.mr.mrx.mr1.u;   break;
1874      case CPUINFO_INT_REGISTER + ADSP2100_MR2_SEC:   info->i = adsp2100.alt.mr.mrx.mr2.u;   break;
1875      case CPUINFO_INT_REGISTER + ADSP2100_MF_SEC:   info->i = adsp2100.alt.mf.u;         break;
1853      case CPUINFO_INT_REGISTER + ADSP2100_MX0_SEC:   info->i = adsp->alt.mx0.u;            break;
1854      case CPUINFO_INT_REGISTER + ADSP2100_MX1_SEC:   info->i = adsp->alt.mx1.u;            break;
1855      case CPUINFO_INT_REGISTER + ADSP2100_MY0_SEC:   info->i = adsp->alt.my0.u;            break;
1856      case CPUINFO_INT_REGISTER + ADSP2100_MY1_SEC:   info->i = adsp->alt.my1.u;            break;
1857      case CPUINFO_INT_REGISTER + ADSP2100_MR0_SEC:   info->i = adsp->alt.mr.mrx.mr0.u;      break;
1858      case CPUINFO_INT_REGISTER + ADSP2100_MR1_SEC:   info->i = adsp->alt.mr.mrx.mr1.u;      break;
1859      case CPUINFO_INT_REGISTER + ADSP2100_MR2_SEC:   info->i = adsp->alt.mr.mrx.mr2.u;      break;
1860      case CPUINFO_INT_REGISTER + ADSP2100_MF_SEC:   info->i = adsp->alt.mf.u;            break;
18761861
1877      case CPUINFO_INT_REGISTER + ADSP2100_SI_SEC:   info->i = adsp2100.alt.si.u;         break;
1878      case CPUINFO_INT_REGISTER + ADSP2100_SE_SEC:   info->i = adsp2100.alt.se.u;         break;
1879      case CPUINFO_INT_REGISTER + ADSP2100_SB_SEC:   info->i = adsp2100.alt.sb.u;         break;
1880      case CPUINFO_INT_REGISTER + ADSP2100_SR0_SEC:   info->i = adsp2100.alt.sr.srx.sr0.u;   break;
1881      case CPUINFO_INT_REGISTER + ADSP2100_SR1_SEC:   info->i = adsp2100.alt.sr.srx.sr1.u;   break;
1862      case CPUINFO_INT_REGISTER + ADSP2100_SI_SEC:   info->i = adsp->alt.si.u;            break;
1863      case CPUINFO_INT_REGISTER + ADSP2100_SE_SEC:   info->i = adsp->alt.se.u;            break;
1864      case CPUINFO_INT_REGISTER + ADSP2100_SB_SEC:   info->i = adsp->alt.sb.u;            break;
1865      case CPUINFO_INT_REGISTER + ADSP2100_SR0_SEC:   info->i = adsp->alt.sr.srx.sr0.u;      break;
1866      case CPUINFO_INT_REGISTER + ADSP2100_SR1_SEC:   info->i = adsp->alt.sr.srx.sr1.u;      break;
18821867
1883      case CPUINFO_INT_REGISTER + ADSP2100_I0:      info->i = adsp2100.i[0];            break;
1884      case CPUINFO_INT_REGISTER + ADSP2100_I1:      info->i = adsp2100.i[1];            break;
1885      case CPUINFO_INT_REGISTER + ADSP2100_I2:      info->i = adsp2100.i[2];            break;
1886      case CPUINFO_INT_REGISTER + ADSP2100_I3:      info->i = adsp2100.i[3];            break;
1887      case CPUINFO_INT_REGISTER + ADSP2100_I4:      info->i = adsp2100.i[4];            break;
1888      case CPUINFO_INT_REGISTER + ADSP2100_I5:      info->i = adsp2100.i[5];            break;
1889      case CPUINFO_INT_REGISTER + ADSP2100_I6:      info->i = adsp2100.i[6];            break;
1890      case CPUINFO_INT_REGISTER + ADSP2100_I7:      info->i = adsp2100.i[7];            break;
1868      case CPUINFO_INT_REGISTER + ADSP2100_I0:      info->i = adsp->i[0];               break;
1869      case CPUINFO_INT_REGISTER + ADSP2100_I1:      info->i = adsp->i[1];               break;
1870      case CPUINFO_INT_REGISTER + ADSP2100_I2:      info->i = adsp->i[2];               break;
1871      case CPUINFO_INT_REGISTER + ADSP2100_I3:      info->i = adsp->i[3];               break;
1872      case CPUINFO_INT_REGISTER + ADSP2100_I4:      info->i = adsp->i[4];               break;
1873      case CPUINFO_INT_REGISTER + ADSP2100_I5:      info->i = adsp->i[5];               break;
1874      case CPUINFO_INT_REGISTER + ADSP2100_I6:      info->i = adsp->i[6];               break;
1875      case CPUINFO_INT_REGISTER + ADSP2100_I7:      info->i = adsp->i[7];               break;
18911876
1892      case CPUINFO_INT_REGISTER + ADSP2100_L0:      info->i = adsp2100.l[0];            break;
1893      case CPUINFO_INT_REGISTER + ADSP2100_L1:      info->i = adsp2100.l[1];            break;
1894      case CPUINFO_INT_REGISTER + ADSP2100_L2:      info->i = adsp2100.l[2];            break;
1895      case CPUINFO_INT_REGISTER + ADSP2100_L3:      info->i = adsp2100.l[3];            break;
1896      case CPUINFO_INT_REGISTER + ADSP2100_L4:      info->i = adsp2100.l[4];            break;
1897      case CPUINFO_INT_REGISTER + ADSP2100_L5:      info->i = adsp2100.l[5];            break;
1898      case CPUINFO_INT_REGISTER + ADSP2100_L6:      info->i = adsp2100.l[6];            break;
1899      case CPUINFO_INT_REGISTER + ADSP2100_L7:      info->i = adsp2100.l[7];            break;
1877      case CPUINFO_INT_REGISTER + ADSP2100_L0:      info->i = adsp->l[0];               break;
1878      case CPUINFO_INT_REGISTER + ADSP2100_L1:      info->i = adsp->l[1];               break;
1879      case CPUINFO_INT_REGISTER + ADSP2100_L2:      info->i = adsp->l[2];               break;
1880      case CPUINFO_INT_REGISTER + ADSP2100_L3:      info->i = adsp->l[3];               break;
1881      case CPUINFO_INT_REGISTER + ADSP2100_L4:      info->i = adsp->l[4];               break;
1882      case CPUINFO_INT_REGISTER + ADSP2100_L5:      info->i = adsp->l[5];               break;
1883      case CPUINFO_INT_REGISTER + ADSP2100_L6:      info->i = adsp->l[6];               break;
1884      case CPUINFO_INT_REGISTER + ADSP2100_L7:      info->i = adsp->l[7];               break;
19001885
1901      case CPUINFO_INT_REGISTER + ADSP2100_M0:      info->i = adsp2100.m[0];            break;
1902      case CPUINFO_INT_REGISTER + ADSP2100_M1:      info->i = adsp2100.m[1];            break;
1903      case CPUINFO_INT_REGISTER + ADSP2100_M2:      info->i = adsp2100.m[2];            break;
1904      case CPUINFO_INT_REGISTER + ADSP2100_M3:      info->i = adsp2100.m[3];            break;
1905      case CPUINFO_INT_REGISTER + ADSP2100_M4:      info->i = adsp2100.m[4];            break;
1906      case CPUINFO_INT_REGISTER + ADSP2100_M5:      info->i = adsp2100.m[5];            break;
1907      case CPUINFO_INT_REGISTER + ADSP2100_M6:      info->i = adsp2100.m[6];            break;
1908      case CPUINFO_INT_REGISTER + ADSP2100_M7:      info->i = adsp2100.m[7];            break;
1886      case CPUINFO_INT_REGISTER + ADSP2100_M0:      info->i = adsp->m[0];               break;
1887      case CPUINFO_INT_REGISTER + ADSP2100_M1:      info->i = adsp->m[1];               break;
1888      case CPUINFO_INT_REGISTER + ADSP2100_M2:      info->i = adsp->m[2];               break;
1889      case CPUINFO_INT_REGISTER + ADSP2100_M3:      info->i = adsp->m[3];               break;
1890      case CPUINFO_INT_REGISTER + ADSP2100_M4:      info->i = adsp->m[4];               break;
1891      case CPUINFO_INT_REGISTER + ADSP2100_M5:      info->i = adsp->m[5];               break;
1892      case CPUINFO_INT_REGISTER + ADSP2100_M6:      info->i = adsp->m[6];               break;
1893      case CPUINFO_INT_REGISTER + ADSP2100_M7:      info->i = adsp->m[7];               break;
19091894
1910      case CPUINFO_INT_REGISTER + ADSP2100_PX:      info->i = adsp2100.px;               break;
1911      case CPUINFO_INT_REGISTER + ADSP2100_CNTR:      info->i = adsp2100.cntr;            break;
1912      case CPUINFO_INT_REGISTER + ADSP2100_ASTAT:      info->i = adsp2100.astat;            break;
1913      case CPUINFO_INT_REGISTER + ADSP2100_SSTAT:      info->i = adsp2100.sstat;            break;
1914      case CPUINFO_INT_REGISTER + ADSP2100_MSTAT:      info->i = adsp2100.mstat;            break;
1895      case CPUINFO_INT_REGISTER + ADSP2100_PX:      info->i = adsp->px;                  break;
1896      case CPUINFO_INT_REGISTER + ADSP2100_CNTR:      info->i = adsp->cntr;               break;
1897      case CPUINFO_INT_REGISTER + ADSP2100_ASTAT:      info->i = adsp->astat;               break;
1898      case CPUINFO_INT_REGISTER + ADSP2100_SSTAT:      info->i = adsp->sstat;               break;
1899      case CPUINFO_INT_REGISTER + ADSP2100_MSTAT:      info->i = adsp->mstat;               break;
19151900
19161901      case CPUINFO_INT_SP:
1917      case CPUINFO_INT_REGISTER + ADSP2100_PCSP:      info->i = adsp2100.pc_sp;            break;
1918      case CPUINFO_INT_REGISTER + ADSP2100_CNTRSP:   info->i = adsp2100.cntr_sp;            break;
1919      case CPUINFO_INT_REGISTER + ADSP2100_STATSP:   info->i = adsp2100.stat_sp;            break;
1920      case CPUINFO_INT_REGISTER + ADSP2100_LOOPSP:   info->i = adsp2100.loop_sp;            break;
1902      case CPUINFO_INT_REGISTER + ADSP2100_PCSP:      info->i = adsp->pc_sp;               break;
1903      case CPUINFO_INT_REGISTER + ADSP2100_CNTRSP:   info->i = adsp->cntr_sp;            break;
1904      case CPUINFO_INT_REGISTER + ADSP2100_STATSP:   info->i = adsp->stat_sp;            break;
1905      case CPUINFO_INT_REGISTER + ADSP2100_LOOPSP:   info->i = adsp->loop_sp;            break;
19211906
1922      case CPUINFO_INT_REGISTER + ADSP2100_IMASK:      info->i = adsp2100.imask;            break;
1923      case CPUINFO_INT_REGISTER + ADSP2100_ICNTL:      info->i = adsp2100.icntl;            break;
1924      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE0:   info->i = adsp2100.irq_state[0];      break;
1925      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE1:   info->i = adsp2100.irq_state[1];      break;
1926      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE2:   info->i = adsp2100.irq_state[2];      break;
1927      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE3:   info->i = adsp2100.irq_state[3];      break;
1907      case CPUINFO_INT_REGISTER + ADSP2100_IMASK:      info->i = adsp->imask;               break;
1908      case CPUINFO_INT_REGISTER + ADSP2100_ICNTL:      info->i = adsp->icntl;               break;
1909      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE0:   info->i = adsp->irq_state[0];         break;
1910      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE1:   info->i = adsp->irq_state[1];         break;
1911      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE2:   info->i = adsp->irq_state[2];         break;
1912      case CPUINFO_INT_REGISTER + ADSP2100_IRQSTATE3:   info->i = adsp->irq_state[3];         break;
19281913
1929      case CPUINFO_INT_REGISTER + ADSP2100_FLAGIN:   info->i = adsp2100.flagin;            break;
1930      case CPUINFO_INT_REGISTER + ADSP2100_FLAGOUT:   info->i = adsp2100.flagout;            break;
1931      case CPUINFO_INT_REGISTER + ADSP2100_FL0:      info->i = adsp2100.fl0;               break;
1932      case CPUINFO_INT_REGISTER + ADSP2100_FL1:      info->i = adsp2100.fl1;               break;
1933      case CPUINFO_INT_REGISTER + ADSP2100_FL2:      info->i = adsp2100.fl2;               break;
1914      case CPUINFO_INT_REGISTER + ADSP2100_FLAGIN:   info->i = adsp->flagin;               break;
1915      case CPUINFO_INT_REGISTER + ADSP2100_FLAGOUT:   info->i = adsp->flagout;            break;
1916      case CPUINFO_INT_REGISTER + ADSP2100_FL0:      info->i = adsp->fl0;               break;
1917      case CPUINFO_INT_REGISTER + ADSP2100_FL1:      info->i = adsp->fl1;               break;
1918      case CPUINFO_INT_REGISTER + ADSP2100_FL2:      info->i = adsp->fl2;               break;
19341919
19351920      /* --- the following bits of info are returned as pointers to data or functions --- */
19361921      case CPUINFO_PTR_SET_INFO:                  /* set per CPU */                  break;
1937      case CPUINFO_PTR_SET_CONTEXT:               /* set per CPU */                  break;
1938      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = adsp2100_get_context; break;
1939      case CPUINFO_PTR_INIT:                     info->init = adsp2100_init;            break;
1940      case CPUINFO_PTR_RESET:                     info->reset = adsp2100_reset;         break;
1941      case CPUINFO_PTR_EXIT:                     info->exit = adsp2100_exit;            break;
1942      case CPUINFO_PTR_EXECUTE:                  info->execute = adsp2100_execute;      break;
1922      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(adsp21xx);break;
1923      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(adsp21xx);break;
1924      case CPUINFO_PTR_INIT:                     /* set per CPU */                  break;
1925      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(adsp21xx);         break;
1926      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(adsp21xx);            break;
1927      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(adsp21xx);      break;
19431928      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1944      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = adsp2100_dasm;      break;
1945      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &adsp2100_icount;      break;
1929      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(adsp21xx);      break;
1930      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &adsp->icount;         break;
19461931
19471932      /* --- the following bits of info are returned as NULL-terminated strings --- */
19481933      case CPUINFO_STR_NAME:                     /* set per CPU */                  break;
r3535r3536
19531938
19541939      case CPUINFO_STR_FLAGS:
19551940         sprintf(info->s, "%c%c%c%c%c%c%c%c",
1956            adsp2100.astat & 0x80 ? 'X':'.',
1957            adsp2100.astat & 0x40 ? 'M':'.',
1958            adsp2100.astat & 0x20 ? 'Q':'.',
1959            adsp2100.astat & 0x10 ? 'S':'.',
1960            adsp2100.astat & 0x08 ? 'C':'.',
1961            adsp2100.astat & 0x04 ? 'V':'.',
1962            adsp2100.astat & 0x02 ? 'N':'.',
1963            adsp2100.astat & 0x01 ? 'Z':'.');
1941            adsp->astat & 0x80 ? 'X':'.',
1942            adsp->astat & 0x40 ? 'M':'.',
1943            adsp->astat & 0x20 ? 'Q':'.',
1944            adsp->astat & 0x10 ? 'S':'.',
1945            adsp->astat & 0x08 ? 'C':'.',
1946            adsp->astat & 0x04 ? 'V':'.',
1947            adsp->astat & 0x02 ? 'N':'.',
1948            adsp->astat & 0x01 ? 'Z':'.');
19641949         break;
19651950
1966      case CPUINFO_STR_REGISTER + ADSP2100_PC:        sprintf(info->s, "PC:  %04X", adsp2100.pc); break;
1951      case CPUINFO_STR_REGISTER + ADSP2100_PC:        sprintf(info->s, "PC:  %04X", adsp->pc); break;
19671952
1968      case CPUINFO_STR_REGISTER + ADSP2100_AX0:      sprintf(info->s, "AX0: %04X", adsp2100.core.ax0.u); break;
1969      case CPUINFO_STR_REGISTER + ADSP2100_AX1:      sprintf(info->s, "AX1: %04X", adsp2100.core.ax1.u); break;
1970      case CPUINFO_STR_REGISTER + ADSP2100_AY0:      sprintf(info->s, "AY0: %04X", adsp2100.core.ay0.u); break;
1971      case CPUINFO_STR_REGISTER + ADSP2100_AY1:      sprintf(info->s, "AY1: %04X", adsp2100.core.ay1.u); break;
1972      case CPUINFO_STR_REGISTER + ADSP2100_AR:      sprintf(info->s, "AR:  %04X", adsp2100.core.ar.u); break;
1973      case CPUINFO_STR_REGISTER + ADSP2100_AF:      sprintf(info->s, "AF:  %04X", adsp2100.core.af.u); break;
1953      case CPUINFO_STR_REGISTER + ADSP2100_AX0:      sprintf(info->s, "AX0: %04X", adsp->core.ax0.u); break;
1954      case CPUINFO_STR_REGISTER + ADSP2100_AX1:      sprintf(info->s, "AX1: %04X", adsp->core.ax1.u); break;
1955      case CPUINFO_STR_REGISTER + ADSP2100_AY0:      sprintf(info->s, "AY0: %04X", adsp->core.ay0.u); break;
1956      case CPUINFO_STR_REGISTER + ADSP2100_AY1:      sprintf(info->s, "AY1: %04X", adsp->core.ay1.u); break;
1957      case CPUINFO_STR_REGISTER + ADSP2100_AR:      sprintf(info->s, "AR:  %04X", adsp->core.ar.u); break;
1958      case CPUINFO_STR_REGISTER + ADSP2100_AF:      sprintf(info->s, "AF:  %04X", adsp->core.af.u); break;
19741959
1975      case CPUINFO_STR_REGISTER + ADSP2100_MX0:       sprintf(info->s, "MX0: %04X", adsp2100.core.mx0.u); break;
1976      case CPUINFO_STR_REGISTER + ADSP2100_MX1:       sprintf(info->s, "MX1: %04X", adsp2100.core.mx1.u); break;
1977      case CPUINFO_STR_REGISTER + ADSP2100_MY0:       sprintf(info->s, "MY0: %04X", adsp2100.core.my0.u); break;
1978      case CPUINFO_STR_REGISTER + ADSP2100_MY1:       sprintf(info->s, "MY1: %04X", adsp2100.core.my1.u); break;
1979      case CPUINFO_STR_REGISTER + ADSP2100_MR0:       sprintf(info->s, "MR0: %04X", adsp2100.core.mr.mrx.mr0.u); break;
1980      case CPUINFO_STR_REGISTER + ADSP2100_MR1:      sprintf(info->s, "MR1: %04X", adsp2100.core.mr.mrx.mr1.u); break;
1981      case CPUINFO_STR_REGISTER + ADSP2100_MR2:       sprintf(info->s, "MR2: %02X", adsp2100.core.mr.mrx.mr2.u & 0x00ff); break;
1982      case CPUINFO_STR_REGISTER + ADSP2100_MF:      sprintf(info->s, "MF:  %04X", adsp2100.core.mf.u); break;
1960      case CPUINFO_STR_REGISTER + ADSP2100_MX0:       sprintf(info->s, "MX0: %04X", adsp->core.mx0.u); break;
1961      case CPUINFO_STR_REGISTER + ADSP2100_MX1:       sprintf(info->s, "MX1: %04X", adsp->core.mx1.u); break;
1962      case CPUINFO_STR_REGISTER + ADSP2100_MY0:       sprintf(info->s, "MY0: %04X", adsp->core.my0.u); break;
1963      case CPUINFO_STR_REGISTER + ADSP2100_MY1:       sprintf(info->s, "MY1: %04X", adsp->core.my1.u); break;
1964      case CPUINFO_STR_REGISTER + ADSP2100_MR0:       sprintf(info->s, "MR0: %04X", adsp->core.mr.mrx.mr0.u); break;
1965      case CPUINFO_STR_REGISTER + ADSP2100_MR1:      sprintf(info->s, "MR1: %04X", adsp->core.mr.mrx.mr1.u); break;
1966      case CPUINFO_STR_REGISTER + ADSP2100_MR2:       sprintf(info->s, "MR2: %02X", adsp->core.mr.mrx.mr2.u & 0x00ff); break;
1967      case CPUINFO_STR_REGISTER + ADSP2100_MF:      sprintf(info->s, "MF:  %04X", adsp->core.mf.u); break;
19831968
1984      case CPUINFO_STR_REGISTER + ADSP2100_SI:      sprintf(info->s, "SI:  %04X", adsp2100.core.si.u); break;
1985      case CPUINFO_STR_REGISTER + ADSP2100_SE:      sprintf(info->s, "SE:  %02X  ", adsp2100.core.se.u & 0x00ff); break;
1986      case CPUINFO_STR_REGISTER + ADSP2100_SB:      sprintf(info->s, "SB:  %02X  ", adsp2100.core.sb.u & 0x001f); break;
1987      case CPUINFO_STR_REGISTER + ADSP2100_SR0:       sprintf(info->s, "SR0: %04X", adsp2100.core.sr.srx.sr0.u); break;
1988      case CPUINFO_STR_REGISTER + ADSP2100_SR1:      sprintf(info->s, "SR1: %04X", adsp2100.core.sr.srx.sr1.u); break;
1969      case CPUINFO_STR_REGISTER + ADSP2100_SI:      sprintf(info->s, "SI:  %04X", adsp->core.si.u); break;
1970      case CPUINFO_STR_REGISTER + ADSP2100_SE:      sprintf(info->s, "SE:  %02X  ", adsp->core.se.u & 0x00ff); break;
1971      case CPUINFO_STR_REGISTER + ADSP2100_SB:      sprintf(info->s, "SB:  %02X  ", adsp->core.sb.u & 0x001f); break;
1972      case CPUINFO_STR_REGISTER + ADSP2100_SR0:       sprintf(info->s, "SR0: %04X", adsp->core.sr.srx.sr0.u); break;
1973      case CPUINFO_STR_REGISTER + ADSP2100_SR1:      sprintf(info->s, "SR1: %04X", adsp->core.sr.srx.sr1.u); break;
19891974
1990      case CPUINFO_STR_REGISTER + ADSP2100_AX0_SEC:   sprintf(info->s, "AX0_SEC: %04X", adsp2100.alt.ax0.u); break;
1991      case CPUINFO_STR_REGISTER + ADSP2100_AX1_SEC:   sprintf(info->s, "AX1_SEC: %04X", adsp2100.alt.ax1.u); break;
1992      case CPUINFO_STR_REGISTER + ADSP2100_AY0_SEC:   sprintf(info->s, "AY0_SEC: %04X", adsp2100.alt.ay0.u); break;
1993      case CPUINFO_STR_REGISTER + ADSP2100_AY1_SEC:   sprintf(info->s, "AY1_SEC: %04X", adsp2100.alt.ay1.u); break;
1994      case CPUINFO_STR_REGISTER + ADSP2100_AR_SEC:   sprintf(info->s, "AR_SEC:  %04X", adsp2100.alt.ar.u); break;
1995      case CPUINFO_STR_REGISTER + ADSP2100_AF_SEC:   sprintf(info->s, "AF_SEC:  %04X", adsp2100.alt.af.u); break;
1975      case CPUINFO_STR_REGISTER + ADSP2100_AX0_SEC:   sprintf(info->s, "AX0_SEC: %04X", adsp->alt.ax0.u); break;
1976      case CPUINFO_STR_REGISTER + ADSP2100_AX1_SEC:   sprintf(info->s, "AX1_SEC: %04X", adsp->alt.ax1.u); break;
1977      case CPUINFO_STR_REGISTER + ADSP2100_AY0_SEC:   sprintf(info->s, "AY0_SEC: %04X", adsp->alt.ay0.u); break;
1978      case CPUINFO_STR_REGISTER + ADSP2100_AY1_SEC:   sprintf(info->s, "AY1_SEC: %04X", adsp->alt.ay1.u); break;
1979      case CPUINFO_STR_REGISTER + ADSP2100_AR_SEC:   sprintf(info->s, "AR_SEC:  %04X", adsp->alt.ar.u); break;
1980      case CPUINFO_STR_REGISTER + ADSP2100_AF_SEC:   sprintf(info->s, "AF_SEC:  %04X", adsp->alt.af.u); break;
19961981
1997      case CPUINFO_STR_REGISTER + ADSP2100_MX0_SEC:   sprintf(info->s, "MX0_SEC: %04X", adsp2100.alt.mx0.u); break;
1998      case CPUINFO_STR_REGISTER + ADSP2100_MX1_SEC:    sprintf(info->s, "MX1_SEC: %04X", adsp2100.alt.mx1.u); break;
1999      case CPUINFO_STR_REGISTER + ADSP2100_MY0_SEC:    sprintf(info->s, "MY0_SEC: %04X", adsp2100.alt.my0.u); break;
2000      case CPUINFO_STR_REGISTER + ADSP2100_MY1_SEC:    sprintf(info->s, "MY1_SEC: %04X", adsp2100.alt.my1.u); break;
2001      case CPUINFO_STR_REGISTER + ADSP2100_MR0_SEC:    sprintf(info->s, "MR0_SEC: %04X", adsp2100.alt.mr.mrx.mr0.u); break;
2002      case CPUINFO_STR_REGISTER + ADSP2100_MR1_SEC:   sprintf(info->s, "MR1_SEC: %04X", adsp2100.alt.mr.mrx.mr1.u); break;
2003      case CPUINFO_STR_REGISTER + ADSP2100_MR2_SEC:    sprintf(info->s, "MR2_SEC: %02X", adsp2100.alt.mr.mrx.mr2.u & 0x00ff); break;
2004      case CPUINFO_STR_REGISTER + ADSP2100_MF_SEC:   sprintf(info->s, "MF_SEC:  %04X", adsp2100.alt.mf.u); break;
1982      case CPUINFO_STR_REGISTER + ADSP2100_MX0_SEC:   sprintf(info->s, "MX0_SEC: %04X", adsp->alt.mx0.u); break;
1983      case CPUINFO_STR_REGISTER + ADSP2100_MX1_SEC:    sprintf(info->s, "MX1_SEC: %04X", adsp->alt.mx1.u); break;
1984      case CPUINFO_STR_REGISTER + ADSP2100_MY0_SEC:    sprintf(info->s, "MY0_SEC: %04X", adsp->alt.my0.u); break;
1985      case CPUINFO_STR_REGISTER + ADSP2100_MY1_SEC:    sprintf(info->s, "MY1_SEC: %04X", adsp->alt.my1.u); break;
1986      case CPUINFO_STR_REGISTER + ADSP2100_MR0_SEC:    sprintf(info->s, "MR0_SEC: %04X", adsp->alt.mr.mrx.mr0.u); break;
1987      case CPUINFO_STR_REGISTER + ADSP2100_MR1_SEC:   sprintf(info->s, "MR1_SEC: %04X", adsp->alt.mr.mrx.mr1.u); break;
1988      case CPUINFO_STR_REGISTER + ADSP2100_MR2_SEC:    sprintf(info->s, "MR2_SEC: %02X", adsp->alt.mr.mrx.mr2.u & 0x00ff); break;
1989      case CPUINFO_STR_REGISTER + ADSP2100_MF_SEC:   sprintf(info->s, "MF_SEC:  %04X", adsp->alt.mf.u); break;
20051990
2006      case CPUINFO_STR_REGISTER + ADSP2100_SI_SEC:   sprintf(info->s, "SI_SEC:  %04X", adsp2100.alt.si.u); break;
2007      case CPUINFO_STR_REGISTER + ADSP2100_SE_SEC:   sprintf(info->s, "SE_SEC:  %02X  ", adsp2100.alt.se.u & 0x00ff); break;
2008      case CPUINFO_STR_REGISTER + ADSP2100_SB_SEC:   sprintf(info->s, "SB_SEC:  %02X  ", adsp2100.alt.sb.u & 0x001f); break;
2009      case CPUINFO_STR_REGISTER + ADSP2100_SR0_SEC:    sprintf(info->s, "SR0_SEC: %04X", adsp2100.alt.sr.srx.sr0.u); break;
2010      case CPUINFO_STR_REGISTER + ADSP2100_SR1_SEC:   sprintf(info->s, "SR1_SEC: %04X", adsp2100.alt.sr.srx.sr1.u); break;
1991      case CPUINFO_STR_REGISTER + ADSP2100_SI_SEC:   sprintf(info->s, "SI_SEC:  %04X", adsp->alt.si.u); break;
1992      case CPUINFO_STR_REGISTER + ADSP2100_SE_SEC:   sprintf(info->s, "SE_SEC:  %02X  ", adsp->alt.se.u & 0x00ff); break;
1993      case CPUINFO_STR_REGISTER + ADSP2100_SB_SEC:   sprintf(info->s, "SB_SEC:  %02X  ", adsp->alt.sb.u & 0x001f); break;
1994      case CPUINFO_STR_REGISTER + ADSP2100_SR0_SEC:    sprintf(info->s, "SR0_SEC: %04X", adsp->alt.sr.srx.sr0.u); break;
1995      case CPUINFO_STR_REGISTER + ADSP2100_SR1_SEC:   sprintf(info->s, "SR1_SEC: %04X", adsp->alt.sr.srx.sr1.u); break;
20111996
2012      case CPUINFO_STR_REGISTER + ADSP2100_I0:      sprintf(info->s, "I0:  %04X", adsp2100.i[0]); break;
2013      case CPUINFO_STR_REGISTER + ADSP2100_I1:      sprintf(info->s, "I1:  %04X", adsp2100.i[1]); break;
2014      case CPUINFO_STR_REGISTER + ADSP2100_I2:      sprintf(info->s, "I2:  %04X", adsp2100.i[2]); break;
2015      case CPUINFO_STR_REGISTER + ADSP2100_I3:      sprintf(info->s, "I3:  %04X", adsp2100.i[3]); break;
2016      case CPUINFO_STR_REGISTER + ADSP2100_I4:      sprintf(info->s, "I4:  %04X", adsp2100.i[4]); break;
2017      case CPUINFO_STR_REGISTER + ADSP2100_I5:      sprintf(info->s, "I5:  %04X", adsp2100.i[5]); break;
2018      case CPUINFO_STR_REGISTER + ADSP2100_I6:      sprintf(info->s, "I6:  %04X", adsp2100.i[6]); break;
2019      case CPUINFO_STR_REGISTER + ADSP2100_I7:      sprintf(info->s, "I7:  %04X", adsp2100.i[7]); break;
1997      case CPUINFO_STR_REGISTER + ADSP2100_I0:      sprintf(info->s, "I0:  %04X", adsp->i[0]); break;
1998      case CPUINFO_STR_REGISTER + ADSP2100_I1:      sprintf(info->s, "I1:  %04X", adsp->i[1]); break;
1999      case CPUINFO_STR_REGISTER + ADSP2100_I2:      sprintf(info->s, "I2:  %04X", adsp->i[2]); break;
2000      case CPUINFO_STR_REGISTER + ADSP2100_I3:      sprintf(info->s, "I3:  %04X", adsp->i[3]); break;
2001      case CPUINFO_STR_REGISTER + ADSP2100_I4:      sprintf(info->s, "I4:  %04X", adsp->i[4]); break;
2002      case CPUINFO_STR_REGISTER + ADSP2100_I5:      sprintf(info->s, "I5:  %04X", adsp->i[5]); break;
2003      case CPUINFO_STR_REGISTER + ADSP2100_I6:      sprintf(info->s, "I6:  %04X", adsp->i[6]); break;
2004      case CPUINFO_STR_REGISTER + ADSP2100_I7:      sprintf(info->s, "I7:  %04X", adsp->i[7]); break;
20202005
2021      case CPUINFO_STR_REGISTER + ADSP2100_L0:      sprintf(info->s, "L0:  %04X", adsp2100.l[0]); break;
2022      case CPUINFO_STR_REGISTER + ADSP2100_L1:      sprintf(info->s, "L1:  %04X", adsp2100.l[1]); break;
2023      case CPUINFO_STR_REGISTER + ADSP2100_L2:      sprintf(info->s, "L2:  %04X", adsp2100.l[2]); break;
2024      case CPUINFO_STR_REGISTER + ADSP2100_L3:      sprintf(info->s, "L3:  %04X", adsp2100.l[3]); break;
2025      case CPUINFO_STR_REGISTER + ADSP2100_L4:      sprintf(info->s, "L4:  %04X", adsp2100.l[4]); break;
2026      case CPUINFO_STR_REGISTER + ADSP2100_L5:      sprintf(info->s, "L5:  %04X", adsp2100.l[5]); break;
2027      case CPUINFO_STR_REGISTER + ADSP2100_L6:      sprintf(info->s, "L6:  %04X", adsp2100.l[6]); break;
2028      case CPUINFO_STR_REGISTER + ADSP2100_L7:      sprintf(info->s, "L7:  %04X", adsp2100.l[7]); break;
2006      case CPUINFO_STR_REGISTER + ADSP2100_L0:      sprintf(info->s, "L0:  %04X", adsp->l[0]); break;
2007      case CPUINFO_STR_REGISTER + ADSP2100_L1:      sprintf(info->s, "L1:  %04X", adsp->l[1]); break;
2008      case CPUINFO_STR_REGISTER + ADSP2100_L2:      sprintf(info->s, "L2:  %04X", adsp->l[2]); break;
2009      case CPUINFO_STR_REGISTER + ADSP2100_L3:      sprintf(info->s, "L3:  %04X", adsp->l[3]); break;
2010      case CPUINFO_STR_REGISTER + ADSP2100_L4:      sprintf(info->s, "L4:  %04X", adsp->l[4]); break;
2011      case CPUINFO_STR_REGISTER + ADSP2100_L5:      sprintf(info->s, "L5:  %04X", adsp->l[5]); break;
2012      case CPUINFO_STR_REGISTER + ADSP2100_L6:      sprintf(info->s, "L6:  %04X", adsp->l[6]); break;
2013      case CPUINFO_STR_REGISTER + ADSP2100_L7:      sprintf(info->s, "L7:  %04X", adsp->l[7]); break;
20292014
2030      case CPUINFO_STR_REGISTER + ADSP2100_M0:      sprintf(info->s, "M0:  %04X", adsp2100.m[0]); break;
2031      case CPUINFO_STR_REGISTER + ADSP2100_M1:      sprintf(info->s, "M1:  %04X", adsp2100.m[1]); break;
2032      case CPUINFO_STR_REGISTER + ADSP2100_M2:      sprintf(info->s, "M2:  %04X", adsp2100.m[2]); break;
2033      case CPUINFO_STR_REGISTER + ADSP2100_M3:      sprintf(info->s, "M3:  %04X", adsp2100.m[3]); break;
2034      case CPUINFO_STR_REGISTER + ADSP2100_M4:      sprintf(info->s, "M4:  %04X", adsp2100.m[4]); break;
2035      case CPUINFO_STR_REGISTER + ADSP2100_M5:      sprintf(info->s, "M5:  %04X", adsp2100.m[5]); break;
2036      case CPUINFO_STR_REGISTER + ADSP2100_M6:      sprintf(info->s, "M6:  %04X", adsp2100.m[6]); break;
2037      case CPUINFO_STR_REGISTER + ADSP2100_M7:      sprintf(info->s, "M7:  %04X", adsp2100.m[7]); break;
2015      case CPUINFO_STR_REGISTER + ADSP2100_M0:      sprintf(info->s, "M0:  %04X", adsp->m[0]); break;
2016      case CPUINFO_STR_REGISTER + ADSP2100_M1:      sprintf(info->s, "M1:  %04X", adsp->m[1]); break;
2017      case CPUINFO_STR_REGISTER + ADSP2100_M2:      sprintf(info->s, "M2:  %04X", adsp->m[2]); break;
2018      case CPUINFO_STR_REGISTER + ADSP2100_M3:      sprintf(info->s, "M3:  %04X", adsp->m[3]); break;
2019      case CPUINFO_STR_REGISTER + ADSP2100_M4:      sprintf(info->s, "M4:  %04X", adsp->m[4]); break;
2020      case CPUINFO_STR_REGISTER + ADSP2100_M5:      sprintf(info->s, "M5:  %04X", adsp->m[5]); break;
2021      case CPUINFO_STR_REGISTER + ADSP2100_M6:      sprintf(info->s, "M6:  %04X", adsp->m[6]); break;
2022      case CPUINFO_STR_REGISTER + ADSP2100_M7:      sprintf(info->s, "M7:  %04X", adsp->m[7]); break;
20382023
2039      case CPUINFO_STR_REGISTER + ADSP2100_PX:      sprintf(info->s, "PX:  %02X  ", adsp2100.px); break;
2040      case CPUINFO_STR_REGISTER + ADSP2100_CNTR:      sprintf(info->s, "CNTR:%04X", adsp2100.cntr); break;
2041      case CPUINFO_STR_REGISTER + ADSP2100_ASTAT:    sprintf(info->s, "ASTA:%02X  ", adsp2100.astat); break;
2042      case CPUINFO_STR_REGISTER + ADSP2100_SSTAT:    sprintf(info->s, "SSTA:%02X  ", adsp2100.sstat); break;
2043      case CPUINFO_STR_REGISTER + ADSP2100_MSTAT:    sprintf(info->s, "MSTA:%02X  ", adsp2100.mstat); break;
2024      case CPUINFO_STR_REGISTER + ADSP2100_PX:      sprintf(info->s, "PX:  %02X  ", adsp->px); break;
2025      case CPUINFO_STR_REGISTER + ADSP2100_CNTR:      sprintf(info->s, "CNTR:%04X", adsp->cntr); break;
2026      case CPUINFO_STR_REGISTER + ADSP2100_ASTAT:    sprintf(info->s, "ASTA:%02X  ", adsp->astat); break;
2027      case CPUINFO_STR_REGISTER + ADSP2100_SSTAT:    sprintf(info->s, "SSTA:%02X  ", adsp->sstat); break;
2028      case CPUINFO_STR_REGISTER + ADSP2100_MSTAT:    sprintf(info->s, "MSTA:%02X  ", adsp->mstat); break;
20442029
2045      case CPUINFO_STR_REGISTER + ADSP2100_PCSP:       sprintf(info->s, "PCSP:%02X  ", adsp2100.pc_sp); break;
2046      case CPUINFO_STR_REGISTER + ADSP2100_CNTRSP:    sprintf(info->s, "CTSP:%01X   ", adsp2100.cntr_sp); break;
2047      case CPUINFO_STR_REGISTER + ADSP2100_STATSP:    sprintf(info->s, "STSP:%01X   ", adsp2100.stat_sp); break;
2048      case CPUINFO_STR_REGISTER + ADSP2100_LOOPSP:    sprintf(info->s, "LPSP:%01X   ", adsp2100.loop_sp); break;
2030      case CPUINFO_STR_REGISTER + ADSP2100_PCSP:       sprintf(info->s, "PCSP:%02X  ", adsp->pc_sp); break;
2031      case CPUINFO_STR_REGISTER + ADSP2100_CNTRSP:    sprintf(info->s, "CTSP:%01X   ", adsp->cntr_sp); break;
2032      case CPUINFO_STR_REGISTER + ADSP2100_STATSP:    sprintf(info->s, "STSP:%01X   ", adsp->stat_sp); break;
2033      case CPUINFO_STR_REGISTER + ADSP2100_LOOPSP:    sprintf(info->s, "LPSP:%01X   ", adsp->loop_sp); break;
20492034
2050      case CPUINFO_STR_REGISTER + ADSP2100_IMASK:    sprintf(info->s, "IMSK:%03X  ", adsp2100.imask); break;
2051      case CPUINFO_STR_REGISTER + ADSP2100_ICNTL:    sprintf(info->s, "ICTL:%02X  ", adsp2100.icntl); break;
2052      case CPUINFO_STR_REGISTER + ADSP2100_IRQSTATE0:   sprintf(info->s, "IRQ0:%X   ", adsp2100.irq_state[0]); break;
2053      case CPUINFO_STR_REGISTER + ADSP2100_IRQSTATE1:   sprintf(info->s, "IRQ1:%X   ", adsp2100.irq_state[1]); break;
2054      case CPUINFO_STR_REGISTER + ADSP2100_IRQSTATE2:   sprintf(info->s, "IRQ2:%X   ", adsp2100.irq_state[2]); break;
2055      case CPUINFO_STR_REGISTER + ADSP2100_IRQSTATE3:   sprintf(info->s, "IRQ3:%X   ", adsp2100.irq_state[3]); break;
2035      case CPUINFO_STR_REGISTER + ADSP2100_IMASK:    sprintf(info->s, "IMSK:%03X  ", adsp->imask); break;
2036      case CPUINFO_STR_REGISTER + ADSP2100_ICNTL:    sprintf(info->s, "ICTL:%02X  ", adsp->icntl); break;
2037      case CPUINFO_STR_REGISTER + ADSP2100_IRQSTATE0:   sprintf(info->s, "IRQ0:%X   ", adsp->irq_state[0]); break;
2038      case CPUINFO_STR_REGISTER + ADSP2100_IRQSTATE1:   sprintf(info->s, "IRQ1:%X   ", adsp->irq_state[1]); break;
2039      case CPUINFO_STR_REGISTER + ADSP2100_IRQSTATE2:   sprintf(info->s, "IRQ2:%X   ", adsp->irq_state[2]); break;
2040      case CPUINFO_STR_REGISTER + ADSP2100_IRQSTATE3:   sprintf(info->s, "IRQ3:%X   ", adsp->irq_state[3]); break;
20562041
2057      case CPUINFO_STR_REGISTER + ADSP2100_FLAGIN:    sprintf(info->s, "FI:  %X   ", adsp2100.flagin); break;
2058      case CPUINFO_STR_REGISTER + ADSP2100_FLAGOUT:    sprintf(info->s, "FO:  %X   ", adsp2100.flagout); break;
2059      case CPUINFO_STR_REGISTER + ADSP2100_FL0:       sprintf(info->s, "FL0: %X   ", adsp2100.fl0); break;
2060      case CPUINFO_STR_REGISTER + ADSP2100_FL1:       sprintf(info->s, "FL1: %X   ", adsp2100.fl1); break;
2061      case CPUINFO_STR_REGISTER + ADSP2100_FL2:       sprintf(info->s, "FL2: %X   ", adsp2100.fl2); break;
2042      case CPUINFO_STR_REGISTER + ADSP2100_FLAGIN:    sprintf(info->s, "FI:  %X   ", adsp->flagin); break;
2043      case CPUINFO_STR_REGISTER + ADSP2100_FLAGOUT:    sprintf(info->s, "FO:  %X   ", adsp->flagout); break;
2044      case CPUINFO_STR_REGISTER + ADSP2100_FL0:       sprintf(info->s, "FL0: %X   ", adsp->fl0); break;
2045      case CPUINFO_STR_REGISTER + ADSP2100_FL1:       sprintf(info->s, "FL1: %X   ", adsp->fl1); break;
2046      case CPUINFO_STR_REGISTER + ADSP2100_FL2:       sprintf(info->s, "FL2: %X   ", adsp->fl2); break;
20622047   }
20632048}
20642049
r3535r3536
20812066 * ADSP2100 section
20822067 **************************************************************************/
20832068
2084static void adsp2100_set_info(UINT32 state, cpuinfo *info)
2069static CPU_INIT( adsp2100 )
20852070{
2071   adsp2100_state *adsp = adsp21xx_init(device, index, clock, config, irqcallback);
2072   adsp->chip_type = CHIP_TYPE_ADSP2100;
2073   adsp->mstat_mask = 0x0f;
2074   adsp->imask_mask = 0x0f;
2075}
2076
2077static CPU_SET_INFO( adsp2100 )
2078{
2079   adsp2100_state *adsp = token;
20862080   switch (state)
20872081   {
20882082      /* --- the following bits of info are set as 64-bit signed integers --- */
2089      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ0:   set_irq_line(ADSP2100_IRQ0, info->i);   break;
2090      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ1:   set_irq_line(ADSP2100_IRQ1, info->i);   break;
2091      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ2:   set_irq_line(ADSP2100_IRQ2, info->i);   break;
2092      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ3:   set_irq_line(ADSP2100_IRQ3, info->i);   break;
2083      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ0:   set_irq_line(adsp, ADSP2100_IRQ0, info->i);   break;
2084      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ1:   set_irq_line(adsp, ADSP2100_IRQ1, info->i);   break;
2085      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ2:   set_irq_line(adsp, ADSP2100_IRQ2, info->i);   break;
2086      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ3:   set_irq_line(adsp, ADSP2100_IRQ3, info->i);   break;
20932087
20942088      default:
2095         adsp21xx_set_info(state, info);
2089         CPU_SET_INFO_CALL(adsp21xx);
20962090         break;
20972091   }
20982092}
20992093
2100void adsp2100_get_info(UINT32 state, cpuinfo *info)
2094CPU_GET_INFO( adsp2100 )
21012095{
2096   adsp2100_state *adsp = token;
21022097   switch (state)
21032098   {
21042099      /* --- the following bits of info are returned as 64-bit signed integers --- */
2105      case CPUINFO_INT_INPUT_LINES:               info->i = 4;                     break;
2106      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ0:   info->i = adsp2100.irq_state[ADSP2100_IRQ0]; break;
2107      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ1:   info->i = adsp2100.irq_state[ADSP2100_IRQ1]; break;
2108      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ2:   info->i = adsp2100.irq_state[ADSP2100_IRQ2]; break;
2109      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ3:   info->i = adsp2100.irq_state[ADSP2100_IRQ3]; break;
2100      case CPUINFO_INT_INPUT_LINES:               info->i = 4;                        break;
2101      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ0:   info->i = adsp->irq_state[ADSP2100_IRQ0];    break;
2102      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ1:   info->i = adsp->irq_state[ADSP2100_IRQ1];    break;
2103      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ2:   info->i = adsp->irq_state[ADSP2100_IRQ2];    break;
2104      case CPUINFO_INT_INPUT_STATE + ADSP2100_IRQ3:   info->i = adsp->irq_state[ADSP2100_IRQ3];    break;
21102105
21112106      /* --- the following bits of info are returned as pointers to data or functions --- */
2112      case CPUINFO_PTR_SET_INFO:                  info->setinfo = adsp2100_set_info;      break;
2113      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = adsp2100_set_context; break;
2107      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(adsp2100);               break;
2108      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(adsp2100);         break;
2109      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(adsp21xx);    break;
21142110
21152111      /* --- the following bits of info are returned as NULL-terminated strings --- */
2116      case CPUINFO_STR_NAME:                     strcpy(info->s, "ADSP2100");         break;
2112      case CPUINFO_STR_NAME:                     strcpy(info->s, "ADSP2100");            break;
21172113
21182114      default:
2119         adsp21xx_get_info(state, info);
2115         CPU_GET_INFO_CALL(adsp21xx);
21202116         break;
21212117   }
21222118}
r3535r3536
21282124 * ADSP2101 section
21292125 **************************************************************************/
21302126
2131static void adsp2101_reset(void)
2127static CPU_INIT( adsp2101 )
21322128{
2133   set_core_2101();
2134   adsp2100_reset();
2129   adsp2100_state *adsp = adsp21xx_init(device, index, clock, config, irqcallback);
2130   adsp->chip_type = CHIP_TYPE_ADSP2101;
2131   adsp->mstat_mask = 0x7f;
2132   adsp->imask_mask = 0x3f;
21352133}
21362134
2137static void adsp2101_set_context(void *src)
2135static CPU_SET_INFO( adsp2101 )
21382136{
2139   /* copy the context */
2140   if (src)
2141   {
2142      adsp2100 = *(adsp2100_Regs *)src;
2143      CHANGEPC();
2144   }
2145
2146   /* reset the chip type */
2147   set_core_2101();
2148
2149   /* check for IRQs */
2150   check_irqs();
2151}
2152
2153static void adsp2101_set_info(UINT32 state, cpuinfo *info)
2154{
2137   adsp2100_state *adsp = token;
21552138   switch (state)
21562139   {
21572140      /* --- the following bits of info are set as 64-bit signed integers --- */
2158      case CPUINFO_INT_INPUT_STATE + ADSP2101_IRQ0:   set_irq_line(ADSP2101_IRQ0, info->i);   break;
2159      case CPUINFO_INT_INPUT_STATE + ADSP2101_IRQ1:   set_irq_line(ADSP2101_IRQ1, info->i);   break;
2160      case CPUINFO_INT_INPUT_STATE + ADSP2101_IRQ2:   set_irq_line(ADSP2101_IRQ2, info->i);   break;
2161      case CPUINFO_INT_INPUT_STATE + ADSP2101_SPORT0_RX:set_irq_line(ADSP2101_SPORT0_RX, info->i); break;
2162      case CPUINFO_INT_INPUT_STATE + ADSP2101_SPORT0_TX:set_irq_line(ADSP2101_SPORT0_TX, info->i); break;
2163      case CPUINFO_INT_INPUT_STATE + ADSP2101_TIMER:   set_irq_line(ADSP2101_TIMER, info->i);   break;
2141      case CPUINFO_INT_INPUT_STATE + ADSP2101_IRQ0:   set_irq_line(adsp, ADSP2101_IRQ0, info->i);         break;
2142      case CPUINFO_INT_INPUT_STATE + ADSP2101_IRQ1:   set_irq_line(adsp, ADSP2101_IRQ1, info->i);         break;
2143      case CPUINFO_INT_INPUT_STATE + ADSP2101_IRQ2:   set_irq_line(adsp, ADSP2101_IRQ2, info->i);         break;
2144      case CPUINFO_INT_INPUT_STATE + ADSP2101_SPORT0_RX:set_irq_line(adsp, ADSP2101_SPORT0_RX, info->i);    break;
2145      case CPUINFO_INT_INPUT_STATE + ADSP2101_SPORT0_TX:set_irq_line(adsp, ADSP2101_SPORT0_TX, info->i);    break;
2146      case CPUINFO_INT_INPUT_STATE + ADSP2101_TIMER:   set_irq_line(adsp, ADSP2101_TIMER, info->i);      break;
21642147
21652148      /* --- the following bits of info are set as pointers to data or functions --- */
2166      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         adsp2100.sport_rx_callback = (RX_CALLBACK)info->f;   break;
2167      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         adsp2100.sport_tx_callback = (TX_CALLBACK)info->f;   break;
2168      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      adsp2100.timer_fired_func = (ADSP2100_TIMER_CALLBACK)info->f;   break;
2149      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         adsp->sport_rx_callback = (RX_CALLBACK)info->f;      break;
2150      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         adsp->sport_tx_callback = (TX_CALLBACK)info->f;      break;
2151      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      adsp->timer_fired_func = (ADSP2100_TIMER_CALLBACK)info->f;   break;
21692152
21702153      default:
2171         adsp21xx_set_info(state, info);
2154         CPU_SET_INFO_CALL(adsp21xx);
21722155         break;
21732156   }
21742157}
21752158
2176void adsp2101_get_info(UINT32 state, cpuinfo *info)
2159CPU_GET_INFO( adsp2101 )
21772160{
2161   adsp2100_state *adsp = token;
21782162   switch (state)
21792163   {
21802164      /* --- the following bits of info are returned as 64-bit signed integers --- */
2181      case CPUINFO_INT_INPUT_LINES:               info->i = 5;                     break;
2182      case CPUINFO_INT_INPUT_STATE + ADSP2101_IRQ0:   info->i = adsp2100.irq_state[ADSP2101_IRQ0]; break;
2183      case CPUINFO_INT_INPUT_STATE + ADSP2101_IRQ1:   info->i = adsp2100.irq_state[ADSP2101_IRQ1]; break;
2184      case CPUINFO_INT_INPUT_STATE + ADSP2101_IRQ2:   info->i = adsp2100.irq_state[ADSP2101_IRQ2]; break;
2185      case CPUINFO_INT_INPUT_STATE + ADSP2101_SPORT0_RX:info->i = adsp2100.irq_state[ADSP2101_SPORT0_RX]; break;
2186      case CPUINFO_INT_INPUT_STATE + ADSP2101_SPORT0_TX:info->i = adsp2100.irq_state[ADSP2101_SPORT0_TX]; break;
2187      case CPUINFO_INT_INPUT_STATE + ADSP2101_TIMER:   info->i = adsp2100.irq_state[ADSP2101_TIMER]; break;
2165      case CPUINFO_INT_INPUT_LINES:               info->i = 5;                           break;
2166      case CPUINFO_INT_INPUT_STATE + ADSP2101_IRQ0:   info->i = adsp->irq_state[ADSP2101_IRQ0];       break;
2167      case CPUINFO_INT_INPUT_STATE + ADSP2101_IRQ1:   info->i = adsp->irq_state[ADSP2101_IRQ1];       break;
2168      case CPUINFO_INT_INPUT_STATE + ADSP2101_IRQ2:   info->i = adsp->irq_state[ADSP2101_IRQ2];       break;
2169      case CPUINFO_INT_INPUT_STATE + ADSP2101_SPORT0_RX:info->i = adsp->irq_state[ADSP2101_SPORT0_RX];break;
2170      case CPUINFO_INT_INPUT_STATE + ADSP2101_SPORT0_TX:info->i = adsp->irq_state[ADSP2101_SPORT0_TX];break;
2171      case CPUINFO_INT_INPUT_STATE + ADSP2101_TIMER:   info->i = adsp->irq_state[ADSP2101_TIMER];       break;
21882172
21892173      /* --- the following bits of info are returned as pointers to data or functions --- */
2190      case CPUINFO_PTR_SET_INFO:                  info->setinfo = adsp2101_set_info;      break;
2191      case CPUINFO_PTR_RESET:                     info->reset = adsp2101_reset;         break;
2192      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = adsp2101_set_context; break;
2174      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(adsp2101);                  break;
2175      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(adsp2101);            break;
21932176
2194      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         info->f = (genf *)adsp2100.sport_rx_callback;   break;
2195      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         info->f = (genf *)adsp2100.sport_tx_callback;   break;
2196      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      info->f = (genf *)adsp2100.timer_fired_func;      break;
2177      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         info->f = (genf *)adsp->sport_rx_callback;      break;
2178      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         info->f = (genf *)adsp->sport_tx_callback;      break;
2179      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      info->f = (genf *)adsp->timer_fired_func;      break;
21972180
21982181      /* --- the following bits of info are returned as NULL-terminated strings --- */
2199      case CPUINFO_STR_NAME:                     strcpy(info->s, "ADSP2101");         break;
2182      case CPUINFO_STR_NAME:                     strcpy(info->s, "ADSP2101");               break;
22002183
22012184      default:
2202         adsp21xx_get_info(state, info);
2185         CPU_GET_INFO_CALL(adsp21xx);
22032186         break;
22042187   }
22052188}
r3535r3536
22112194 * ADSP2104 section
22122195 **************************************************************************/
22132196
2214static void adsp2104_reset(void)
2197static CPU_INIT( adsp2104 )
22152198{
2216   set_core_2104();
2217   adsp2100_reset();
2199   adsp2100_state *adsp = adsp21xx_init(device, index, clock, config, irqcallback);
2200   adsp->chip_type = CHIP_TYPE_ADSP2104;
2201   adsp->mstat_mask = 0x7f;
2202   adsp->imask_mask = 0x3f;
22182203}
22192204
2220static void adsp2104_set_context(void *src)
2221{
2222   /* copy the context */
2223   if (src)
2224   {
2225      adsp2100 = *(adsp2100_Regs *)src;
2226      CHANGEPC();
2227   }
2228
2229   /* reset the chip type */
2230   set_core_2104();
2231
2232   /* check for IRQs */
2233   check_irqs();
2234}
2235
22362205void adsp2104_load_boot_data(UINT8 *srcdata, UINT32 *dstdata)
22372206{
22382207   adsp21xx_load_boot_data(srcdata, dstdata);
22392208}
22402209
2241static void adsp2104_set_info(UINT32 state, cpuinfo *info)
2210static CPU_SET_INFO( adsp2104 )
22422211{
2212   adsp2100_state *adsp = token;
22432213   switch (state)
22442214   {
22452215      /* --- the following bits of info are set as 64-bit signed integers --- */
2246      case CPUINFO_INT_INPUT_STATE + ADSP2104_IRQ0:   set_irq_line(ADSP2104_IRQ0, info->i);   break;
2247      case CPUINFO_INT_INPUT_STATE + ADSP2104_IRQ1:   set_irq_line(ADSP2104_IRQ1, info->i);   break;
2248      case CPUINFO_INT_INPUT_STATE + ADSP2104_IRQ2:   set_irq_line(ADSP2104_IRQ2, info->i);   break;
2249      case CPUINFO_INT_INPUT_STATE + ADSP2104_SPORT0_RX:set_irq_line(ADSP2104_SPORT0_RX, info->i); break;
2250      case CPUINFO_INT_INPUT_STATE + ADSP2104_SPORT0_TX:set_irq_line(ADSP2104_SPORT0_TX, info->i); break;
2251      case CPUINFO_INT_INPUT_STATE + ADSP2104_TIMER:   set_irq_line(ADSP2104_TIMER, info->i);   break;
2216      case CPUINFO_INT_INPUT_STATE + ADSP2104_IRQ0:   set_irq_line(adsp, ADSP2104_IRQ0, info->i);         break;
2217      case CPUINFO_INT_INPUT_STATE + ADSP2104_IRQ1:   set_irq_line(adsp, ADSP2104_IRQ1, info->i);         break;
2218      case CPUINFO_INT_INPUT_STATE + ADSP2104_IRQ2:   set_irq_line(adsp, ADSP2104_IRQ2, info->i);         break;
2219      case CPUINFO_INT_INPUT_STATE + ADSP2104_SPORT0_RX:set_irq_line(adsp, ADSP2104_SPORT0_RX, info->i);    break;
2220      case CPUINFO_INT_INPUT_STATE + ADSP2104_SPORT0_TX:set_irq_line(adsp, ADSP2104_SPORT0_TX, info->i);    break;
2221      case CPUINFO_INT_INPUT_STATE + ADSP2104_TIMER:   set_irq_line(adsp, ADSP2104_TIMER, info->i);      break;
22522222
22532223      /* --- the following bits of info are set as pointers to data or functions --- */
2254      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         adsp2100.sport_rx_callback = (RX_CALLBACK)info->f;   break;
2255      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         adsp2100.sport_tx_callback = (TX_CALLBACK)info->f;   break;
2256      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      adsp2100.timer_fired_func = (ADSP2100_TIMER_CALLBACK)info->f;   break;
2224      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         adsp->sport_rx_callback = (RX_CALLBACK)info->f;      break;
2225      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         adsp->sport_tx_callback = (TX_CALLBACK)info->f;      break;
2226      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      adsp->timer_fired_func = (ADSP2100_TIMER_CALLBACK)info->f;   break;
22572227
22582228      default:
2259         adsp21xx_set_info(state, info);
2229         CPU_SET_INFO_CALL(adsp21xx);
22602230         break;
22612231   }
22622232}
22632233
2264void adsp2104_get_info(UINT32 state, cpuinfo *info)
2234CPU_GET_INFO( adsp2104 )
22652235{
2236   adsp2100_state *adsp = token;
22662237   switch (state)
22672238   {
22682239      /* --- the following bits of info are returned as 64-bit signed integers --- */
2269      case CPUINFO_INT_INPUT_LINES:               info->i = 5;                     break;
2270      case CPUINFO_INT_INPUT_STATE + ADSP2104_IRQ0:   info->i = adsp2100.irq_state[ADSP2104_IRQ0]; break;
2271      case CPUINFO_INT_INPUT_STATE + ADSP2104_IRQ1:   info->i = adsp2100.irq_state[ADSP2104_IRQ1]; break;
2272      case CPUINFO_INT_INPUT_STATE + ADSP2104_IRQ2:   info->i = adsp2100.irq_state[ADSP2104_IRQ2]; break;
2273      case CPUINFO_INT_INPUT_STATE + ADSP2104_SPORT0_RX:info->i = adsp2100.irq_state[ADSP2104_SPORT0_RX]; break;
2274      case CPUINFO_INT_INPUT_STATE + ADSP2104_SPORT0_TX:info->i = adsp2100.irq_state[ADSP2104_SPORT0_TX]; break;
2275      case CPUINFO_INT_INPUT_STATE + ADSP2104_TIMER:   info->i = adsp2100.irq_state[ADSP2104_TIMER]; break;
2240      case CPUINFO_INT_INPUT_LINES:               info->i = 5;                           break;
2241      case CPUINFO_INT_INPUT_STATE + ADSP2104_IRQ0:   info->i = adsp->irq_state[ADSP2104_IRQ0];       break;
2242      case CPUINFO_INT_INPUT_STATE + ADSP2104_IRQ1:   info->i = adsp->irq_state[ADSP2104_IRQ1];       break;
2243      case CPUINFO_INT_INPUT_STATE + ADSP2104_IRQ2:   info->i = adsp->irq_state[ADSP2104_IRQ2];       break;
2244      case CPUINFO_INT_INPUT_STATE + ADSP2104_SPORT0_RX:info->i = adsp->irq_state[ADSP2104_SPORT0_RX];break;
2245      case CPUINFO_INT_INPUT_STATE + ADSP2104_SPORT0_TX:info->i = adsp->irq_state[ADSP2104_SPORT0_TX];break;
2246      case CPUINFO_INT_INPUT_STATE + ADSP2104_TIMER:   info->i = adsp->irq_state[ADSP2104_TIMER];       break;
22762247
22772248      /* --- the following bits of info are returned as pointers to data or functions --- */
2278      case CPUINFO_PTR_SET_INFO:                  info->setinfo = adsp2104_set_info;      break;
2279      case CPUINFO_PTR_RESET:                     info->reset = adsp2104_reset;         break;
2280      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = adsp2104_set_context; break;
2249      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(adsp2104);                  break;
2250      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(adsp2104);            break;
22812251
2282      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         info->f = (genf *)adsp2100.sport_rx_callback;   break;
2283      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         info->f = (genf *)adsp2100.sport_tx_callback;   break;
2284      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      info->f = (genf *)adsp2100.timer_fired_func;      break;
2252      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         info->f = (genf *)adsp->sport_rx_callback;      break;
2253      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         info->f = (genf *)adsp->sport_tx_callback;      break;
2254      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      info->f = (genf *)adsp->timer_fired_func;      break;
22852255
22862256      /* --- the following bits of info are returned as NULL-terminated strings --- */
2287      case CPUINFO_STR_NAME:                     strcpy(info->s, "ADSP2104");         break;
2257      case CPUINFO_STR_NAME:                     strcpy(info->s, "ADSP2104");               break;
22882258
22892259      default:
2290         adsp21xx_get_info(state, info);
2260         CPU_GET_INFO_CALL(adsp21xx);
22912261         break;
22922262   }
22932263}
r3535r3536
22992269 * ADSP2105 section
23002270 **************************************************************************/
23012271
2302static void adsp2105_reset(void)
2272static CPU_INIT( adsp2105 )
23032273{
2304   set_core_2105();
2305   adsp2100_reset();
2274   adsp2100_state *adsp = adsp21xx_init(device, index, clock, config, irqcallback);
2275   adsp->chip_type = CHIP_TYPE_ADSP2105;
2276   adsp->mstat_mask = 0x7f;
2277   adsp->imask_mask = 0x3f;
23062278}
23072279
2308static void adsp2105_set_context(void *src)
2309{
2310   /* copy the context */
2311   if (src)
2312   {
2313      adsp2100 = *(adsp2100_Regs *)src;
2314      CHANGEPC();
2315   }
2316
2317   /* reset the chip type */
2318   set_core_2105();
2319
2320   /* check for IRQs */
2321   check_irqs();
2322}
2323
23242280void adsp2105_load_boot_data(UINT8 *srcdata, UINT32 *dstdata)
23252281{
23262282   adsp21xx_load_boot_data(srcdata, dstdata);
23272283}
23282284
2329static void adsp2105_set_info(UINT32 state, cpuinfo *info)
2285static CPU_SET_INFO( adsp2105 )
23302286{
2287   adsp2100_state *adsp = token;
23312288   switch (state)
23322289   {
23332290      /* --- the following bits of info are set as 64-bit signed integers --- */
2334      case CPUINFO_INT_INPUT_STATE + ADSP2105_IRQ0:   set_irq_line(ADSP2105_IRQ0, info->i);   break;
2335      case CPUINFO_INT_INPUT_STATE + ADSP2105_IRQ1:   set_irq_line(ADSP2105_IRQ1, info->i);   break;
2336      case CPUINFO_INT_INPUT_STATE + ADSP2105_IRQ2:   set_irq_line(ADSP2105_IRQ2, info->i);   break;
2291      case CPUINFO_INT_INPUT_STATE + ADSP2105_IRQ0:   set_irq_line(adsp, ADSP2105_IRQ0, info->i);      break;
2292      case CPUINFO_INT_INPUT_STATE + ADSP2105_IRQ1:   set_irq_line(adsp, ADSP2105_IRQ1, info->i);      break;
2293      case CPUINFO_INT_INPUT_STATE + ADSP2105_IRQ2:   set_irq_line(adsp, ADSP2105_IRQ2, info->i);      break;
23372294
23382295      /* --- the following bits of info are set as pointers to data or functions --- */
2339      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         adsp2100.sport_rx_callback = (RX_CALLBACK)info->f;   break;
2340      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         adsp2100.sport_tx_callback = (TX_CALLBACK)info->f;   break;
2341      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      adsp2100.timer_fired_func = (ADSP2100_TIMER_CALLBACK)info->f;   break;
2296      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         adsp->sport_rx_callback = (RX_CALLBACK)info->f;   break;
2297      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         adsp->sport_tx_callback = (TX_CALLBACK)info->f;   break;
2298      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      adsp->timer_fired_func = (ADSP2100_TIMER_CALLBACK)info->f;   break;
23422299
23432300      default:
2344         adsp21xx_set_info(state, info);
2301         CPU_SET_INFO_CALL(adsp21xx);
23452302         break;
23462303   }
23472304}
23482305
2349void adsp2105_get_info(UINT32 state, cpuinfo *info)
2306CPU_GET_INFO( adsp2105 )
23502307{
2308   adsp2100_state *adsp = token;
23512309   switch (state)
23522310   {
23532311      /* --- the following bits of info are returned as 64-bit signed integers --- */
2354      case CPUINFO_INT_INPUT_LINES:               info->i = 3;                     break;
2355      case CPUINFO_INT_INPUT_STATE + ADSP2105_IRQ0:   info->i = adsp2100.irq_state[ADSP2105_IRQ0]; break;
2356      case CPUINFO_INT_INPUT_STATE + ADSP2105_IRQ1:   info->i = adsp2100.irq_state[ADSP2105_IRQ1]; break;
2357      case CPUINFO_INT_INPUT_STATE + ADSP2105_IRQ2:   info->i = adsp2100.irq_state[ADSP2105_IRQ2]; break;
2312      case CPUINFO_INT_INPUT_LINES:               info->i = 3;                        break;
2313      case CPUINFO_INT_INPUT_STATE + ADSP2105_IRQ0:   info->i = adsp->irq_state[ADSP2105_IRQ0];    break;
2314      case CPUINFO_INT_INPUT_STATE + ADSP2105_IRQ1:   info->i = adsp->irq_state[ADSP2105_IRQ1];    break;
2315      case CPUINFO_INT_INPUT_STATE + ADSP2105_IRQ2:   info->i = adsp->irq_state[ADSP2105_IRQ2];    break;
23582316
23592317      /* --- the following bits of info are returned as pointers to data or functions --- */
2360      case CPUINFO_PTR_SET_INFO:                  info->setinfo = adsp2105_set_info;      break;
2361      case CPUINFO_PTR_RESET:                     info->reset = adsp2105_reset;         break;
2362      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = adsp2105_set_context; break;
2318      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(adsp2105);               break;
2319      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(adsp2105);         break;
23632320
2364      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         info->f = (genf *)adsp2100.sport_rx_callback;   break;
2365      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         info->f = (genf *)adsp2100.sport_tx_callback;   break;
2366      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      info->f = (genf *)adsp2100.timer_fired_func;      break;
2321      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         info->f = (genf *)adsp->sport_rx_callback;   break;
2322      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         info->f = (genf *)adsp->sport_tx_callback;   break;
2323      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      info->f = (genf *)adsp->timer_fired_func;   break;
23672324
23682325      /* --- the following bits of info are returned as NULL-terminated strings --- */
2369      case CPUINFO_STR_NAME:                     strcpy(info->s, "ADSP2105");         break;
2326      case CPUINFO_STR_NAME:                     strcpy(info->s, "ADSP2105");            break;
23702327
23712328      default:
2372         adsp21xx_get_info(state, info);
2329         CPU_GET_INFO_CALL(adsp21xx);
23732330         break;
23742331   }
23752332}
r3535r3536
23812338 * ADSP2115 section
23822339 **************************************************************************/
23832340
2384static void adsp2115_reset(void)
2341static CPU_INIT( adsp2115 )
23852342{
2386   set_core_2115();
2387   adsp2100_reset();
2343   adsp2100_state *adsp = adsp21xx_init(device, index, clock, config, irqcallback);
2344   adsp->chip_type = CHIP_TYPE_ADSP2115;
2345   adsp->mstat_mask = 0x7f;
2346   adsp->imask_mask = 0x3f;
23882347}
23892348
2390static void adsp2115_set_context(void *src)
2391{
2392   /* copy the context */
2393   if (src)
2394   {
2395      adsp2100 = *(adsp2100_Regs *)src;
2396      CHANGEPC();
2397   }
2398
2399   /* reset the chip type */
2400   set_core_2115();
2401
2402   /* check for IRQs */
2403   check_irqs();
2404}
2405
24062349void adsp2115_load_boot_data(UINT8 *srcdata, UINT32 *dstdata)
24072350{
24082351   adsp21xx_load_boot_data(srcdata, dstdata);
24092352}
24102353
2411static void adsp2115_set_info(UINT32 state, cpuinfo *info)
2354static CPU_SET_INFO( adsp2115 )
24122355{
2356   adsp2100_state *adsp = token;
24132357   switch (state)
24142358   {
24152359      /* --- the following bits of info are set as 64-bit signed integers --- */
2416      case CPUINFO_INT_INPUT_STATE + ADSP2115_IRQ0:   set_irq_line(ADSP2115_IRQ0, info->i);   break;
2417      case CPUINFO_INT_INPUT_STATE + ADSP2115_IRQ1:   set_irq_line(ADSP2115_IRQ1, info->i);   break;
2418      case CPUINFO_INT_INPUT_STATE + ADSP2115_IRQ2:   set_irq_line(ADSP2115_IRQ2, info->i);   break;
2419      case CPUINFO_INT_INPUT_STATE + ADSP2115_SPORT0_RX:set_irq_line(ADSP2115_SPORT0_RX, info->i); break;
2420      case CPUINFO_INT_INPUT_STATE + ADSP2115_SPORT0_TX:set_irq_line(ADSP2115_SPORT0_TX, info->i); break;
2421      case CPUINFO_INT_INPUT_STATE + ADSP2115_TIMER:   set_irq_line(ADSP2115_TIMER, info->i);   break;
2360      case CPUINFO_INT_INPUT_STATE + ADSP2115_IRQ0:   set_irq_line(adsp, ADSP2115_IRQ0, info->i);         break;
2361      case CPUINFO_INT_INPUT_STATE + ADSP2115_IRQ1:   set_irq_line(adsp, ADSP2115_IRQ1, info->i);         break;
2362      case CPUINFO_INT_INPUT_STATE + ADSP2115_IRQ2:   set_irq_line(adsp, ADSP2115_IRQ2, info->i);         break;
2363      case CPUINFO_INT_INPUT_STATE + ADSP2115_SPORT0_RX:set_irq_line(adsp, ADSP2115_SPORT0_RX, info->i);    break;
2364      case CPUINFO_INT_INPUT_STATE + ADSP2115_SPORT0_TX:set_irq_line(adsp, ADSP2115_SPORT0_TX, info->i);    break;
2365      case CPUINFO_INT_INPUT_STATE + ADSP2115_TIMER:   set_irq_line(adsp, ADSP2115_TIMER, info->i);      break;
24222366
24232367      /* --- the following bits of info are set as pointers to data or functions --- */
2424      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         adsp2100.sport_rx_callback = (RX_CALLBACK)info->f;   break;
2425      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         adsp2100.sport_tx_callback = (TX_CALLBACK)info->f;   break;
2426      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      adsp2100.timer_fired_func = (ADSP2100_TIMER_CALLBACK)info->f;   break;
2368      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         adsp->sport_rx_callback = (RX_CALLBACK)info->f;      break;
2369      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         adsp->sport_tx_callback = (TX_CALLBACK)info->f;      break;
2370      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      adsp->timer_fired_func = (ADSP2100_TIMER_CALLBACK)info->f;   break;
24272371
24282372      default:
2429         adsp21xx_set_info(state, info);
2373         CPU_SET_INFO_CALL(adsp21xx);
24302374         break;
24312375   }
24322376}
24332377
2434void adsp2115_get_info(UINT32 state, cpuinfo *info)
2378CPU_GET_INFO( adsp2115 )
24352379{
2380   adsp2100_state *adsp = token;
24362381   switch (state)
24372382   {
24382383      /* --- the following bits of info are returned as 64-bit signed integers --- */
2439      case CPUINFO_INT_INPUT_LINES:               info->i = 4;                     break;
2440      case CPUINFO_INT_INPUT_STATE + ADSP2115_IRQ0:   info->i = adsp2100.irq_state[ADSP2115_IRQ0]; break;
2441      case CPUINFO_INT_INPUT_STATE + ADSP2115_IRQ1:   info->i = adsp2100.irq_state[ADSP2115_IRQ1]; break;
2442      case CPUINFO_INT_INPUT_STATE + ADSP2115_IRQ2:   info->i = adsp2100.irq_state[ADSP2115_IRQ2]; break;
2443      case CPUINFO_INT_INPUT_STATE + ADSP2115_SPORT0_RX:info->i = adsp2100.irq_state[ADSP2115_SPORT0_RX]; break;
2444      case CPUINFO_INT_INPUT_STATE + ADSP2115_SPORT0_TX:info->i = adsp2100.irq_state[ADSP2115_SPORT0_TX]; break;
2445      case CPUINFO_INT_INPUT_STATE + ADSP2115_TIMER:   info->i = adsp2100.irq_state[ADSP2115_TIMER]; break;
2384      case CPUINFO_INT_INPUT_LINES:               info->i = 4;                           break;
2385      case CPUINFO_INT_INPUT_STATE + ADSP2115_IRQ0:   info->i = adsp->irq_state[ADSP2115_IRQ0];       break;
2386      case CPUINFO_INT_INPUT_STATE + ADSP2115_IRQ1:   info->i = adsp->irq_state[ADSP2115_IRQ1];       break;
2387      case CPUINFO_INT_INPUT_STATE + ADSP2115_IRQ2:   info->i = adsp->irq_state[ADSP2115_IRQ2];       break;
2388      case CPUINFO_INT_INPUT_STATE + ADSP2115_SPORT0_RX:info->i = adsp->irq_state[ADSP2115_SPORT0_RX];break;
2389      case CPUINFO_INT_INPUT_STATE + ADSP2115_SPORT0_TX:info->i = adsp->irq_state[ADSP2115_SPORT0_TX];break;
2390      case CPUINFO_INT_INPUT_STATE + ADSP2115_TIMER:   info->i = adsp->irq_state[ADSP2115_TIMER];       break;
24462391
24472392      /* --- the following bits of info are returned as pointers to data or functions --- */
2448      case CPUINFO_PTR_SET_INFO:                  info->setinfo = adsp2115_set_info;      break;
2449      case CPUINFO_PTR_RESET:                     info->reset = adsp2115_reset;         break;
2450      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = adsp2115_set_context; break;
2393      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(adsp2115);                  break;
2394      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(adsp2115);            break;
24512395
2452      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         info->f = (genf *)adsp2100.sport_rx_callback;   break;
2453      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         info->f = (genf *)adsp2100.sport_tx_callback;   break;
2454      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      info->f = (genf *)adsp2100.timer_fired_func;      break;
2396      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         info->f = (genf *)adsp->sport_rx_callback;      break;
2397      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         info->f = (genf *)adsp->sport_tx_callback;      break;
2398      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      info->f = (genf *)adsp->timer_fired_func;      break;
24552399
24562400      /* --- the following bits of info are returned as NULL-terminated strings --- */
2457      case CPUINFO_STR_NAME:                     strcpy(info->s, "ADSP2115");         break;
2401      case CPUINFO_STR_NAME:                     strcpy(info->s, "ADSP2115");               break;
24582402
24592403      default:
2460         adsp21xx_get_info(state, info);
2404         CPU_GET_INFO_CALL(adsp21xx);
24612405         break;
24622406   }
24632407}
r3535r3536
24692413 * ADSP2181 section
24702414 **************************************************************************/
24712415
2472static void adsp2181_reset(void)
2416static CPU_INIT( adsp2181 )
24732417{
2474   set_core_2181();
2475   adsp2100_reset();
2418   adsp2100_state *adsp = adsp21xx_init(device, index, clock, config, irqcallback);
2419   adsp->chip_type = CHIP_TYPE_ADSP2181;
2420   adsp->mstat_mask = 0x7f;
2421   adsp->imask_mask = 0x3ff;
24762422}
24772423
2478static void adsp2181_set_context(void *src)
2479{
2480   /* copy the context */
2481   if (src)
2482   {
2483      adsp2100 = *(adsp2100_Regs *)src;
2484      CHANGEPC();
2485   }
2486
2487   /* reset the chip type */
2488   set_core_2181();
2489
2490   /* check for IRQs */
2491   check_irqs();
2492}
2493
24942424void adsp2181_load_boot_data(UINT8 *srcdata, UINT32 *dstdata)
24952425{
24962426   adsp21xx_load_boot_data(srcdata, dstdata);
24972427}
24982428
2499static void adsp2181_set_info(UINT32 state, cpuinfo *info)
2429static CPU_SET_INFO( adsp2181 )
25002430{
2431   adsp2100_state *adsp = token;
25012432   switch (state)
25022433   {
25032434      /* --- the following bits of info are set as 64-bit signed integers --- */
2504      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQ0:   set_irq_line(ADSP2181_IRQ0, info->i);   break;
2505      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQ1:   set_irq_line(ADSP2181_IRQ1, info->i);   break;
2506      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQ2:   set_irq_line(ADSP2181_IRQ2, info->i);   break;
2507      case CPUINFO_INT_INPUT_STATE + ADSP2181_SPORT0_RX:set_irq_line(ADSP2181_SPORT0_RX, info->i); break;
2508      case CPUINFO_INT_INPUT_STATE + ADSP2181_SPORT0_TX:set_irq_line(ADSP2181_SPORT0_TX, info->i); break;
2509      case CPUINFO_INT_INPUT_STATE + ADSP2181_TIMER:   set_irq_line(ADSP2181_TIMER, info->i);   break;
2510      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQE:   set_irq_line(ADSP2181_IRQE, info->i);   break;
2511      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQL1:   set_irq_line(ADSP2181_IRQL1, info->i);   break;
2512      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQL2:   set_irq_line(ADSP2181_IRQL2, info->i);   break;
2435      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQ0:   set_irq_line(adsp, ADSP2181_IRQ0, info->i);         break;
2436      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQ1:   set_irq_line(adsp, ADSP2181_IRQ1, info->i);         break;
2437      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQ2:   set_irq_line(adsp, ADSP2181_IRQ2, info->i);         break;
2438      case CPUINFO_INT_INPUT_STATE + ADSP2181_SPORT0_RX:set_irq_line(adsp, ADSP2181_SPORT0_RX, info->i);    break;
2439      case CPUINFO_INT_INPUT_STATE + ADSP2181_SPORT0_TX:set_irq_line(adsp, ADSP2181_SPORT0_TX, info->i);    break;
2440      case CPUINFO_INT_INPUT_STATE + ADSP2181_TIMER:   set_irq_line(adsp, ADSP2181_TIMER, info->i);      break;
2441      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQE:   set_irq_line(adsp, ADSP2181_IRQE, info->i);         break;
2442      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQL1:   set_irq_line(adsp, ADSP2181_IRQL1, info->i);      break;
2443      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQL2:   set_irq_line(adsp, ADSP2181_IRQL2, info->i);      break;
25132444
25142445      /* --- the following bits of info are set as pointers to data or functions --- */
2515      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         adsp2100.sport_rx_callback = (RX_CALLBACK)info->f;   break;
2516      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         adsp2100.sport_tx_callback = (TX_CALLBACK)info->f;   break;
2517      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      adsp2100.timer_fired_func = (ADSP2100_TIMER_CALLBACK)info->f;   break;
2446      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         adsp->sport_rx_callback = (RX_CALLBACK)info->f;      break;
2447      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         adsp->sport_tx_callback = (TX_CALLBACK)info->f;      break;
2448      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      adsp->timer_fired_func = (ADSP2100_TIMER_CALLBACK)info->f;   break;
25182449
25192450      default:
2520         adsp21xx_set_info(state, info);
2451         CPU_SET_INFO_CALL(adsp21xx);
25212452         break;
25222453   }
25232454}
25242455
2525void adsp2181_get_info(UINT32 state, cpuinfo *info)
2456CPU_GET_INFO( adsp2181 )
25262457{
2458   adsp2100_state *adsp = token;
25272459   switch (state)
25282460   {
25292461      /* --- the following bits of info are returned as 64-bit signed integers --- */
2530      case CPUINFO_INT_INPUT_LINES:               info->i = 4;                     break;
2531      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQ0:   info->i = adsp2100.irq_state[ADSP2181_IRQ0]; break;
2532      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQ1:   info->i = adsp2100.irq_state[ADSP2181_IRQ1]; break;
2533      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQ2:   info->i = adsp2100.irq_state[ADSP2181_IRQ2]; break;
2534      case CPUINFO_INT_INPUT_STATE + ADSP2181_SPORT0_RX:info->i = adsp2100.irq_state[ADSP2181_SPORT0_RX]; break;
2535      case CPUINFO_INT_INPUT_STATE + ADSP2181_SPORT0_TX:info->i = adsp2100.irq_state[ADSP2181_SPORT0_TX]; break;
2536      case CPUINFO_INT_INPUT_STATE + ADSP2181_TIMER:   info->i = adsp2100.irq_state[ADSP2181_TIMER]; break;
2537      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQE:   info->i = adsp2100.irq_state[ADSP2181_IRQE]; break;
2538      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQL1:   info->i = adsp2100.irq_state[ADSP2181_IRQL1]; break;
2539      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQL2:   info->i = adsp2100.irq_state[ADSP2181_IRQL2]; break;
2462      case CPUINFO_INT_INPUT_LINES:               info->i = 4;                           break;
2463      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQ0:   info->i = adsp->irq_state[ADSP2181_IRQ0];       break;
2464      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQ1:   info->i = adsp->irq_state[ADSP2181_IRQ1];       break;
2465      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQ2:   info->i = adsp->irq_state[ADSP2181_IRQ2];       break;
2466      case CPUINFO_INT_INPUT_STATE + ADSP2181_SPORT0_RX:info->i = adsp->irq_state[ADSP2181_SPORT0_RX];break;
2467      case CPUINFO_INT_INPUT_STATE + ADSP2181_SPORT0_TX:info->i = adsp->irq_state[ADSP2181_SPORT0_TX];break;
2468      case CPUINFO_INT_INPUT_STATE + ADSP2181_TIMER:   info->i = adsp->irq_state[ADSP2181_TIMER];       break;
2469      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQE:   info->i = adsp->irq_state[ADSP2181_IRQE];       break;
2470      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQL1:   info->i = adsp->irq_state[ADSP2181_IRQL1];       break;
2471      case CPUINFO_INT_INPUT_STATE + ADSP2181_IRQL2:   info->i = adsp->irq_state[ADSP2181_IRQL2];       break;
25402472
2541      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 16;               break;
2542      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 11;               break;
2543      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = -1;               break;
2473      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 16;                     break;
2474      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 11;                     break;
2475      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = -1;                     break;
25442476
25452477      /* --- the following bits of info are returned as pointers to data or functions --- */
2546      case CPUINFO_PTR_SET_INFO:                  info->setinfo = adsp2181_set_info;      break;
2547      case CPUINFO_PTR_RESET:                     info->reset = adsp2181_reset;         break;
2548      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = adsp2181_set_context; break;
2478      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(adsp2181);                  break;
2479      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(adsp2181);            break;
25492480
2550      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         info->f = (genf *)adsp2100.sport_rx_callback; break;
2551      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         info->f = (genf *)adsp2100.sport_tx_callback; break;
2552      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      info->f = (genf *)adsp2100.timer_fired_func; break;
2481      case CPUINFO_PTR_ADSP2100_RX_HANDLER:         info->f = (genf *)adsp->sport_rx_callback;       break;
2482      case CPUINFO_PTR_ADSP2100_TX_HANDLER:         info->f = (genf *)adsp->sport_tx_callback;       break;
2483      case CPUINFO_PTR_ADSP2100_TIMER_HANDLER:      info->f = (genf *)adsp->timer_fired_func;       break;
25532484
25542485      /* --- the following bits of info are returned as NULL-terminated strings --- */
2555      case CPUINFO_STR_NAME:                     strcpy(info->s, "ADSP2181");         break;
2486      case CPUINFO_STR_NAME:                     strcpy(info->s, "ADSP2181");               break;
25562487
25572488      default:
2558         adsp21xx_get_info(state, info);
2489         CPU_GET_INFO_CALL(adsp21xx);
25592490         break;
25602491   }
25612492}
25622493
25632494void adsp2181_idma_addr_w(UINT16 data)
25642495{
2565   adsp2100.idma_addr = data;
2566   adsp2100.idma_offs = 0;
2496   adsp2100_state *adsp = token;
2497   adsp->idma_addr = data;
2498   adsp->idma_offs = 0;
25672499}
25682500
25692501UINT16 adsp2181_idma_addr_r(void)
25702502{
2571   return adsp2100.idma_addr;
2503   adsp2100_state *adsp = token;
2504   return adsp->idma_addr;
25722505}
25732506
25742507void adsp2181_idma_data_w(UINT16 data)
25752508{
2509   adsp2100_state *adsp = token;
2510
25762511   /* program memory? */
2577   if (!(adsp2100.idma_addr & 0x4000))
2512   if (!(adsp->idma_addr & 0x4000))
25782513   {
25792514      /* upper 16 bits */
2580      if (adsp2100.idma_offs == 0)
2515      if (adsp->idma_offs == 0)
25812516      {
2582         adsp2100.idma_cache = data;
2583         adsp2100.idma_offs = 1;
2517         adsp->idma_cache = data;
2518         adsp->idma_offs = 1;
25842519      }
25852520
25862521      /* lower 8 bits */
25872522      else
25882523      {
2589         WWORD_PGM(adsp2100.idma_addr++ & 0x3fff, (adsp2100.idma_cache << 8) | (data & 0xff));
2590         adsp2100.idma_offs = 0;
2524         WWORD_PGM(adsp->idma_addr++ & 0x3fff, (adsp->idma_cache << 8) | (data & 0xff));
2525         adsp->idma_offs = 0;
25912526      }
25922527   }
25932528
25942529   /* data memory */
25952530   else
2596      WWORD_DATA(adsp2100.idma_addr++ & 0x3fff, data);
2531      WWORD_DATA(adsp->idma_addr++ & 0x3fff, data);
25972532}
25982533
25992534UINT16 adsp2181_idma_data_r(void)
26002535{
2536   adsp2100_state *adsp = token;
26012537   UINT16 result = 0xffff;
26022538
26032539   /* program memory? */
2604   if (!(adsp2100.idma_addr & 0x4000))
2540   if (!(adsp->idma_addr & 0x4000))
26052541   {
26062542      /* upper 16 bits */
2607      if (adsp2100.idma_offs == 0)
2543      if (adsp->idma_offs == 0)
26082544      {
2609         result = RWORD_PGM(adsp2100.idma_addr & 0x3fff) >> 8;
2610         adsp2100.idma_offs = 1;
2545         result = RWORD_PGM(adsp->idma_addr & 0x3fff) >> 8;
2546         adsp->idma_offs = 1;
26112547      }
26122548
26132549      /* lower 8 bits */
26142550      else
26152551      {
2616         result = RWORD_PGM(adsp2100.idma_addr++ & 0x3fff) & 0xff;
2617         adsp2100.idma_offs = 0;
2552         result = RWORD_PGM(adsp->idma_addr++ & 0x3fff) & 0xff;
2553         adsp->idma_offs = 0;
26182554      }
26192555   }
26202556
26212557   /* data memory */
26222558   else
2623      result = RWORD_DATA(adsp2100.idma_addr++ & 0x3fff);
2559      result = RWORD_DATA(adsp->idma_addr++ & 0x3fff);
26242560
26252561   return result;
26262562}
src/emu/cpu/dsp32/dsp32.h
r3535r3536
7979    PUBLIC FUNCTIONS
8080***************************************************************************/
8181
82extern void dsp32c_get_info(UINT32 state, cpuinfo *info);
82extern CPU_GET_INFO( dsp32c );
8383
8484extern void dsp32c_pio_w(int cpunum, int reg, int data);
8585extern int dsp32c_pio_r(int cpunum, int reg);
src/emu/cpu/dsp32/dsp32.c
r3535r3536
185185   UINT32         op;
186186   int            interrupt_cycles;
187187   void         (*output_pins_changed)(UINT32 pins);
188   const device_config *device;
188189} dsp32_regs;
189190
190191
r3535r3536
193194    FUNCTION PROTOTYPES
194195***************************************************************************/
195196
196static void dsp32c_reset(void);
197static CPU_RESET( dsp32c );
197198
198199
199200
r3535r3536
301302
302303   /* reset the chip if we get a reset */
303304   if ((oldval & PCR_RESET) == 0 && (newval & PCR_RESET) != 0)
304      dsp32c_reset();
305      CPU_RESET_NAME(dsp32c)(dsp32.device);
305306
306307   /* track the state of the output pins */
307308   if (dsp32.output_pins_changed)
r3535r3536
321322    CONTEXT SWITCHING
322323***************************************************************************/
323324
324static void dsp32c_get_context(void *dst)
325static CPU_GET_CONTEXT( dsp32c )
325326{
326327   /* copy the context */
327328   if (dst)
r3535r3536
329330}
330331
331332
332static void dsp32c_set_context(void *src)
333static CPU_SET_CONTEXT( dsp32c )
333334{
334335   /* copy the context */
335336   if (src)
r3535r3536
346347    INITIALIZATION AND SHUTDOWN
347348***************************************************************************/
348349
349static void dsp32c_init(int index, int clock, const void *_config, int (*irqcallback)(int))
350static CPU_INIT( dsp32c )
350351{
351   const dsp32_config *config = _config;
352   const dsp32_config *configdata = config;
352353
353354   /* copy in config data */
354   if (config)
355      dsp32.output_pins_changed = config->output_pins_changed;
355   if (configdata)
356      dsp32.output_pins_changed = configdata->output_pins_changed;
357
358   dsp32.device = device;
356359}
357360
358361
359static void dsp32c_reset(void)
362static CPU_RESET( dsp32c )
360363{
361364   /* reset goes to 0 */
362365   dsp32.PC = 0;
r3535r3536
381384}
382385
383386
384static void dsp32c_exit(void)
387static CPU_EXIT( dsp32c )
385388{
386389}
387390
r3535r3536
399402    CORE EXECUTION LOOP
400403***************************************************************************/
401404
402static int dsp32c_execute(int cycles)
405static CPU_EXECUTE( dsp32c )
403406{
404407   /* skip if halted */
405408   if ((dsp32.pcr & PCR_RESET) == 0)
r3535r3536
437440    DISASSEMBLY HOOK
438441***************************************************************************/
439442
440static offs_t dsp32c_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
443static CPU_DISASSEMBLE( dsp32c )
441444{
442445   extern unsigned dasm_dsp32(char *, unsigned, UINT32);
443446   return dasm_dsp32(buffer, pc, oprom[0] | (oprom[1] << 8) | (oprom[2] << 16) | (oprom[3] << 24));
r3535r3536
709712 * Generic set_info
710713 **************************************************************************/
711714
712static void dsp32c_set_info(UINT32 state, cpuinfo *info)
715static CPU_SET_INFO( dsp32c )
713716{
714717   switch (state)
715718   {
r3535r3536
780783 * Generic get_info
781784 **************************************************************************/
782785
783void dsp32c_get_info(UINT32 state, cpuinfo *info)
786CPU_GET_INFO( dsp32c )
784787{
785788   switch (state)
786789   {
r3535r3536
867870      case CPUINFO_INT_REGISTER + DSP32_IOC:         info->i = dsp32.IOC;               break;
868871
869872      /* --- the following bits of info are returned as pointers to data or functions --- */
870      case CPUINFO_PTR_SET_INFO:                  info->setinfo = dsp32c_set_info;      break;
871      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = dsp32c_get_context;   break;
872      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = dsp32c_set_context;   break;
873      case CPUINFO_PTR_INIT:                     info->init = dsp32c_init;            break;
874      case CPUINFO_PTR_RESET:                     info->reset = dsp32c_reset;            break;
875      case CPUINFO_PTR_EXIT:                     info->exit = dsp32c_exit;            break;
876      case CPUINFO_PTR_EXECUTE:                  info->execute = dsp32c_execute;         break;
873      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(dsp32c);      break;
874      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(dsp32c);   break;
875      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(dsp32c);   break;
876      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(dsp32c);            break;
877      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(dsp32c);            break;
878      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(dsp32c);            break;
879      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(dsp32c);         break;
877880      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
878      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = dsp32c_dasm;      break;
881      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(dsp32c);      break;
879882      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &dsp32_icount;         break;
880883
881884      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/rsp/rsp.c
r3535r3536
2929static FILE *exec_output;
3030
3131
32static rsp_config *config;
32static rsp_config *configdata;
3333
3434
3535typedef struct
r3535r3536
5858   UINT32 ppc;
5959   UINT32 nextpc;
6060
61   int (*irq_callback)(int irqline);
61   cpu_irq_callback irq_callback;
62   const device_config *device;
6263} RSP_REGS;
6364
6465
r3535r3536
230231{
231232   if (reg >= 0 && reg < 8)
232233   {
233      return (config->sp_reg_r)(Machine, reg, 0x00000000);
234      return (configdata->sp_reg_r)(Machine, reg, 0x00000000);
234235   }
235236   else if (reg >= 8 && reg < 16)
236237   {
237      return (config->dp_reg_r)(Machine, reg - 8, 0x00000000);
238      return (configdata->dp_reg_r)(Machine, reg - 8, 0x00000000);
238239   }
239240   else
240241   {
r3535r3536
246247{
247248   if (reg >= 0 && reg < 8)
248249   {
249      (config->sp_reg_w)(Machine, reg, data, 0x00000000);
250      (configdata->sp_reg_w)(Machine, reg, data, 0x00000000);
250251   }
251252   else if (reg >= 8 && reg < 16)
252253   {
253      (config->dp_reg_w)(Machine, reg - 8, data, 0x00000000);
254      (configdata->dp_reg_w)(Machine, reg - 8, data, 0x00000000);
254255   }
255256   else
256257   {
r3535r3536
342343   { 7, 7, 7, 7, 7, 7, 7, 7 },      // 7
343344};
344345
345static void rsp_init(int index, int clock, const void *_config, int (*irqcallback)(int))
346static CPU_INIT( rsp )
346347{
347348    int regIdx;
348349    int accumIdx;
349   config = (rsp_config *)_config;
350   configdata = (rsp_config *)config;
350351
351352   if (LOG_INSTRUCTION_EXECUTION)
352353      exec_output = fopen("rsp_execute.txt", "wt");
353354
354355   rsp.irq_callback = irqcallback;
356   rsp.device = device;
355357
356358#if 1
357359    // Inaccurate.  RSP registers power on to a random state...
r3535r3536
383385    rsp.step_count = 0;
384386}
385387
386static void rsp_exit(void)
388static CPU_EXIT( rsp )
387389{
388390#if SAVE_DISASM
389391   {
r3535r3536
429431   exec_output = NULL;
430432}
431433
432static void rsp_reset(void)
434static CPU_RESET( rsp )
433435{
434436   rsp.nextpc = ~0;
435437}
r3535r3536
25782580   }
25792581}
25802582
2581static int rsp_execute(int cycles)
2583static CPU_EXECUTE( rsp )
25822584{
25832585   UINT32 op;
25842586
r3535r3536
26232625               case 0x09:   /* JALR */      JUMP_PC_L(RSVAL, RDREG); break;
26242626               case 0x0d:   /* BREAK */
26252627               {
2626                  (config->sp_set_status)(0x3);
2628                  (configdata->sp_set_status)(0x3);
26272629                  rsp_icount = MIN(rsp_icount, 1);
26282630
26292631                  if (LOG_INSTRUCTION_EXECUTION) fprintf(exec_output, "\n---------- break ----------\n\n");
r3535r3536
28532855
28542856/*****************************************************************************/
28552857
2856static void rsp_get_context(void *dst)
2858static CPU_GET_CONTEXT( rsp )
28572859{
28582860   /* copy the context */
28592861   if (dst)
r3535r3536
28612863}
28622864
28632865
2864static void rsp_set_context(void *src)
2866static CPU_SET_CONTEXT( rsp )
28652867{
28662868   /* copy the context */
28672869   if (src)
r3535r3536
28712873
28722874/*****************************************************************************/
28732875
2874static offs_t rsp_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
2876static CPU_DISASSEMBLE( rsp )
28752877{
28762878   UINT32 op = LITTLE_ENDIANIZE_INT32(*(UINT32 *)opram);
28772879   return rsp_dasm_one(buffer, pc, op);
r3535r3536
28792881
28802882/*****************************************************************************/
28812883
2882static void rsp_set_info(UINT32 state, cpuinfo *info)
2884static CPU_SET_INFO( rsp )
28832885{
28842886   switch (state)
28852887   {
r3535r3536
29252927   }
29262928}
29272929
2928void rsp_get_info(UINT32 state, cpuinfo *info)
2930CPU_GET_INFO( rsp )
29292931{
29302932   switch(state)
29312933   {
r3535r3536
29962998        case CPUINFO_INT_REGISTER + RSP_STEPCNT:        info->i = rsp.step_count;               break;
29972999
29983000      /* --- the following bits of info are returned as pointers to data or functions --- */
2999      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = rsp_get_context;      break;
3000      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = rsp_set_context;      break;
3001      case CPUINFO_PTR_SET_INFO:                  info->setinfo = rsp_set_info;         break;
3002      case CPUINFO_PTR_INIT:                     info->init = rsp_init;               break;
3003      case CPUINFO_PTR_RESET:                     info->reset = rsp_reset;            break;
3004      case CPUINFO_PTR_EXIT:                     info->exit = rsp_exit;               break;
3005      case CPUINFO_PTR_EXECUTE:                  info->execute = rsp_execute;         break;
3001      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(rsp);      break;
3002      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(rsp);      break;
3003      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(rsp);         break;
3004      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(rsp);               break;
3005      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(rsp);            break;
3006      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(rsp);               break;
3007      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(rsp);         break;
30063008      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
3007      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = rsp_dasm;         break;
3009      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(rsp);         break;
30083010      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &rsp_icount;            break;
30093011
30103012      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/rsp/rsp.h
r3535r3536
6969#define RSP_STATUS_SIGNAL6       0x2000
7070#define RSP_STATUS_SIGNAL7       0x4000
7171
72void rsp_get_info(UINT32 state, cpuinfo *info);
72CPU_GET_INFO( rsp );
7373
7474extern offs_t rsp_dasm_one(char *buffer, offs_t pc, UINT32 op);
7575
src/emu/cpu/cop400/cop420ds.c
r3535r3536
1111
1212#include "cpuintrf.h"
1313
14offs_t cop420_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
14CPU_DISASSEMBLE( cop420 )
1515{
1616   UINT8 opcode = oprom[0];
1717   UINT8 next_opcode = oprom[1];
src/emu/cpu/cop400/cop410.c
r3535r3536
216216/****************************************************************************
217217 * Initialize emulation
218218 ****************************************************************************/
219static void cop410_init(int index, int clock, const void *config, int (*irqcallback)(int))
219static CPU_INIT( cop410 )
220220{
221221   int i;
222222
r3535r3536
277277   state_save_register_item("cop410", index, R.halt);
278278}
279279
280static void cop411_init(int index, int clock, const void *config, int (*irqcallback)(int))
280static CPU_INIT( cop411 )
281281{
282   cop410_init(index, clock, config, irqcallback);
282   CPU_INIT_CALL(cop410);
283283
284284   /* the COP411 is like the COP410, just with less output ports */
285285   R.G_mask = 0x07;
r3535r3536
289289/****************************************************************************
290290 * Reset registers to their initial values
291291 ****************************************************************************/
292static void cop410_reset(void)
292static CPU_RESET( cop410 )
293293{
294294   PC = 0;
295295   A = 0;
r3535r3536
305305/****************************************************************************
306306 * Execute cycles CPU cycles. Return number of cycles really executed
307307 ****************************************************************************/
308static int cop410_execute(int cycles)
308static CPU_EXECUTE( cop410 )
309309{
310310   UINT8 opcode;
311311
r3535r3536
375375/****************************************************************************
376376 * Get all registers in given buffer
377377 ****************************************************************************/
378static void cop410_get_context (void *dst)
378static CPU_GET_CONTEXT( cop410 )
379379{
380380   if( dst )
381381      *(COP410_Regs*)dst = R;
r3535r3536
385385/****************************************************************************
386386 * Set all registers to given values
387387 ****************************************************************************/
388static void cop410_set_context (void *src)
388static CPU_SET_CONTEXT( cop410 )
389389{
390390   if( src )
391391      R = *(COP410_Regs*)src;
r3535r3536
394394/**************************************************************************
395395 * Validity check
396396 **************************************************************************/
397static int cop410_validity_check(const game_driver *driver, const void *config)
397static CPU_VALIDITY_CHECK( cop410 )
398398{
399399   int error = FALSE;
400400   const cop400_interface *intf = (const cop400_interface *) config;
r3535r3536
412412 * Generic set_info
413413 **************************************************************************/
414414
415static void cop410_set_info(UINT32 state, cpuinfo *info)
415static CPU_SET_INFO( cop410 )
416416{
417417   switch (state)
418418   {
r3535r3536
437437 * Generic get_info
438438 **************************************************************************/
439439
440void cop410_get_info(UINT32 state, cpuinfo *info)
440CPU_GET_INFO( cop410 )
441441{
442442   switch (state)
443443   {
r3535r3536
481481      case CPUINFO_INT_REGISTER + COP400_SKL:         info->i = SKL;                     break;
482482
483483      /* --- the following bits of info are returned as pointers to data or functions --- */
484      case CPUINFO_PTR_SET_INFO:                  info->setinfo = cop410_set_info;      break;
485      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = cop410_get_context;   break;
486      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = cop410_set_context;   break;
487      case CPUINFO_PTR_INIT:                     info->init = cop410_init;            break;
488      case CPUINFO_PTR_RESET:                     info->reset = cop410_reset;            break;
489      case CPUINFO_PTR_EXECUTE:                  info->execute = cop410_execute;         break;
484      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(cop410);      break;
485      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(cop410);   break;
486      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(cop410);   break;
487      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(cop410);            break;
488      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(cop410);            break;
489      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(cop410);         break;
490490      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
491      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = cop410_dasm;      break;
491      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(cop410);      break;
492492      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &cop410_ICount;         break;
493      case CPUINFO_PTR_VALIDITY_CHECK:            info->validity_check = cop410_validity_check;   break;
493      case CPUINFO_PTR_VALIDITY_CHECK:            info->validity_check = CPU_VALIDITY_CHECK_NAME(cop410);   break;
494494
495495      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:
496            info->internal_map8 = address_map_cop410_internal_rom;                              break;
496         info->internal_map8 = ADDRESS_MAP_NAME(cop410_internal_rom);                              break;
497497      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:
498          info->internal_map8 = address_map_cop410_internal_ram;                        break;
498          info->internal_map8 = ADDRESS_MAP_NAME(cop410_internal_ram);                        break;
499499
500500      /* --- the following bits of info are returned as NULL-terminated strings --- */
501501      case CPUINFO_STR_NAME:                     strcpy(info->s, "COP410");            break;
r3535r3536
522522   }
523523}
524524
525void cop411_get_info(UINT32 state, cpuinfo *info)
525CPU_GET_INFO( cop411 )
526526{
527527   // COP411 is a 20-pin package version of the COP410, missing D2/D3/G3/CKO
528528
529529   switch (state)
530530   {
531531      /* --- the following bits of info are returned as pointers to data or functions --- */
532      case CPUINFO_PTR_INIT:                     info->init = cop411_init;            break;
532      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(cop411);            break;
533533
534534      /* --- the following bits of info are returned as NULL-terminated strings --- */
535535      case CPUINFO_STR_NAME:                     strcpy(info->s, "COP411");            break;
536536      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "National Semiconductor COPS"); break;
537537
538      default: cop410_get_info(state, info); break;
538      default: CPU_GET_INFO_CALL(cop410); break;
539539   }
540540}
541541
542void cop401_get_info(UINT32 state, cpuinfo *info)
542CPU_GET_INFO( cop401 )
543543{
544544   // COP401 is a ROMless version of the COP410
545545
r3535r3536
551551      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:
552552          info->internal_map8 = NULL;                                             break;
553553
554      default: cop410_get_info(state, info); break;
554      default: CPU_GET_INFO_CALL(cop410); break;
555555   }
556556}
src/emu/cpu/cop400/cop420.c
r3535r3536
304304/****************************************************************************
305305 * Initialize emulation
306306 ****************************************************************************/
307static void cop420_init(int index, int clock, const void *config, int (*irqcallback)(int))
307static CPU_INIT( cop420 )
308308{
309309   int i;
310310
r3535r3536
395395   state_save_register_item("cop420", index, R.halt);
396396}
397397
398static void cop421_init(int index, int clock, const void *config, int (*irqcallback)(int))
398static CPU_INIT( cop421 )
399399{
400   cop420_init(index, clock, config, irqcallback);
400   CPU_INIT_CALL(cop420);
401401
402402   /* microbus option is not available */
403403
r3535r3536
408408   R.IN_mask = 0; // IN lines not available
409409}
410410
411static void cop422_init(int index, int clock, const void *config, int (*irqcallback)(int))
411static CPU_INIT( cop422 )
412412{
413   cop420_init(index, clock, config, irqcallback);
413   CPU_INIT_CALL(cop420);
414414
415415   /* microbus option is not available */
416416
r3535r3536
426426/****************************************************************************
427427 * Reset registers to their initial values
428428 ****************************************************************************/
429static void cop420_reset(void)
429static CPU_RESET( cop420 )
430430{
431431   PC = 0;
432432   A = 0;
r3535r3536
443443/****************************************************************************
444444 * Execute cycles CPU cycles. Return number of cycles really executed
445445 ****************************************************************************/
446static int cop420_execute(int cycles)
446static CPU_EXECUTE( cop420 )
447447{
448448   UINT8 opcode;
449449
r3535r3536
545545/****************************************************************************
546546 * Get all registers in given buffer
547547 ****************************************************************************/
548static void cop420_get_context (void *dst)
548static CPU_GET_CONTEXT( cop420 )
549549{
550550   if( dst )
551551      *(COP420_Regs*)dst = R;
r3535r3536
555555/****************************************************************************
556556 * Set all registers to given values
557557 ****************************************************************************/
558static void cop420_set_context (void *src)
558static CPU_SET_CONTEXT( cop420 )
559559{
560560   if( src )
561561      R = *(COP420_Regs*)src;
r3535r3536
565565 * Generic set_info
566566 **************************************************************************/
567567
568static void cop420_set_info(UINT32 state, cpuinfo *info)
568static CPU_SET_INFO( cop420 )
569569{
570570   switch (state)
571571   {
r3535r3536
591591 * Generic get_info
592592 **************************************************************************/
593593
594void cop420_get_info(UINT32 state, cpuinfo *info)
594CPU_GET_INFO( cop420 )
595595{
596596   switch (state)
597597   {
r3535r3536
636636      case CPUINFO_INT_REGISTER + COP400_SKL:         info->i = SKL;                     break;
637637
638638      /* --- the following bits of info are returned as pointers to data or functions --- */
639      case CPUINFO_PTR_SET_INFO:                  info->setinfo = cop420_set_info;      break;
640      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = cop420_get_context;   break;
641      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = cop420_set_context;   break;
642      case CPUINFO_PTR_INIT:                     info->init = cop420_init;            break;
643      case CPUINFO_PTR_RESET:                     info->reset = cop420_reset;            break;
644      case CPUINFO_PTR_EXECUTE:                  info->execute = cop420_execute;         break;
639      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(cop420);      break;
640      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(cop420);   break;
641      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(cop420);   break;
642      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(cop420);            break;
643      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(cop420);            break;
644      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(cop420);         break;
645645      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
646      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = cop420_dasm;      break;
646      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(cop420);      break;
647647      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &cop420_ICount;         break;
648648
649649/*      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:
650            info->internal_map8 = address_map_cop420_internal_rom;                              break;*/
650            info->internal_map8 = ADDRESS_MAP_NAME(cop420_internal_rom);                              break;*/
651651      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:
652          info->internal_map8 = address_map_cop420_internal_ram;                        break;
652          info->internal_map8 = ADDRESS_MAP_NAME(cop420_internal_ram);                        break;
653653
654654      /* --- the following bits of info are returned as NULL-terminated strings --- */
655655      case CPUINFO_STR_NAME:                     strcpy(info->s, "COP420");            break;
r3535r3536
677677   }
678678}
679679
680void cop421_get_info(UINT32 state, cpuinfo *info)
680CPU_GET_INFO( cop421 )
681681{
682682   // COP421 is a 24-pin package version of the COP420, lacking the IN ports
683683
684684   switch (state)
685685   {
686686      /* --- the following bits of info are returned as pointers to data or functions --- */
687      case CPUINFO_PTR_INIT:                     info->init = cop421_init;            break;
687      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(cop421);            break;
688688
689689      /* --- the following bits of info are returned as NULL-terminated strings --- */
690690      case CPUINFO_STR_NAME:                     strcpy(info->s, "COP421");            break;
691691      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "National Semiconductor COPS"); break;
692692
693      default: cop420_get_info(state, info); break;
693      default: CPU_GET_INFO_CALL(cop420); break;
694694   }
695695}
696696
697void cop422_get_info(UINT32 state, cpuinfo *info)
697CPU_GET_INFO( cop422 )
698698{
699699   // COP422 is a 20-pin package version of the COP420, lacking G0/G1, D0/D1, and the IN ports
700700
701701   switch (state)
702702   {
703703      /* --- the following bits of info are returned as pointers to data or functions --- */
704      case CPUINFO_PTR_INIT:                     info->init = cop422_init;            break;
704      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(cop422);            break;
705705
706706      /* --- the following bits of info are returned as NULL-terminated strings --- */
707707      case CPUINFO_STR_NAME:                     strcpy(info->s, "COP422");            break;
708708      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "National Semiconductor COPS"); break;
709709
710      default: cop420_get_info(state, info); break;
710      default: CPU_GET_INFO_CALL(cop420); break;
711711   }
712712}
713713
714void cop402_get_info(UINT32 state, cpuinfo *info)
714CPU_GET_INFO( cop402 )
715715{
716716   // COP402 is a ROMless version of the COP420
717717
r3535r3536
725725      case CPUINFO_STR_NAME:                     strcpy(info->s, "COP402");            break;
726726      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "National Semiconductor COPS"); break;
727727
728      default: cop420_get_info(state, info); break;
728      default: CPU_GET_INFO_CALL(cop420); break;
729729   }
730730}
731731
732732/* COP44x */
733733
734static void cop426_init(int index, int clock, const void *config, int (*irqcallback)(int))
734static CPU_INIT( cop426 )
735735{
736   cop420_init(index, clock, config, irqcallback);
736   CPU_INIT_CALL(cop420);
737737
738738   R.G_mask = 0x0e; // only G2, G3 available
739739   R.D_mask = 0x0e; // only D2, D3 available
740740}
741741
742static void cop445_init(int index, int clock, const void *config, int (*irqcallback)(int))
742static CPU_INIT( cop445 )
743743{
744   cop420_init(index, clock, config, irqcallback);
744   CPU_INIT_CALL(cop420);
745745
746746   R.G_mask = 0x07;
747747   R.D_mask = 0x03;
r3535r3536
763763   AM_RANGE(0x00, 0x7f) AM_RAM
764764ADDRESS_MAP_END
765765
766void cop444_get_info(UINT32 state, cpuinfo *info)
766CPU_GET_INFO( cop444 )
767767{
768768   switch (state)
769769   {
770770      /* --- the following bits of info are returned as pointers to data or functions --- */
771771      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:
772          info->internal_map8 = address_map_cop444_internal_rom;                        break;
772          info->internal_map8 = ADDRESS_MAP_NAME(cop444_internal_rom);                        break;
773773      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:
774          info->internal_map8 = address_map_cop444_internal_ram;                        break;
774          info->internal_map8 = ADDRESS_MAP_NAME(cop444_internal_ram);                        break;
775775
776776      /* --- the following bits of info are returned as NULL-terminated strings --- */
777777      case CPUINFO_STR_NAME:                     strcpy(info->s, "COP444");            break;
778778      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "National Semiconductor COPS"); break;
779779
780      default: cop420_get_info(state, info); break;
780      default: CPU_GET_INFO_CALL(cop420); break;
781781   }
782782}
783783
784void cop445_get_info(UINT32 state, cpuinfo *info)
784CPU_GET_INFO( cop445 )
785785{
786786   // COP445 is a 24-pin package version of the COP444, lacking the IN ports
787787
788788   switch (state)
789789   {
790790      /* --- the following bits of info are returned as pointers to data or functions --- */
791      case CPUINFO_PTR_INIT:                     info->init = cop445_init;            break;
791      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(cop445);            break;
792792
793793      /* --- the following bits of info are returned as NULL-terminated strings --- */
794794      case CPUINFO_STR_NAME:                     strcpy(info->s, "COP445");            break;
795795      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "National Semiconductor COPS"); break;
796796
797      default: cop444_get_info(state, info); break;
797      default: CPU_GET_INFO_CALL(cop444); break;
798798   }
799799}
800800
801void cop424_get_info(UINT32 state, cpuinfo *info)
801CPU_GET_INFO( cop424 )
802802{
803803   // COP424 is functionally equivalent to COP444, with only 1K ROM and 64x4 bytes RAM
804804
r3535r3536
806806   {
807807      /* --- the following bits of info are returned as pointers to data or functions --- */
808808      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:
809          info->internal_map8 = address_map_cop424_internal_rom;                        break;
809          info->internal_map8 = ADDRESS_MAP_NAME(cop424_internal_rom);                        break;
810810      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:
811          info->internal_map8 = address_map_cop424_internal_ram;                        break;
811          info->internal_map8 = ADDRESS_MAP_NAME(cop424_internal_ram);                        break;
812812
813813      /* --- the following bits of info are returned as NULL-terminated strings --- */
814814      case CPUINFO_STR_NAME:                     strcpy(info->s, "COP424");            break;
815815      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "National Semiconductor COPS"); break;
816816
817      default: cop444_get_info(state, info); break;
817      default: CPU_GET_INFO_CALL(cop444); break;
818818   }
819819}
820820
821void cop425_get_info(UINT32 state, cpuinfo *info)
821CPU_GET_INFO( cop425 )
822822{
823823   // COP425 is a 24-pin package version of the COP424, lacking the IN ports
824824
r3535r3536
828828      case CPUINFO_STR_NAME:                     strcpy(info->s, "COP425");            break;
829829      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "National Semiconductor COPS"); break;
830830
831      default: cop444_get_info(state, info); break;
831      default: CPU_GET_INFO_CALL(cop444); break;
832832   }
833833}
834834
835void cop426_get_info(UINT32 state, cpuinfo *info)
835CPU_GET_INFO( cop426 )
836836{
837837   // COP426 is a 20-pin package version of the COP424, with only L0-L7, G2-G3, D2-D3 ports
838838
839839   switch (state)
840840   {
841841      /* --- the following bits of info are returned as pointers to data or functions --- */
842      case CPUINFO_PTR_INIT:                     info->init = cop426_init;            break;
842      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(cop426);            break;
843843
844844      /* --- the following bits of info are returned as NULL-terminated strings --- */
845845      case CPUINFO_STR_NAME:                     strcpy(info->s, "COP426");            break;
846846      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "National Semiconductor COPS"); break;
847847
848      default: cop444_get_info(state, info); break;
848      default: CPU_GET_INFO_CALL(cop444); break;
849849   }
850850}
851851
852void cop404_get_info(UINT32 state, cpuinfo *info)
852CPU_GET_INFO( cop404 )
853853{
854854   // COP404 is a ROMless version of the COP444, which can emulate a COP410 or a COP424
855855
r3535r3536
863863      case CPUINFO_STR_NAME:                     strcpy(info->s, "COP404");            break;
864864      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "National Semiconductor COPS"); break;
865865
866      default: cop444_get_info(state, info); break;
866      default: CPU_GET_INFO_CALL(cop444); break;
867867   }
868868}
src/emu/cpu/cop400/cop400.h
r3535r3536
8282*/
8383
8484/* COP 41x */
85extern void cop401_get_info(UINT32 state, cpuinfo *info);
86extern void cop410_get_info(UINT32 state, cpuinfo *info);
87extern void cop411_get_info(UINT32 state, cpuinfo *info);
85extern CPU_GET_INFO( cop401 );
86extern CPU_GET_INFO( cop410 );
87extern CPU_GET_INFO( cop411 );
8888
8989/* COP 42x */
90extern void cop402_get_info(UINT32 state, cpuinfo *info);
91extern void cop420_get_info(UINT32 state, cpuinfo *info);
92extern void cop421_get_info(UINT32 state, cpuinfo *info);
93extern void cop422_get_info(UINT32 state, cpuinfo *info);
90extern CPU_GET_INFO( cop402 );
91extern CPU_GET_INFO( cop420 );
92extern CPU_GET_INFO( cop421 );
93extern CPU_GET_INFO( cop422 );
9494
9595/* COP 44x */
96extern void cop404_get_info(UINT32 state, cpuinfo *info);
97extern void cop424_get_info(UINT32 state, cpuinfo *info);
98extern void cop425_get_info(UINT32 state, cpuinfo *info);
99extern void cop426_get_info(UINT32 state, cpuinfo *info);
100extern void cop444_get_info(UINT32 state, cpuinfo *info);
101extern void cop445_get_info(UINT32 state, cpuinfo *info);
96extern CPU_GET_INFO( cop404 );
97extern CPU_GET_INFO( cop424 );
98extern CPU_GET_INFO( cop425 );
99extern CPU_GET_INFO( cop426 );
100extern CPU_GET_INFO( cop444 );
101extern CPU_GET_INFO( cop445 );
102102
103offs_t cop410_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
104offs_t cop420_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
103CPU_DISASSEMBLE( cop410 );
104CPU_DISASSEMBLE( cop420 );
105105
106106#endif  /* __COP400__ */
src/emu/cpu/cop400/cop410ds.c
r3535r3536
1111
1212#include "cpuintrf.h"
1313
14offs_t cop410_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
14CPU_DISASSEMBLE( cop410 )
1515{
1616   UINT8 opcode = oprom[0];
1717   UINT8 next_opcode = oprom[1];
src/emu/cpu/m6502/6502dasm.c
r3535r3536
742742   return (pc - PC) | flags;
743743}
744744
745unsigned m6502_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
745CPU_DISASSEMBLE( m6502 )
746746{
747747   return internal_m6502_dasm(op6502, buffer, pc, oprom, opram);
748748}
749749
750750#if (HAS_M65SC02)
751unsigned m65sc02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
751CPU_DISASSEMBLE( m65sc02 )
752752{
753753   return internal_m6502_dasm(op65sc02, buffer, pc, oprom, opram);
754754}
755755#endif
756756
757757#if (HAS_M65C02||HAS_M65SC02||HAS_DECO16)
758unsigned m65c02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
758CPU_DISASSEMBLE( m65c02 )
759759{
760760   return internal_m6502_dasm(op65c02, buffer, pc, oprom, opram);
761761}
762762#endif
763763
764764#if (HAS_M65CE02)
765unsigned m65ce02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
765CPU_DISASSEMBLE( m65ce02 )
766766{
767767   return internal_m6502_dasm(op65ce02, buffer, pc, oprom, opram);
768768}
769769#endif
770770
771771#if (HAS_M6510)
772unsigned m6510_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
772CPU_DISASSEMBLE( m6510 )
773773{
774774   return internal_m6502_dasm(op6502, buffer, pc, oprom, opram);
775775}
776776#endif
777777
778778#if (HAS_DECO16)
779unsigned deco16_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
779CPU_DISASSEMBLE( deco16 )
780780{
781781   return internal_m6502_dasm(opdeco16, buffer, pc, oprom, opram);
782782}
783783#endif
784784
785785#if (HAS_M4510)
786unsigned m4510_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
786CPU_DISASSEMBLE( m4510 )
787787{
788788   return internal_m6502_dasm(op4510, buffer, pc, oprom, opram);
789789}
src/emu/cpu/m6502/mincce02.h
r3535r3536
1717#define F_N   0x80
1818
1919/* some shortcuts for improved readability */
20#define A   m65ce02.a
21#define X   m65ce02.x
22#define Y   m65ce02.y
23#define P   m65ce02.p
24#define Z   m65ce02.z
25#define B   m65ce02.zp.b.h
26#define SW   m65ce02.sp.w.l
27#define SPL   m65ce02.sp.b.l
28#define SPH   m65ce02.sp.b.h
29#define SPD   m65ce02.sp.d
20#define A   m65ce02->a
21#define X   m65ce02->x
22#define Y   m65ce02->y
23#define P   m65ce02->p
24#define Z   m65ce02->z
25#define B   m65ce02->zp.b.h
26#define SW   m65ce02->sp.w.l
27#define SPL   m65ce02->sp.b.l
28#define SPH   m65ce02->sp.b.h
29#define SPD   m65ce02->sp.d
3030
31#define NZ   m65ce02.nz
31#define NZ   m65ce02->nz
3232
33#define EAL   m65ce02.ea.b.l
34#define EAH   m65ce02.ea.b.h
35#define EAW   m65ce02.ea.w.l
36#define EAD   m65ce02.ea.d
33#define EAL   m65ce02->ea.b.l
34#define EAH   m65ce02->ea.b.h
35#define EAW   m65ce02->ea.w.l
36#define EAD   m65ce02->ea.d
3737
38#define ZPL   m65ce02.zp.b.l
39#define ZPH   m65ce02.zp.b.h
40#define ZPW   m65ce02.zp.w.l
41#define ZPD   m65ce02.zp.d
38#define ZPL   m65ce02->zp.b.l
39#define ZPH   m65ce02->zp.b.h
40#define ZPW   m65ce02->zp.w.l
41#define ZPD   m65ce02->zp.d
4242
43#define PCL   m65ce02.pc.b.l
44#define PCH   m65ce02.pc.b.h
45#define PCW   m65ce02.pc.w.l
46#define PCD   m65ce02.pc.d
43#define PCL   m65ce02->pc.b.l
44#define PCH   m65ce02->pc.b.h
45#define PCW   m65ce02->pc.w.l
46#define PCD   m65ce02->pc.d
4747
48#define PPC   m65ce02.ppc.d
48#define PPC   m65ce02->ppc.d
4949
50#define RDMEM_ID   m65ce02.rdmem_id
51#define WRMEM_ID   m65ce02.wrmem_id
50#define RDMEM_ID   m65ce02->rdmem_id
51#define WRMEM_ID   m65ce02->wrmem_id
5252
53#define IRQ_STATE   m65ce02.irq_state
54#define AFTER_CLI   m65ce02.after_cli
53#define IRQ_STATE   m65ce02->irq_state
54#define AFTER_CLI   m65ce02->after_cli
5555
5656#define CHANGE_PC   change_pc(PCD)
5757
5858/***************************************************************
5959 *  RDOP    read an opcode
6060 ***************************************************************/
61#define RDOP()   cpu_readop(PCW++); m65ce02_ICount -= 1
61#define RDOP()   cpu_readop(PCW++); m65ce02->icount -= 1
6262
6363/***************************************************************
6464 *  RDOPARG read an opcode argument
6565 ***************************************************************/
66#define RDOPARG()   cpu_readop_arg(PCW++); m65ce02_ICount -= 1
66#define RDOPARG()   cpu_readop_arg(PCW++); m65ce02->icount -= 1
6767
6868#define PEEK_OP()   cpu_readop(PCW)
6969
70#define RDMEM(addr)         program_read_byte_8le(addr); m65ce02_ICount -= 1
71#define WRMEM(addr,data)   program_write_byte_8le(addr,data); m65ce02_ICount -= 1
70#define RDMEM(addr)         program_read_byte_8le(addr); m65ce02->icount -= 1
71#define WRMEM(addr,data)   program_write_byte_8le(addr,data); m65ce02->icount -= 1
src/emu/cpu/m6502/minc4510.h
r3535r3536
1717#define F_N   0x80
1818
1919/* some shortcuts for improved readability */
20#define A   m4510.a
21#define X   m4510.x
22#define Y   m4510.y
23#define P   m4510.p
24#define Z   m4510.z
25#define B   m4510.zp.b.h
26#define SW   m4510.sp.w.l
27#define SPL   m4510.sp.b.l
28#define SPH   m4510.sp.b.h
29#define SPD   m4510.sp.d
20#define A   m4510->a
21#define X   m4510->x
22#define Y   m4510->y
23#define P   m4510->p
24#define Z   m4510->z
25#define B   m4510->zp.b.h
26#define SW   m4510->sp.w.l
27#define SPL   m4510->sp.b.l
28#define SPH   m4510->sp.b.h
29#define SPD   m4510->sp.d
3030
31#define NZ   m4510.nz
31#define NZ   m4510->nz
3232
33#define EAL   m4510.ea.b.l
34#define EAH   m4510.ea.b.h
35#define EAW   m4510.ea.w.l
36#define EAD   m4510.ea.d
33#define EAL   m4510->ea.b.l
34#define EAH   m4510->ea.b.h
35#define EAW   m4510->ea.w.l
36#define EAD   m4510->ea.d
3737
38#define ZPL   m4510.zp.b.l
39#define ZPH   m4510.zp.b.h
40#define ZPW   m4510.zp.w.l
41#define ZPD   m4510.zp.d
38#define ZPL   m4510->zp.b.l
39#define ZPH   m4510->zp.b.h
40#define ZPW   m4510->zp.w.l
41#define ZPD   m4510->zp.d
4242
43#define PCL   m4510.pc.b.l
44#define PCH   m4510.pc.b.h
45#define PCW   m4510.pc.w.l
46#define PCD   m4510.pc.d
43#define PCL   m4510->pc.b.l
44#define PCH   m4510->pc.b.h
45#define PCW   m4510->pc.w.l
46#define PCD   m4510->pc.d
4747
48#define PPC   m4510.ppc.d
48#define PPC   m4510->ppc.d
4949
50#define IRQ_STATE   m4510.irq_state
51#define AFTER_CLI   m4510.after_cli
50#define IRQ_STATE   m4510->irq_state
51#define AFTER_CLI   m4510->after_cli
5252
53#define M4510_MEM(addr)   (m4510.mem[(addr)>>13]+(addr))
53#define M4510_MEM(addr)   (m4510->mem[(addr)>>13]+(addr))
5454
5555#define CHANGE_PC   change_pc(M4510_MEM(PCD))
5656
5757#define PEEK_OP()   cpu_readop(M4510_MEM(PCW))
5858
59#define RDMEM(addr)         program_read_byte_8le(M4510_MEM(addr)); m4510_ICount -= 1
60#define WRMEM(addr,data)   program_write_byte_8le(M4510_MEM(addr),data); m4510_ICount -= 1
59#define RDMEM(addr)         program_read_byte_8le(M4510_MEM(addr)); m4510->icount -= 1
60#define WRMEM(addr,data)   program_write_byte_8le(M4510_MEM(addr),data); m4510->icount -= 1
6161
6262/***************************************************************
6363 *  RDOP    read an opcode
6464 ***************************************************************/
6565#undef RDOP
66#define RDOP() m4510_cpu_readop(); m4510_ICount -= 1
66#define RDOP() m4510_cpu_readop(m4510); m4510->icount -= 1
6767
6868/***************************************************************
6969 *  RDOPARG read an opcode argument
7070 ***************************************************************/
7171#undef RDOPARG
72#define RDOPARG() m4510_cpu_readop_arg(); m4510_ICount -= 1
72#define RDOPARG() m4510_cpu_readop_arg(m4510); m4510->icount -= 1
src/emu/cpu/m6502/tdeco16.c
r3535r3536
66#define DECO16_VERBOSE 0
77
88#undef   OP
9#define OP(nn) INLINE void deco16_##nn(void)
9#define OP(nn) INLINE void deco16_##nn(m6502_Regs *m6502)
1010
1111#define DECO16_BRK                           \
1212   logerror("%04x: BRK\n",activecpu_get_pc());               \
r3535r3536
8585OP(23) {
8686   int tmp;
8787
88   m6502_ICount -= 1;
88   m6502->icount -= 1;
8989   RD_IMM;
9090
9191   if (DECO16_VERBOSE)
r3535r3536
9595OP(63) {
9696   int tmp;
9797
98   m6502_ICount -= 1;
98   m6502->icount -= 1;
9999   RD_IMM;
100100
101101   if (DECO16_VERBOSE)
r3535r3536
105105OP(a3) {
106106   int tmp;
107107
108   m6502_ICount -= 1;
108   m6502->icount -= 1;
109109   RD_IMM;
110110
111111   if (DECO16_VERBOSE)
r3535r3536
114114OP(c3) { RD_DUM; ILL; }                         /* 2 ILL */
115115OP(e3) { RD_DUM; ILL; }                         /* 2 ILL */
116116
117OP(13) { int tmp; m6502_ICount -= 1; RD_IMM;
117OP(13) { int tmp; m6502->icount -= 1; RD_IMM;
118118
119119   if (DECO16_VERBOSE)
120120      logerror("%04x: OP13 %02x\n",activecpu_get_pc(),tmp);
r3535r3536
189189OP(47) { RD_DUM; ILL; }                           /* 2 ILL / 5 RMB4 ZPG ?? */
190190OP(67) {
191191   int tmp; RD_IMM;
192   m6502.a=io_read_byte_8le(0);
192   m6502->a=io_read_byte_8le(0);
193193
194194//  logerror("%04x: VBL (0x67)\n",activecpu_get_pc());
195195
196196// really - wait for status?
197197
198198} /*  */
199OP(87) { int tmp; m6502_ICount -= 1; RD_IMM;
199OP(87) { int tmp; m6502->icount -= 1; RD_IMM;
200200   logerror("%04x: OP87 %02x\n",activecpu_get_pc(),tmp);
201201
202202              } /*  */
r3535r3536
267267#define deco16_da m65c02_da                        /* 3 PHX */
268268#define deco16_fa m65c02_fa                        /* 4 PLX */
269269
270OP(0b) { int tmp; m6502_ICount -= 1; RD_IMM;
270OP(0b) { int tmp; m6502->icount -= 1; RD_IMM;
271271   logerror("%04x: OP0B %02x\n",activecpu_get_pc(),tmp);
272272
273273              }
274274OP(2b) { RD_DUM; ILL; }                         /* 2 ILL */
275OP(4b) { int tmp; m6502_ICount -= 1; RD_IMM;
275OP(4b) { int tmp; m6502->icount -= 1; RD_IMM;
276276   logerror("%04x: OP4B %02x\n",activecpu_get_pc(),tmp);
277277
278//  m6502.a=io_read_byte_8le(0);
278//  m6502->a=io_read_byte_8le(0);
279279
280280//tilt??
281281
r3535r3536
297297OP(bb) {
298298   int tmp;
299299
300   m6502_ICount -= 1;
300   m6502->icount -= 1;
301301   RD_IMM;
302302
303303   if (DECO16_VERBOSE)
r3535r3536
364364OP(2f) { RD_DUM; ILL; }                           /* 2 ILL / 5 BBR2 ZPG ?? */
365365OP(4f) { RD_DUM; ILL; }                           /* 2 ILL / 5 BBR4 ZPG ?? */
366366OP(6f) { RD_DUM; ILL; }                           /* 2 ILL / 5 BBR6 ZPG ?? */
367OP(8f) { int tmp; m6502_ICount -= 1; RD_IMM;
367OP(8f) { int tmp; m6502->icount -= 1; RD_IMM;
368368   logerror("%04x: BANK (8F) %02x\n",activecpu_get_pc(),tmp);
369369
370370   io_write_byte_8le(0,tmp);
r3535r3536
380380OP(3f) {
381381   int tmp;
382382
383   m6502_ICount -= 1;
383   m6502->icount -= 1;
384384   RD_IMM;
385385
386386   if (DECO16_VERBOSE)
r3535r3536
393393OP(df) { RD_DUM; ILL; }                           /* 2 ILL / 5 BBS5 ZPG ?? */
394394OP(ff) { RD_DUM; ILL; }                           /* 2 ILL / 5 BBS7 ZPG ?? */
395395
396static void (*const insndeco16[0x100])(void) = {
396static void (*const insndeco16[0x100])(m6502_Regs *m6502) = {
397397   deco16_00,deco16_01,deco16_02,deco16_03,deco16_04,deco16_05,deco16_06,deco16_07,
398398   deco16_08,deco16_09,deco16_0a,deco16_0b,deco16_0c,deco16_0d,deco16_0e,deco16_0f,
399399   deco16_10,deco16_11,deco16_12,deco16_13,deco16_14,deco16_15,deco16_16,deco16_17,
src/emu/cpu/m6502/m4510.c
r3535r3536
120120
121121#define LOG(x)   do { if (VERBOSE) logerror x; } while (0)
122122
123
124typedef struct {
125   void   (*const *insn)(void); /* pointer to the function pointer table */
123typedef struct _m4510_Regs m4510_Regs;
124struct _m4510_Regs {
125   void   (*const *insn)(m4510_Regs *); /* pointer to the function pointer table */
126126   PAIR   ppc;         /* previous program counter */
127127   PAIR   pc;          /* program counter */
128128   PAIR   sp;          /* stack pointer (always 100 - 1FF) */
r3535r3536
141141   UINT8   irq_state;
142142   UINT16  low, high;
143143   UINT32   mem[8];
144   int    (*irq_callback)(int irqline);   /* IRQ callback */
144
145   cpu_irq_callback irq_callback;
146   const device_config *device;
147   int    icount;
148
145149   read8_machine_func rdmem_id;               /* readmem callback for indexed instructions */
146150   write8_machine_func wrmem_id;            /* writemem callback for indexed instructions */
147151
r3535r3536
149153   UINT8    port;
150154   UINT8 (*port_read)(void);
151155   void (*port_write)(UINT8 data);
152}   m4510_Regs;
156};
153157
154static int m4510_ICount = 0;
158static void *token;
155159
156static m4510_Regs m4510;
157
158160/***************************************************************
159161 * include the opcode macros, functions and tables
160162 ***************************************************************/
161163
162INLINE int m4510_cpu_readop(void)
164INLINE int m4510_cpu_readop(m4510_Regs *m4510)
163165{
164   register UINT16 t=m4510.pc.w.l++;
166   register UINT16 t=m4510->pc.w.l++;
165167   return cpu_readop(M4510_MEM(t));
166168}
167169
168INLINE int m4510_cpu_readop_arg(void)
170INLINE int m4510_cpu_readop_arg(m4510_Regs *m4510)
169171{
170   register UINT16 t=m4510.pc.w.l++;
172   register UINT16 t=m4510->pc.w.l++;
171173   return cpu_readop_arg(M4510_MEM(t));
172174}
173175
174176#define M4510
175177#include "t65ce02.c"
176178
177static READ8_HANDLER( default_rdmem_id ) { return program_read_byte_8le(M4510_MEM(offset)); }
178static WRITE8_HANDLER( default_wrmem_id ) { program_write_byte_8le(M4510_MEM(offset), data); }
179static READ8_HANDLER( default_rdmem_id )
180{
181   m4510_Regs *m4510 = token;
182   return program_read_byte_8le(M4510_MEM(offset));
183}
184static WRITE8_HANDLER( default_wrmem_id )
185{
186   m4510_Regs *m4510 = token;
187   program_write_byte_8le(M4510_MEM(offset), data);
188}
179189
180static void m4510_init(int index, int clock, const void *config, int (*irqcallback)(int))
190static CPU_INIT( m4510 )
181191{
182   m4510.interrupt_inhibit = 0;
183   m4510.rdmem_id = default_rdmem_id;
184   m4510.wrmem_id = default_wrmem_id;
185   m4510.irq_callback = irqcallback;
192   m4510_Regs *m4510 = device->token;
193
194   token = device->token;
195
196   m4510->interrupt_inhibit = 0;
197   m4510->rdmem_id = default_rdmem_id;
198   m4510->wrmem_id = default_wrmem_id;
199   m4510->irq_callback = irqcallback;
200   m4510->device = device;
186201}
187202
188static void m4510_reset (void)
203static CPU_RESET( m4510 )
189204{
190   m4510.insn = insn4510;
205   m4510_Regs *m4510 = device->token;
191206
207   m4510->insn = insn4510;
208
192209   /* wipe out the rest of the m65ce02 structure */
193210   /* read the reset vector into PC */
194211   /* reset z index and b bank */
r3535r3536
196213   PCH = RDMEM(M4510_RST_VEC+1);
197214
198215   /* after reset in 6502 compatibility mode */
199   m4510.sp.d = 0x01ff; /* high byte descriped in databook */
200   m4510.z = 0;
216   m4510->sp.d = 0x01ff; /* high byte descriped in databook */
217   m4510->z = 0;
201218   B = 0;
202   m4510.p = F_E|F_B|F_I|F_Z;   /* set E, I and Z flags */
203   m4510.interrupt_inhibit = 0;
204   m4510.pending_irq = 0;   /* nonzero if an IRQ is pending */
205   m4510.after_cli = 0;      /* pending IRQ and last insn cleared I */
206   m4510.irq_callback = NULL;
219   m4510->p = F_E|F_B|F_I|F_Z;   /* set E, I and Z flags */
220   m4510->interrupt_inhibit = 0;
221   m4510->pending_irq = 0;   /* nonzero if an IRQ is pending */
222   m4510->after_cli = 0;      /* pending IRQ and last insn cleared I */
223   m4510->irq_callback = NULL;
207224
208225   /* don't know */
209   m4510.high=0x8200;
210   m4510.mem[7]=0x20000;
226   m4510->high=0x8200;
227   m4510->mem[7]=0x20000;
211228
212229   CHANGE_PC;
213230
214   m4510.port = 0xff;
215   m4510.ddr = 0x00;
231   m4510->port = 0xff;
232   m4510->ddr = 0x00;
216233}
217234
218static void m4510_exit(void)
235static CPU_EXIT( m4510 )
219236{
220237   /* nothing to do yet */
221238}
222239
223static void m4510_get_context (void *dst)
240static CPU_GET_CONTEXT( m4510 )
224241{
225   if( dst )
226      *(m4510_Regs*)dst = m4510;
227242}
228243
229static void m4510_set_context (void *src)
244static CPU_SET_CONTEXT( m4510 )
230245{
246   m4510_Regs *m4510;
231247   if( src )
232248   {
233      m4510 = *(m4510_Regs*)src;
249      token = src;
250      m4510 = token;
234251      CHANGE_PC;
235252   }
236253}
237254
238255
239INLINE void m4510_take_irq(void)
256INLINE void m4510_take_irq(m4510_Regs *m4510)
240257{
241   if(( !(P & F_I) ) && (m4510.interrupt_inhibit == 0))
258   if(( !(P & F_I) ) && (m4510->interrupt_inhibit == 0))
242259   {
243260      EAD = M4510_IRQ_VEC;
244      m4510_ICount -= 7;
261      m4510->icount -= 7;
245262      PUSH(PCH);
246263      PUSH(PCL);
247264      PUSH(P & ~F_B);
r3535r3536
250267      PCH = RDMEM(EAD+1);
251268      LOG(("M4510#%d takes IRQ ($%04x)\n", cpu_getactivecpu(), PCD));
252269      /* call back the cpuintrf to let it clear the line */
253      if (m4510.irq_callback) (*m4510.irq_callback)(0);
270      if (m4510->irq_callback) (*m4510->irq_callback)(m4510->device, 0);
254271      CHANGE_PC;
255272   }
256   m4510.pending_irq = 0;
273   m4510->pending_irq = 0;
257274}
258275
259static int m4510_execute(int cycles)
276static CPU_EXECUTE( m4510 )
260277{
261   m4510_ICount = cycles;
278   m4510_Regs *m4510 = token;
262279
280   m4510->icount = cycles;
281
263282   CHANGE_PC;
264283
265284   do
r3535r3536
270289      debugger_instruction_hook(Machine, PCD);
271290
272291      /* if an irq is pending, take it now */
273      if( m4510.pending_irq )
274         m4510_take_irq();
292      if( m4510->pending_irq )
293         m4510_take_irq(m4510);
275294
276295      op = RDOP();
277      (*insn4510[op])();
296      (*insn4510[op])(m4510);
278297
279298      /* check if the I flag was just reset (interrupts enabled) */
280      if( m4510.after_cli )
299      if( m4510->after_cli )
281300      {
282301         LOG(("M4510#%d after_cli was >0", cpu_getactivecpu()));
283         m4510.after_cli = 0;
284         if (m4510.irq_state != CLEAR_LINE)
302         m4510->after_cli = 0;
303         if (m4510->irq_state != CLEAR_LINE)
285304         {
286305            LOG((": irq line is asserted: set pending IRQ\n"));
287            m4510.pending_irq = 1;
306            m4510->pending_irq = 1;
288307         }
289308         else
290309         {
r3535r3536
292311         }
293312      }
294313      else
295      if( m4510.pending_irq )
296         m4510_take_irq();
314      if( m4510->pending_irq )
315         m4510_take_irq(m4510);
297316
298   } while (m4510_ICount > 0);
317   } while (m4510->icount > 0);
299318
300   return cycles - m4510_ICount;
319   return cycles - m4510->icount;
301320}
302321
303static void m4510_set_irq_line(int irqline, int state)
322static void m4510_set_irq_line(m4510_Regs *m4510, int irqline, int state)
304323{
305324   if (irqline == INPUT_LINE_NMI)
306325   {
307      if (m4510.nmi_state == state) return;
308      m4510.nmi_state = state;
326      if (m4510->nmi_state == state) return;
327      m4510->nmi_state = state;
309328      if( state != CLEAR_LINE )
310329      {
311330         LOG(("M4510#%d set_nmi_line(ASSERT)\n", cpu_getactivecpu()));
312331         EAD = M4510_NMI_VEC;
313         m4510_ICount -= 7;
332         m4510->icount -= 7;
314333         PUSH(PCH);
315334         PUSH(PCL);
316335         PUSH(P & ~F_B);
r3535r3536
323342   }
324343   else
325344   {
326      m4510.irq_state = state;
345      m4510->irq_state = state;
327346      if( state != CLEAR_LINE )
328347      {
329348         LOG(("M4510#%d set_irq_line(ASSERT)\n", cpu_getactivecpu()));
330         m4510.pending_irq = 1;
349         m4510->pending_irq = 1;
331350      }
332351   }
333352}
334353
335static UINT8 m4510_get_port(void)
354static UINT8 m4510_get_port(m4510_Regs *m4510)
336355{
337   return (m4510.port & m4510.ddr) | (m4510.ddr ^ 0xff);
356   return (m4510->port & m4510->ddr) | (m4510->ddr ^ 0xff);
338357}
339358
340359static READ8_HANDLER( m4510_read_0000 )
341360{
342361   UINT8 result = 0x00;
362   m4510_Regs *m4510 = token;
343363
344364   switch(offset)
345365   {
346366      case 0x0000:   /* DDR */
347         result = m4510.ddr;
367         result = m4510->ddr;
348368         break;
349369      case 0x0001:   /* Data Port */
350         if (m4510.port_read)
351            result = m4510.port_read();
352         result = (m4510.ddr & m4510.port) | (~m4510.ddr & result);
370         if (m4510->port_read)
371            result = m4510->port_read();
372         result = (m4510->ddr & m4510->port) | (~m4510->ddr & result);
353373         break;
354374   }
355375   return result;
r3535r3536
357377
358378static WRITE8_HANDLER( m4510_write_0000 )
359379{
380   m4510_Regs *m4510 = token;
381
360382   switch(offset)
361383   {
362384      case 0x0000:   /* DDR */
363         m4510.ddr = data;
385         m4510->ddr = data;
364386         break;
365387      case 0x0001:   /* Data Port */
366         m4510.port = data;
388         m4510->port = data;
367389         break;
368390   }
369391
370   if (m4510.port_write)
371      m4510.port_write(m4510_get_port());
392   if (m4510->port_write)
393      m4510->port_write(m4510_get_port(m4510));
372394}
373395
374396static ADDRESS_MAP_START(m4510_mem, ADDRESS_SPACE_PROGRAM, 8)
375397   AM_RANGE(0x0000, 0x0001) AM_READWRITE(m4510_read_0000, m4510_write_0000)
376398ADDRESS_MAP_END
377399
378static int m4510_translate(int space, int intention, offs_t *addr)
400static CPU_TRANSLATE( m4510 )
379401{
402   m4510_Regs *m4510 = token;
403
380404   if (space == ADDRESS_SPACE_PROGRAM)
381      *addr = M4510_MEM(*addr);
405      *address = M4510_MEM(*address);
382406   return TRUE;
383407}
384408
r3535r3536
386410 * Generic set_info
387411 **************************************************************************/
388412
389static void m4510_set_info(UINT32 state, cpuinfo *info)
413static CPU_SET_INFO( m4510 )
390414{
415   m4510_Regs *m4510 = token;
416
391417   switch (state)
392418   {
393419      /* --- the following bits of info are set as 64-bit signed integers --- */
394      case CPUINFO_INT_INPUT_STATE + M4510_IRQ_LINE:   m4510_set_irq_line(M4510_IRQ_LINE, info->i); break;
395      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   m4510_set_irq_line(INPUT_LINE_NMI, info->i); break;
420      case CPUINFO_INT_INPUT_STATE + M4510_IRQ_LINE:   m4510_set_irq_line(m4510, M4510_IRQ_LINE, info->i); break;
421      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   m4510_set_irq_line(m4510, INPUT_LINE_NMI, info->i); break;
396422
397423      case CPUINFO_INT_PC:                     PCW = info->i; change_pc(PCD);         break;
398      case CPUINFO_INT_REGISTER + M4510_PC:         m4510.pc.w.l = info->i;               break;
424      case CPUINFO_INT_REGISTER + M4510_PC:         m4510->pc.w.l = info->i;               break;
399425      case CPUINFO_INT_SP:                     SPL = info->i;                     break;
400      case CPUINFO_INT_REGISTER + M4510_S:         m4510.sp.b.l = info->i;               break;
401      case CPUINFO_INT_REGISTER + M4510_P:         m4510.p = info->i;                  break;
402      case CPUINFO_INT_REGISTER + M4510_A:         m4510.a = info->i;                  break;
403      case CPUINFO_INT_REGISTER + M4510_X:         m4510.x = info->i;                  break;
404      case CPUINFO_INT_REGISTER + M4510_Y:         m4510.y = info->i;                  break;
405      case CPUINFO_INT_REGISTER + M4510_Z:         m4510.z = info->i;                  break;
406      case CPUINFO_INT_REGISTER + M4510_B:         m4510.zp.b.h = info->i;               break;
407      case CPUINFO_INT_REGISTER + M4510_MEM_LOW:      m4510.low = info->i;               break;
408      case CPUINFO_INT_REGISTER + M4510_MEM_HIGH:      m4510.high = info->i;               break;
409      case CPUINFO_INT_REGISTER + M4510_EA:         m4510.ea.w.l = info->i;               break;
410      case CPUINFO_INT_REGISTER + M4510_ZP:         m4510.zp.w.l = info->i;               break;
411      case CPUINFO_INT_REGISTER + M4510_MEM0:         m4510.mem[0] = info->i;               break;
412      case CPUINFO_INT_REGISTER + M4510_MEM1:         m4510.mem[1] = info->i;               break;
413      case CPUINFO_INT_REGISTER + M4510_MEM2:         m4510.mem[2] = info->i;               break;
414      case CPUINFO_INT_REGISTER + M4510_MEM3:         m4510.mem[3] = info->i;               break;
415      case CPUINFO_INT_REGISTER + M4510_MEM4:         m4510.mem[4] = info->i;               break;
416      case CPUINFO_INT_REGISTER + M4510_MEM5:         m4510.mem[5] = info->i;               break;
417      case CPUINFO_INT_REGISTER + M4510_MEM6:         m4510.mem[6] = info->i;               break;
418      case CPUINFO_INT_REGISTER + M4510_MEM7:         m4510.mem[7] = info->i;               break;
426      case CPUINFO_INT_REGISTER + M4510_S:         m4510->sp.b.l = info->i;               break;
427      case CPUINFO_INT_REGISTER + M4510_P:         m4510->p = info->i;                  break;
428      case CPUINFO_INT_REGISTER + M4510_A:         m4510->a = info->i;                  break;
429      case CPUINFO_INT_REGISTER + M4510_X:         m4510->x = info->i;                  break;
430      case CPUINFO_INT_REGISTER + M4510_Y:         m4510->y = info->i;                  break;
431      case CPUINFO_INT_REGISTER + M4510_Z:         m4510->z = info->i;                  break;
432      case CPUINFO_INT_REGISTER + M4510_B:         m4510->zp.b.h = info->i;               break;
433      case CPUINFO_INT_REGISTER + M4510_MEM_LOW:      m4510->low = info->i;               break;
434      case CPUINFO_INT_REGISTER + M4510_MEM_HIGH:      m4510->high = info->i;               break;
435      case CPUINFO_INT_REGISTER + M4510_EA:         m4510->ea.w.l = info->i;               break;
436      case CPUINFO_INT_REGISTER + M4510_ZP:         m4510->zp.w.l = info->i;               break;
437      case CPUINFO_INT_REGISTER + M4510_MEM0:         m4510->mem[0] = info->i;               break;
438      case CPUINFO_INT_REGISTER + M4510_MEM1:         m4510->mem[1] = info->i;               break;
439      case CPUINFO_INT_REGISTER + M4510_MEM2:         m4510->mem[2] = info->i;               break;
440      case CPUINFO_INT_REGISTER + M4510_MEM3:         m4510->mem[3] = info->i;               break;
441      case CPUINFO_INT_REGISTER + M4510_MEM4:         m4510->mem[4] = info->i;               break;
442      case CPUINFO_INT_REGISTER + M4510_MEM5:         m4510->mem[5] = info->i;               break;
443      case CPUINFO_INT_REGISTER + M4510_MEM6:         m4510->mem[6] = info->i;               break;
444      case CPUINFO_INT_REGISTER + M4510_MEM7:         m4510->mem[7] = info->i;               break;
419445
420446      /* --- the following bits of info are set as pointers to data or functions --- */
421      case CPUINFO_PTR_M6502_READINDEXED_CALLBACK:   m4510.rdmem_id = (read8_machine_func) info->f; break;
422      case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK:   m4510.wrmem_id = (write8_machine_func) info->f; break;
423      case CPUINFO_PTR_M6510_PORTREAD:            m4510.port_read = (UINT8 (*)(void)) info->f; break;
424      case CPUINFO_PTR_M6510_PORTWRITE:            m4510.port_write = (void (*)(UINT8)) info->f; break;
447      case CPUINFO_PTR_M6502_READINDEXED_CALLBACK:   m4510->rdmem_id = (read8_machine_func) info->f; break;
448      case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK:   m4510->wrmem_id = (write8_machine_func) info->f; break;
449      case CPUINFO_PTR_M6510_PORTREAD:            m4510->port_read = (UINT8 (*)(void)) info->f; break;
450      case CPUINFO_PTR_M6510_PORTWRITE:            m4510->port_write = (void (*)(UINT8)) info->f; break;
425451   }
426452}
427453
r3535r3536
431457 * Generic get_info
432458 **************************************************************************/
433459
434void m4510_get_info(UINT32 state, cpuinfo *info)
460CPU_GET_INFO( m4510 )
435461{
462   m4510_Regs *m4510 = token;
463
436464   switch (state)
437465   {
438466      /* --- the following bits of info are returned as 64-bit signed integers --- */
r3535r3536
459487      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 0;               break;
460488      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = 0;               break;
461489
462      case CPUINFO_INT_INPUT_STATE + M4510_IRQ_LINE:   info->i = m4510.irq_state;            break;
463      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   info->i = m4510.nmi_state;            break;
490      case CPUINFO_INT_INPUT_STATE + M4510_IRQ_LINE:   info->i = m4510->irq_state;            break;
491      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   info->i = m4510->nmi_state;            break;
464492
465      case CPUINFO_INT_PREVIOUSPC:               info->i = m4510.ppc.w.l;            break;
493      case CPUINFO_INT_PREVIOUSPC:               info->i = m4510->ppc.w.l;            break;
466494
467495      case CPUINFO_INT_PC:                     info->i = PCD;                     break;
468      case CPUINFO_INT_REGISTER + M4510_PC:         info->i = m4510.pc.w.l;               break;
496      case CPUINFO_INT_REGISTER + M4510_PC:         info->i = m4510->pc.w.l;               break;
469497      case CPUINFO_INT_SP:                     info->i = SPL;                     break;
470      case CPUINFO_INT_REGISTER + M4510_S:         info->i = m4510.sp.b.l;               break;
471      case CPUINFO_INT_REGISTER + M4510_P:         info->i = m4510.p;                  break;
472      case CPUINFO_INT_REGISTER + M4510_A:         info->i = m4510.a;                  break;
473      case CPUINFO_INT_REGISTER + M4510_X:         info->i = m4510.x;                  break;
474      case CPUINFO_INT_REGISTER + M4510_Y:         info->i = m4510.y;                  break;
475      case CPUINFO_INT_REGISTER + M4510_Z:         info->i = m4510.z;                  break;
476      case CPUINFO_INT_REGISTER + M4510_B:         info->i = m4510.zp.b.h;               break;
477      case CPUINFO_INT_REGISTER + M4510_MEM_LOW:      info->i = m4510.low;               break;
478      case CPUINFO_INT_REGISTER + M4510_MEM_HIGH:      info->i = m4510.high;               break;
479      case CPUINFO_INT_REGISTER + M4510_EA:         info->i = m4510.ea.w.l;               break;
480      case CPUINFO_INT_REGISTER + M4510_ZP:         info->i = m4510.zp.w.l;               break;
481      case CPUINFO_INT_REGISTER + M4510_MEM0:         info->i = m4510.mem[0];               break;
482      case CPUINFO_INT_REGISTER + M4510_MEM1:         info->i = m4510.mem[1];               break;
483      case CPUINFO_INT_REGISTER + M4510_MEM2:         info->i = m4510.mem[2];               break;
484      case CPUINFO_INT_REGISTER + M4510_MEM3:         info->i = m4510.mem[3];               break;
485      case CPUINFO_INT_REGISTER + M4510_MEM4:         info->i = m4510.mem[4];               break;
486      case CPUINFO_INT_REGISTER + M4510_MEM5:         info->i = m4510.mem[5];               break;
487      case CPUINFO_INT_REGISTER + M4510_MEM6:         info->i = m4510.mem[6];               break;
488      case CPUINFO_INT_REGISTER + M4510_MEM7:         info->i = m4510.mem[7];               break;
489      case CPUINFO_INT_M6510_PORT:               info->i = m4510_get_port();            break;
498      case CPUINFO_INT_REGISTER + M4510_S:         info->i = m4510->sp.b.l;               break;
499      case CPUINFO_INT_REGISTER + M4510_P:         info->i = m4510->p;                  break;
500      case CPUINFO_INT_REGISTER + M4510_A:         info->i = m4510->a;                  break;
501      case CPUINFO_INT_REGISTER + M4510_X:         info->i = m4510->x;                  break;
502      case CPUINFO_INT_REGISTER + M4510_Y:         info->i = m4510->y;                  break;
503      case CPUINFO_INT_REGISTER + M4510_Z:         info->i = m4510->z;                  break;
504      case CPUINFO_INT_REGISTER + M4510_B:         info->i = m4510->zp.b.h;               break;
505      case CPUINFO_INT_REGISTER + M4510_MEM_LOW:      info->i = m4510->low;               break;
506      case CPUINFO_INT_REGISTER + M4510_MEM_HIGH:      info->i = m4510->high;               break;
507      case CPUINFO_INT_REGISTER + M4510_EA:         info->i = m4510->ea.w.l;               break;
508      case CPUINFO_INT_REGISTER + M4510_ZP:         info->i = m4510->zp.w.l;               break;
509      case CPUINFO_INT_REGISTER + M4510_MEM0:         info->i = m4510->mem[0];               break;
510      case CPUINFO_INT_REGISTER + M4510_MEM1:         info->i = m4510->mem[1];               break;
511      case CPUINFO_INT_REGISTER + M4510_MEM2:         info->i = m4510->mem[2];               break;
512      case CPUINFO_INT_REGISTER + M4510_MEM3:         info->i = m4510->mem[3];               break;
513      case CPUINFO_INT_REGISTER + M4510_MEM4:         info->i = m4510->mem[4];               break;
514      case CPUINFO_INT_REGISTER + M4510_MEM5:         info->i = m4510->mem[5];               break;
515      case CPUINFO_INT_REGISTER + M4510_MEM6:         info->i = m4510->mem[6];               break;
516      case CPUINFO_INT_REGISTER + M4510_MEM7:         info->i = m4510->mem[7];               break;
517      case CPUINFO_INT_M6510_PORT:               info->i = m4510_get_port(m4510);            break;
490518
491519      /* --- the following bits of info are returned as pointers to data or functions --- */
492      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m4510_set_info;         break;
493      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = m4510_get_context;   break;
494      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = m4510_set_context;   break;
495      case CPUINFO_PTR_INIT:                     info->init = m4510_init;            break;
496      case CPUINFO_PTR_RESET:                     info->reset = m4510_reset;            break;
497      case CPUINFO_PTR_EXIT:                     info->exit = m4510_exit;            break;
498      case CPUINFO_PTR_EXECUTE:                  info->execute = m4510_execute;         break;
520      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m4510);         break;
521      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(m4510);   break;
522      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(m4510);   break;
523      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m4510);            break;
524      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m4510);            break;
525      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(m4510);            break;
526      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m4510);         break;
499527      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
500      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m4510_dasm;         break;
501      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m4510_ICount;         break;
502      case CPUINFO_PTR_INTERNAL_MEMORY_MAP:         info->internal_map8 = address_map_m4510_mem; break;
503      case CPUINFO_PTR_TRANSLATE:                  info->translate = m4510_translate;      break;
504      case CPUINFO_PTR_M6502_READINDEXED_CALLBACK:   info->f = (genf *) m4510.rdmem_id;      break;
505      case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK:   info->f = (genf *) m4510.wrmem_id;      break;
506      case CPUINFO_PTR_M6510_PORTREAD:            info->f = (genf *) m4510.port_read;      break;
507      case CPUINFO_PTR_M6510_PORTWRITE:            info->f = (genf *) m4510.port_write;   break;
528      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m4510);         break;
529      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m4510->icount;         break;
530      case CPUINFO_PTR_INTERNAL_MEMORY_MAP:         info->internal_map8 = ADDRESS_MAP_NAME(m4510_mem); break;
531      case CPUINFO_PTR_TRANSLATE:                  info->translate = CPU_TRANSLATE_NAME(m4510);      break;
532      case CPUINFO_PTR_M6502_READINDEXED_CALLBACK:   info->f = (genf *) m4510->rdmem_id;      break;
533      case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK:   info->f = (genf *) m4510->wrmem_id;      break;
534      case CPUINFO_PTR_M6510_PORTREAD:            info->f = (genf *) m4510->port_read;      break;
535      case CPUINFO_PTR_M6510_PORTWRITE:            info->f = (genf *) m4510->port_write;   break;
508536
509537      /* --- the following bits of info are returned as NULL-terminated strings --- */
510538      case CPUINFO_STR_NAME:                     strcpy(info->s, "M4510");            break;
r3535r3536
515543
516544      case CPUINFO_STR_FLAGS:
517545         sprintf(info->s, "%c%c%c%c%c%c%c%c",
518            m4510.p & 0x80 ? 'N':'.',
519            m4510.p & 0x40 ? 'V':'.',
520            m4510.p & 0x20 ? 'R':'.',
521            m4510.p & 0x10 ? 'B':'.',
522            m4510.p & 0x08 ? 'D':'.',
523            m4510.p & 0x04 ? 'I':'.',
524            m4510.p & 0x02 ? 'Z':'.',
525            m4510.p & 0x01 ? 'C':'.');
546            m4510->p & 0x80 ? 'N':'.',
547            m4510->p & 0x40 ? 'V':'.',
548            m4510->p & 0x20 ? 'R':'.',
549            m4510->p & 0x10 ? 'B':'.',
550            m4510->p & 0x08 ? 'D':'.',
551            m4510->p & 0x04 ? 'I':'.',
552            m4510->p & 0x02 ? 'Z':'.',
553            m4510->p & 0x01 ? 'C':'.');
526554         break;
527555
528      case CPUINFO_STR_REGISTER + M4510_PC:         sprintf(info->s, "PC:%04X", m4510.pc.w.l); break;
529      case CPUINFO_STR_REGISTER + M4510_S:         sprintf(info->s, "S:%02X", m4510.sp.b.l); break;
530      case CPUINFO_STR_REGISTER + M4510_P:         sprintf(info->s, "P:%02X", m4510.p); break;
531      case CPUINFO_STR_REGISTER + M4510_A:         sprintf(info->s, "A:%02X", m4510.a); break;
532      case CPUINFO_STR_REGISTER + M4510_X:         sprintf(info->s, "X:%02X", m4510.x); break;
533      case CPUINFO_STR_REGISTER + M4510_Y:         sprintf(info->s, "Y:%02X", m4510.y); break;
534      case CPUINFO_STR_REGISTER + M4510_Z:         sprintf(info->s, "Z:%02X", m4510.z); break;
535      case CPUINFO_STR_REGISTER + M4510_B:         sprintf(info->s, "B:%02X", m4510.zp.b.h); break;
536      case CPUINFO_STR_REGISTER + M4510_MEM_LOW:      sprintf(info->s, "M0:%01X", m4510.low); break;
537      case CPUINFO_STR_REGISTER + M4510_MEM_HIGH:      sprintf(info->s, "M1:%01X", m4510.high); break;
538      case CPUINFO_STR_REGISTER + M4510_EA:         sprintf(info->s, "EA:%04X", m4510.ea.w.l); break;
539      case CPUINFO_STR_REGISTER + M4510_ZP:         sprintf(info->s, "ZP:%03X", m4510.zp.w.l); break;
556      case CPUINFO_STR_REGISTER + M4510_PC:         sprintf(info->s, "PC:%04X", m4510->pc.w.l); break;
557      case CPUINFO_STR_REGISTER + M4510_S:         sprintf(info->s, "S:%02X", m4510->sp.b.l); break;
558      case CPUINFO_STR_REGISTER + M4510_P:         sprintf(info->s, "P:%02X", m4510->p); break;
559      case CPUINFO_STR_REGISTER + M4510_A:         sprintf(info->s, "A:%02X", m4510->a); break;
560      case CPUINFO_STR_REGISTER + M4510_X:         sprintf(info->s, "X:%02X", m4510->x); break;
561      case CPUINFO_STR_REGISTER + M4510_Y:         sprintf(info->s, "Y:%02X", m4510->y); break;
562      case CPUINFO_STR_REGISTER + M4510_Z:         sprintf(info->s, "Z:%02X", m4510->z); break;
563      case CPUINFO_STR_REGISTER + M4510_B:         sprintf(info->s, "B:%02X", m4510->zp.b.h); break;
564      case CPUINFO_STR_REGISTER + M4510_MEM_LOW:      sprintf(info->s, "M0:%01X", m4510->low); break;
565      case CPUINFO_STR_REGISTER + M4510_MEM_HIGH:      sprintf(info->s, "M1:%01X", m4510->high); break;
566      case CPUINFO_STR_REGISTER + M4510_EA:         sprintf(info->s, "EA:%04X", m4510->ea.w.l); break;
567      case CPUINFO_STR_REGISTER + M4510_ZP:         sprintf(info->s, "ZP:%03X", m4510->zp.w.l); break;
540568   }
541569}
542570
src/emu/cpu/m6502/t65sc02.c
r3535r3536
3232*/
3333
3434#undef   OP
35#define OP(nn) INLINE void m65sc02_##nn(void)
35#define OP(nn) INLINE void m65sc02_##nn(m6502_Regs *m6502)
3636
3737/*****************************************************************************
3838 *****************************************************************************
r3535r3536
4343 * op    temp     cycles             rdmem   opc  wrmem   ********************/
4444OP(63) { BSR;                                             } /* 5? BSR */
4545
46static void (*const insn65sc02[0x100])(void) = {
46static void (*const insn65sc02[0x100])(m6502_Regs *m6502) = {
4747   m65c02_00,m65c02_01,m65c02_02,m65c02_03,m65c02_04,m65c02_05,m65c02_06,m65c02_07,
4848   m65c02_08,m65c02_09,m65c02_0a,m65c02_0b,m65c02_0c,m65c02_0d,m65c02_0e,m65c02_0f,
4949   m65c02_10,m65c02_11,m65c02_12,m65c02_13,m65c02_14,m65c02_15,m65c02_16,m65c02_17,
src/emu/cpu/m6502/tn2a03.c
r3535r3536
3232
3333
3434#undef   OP
35#define OP(nn) INLINE void n2a03_##nn(void)
35#define OP(nn) INLINE void n2a03_##nn(m6502_Regs *m6502)
3636
3737/*****************************************************************************
3838 *****************************************************************************
r3535r3536
6060OP(7d) { int tmp; RD_ABX_P; ADC_NES;     } /* 4 ADC ABX page penalty */
6161OP(fd) { int tmp; RD_ABX_P; SBC_NES;     } /* 4 SBC ABX page penalty */
6262
63static void (*const insn2a03[0x100])(void) = {
63static void (*const insn2a03[0x100])(m6502_Regs *m6502) = {
6464   m6502_00,m6502_01,m6502_02,m6502_03,m6502_04,m6502_05,m6502_06,m6502_07,
6565   m6502_08,m6502_09,m6502_0a,m6502_0b,m6502_0c,m6502_0d,m6502_0e,m6502_0f,
6666   m6502_10,m6502_11,m6502_12,m6502_13,m6502_14,m6502_15,m6502_16,m6502_17,
src/emu/cpu/m6502/ops02.h
r3535r3536
3232#define F_N 0x80
3333
3434/* some shortcuts for improved readability */
35#define A   m6502.a
36#define X   m6502.x
37#define Y   m6502.y
38#define P   m6502.p
39#define S   m6502.sp.b.l
40#define SPD m6502.sp.d
35#define A   m6502->a
36#define X   m6502->x
37#define Y   m6502->y
38#define P   m6502->p
39#define S   m6502->sp.b.l
40#define SPD m6502->sp.d
4141
42#define NZ   m6502.nz
42#define NZ   m6502->nz
4343
4444#define SET_NZ(n)            \
4545   if ((n) == 0) P = (P & ~F_N) | F_Z; else P = (P & ~(F_N | F_Z)) | ((n) & F_N)
r3535r3536
4747#define SET_Z(n)            \
4848   if ((n) == 0) P |= F_Z; else P &= ~F_Z
4949
50#define EAL m6502.ea.b.l
51#define EAH m6502.ea.b.h
52#define EAW m6502.ea.w.l
53#define EAD m6502.ea.d
50#define EAL m6502->ea.b.l
51#define EAH m6502->ea.b.h
52#define EAW m6502->ea.w.l
53#define EAD m6502->ea.d
5454
55#define ZPL m6502.zp.b.l
56#define ZPH m6502.zp.b.h
57#define ZPW m6502.zp.w.l
58#define ZPD m6502.zp.d
55#define ZPL m6502->zp.b.l
56#define ZPH m6502->zp.b.h
57#define ZPW m6502->zp.w.l
58#define ZPD m6502->zp.d
5959
60#define PCL m6502.pc.b.l
61#define PCH m6502.pc.b.h
62#define PCW m6502.pc.w.l
63#define PCD m6502.pc.d
60#define PCL m6502->pc.b.l
61#define PCH m6502->pc.b.h
62#define PCW m6502->pc.w.l
63#define PCD m6502->pc.d
6464
65#define PPC m6502.ppc.d
65#define PPC m6502->ppc.d
6666
67#define RDMEM_ID(a)      m6502.rdmem_id(Machine,a)
68#define WRMEM_ID(a,d)   m6502.wrmem_id(Machine,a,d)
67#define RDMEM_ID(a)      m6502->rdmem_id(Machine,a)
68#define WRMEM_ID(a,d)   m6502->wrmem_id(Machine,a,d)
6969
7070#define CHANGE_PC change_pc(PCD)
7171
7272/***************************************************************
7373 *  RDOP    read an opcode
7474 ***************************************************************/
75#define RDOP() cpu_readop(PCW++); m6502_ICount -= 1
75#define RDOP() cpu_readop(PCW++); m6502->icount -= 1
7676
7777/***************************************************************
7878 *  RDOPARG read an opcode argument
7979 ***************************************************************/
80#define RDOPARG() cpu_readop_arg(PCW++); m6502_ICount -= 1
80#define RDOPARG() cpu_readop_arg(PCW++); m6502->icount -= 1
8181
8282/***************************************************************
8383 *  RDMEM   read memory
8484 ***************************************************************/
85#define RDMEM(addr) program_read_byte_8le(addr); m6502_ICount -= 1
85#define RDMEM(addr) program_read_byte_8le(addr); m6502->icount -= 1
8686
8787/***************************************************************
8888 *  WRMEM   write memory
8989 ***************************************************************/
90#define WRMEM(addr,data) program_write_byte_8le(addr,data); m6502_ICount -= 1
90#define WRMEM(addr,data) program_write_byte_8le(addr,data); m6502->icount -= 1
9191
9292/***************************************************************
9393 *  BRA  branch relative
r3535r3536
269269#define RD_ABX_NP   EA_ABX_NP; tmp = RDMEM(EAD)
270270#define RD_ABY_P   EA_ABY_P; tmp = RDMEM(EAD)
271271#define RD_ABY_NP   EA_ABY_NP; tmp = RDMEM(EAD)
272#define RD_IDX      EA_IDX; tmp = RDMEM_ID(EAD); m6502_ICount -= 1
273#define RD_IDY_P   EA_IDY_P; tmp = RDMEM_ID(EAD); m6502_ICount -= 1
274#define RD_IDY_NP   EA_IDY_NP; tmp = RDMEM_ID(EAD); m6502_ICount -= 1
272#define RD_IDX      EA_IDX; tmp = RDMEM_ID(EAD); m6502->icount -= 1
273#define RD_IDY_P   EA_IDY_P; tmp = RDMEM_ID(EAD); m6502->icount -= 1
274#define RD_IDY_NP   EA_IDY_NP; tmp = RDMEM_ID(EAD); m6502->icount -= 1
275275#define RD_ZPI      EA_ZPI; tmp = RDMEM(EAD)
276276
277277/* write a value from tmp */
r3535r3536
281281#define WR_ABS      EA_ABS; WRMEM(EAD, tmp)
282282#define WR_ABX_NP   EA_ABX_NP; WRMEM(EAD, tmp)
283283#define WR_ABY_NP   EA_ABY_NP; WRMEM(EAD, tmp)
284#define WR_IDX      EA_IDX; WRMEM_ID(EAD, tmp); m6502_ICount -= 1
285#define WR_IDY_NP   EA_IDY_NP; WRMEM_ID(EAD, tmp); m6502_ICount -= 1
284#define WR_IDX      EA_IDX; WRMEM_ID(EAD, tmp); m6502->icount -= 1
285#define WR_IDY_NP   EA_IDY_NP; WRMEM_ID(EAD, tmp); m6502->icount -= 1
286286#define WR_ZPI      EA_ZPI; WRMEM(EAD, tmp)
287287
288288/* dummy read from the last EA */
r3535r3536
438438 * CLI  Clear interrupt flag
439439 ***************************************************************/
440440#define CLI                                        \
441   if ((m6502.irq_state != CLEAR_LINE) && (P & F_I)) {       \
442      m6502.after_cli = 1;                           \
441   if ((m6502->irq_state != CLEAR_LINE) && (P & F_I)) {       \
442      m6502->after_cli = 1;                           \
443443   }                                             \
444444   P &= ~F_I
445445
r3535r3536
536536 *  set PC to the effective address
537537 ***************************************************************/
538538#define JMP                                        \
539   if( EAD == PPC && !m6502.pending_irq && !m6502.after_cli )   \
540      if( m6502_ICount > 0 ) m6502_ICount = 0;            \
539   if( EAD == PPC && !m6502->pending_irq && !m6502->after_cli )   \
540      if( m6502->icount > 0 ) m6502->icount = 0;            \
541541   PCD = EAD;                                       \
542542   CHANGE_PC
543543
r3535r3536
625625   RDMEM(SPD);                                       \
626626   if ( P & F_I ) {                                 \
627627      PULL(P);                                    \
628      if ((m6502.irq_state != CLEAR_LINE) && !(P & F_I)) {   \
628      if ((m6502->irq_state != CLEAR_LINE) && !(P & F_I)) {   \
629629         LOG(("M6502#%d PLP sets after_cli\n",cpu_getactivecpu()));   \
630         m6502.after_cli = 1;                        \
630         m6502->after_cli = 1;                        \
631631      }                                          \
632632   } else {                                       \
633633      PULL(P);                                    \
r3535r3536
666666   PULL(PCL);                                       \
667667   PULL(PCH);                                       \
668668   P |= F_T | F_B;                                  \
669   if( (m6502.irq_state != CLEAR_LINE) && !(P & F_I) )         \
669   if( (m6502->irq_state != CLEAR_LINE) && !(P & F_I) )         \
670670   {                                             \
671671      LOG(("M6502#%d RTI sets after_cli\n",cpu_getactivecpu()));    \
672      m6502.after_cli = 1;                           \
672      m6502->after_cli = 1;                           \
673673   }                                             \
674674   CHANGE_PC
675675
src/emu/cpu/m6502/m6502.c
r3535r3536
5353/****************************************************************************
5454 * The 6502 registers.
5555 ****************************************************************************/
56typedef struct
56typedef struct _m6502_Regs m6502_Regs;
57struct _m6502_Regs
5758{
5859   UINT8   subtype;      /* currently selected cpu sub type */
59   void   (*const *insn)(void); /* pointer to the function pointer table */
60   void   (*const *insn)(m6502_Regs *); /* pointer to the function pointer table */
6061   PAIR   ppc;         /* previous program counter */
6162   PAIR   pc;          /* program counter */
6263   PAIR   sp;          /* stack pointer (always 100 - 1FF) */
r3535r3536
7172   UINT8   nmi_state;
7273   UINT8   irq_state;
7374   UINT8   so_state;
74   int    (*irq_callback)(int irqline);   /* IRQ callback */
75
76   cpu_irq_callback irq_callback;
77   const device_config *device;
78   int      int_occured;
79   int      icount;
80
7581   read8_machine_func rdmem_id;               /* readmem callback for indexed instructions */
7682   write8_machine_func wrmem_id;            /* writemem callback for indexed instructions */
7783
r3535r3536
8288   void   (*port_write)(UINT8 direction, UINT8 data);
8389#endif
8490
85}   m6502_Regs;
91};
8692
87static int m6502_IntOccured = 0;
88static int m6502_ICount = 0;
8993
90static m6502_Regs m6502;
94static void *token;
95//static m6502_Regs *m6502;
9196
9297static READ8_HANDLER( default_rdmem_id ) { return program_read_byte_8le(offset); }
9398static WRITE8_HANDLER( default_wdmem_id ) { program_write_byte_8le(offset, data); }
r3535r3536
127132 *
128133 *****************************************************************************/
129134
130static void m6502_common_init(int index, int clock, const void *config, int (*irqcallback)(int), UINT8 subtype, void (*const *insn)(void), const char *type)
135static void m6502_common_init(const device_config *device, int index, int clock, const void *config, cpu_irq_callback irqcallback, UINT8 subtype, void (*const *insn)(m6502_Regs *m6502), const char *type)
131136{
132   memset(&m6502, 0, sizeof(m6502));
133   m6502.irq_callback = irqcallback;
134   m6502.subtype = subtype;
135   m6502.insn = insn;
136   m6502.rdmem_id = default_rdmem_id;
137   m6502.wrmem_id = default_wdmem_id;
137   m6502_Regs *m6502 = device->token;
138138
139   state_save_register_item(type, index, m6502.pc.w.l);
140   state_save_register_item(type, index, m6502.sp.w.l);
141   state_save_register_item(type, index, m6502.p);
142   state_save_register_item(type, index, m6502.a);
143   state_save_register_item(type, index, m6502.x);
144   state_save_register_item(type, index, m6502.y);
145   state_save_register_item(type, index, m6502.pending_irq);
146   state_save_register_item(type, index, m6502.after_cli);
147   state_save_register_item(type, index, m6502.nmi_state);
148   state_save_register_item(type, index, m6502.irq_state);
149   state_save_register_item(type, index, m6502.so_state);
139   token = device->token;   // temporary
150140
141   m6502->irq_callback = irqcallback;
142   m6502->device = device;
143   m6502->subtype = subtype;
144   m6502->insn = insn;
145   m6502->rdmem_id = default_rdmem_id;
146   m6502->wrmem_id = default_wdmem_id;
147
148   state_save_register_item(type, index, m6502->pc.w.l);
149   state_save_register_item(type, index, m6502->sp.w.l);
150   state_save_register_item(type, index, m6502->p);
151   state_save_register_item(type, index, m6502->a);
152   state_save_register_item(type, index, m6502->x);
153   state_save_register_item(type, index, m6502->y);
154   state_save_register_item(type, index, m6502->pending_irq);
155   state_save_register_item(type, index, m6502->after_cli);
156   state_save_register_item(type, index, m6502->nmi_state);
157   state_save_register_item(type, index, m6502->irq_state);
158   state_save_register_item(type, index, m6502->so_state);
159
151160#if (HAS_M6510) || (HAS_M6510T) || (HAS_M8502) || (HAS_M7501)
152161   if (subtype == SUBTYPE_6510)
153162   {
154      state_save_register_item(type, index, m6502.port);
155      state_save_register_item(type, index, m6502.ddr);
163      state_save_register_item(type, index, m6502->port);
164      state_save_register_item(type, index, m6502->ddr);
156165   }
157166#endif
158167}
159168
160static void m6502_init(int index, int clock, const void *config, int (*irqcallback)(int))
169static CPU_INIT( m6502 )
161170{
162   m6502_common_init(index, clock, config, irqcallback, SUBTYPE_6502, insn6502, "m6502");
171   m6502_common_init(device, index, clock, config, irqcallback, SUBTYPE_6502, insn6502, "m6502");
163172}
164173
165static void m6502_reset(void)
174static CPU_RESET( m6502 )
166175{
176   m6502_Regs *m6502 = device->token;
167177   /* wipe out the rest of the m6502 structure */
168178   /* read the reset vector into PC */
169179   PCL = RDMEM(M6502_RST_VEC);
170180   PCH = RDMEM(M6502_RST_VEC+1);
171181
172   m6502.sp.d = 0x01ff;   /* stack pointer starts at page 1 offset FF */
173   m6502.p = F_T|F_I|F_Z|F_B|(P&F_D);   /* set T, I and Z flags */
174   m6502.pending_irq = 0;   /* nonzero if an IRQ is pending */
175   m6502.after_cli = 0;   /* pending IRQ and last insn cleared I */
176   m6502.irq_state = 0;
177   m6502.nmi_state = 0;
182   m6502->sp.d = 0x01ff;   /* stack pointer starts at page 1 offset FF */
183   m6502->p = F_T|F_I|F_Z|F_B|(P&F_D);   /* set T, I and Z flags */
184   m6502->pending_irq = 0;   /* nonzero if an IRQ is pending */
185   m6502->after_cli = 0;   /* pending IRQ and last insn cleared I */
186   m6502->irq_state = 0;
187   m6502->nmi_state = 0;
178188
179189   change_pc(PCD);
180190}
181191
182static void m6502_exit(void)
192static CPU_EXIT( m6502 )
183193{
184194   /* nothing to do yet */
185195}
186196
187static void m6502_get_context (void *dst)
197static CPU_GET_CONTEXT( m6502 )
188198{
189   if( dst )
190      *(m6502_Regs*)dst = m6502;
191199}
192200
193static void m6502_set_context (void *src)
201static CPU_SET_CONTEXT( m6502 )
194202{
203   m6502_Regs *m6502;
204
195205   if( src )
196206   {
197      m6502 = *(m6502_Regs*)src;
207      token = src;
208      m6502 = token;
198209      change_pc(PCD);
199210   }
200211}
201212
202INLINE void m6502_take_irq(void)
213INLINE void m6502_take_irq(m6502_Regs *m6502)
203214{
204215   if( !(P & F_I) )
205216   {
206217      EAD = M6502_IRQ_VEC;
207      m6502_ICount -= 2;
218      m6502->icount -= 2;
208219      PUSH(PCH);
209220      PUSH(PCL);
210221      PUSH(P & ~F_B);
r3535r3536
213224      PCH = RDMEM(EAD+1);
214225      LOG(("M6502#%d takes IRQ ($%04x)\n", cpu_getactivecpu(), PCD));
215226      /* call back the cpuintrf to let it clear the line */
216      if (m6502.irq_callback) (*m6502.irq_callback)(0);
227      if (m6502->irq_callback) (*m6502->irq_callback)(m6502->device, 0);
217228      change_pc(PCD);
218229   }
219   m6502.pending_irq = 0;
230   m6502->pending_irq = 0;
220231}
221232
222static int m6502_execute(int cycles)
233static CPU_EXECUTE( m6502 )
223234{
224   m6502_ICount = cycles;
235   m6502_Regs *m6502 = device->token;
225236
237   m6502->icount = cycles;
238
226239   change_pc(PCD);
227240
228241   do
r3535r3536
233246      debugger_instruction_hook(Machine, PCD);
234247
235248      /* if an irq is pending, take it now */
236      if( m6502.pending_irq )
237         m6502_take_irq();
249      if( m6502->pending_irq )
250         m6502_take_irq(m6502);
238251
239252      op = RDOP();
240      (*m6502.insn[op])();
253      (*m6502->insn[op])(m6502);
241254
242255      /* check if the I flag was just reset (interrupts enabled) */
243      if( m6502.after_cli )
256      if( m6502->after_cli )
244257      {
245258         LOG(("M6502#%d after_cli was >0", cpu_getactivecpu()));
246         m6502.after_cli = 0;
247         if (m6502.irq_state != CLEAR_LINE)
259         m6502->after_cli = 0;
260         if (m6502->irq_state != CLEAR_LINE)
248261         {
249262            LOG((": irq line is asserted: set pending IRQ\n"));
250            m6502.pending_irq = 1;
263            m6502->pending_irq = 1;
251264         }
252265         else
253266         {
r3535r3536
255268         }
256269      }
257270      else {
258         if ( m6502.pending_irq == 2 ) {
259            if ( m6502_IntOccured - m6502_ICount > 1 ) {
260               m6502.pending_irq = 1;
271         if ( m6502->pending_irq == 2 ) {
272            if ( m6502->int_occured - m6502->icount > 1 ) {
273               m6502->pending_irq = 1;
261274            }
262275         }
263         if( m6502.pending_irq == 1 )
264            m6502_take_irq();
265         if ( m6502.pending_irq == 2 ) {
266            m6502.pending_irq = 1;
276         if( m6502->pending_irq == 1 )
277            m6502_take_irq(m6502);
278         if ( m6502->pending_irq == 2 ) {
279            m6502->pending_irq = 1;
267280         }
268281      }
269282
270   } while (m6502_ICount > 0);
283   } while (m6502->icount > 0);
271284
272   return cycles - m6502_ICount;
285   return cycles - m6502->icount;
273286}
274287
275static void m6502_set_irq_line(int irqline, int state)
288static void m6502_set_irq_line(m6502_Regs *m6502, int irqline, int state)
276289{
277290   if (irqline == INPUT_LINE_NMI)
278291   {
279      if (m6502.nmi_state == state) return;
280      m6502.nmi_state = state;
292      if (m6502->nmi_state == state) return;
293      m6502->nmi_state = state;
281294      if( state != CLEAR_LINE )
282295      {
283296         LOG(( "M6502#%d set_nmi_line(ASSERT)\n", cpu_getactivecpu()));
284297         EAD = M6502_NMI_VEC;
285         m6502_ICount -= 2;
298         m6502->icount -= 2;
286299         PUSH(PCH);
287300         PUSH(PCL);
288301         PUSH(P & ~F_B);
r3535r3536
297310   {
298311      if( irqline == M6502_SET_OVERFLOW )
299312      {
300         if( m6502.so_state && !state )
313         if( m6502->so_state && !state )
301314         {
302315            LOG(( "M6502#%d set overflow\n", cpu_getactivecpu()));
303316            P|=F_V;
304317         }
305         m6502.so_state=state;
318         m6502->so_state=state;
306319         return;
307320      }
308      m6502.irq_state = state;
321      m6502->irq_state = state;
309322      if( state != CLEAR_LINE )
310323      {
311324         LOG(( "M6502#%d set_irq_line(ASSERT)\n", cpu_getactivecpu()));
312         m6502.pending_irq = 1;
313//          m6502.pending_irq = 2;
314         m6502_IntOccured = m6502_ICount;
325         m6502->pending_irq = 1;
326//          m6502->pending_irq = 2;
327         m6502->int_occured = m6502->icount;
315328      }
316329   }
317330}
r3535r3536
323336 ****************************************************************************/
324337#if (HAS_N2A03)
325338
326static void n2a03_init(int index, int clock, const void *config, int (*irqcallback)(int))
339static CPU_INIT( n2a03 )
327340{
328   m6502_common_init(index, clock, config, irqcallback, SUBTYPE_2A03, insn2a03, "n2a03");
341   m6502_common_init(device, index, clock, config, irqcallback, SUBTYPE_2A03, insn2a03, "n2a03");
329342}
330343
331344/* The N2A03 is integrally tied to its PSG (they're on the same die).
332345   Bit 7 of address $4011 (the PSG's DPCM control register), when set,
333346   causes an IRQ to be generated.  This function allows the IRQ to be called
334347   from the PSG core when such an occasion arises. */
335void n2a03_irq(void)
348void n2a03_irq()
336349{
337  m6502_take_irq();
350   m6502_Regs *m6502 = token;
351
352   m6502_take_irq(m6502);
338353}
339354#endif
340355
r3535r3536
344359 ****************************************************************************/
345360#if (HAS_M6510)
346361
347static void m6510_init (int index, int clock, const void *config, int (*irqcallback)(int))
362static CPU_INIT( m6510 )
348363{
349   m6502_common_init(index, clock, config, irqcallback, SUBTYPE_6510, insn6510, "m6510");
364   m6502_common_init(device, index, clock, config, irqcallback, SUBTYPE_6510, insn6510, "m6510");
350365}
351366
352static void m6510_reset (void)
367static CPU_RESET( m6510 )
353368{
354   m6502_reset();
355   m6502.port = 0xff;
356   m6502.ddr = 0x00;
369   m6502_Regs *m6502 = device->token;
370
371   CPU_RESET_CALL(m6502);
372   m6502->port = 0xff;
373   m6502->ddr = 0x00;
357374}
358375
359static UINT8 m6510_get_port(void)
376static UINT8 m6510_get_port(m6502_Regs *m6502)
360377{
361   return (m6502.port & m6502.ddr) | (m6502.ddr ^ 0xff);
378   return (m6502->port & m6502->ddr) | (m6502->ddr ^ 0xff);
362379}
363380
364381static READ8_HANDLER( m6510_read_0000 )
365382{
383   m6502_Regs *m6502 = token;
366384   UINT8 result = 0x00;
367385
368386   switch(offset)
369387   {
370388      case 0x0000:   /* DDR */
371         result = m6502.ddr;
389         result = m6502->ddr;
372390         break;
373391      case 0x0001:   /* Data Port */
374         if (m6502.port_read)
375            result = m6502.port_read( m6502.ddr );
376         result = (m6502.ddr & m6502.port) | (~m6502.ddr & result);
392         if (m6502->port_read)
393            result = m6502->port_read( m6502->ddr );
394         result = (m6502->ddr & m6502->port) | (~m6502->ddr & result);
377395         break;
378396   }
379397   return result;
r3535r3536
381399
382400static WRITE8_HANDLER( m6510_write_0000 )
383401{
402   m6502_Regs *m6502 = token;
403
384404   switch(offset)
385405   {
386406      case 0x0000:   /* DDR */
387         m6502.ddr = data;
407         m6502->ddr = data;
388408         break;
389409      case 0x0001:   /* Data Port */
390         m6502.port = data;
410         m6502->port = data;
391411         break;
392412   }
393413
394   if (m6502.port_write)
395      m6502.port_write( m6502.ddr, m6502.port & m6502.ddr );
414   if (m6502->port_write)
415      m6502->port_write( m6502->ddr, m6502->port & m6502->ddr );
396416}
397417
398418static ADDRESS_MAP_START(m6510_mem, ADDRESS_SPACE_PROGRAM, 8)
r3535r3536
407427 ****************************************************************************/
408428#if (HAS_M65C02)
409429
410static void m65c02_init(int index, int clock, const void *config, int (*irqcallback)(int))
430static CPU_INIT( m65c02 )
411431{
412   m6502_common_init(index, clock, config, irqcallback, SUBTYPE_65C02, insn65c02, "m65c02");
432   m6502_common_init(device, index, clock, config, irqcallback, SUBTYPE_65C02, insn65c02, "m65c02");
413433}
414434
415static void m65c02_reset (void)
435static CPU_RESET( m65c02 )
416436{
417   m6502_reset();
437   m6502_Regs *m6502 = device->token;
438
439   CPU_RESET_CALL(m6502);
418440   P &=~F_D;
419441}
420442
421INLINE void m65c02_take_irq(void)
443INLINE void m65c02_take_irq(m6502_Regs *m6502)
422444{
423445   if( !(P & F_I) )
424446   {
425447      EAD = M6502_IRQ_VEC;
426      m6502_ICount -= 2;
448      m6502->icount -= 2;
427449      PUSH(PCH);
428450      PUSH(PCL);
429451      PUSH(P & ~F_B);
r3535r3536
432454      PCH = RDMEM(EAD+1);
433455      LOG(("M65c02#%d takes IRQ ($%04x)\n", cpu_getactivecpu(), PCD));
434456      /* call back the cpuintrf to let it clear the line */
435      if (m6502.irq_callback) (*m6502.irq_callback)(0);
457      if (m6502->irq_callback) (*m6502->irq_callback)(m6502->device, 0);
436458      change_pc(PCD);
437459   }
438   m6502.pending_irq = 0;
460   m6502->pending_irq = 0;
439461}
440462
441static int m65c02_execute(int cycles)
463static CPU_EXECUTE( m65c02 )
442464{
443   m6502_ICount = cycles;
465   m6502_Regs *m6502 = device->token;
444466
467   m6502->icount = cycles;
468
445469   change_pc(PCD);
446470
447471   do
r3535r3536
452476      debugger_instruction_hook(Machine, PCD);
453477
454478      op = RDOP();
455      (*m6502.insn[op])();
479      (*m6502->insn[op])(m6502);
456480
457481      /* if an irq is pending, take it now */
458      if( m6502.pending_irq )
459         m65c02_take_irq();
482      if( m6502->pending_irq )
483         m65c02_take_irq(m6502);
460484
461485
462486      /* check if the I flag was just reset (interrupts enabled) */
463      if( m6502.after_cli )
487      if( m6502->after_cli )
464488      {
465489         LOG(("M6502#%d after_cli was >0", cpu_getactivecpu()));
466         m6502.after_cli = 0;
467         if (m6502.irq_state != CLEAR_LINE)
490         m6502->after_cli = 0;
491         if (m6502->irq_state != CLEAR_LINE)
468492         {
469493            LOG((": irq line is asserted: set pending IRQ\n"));
470            m6502.pending_irq = 1;
494            m6502->pending_irq = 1;
471495         }
472496         else
473497         {
r3535r3536
475499         }
476500      }
477501      else
478      if( m6502.pending_irq )
479         m65c02_take_irq();
502      if( m6502->pending_irq )
503         m65c02_take_irq(m6502);
480504
481   } while (m6502_ICount > 0);
505   } while (m6502->icount > 0);
482506
483   return cycles - m6502_ICount;
507   return cycles - m6502->icount;
484508}
485509
486static void m65c02_set_irq_line(int irqline, int state)
510static void m65c02_set_irq_line(m6502_Regs *m6502, int irqline, int state)
487511{
488512   if (irqline == INPUT_LINE_NMI)
489513   {
490      if (m6502.nmi_state == state) return;
491      m6502.nmi_state = state;
514      if (m6502->nmi_state == state) return;
515      m6502->nmi_state = state;
492516      if( state != CLEAR_LINE )
493517      {
494518         LOG(( "M6502#%d set_nmi_line(ASSERT)\n", cpu_getactivecpu()));
495519         EAD = M6502_NMI_VEC;
496         m6502_ICount -= 2;
520         m6502->icount -= 2;
497521         PUSH(PCH);
498522         PUSH(PCL);
499523         PUSH(P & ~F_B);
r3535r3536
505529      }
506530   }
507531   else
508      m6502_set_irq_line(irqline,state);
532      m6502_set_irq_line(m6502, irqline,state);
509533}
510534#endif
511535
r3535r3536
513537 * 65SC02 section
514538 ****************************************************************************/
515539#if (HAS_M65SC02)
516static void m65sc02_init(int index, int clock, const void *config, int (*irqcallback)(int))
540static CPU_INIT( m65sc02 )
517541{
518   m6502_common_init(index, clock, config, irqcallback, SUBTYPE_65SC02, insn65sc02, "m65sc02");
542   m6502_common_init(device, index, clock, config, irqcallback, SUBTYPE_65SC02, insn65sc02, "m65sc02");
519543}
520544#endif
521545
r3535r3536
524548 ****************************************************************************/
525549#if (HAS_DECO16)
526550
527static void deco16_init(int index, int clock, const void *config, int (*irqcallback)(int))
551static CPU_INIT( deco16 )
528552{
529   m6502_common_init(index, clock, config, irqcallback, SUBTYPE_DECO16, insndeco16, "deco16");
553   m6502_common_init(device, index, clock, config, irqcallback, SUBTYPE_DECO16, insndeco16, "deco16");
530554}
531555
532556
533static void deco16_reset (void)
557static CPU_RESET( deco16 )
534558{
535   m6502_reset();
536   m6502.subtype = SUBTYPE_DECO16;
537   m6502.insn = insndeco16;
559   m6502_Regs *m6502 = device->token;
538560
561   CPU_RESET_CALL(m6502);
562   m6502->subtype = SUBTYPE_DECO16;
563   m6502->insn = insndeco16;
564
539565    PCL = RDMEM(DECO16_RST_VEC+1);
540566    PCH = RDMEM(DECO16_RST_VEC);
541567
542   m6502.sp.d = 0x01ff;   /* stack pointer starts at page 1 offset FF */
543   m6502.p = F_T|F_I|F_Z|F_B|(P&F_D);   /* set T, I and Z flags */
544   m6502.pending_irq = 0;   /* nonzero if an IRQ is pending */
545   m6502.after_cli = 0;   /* pending IRQ and last insn cleared I */
568   m6502->sp.d = 0x01ff;   /* stack pointer starts at page 1 offset FF */
569   m6502->p = F_T|F_I|F_Z|F_B|(P&F_D);   /* set T, I and Z flags */
570   m6502->pending_irq = 0;   /* nonzero if an IRQ is pending */
571   m6502->after_cli = 0;   /* pending IRQ and last insn cleared I */
546572
547573   change_pc(PCD);
548574}
549575
550INLINE void deco16_take_irq(void)
576INLINE void deco16_take_irq(m6502_Regs *m6502)
551577{
552578   if( !(P & F_I) )
553579   {
554580      EAD = DECO16_IRQ_VEC;
555      m6502_ICount -= 2;
581      m6502->icount -= 2;
556582      PUSH(PCH);
557583      PUSH(PCL);
558584      PUSH(P & ~F_B);
r3535r3536
561587      PCH = RDMEM(EAD);
562588      LOG(("M6502#%d takes IRQ ($%04x)\n", cpu_getactivecpu(), PCD));
563589      /* call back the cpuintrf to let it clear the line */
564      if (m6502.irq_callback) (*m6502.irq_callback)(0);
590      if (m6502->irq_callback) (*m6502->irq_callback)(m6502->device, 0);
565591      change_pc(PCD);
566592   }
567   m6502.pending_irq = 0;
593   m6502->pending_irq = 0;
568594}
569595
570static void deco16_set_irq_line(int irqline, int state)
596static void deco16_set_irq_line(m6502_Regs *m6502, int irqline, int state)
571597{
572598   if (irqline == INPUT_LINE_NMI)
573599   {
574      if (m6502.nmi_state == state) return;
575      m6502.nmi_state = state;
600      if (m6502->nmi_state == state) return;
601      m6502->nmi_state = state;
576602      if( state != CLEAR_LINE )
577603      {
578604         LOG(( "M6502#%d set_nmi_line(ASSERT)\n", cpu_getactivecpu()));
579605         EAD = DECO16_NMI_VEC;
580         m6502_ICount -= 7;
606         m6502->icount -= 7;
581607         PUSH(PCH);
582608         PUSH(PCL);
583609         PUSH(P & ~F_B);
r3535r3536
592618   {
593619      if( irqline == M6502_SET_OVERFLOW )
594620      {
595         if( m6502.so_state && !state )
621         if( m6502->so_state && !state )
596622         {
597623            LOG(( "M6502#%d set overflow\n", cpu_getactivecpu()));
598624            P|=F_V;
599625         }
600         m6502.so_state=state;
626         m6502->so_state=state;
601627         return;
602628      }
603      m6502.irq_state = state;
629      m6502->irq_state = state;
604630      if( state != CLEAR_LINE )
605631      {
606632         LOG(( "M6502#%d set_irq_line(ASSERT)\n", cpu_getactivecpu()));
607         m6502.pending_irq = 1;
633         m6502->pending_irq = 1;
608634      }
609635   }
610636}
611637
612static int deco16_execute(int cycles)
638static CPU_EXECUTE( deco16 )
613639{
614   m6502_ICount = cycles;
640   m6502_Regs *m6502 = device->token;
615641
642   m6502->icount = cycles;
643
616644   change_pc(PCD);
617645
618646   do
r3535r3536
623651      debugger_instruction_hook(Machine, PCD);
624652
625653      op = RDOP();
626      (*m6502.insn[op])();
654      (*m6502->insn[op])(m6502);
627655
628656      /* if an irq is pending, take it now */
629      if( m6502.pending_irq )
630         deco16_take_irq();
657      if( m6502->pending_irq )
658         deco16_take_irq(m6502);
631659
632660
633661      /* check if the I flag was just reset (interrupts enabled) */
634      if( m6502.after_cli )
662      if( m6502->after_cli )
635663      {
636664         LOG(("M6502#%d after_cli was >0", cpu_getactivecpu()));
637         m6502.after_cli = 0;
638         if (m6502.irq_state != CLEAR_LINE)
665         m6502->after_cli = 0;
666         if (m6502->irq_state != CLEAR_LINE)
639667         {
640668            LOG((": irq line is asserted: set pending IRQ\n"));
641            m6502.pending_irq = 1;
669            m6502->pending_irq = 1;
642670         }
643671         else
644672         {
r3535r3536
646674         }
647675      }
648676      else
649      if( m6502.pending_irq )
650         deco16_take_irq();
677      if( m6502->pending_irq )
678         deco16_take_irq(m6502);
651679
652   } while (m6502_ICount > 0);
680   } while (m6502->icount > 0);
653681
654   return cycles - m6502_ICount;
682   return cycles - m6502->icount;
655683}
656684
657685#endif
r3535r3536
662690 * Generic set_info
663691 **************************************************************************/
664692
665static void m6502_set_info(UINT32 state, cpuinfo *info)
693static CPU_SET_INFO( m6502 )
666694{
695   m6502_Regs *m6502 = token;
696
667697   switch (state)
668698   {
669699      /* --- the following bits of info are set as 64-bit signed integers --- */
670      case CPUINFO_INT_INPUT_STATE + M6502_IRQ_LINE:      m6502_set_irq_line(M6502_IRQ_LINE, info->i); break;
671      case CPUINFO_INT_INPUT_STATE + M6502_SET_OVERFLOW:   m6502_set_irq_line(M6502_SET_OVERFLOW, info->i); break;
672      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:      m6502_set_irq_line(INPUT_LINE_NMI, info->i); break;
700      case CPUINFO_INT_INPUT_STATE + M6502_IRQ_LINE:      m6502_set_irq_line(m6502, M6502_IRQ_LINE, info->i); break;
701      case CPUINFO_INT_INPUT_STATE + M6502_SET_OVERFLOW:   m6502_set_irq_line(m6502, M6502_SET_OVERFLOW, info->i); break;
702      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:      m6502_set_irq_line(m6502, INPUT_LINE_NMI, info->i); break;
673703
674704      case CPUINFO_INT_PC:                     PCW = info->i; change_pc(PCD);         break;
675      case CPUINFO_INT_REGISTER + M6502_PC:         m6502.pc.w.l = info->i;               break;
705      case CPUINFO_INT_REGISTER + M6502_PC:         m6502->pc.w.l = info->i;               break;
676706      case CPUINFO_INT_SP:                     S = info->i;                     break;
677      case CPUINFO_INT_REGISTER + M6502_S:         m6502.sp.b.l = info->i;               break;
678      case CPUINFO_INT_REGISTER + M6502_P:         m6502.p = info->i;                  break;
679      case CPUINFO_INT_REGISTER + M6502_A:         m6502.a = info->i;                  break;
680      case CPUINFO_INT_REGISTER + M6502_X:         m6502.x = info->i;                  break;
681      case CPUINFO_INT_REGISTER + M6502_Y:         m6502.y = info->i;                  break;
682      case CPUINFO_INT_REGISTER + M6502_EA:         m6502.ea.w.l = info->i;               break;
683      case CPUINFO_INT_REGISTER + M6502_ZP:         m6502.zp.w.l = info->i;               break;
707      case CPUINFO_INT_REGISTER + M6502_S:         m6502->sp.b.l = info->i;               break;
708      case CPUINFO_INT_REGISTER + M6502_P:         m6502->p = info->i;                  break;
709      case CPUINFO_INT_REGISTER + M6502_A:         m6502->a = info->i;                  break;
710      case CPUINFO_INT_REGISTER + M6502_X:         m6502->x = info->i;                  break;
711      case CPUINFO_INT_REGISTER + M6502_Y:         m6502->y = info->i;                  break;
712      case CPUINFO_INT_REGISTER + M6502_EA:         m6502->ea.w.l = info->i;               break;
713      case CPUINFO_INT_REGISTER + M6502_ZP:         m6502->zp.w.l = info->i;               break;
684714
685715      /* --- the following bits of info are set as pointers to data or functions --- */
686      case CPUINFO_PTR_M6502_READINDEXED_CALLBACK:   m6502.rdmem_id = (read8_machine_func) info->f; break;
687      case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK:   m6502.wrmem_id = (write8_machine_func) info->f; break;
716      case CPUINFO_PTR_M6502_READINDEXED_CALLBACK:   m6502->rdmem_id = (read8_machine_func) info->f; break;
717      case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK:   m6502->wrmem_id = (write8_machine_func) info->f; break;
688718   }
689719}
690720
r3535r3536
694724 * Generic get_info
695725 **************************************************************************/
696726
697void m6502_get_info(UINT32 state, cpuinfo *info)
727CPU_GET_INFO( m6502 )
698728{
729   m6502_Regs *m6502 = token;
730
699731   switch (state)
700732   {
701733      /* --- the following bits of info are returned as 64-bit signed integers --- */
702      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(m6502);            break;
734      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(m6502_Regs);            break;
703735      case CPUINFO_INT_INPUT_LINES:               info->i = 2;                     break;
704736      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:         info->i = 0;                     break;
705737      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
r3535r3536
720752      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 0;               break;
721753      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = 0;               break;
722754
723      case CPUINFO_INT_INPUT_STATE + M6502_IRQ_LINE:      info->i = m6502.irq_state;         break;
724      case CPUINFO_INT_INPUT_STATE + M6502_SET_OVERFLOW:   info->i = m6502.so_state;         break;
725      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:      info->i = m6502.nmi_state;         break;
755      case CPUINFO_INT_INPUT_STATE + M6502_IRQ_LINE:      info->i = m6502->irq_state;         break;
756      case CPUINFO_INT_INPUT_STATE + M6502_SET_OVERFLOW:   info->i = m6502->so_state;         break;
757      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:      info->i = m6502->nmi_state;         break;
726758
727      case CPUINFO_INT_PREVIOUSPC:               info->i = m6502.ppc.w.l;            break;
759      case CPUINFO_INT_PREVIOUSPC:               info->i = m6502->ppc.w.l;            break;
728760
729761      case CPUINFO_INT_PC:                     info->i = PCD;                     break;
730      case CPUINFO_INT_REGISTER + M6502_PC:         info->i = m6502.pc.w.l;               break;
762      case CPUINFO_INT_REGISTER + M6502_PC:         info->i = m6502->pc.w.l;               break;
731763      case CPUINFO_INT_SP:                     info->i = S;                     break;
732      case CPUINFO_INT_REGISTER + M6502_S:         info->i = m6502.sp.b.l;               break;
733      case CPUINFO_INT_REGISTER + M6502_P:         info->i = m6502.p;                  break;
734      case CPUINFO_INT_REGISTER + M6502_A:         info->i = m6502.a;                  break;
735      case CPUINFO_INT_REGISTER + M6502_X:         info->i = m6502.x;                  break;
736      case CPUINFO_INT_REGISTER + M6502_Y:         info->i = m6502.y;                  break;
737      case CPUINFO_INT_REGISTER + M6502_EA:         info->i = m6502.ea.w.l;               break;
738      case CPUINFO_INT_REGISTER + M6502_ZP:         info->i = m6502.zp.w.l;               break;
739      case CPUINFO_INT_REGISTER + M6502_SUBTYPE:      info->i = m6502.subtype;            break;
764      case CPUINFO_INT_REGISTER + M6502_S:         info->i = m6502->sp.b.l;               break;
765      case CPUINFO_INT_REGISTER + M6502_P:         info->i = m6502->p;                  break;
766      case CPUINFO_INT_REGISTER + M6502_A:         info->i = m6502->a;                  break;
767      case CPUINFO_INT_REGISTER + M6502_X:         info->i = m6502->x;                  break;
768      case CPUINFO_INT_REGISTER + M6502_Y:         info->i = m6502->y;                  break;
769      case CPUINFO_INT_REGISTER + M6502_EA:         info->i = m6502->ea.w.l;               break;
770      case CPUINFO_INT_REGISTER + M6502_ZP:         info->i = m6502->zp.w.l;               break;
771      case CPUINFO_INT_REGISTER + M6502_SUBTYPE:      info->i = m6502->subtype;            break;
740772
741773      /* --- the following bits of info are returned as pointers to data or functions --- */
742      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m6502_set_info;         break;
743      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = m6502_get_context;   break;
744      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = m6502_set_context;   break;
745      case CPUINFO_PTR_INIT:                     info->init = m6502_init;            break;
746      case CPUINFO_PTR_RESET:                     info->reset = m6502_reset;            break;
747      case CPUINFO_PTR_EXIT:                     info->exit = m6502_exit;            break;
748      case CPUINFO_PTR_EXECUTE:                  info->execute = m6502_execute;         break;
774      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m6502);         break;
775      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(m6502);   break;
776      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(m6502);   break;
777      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m6502);            break;
778      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m6502);            break;
779      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(m6502);            break;
780      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m6502);         break;
749781      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
750      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m6502_dasm;         break;
751      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m6502_ICount;         break;
752      case CPUINFO_PTR_M6502_READINDEXED_CALLBACK:   info->f = (genf *) m6502.rdmem_id;      break;
753      case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK:   info->f = (genf *) m6502.wrmem_id;      break;
782      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m6502);         break;
783      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m6502->icount;         break;
784      case CPUINFO_PTR_M6502_READINDEXED_CALLBACK:   info->f = (genf *) m6502->rdmem_id;      break;
785      case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK:   info->f = (genf *) m6502->wrmem_id;      break;
754786
755787      /* --- the following bits of info are returned as NULL-terminated strings --- */
756788      case CPUINFO_STR_NAME:                     strcpy(info->s, "M6502");            break;
r3535r3536
761793
762794      case CPUINFO_STR_FLAGS:
763795         sprintf(info->s, "%c%c%c%c%c%c%c%c",
764            m6502.p & 0x80 ? 'N':'.',
765            m6502.p & 0x40 ? 'V':'.',
766            m6502.p & 0x20 ? 'R':'.',
767            m6502.p & 0x10 ? 'B':'.',
768            m6502.p & 0x08 ? 'D':'.',
769            m6502.p & 0x04 ? 'I':'.',
770            m6502.p & 0x02 ? 'Z':'.',
771            m6502.p & 0x01 ? 'C':'.');
796            m6502->p & 0x80 ? 'N':'.',
797            m6502->p & 0x40 ? 'V':'.',
798            m6502->p & 0x20 ? 'R':'.',
799            m6502->p & 0x10 ? 'B':'.',
800            m6502->p & 0x08 ? 'D':'.',
801            m6502->p & 0x04 ? 'I':'.',
802            m6502->p & 0x02 ? 'Z':'.',
803            m6502->p & 0x01 ? 'C':'.');
772804         break;
773805
774      case CPUINFO_STR_REGISTER + M6502_PC:         sprintf(info->s, "PC:%04X", m6502.pc.w.l); break;
775      case CPUINFO_STR_REGISTER + M6502_S:         sprintf(info->s, "S:%02X", m6502.sp.b.l); break;
776      case CPUINFO_STR_REGISTER + M6502_P:         sprintf(info->s, "P:%02X", m6502.p); break;
777      case CPUINFO_STR_REGISTER + M6502_A:         sprintf(info->s, "A:%02X", m6502.a); break;
778      case CPUINFO_STR_REGISTER + M6502_X:         sprintf(info->s, "X:%02X", m6502.x); break;
779      case CPUINFO_STR_REGISTER + M6502_Y:         sprintf(info->s, "Y:%02X", m6502.y); break;
780      case CPUINFO_STR_REGISTER + M6502_EA:         sprintf(info->s, "EA:%04X", m6502.ea.w.l); break;
781      case CPUINFO_STR_REGISTER + M6502_ZP:         sprintf(info->s, "ZP:%03X", m6502.zp.w.l); break;
806      case CPUINFO_STR_REGISTER + M6502_PC:         sprintf(info->s, "PC:%04X", m6502->pc.w.l); break;
807      case CPUINFO_STR_REGISTER + M6502_S:         sprintf(info->s, "S:%02X", m6502->sp.b.l); break;
808      case CPUINFO_STR_REGISTER + M6502_P:         sprintf(info->s, "P:%02X", m6502->p); break;
809      case CPUINFO_STR_REGISTER + M6502_A:         sprintf(info->s, "A:%02X", m6502->a); break;
810      case CPUINFO_STR_REGISTER + M6502_X:         sprintf(info->s, "X:%02X", m6502->x); break;
811      case CPUINFO_STR_REGISTER + M6502_Y:         sprintf(info->s, "Y:%02X", m6502->y); break;
812      case CPUINFO_STR_REGISTER + M6502_EA:         sprintf(info->s, "EA:%04X", m6502->ea.w.l); break;
813      case CPUINFO_STR_REGISTER + M6502_ZP:         sprintf(info->s, "ZP:%03X", m6502->zp.w.l); break;
782814   }
783815}
784816
r3535r3536
788820 * CPU-specific set_info
789821 **************************************************************************/
790822
791void n2a03_get_info(UINT32 state, cpuinfo *info)
823CPU_GET_INFO( n2a03 )
792824{
793825   switch (state)
794826   {
795827      /* --- the following bits of info are returned as pointers to data or functions --- */
796      case CPUINFO_PTR_INIT:                     info->init = n2a03_init;            break;
828      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(n2a03);            break;
797829
798830      /* --- the following bits of info are returned as NULL-terminated strings --- */
799831      case CPUINFO_STR_NAME:                     strcpy(info->s, "N2A03");            break;
800832
801      default:                              m6502_get_info(state, info);         break;
833      default:                              CPU_GET_INFO_CALL(m6502);         break;
802834   }
803835}
804836#endif
r3535r3536
809841 * CPU-specific set_info
810842 **************************************************************************/
811843
812static void m6510_set_info(UINT32 state, cpuinfo *info)
844static CPU_SET_INFO( m6510 )
813845{
846   m6502_Regs *m6502 = token;
847
814848   switch (state)
815849   {
816850      /* --- the following bits of info are set as pointers to data or functions --- */
817      case CPUINFO_PTR_M6510_PORTREAD:   m6502.port_read = (UINT8 (*)(UINT8)) info->f;   break;
818      case CPUINFO_PTR_M6510_PORTWRITE:   m6502.port_write = (void (*)(UINT8,UINT8)) info->f;   break;
851      case CPUINFO_PTR_M6510_PORTREAD:   m6502->port_read = (UINT8 (*)(UINT8)) info->f;   break;
852      case CPUINFO_PTR_M6510_PORTWRITE:   m6502->port_write = (void (*)(UINT8,UINT8)) info->f;   break;
819853
820      default:                     m6502_set_info(state, info);                  break;
854      default:                     CPU_SET_INFO_CALL(m6502);         break;
821855   }
822856}
823857
824void m6510_get_info(UINT32 state, cpuinfo *info)
858CPU_GET_INFO( m6510 )
825859{
860   m6502_Regs *m6502 = token;
861
826862   switch (state)
827863   {
828864      /* --- the following bits of info are returned as pointers to data or functions --- */
829      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m6510_set_info;         break;
830      case CPUINFO_PTR_INIT:                     info->init = m6510_init;            break;
831      case CPUINFO_PTR_RESET:                     info->reset = m6510_reset;            break;
832      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m6510_dasm;         break;
833      case CPUINFO_PTR_INTERNAL_MEMORY_MAP:         info->internal_map8 = address_map_m6510_mem; break;
834      case CPUINFO_PTR_M6510_PORTREAD:            info->f = (genf *) m6502.port_read;      break;
835      case CPUINFO_PTR_M6510_PORTWRITE:            info->f = (genf *) m6502.port_write;   break;
865      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m6510);         break;
866      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m6510);            break;
867      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m6510);            break;
868      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m6510);         break;
869      case CPUINFO_PTR_INTERNAL_MEMORY_MAP:         info->internal_map8 = ADDRESS_MAP_NAME(m6510_mem); break;
870      case CPUINFO_PTR_M6510_PORTREAD:            info->f = (genf *) m6502->port_read;      break;
871      case CPUINFO_PTR_M6510_PORTWRITE:            info->f = (genf *) m6502->port_write;   break;
836872
837873      /* --- the following bits of info are returned as NULL-terminated strings --- */
838874      case CPUINFO_STR_NAME:                     strcpy(info->s, "M6510");            break;
839875
840876      /* --- the following bits of info are set as 64-bit signed integers --- */
841      case CPUINFO_INT_M6510_PORT:               info->i = m6510_get_port();            break;
877      case CPUINFO_INT_M6510_PORT:               info->i = m6510_get_port(m6502);            break;
842878
843      default:                              m6502_get_info(state, info);         break;
879      default:                              CPU_GET_INFO_CALL(m6502);         break;
844880   }
845881}
846882#endif
r3535r3536
851887 * CPU-specific set_info
852888 **************************************************************************/
853889
854void m6510t_get_info(UINT32 state, cpuinfo *info)
890CPU_GET_INFO( m6510t )
855891{
856892   switch (state)
857893   {
858894      /* --- the following bits of info are returned as NULL-terminated strings --- */
859895      case CPUINFO_STR_NAME:                     strcpy(info->s, "M6510T");            break;
860896
861      default:                              m6510_get_info(state, info);         break;
897      default:                              CPU_GET_INFO_CALL(m6510);         break;
862898   }
863899}
864900#endif
r3535r3536
869905 * CPU-specific set_info
870906 **************************************************************************/
871907
872void m7501_get_info(UINT32 state, cpuinfo *info)
908CPU_GET_INFO( m7501 )
873909{
874910   switch (state)
875911   {
876912      /* --- the following bits of info are returned as NULL-terminated strings --- */
877913      case CPUINFO_STR_NAME:                     strcpy(info->s, "M7501");            break;
878914
879      default:                              m6510_get_info(state, info);         break;
915      default:                              CPU_GET_INFO_CALL(m6510);         break;
880916   }
881917}
882918#endif
r3535r3536
887923 * CPU-specific set_info
888924 **************************************************************************/
889925
890void m8502_get_info(UINT32 state, cpuinfo *info)
926CPU_GET_INFO( m8502 )
891927{
892928   switch (state)
893929   {
894930      /* --- the following bits of info are returned as NULL-terminated strings --- */
895931      case CPUINFO_STR_NAME:                     strcpy(info->s, "M8502");            break;
896932
897      default:                              m6510_get_info(state, info);         break;
933      default:                              CPU_GET_INFO_CALL(m6510);         break;
898934   }
899935}
900936#endif
r3535r3536
905941 * CPU-specific set_info
906942 **************************************************************************/
907943
908static void m65c02_set_info(UINT32 state, cpuinfo *info)
944static CPU_SET_INFO( m65c02 )
909945{
946   m6502_Regs *m6502 = token;
947
910948   switch (state)
911949   {
912950      /* --- the following bits of info are set as 64-bit signed integers --- */
913      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   m65c02_set_irq_line(INPUT_LINE_NMI, info->i); break;
951      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   m65c02_set_irq_line(m6502, INPUT_LINE_NMI, info->i); break;
914952
915      default:                              m6502_set_info(state, info);         break;
953      default:                              CPU_SET_INFO_CALL(m6502);         break;
916954   }
917955}
918956
919void m65c02_get_info(UINT32 state, cpuinfo *info)
957CPU_GET_INFO( m65c02 )
920958{
921959   switch (state)
922960   {
923961      /* --- the following bits of info are returned as pointers to data or functions --- */
924      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m65c02_set_info;      break;
925      case CPUINFO_PTR_INIT:                     info->init = m65c02_init;            break;
926      case CPUINFO_PTR_RESET:                     info->reset = m65c02_reset;            break;
927      case CPUINFO_PTR_EXECUTE:                  info->execute = m65c02_execute;         break;
928      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m65c02_dasm;      break;
962      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m65c02);      break;
963      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m65c02);            break;
964      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m65c02);            break;
965      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m65c02);         break;
966      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m65c02);      break;
929967
930968      /* --- the following bits of info are returned as NULL-terminated strings --- */
931969      case CPUINFO_STR_NAME:                     strcpy(info->s, "M65C02");            break;
932970
933      default:                              m6502_get_info(state, info);         break;
971      default:                              CPU_GET_INFO_CALL(m6502);         break;
934972   }
935973}
936974#endif
r3535r3536
941979 * CPU-specific set_info
942980 **************************************************************************/
943981
944void m65sc02_get_info(UINT32 state, cpuinfo *info)
982CPU_GET_INFO( m65sc02 )
945983{
946984   switch (state)
947985   {
948986      /* --- the following bits of info are returned as pointers to data or functions --- */
949      case CPUINFO_PTR_INIT:                     info->init = m65sc02_init;            break;
950      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m65sc02_dasm;      break;
987      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m65sc02);            break;
988      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m65sc02);      break;
951989
952990      /* --- the following bits of info are returned as NULL-terminated strings --- */
953991      case CPUINFO_STR_NAME:                     strcpy(info->s, "M65SC02");            break;
r3535r3536
956994      case CPUINFO_STR_CORE_FILE:                  strcpy(info->s, __FILE__);            break;
957995      case CPUINFO_STR_CORE_CREDITS:               strcpy(info->s, "Copyright Juergen Buchmueller\nCopyright Peter Trauner\nall rights reserved."); break;
958996
959      default:                              m65c02_get_info(state, info);         break;
997      default:                              CPU_GET_INFO_CALL(m65c02);         break;
960998   }
961999}
9621000#endif
r3535r3536
9671005 * CPU-specific set_info
9681006 **************************************************************************/
9691007
970static void deco16_set_info(UINT32 state, cpuinfo *info)
1008static CPU_SET_INFO( deco16 )
9711009{
1010   m6502_Regs *m6502 = token;
1011
9721012   switch (state)
9731013   {
9741014      /* --- the following bits of info are set as 64-bit signed integers --- */
975      case CPUINFO_INT_INPUT_STATE + M6502_IRQ_LINE:      deco16_set_irq_line(M6502_IRQ_LINE, info->i); break;
976      case CPUINFO_INT_INPUT_STATE + M6502_SET_OVERFLOW:   deco16_set_irq_line(M6502_SET_OVERFLOW, info->i); break;
977      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:      deco16_set_irq_line(INPUT_LINE_NMI, info->i); break;
1015      case CPUINFO_INT_INPUT_STATE + M6502_IRQ_LINE:      deco16_set_irq_line(m6502, M6502_IRQ_LINE, info->i); break;
1016      case CPUINFO_INT_INPUT_STATE + M6502_SET_OVERFLOW:   deco16_set_irq_line(m6502, M6502_SET_OVERFLOW, info->i); break;
1017      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:      deco16_set_irq_line(m6502, INPUT_LINE_NMI, info->i); break;
9781018
979      default:                              m6502_set_info(state, info);         break;
1019      default:                                 CPU_SET_INFO_CALL(m6502);         break;
9801020   }
9811021}
9821022
983void deco16_get_info(UINT32 state, cpuinfo *info)
1023CPU_GET_INFO( deco16 )
9841024{
9851025   switch (state)
9861026   {
r3535r3536
9891029      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 8;               break;
9901030
9911031      /* --- the following bits of info are returned as pointers to data or functions --- */
992      case CPUINFO_PTR_SET_INFO:                  info->setinfo = deco16_set_info;      break;
993      case CPUINFO_PTR_INIT:                     info->init = deco16_init;            break;
994      case CPUINFO_PTR_RESET:                     info->reset = deco16_reset;            break;
995      case CPUINFO_PTR_EXECUTE:                  info->execute = deco16_execute;         break;
996      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = deco16_dasm;      break;
1032      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(deco16);      break;
1033      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(deco16);            break;
1034      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(deco16);            break;
1035      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(deco16);         break;
1036      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(deco16);      break;
9971037
9981038      /* --- the following bits of info are returned as NULL-terminated strings --- */
9991039      case CPUINFO_STR_NAME:                     strcpy(info->s, "DECO CPU16");         break;
r3535r3536
10021042      case CPUINFO_STR_CORE_FILE:                  strcpy(info->s, __FILE__);            break;
10031043      case CPUINFO_STR_CORE_CREDITS:               strcpy(info->s, "Copyright Juergen Buchmueller\nCopyright Bryan McPhail\nall rights reserved."); break;
10041044
1005      default:                              m6502_get_info(state, info);         break;
1045      default:                              CPU_GET_INFO_CALL(m6502);         break;
10061046   }
10071047}
10081048#endif
src/emu/cpu/m6502/m4510.h
r3535r3536
3939
4040#define M4510_IRQ_LINE               M6502_IRQ_LINE
4141
42void m4510_get_info(UINT32 state, cpuinfo *info);
42CPU_GET_INFO( m4510 );
4343
4444
45extern unsigned m4510_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
45extern CPU_DISASSEMBLE( m4510 );
4646
4747#endif /* __M4510_H__ */
src/emu/cpu/m6502/opsc02.h
r3535r3536
128128#define RD_ABX_C02_P   EA_ABX_C02_P; tmp = RDMEM(EAD)
129129#define RD_ABX_C02_NP   EA_ABX_C02_NP; tmp = RDMEM(EAD)
130130#define RD_ABY_C02_P   EA_ABY_C02_P; tmp = RDMEM(EAD)
131#define RD_IDY_C02_P   EA_IDY_C02_P; tmp = RDMEM_ID(EAD); m6502_ICount -= 1
131#define RD_IDY_C02_P   EA_IDY_C02_P; tmp = RDMEM_ID(EAD); m6502->icount -= 1
132132
133133#define WR_ABX_C02_NP   EA_ABX_C02_NP; WRMEM(EAD, tmp)
134134#define WR_ABY_C02_NP   EA_ABY_C02_NP; WRMEM(EAD, tmp)
135#define WR_IDY_C02_NP   EA_IDY_C02_NP; WRMEM_ID(EAD, tmp); m6502_ICount -= 1
135#define WR_IDY_C02_NP   EA_IDY_C02_NP; WRMEM_ID(EAD, tmp); m6502->icount -= 1
136136
137137
138138/* 65C02********************************************************
src/emu/cpu/m6502/m6502.h
r3535r3536
7272   CPUINFO_INT_M6510_PORT = CPUINFO_INT_CPU_SPECIFIC
7373};
7474
75extern void m6502_get_info(UINT32 state, cpuinfo *info);
75extern CPU_GET_INFO( m6502 );
7676
77extern unsigned m6502_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
77extern CPU_DISASSEMBLE( m6502 );
7878
7979/****************************************************************************
8080 * The 6510
r3535r3536
9393
9494#define M6510_IRQ_LINE               M6502_IRQ_LINE
9595
96extern void m6510_get_info(UINT32 state, cpuinfo *info);
96extern CPU_GET_INFO( m6510 );
9797
98extern unsigned m6510_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
98extern CPU_DISASSEMBLE( m6510 );
9999
100100#endif
101101
r3535r3536
113113
114114#define M6510T_IRQ_LINE               M6502_IRQ_LINE
115115
116extern void m6510t_get_info(UINT32 state, cpuinfo *info);
116extern CPU_GET_INFO( m6510t );
117117
118118#endif
119119
r3535r3536
131131
132132#define M7501_IRQ_LINE               M6502_IRQ_LINE
133133
134extern void m7501_get_info(UINT32 state, cpuinfo *info);
134extern CPU_GET_INFO( m7501 );
135135#endif
136136
137137#if (HAS_M8502)
r3535r3536
148148
149149#define M8502_IRQ_LINE               M6502_IRQ_LINE
150150
151extern void m8502_get_info(UINT32 state, cpuinfo *info);
151extern CPU_GET_INFO( m8502 );
152152#endif
153153
154154
r3535r3536
169169
170170#define N2A03_IRQ_LINE               M6502_IRQ_LINE
171171
172extern void n2a03_get_info(UINT32 state, cpuinfo *info);
172extern CPU_GET_INFO( n2a03 );
173173
174174#define N2A03_DEFAULTCLOCK (21477272.724 / 12)
175175
r3535r3536
198198
199199#define M65C02_IRQ_LINE               M6502_IRQ_LINE
200200
201extern void m65c02_get_info(UINT32 state, cpuinfo *info);
201extern CPU_GET_INFO( m65c02 );
202202
203extern unsigned m65c02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
203extern CPU_DISASSEMBLE( m65c02 );
204204
205205#endif
206206
r3535r3536
221221
222222#define M65SC02_IRQ_LINE            M6502_IRQ_LINE
223223
224extern void m65sc02_get_info(UINT32 state, cpuinfo *info);
224extern CPU_GET_INFO( m65sc02 );
225225
226extern unsigned m65sc02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
226extern CPU_DISASSEMBLE( m65sc02 );
227227#endif
228228
229229/****************************************************************************
r3535r3536
243243
244244#define DECO16_IRQ_LINE               M6502_IRQ_LINE
245245
246extern void deco16_get_info(UINT32 state, cpuinfo *info);
246extern CPU_GET_INFO( deco16 );
247247#endif
248248
249extern unsigned deco16_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
249extern CPU_DISASSEMBLE( deco16 );
250250
251251#endif /* __M6502_H__ */
src/emu/cpu/m6502/ops09.h
r3535r3536
2020 *
2121 *****************************************************************************/
2222
23#define m6502 m6509
24#define m6502_ICount m6509_ICount
23#define ZPWH   m6502->zp.w.h
2524
26#define ZPWH   m6509.zp.w.h
25#define EAWH   m6502->ea.w.h
2726
28#define EAWH   m6509.ea.w.h
27#define PBWH   m6502->pc_bank.w.h
28#define PB      m6502->pc_bank.d
2929
30#define PBWH   m6509.pc_bank.w.h
31#define PB      m6509.pc_bank.d
30#define IBWH   m6502->ind_bank.w.h
31#define IB      m6502->ind_bank.d
3232
33#define IBWH   m6509.ind_bank.w.h
34#define IB      m6509.ind_bank.d
35
3633#undef CHANGE_PC
3734#define CHANGE_PC change_pc(PCD|PB)
3835
r3535r3536
4037 *  RDOP    read an opcode
4138 ***************************************************************/
4239#undef RDOP
43#define RDOP() cpu_readop((PCW++)|PB); m6502_ICount -= 1
40#define RDOP() cpu_readop((PCW++)|PB); m6502->icount -= 1
4441
4542/***************************************************************
4643 *  RDOPARG read an opcode argument
4744 ***************************************************************/
4845#undef RDOPARG
49#define RDOPARG() cpu_readop_arg((PCW++)|PB); m6502_ICount -= 1
46#define RDOPARG() cpu_readop_arg((PCW++)|PB); m6502->icount -= 1
5047
5148/***************************************************************
5249 *  RDMEM   read memory
5350 ***************************************************************/
5451#undef RDMEM
55#define RDMEM(addr) program_read_byte_8le(addr); m6502_ICount -= 1
52#define RDMEM(addr) program_read_byte_8le(addr); m6502->icount -= 1
5653
5754/***************************************************************
5855 *  WRMEM   write memory
5956 ***************************************************************/
6057#undef WRMEM
61#define WRMEM(addr,data) program_write_byte_8le(addr,data); m6502_ICount -= 1
58#define WRMEM(addr,data) program_write_byte_8le(addr,data); m6502->icount -= 1
6259
6360/***************************************************************
6461 * push a register onto the stack
r3535r3536
134131   EAH = RDMEM(ZPD);                                 \
135132   EAWH = PBWH;                                    \
136133    if (EAL + Y > 0xff)                                         \
137      m6509_ICount--;                               \
134      m6502->icount--;                               \
138135   EAW += Y
139136
140137
r3535r3536
150147   EAH = RDMEM(ZPD);                                 \
151148   EAWH = IBWH;                                    \
152149    if (EAL + Y > 0xff)                                         \
153      m6509_ICount--;                               \
150      m6502->icount--;                               \
154151   EAW += Y
155152
156153/***************************************************************
r3535r3536
178175   {                                             \
179176      tmp = RDOPARG();                              \
180177      EAW = PCW + (signed char)tmp;                     \
181      m6509_ICount -= (PCH == EAH) ? 1 : 2;               \
178      m6502->icount -= (PCH == EAH) ? 1 : 2;               \
182179      PCD = EAD|PB;                                 \
183180      CHANGE_PC;                                    \
184181   }                                             \
185182   else                                          \
186183   {                                             \
187184      PCW++;                                       \
188      m6509_ICount -= 1;                              \
185      m6502->icount -= 1;                              \
189186   }
190187
191188/* 6502 ********************************************************
src/emu/cpu/m6502/ops4510.h
r3535r3536
3333   SPL = X;                     \
3434   if (PEEK_OP() == 0x2b /*TYS*/ ) {               \
3535      UINT8 op = RDOP();            \
36      (*m4510.insn[op])();         \
36      (*m4510->insn[op])(m4510);         \
3737   }
3838
3939#undef NOP
4040#define NOP       \
41  m4510.interrupt_inhibit = 0;
41  m4510->interrupt_inhibit = 0;
4242
4343/* c65 docu says transfer of axyz to the mapper register
4444   so no readback!? */
4545#define MAP                   \
46  m4510.interrupt_inhibit = 1;         \
47  m4510.low=m4510.a|(m4510.x<<8); \
48  m4510.high=m4510.y|(m4510.z<<8); \
49  m4510.mem[0]=(m4510.low&0x1000) ?  (m4510.low&0xfff)<<8:0;  \
50  m4510.mem[1]=(m4510.low&0x2000) ?  (m4510.low&0xfff)<<8:0;  \
51  m4510.mem[2]=(m4510.low&0x4000) ?  (m4510.low&0xfff)<<8:0;  \
52  m4510.mem[3]=(m4510.low&0x8000) ?  (m4510.low&0xfff)<<8:0;  \
53  m4510.mem[4]=(m4510.high&0x1000) ? (m4510.high&0xfff)<<8:0; \
54  m4510.mem[5]=(m4510.high&0x2000) ? (m4510.high&0xfff)<<8:0; \
55  m4510.mem[6]=(m4510.high&0x4000) ? (m4510.high&0xfff)<<8:0; \
56  m4510.mem[7]=(m4510.high&0x8000) ? (m4510.high&0xfff)<<8:0; \
46  m4510->interrupt_inhibit = 1;         \
47  m4510->low=m4510->a|(m4510->x<<8); \
48  m4510->high=m4510->y|(m4510->z<<8); \
49  m4510->mem[0]=(m4510->low&0x1000) ?  (m4510->low&0xfff)<<8:0;  \
50  m4510->mem[1]=(m4510->low&0x2000) ?  (m4510->low&0xfff)<<8:0;  \
51  m4510->mem[2]=(m4510->low&0x4000) ?  (m4510->low&0xfff)<<8:0;  \
52  m4510->mem[3]=(m4510->low&0x8000) ?  (m4510->low&0xfff)<<8:0;  \
53  m4510->mem[4]=(m4510->high&0x1000) ? (m4510->high&0xfff)<<8:0; \
54  m4510->mem[5]=(m4510->high&0x2000) ? (m4510->high&0xfff)<<8:0; \
55  m4510->mem[6]=(m4510->high&0x4000) ? (m4510->high&0xfff)<<8:0; \
56  m4510->mem[7]=(m4510->high&0x8000) ? (m4510->high&0xfff)<<8:0; \
5757  CHANGE_PC; \
58  m4510_ICount -= 3; \
58  m4510->icount -= 3; \
5959  { \
6060            UINT8 op = RDOP();                        \
61            (*m4510.insn[op])();                     \
61            (*m4510->insn[op])(m4510);                     \
6262  }
src/emu/cpu/m6502/m6509.c
r3535r3536
5656
5757#define LOG(x)   do { if (VERBOSE) logerror x; } while (0)
5858
59
60typedef struct {
59typedef struct _m6509_Regs m6509_Regs;
60struct _m6509_Regs {
6161   UINT8   subtype;      /* currently selected cpu sub type */
62   void   (*const *insn)(void); /* pointer to the function pointer table */
62   void   (*const *insn)(m6509_Regs *); /* pointer to the function pointer table */
6363   PAIR   ppc;         /* previous program counter */
6464   /* pc.w.h contains the current page pc_bank.w.h for better speed */
6565   PAIR   pc;          /* program counter */
r3535r3536
7777   UINT8   nmi_state;
7878   UINT8   irq_state;
7979   UINT8   so_state;
80   int    (*irq_callback)(int irqline);   /* IRQ callback */
80   cpu_irq_callback irq_callback;
81   const device_config *device;
82
83   int    icount;
84
8185   read8_machine_func rdmem_id;               /* readmem callback for indexed instructions */
8286   write8_machine_func wrmem_id;            /* readmem callback for indexed instructions */
83}   m6509_Regs;
87};
8488
85static int m6502_ICount = 0;
89static void *token;
8690
87static m6509_Regs m6509;
88
8991/***************************************************************
9092 * include the opcode macros, functions and tables
9193 ***************************************************************/
r3535r3536
9496
9597static READ8_HANDLER( m6509_read_00000 )
9698{
97   return m6509.pc_bank.b.h2;
99   m6509_Regs *m6509 = token;
100
101   return m6509->pc_bank.b.h2;
98102}
99103
100104static READ8_HANDLER( m6509_read_00001 )
101105{
102   return m6509.ind_bank.b.h2;
106   m6509_Regs *m6509 = token;
107
108   return m6509->ind_bank.b.h2;
103109}
104110
105111static WRITE8_HANDLER( m6509_write_00000 )
106112{
107   m6509.pc_bank.b.h2=data&0xf;
108   m6509.pc.w.h=m6509.pc_bank.w.h;
113   m6509_Regs *m6509 = token;
114   m6509_Regs *m6502 = m6509;
115
116   m6509->pc_bank.b.h2=data&0xf;
117   m6509->pc.w.h=m6509->pc_bank.w.h;
109118   change_pc(PCD);
119
110120}
111121
112122static WRITE8_HANDLER( m6509_write_00001 )
113123{
114   m6509.ind_bank.b.h2=data&0xf;
124   m6509_Regs *m6509 = token;
125
126   m6509->ind_bank.b.h2=data&0xf;
115127}
116128
117129static ADDRESS_MAP_START(m6509_mem, ADDRESS_SPACE_PROGRAM, 8)
r3535r3536
122134static READ8_HANDLER( default_rdmem_id ) { return program_read_byte_8le(offset); }
123135static WRITE8_HANDLER( default_wdmem_id ) { program_write_byte_8le(offset, data); }
124136
125static void m6509_init(int index, int clock, const void *config, int (*irqcallback)(int))
137static CPU_INIT( m6509 )
126138{
127   m6509.rdmem_id = default_rdmem_id;
128   m6509.wrmem_id = default_wdmem_id;
129   m6509.irq_callback = irqcallback;
139   m6509_Regs *m6509 = device->token;
140
141   token = device->token;   // temporary
142
143   m6509->rdmem_id = default_rdmem_id;
144   m6509->wrmem_id = default_wdmem_id;
145   m6509->irq_callback = irqcallback;
146   m6509->device = device;
130147}
131148
132static void m6509_reset (void)
149static CPU_RESET( m6509 )
133150{
134   m6509.insn = insn6509;
151   m6509_Regs *m6509 = device->token;
152   m6509_Regs *m6502 = m6509;
135153
136   m6509.pc_bank.d=m6509.ind_bank.d=0;
137   m6509.pc_bank.b.h2=m6509.ind_bank.b.h2=0xf; /* cbm500 needs this */
138   m6509.pc.w.h=m6509.pc_bank.w.h;
154   m6509->insn = insn6509;
155
156   m6509->pc_bank.d=m6509->ind_bank.d=0;
157   m6509->pc_bank.b.h2=m6509->ind_bank.b.h2=0xf; /* cbm500 needs this */
158   m6509->pc.w.h=m6509->pc_bank.w.h;
139159   /* wipe out the rest of the m6509 structure */
140160   /* read the reset vector into PC */
141161   PCL = RDMEM(M6509_RST_VEC|PB);
142162   PCH = RDMEM((M6509_RST_VEC+1)|PB);
143163
144   m6509.sp.d = 0x01ff;
145   m6509.p = F_T|F_B|F_I|F_Z|(P&F_D);   /* set T, I and Z flags */
146   m6509.pending_irq = 0;   /* nonzero if an IRQ is pending */
147   m6509.after_cli = 0;   /* pending IRQ and last insn cleared I */
148   m6509.irq_callback = NULL;
164   m6509->sp.d = 0x01ff;
165   m6509->p = F_T|F_B|F_I|F_Z|(P&F_D);   /* set T, I and Z flags */
166   m6509->pending_irq = 0;   /* nonzero if an IRQ is pending */
167   m6509->after_cli = 0;   /* pending IRQ and last insn cleared I */
168   m6509->irq_callback = NULL;
149169
150170   change_pc(PCD);
151171}
152172
153static void m6509_exit(void)
173static CPU_EXIT( m6509 )
154174{
155175   /* nothing to do yet */
156176}
157177
158static void m6509_get_context (void *dst)
178static CPU_GET_CONTEXT( m6509 )
159179{
160   if( dst )
161      *(m6509_Regs*)dst = m6509;
162180}
163181
164static void m6509_set_context (void *src)
182static CPU_SET_CONTEXT( m6509 )
165183{
184   m6509_Regs *m6502;
185
166186   if( src )
167187   {
168      m6509 = *(m6509_Regs*)src;
188      token = src;
189      m6502 = token;
169190      change_pc(PCD);
170191   }
171192}
172193
173194
174195
175INLINE void m6509_take_irq(void)
196INLINE void m6509_take_irq(   m6509_Regs *m6502)
176197{
198
177199   if( !(P & F_I) )
178200   {
179201      EAD = M6509_IRQ_VEC;
180202      EAWH = PBWH;
181      m6502_ICount -= 2;
203      m6502->icount -= 2;
182204      PUSH(PCH);
183205      PUSH(PCL);
184206      PUSH(P & ~F_B);
r3535r3536
187209      PCH = RDMEM(EAD+1);
188210      LOG(("M6509#%d takes IRQ ($%04x)\n", cpu_getactivecpu(), PCD));
189211      /* call back the cpuintrf to let it clear the line */
190      if (m6509.irq_callback) (*m6509.irq_callback)(0);
212      if (m6502->irq_callback) (*m6502->irq_callback)(m6502->device, 0);
191213      change_pc(PCD);
192214   }
193   m6509.pending_irq = 0;
215   m6502->pending_irq = 0;
194216}
195217
196static int m6509_execute(int cycles)
218static CPU_EXECUTE( m6509 )
197219{
198   m6502_ICount = cycles;
220   m6509_Regs *m6502 = device->token;
221   m6509_Regs *m6509 = m6502;
199222
223   m6502->icount = cycles;
224
200225   change_pc(PCD);
201226
202227   do
r3535r3536
207232      debugger_instruction_hook(Machine, PCD);
208233
209234      /* if an irq is pending, take it now */
210      if( m6509.pending_irq )
211         m6509_take_irq();
235      if( m6509->pending_irq )
236         m6509_take_irq(m6509);
212237
213238      op = RDOP();
214      (*m6509.insn[op])();
239      (*m6509->insn[op])(m6509);
215240
216241      /* check if the I flag was just reset (interrupts enabled) */
217      if( m6509.after_cli )
242      if( m6509->after_cli )
218243      {
219244         LOG(("M6509#%d after_cli was >0", cpu_getactivecpu()));
220         m6509.after_cli = 0;
221         if (m6509.irq_state != CLEAR_LINE)
245         m6509->after_cli = 0;
246         if (m6509->irq_state != CLEAR_LINE)
222247         {
223248            LOG((": irq line is asserted: set pending IRQ\n"));
224            m6509.pending_irq = 1;
249            m6509->pending_irq = 1;
225250         }
226251         else
227252         {
r3535r3536
229254         }
230255      }
231256      else
232      if( m6509.pending_irq )
233         m6509_take_irq();
257      if( m6509->pending_irq )
258         m6509_take_irq(m6502);
234259
235   } while (m6502_ICount > 0);
260   } while (m6502->icount > 0);
236261
237   return cycles - m6502_ICount;
262   return cycles - m6502->icount;
238263}
239264
240static void m6509_set_irq_line(int irqline, int state)
265static void m6509_set_irq_line(m6509_Regs *m6509, int irqline, int state)
241266{
267   m6509_Regs *m6502 = m6509;
268
242269   if (irqline == INPUT_LINE_NMI)
243270   {
244      if (m6509.nmi_state == state) return;
245      m6509.nmi_state = state;
271      if (m6509->nmi_state == state) return;
272      m6509->nmi_state = state;
246273      if( state != CLEAR_LINE )
247274      {
248275         LOG(( "M6509#%d set_nmi_line(ASSERT)\n", cpu_getactivecpu()));
249276         EAD = M6509_NMI_VEC;
250277         EAWH = PBWH;
251         m6502_ICount -= 2;
278         m6502->icount -= 2;
252279         PUSH(PCH);
253280         PUSH(PCL);
254281         PUSH(P & ~F_B);
r3535r3536
263290   {
264291      if( irqline == M6509_SET_OVERFLOW )
265292      {
266         if( m6509.so_state && !state )
293         if( m6509->so_state && !state )
267294         {
268295            LOG(( "M6509#%d set overflow\n", cpu_getactivecpu()));
269296            P|=F_V;
270297         }
271         m6509.so_state=state;
298         m6509->so_state=state;
272299         return;
273300      }
274      m6509.irq_state = state;
301      m6509->irq_state = state;
275302      if( state != CLEAR_LINE )
276303      {
277304         LOG(( "M6509#%d set_irq_line(ASSERT)\n", cpu_getactivecpu()));
278         m6509.pending_irq = 1;
305         m6509->pending_irq = 1;
279306      }
280307   }
281308}
r3535r3536
284311 * Generic set_info
285312 **************************************************************************/
286313
287static void m6509_set_info(UINT32 state, cpuinfo *info)
314static CPU_SET_INFO( m6509 )
288315{
316   m6509_Regs *m6509 = token;
317   m6509_Regs *m6502 = m6509;
318
289319   switch (state)
290320   {
291321      /* --- the following bits of info are set as 64-bit signed integers --- */
292      case CPUINFO_INT_INPUT_STATE + M6509_IRQ_LINE:   m6509_set_irq_line(M6509_IRQ_LINE, info->i); break;
293      case CPUINFO_INT_INPUT_STATE + M6509_SET_OVERFLOW:m6509_set_irq_line(M6509_SET_OVERFLOW, info->i); break;
294      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   m6509_set_irq_line(INPUT_LINE_NMI, info->i); break;
322      case CPUINFO_INT_INPUT_STATE + M6509_IRQ_LINE:   m6509_set_irq_line(m6509, M6509_IRQ_LINE, info->i); break;
323      case CPUINFO_INT_INPUT_STATE + M6509_SET_OVERFLOW:m6509_set_irq_line(m6509, M6509_SET_OVERFLOW, info->i); break;
324      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   m6509_set_irq_line(m6509, INPUT_LINE_NMI, info->i); break;
295325
296326      case CPUINFO_INT_PC:                     PCW = info->i; change_pc(PCD);         break;
297      case CPUINFO_INT_REGISTER + M6509_PC:         m6509.pc.w.l = info->i;               break;
327      case CPUINFO_INT_REGISTER + M6509_PC:         m6509->pc.w.l = info->i;               break;
298328      case CPUINFO_INT_SP:                     S = info->i;                     break;
299      case CPUINFO_INT_REGISTER + M6509_S:         m6509.sp.b.l = info->i;               break;
300      case CPUINFO_INT_REGISTER + M6509_P:         m6509.p = info->i;                  break;
301      case CPUINFO_INT_REGISTER + M6509_A:         m6509.a = info->i;                  break;
302      case CPUINFO_INT_REGISTER + M6509_X:         m6509.x = info->i;                  break;
303      case CPUINFO_INT_REGISTER + M6509_Y:         m6509.y = info->i;                  break;
304      case CPUINFO_INT_REGISTER + M6509_PC_BANK:      m6509.pc_bank.b.h2 = info->i;         break;
305      case CPUINFO_INT_REGISTER + M6509_IND_BANK:      m6509.ind_bank.b.h2 = info->i;         break;
306      case CPUINFO_INT_REGISTER + M6509_EA:         m6509.ea.w.l = info->i;               break;
307      case CPUINFO_INT_REGISTER + M6509_ZP:         m6509.zp.w.l = info->i;               break;
329      case CPUINFO_INT_REGISTER + M6509_S:         m6509->sp.b.l = info->i;               break;
330      case CPUINFO_INT_REGISTER + M6509_P:         m6509->p = info->i;                  break;
331      case CPUINFO_INT_REGISTER + M6509_A:         m6509->a = info->i;                  break;
332      case CPUINFO_INT_REGISTER + M6509_X:         m6509->x = info->i;                  break;
333      case CPUINFO_INT_REGISTER + M6509_Y:         m6509->y = info->i;                  break;
334      case CPUINFO_INT_REGISTER + M6509_PC_BANK:      m6509->pc_bank.b.h2 = info->i;         break;
335      case CPUINFO_INT_REGISTER + M6509_IND_BANK:      m6509->ind_bank.b.h2 = info->i;         break;
336      case CPUINFO_INT_REGISTER + M6509_EA:         m6509->ea.w.l = info->i;               break;
337      case CPUINFO_INT_REGISTER + M6509_ZP:         m6509->zp.w.l = info->i;               break;
308338
309339      /* --- the following bits of info are set as pointers to data or functions --- */
310      case CPUINFO_PTR_M6502_READINDEXED_CALLBACK:   m6509.rdmem_id = (read8_machine_func) info->f; break;
311      case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK:   m6509.wrmem_id = (write8_machine_func) info->f; break;
340      case CPUINFO_PTR_M6502_READINDEXED_CALLBACK:   m6509->rdmem_id = (read8_machine_func) info->f; break;
341      case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK:   m6509->wrmem_id = (write8_machine_func) info->f; break;
312342   }
313343}
314344
r3535r3536
318348 * Generic get_info
319349 **************************************************************************/
320350
321void m6509_get_info(UINT32 state, cpuinfo *info)
351CPU_GET_INFO( m6509 )
322352{
353   m6509_Regs *m6502 = token;
354   m6509_Regs *m6509 = m6502;
355
323356   switch (state)
324357   {
325358      /* --- the following bits of info are returned as 64-bit signed integers --- */
r3535r3536
344377      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 0;               break;
345378      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = 0;               break;
346379
347      case CPUINFO_INT_INPUT_STATE + M6509_IRQ_LINE:   info->i = m6509.irq_state;            break;
348      case CPUINFO_INT_INPUT_STATE + M6509_SET_OVERFLOW:info->i = m6509.so_state;            break;
349      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   info->i = m6509.nmi_state;            break;
380      case CPUINFO_INT_INPUT_STATE + M6509_IRQ_LINE:   info->i = m6509->irq_state;            break;
381      case CPUINFO_INT_INPUT_STATE + M6509_SET_OVERFLOW:info->i = m6509->so_state;            break;
382      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   info->i = m6509->nmi_state;            break;
350383
351      case CPUINFO_INT_PREVIOUSPC:               info->i = m6509.ppc.w.l;            break;
384      case CPUINFO_INT_PREVIOUSPC:               info->i = m6509->ppc.w.l;            break;
352385
353386      case CPUINFO_INT_PC:                     info->i = PCD;                     break;
354      case CPUINFO_INT_REGISTER + M6509_PC:         info->i = m6509.pc.w.l;               break;
387      case CPUINFO_INT_REGISTER + M6509_PC:         info->i = m6509->pc.w.l;               break;
355388      case CPUINFO_INT_SP:                     info->i = S;                     break;
356      case CPUINFO_INT_REGISTER + M6509_S:         info->i = m6509.sp.b.l;               break;
357      case CPUINFO_INT_REGISTER + M6509_P:         info->i = m6509.p;                  break;
358      case CPUINFO_INT_REGISTER + M6509_A:         info->i = m6509.a;                  break;
359      case CPUINFO_INT_REGISTER + M6509_X:         info->i = m6509.x;                  break;
360      case CPUINFO_INT_REGISTER + M6509_Y:         info->i = m6509.y;                  break;
361      case CPUINFO_INT_REGISTER + M6509_PC_BANK:      info->i = m6509.pc_bank.b.h2;         break;
362      case CPUINFO_INT_REGISTER + M6509_IND_BANK:      info->i = m6509.ind_bank.b.h2;         break;
363      case CPUINFO_INT_REGISTER + M6509_EA:         info->i = m6509.ea.w.l;               break;
364      case CPUINFO_INT_REGISTER + M6509_ZP:         info->i = m6509.zp.w.l;               break;
389      case CPUINFO_INT_REGISTER + M6509_S:         info->i = m6509->sp.b.l;               break;
390      case CPUINFO_INT_REGISTER + M6509_P:         info->i = m6509->p;                  break;
391      case CPUINFO_INT_REGISTER + M6509_A:         info->i = m6509->a;                  break;
392      case CPUINFO_INT_REGISTER + M6509_X:         info->i = m6509->x;                  break;
393      case CPUINFO_INT_REGISTER + M6509_Y:         info->i = m6509->y;                  break;
394      case CPUINFO_INT_REGISTER + M6509_PC_BANK:      info->i = m6509->pc_bank.b.h2;         break;
395      case CPUINFO_INT_REGISTER + M6509_IND_BANK:      info->i = m6509->ind_bank.b.h2;         break;
396      case CPUINFO_INT_REGISTER + M6509_EA:         info->i = m6509->ea.w.l;               break;
397      case CPUINFO_INT_REGISTER + M6509_ZP:         info->i = m6509->zp.w.l;               break;
365398
366399      /* --- the following bits of info are returned as pointers to data or functions --- */
367      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m6509_set_info;         break;
368      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = m6509_get_context;   break;
369      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = m6509_set_context;   break;
370      case CPUINFO_PTR_INIT:                     info->init = m6509_init;            break;
371      case CPUINFO_PTR_RESET:                     info->reset = m6509_reset;            break;
372      case CPUINFO_PTR_EXIT:                     info->exit = m6509_exit;            break;
373      case CPUINFO_PTR_EXECUTE:                  info->execute = m6509_execute;         break;
400      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m6509);         break;
401      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(m6509);   break;
402      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(m6509);   break;
403      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m6509);            break;
404      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m6509);            break;
405      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(m6509);            break;
406      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m6509);         break;
374407      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
375      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m6502_dasm;         break;
376      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m6502_ICount;         break;
377      case CPUINFO_PTR_INTERNAL_MEMORY_MAP:         info->internal_map8 = address_map_m6509_mem; break;
378      case CPUINFO_PTR_M6502_READINDEXED_CALLBACK:   info->f = (genf *) m6509.rdmem_id;      break;
379      case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK:   info->f = (genf *) m6509.wrmem_id;      break;
408      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m6502);         break;
409      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m6502->icount;         break;
410      case CPUINFO_PTR_INTERNAL_MEMORY_MAP:         info->internal_map8 = ADDRESS_MAP_NAME(m6509_mem); break;
411      case CPUINFO_PTR_M6502_READINDEXED_CALLBACK:   info->f = (genf *) m6509->rdmem_id;      break;
412      case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK:   info->f = (genf *) m6509->wrmem_id;      break;
380413
381414      /* --- the following bits of info are returned as NULL-terminated strings --- */
382415      case CPUINFO_STR_NAME:                     strcpy(info->s, "M6509");            break;
r3535r3536
387420
388421      case CPUINFO_STR_FLAGS:
389422         sprintf(info->s, "%c%c%c%c%c%c%c%c",
390            m6509.p & 0x80 ? 'N':'.',
391            m6509.p & 0x40 ? 'V':'.',
392            m6509.p & 0x20 ? 'R':'.',
393            m6509.p & 0x10 ? 'B':'.',
394            m6509.p & 0x08 ? 'D':'.',
395            m6509.p & 0x04 ? 'I':'.',
396            m6509.p & 0x02 ? 'Z':'.',
397            m6509.p & 0x01 ? 'C':'.');
423            m6509->p & 0x80 ? 'N':'.',
424            m6509->p & 0x40 ? 'V':'.',
425            m6509->p & 0x20 ? 'R':'.',
426            m6509->p & 0x10 ? 'B':'.',
427            m6509->p & 0x08 ? 'D':'.',
428            m6509->p & 0x04 ? 'I':'.',
429            m6509->p & 0x02 ? 'Z':'.',
430            m6509->p & 0x01 ? 'C':'.');
398431         break;
399432
400      case CPUINFO_STR_REGISTER + M6509_PC:         sprintf(info->s, "PC:%04X", m6509.pc.w.l); break;
401      case CPUINFO_STR_REGISTER + M6509_S:         sprintf(info->s, "S:%02X", m6509.sp.b.l); break;
402      case CPUINFO_STR_REGISTER + M6509_P:         sprintf(info->s, "P:%02X", m6509.p); break;
403      case CPUINFO_STR_REGISTER + M6509_A:         sprintf(info->s, "A:%02X", m6509.a); break;
404      case CPUINFO_STR_REGISTER + M6509_X:         sprintf(info->s, "X:%02X", m6509.x); break;
405      case CPUINFO_STR_REGISTER + M6509_Y:         sprintf(info->s, "Y:%02X", m6509.y); break;
406      case CPUINFO_STR_REGISTER + M6509_PC_BANK:      sprintf(info->s, "M0:%01X", m6509.pc_bank.b.h2); break;
407      case CPUINFO_STR_REGISTER + M6509_IND_BANK:      sprintf(info->s, "M1:%01X", m6509.ind_bank.b.h2); break;
408      case CPUINFO_STR_REGISTER + M6509_EA:         sprintf(info->s, "EA:%04X", m6509.ea.w.l); break;
409      case CPUINFO_STR_REGISTER + M6509_ZP:         sprintf(info->s, "ZP:%03X", m6509.zp.w.l); break;
433      case CPUINFO_STR_REGISTER + M6509_PC:         sprintf(info->s, "PC:%04X", m6509->pc.w.l); break;
434      case CPUINFO_STR_REGISTER + M6509_S:         sprintf(info->s, "S:%02X", m6509->sp.b.l); break;
435      case CPUINFO_STR_REGISTER + M6509_P:         sprintf(info->s, "P:%02X", m6509->p); break;
436      case CPUINFO_STR_REGISTER + M6509_A:         sprintf(info->s, "A:%02X", m6509->a); break;
437      case CPUINFO_STR_REGISTER + M6509_X:         sprintf(info->s, "X:%02X", m6509->x); break;
438      case CPUINFO_STR_REGISTER + M6509_Y:         sprintf(info->s, "Y:%02X", m6509->y); break;
439      case CPUINFO_STR_REGISTER + M6509_PC_BANK:      sprintf(info->s, "M0:%01X", m6509->pc_bank.b.h2); break;
440      case CPUINFO_STR_REGISTER + M6509_IND_BANK:      sprintf(info->s, "M1:%01X", m6509->ind_bank.b.h2); break;
441      case CPUINFO_STR_REGISTER + M6509_EA:         sprintf(info->s, "EA:%04X", m6509->ea.w.l); break;
442      case CPUINFO_STR_REGISTER + M6509_ZP:         sprintf(info->s, "ZP:%03X", m6509->zp.w.l); break;
410443   }
411444}
412445
src/emu/cpu/m6502/t6502.c
r3535r3536
2323 *****************************************************************************/
2424
2525#undef   OP
26#define OP(nn) INLINE void m6502_##nn(void)
26#define OP(nn) INLINE void m6502_##nn(m6502_Regs *m6502)
2727
2828/*****************************************************************************
2929 *****************************************************************************
r3535r3536
323323
324324/* and here's the array of function pointers */
325325
326static void (*const insn6502[0x100])(void) = {
326static void (*const insn6502[0x100])(m6502_Regs *m6502) = {
327327   m6502_00,m6502_01,m6502_02,m6502_03,m6502_04,m6502_05,m6502_06,m6502_07,
328328   m6502_08,m6502_09,m6502_0a,m6502_0b,m6502_0c,m6502_0d,m6502_0e,m6502_0f,
329329   m6502_10,m6502_11,m6502_12,m6502_13,m6502_14,m6502_15,m6502_16,m6502_17,
src/emu/cpu/m6502/m65ce02.c
r3535r3536
5555
5656#define LOG(x)   do { if (VERBOSE) logerror x; } while (0)
5757
58
59typedef struct {
58typedef struct    _m65ce02_Regs m65ce02_Regs;
59struct    _m65ce02_Regs {
6060   void   (*const *insn)(void); /* pointer to the function pointer table */
6161   PAIR   ppc;         /* previous program counter */
6262   PAIR   pc;            /* program counter */
r3535r3536
7373   UINT8   after_cli;      /* pending IRQ and last insn cleared I */
7474   UINT8   nmi_state;
7575   UINT8   irq_state;
76   int    (*irq_callback)(int irqline);   /* IRQ callback */
76   cpu_irq_callback irq_callback;
77   const device_config *device;
7778   read8_machine_func rdmem_id;               /* readmem callback for indexed instructions */
7879   write8_machine_func wrmem_id;            /* writemem callback for indexed instructions */
79}   m65ce02_Regs;
80};
8081
81
82static int m65ce02_ICount = 0;
83
84static m65ce02_Regs m65ce02;
85
82static void *token;
8683/***************************************************************
8784 * include the opcode macros, functions and tables
8885 ***************************************************************/
r3535r3536
9289static READ8_HANDLER( default_rdmem_id ) { return program_read_byte_8le(offset); }
9390static WRITE8_HANDLER( default_wdmem_id ) { program_write_byte_8le(offset, data); }
9491
95static void m65ce02_init(int index, int clock, const void *config, int (*irqcallback)(int))
92static CPU_INIT( m65ce02 )
9693{
9794   m65ce02.rdmem_id = default_rdmem_id;
9895   m65ce02.wrmem_id = default_wdmem_id;
9996   m65ce02.irq_callback = irqcallback;
97   m65ce02.device = device;
10098}
10199
102static void m65ce02_reset(void)
100static CPU_RESET( m65ce02 )
103101{
104102   m65ce02.insn = insn65ce02;
105103
r3535r3536
121119   change_pc(PCD);
122120}
123121
124static void m65ce02_exit(void)
122static CPU_EXIT( m65ce02 )
125123{
126124   /* nothing to do yet */
127125}
128126
129static void m65ce02_get_context (void *dst)
127static CPU_GET_CONTEXT( m65ce02 )
130128{
131129   if( dst )
132130      *(m65ce02_Regs*)dst = m65ce02;
133131}
134132
135static void m65ce02_set_context (void *src)
133static CPU_SET_CONTEXT( m65ce02 )
136134{
137135   if( src )
138136   {
r3535r3536
146144   if( !(P & F_I) )
147145   {
148146      EAD = M65CE02_IRQ_VEC;
149      m65ce02_ICount -= 7;
147      m65ce02->icount -= 7;
150148      PUSH(PCH);
151149      PUSH(PCL);
152150      PUSH(P & ~F_B);
r3535r3536
155153      PCH = RDMEM(EAD+1);
156154      LOG(("M65ce02#%d takes IRQ ($%04x)\n", cpu_getactivecpu(), PCD));
157155      /* call back the cpuintrf to let it clear the line */
158      if (m65ce02.irq_callback) (*m65ce02.irq_callback)(0);
156      if (m65ce02.irq_callback) (*m65ce02.irq_callback)(m65ce02.device, 0);
159157      change_pc(PCD);
160158   }
161159   m65ce02.pending_irq = 0;
162160}
163161
164static int m65ce02_execute(int cycles)
162static CPU_EXECUTE( m65ce02 )
165163{
166   m65ce02_ICount = cycles;
164   m65ce02->icount = cycles;
167165
168166   change_pc(PCD);
169167
r3535r3536
200198      if( m65ce02.pending_irq )
201199         m65ce02_take_irq();
202200
203   } while (m65ce02_ICount > 0);
201   } while (m65ce02->icount > 0);
204202
205   return cycles - m65ce02_ICount;
203   return cycles - m65ce02->icount;
206204}
207205
208206static void m65ce02_set_irq_line(int irqline, int state)
r3535r3536
215213      {
216214         LOG(("M65ce02#%d set_nmi_line(ASSERT)\n", cpu_getactivecpu()));
217215         EAD = M65CE02_NMI_VEC;
218         m65ce02_ICount -= 7;
216         m65ce02->icount -= 7;
219217         PUSH(PCH);
220218         PUSH(PCL);
221219         PUSH(P & ~F_B);
r3535r3536
241239 * Generic set_info
242240 **************************************************************************/
243241
244static void m65ce02_set_info(UINT32 state, cpuinfo *info)
242static CPU_SET_INFO( m65ce02 )
245243{
246244   switch( state )
247245    {
r3535r3536
272270 * Generic get_info
273271 **************************************************************************/
274272
275void m65ce02_get_info(UINT32 state, cpuinfo *info)
273CPU_GET_INFO( m65ce02 )
276274{
277275   switch( state )
278276   {
r3535r3536
319317      case CPUINFO_INT_REGISTER+M65CE02_ZP:         info->i = m65ce02.zp.w.l;            break;
320318
321319      /* --- the following bits of info are returned as pointers to data or functions --- */
322      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m65ce02_set_info;         break;
323      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = m65ce02_get_context;   break;
324      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = m65ce02_set_context;   break;
325      case CPUINFO_PTR_INIT:                     info->init = m65ce02_init;            break;
326      case CPUINFO_PTR_RESET:                     info->reset = m65ce02_reset;            break;
327      case CPUINFO_PTR_EXIT:                     info->exit = m65ce02_exit;            break;
328      case CPUINFO_PTR_EXECUTE:                  info->execute = m65ce02_execute;         break;
320      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m65ce02);         break;
321      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(m65ce02);   break;
322      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(m65ce02);   break;
323      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m65ce02);            break;
324      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m65ce02);            break;
325      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(m65ce02);            break;
326      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m65ce02);         break;
329327      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
330      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m65ce02_dasm;         break;
331      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m65ce02_ICount;         break;
328      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m65ce02);         break;
329      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m65ce02->icount;         break;
332330      case CPUINFO_PTR_M6502_READINDEXED_CALLBACK:   info->f = (genf *) m65ce02.rdmem_id;      break;
333331      case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK:   info->f = (genf *) m65ce02.wrmem_id;      break;
334332
src/emu/cpu/m6502/t65c02.c
r3535r3536
2424 *****************************************************************************/
2525
2626#undef   OP
27#define OP(nn) INLINE void m65c02_##nn(void)
27#define OP(nn) INLINE void m65c02_##nn(m6502_Regs *m6502)
2828
2929/*****************************************************************************
3030 *****************************************************************************
r3535r3536
326326OP(df) { int tmp; RD_ZPG; BBS(5);                   } /* 5-7 BBS5 ZPG */
327327OP(ff) { int tmp; RD_ZPG; BBS(7);                   } /* 5-7 BBS7 ZPG */
328328
329static void (*const insn65c02[0x100])(void) = {
329static void (*const insn65c02[0x100])(m6502_Regs *m6502) = {
330330   m65c02_00,m65c02_01,m65c02_02,m65c02_03,m65c02_04,m65c02_05,m65c02_06,m65c02_07,
331331   m65c02_08,m65c02_09,m65c02_0a,m65c02_0b,m65c02_0c,m65c02_0d,m65c02_0e,m65c02_0f,
332332   m65c02_10,m65c02_11,m65c02_12,m65c02_13,m65c02_14,m65c02_15,m65c02_16,m65c02_17,
r3535r3536
371371OP(de_wdc) { int tmp; RD_ABX_P; RD_EA; DEC; WB_EA;      } /* 6 DEC ABX page penalty */
372372OP(fe_wdc) { int tmp; RD_ABX_P; RD_EA; INC; WB_EA;      } /* 6 INC ABX page penalty */
373373
374static void (*const insnwdc65c02[0x100])(void) = {
374static void (*const insnwdc65c02[0x100])(m6502_Regs *m6502) = {
375375   m65c02_00,m65c02_01,m65c02_02,m65c02_03,m65c02_04,m65c02_05,m65c02_06,m65c02_07,
376376   m65c02_08,m65c02_09,m65c02_0a,m65c02_0b,m65c02_0c,m65c02_0d,m65c02_0e,m65c02_0f,
377377   m65c02_10,m65c02_11,m65c02_12,m65c02_13,m65c02_14,m65c02_15,m65c02_16,m65c02_17,
src/emu/cpu/m6502/m6509.h
r3535r3536
3939   positiv edge sets overflow flag */
4040#define M6509_SET_OVERFLOW 3
4141
42void m6509_get_info(UINT32 state, cpuinfo *info);
42CPU_GET_INFO( m6509 );
4343
4444#endif /* __M6509_H__ */
src/emu/cpu/m6502/m65ce02.h
r3535r3536
3535
3636#define M65CE02_IRQ_LINE            M6502_IRQ_LINE
3737
38void m65ce02_get_info(UINT32 state, cpuinfo *info);
38CPU_GET_INFO( m65ce02 );
3939
40extern unsigned m65ce02_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
40extern CPU_DISASSEMBLE( m65ce02 );
4141
4242#endif /* __M65CE02_H__ */
src/emu/cpu/m6502/t6509.c
r3535r3536
2424 *****************************************************************************/
2525
2626#undef   OP
27#define OP(nn) INLINE void m6509_##nn(void)
27#define OP(nn) INLINE void m6509_##nn(m6509_Regs *m6502)
2828
2929OP(00) {                  BRK;                 } /* 7 BRK */
3030OP(20) {                  JSR;                 } /* 6 JSR */
r3535r3536
314314OP(df) { int tmp; RD_ABX_NP; WB_EA; DCP; WB_EA; } /* 7 DCP ABX */
315315OP(ff) { int tmp; RD_ABX_NP; WB_EA; ISB; WB_EA; } /* 7 ISB ABX */
316316
317static void (*const insn6509[0x100])(void) = {
317static void (*const insn6509[0x100])(m6509_Regs *) = {
318318   m6509_00,m6509_01,m6509_02,m6509_03,m6509_04,m6509_05,m6509_06,m6509_07,
319319   m6509_08,m6509_09,m6509_0a,m6509_0b,m6509_0c,m6509_0d,m6509_0e,m6509_0f,
320320   m6509_10,m6509_11,m6509_12,m6509_13,m6509_14,m6509_15,m6509_16,m6509_17,
src/emu/cpu/m6502/t65ce02.c
r3535r3536
2121
2222#undef   OP
2323#ifdef M4510
24#define OP(nn) INLINE void m4510_##nn(void)
24#define OP(nn) INLINE void m4510_##nn(m4510_Regs *m4510)
2525#else
26#define OP(nn) INLINE void m65ce02_##nn(void)
26#define OP(nn) INLINE void m65ce02_##nn(m65ce02_Regs *m65ce02)
2727#endif
2828
2929/*****************************************************************************
r3535r3536
326326OP(ff) { int tmp; RD_ZPG; BBS(7); } /* 4 BBS7 ZPG */
327327
328328#ifdef M4510
329static void (*const insn4510[0x100])(void) = {
329static void (*const insn4510[0x100])(m4510_Regs *) = {
330330   m4510_00,m4510_01,m4510_02,m4510_03,m4510_04,m4510_05,m4510_06,m4510_07,
331331   m4510_08,m4510_09,m4510_0a,m4510_0b,m4510_0c,m4510_0d,m4510_0e,m4510_0f,
332332   m4510_10,m4510_11,m4510_12,m4510_13,m4510_14,m4510_15,m4510_16,m4510_17,
r3535r3536
361361   m4510_f8,m4510_f9,m4510_fa,m4510_fb,m4510_fc,m4510_fd,m4510_fe,m4510_ff
362362};
363363#else
364static void (*const insn65ce02[0x100])(void) = {
364static void (*const insn65ce02[0x100])(m4510_Regs *) = {
365365   m65ce02_00,m65ce02_01,m65ce02_02,m65ce02_03,m65ce02_04,m65ce02_05,m65ce02_06,m65ce02_07,
366366   m65ce02_08,m65ce02_09,m65ce02_0a,m65ce02_0b,m65ce02_0c,m65ce02_0d,m65ce02_0e,m65ce02_0f,
367367   m65ce02_10,m65ce02_11,m65ce02_12,m65ce02_13,m65ce02_14,m65ce02_15,m65ce02_16,m65ce02_17,
src/emu/cpu/jaguar/jaguar.h
r3535r3536
9898    PUBLIC FUNCTIONS
9999***************************************************************************/
100100
101extern void jaguargpu_get_info(UINT32 state, cpuinfo *info);
101extern CPU_GET_INFO( jaguargpu );
102102extern void jaguargpu_ctrl_w(int cpunum, offs_t offset, UINT32 data, UINT32 mem_mask);
103103extern UINT32 jaguargpu_ctrl_r(int cpunum, offs_t offset);
104104
105extern void jaguardsp_get_info(UINT32 state, cpuinfo *info);
105extern CPU_GET_INFO( jaguardsp );
106106extern void jaguardsp_ctrl_w(int cpunum, offs_t offset, UINT32 data, UINT32 mem_mask);
107107extern UINT32 jaguardsp_ctrl_r(int cpunum, offs_t offset);
108108
src/emu/cpu/jaguar/jaguar.c
r3535r3536
9494   int         op;
9595   int         interrupt_cycles;
9696   void       (*const *table)(void);
97   int       (*irq_callback)(int irqline);
97   cpu_irq_callback irq_callback;
98   const device_config *device;
9899   void      (*cpu_interrupt)(void);
99100} jaguar_regs;
100101
r3535r3536
352353    CONTEXT SWITCHING
353354***************************************************************************/
354355
355static void jaguar_get_context(void *dst)
356static CPU_GET_CONTEXT( jaguar )
356357{
357358   /* copy the context */
358359   if (dst)
r3535r3536
360361}
361362
362363
363static void jaguar_set_context(void *src)
364static CPU_SET_CONTEXT( jaguar )
364365{
365366   /* copy the context */
366367   if (src)
r3535r3536
430431   state_save_register_postload(Machine, jaguar_postload, NULL);
431432}
432433
433static void jaguargpu_init(int index, int clock, const void *_config, int (*irqcallback)(int))
434static CPU_INIT( jaguargpu )
434435{
435   const jaguar_cpu_core *config = _config;
436   const jaguar_cpu_core *configdata = config;
436437
437438   memset(&jaguar, 0, sizeof(jaguar));
438439
439440   jaguar_state_register(index, "jaguargpu");
440441
441442   jaguar.irq_callback = irqcallback;
442   if (config)
443      jaguar.cpu_interrupt = config->cpu_int_callback;
443   jaguar.device = device;
444   if (configdata)
445      jaguar.cpu_interrupt = configdata->cpu_int_callback;
444446}
445447
446static void jaguardsp_init(int index, int clock, const void *_config, int (*irqcallback)(int))
448static CPU_INIT( jaguardsp )
447449{
448   const jaguar_cpu_core *config = _config;
450   const jaguar_cpu_core *configdata = config;
449451
450452   memset(&jaguar, 0, sizeof(jaguar));
451453
452454   jaguar_state_register(index, "jaguardsp");
453455
454456   jaguar.irq_callback = irqcallback;
455   if (config)
456      jaguar.cpu_interrupt = config->cpu_int_callback;
457   jaguar.device = device;
458   if (configdata)
459      jaguar.cpu_interrupt = configdata->cpu_int_callback;
457460}
458461
459INLINE void common_reset(void)
462INLINE CPU_RESET( common )
460463{
461464   init_tables();
462465
r3535r3536
467470   change_pc(jaguar.PC);
468471}
469472
470static void jaguargpu_reset(void)
473static CPU_RESET( jaguargpu )
471474{
472   common_reset();
475   CPU_RESET_CALL(common);
473476   jaguar.table = gpu_op_table;
474477   jaguar.isdsp = 0;
475478}
476479
477static void jaguardsp_reset(void)
480static CPU_RESET( jaguardsp )
478481{
479   common_reset();
482   CPU_RESET_CALL(common);
480483   jaguar.table = dsp_op_table;
481484   jaguar.isdsp = 1;
482485}
483486
484static void jaguar_exit(void)
487static CPU_EXIT( jaguar )
485488{
486489   if (mirror_table)
487490      free(mirror_table);
r3535r3536
498501    CORE EXECUTION LOOP
499502***************************************************************************/
500503
501static int jaguargpu_execute(int cycles)
504static CPU_EXECUTE( jaguargpu )
502505{
503506   /* if we're halted, we shouldn't be here */
504507   if (!(jaguar.ctrl[G_CTRL] & 1))
r3535r3536
544547   return cycles - jaguar_icount;
545548}
546549
547static int jaguardsp_execute(int cycles)
550static CPU_EXECUTE( jaguardsp )
548551{
549552   /* if we're halted, we shouldn't be here */
550553   if (!(jaguar.ctrl[G_CTRL] & 1))
r3535r3536
596599    DISASSEMBLY HOOK
597600***************************************************************************/
598601
599static offs_t jaguargpu_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
602static CPU_DISASSEMBLE( jaguargpu )
600603{
601604   extern unsigned dasmjag(int, char *, unsigned, const UINT8 *);
602605    return dasmjag(JAGUAR_VARIANT_GPU, buffer, pc, oprom);
603606}
604607
605static offs_t jaguardsp_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
608static CPU_DISASSEMBLE( jaguardsp )
606609{
607610   extern unsigned dasmjag(int, char *, unsigned, const UINT8 *);
608611    return dasmjag(JAGUAR_VARIANT_DSP, buffer, pc, oprom);
r3535r3536
15121515 * Generic set_info
15131516 **************************************************************************/
15141517
1515static void jaguargpu_set_info(UINT32 state, cpuinfo *info)
1518static CPU_SET_INFO( jaguargpu )
15161519{
15171520   switch (state)
15181521   {
r3535r3536
15691572 * Generic get_info
15701573 **************************************************************************/
15711574
1572void jaguargpu_get_info(UINT32 state, cpuinfo *info)
1575CPU_GET_INFO( jaguargpu )
15731576{
15741577   switch (state)
15751578   {
r3535r3536
16421645      case CPUINFO_INT_SP:                     info->i = jaguar.b0[31];            break;
16431646
16441647      /* --- the following bits of info are returned as pointers to data or functions --- */
1645      case CPUINFO_PTR_SET_INFO:                  info->setinfo = jaguargpu_set_info;      break;
1646      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = jaguar_get_context;   break;
1647      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = jaguar_set_context;   break;
1648      case CPUINFO_PTR_INIT:                     info->init = jaguargpu_init;         break;
1649      case CPUINFO_PTR_RESET:                     info->reset = jaguargpu_reset;         break;
1650      case CPUINFO_PTR_EXIT:                     info->exit = jaguar_exit;            break;
1651      case CPUINFO_PTR_EXECUTE:                  info->execute = jaguargpu_execute;      break;
1648      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(jaguargpu);      break;
1649      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(jaguar);   break;
1650      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(jaguar);   break;
1651      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(jaguargpu);         break;
1652      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(jaguargpu);         break;
1653      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(jaguar);            break;
1654      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(jaguargpu);      break;
16521655      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1653      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = jaguargpu_dasm;      break;
1656      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(jaguargpu);      break;
16541657      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &jaguar_icount;         break;
16551658
16561659      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
17151718 * CPU-specific set_info
17161719 **************************************************************************/
17171720
1718static void jaguardsp_set_info(UINT32 state, cpuinfo *info)
1721static CPU_SET_INFO( jaguardsp )
17191722{
17201723   switch (state)
17211724   {
r3535r3536
17251728      /* --- the following bits of info are set as pointers to data or functions --- */
17261729
17271730      default:
1728         jaguargpu_set_info(state, info);
1731         CPU_SET_INFO_CALL(jaguargpu);
17291732         break;
17301733   }
17311734}
17321735
1733void jaguardsp_get_info(UINT32 state, cpuinfo *info)
1736CPU_GET_INFO( jaguardsp )
17341737{
17351738   switch (state)
17361739   {
r3535r3536
17391742      case CPUINFO_INT_INPUT_STATE + JAGUAR_IRQ5:      info->i = (jaguar.ctrl[G_CTRL] & 0x10000) ? ASSERT_LINE : CLEAR_LINE; break;
17401743
17411744      /* --- the following bits of info are returned as pointers to data or functions --- */
1742      case CPUINFO_PTR_SET_INFO:                  info->setinfo = jaguardsp_set_info;      break;
1743      case CPUINFO_PTR_INIT:                     info->init = jaguardsp_init;         break;
1744      case CPUINFO_PTR_RESET:                     info->reset = jaguardsp_reset;         break;
1745      case CPUINFO_PTR_EXECUTE:                  info->execute = jaguardsp_execute;      break;
1746      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = jaguardsp_dasm;      break;
1745      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(jaguardsp);      break;
1746      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(jaguardsp);         break;
1747      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(jaguardsp);         break;
1748      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(jaguardsp);      break;
1749      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(jaguardsp);      break;
17471750
17481751      /* --- the following bits of info are returned as NULL-terminated strings --- */
17491752      case CPUINFO_STR_NAME:                     strcpy(info->s, "Jaguar DSP");         break;
17501753
17511754      default:
1752         jaguargpu_get_info(state, info);
1755         CPU_GET_INFO_CALL(jaguargpu);
17531756         break;
17541757   }
17551758}
src/emu/cpu/i8085/i8085.h
r3535r3536
2323#define I8085_RST65_LINE   2
2424#define I8085_RST75_LINE   3
2525
26void i8085_get_info(UINT32 state, cpuinfo *info);
26CPU_GET_INFO( i8085 );
2727
2828/**************************************************************************
2929 * I8080 section
r3535r3536
5050
5151#define I8080_INTR_LINE         I8085_INTR_LINE
5252
53void i8080_get_info(UINT32 state, cpuinfo *info);
53CPU_GET_INFO( i8080 );
5454#endif
5555
56offs_t i8085_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
56CPU_DISASSEMBLE( i8085 );
5757
5858#endif
src/emu/cpu/i8085/8085dasm.c
r3535r3536
5353#define ARG(A)  opram[(A) - PC]
5454#define ARGW(A) (opram[(A) - PC] | (opram[(A) + 1 - PC] << 8))
5555
56offs_t i8085_dasm(char *buff, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
56CPU_DISASSEMBLE( i8085 )
5757{
5858   UINT32 flags = 0;
5959   UINT8 op;
r3535r3536
6161   switch (op = OP(pc++))
6262   {
6363#ifdef  Z80_MNEMONICS
64      case 0x00: sprintf (buff,"nop");                             break;
65      case 0x01: sprintf (buff,"ld   bc,$%04x", ARGW(pc)); pc+=2;  break;
66      case 0x02: sprintf (buff,"ld   (bc),a");                     break;
67      case 0x03: sprintf (buff,"inc  bc");                         break;
68      case 0x04: sprintf (buff,"inc  b");                          break;
69      case 0x05: sprintf (buff,"dec  b");                          break;
70      case 0x06: sprintf (buff,"ld   b,$%02x", ARG(pc)); pc++;     break;
71      case 0x07: sprintf (buff,"rlca");                            break;
72      case 0x08: sprintf (buff,"sub  hl,bc (*)");                  break;
73      case 0x09: sprintf (buff,"add  hl,bc");                      break;
74      case 0x0a: sprintf (buff,"ld   a,(bc)");                     break;
75      case 0x0b: sprintf (buff,"dec  bc");                         break;
76      case 0x0c: sprintf (buff,"inc  c");                          break;
77      case 0x0d: sprintf (buff,"dec  c");                          break;
78      case 0x0e: sprintf (buff,"ld   c,$%02x", ARG(pc)); pc++;     break;
79      case 0x0f: sprintf (buff,"rrca");                            break;
80      case 0x10: sprintf (buff,"sra  hl (*)");                     break;
81      case 0x11: sprintf (buff,"ld   de,$%04x", ARGW(pc)); pc+=2;  break;
82      case 0x12: sprintf (buff,"ld   (de),a");                     break;
83      case 0x13: sprintf (buff,"inc  de");                         break;
84      case 0x14: sprintf (buff,"inc  d");                          break;
85      case 0x15: sprintf (buff,"dec  d");                          break;
86      case 0x16: sprintf (buff,"ld   d,$%02x", ARG(pc)); pc++;     break;
87      case 0x17: sprintf (buff,"rla");                             break;
88      case 0x18: sprintf (buff,"rl   de (*)");                     break;
89      case 0x19: sprintf (buff,"add  hl,de");                      break;
90      case 0x1a: sprintf (buff,"ld   a,(de)");                     break;
91      case 0x1b: sprintf (buff,"dec  de");                         break;
92      case 0x1c: sprintf (buff,"inc  e");                          break;
93      case 0x1d: sprintf (buff,"dec  e");                          break;
94      case 0x1e: sprintf (buff,"ld   e,$%02x", ARG(pc)); pc++;     break;
95      case 0x1f: sprintf (buff,"rra");                             break;
96      case 0x20: sprintf (buff,"rim");                             break;
97      case 0x21: sprintf (buff,"ld   hl,$%04x", ARGW(pc)); pc+=2;  break;
98      case 0x22: sprintf (buff,"ld   ($%04x),hl", ARGW(pc)); pc+=2;break;
99      case 0x23: sprintf (buff,"inc  hl");                         break;
100      case 0x24: sprintf (buff,"inc  h");                          break;
101      case 0x25: sprintf (buff,"dec  h");                          break;
102      case 0x26: sprintf (buff,"ld   h,$%02x", ARG(pc)); pc++;     break;
103      case 0x27: sprintf (buff,"daa");                             break;
104      case 0x28: sprintf (buff,"ld   de,hl+$%02x (*)",ARG(pc));pc++;break;
105      case 0x29: sprintf (buff,"add  hl,hl");                      break;
106      case 0x2a: sprintf (buff,"ld   hl,($%04x)", ARGW(pc)); pc+=2;break;
107      case 0x2b: sprintf (buff,"dec  hl");                         break;
108      case 0x2c: sprintf (buff,"inc  l");                          break;
109      case 0x2d: sprintf (buff,"dec  l");                          break;
110      case 0x2e: sprintf (buff,"ld   l,$%02x", ARG(pc)); pc++;     break;
111      case 0x2f: sprintf (buff,"cpl");                             break;
112      case 0x30: sprintf (buff,"sim");                             break;
113      case 0x31: sprintf (buff,"ld   sp,$%04x", ARGW(pc)); pc+=2;  break;
114      case 0x32: sprintf (buff,"ld   ($%04x),a", ARGW(pc)); pc+=2; break;
115      case 0x33: sprintf (buff,"inc  sp");                         break;
116      case 0x34: sprintf (buff,"inc  (hl)");                       break;
117      case 0x35: sprintf (buff,"dec  (hl)");                       break;
118      case 0x36: sprintf (buff,"ld   (hl),$%02x", ARG(pc)); pc++;  break;
119      case 0x37: sprintf (buff,"scf");                             break;
120      case 0x38: sprintf (buff,"ld   de,sp+$%02x (*)",ARG(pc));pc++;break;
121      case 0x39: sprintf (buff,"add  hl,sp");                      break;
122      case 0x3a: sprintf (buff,"ld   a,($%04x)", ARGW(pc)); pc+=2; break;
123      case 0x3b: sprintf (buff,"dec  sp");                         break;
124      case 0x3c: sprintf (buff,"inc  a");                          break;
125      case 0x3d: sprintf (buff,"dec  a");                          break;
126      case 0x3e: sprintf (buff,"ld   a,$%02x", ARG(pc)); pc++;     break;
127      case 0x3f: sprintf (buff,"ccf");                             break;
128      case 0x40: sprintf (buff,"ld   b,b");                        break;
129      case 0x41: sprintf (buff,"ld   b,c");                        break;
130      case 0x42: sprintf (buff,"ld   b,d");                        break;
131      case 0x43: sprintf (buff,"ld   b,e");                        break;
132      case 0x44: sprintf (buff,"ld   b,h");                        break;
133      case 0x45: sprintf (buff,"ld   b,l");                        break;
134      case 0x46: sprintf (buff,"ld   b,(hl)");                     break;
135      case 0x47: sprintf (buff,"ld   b,a");                        break;
136      case 0x48: sprintf (buff,"ld   c,b");                        break;
137      case 0x49: sprintf (buff,"ld   c,c");                        break;
138      case 0x4a: sprintf (buff,"ld   c,d");                        break;
139      case 0x4b: sprintf (buff,"ld   c,e");                        break;
140      case 0x4c: sprintf (buff,"ld   c,h");                        break;
141      case 0x4d: sprintf (buff,"ld   c,l");                        break;
142      case 0x4e: sprintf (buff,"ld   c,(hl)");                     break;
143      case 0x4f: sprintf (buff,"ld   c,a");                        break;
144      case 0x50: sprintf (buff,"ld   d,b");                        break;
145      case 0x51: sprintf (buff,"ld   d,c");                        break;
146      case 0x52: sprintf (buff,"ld   d,d");                        break;
147      case 0x53: sprintf (buff,"ld   d,e");                        break;
148      case 0x54: sprintf (buff,"ld   d,h");                        break;
149      case 0x55: sprintf (buff,"ld   d,l");                        break;
150      case 0x56: sprintf (buff,"ld   d,(hl)");                     break;
151      case 0x57: sprintf (buff,"ld   d,a");                        break;
152      case 0x58: sprintf (buff,"ld   e,b");                        break;
153      case 0x59: sprintf (buff,"ld   e,c");                        break;
154      case 0x5a: sprintf (buff,"ld   e,d");                        break;
155      case 0x5b: sprintf (buff,"ld   e,e");                        break;
156      case 0x5c: sprintf (buff,"ld   e,h");                        break;
157      case 0x5d: sprintf (buff,"ld   e,l");                        break;
158      case 0x5e: sprintf (buff,"ld   e,(hl)");                     break;
159      case 0x5f: sprintf (buff,"ld   e,a");                        break;
160      case 0x60: sprintf (buff,"ld   h,b");                        break;
161      case 0x61: sprintf (buff,"ld   h,c");                        break;
162      case 0x62: sprintf (buff,"ld   h,d");                        break;
163      case 0x63: sprintf (buff,"ld   h,e");                        break;
164      case 0x64: sprintf (buff,"ld   h,h");                        break;
165      case 0x65: sprintf (buff,"ld   h,l");                        break;
166      case 0x66: sprintf (buff,"ld   h,(hl)");                     break;
167      case 0x67: sprintf (buff,"ld   h,a");                        break;
168      case 0x68: sprintf (buff,"ld   l,b");                        break;
169      case 0x69: sprintf (buff,"ld   l,c");                        break;
170      case 0x6a: sprintf (buff,"ld   l,d");                        break;
171      case 0x6b: sprintf (buff,"ld   l,e");                        break;
172      case 0x6c: sprintf (buff,"ld   l,h");                        break;
173      case 0x6d: sprintf (buff,"ld   l,l");                        break;
174      case 0x6e: sprintf (buff,"ld   l,(hl)");                     break;
175      case 0x6f: sprintf (buff,"ld   l,a");                        break;
176      case 0x70: sprintf (buff,"ld   (hl),b");                     break;
177      case 0x71: sprintf (buff,"ld   (hl),c");                     break;
178      case 0x72: sprintf (buff,"ld   (hl),d");                     break;
179      case 0x73: sprintf (buff,"ld   (hl),e");                     break;
180      case 0x74: sprintf (buff,"ld   (hl),h");                     break;
181      case 0x75: sprintf (buff,"ld   (hl),l");                     break;
182      case 0x76: sprintf (buff,"halt");                            break;
183      case 0x77: sprintf (buff,"ld   (hl),a");                     break;
184      case 0x78: sprintf (buff,"ld   a,b");                        break;
185      case 0x79: sprintf (buff,"ld   a,c");                        break;
186      case 0x7a: sprintf (buff,"ld   a,d");                        break;
187      case 0x7b: sprintf (buff,"ld   a,e");                        break;
188      case 0x7c: sprintf (buff,"ld   a,h");                        break;
189      case 0x7d: sprintf (buff,"ld   a,l");                        break;
190      case 0x7e: sprintf (buff,"ld   a,(hl)");                     break;
191      case 0x7f: sprintf (buff,"ld   a,a");                        break;
192      case 0x80: sprintf (buff,"add  a,b");                        break;
193      case 0x81: sprintf (buff,"add  a,c");                        break;
194      case 0x82: sprintf (buff,"add  a,d");                        break;
195      case 0x83: sprintf (buff,"add  a,e");                        break;
196      case 0x84: sprintf (buff,"add  a,h");                        break;
197      case 0x85: sprintf (buff,"add  a,l");                        break;
198      case 0x86: sprintf (buff,"add  a,(hl)");                     break;
199      case 0x87: sprintf (buff,"add  a,a");                        break;
200      case 0x88: sprintf (buff,"adc  a,b");                        break;
201      case 0x89: sprintf (buff,"adc  a,c");                        break;
202      case 0x8a: sprintf (buff,"adc  a,d");                        break;
203      case 0x8b: sprintf (buff,"adc  a,e");                        break;
204      case 0x8c: sprintf (buff,"adc  a,h");                        break;
205      case 0x8d: sprintf (buff,"adc  a,l");                        break;
206      case 0x8e: sprintf (buff,"adc  a,(hl)");                     break;
207      case 0x8f: sprintf (buff,"adc  a,a");                        break;
208      case 0x90: sprintf (buff,"sub  b");                          break;
209      case 0x91: sprintf (buff,"sub  c");                          break;
210      case 0x92: sprintf (buff,"sub  d");                          break;
211      case 0x93: sprintf (buff,"sub  e");                          break;
212      case 0x94: sprintf (buff,"sub  h");                          break;
213      case 0x95: sprintf (buff,"sub  l");                          break;
214      case 0x96: sprintf (buff,"sub  (hl)");                       break;
215      case 0x97: sprintf (buff,"sub  a");                          break;
216      case 0x98: sprintf (buff,"sbc  a,b");                        break;
217      case 0x99: sprintf (buff,"sbc  a,c");                        break;
218      case 0x9a: sprintf (buff,"sbc  a,d");                        break;
219      case 0x9b: sprintf (buff,"sbc  a,e");                        break;
220      case 0x9c: sprintf (buff,"sbc  a,h");                        break;
221      case 0x9d: sprintf (buff,"sbc  a,l");                        break;
222      case 0x9e: sprintf (buff,"sbc  a,(hl)");                     break;
223      case 0x9f: sprintf (buff,"sbc  a,a");                        break;
224      case 0xa0: sprintf (buff,"and  b");                          break;
225      case 0xa1: sprintf (buff,"and  c");                          break;
226      case 0xa2: sprintf (buff,"and  d");                          break;
227      case 0xa3: sprintf (buff,"and  e");                          break;
228      case 0xa4: sprintf (buff,"and  h");                          break;
229      case 0xa5: sprintf (buff,"and  l");                          break;
230      case 0xa6: sprintf (buff,"and  (hl)");                       break;
231      case 0xa7: sprintf (buff,"and  a");                          break;
232      case 0xa8: sprintf (buff,"xor  b");                          break;
233      case 0xa9: sprintf (buff,"xor  c");                          break;
234      case 0xaa: sprintf (buff,"xor  d");                          break;
235      case 0xab: sprintf (buff,"xor  e");                          break;
236      case 0xac: sprintf (buff,"xor  h");                          break;
237      case 0xad: sprintf (buff,"xor  l");                          break;
238      case 0xae: sprintf (buff,"xor  (hl)");                       break;
239      case 0xaf: sprintf (buff,"xor  a");                          break;
240      case 0xb0: sprintf (buff,"or   b");                          break;
241      case 0xb1: sprintf (buff,"or   c");                          break;
242      case 0xb2: sprintf (buff,"or   d");                          break;
243      case 0xb3: sprintf (buff,"or   e");                          break;
244      case 0xb4: sprintf (buff,"or   h");                          break;
245      case 0xb5: sprintf (buff,"or   l");                          break;
246      case 0xb6: sprintf (buff,"or   (hl)");                       break;
247      case 0xb7: sprintf (buff,"or   a");                          break;
248      case 0xb8: sprintf (buff,"cp   b");                          break;
249      case 0xb9: sprintf (buff,"cp   c");                          break;
250      case 0xba: sprintf (buff,"cp   d");                          break;
251      case 0xbb: sprintf (buff,"cp   e");                          break;
252      case 0xbc: sprintf (buff,"cp   h");                          break;
253      case 0xbd: sprintf (buff,"cp   l");                          break;
254      case 0xbe: sprintf (buff,"cp   (hl)");                       break;
255      case 0xbf: sprintf (buff,"cp   a");                          break;
256      case 0xc0: sprintf (buff,"ret  nz"); flags = DASMFLAG_STEP_OUT; break;
257      case 0xc1: sprintf (buff,"pop  bc");                         break;
258      case 0xc2: sprintf (buff,"jp   nz,$%04x", ARGW(pc)); pc+=2;  break;
259      case 0xc3: sprintf (buff,"jp   $%04x", ARGW(pc)); pc+=2;     break;
260      case 0xc4: sprintf (buff,"call nz,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
261      case 0xc5: sprintf (buff,"push bc");                         break;
262      case 0xc6: sprintf (buff,"add  a,$%02x", ARG(pc)); pc++;     break;
263      case 0xc7: sprintf (buff,"rst  $00"); flags = DASMFLAG_STEP_OVER; break;
264      case 0xc8: sprintf (buff,"ret  z"); flags = DASMFLAG_STEP_OUT; break;
265      case 0xc9: sprintf (buff,"ret"); flags = DASMFLAG_STEP_OUT;  break;
266      case 0xca: sprintf (buff,"jp   z,$%04x", ARGW(pc)); pc+=2;   break;
267      case 0xcb: sprintf (buff,"rst  v,$40 (*)"); flags = DASMFLAG_STEP_OVER; break;
268      case 0xcc: sprintf (buff,"call z,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
269      case 0xcd: sprintf (buff,"call $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
270      case 0xce: sprintf (buff,"adc  a,$%02x", ARG(pc)); pc++;     break;
271      case 0xcf: sprintf (buff,"rst  $08"); flags = DASMFLAG_STEP_OVER; break;
272      case 0xd0: sprintf (buff,"ret  nc"); flags = DASMFLAG_STEP_OUT; break;
273      case 0xd1: sprintf (buff,"pop  de");                         break;
274      case 0xd2: sprintf (buff,"jp   nc,$%04x", ARGW(pc)); pc+=2;  break;
275      case 0xd3: sprintf (buff,"out  ($%02x),a", ARG(pc)); pc++;   break;
276      case 0xd4: sprintf (buff,"call nc,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
277      case 0xd5: sprintf (buff,"push de");                         break;
278      case 0xd6: sprintf (buff,"sub  $%02x", ARG(pc)); pc++;       break;
279      case 0xd7: sprintf (buff,"rst  $10"); flags = DASMFLAG_STEP_OVER; break;
280      case 0xd8: sprintf (buff,"ret  c");                          break;
281      case 0xd9: sprintf (buff,"ld   (de),hl (*)");                break;
282      case 0xda: sprintf (buff,"jp   c,$%04x", ARGW(pc)); pc+=2;   break;
283      case 0xdb: sprintf (buff,"in   a,($%02x)", ARG(pc)); pc++;   break;
284      case 0xdc: sprintf (buff,"call c,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
285      case 0xdd: sprintf (buff,"jp   nx,$%04x (*)",ARGW(pc));pc+=2;break;
286      case 0xde: sprintf (buff,"sub  $%02x", ARG(pc)); pc++;       break;
287      case 0xdf: sprintf (buff,"rst  $18"); flags = DASMFLAG_STEP_OVER; break;
288      case 0xe0: sprintf (buff,"ret  pe");                         break;
289      case 0xe1: sprintf (buff,"pop  hl");                         break;
290      case 0xe2: sprintf (buff,"jp   pe,$%04x", ARGW(pc)); pc+=2;  break;
291      case 0xe3: sprintf (buff,"ex   (sp),hl");                    break;
292      case 0xe4: sprintf (buff,"call pe,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
293      case 0xe5: sprintf (buff,"push hl");                         break;
294      case 0xe6: sprintf (buff,"and  $%02x", ARG(pc)); pc++;       break;
295      case 0xe7: sprintf (buff,"rst  $20"); flags = DASMFLAG_STEP_OVER; break;
296      case 0xe8: sprintf (buff,"ret  po");                         break;
297      case 0xe9: sprintf (buff,"jp   (hl)");                       break;
298      case 0xea: sprintf (buff,"jp   po,$%04x", ARGW(pc)); pc+=2;  break;
299      case 0xeb: sprintf (buff,"ex   de,hl");                      break;
300      case 0xec: sprintf (buff,"call po,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
301      case 0xed: sprintf (buff,"ld   hl,(de) (*)");                break;
302      case 0xee: sprintf (buff,"xor  $%02x", ARG(pc)); pc++;       break;
303      case 0xef: sprintf (buff,"rst  $28"); flags = DASMFLAG_STEP_OVER; break;
304      case 0xf0: sprintf (buff,"ret  p");                          break;
305      case 0xf1: sprintf (buff,"pop  af");                         break;
306      case 0xf2: sprintf (buff,"jp   p,$%04x", ARGW(pc)); pc+=2;   break;
307      case 0xf3: sprintf (buff,"di");                              break;
308      case 0xf4: sprintf (buff,"cp   $%04x", ARGW(pc)); pc+=2;     break;
309      case 0xf5: sprintf (buff,"push af");                         break;
310      case 0xf6: sprintf (buff,"or   $%02x", ARG(pc)); pc++;       break;
311      case 0xf7: sprintf (buff,"rst  $30"); flags = DASMFLAG_STEP_OVER; break;
312      case 0xf8: sprintf (buff,"ret  m");                          break;
313      case 0xf9: sprintf (buff,"ld   sp,hl");                      break;
314      case 0xfa: sprintf (buff,"jp   m,$%04x", ARGW(pc)); pc+=2;   break;
315      case 0xfb: sprintf (buff,"ei");                              break;
316      case 0xfc: sprintf (buff,"call m,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
317      case 0xfd: sprintf (buff,"jp   x,$%04x (*)",ARGW(pc));pc+=2; break;
318      case 0xfe: sprintf (buff,"cp   $%02x", ARG(pc)); pc++;       break;
319      case 0xff: sprintf (buff,"rst  $38"); flags = DASMFLAG_STEP_OVER; break;
64      case 0x00: sprintf (buffer,"nop");                             break;
65      case 0x01: sprintf (buffer,"ld   bc,$%04x", ARGW(pc)); pc+=2;  break;
66      case 0x02: sprintf (buffer,"ld   (bc),a");                     break;
67      case 0x03: sprintf (buffer,"inc  bc");                         break;
68      case 0x04: sprintf (buffer,"inc  b");                          break;
69      case 0x05: sprintf (buffer,"dec  b");                          break;
70      case 0x06: sprintf (buffer,"ld   b,$%02x", ARG(pc)); pc++;     break;
71      case 0x07: sprintf (buffer,"rlca");                            break;
72      case 0x08: sprintf (buffer,"sub  hl,bc (*)");                  break;
73      case 0x09: sprintf (buffer,"add  hl,bc");                      break;
74      case 0x0a: sprintf (buffer,"ld   a,(bc)");                     break;
75      case 0x0b: sprintf (buffer,"dec  bc");                         break;
76      case 0x0c: sprintf (buffer,"inc  c");                          break;
77      case 0x0d: sprintf (buffer,"dec  c");                          break;
78      case 0x0e: sprintf (buffer,"ld   c,$%02x", ARG(pc)); pc++;     break;
79      case 0x0f: sprintf (buffer,"rrca");                            break;
80      case 0x10: sprintf (buffer,"sra  hl (*)");                     break;
81      case 0x11: sprintf (buffer,"ld   de,$%04x", ARGW(pc)); pc+=2;  break;
82      case 0x12: sprintf (buffer,"ld   (de),a");                     break;
83      case 0x13: sprintf (buffer,"inc  de");                         break;
84      case 0x14: sprintf (buffer,"inc  d");                          break;
85      case 0x15: sprintf (buffer,"dec  d");                          break;
86      case 0x16: sprintf (buffer,"ld   d,$%02x", ARG(pc)); pc++;     break;
87      case 0x17: sprintf (buffer,"rla");                             break;
88      case 0x18: sprintf (buffer,"rl   de (*)");                     break;
89      case 0x19: sprintf (buffer,"add  hl,de");                      break;
90      case 0x1a: sprintf (buffer,"ld   a,(de)");                     break;
91      case 0x1b: sprintf (buffer,"dec  de");                         break;
92      case 0x1c: sprintf (buffer,"inc  e");                          break;
93      case 0x1d: sprintf (buffer,"dec  e");                          break;
94      case 0x1e: sprintf (buffer,"ld   e,$%02x", ARG(pc)); pc++;     break;
95      case 0x1f: sprintf (buffer,"rra");                             break;
96      case 0x20: sprintf (buffer,"rim");                             break;
97      case 0x21: sprintf (buffer,"ld   hl,$%04x", ARGW(pc)); pc+=2;  break;
98      case 0x22: sprintf (buffer,"ld   ($%04x),hl", ARGW(pc)); pc+=2;break;
99      case 0x23: sprintf (buffer,"inc  hl");                         break;
100      case 0x24: sprintf (buffer,"inc  h");                          break;
101      case 0x25: sprintf (buffer,"dec  h");                          break;
102      case 0x26: sprintf (buffer,"ld   h,$%02x", ARG(pc)); pc++;     break;
103      case 0x27: sprintf (buffer,"daa");                             break;
104      case 0x28: sprintf (buffer,"ld   de,hl+$%02x (*)",ARG(pc));pc++;break;
105      case 0x29: sprintf (buffer,"add  hl,hl");                      break;
106      case 0x2a: sprintf (buffer,"ld   hl,($%04x)", ARGW(pc)); pc+=2;break;
107      case 0x2b: sprintf (buffer,"dec  hl");                         break;
108      case 0x2c: sprintf (buffer,"inc  l");                          break;
109      case 0x2d: sprintf (buffer,"dec  l");                          break;
110      case 0x2e: sprintf (buffer,"ld   l,$%02x", ARG(pc)); pc++;     break;
111      case 0x2f: sprintf (buffer,"cpl");                             break;
112      case 0x30: sprintf (buffer,"sim");                             break;
113      case 0x31: sprintf (buffer,"ld   sp,$%04x", ARGW(pc)); pc+=2;  break;
114      case 0x32: sprintf (buffer,"ld   ($%04x),a", ARGW(pc)); pc+=2; break;
115      case 0x33: sprintf (buffer,"inc  sp");                         break;
116      case 0x34: sprintf (buffer,"inc  (hl)");                       break;
117      case 0x35: sprintf (buffer,"dec  (hl)");                       break;
118      case 0x36: sprintf (buffer,"ld   (hl),$%02x", ARG(pc)); pc++;  break;
119      case 0x37: sprintf (buffer,"scf");                             break;
120      case 0x38: sprintf (buffer,"ld   de,sp+$%02x (*)",ARG(pc));pc++;break;
121      case 0x39: sprintf (buffer,"add  hl,sp");                      break;
122      case 0x3a: sprintf (buffer,"ld   a,($%04x)", ARGW(pc)); pc+=2; break;
123      case 0x3b: sprintf (buffer,"dec  sp");                         break;
124      case 0x3c: sprintf (buffer,"inc  a");                          break;
125      case 0x3d: sprintf (buffer,"dec  a");                          break;
126      case 0x3e: sprintf (buffer,"ld   a,$%02x", ARG(pc)); pc++;     break;
127      case 0x3f: sprintf (buffer,"ccf");                             break;
128      case 0x40: sprintf (buffer,"ld   b,b");                        break;
129      case 0x41: sprintf (buffer,"ld   b,c");                        break;
130      case 0x42: sprintf (buffer,"ld   b,d");                        break;
131      case 0x43: sprintf (buffer,"ld   b,e");                        break;
132      case 0x44: sprintf (buffer,"ld   b,h");                        break;
133      case 0x45: sprintf (buffer,"ld   b,l");                        break;
134      case 0x46: sprintf (buffer,"ld   b,(hl)");                     break;
135      case 0x47: sprintf (buffer,"ld   b,a");                        break;
136      case 0x48: sprintf (buffer,"ld   c,b");                        break;
137      case 0x49: sprintf (buffer,"ld   c,c");                        break;
138      case 0x4a: sprintf (buffer,"ld   c,d");                        break;
139      case 0x4b: sprintf (buffer,"ld   c,e");                        break;
140      case 0x4c: sprintf (buffer,"ld   c,h");                        break;
141      case 0x4d: sprintf (buffer,"ld   c,l");                        break;
142      case 0x4e: sprintf (buffer,"ld   c,(hl)");                     break;
143      case 0x4f: sprintf (buffer,"ld   c,a");                        break;
144      case 0x50: sprintf (buffer,"ld   d,b");                        break;
145      case 0x51: sprintf (buffer,"ld   d,c");                        break;
146      case 0x52: sprintf (buffer,"ld   d,d");                        break;
147      case 0x53: sprintf (buffer,"ld   d,e");                        break;
148      case 0x54: sprintf (buffer,"ld   d,h");                        break;
149      case 0x55: sprintf (buffer,"ld   d,l");                        break;
150      case 0x56: sprintf (buffer,"ld   d,(hl)");                     break;
151      case 0x57: sprintf (buffer,"ld   d,a");                        break;
152      case 0x58: sprintf (buffer,"ld   e,b");                        break;
153      case 0x59: sprintf (buffer,"ld   e,c");                        break;
154      case 0x5a: sprintf (buffer,"ld   e,d");                        break;
155      case 0x5b: sprintf (buffer,"ld   e,e");                        break;
156      case 0x5c: sprintf (buffer,"ld   e,h");                        break;
157      case 0x5d: sprintf (buffer,"ld   e,l");                        break;
158      case 0x5e: sprintf (buffer,"ld   e,(hl)");                     break;
159      case 0x5f: sprintf (buffer,"ld   e,a");                        break;
160      case 0x60: sprintf (buffer,"ld   h,b");                        break;
161      case 0x61: sprintf (buffer,"ld   h,c");                        break;
162      case 0x62: sprintf (buffer,"ld   h,d");                        break;
163      case 0x63: sprintf (buffer,"ld   h,e");                        break;
164      case 0x64: sprintf (buffer,"ld   h,h");                        break;
165      case 0x65: sprintf (buffer,"ld   h,l");                        break;
166      case 0x66: sprintf (buffer,"ld   h,(hl)");                     break;
167      case 0x67: sprintf (buffer,"ld   h,a");                        break;
168      case 0x68: sprintf (buffer,"ld   l,b");                        break;
169      case 0x69: sprintf (buffer,"ld   l,c");                        break;
170      case 0x6a: sprintf (buffer,"ld   l,d");                        break;
171      case 0x6b: sprintf (buffer,"ld   l,e");                        break;
172      case 0x6c: sprintf (buffer,"ld   l,h");                        break;
173      case 0x6d: sprintf (buffer,"ld   l,l");                        break;
174      case 0x6e: sprintf (buffer,"ld   l,(hl)");                     break;
175      case 0x6f: sprintf (buffer,"ld   l,a");                        break;
176      case 0x70: sprintf (buffer,"ld   (hl),b");                     break;
177      case 0x71: sprintf (buffer,"ld   (hl),c");                     break;
178      case 0x72: sprintf (buffer,"ld   (hl),d");                     break;
179      case 0x73: sprintf (buffer,"ld   (hl),e");                     break;
180      case 0x74: sprintf (buffer,"ld   (hl),h");                     break;
181      case 0x75: sprintf (buffer,"ld   (hl),l");                     break;
182      case 0x76: sprintf (buffer,"halt");                            break;
183      case 0x77: sprintf (buffer,"ld   (hl),a");                     break;
184      case 0x78: sprintf (buffer,"ld   a,b");                        break;
185      case 0x79: sprintf (buffer,"ld   a,c");                        break;
186      case 0x7a: sprintf (buffer,"ld   a,d");                        break;
187      case 0x7b: sprintf (buffer,"ld   a,e");                        break;
188      case 0x7c: sprintf (buffer,"ld   a,h");                        break;
189      case 0x7d: sprintf (buffer,"ld   a,l");                        break;
190      case 0x7e: sprintf (buffer,"ld   a,(hl)");                     break;
191      case 0x7f: sprintf (buffer,"ld   a,a");                        break;
192      case 0x80: sprintf (buffer,"add  a,b");                        break;
193      case 0x81: sprintf (buffer,"add  a,c");                        break;
194      case 0x82: sprintf (buffer,"add  a,d");                        break;
195      case 0x83: sprintf (buffer,"add  a,e");                        break;
196      case 0x84: sprintf (buffer,"add  a,h");                        break;
197      case 0x85: sprintf (buffer,"add  a,l");                        break;
198      case 0x86: sprintf (buffer,"add  a,(hl)");                     break;
199      case 0x87: sprintf (buffer,"add  a,a");                        break;
200      case 0x88: sprintf (buffer,"adc  a,b");                        break;
201      case 0x89: sprintf (buffer,"adc  a,c");                        break;
202      case 0x8a: sprintf (buffer,"adc  a,d");                        break;
203      case 0x8b: sprintf (buffer,"adc  a,e");                        break;
204      case 0x8c: sprintf (buffer,"adc  a,h");                        break;
205      case 0x8d: sprintf (buffer,"adc  a,l");                        break;
206      case 0x8e: sprintf (buffer,"adc  a,(hl)");                     break;
207      case 0x8f: sprintf (buffer,"adc  a,a");                        break;
208      case 0x90: sprintf (buffer,"sub  b");                          break;
209      case 0x91: sprintf (buffer,"sub  c");                          break;
210      case 0x92: sprintf (buffer,"sub  d");                          break;
211      case 0x93: sprintf (buffer,"sub  e");                          break;
212      case 0x94: sprintf (buffer,"sub  h");                          break;
213      case 0x95: sprintf (buffer,"sub  l");                          break;
214      case 0x96: sprintf (buffer,"sub  (hl)");                       break;
215      case 0x97: sprintf (buffer,"sub  a");                          break;
216      case 0x98: sprintf (buffer,"sbc  a,b");                        break;
217      case 0x99: sprintf (buffer,"sbc  a,c");                        break;
218      case 0x9a: sprintf (buffer,"sbc  a,d");                        break;
219      case 0x9b: sprintf (buffer,"sbc  a,e");                        break;
220      case 0x9c: sprintf (buffer,"sbc  a,h");                        break;
221      case 0x9d: sprintf (buffer,"sbc  a,l");                        break;
222      case 0x9e: sprintf (buffer,"sbc  a,(hl)");                     break;
223      case 0x9f: sprintf (buffer,"sbc  a,a");                        break;
224      case 0xa0: sprintf (buffer,"and  b");                          break;
225      case 0xa1: sprintf (buffer,"and  c");                          break;
226      case 0xa2: sprintf (buffer,"and  d");                          break;
227      case 0xa3: sprintf (buffer,"and  e");                          break;
228      case 0xa4: sprintf (buffer,"and  h");                          break;
229      case 0xa5: sprintf (buffer,"and  l");                          break;
230      case 0xa6: sprintf (buffer,"and  (hl)");                       break;
231      case 0xa7: sprintf (buffer,"and  a");                          break;
232      case 0xa8: sprintf (buffer,"xor  b");                          break;
233      case 0xa9: sprintf (buffer,"xor  c");                          break;
234      case 0xaa: sprintf (buffer,"xor  d");                          break;
235      case 0xab: sprintf (buffer,"xor  e");                          break;
236      case 0xac: sprintf (buffer,"xor  h");                          break;
237      case 0xad: sprintf (buffer,"xor  l");                          break;
238      case 0xae: sprintf (buffer,"xor  (hl)");                       break;
239      case 0xaf: sprintf (buffer,"xor  a");                          break;
240      case 0xb0: sprintf (buffer,"or   b");                          break;
241      case 0xb1: sprintf (buffer,"or   c");                          break;
242      case 0xb2: sprintf (buffer,"or   d");                          break;
243      case 0xb3: sprintf (buffer,"or   e");                          break;
244      case 0xb4: sprintf (buffer,"or   h");                          break;
245      case 0xb5: sprintf (buffer,"or   l");                          break;
246      case 0xb6: sprintf (buffer,"or   (hl)");                       break;
247      case 0xb7: sprintf (buffer,"or   a");                          break;
248      case 0xb8: sprintf (buffer,"cp   b");                          break;
249      case 0xb9: sprintf (buffer,"cp   c");                          break;
250      case 0xba: sprintf (buffer,"cp   d");                          break;
251      case 0xbb: sprintf (buffer,"cp   e");                          break;
252      case 0xbc: sprintf (buffer,"cp   h");                          break;
253      case 0xbd: sprintf (buffer,"cp   l");                          break;
254      case 0xbe: sprintf (buffer,"cp   (hl)");                       break;
255      case 0xbf: sprintf (buffer,"cp   a");                          break;
256      case 0xc0: sprintf (buffer,"ret  nz"); flags = DASMFLAG_STEP_OUT; break;
257      case 0xc1: sprintf (buffer,"pop  bc");                         break;
258      case 0xc2: sprintf (buffer,"jp   nz,$%04x", ARGW(pc)); pc+=2;  break;
259      case 0xc3: sprintf (buffer,"jp   $%04x", ARGW(pc)); pc+=2;     break;
260      case 0xc4: sprintf (buffer,"call nz,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
261      case 0xc5: sprintf (buffer,"push bc");                         break;
262      case 0xc6: sprintf (buffer,"add  a,$%02x", ARG(pc)); pc++;     break;
263      case 0xc7: sprintf (buffer,"rst  $00"); flags = DASMFLAG_STEP_OVER; break;
264      case 0xc8: sprintf (buffer,"ret  z"); flags = DASMFLAG_STEP_OUT; break;
265      case 0xc9: sprintf (buffer,"ret"); flags = DASMFLAG_STEP_OUT;  break;
266      case 0xca: sprintf (buffer,"jp   z,$%04x", ARGW(pc)); pc+=2;   break;
267      case 0xcb: sprintf (buffer,"rst  v,$40 (*)"); flags = DASMFLAG_STEP_OVER; break;
268      case 0xcc: sprintf (buffer,"call z,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
269      case 0xcd: sprintf (buffer,"call $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
270      case 0xce: sprintf (buffer,"adc  a,$%02x", ARG(pc)); pc++;     break;
271      case 0xcf: sprintf (buffer,"rst  $08"); flags = DASMFLAG_STEP_OVER; break;
272      case 0xd0: sprintf (buffer,"ret  nc"); flags = DASMFLAG_STEP_OUT; break;
273      case 0xd1: sprintf (buffer,"pop  de");                         break;
274      case 0xd2: sprintf (buffer,"jp   nc,$%04x", ARGW(pc)); pc+=2;  break;
275      case 0xd3: sprintf (buffer,"out  ($%02x),a", ARG(pc)); pc++;   break;
276      case 0xd4: sprintf (buffer,"call nc,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
277      case 0xd5: sprintf (buffer,"push de");                         break;
278      case 0xd6: sprintf (buffer,"sub  $%02x", ARG(pc)); pc++;       break;
279      case 0xd7: sprintf (buffer,"rst  $10"); flags = DASMFLAG_STEP_OVER; break;
280      case 0xd8: sprintf (buffer,"ret  c");                          break;
281      case 0xd9: sprintf (buffer,"ld   (de),hl (*)");                break;
282      case 0xda: sprintf (buffer,"jp   c,$%04x", ARGW(pc)); pc+=2;   break;
283      case 0xdb: sprintf (buffer,"in   a,($%02x)", ARG(pc)); pc++;   break;
284      case 0xdc: sprintf (buffer,"call c,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
285      case 0xdd: sprintf (buffer,"jp   nx,$%04x (*)",ARGW(pc));pc+=2;break;
286      case 0xde: sprintf (buffer,"sub  $%02x", ARG(pc)); pc++;       break;
287      case 0xdf: sprintf (buffer,"rst  $18"); flags = DASMFLAG_STEP_OVER; break;
288      case 0xe0: sprintf (buffer,"ret  pe");                         break;
289      case 0xe1: sprintf (buffer,"pop  hl");                         break;
290      case 0xe2: sprintf (buffer,"jp   pe,$%04x", ARGW(pc)); pc+=2;  break;
291      case 0xe3: sprintf (buffer,"ex   (sp),hl");                    break;
292      case 0xe4: sprintf (buffer,"call pe,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
293      case 0xe5: sprintf (buffer,"push hl");                         break;
294      case 0xe6: sprintf (buffer,"and  $%02x", ARG(pc)); pc++;       break;
295      case 0xe7: sprintf (buffer,"rst  $20"); flags = DASMFLAG_STEP_OVER; break;
296      case 0xe8: sprintf (buffer,"ret  po");                         break;
297      case 0xe9: sprintf (buffer,"jp   (hl)");                       break;
298      case 0xea: sprintf (buffer,"jp   po,$%04x", ARGW(pc)); pc+=2;  break;
299      case 0xeb: sprintf (buffer,"ex   de,hl");                      break;
300      case 0xec: sprintf (buffer,"call po,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
301      case 0xed: sprintf (buffer,"ld   hl,(de) (*)");                break;
302      case 0xee: sprintf (buffer,"xor  $%02x", ARG(pc)); pc++;       break;
303      case 0xef: sprintf (buffer,"rst  $28"); flags = DASMFLAG_STEP_OVER; break;
304      case 0xf0: sprintf (buffer,"ret  p");                          break;
305      case 0xf1: sprintf (buffer,"pop  af");                         break;
306      case 0xf2: sprintf (buffer,"jp   p,$%04x", ARGW(pc)); pc+=2;   break;
307      case 0xf3: sprintf (buffer,"di");                              break;
308      case 0xf4: sprintf (buffer,"cp   $%04x", ARGW(pc)); pc+=2;     break;
309      case 0xf5: sprintf (buffer,"push af");                         break;
310      case 0xf6: sprintf (buffer,"or   $%02x", ARG(pc)); pc++;       break;
311      case 0xf7: sprintf (buffer,"rst  $30"); flags = DASMFLAG_STEP_OVER; break;
312      case 0xf8: sprintf (buffer,"ret  m");                          break;
313      case 0xf9: sprintf (buffer,"ld   sp,hl");                      break;
314      case 0xfa: sprintf (buffer,"jp   m,$%04x", ARGW(pc)); pc+=2;   break;
315      case 0xfb: sprintf (buffer,"ei");                              break;
316      case 0xfc: sprintf (buffer,"call m,$%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
317      case 0xfd: sprintf (buffer,"jp   x,$%04x (*)",ARGW(pc));pc+=2; break;
318      case 0xfe: sprintf (buffer,"cp   $%02x", ARG(pc)); pc++;       break;
319      case 0xff: sprintf (buffer,"rst  $38"); flags = DASMFLAG_STEP_OVER; break;
320320#else
321      case 0x00: sprintf (buff,"nop");                             break;
322      case 0x01: sprintf (buff,"lxi  b,$%04x", ARGW(pc)); pc+=2;   break;
323      case 0x02: sprintf (buff,"stax b");                          break;
324      case 0x03: sprintf (buff,"inx  b");                          break;
325      case 0x04: sprintf (buff,"inr  b");                          break;
326      case 0x05: sprintf (buff,"dcr  b");                          break;
327      case 0x06: sprintf (buff,"mvi  b,$%02x", ARG(pc)); pc++;     break;
328      case 0x07: sprintf (buff,"rlc");                             break;
329      case 0x08: sprintf (buff,"dsub (*)");                        break;
330      case 0x09: sprintf (buff,"dad  b");                          break;
331      case 0x0a: sprintf (buff,"ldax b");                          break;
332      case 0x0b: sprintf (buff,"dcx  b");                          break;
333      case 0x0c: sprintf (buff,"inr  c");                          break;
334      case 0x0d: sprintf (buff,"dcr  c");                          break;
335      case 0x0e: sprintf (buff,"mvi  c,$%02x", ARG(pc)); pc++;     break;
336      case 0x0f: sprintf (buff,"rrc");                             break;
337      case 0x10: sprintf (buff,"asrh (*)");                        break;
338      case 0x11: sprintf (buff,"lxi  d,$%04x", ARGW(pc)); pc+=2;   break;
339      case 0x12: sprintf (buff,"stax d");                          break;
340      case 0x13: sprintf (buff,"inx  d");                          break;
341      case 0x14: sprintf (buff,"inr  d");                          break;
342      case 0x15: sprintf (buff,"dcr  d");                          break;
343      case 0x16: sprintf (buff,"mvi  d,$%02x", ARG(pc)); pc++;     break;
344      case 0x17: sprintf (buff,"ral");                             break;
345      case 0x18: sprintf (buff,"rlde (*)");                        break;
346      case 0x19: sprintf (buff,"dad  d");                          break;
347      case 0x1a: sprintf (buff,"ldax d");                          break;
348      case 0x1b: sprintf (buff,"dcx  d");                          break;
349      case 0x1c: sprintf (buff,"inr  e");                          break;
350      case 0x1d: sprintf (buff,"dcr  e");                          break;
351      case 0x1e: sprintf (buff,"mvi  e,$%02x", ARG(pc)); pc++;     break;
352      case 0x1f: sprintf (buff,"rar");                             break;
353      case 0x20: sprintf (buff,"rim");                             break;
354      case 0x21: sprintf (buff,"lxi  h,$%04x", ARGW(pc)); pc+=2;   break;
355      case 0x22: sprintf (buff,"shld $%04x", ARGW(pc)); pc+=2;     break;
356      case 0x23: sprintf (buff,"inx  h");                          break;
357      case 0x24: sprintf (buff,"inr  h");                          break;
358      case 0x25: sprintf (buff,"dcr  h");                          break;
359      case 0x26: sprintf (buff,"mvi  h,$%02x", ARG(pc)); pc++;     break;
360      case 0x27: sprintf (buff,"daa");                             break;
361      case 0x28: sprintf (buff,"ldeh $%02x (*)", ARG(pc)); pc++;   break;
362      case 0x29: sprintf (buff,"dad  h");                          break;
363      case 0x2a: sprintf (buff,"lhld $%04x", ARGW(pc)); pc+=2;     break;
364      case 0x2b: sprintf (buff,"dcx  h");                          break;
365      case 0x2c: sprintf (buff,"inr  l");                          break;
366      case 0x2d: sprintf (buff,"dcr  l");                          break;
367      case 0x2e: sprintf (buff,"mvi  l,$%02x", ARG(pc)); pc++;     break;
368      case 0x2f: sprintf (buff,"cma");                             break;
369      case 0x30: sprintf (buff,"sim");                             break;
370      case 0x31: sprintf (buff,"lxi  sp,$%04x", ARGW(pc)); pc+=2;  break;
371      case 0x32: sprintf (buff,"stax $%04x", ARGW(pc)); pc+=2;     break;
372      case 0x33: sprintf (buff,"inx  sp");                         break;
373      case 0x34: sprintf (buff,"inr  m");                          break;
374      case 0x35: sprintf (buff,"dcr  m");                          break;
375      case 0x36: sprintf (buff,"mvi  m,$%02x", ARG(pc)); pc++;     break;
376      case 0x37: sprintf (buff,"stc");                             break;
377      case 0x38: sprintf (buff,"ldes $%02x", ARG(pc)); pc++;       break;
378      case 0x39: sprintf (buff,"dad sp");                          break;
379      case 0x3a: sprintf (buff,"ldax $%04x", ARGW(pc)); pc+=2;     break;
380      case 0x3b: sprintf (buff,"dcx  sp");                         break;
381      case 0x3c: sprintf (buff,"inr  a");                          break;
382      case 0x3d: sprintf (buff,"dcr  a");                          break;
383      case 0x3e: sprintf (buff,"mvi  a,$%02x", ARG(pc)); pc++;     break;
384      case 0x3f: sprintf (buff,"cmf");                             break;
385      case 0x40: sprintf (buff,"mov  b,b");                        break;
386      case 0x41: sprintf (buff,"mov  b,c");                        break;
387      case 0x42: sprintf (buff,"mov  b,d");                        break;
388      case 0x43: sprintf (buff,"mov  b,e");                        break;
389      case 0x44: sprintf (buff,"mov  b,h");                        break;
390      case 0x45: sprintf (buff,"mov  b,l");                        break;
391      case 0x46: sprintf (buff,"mov  b,m");                        break;
392      case 0x47: sprintf (buff,"mov  b,a");                        break;
393      case 0x48: sprintf (buff,"mov  c,b");                        break;
394      case 0x49: sprintf (buff,"mov  c,c");                        break;
395      case 0x4a: sprintf (buff,"mov  c,d");                        break;
396      case 0x4b: sprintf (buff,"mov  c,e");                        break;
397      case 0x4c: sprintf (buff,"mov  c,h");                        break;
398      case 0x4d: sprintf (buff,"mov  c,l");                        break;
399      case 0x4e: sprintf (buff,"mov  c,m");                        break;
400      case 0x4f: sprintf (buff,"mov  c,a");                        break;
401      case 0x50: sprintf (buff,"mov  d,b");                        break;
402      case 0x51: sprintf (buff,"mov  d,c");                        break;
403      case 0x52: sprintf (buff,"mov  d,d");                        break;
404      case 0x53: sprintf (buff,"mov  d,e");                        break;
405      case 0x54: sprintf (buff,"mov  d,h");                        break;
406      case 0x55: sprintf (buff,"mov  d,l");                        break;
407      case 0x56: sprintf (buff,"mov  d,m");                        break;
408      case 0x57: sprintf (buff,"mov  d,a");                        break;
409      case 0x58: sprintf (buff,"mov  e,b");                        break;
410      case 0x59: sprintf (buff,"mov  e,c");                        break;
411      case 0x5a: sprintf (buff,"mov  e,d");                        break;
412      case 0x5b: sprintf (buff,"mov  e,e");                        break;
413      case 0x5c: sprintf (buff,"mov  e,h");                        break;
414      case 0x5d: sprintf (buff,"mov  e,l");                        break;
415      case 0x5e: sprintf (buff,"mov  e,m");                        break;
416      case 0x5f: sprintf (buff,"mov  e,a");                        break;
417      case 0x60: sprintf (buff,"mov  h,b");                        break;
418      case 0x61: sprintf (buff,"mov  h,c");                        break;
419      case 0x62: sprintf (buff,"mov  h,d");                        break;
420      case 0x63: sprintf (buff,"mov  h,e");                        break;
421      case 0x64: sprintf (buff,"mov  h,h");                        break;
422      case 0x65: sprintf (buff,"mov  h,l");                        break;
423      case 0x66: sprintf (buff,"mov  h,m");                        break;
424      case 0x67: sprintf (buff,"mov  h,a");                        break;
425      case 0x68: sprintf (buff,"mov  l,b");                        break;
426      case 0x69: sprintf (buff,"mov  l,c");                        break;
427      case 0x6a: sprintf (buff,"mov  l,d");                        break;
428      case 0x6b: sprintf (buff,"mov  l,e");                        break;
429      case 0x6c: sprintf (buff,"mov  l,h");                        break;
430      case 0x6d: sprintf (buff,"mov  l,l");                        break;
431      case 0x6e: sprintf (buff,"mov  l,m");                        break;
432      case 0x6f: sprintf (buff,"mov  l,a");                        break;
433      case 0x70: sprintf (buff,"mov  m,b");                        break;
434      case 0x71: sprintf (buff,"mov  m,c");                        break;
435      case 0x72: sprintf (buff,"mov  m,d");                        break;
436      case 0x73: sprintf (buff,"mov  m,e");                        break;
437      case 0x74: sprintf (buff,"mov  m,h");                        break;
438      case 0x75: sprintf (buff,"mov  m,l");                        break;
439      case 0x76: sprintf (buff,"hlt");                             break;
440      case 0x77: sprintf (buff,"mov  m,a");                        break;
441      case 0x78: sprintf (buff,"mov  a,b");                        break;
442      case 0x79: sprintf (buff,"mov  a,c");                        break;
443      case 0x7a: sprintf (buff,"mov  a,d");                        break;
444      case 0x7b: sprintf (buff,"mov  a,e");                        break;
445      case 0x7c: sprintf (buff,"mov  a,h");                        break;
446      case 0x7d: sprintf (buff,"mov  a,l");                        break;
447      case 0x7e: sprintf (buff,"mov  a,m");                        break;
448      case 0x7f: sprintf (buff,"mov  a,a");                        break;
449      case 0x80: sprintf (buff,"add  b");                          break;
450      case 0x81: sprintf (buff,"add  c");                          break;
451      case 0x82: sprintf (buff,"add  d");                          break;
452      case 0x83: sprintf (buff,"add  e");                          break;
453      case 0x84: sprintf (buff,"add  h");                          break;
454      case 0x85: sprintf (buff,"add  l");                          break;
455      case 0x86: sprintf (buff,"add  m");                          break;
456      case 0x87: sprintf (buff,"add  a");                          break;
457      case 0x88: sprintf (buff,"adc  b");                          break;
458      case 0x89: sprintf (buff,"adc  c");                          break;
459      case 0x8a: sprintf (buff,"adc  d");                          break;
460      case 0x8b: sprintf (buff,"adc  e");                          break;
461      case 0x8c: sprintf (buff,"adc  h");                          break;
462      case 0x8d: sprintf (buff,"adc  l");                          break;
463      case 0x8e: sprintf (buff,"adc  m");                          break;
464      case 0x8f: sprintf (buff,"adc  a");                          break;
465      case 0x90: sprintf (buff,"sub  b");                          break;
466      case 0x91: sprintf (buff,"sub  c");                          break;
467      case 0x92: sprintf (buff,"sub  d");                          break;
468      case 0x93: sprintf (buff,"sub  e");                          break;
469      case 0x94: sprintf (buff,"sub  h");                          break;
470      case 0x95: sprintf (buff,"sub  l");                          break;
471      case 0x96: sprintf (buff,"sub  m");                          break;
472      case 0x97: sprintf (buff,"sub  a");                          break;
473      case 0x98: sprintf (buff,"sbb  b");                          break;
474      case 0x99: sprintf (buff,"sbb  c");                          break;
475      case 0x9a: sprintf (buff,"sbb  d");                          break;
476      case 0x9b: sprintf (buff,"sbb  e");                          break;
477      case 0x9c: sprintf (buff,"sbb  h");                          break;
478      case 0x9d: sprintf (buff,"sbb  l");                          break;
479      case 0x9e: sprintf (buff,"sbb  m");                          break;
480      case 0x9f: sprintf (buff,"sbb  a");                          break;
481      case 0xa0: sprintf (buff,"ana  b");                          break;
482      case 0xa1: sprintf (buff,"ana  c");                          break;
483      case 0xa2: sprintf (buff,"ana  d");                          break;
484      case 0xa3: sprintf (buff,"ana  e");                          break;
485      case 0xa4: sprintf (buff,"ana  h");                          break;
486      case 0xa5: sprintf (buff,"ana  l");                          break;
487      case 0xa6: sprintf (buff,"ana  m");                          break;
488      case 0xa7: sprintf (buff,"ana  a");                          break;
489      case 0xa8: sprintf (buff,"xra  b");                          break;
490      case 0xa9: sprintf (buff,"xra  c");                          break;
491      case 0xaa: sprintf (buff,"xra  d");                          break;
492      case 0xab: sprintf (buff,"xra  e");                          break;
493      case 0xac: sprintf (buff,"xra  h");                          break;
494      case 0xad: sprintf (buff,"xra  l");                          break;
495      case 0xae: sprintf (buff,"xra  m");                          break;
496      case 0xaf: sprintf (buff,"xra  a");                          break;
497      case 0xb0: sprintf (buff,"ora  b");                          break;
498      case 0xb1: sprintf (buff,"ora  c");                          break;
499      case 0xb2: sprintf (buff,"ora  d");                          break;
500      case 0xb3: sprintf (buff,"ora  e");                          break;
501      case 0xb4: sprintf (buff,"ora  h");                          break;
502      case 0xb5: sprintf (buff,"ora  l");                          break;
503      case 0xb6: sprintf (buff,"ora  m");                          break;
504      case 0xb7: sprintf (buff,"ora  a");                          break;
505      case 0xb8: sprintf (buff,"cmp  b");                          break;
506      case 0xb9: sprintf (buff,"cmp  c");                          break;
507      case 0xba: sprintf (buff,"cmp  d");                          break;
508      case 0xbb: sprintf (buff,"cmp  e");                          break;
509      case 0xbc: sprintf (buff,"cmp  h");                          break;
510      case 0xbd: sprintf (buff,"cmp  l");                          break;
511      case 0xbe: sprintf (buff,"cmp  m");                          break;
512      case 0xbf: sprintf (buff,"cmp  a");                          break;
513      case 0xc0: sprintf (buff,"rnz"); flags = DASMFLAG_STEP_OUT;  break;
514      case 0xc1: sprintf (buff,"pop  b");                          break;
515      case 0xc2: sprintf (buff,"jnz  $%04x", ARGW(pc)); pc+=2;     break;
516      case 0xc3: sprintf (buff,"jmp  $%04x", ARGW(pc)); pc+=2;     break;
517      case 0xc4: sprintf (buff,"cnz  $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
518      case 0xc5: sprintf (buff,"push b");                          break;
519      case 0xc6: sprintf (buff,"adi  $%02x", ARG(pc)); pc++;       break;
520      case 0xc7: sprintf (buff,"rst  0"); flags = DASMFLAG_STEP_OVER; break;
521      case 0xc8: sprintf (buff,"rz"); flags = DASMFLAG_STEP_OUT;   break;
522      case 0xc9: sprintf (buff,"ret"); flags = DASMFLAG_STEP_OUT;  break;
523      case 0xca: sprintf (buff,"jz   $%04x", ARGW(pc)); pc+=2;     break;
524      case 0xcb: sprintf (buff,"rstv 8 (*)"); flags = DASMFLAG_STEP_OVER; break;
525      case 0xcc: sprintf (buff,"cz   $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
526      case 0xcd: sprintf (buff,"call $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
527      case 0xce: sprintf (buff,"aci  $%02x", ARG(pc)); pc++;       break;
528      case 0xcf: sprintf (buff,"rst  1"); flags = DASMFLAG_STEP_OVER; break;
529      case 0xd0: sprintf (buff,"rnc"); flags = DASMFLAG_STEP_OUT;  break;
530      case 0xd1: sprintf (buff,"pop  d");                          break;
531      case 0xd2: sprintf (buff,"jnc  $%04x", ARGW(pc)); pc+=2;     break;
532      case 0xd3: sprintf (buff,"out  $%02x", ARG(pc)); pc++;       break;
533      case 0xd4: sprintf (buff,"cnc  $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
534      case 0xd5: sprintf (buff,"push d");                          break;
535      case 0xd6: sprintf (buff,"sui  $%02x", ARG(pc)); pc++;       break;
536      case 0xd7: sprintf (buff,"rst  2"); flags = DASMFLAG_STEP_OVER; break;
537      case 0xd8: sprintf (buff,"rc"); flags = DASMFLAG_STEP_OUT;   break;
538      case 0xd9: sprintf (buff,"shlx d (*)");                      break;
539      case 0xda: sprintf (buff,"jc   $%04x", ARGW(pc)); pc+=2;     break;
540      case 0xdb: sprintf (buff,"in   $%02x", ARG(pc)); pc++;       break;
541      case 0xdc: sprintf (buff,"cc   $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
542      case 0xdd: sprintf (buff,"jnx  $%04x (*)", ARGW(pc)); pc+=2; break;
543      case 0xde: sprintf (buff,"sbi  $%02x", ARG(pc)); pc++;       break;
544      case 0xdf: sprintf (buff,"rst  3"); flags = DASMFLAG_STEP_OVER; break;
545      case 0xe0: sprintf (buff,"rpo"); flags = DASMFLAG_STEP_OUT;  break;
546      case 0xe1: sprintf (buff,"pop  h");                          break;
547      case 0xe2: sprintf (buff,"jpo  $%04x", ARGW(pc)); pc+=2;     break;
548      case 0xe3: sprintf (buff,"xthl");                            break;
549      case 0xe4: sprintf (buff,"cpo  $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
550      case 0xe5: sprintf (buff,"push h");                          break;
551      case 0xe6: sprintf (buff,"ani  $%02x", ARG(pc)); pc++;       break;
552      case 0xe7: sprintf (buff,"rst  4"); flags = DASMFLAG_STEP_OVER; break;
553      case 0xe8: sprintf (buff,"rpe"); flags = DASMFLAG_STEP_OUT;  break;
554      case 0xe9: sprintf (buff,"pchl");                            break;
555      case 0xea: sprintf (buff,"jpe  $%04x", ARGW(pc)); pc+=2;     break;
556      case 0xeb: sprintf (buff,"xchg");                            break;
557      case 0xec: sprintf (buff,"cpe  $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
558      case 0xed: sprintf (buff,"lhlx d (*)");                      break;
559      case 0xee: sprintf (buff,"xri  $%02x", ARG(pc)); pc++;       break;
560      case 0xef: sprintf (buff,"rst  5"); flags = DASMFLAG_STEP_OVER; break;
561      case 0xf0: sprintf (buff,"rp"); flags = DASMFLAG_STEP_OUT;   break;
562      case 0xf1: sprintf (buff,"pop  a");                          break;
563      case 0xf2: sprintf (buff,"jp   $%04x", ARGW(pc)); pc+=2;     break;
564      case 0xf3: sprintf (buff,"di");                              break;
565      case 0xf4: sprintf (buff,"cp   $%04x", ARGW(pc)); pc+=2;     break;
566      case 0xf5: sprintf (buff,"push a");                          break;
567      case 0xf6: sprintf (buff,"ori  $%02x", ARG(pc)); pc++;       break;
568      case 0xf7: sprintf (buff,"rst  6"); flags = DASMFLAG_STEP_OVER; break;
569      case 0xf8: sprintf (buff,"rm"); flags = DASMFLAG_STEP_OUT;   break;
570      case 0xf9: sprintf (buff,"sphl");                            break;
571      case 0xfa: sprintf (buff,"jm   $%04x", ARGW(pc)); pc+=2;     break;
572      case 0xfb: sprintf (buff,"ei");                              break;
573      case 0xfc: sprintf (buff,"cm   $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
574      case 0xfd: sprintf (buff,"jx   $%04x (*)", ARGW(pc)); pc+=2; break;
575      case 0xfe: sprintf (buff,"cpi  $%02x", ARG(pc)); pc++;       break;
576      case 0xff: sprintf (buff,"rst  7"); flags = DASMFLAG_STEP_OVER; break;
321      case 0x00: sprintf (buffer,"nop");                             break;
322      case 0x01: sprintf (buffer,"lxi  b,$%04x", ARGW(pc)); pc+=2;   break;
323      case 0x02: sprintf (buffer,"stax b");                          break;
324      case 0x03: sprintf (buffer,"inx  b");                          break;
325      case 0x04: sprintf (buffer,"inr  b");                          break;
326      case 0x05: sprintf (buffer,"dcr  b");                          break;
327      case 0x06: sprintf (buffer,"mvi  b,$%02x", ARG(pc)); pc++;     break;
328      case 0x07: sprintf (buffer,"rlc");                             break;
329      case 0x08: sprintf (buffer,"dsub (*)");                        break;
330      case 0x09: sprintf (buffer,"dad  b");                          break;
331      case 0x0a: sprintf (buffer,"ldax b");                          break;
332      case 0x0b: sprintf (buffer,"dcx  b");                          break;
333      case 0x0c: sprintf (buffer,"inr  c");                          break;
334      case 0x0d: sprintf (buffer,"dcr  c");                          break;
335      case 0x0e: sprintf (buffer,"mvi  c,$%02x", ARG(pc)); pc++;     break;
336      case 0x0f: sprintf (buffer,"rrc");                             break;
337      case 0x10: sprintf (buffer,"asrh (*)");                        break;
338      case 0x11: sprintf (buffer,"lxi  d,$%04x", ARGW(pc)); pc+=2;   break;
339      case 0x12: sprintf (buffer,"stax d");                          break;
340      case 0x13: sprintf (buffer,"inx  d");                          break;
341      case 0x14: sprintf (buffer,"inr  d");                          break;
342      case 0x15: sprintf (buffer,"dcr  d");                          break;
343      case 0x16: sprintf (buffer,"mvi  d,$%02x", ARG(pc)); pc++;     break;
344      case 0x17: sprintf (buffer,"ral");                             break;
345      case 0x18: sprintf (buffer,"rlde (*)");                        break;
346      case 0x19: sprintf (buffer,"dad  d");                          break;
347      case 0x1a: sprintf (buffer,"ldax d");                          break;
348      case 0x1b: sprintf (buffer,"dcx  d");                          break;
349      case 0x1c: sprintf (buffer,"inr  e");                          break;
350      case 0x1d: sprintf (buffer,"dcr  e");                          break;
351      case 0x1e: sprintf (buffer,"mvi  e,$%02x", ARG(pc)); pc++;     break;
352      case 0x1f: sprintf (buffer,"rar");                             break;
353      case 0x20: sprintf (buffer,"rim");                             break;
354      case 0x21: sprintf (buffer,"lxi  h,$%04x", ARGW(pc)); pc+=2;   break;
355      case 0x22: sprintf (buffer,"shld $%04x", ARGW(pc)); pc+=2;     break;
356      case 0x23: sprintf (buffer,"inx  h");                          break;
357      case 0x24: sprintf (buffer,"inr  h");                          break;
358      case 0x25: sprintf (buffer,"dcr  h");                          break;
359      case 0x26: sprintf (buffer,"mvi  h,$%02x", ARG(pc)); pc++;     break;
360      case 0x27: sprintf (buffer,"daa");                             break;
361      case 0x28: sprintf (buffer,"ldeh $%02x (*)", ARG(pc)); pc++;   break;
362      case 0x29: sprintf (buffer,"dad  h");                          break;
363      case 0x2a: sprintf (buffer,"lhld $%04x", ARGW(pc)); pc+=2;     break;
364      case 0x2b: sprintf (buffer,"dcx  h");                          break;
365      case 0x2c: sprintf (buffer,"inr  l");                          break;
366      case 0x2d: sprintf (buffer,"dcr  l");                          break;
367      case 0x2e: sprintf (buffer,"mvi  l,$%02x", ARG(pc)); pc++;     break;
368      case 0x2f: sprintf (buffer,"cma");                             break;
369      case 0x30: sprintf (buffer,"sim");                             break;
370      case 0x31: sprintf (buffer,"lxi  sp,$%04x", ARGW(pc)); pc+=2;  break;
371      case 0x32: sprintf (buffer,"stax $%04x", ARGW(pc)); pc+=2;     break;
372      case 0x33: sprintf (buffer,"inx  sp");                         break;
373      case 0x34: sprintf (buffer,"inr  m");                          break;
374      case 0x35: sprintf (buffer,"dcr  m");                          break;
375      case 0x36: sprintf (buffer,"mvi  m,$%02x", ARG(pc)); pc++;     break;
376      case 0x37: sprintf (buffer,"stc");                             break;
377      case 0x38: sprintf (buffer,"ldes $%02x", ARG(pc)); pc++;       break;
378      case 0x39: sprintf (buffer,"dad sp");                          break;
379      case 0x3a: sprintf (buffer,"ldax $%04x", ARGW(pc)); pc+=2;     break;
380      case 0x3b: sprintf (buffer,"dcx  sp");                         break;
381      case 0x3c: sprintf (buffer,"inr  a");                          break;
382      case 0x3d: sprintf (buffer,"dcr  a");                          break;
383      case 0x3e: sprintf (buffer,"mvi  a,$%02x", ARG(pc)); pc++;     break;
384      case 0x3f: sprintf (buffer,"cmf");                             break;
385      case 0x40: sprintf (buffer,"mov  b,b");                        break;
386      case 0x41: sprintf (buffer,"mov  b,c");                        break;
387      case 0x42: sprintf (buffer,"mov  b,d");                        break;
388      case 0x43: sprintf (buffer,"mov  b,e");                        break;
389      case 0x44: sprintf (buffer,"mov  b,h");                        break;
390      case 0x45: sprintf (buffer,"mov  b,l");                        break;
391      case 0x46: sprintf (buffer,"mov  b,m");                        break;
392      case 0x47: sprintf (buffer,"mov  b,a");                        break;
393      case 0x48: sprintf (buffer,"mov  c,b");                        break;
394      case 0x49: sprintf (buffer,"mov  c,c");                        break;
395      case 0x4a: sprintf (buffer,"mov  c,d");                        break;
396      case 0x4b: sprintf (buffer,"mov  c,e");                        break;
397      case 0x4c: sprintf (buffer,"mov  c,h");                        break;
398      case 0x4d: sprintf (buffer,"mov  c,l");                        break;
399      case 0x4e: sprintf (buffer,"mov  c,m");                        break;
400      case 0x4f: sprintf (buffer,"mov  c,a");                        break;
401      case 0x50: sprintf (buffer,"mov  d,b");                        break;
402      case 0x51: sprintf (buffer,"mov  d,c");                        break;
403      case 0x52: sprintf (buffer,"mov  d,d");                        break;
404      case 0x53: sprintf (buffer,"mov  d,e");                        break;
405      case 0x54: sprintf (buffer,"mov  d,h");                        break;
406      case 0x55: sprintf (buffer,"mov  d,l");                        break;
407      case 0x56: sprintf (buffer,"mov  d,m");                        break;
408      case 0x57: sprintf (buffer,"mov  d,a");                        break;
409      case 0x58: sprintf (buffer,"mov  e,b");                        break;
410      case 0x59: sprintf (buffer,"mov  e,c");                        break;
411      case 0x5a: sprintf (buffer,"mov  e,d");                        break;
412      case 0x5b: sprintf (buffer,"mov  e,e");                        break;
413      case 0x5c: sprintf (buffer,"mov  e,h");                        break;
414      case 0x5d: sprintf (buffer,"mov  e,l");                        break;
415      case 0x5e: sprintf (buffer,"mov  e,m");                        break;
416      case 0x5f: sprintf (buffer,"mov  e,a");                        break;
417      case 0x60: sprintf (buffer,"mov  h,b");                        break;
418      case 0x61: sprintf (buffer,"mov  h,c");                        break;
419      case 0x62: sprintf (buffer,"mov  h,d");                        break;
420      case 0x63: sprintf (buffer,"mov  h,e");                        break;
421      case 0x64: sprintf (buffer,"mov  h,h");                        break;
422      case 0x65: sprintf (buffer,"mov  h,l");                        break;
423      case 0x66: sprintf (buffer,"mov  h,m");                        break;
424      case 0x67: sprintf (buffer,"mov  h,a");                        break;
425      case 0x68: sprintf (buffer,"mov  l,b");                        break;
426      case 0x69: sprintf (buffer,"mov  l,c");                        break;
427      case 0x6a: sprintf (buffer,"mov  l,d");                        break;
428      case 0x6b: sprintf (buffer,"mov  l,e");                        break;
429      case 0x6c: sprintf (buffer,"mov  l,h");                        break;
430      case 0x6d: sprintf (buffer,"mov  l,l");                        break;
431      case 0x6e: sprintf (buffer,"mov  l,m");                        break;
432      case 0x6f: sprintf (buffer,"mov  l,a");                        break;
433      case 0x70: sprintf (buffer,"mov  m,b");                        break;
434      case 0x71: sprintf (buffer,"mov  m,c");                        break;
435      case 0x72: sprintf (buffer,"mov  m,d");                        break;
436      case 0x73: sprintf (buffer,"mov  m,e");                        break;
437      case 0x74: sprintf (buffer,"mov  m,h");                        break;
438      case 0x75: sprintf (buffer,"mov  m,l");                        break;
439      case 0x76: sprintf (buffer,"hlt");                             break;
440      case 0x77: sprintf (buffer,"mov  m,a");                        break;
441      case 0x78: sprintf (buffer,"mov  a,b");                        break;
442      case 0x79: sprintf (buffer,"mov  a,c");                        break;
443      case 0x7a: sprintf (buffer,"mov  a,d");                        break;
444      case 0x7b: sprintf (buffer,"mov  a,e");                        break;
445      case 0x7c: sprintf (buffer,"mov  a,h");                        break;
446      case 0x7d: sprintf (buffer,"mov  a,l");                        break;
447      case 0x7e: sprintf (buffer,"mov  a,m");                        break;
448      case 0x7f: sprintf (buffer,"mov  a,a");                        break;
449      case 0x80: sprintf (buffer,"add  b");                          break;
450      case 0x81: sprintf (buffer,"add  c");                          break;
451      case 0x82: sprintf (buffer,"add  d");                          break;
452      case 0x83: sprintf (buffer,"add  e");                          break;
453      case 0x84: sprintf (buffer,"add  h");                          break;
454      case 0x85: sprintf (buffer,"add  l");                          break;
455      case 0x86: sprintf (buffer,"add  m");                          break;
456      case 0x87: sprintf (buffer,"add  a");                          break;
457      case 0x88: sprintf (buffer,"adc  b");                          break;
458      case 0x89: sprintf (buffer,"adc  c");                          break;
459      case 0x8a: sprintf (buffer,"adc  d");                          break;
460      case 0x8b: sprintf (buffer,"adc  e");                          break;
461      case 0x8c: sprintf (buffer,"adc  h");                          break;
462      case 0x8d: sprintf (buffer,"adc  l");                          break;
463      case 0x8e: sprintf (buffer,"adc  m");                          break;
464      case 0x8f: sprintf (buffer,"adc  a");                          break;
465      case 0x90: sprintf (buffer,"sub  b");                          break;
466      case 0x91: sprintf (buffer,"sub  c");                          break;
467      case 0x92: sprintf (buffer,"sub  d");                          break;
468      case 0x93: sprintf (buffer,"sub  e");                          break;
469      case 0x94: sprintf (buffer,"sub  h");                          break;
470      case 0x95: sprintf (buffer,"sub  l");                          break;
471      case 0x96: sprintf (buffer,"sub  m");                          break;
472      case 0x97: sprintf (buffer,"sub  a");                          break;
473      case 0x98: sprintf (buffer,"sbb  b");                          break;
474      case 0x99: sprintf (buffer,"sbb  c");                          break;
475      case 0x9a: sprintf (buffer,"sbb  d");                          break;
476      case 0x9b: sprintf (buffer,"sbb  e");                          break;
477      case 0x9c: sprintf (buffer,"sbb  h");                          break;
478      case 0x9d: sprintf (buffer,"sbb  l");                          break;
479      case 0x9e: sprintf (buffer,"sbb  m");                          break;
480      case 0x9f: sprintf (buffer,"sbb  a");                          break;
481      case 0xa0: sprintf (buffer,"ana  b");                          break;
482      case 0xa1: sprintf (buffer,"ana  c");                          break;
483      case 0xa2: sprintf (buffer,"ana  d");                          break;
484      case 0xa3: sprintf (buffer,"ana  e");                          break;
485      case 0xa4: sprintf (buffer,"ana  h");                          break;
486      case 0xa5: sprintf (buffer,"ana  l");                          break;
487      case 0xa6: sprintf (buffer,"ana  m");                          break;
488      case 0xa7: sprintf (buffer,"ana  a");                          break;
489      case 0xa8: sprintf (buffer,"xra  b");                          break;
490      case 0xa9: sprintf (buffer,"xra  c");                          break;
491      case 0xaa: sprintf (buffer,"xra  d");                          break;
492      case 0xab: sprintf (buffer,"xra  e");                          break;
493      case 0xac: sprintf (buffer,"xra  h");                          break;
494      case 0xad: sprintf (buffer,"xra  l");                          break;
495      case 0xae: sprintf (buffer,"xra  m");                          break;
496      case 0xaf: sprintf (buffer,"xra  a");                          break;
497      case 0xb0: sprintf (buffer,"ora  b");                          break;
498      case 0xb1: sprintf (buffer,"ora  c");                          break;
499      case 0xb2: sprintf (buffer,"ora  d");                          break;
500      case 0xb3: sprintf (buffer,"ora  e");                          break;
501      case 0xb4: sprintf (buffer,"ora  h");                          break;
502      case 0xb5: sprintf (buffer,"ora  l");                          break;
503      case 0xb6: sprintf (buffer,"ora  m");                          break;
504      case 0xb7: sprintf (buffer,"ora  a");                          break;
505      case 0xb8: sprintf (buffer,"cmp  b");                          break;
506      case 0xb9: sprintf (buffer,"cmp  c");                          break;
507      case 0xba: sprintf (buffer,"cmp  d");                          break;
508      case 0xbb: sprintf (buffer,"cmp  e");                          break;
509      case 0xbc: sprintf (buffer,"cmp  h");                          break;
510      case 0xbd: sprintf (buffer,"cmp  l");                          break;
511      case 0xbe: sprintf (buffer,"cmp  m");                          break;
512      case 0xbf: sprintf (buffer,"cmp  a");                          break;
513      case 0xc0: sprintf (buffer,"rnz"); flags = DASMFLAG_STEP_OUT;  break;
514      case 0xc1: sprintf (buffer,"pop  b");                          break;
515      case 0xc2: sprintf (buffer,"jnz  $%04x", ARGW(pc)); pc+=2;     break;
516      case 0xc3: sprintf (buffer,"jmp  $%04x", ARGW(pc)); pc+=2;     break;
517      case 0xc4: sprintf (buffer,"cnz  $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
518      case 0xc5: sprintf (buffer,"push b");                          break;
519      case 0xc6: sprintf (buffer,"adi  $%02x", ARG(pc)); pc++;       break;
520      case 0xc7: sprintf (buffer,"rst  0"); flags = DASMFLAG_STEP_OVER; break;
521      case 0xc8: sprintf (buffer,"rz"); flags = DASMFLAG_STEP_OUT;   break;
522      case 0xc9: sprintf (buffer,"ret"); flags = DASMFLAG_STEP_OUT;  break;
523      case 0xca: sprintf (buffer,"jz   $%04x", ARGW(pc)); pc+=2;     break;
524      case 0xcb: sprintf (buffer,"rstv 8 (*)"); flags = DASMFLAG_STEP_OVER; break;
525      case 0xcc: sprintf (buffer,"cz   $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
526      case 0xcd: sprintf (buffer,"call $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
527      case 0xce: sprintf (buffer,"aci  $%02x", ARG(pc)); pc++;       break;
528      case 0xcf: sprintf (buffer,"rst  1"); flags = DASMFLAG_STEP_OVER; break;
529      case 0xd0: sprintf (buffer,"rnc"); flags = DASMFLAG_STEP_OUT;  break;
530      case 0xd1: sprintf (buffer,"pop  d");                          break;
531      case 0xd2: sprintf (buffer,"jnc  $%04x", ARGW(pc)); pc+=2;     break;
532      case 0xd3: sprintf (buffer,"out  $%02x", ARG(pc)); pc++;       break;
533      case 0xd4: sprintf (buffer,"cnc  $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
534      case 0xd5: sprintf (buffer,"push d");                          break;
535      case 0xd6: sprintf (buffer,"sui  $%02x", ARG(pc)); pc++;       break;
536      case 0xd7: sprintf (buffer,"rst  2"); flags = DASMFLAG_STEP_OVER; break;
537      case 0xd8: sprintf (buffer,"rc"); flags = DASMFLAG_STEP_OUT;   break;
538      case 0xd9: sprintf (buffer,"shlx d (*)");                      break;
539      case 0xda: sprintf (buffer,"jc   $%04x", ARGW(pc)); pc+=2;     break;
540      case 0xdb: sprintf (buffer,"in   $%02x", ARG(pc)); pc++;       break;
541      case 0xdc: sprintf (buffer,"cc   $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
542      case 0xdd: sprintf (buffer,"jnx  $%04x (*)", ARGW(pc)); pc+=2; break;
543      case 0xde: sprintf (buffer,"sbi  $%02x", ARG(pc)); pc++;       break;
544      case 0xdf: sprintf (buffer,"rst  3"); flags = DASMFLAG_STEP_OVER; break;
545      case 0xe0: sprintf (buffer,"rpo"); flags = DASMFLAG_STEP_OUT;  break;
546      case 0xe1: sprintf (buffer,"pop  h");                          break;
547      case 0xe2: sprintf (buffer,"jpo  $%04x", ARGW(pc)); pc+=2;     break;
548      case 0xe3: sprintf (buffer,"xthl");                            break;
549      case 0xe4: sprintf (buffer,"cpo  $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
550      case 0xe5: sprintf (buffer,"push h");                          break;
551      case 0xe6: sprintf (buffer,"ani  $%02x", ARG(pc)); pc++;       break;
552      case 0xe7: sprintf (buffer,"rst  4"); flags = DASMFLAG_STEP_OVER; break;
553      case 0xe8: sprintf (buffer,"rpe"); flags = DASMFLAG_STEP_OUT;  break;
554      case 0xe9: sprintf (buffer,"pchl");                            break;
555      case 0xea: sprintf (buffer,"jpe  $%04x", ARGW(pc)); pc+=2;     break;
556      case 0xeb: sprintf (buffer,"xchg");                            break;
557      case 0xec: sprintf (buffer,"cpe  $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
558      case 0xed: sprintf (buffer,"lhlx d (*)");                      break;
559      case 0xee: sprintf (buffer,"xri  $%02x", ARG(pc)); pc++;       break;
560      case 0xef: sprintf (buffer,"rst  5"); flags = DASMFLAG_STEP_OVER; break;
561      case 0xf0: sprintf (buffer,"rp"); flags = DASMFLAG_STEP_OUT;   break;
562      case 0xf1: sprintf (buffer,"pop  a");                          break;
563      case 0xf2: sprintf (buffer,"jp   $%04x", ARGW(pc)); pc+=2;     break;
564      case 0xf3: sprintf (buffer,"di");                              break;
565      case 0xf4: sprintf (buffer,"cp   $%04x", ARGW(pc)); pc+=2;     break;
566      case 0xf5: sprintf (buffer,"push a");                          break;
567      case 0xf6: sprintf (buffer,"ori  $%02x", ARG(pc)); pc++;       break;
568      case 0xf7: sprintf (buffer,"rst  6"); flags = DASMFLAG_STEP_OVER; break;
569      case 0xf8: sprintf (buffer,"rm"); flags = DASMFLAG_STEP_OUT;   break;
570      case 0xf9: sprintf (buffer,"sphl");                            break;
571      case 0xfa: sprintf (buffer,"jm   $%04x", ARGW(pc)); pc+=2;     break;
572      case 0xfb: sprintf (buffer,"ei");                              break;
573      case 0xfc: sprintf (buffer,"cm   $%04x", ARGW(pc)); pc+=2; flags = DASMFLAG_STEP_OVER; break;
574      case 0xfd: sprintf (buffer,"jx   $%04x (*)", ARGW(pc)); pc+=2; break;
575      case 0xfe: sprintf (buffer,"cpi  $%02x", ARG(pc)); pc++;       break;
576      case 0xff: sprintf (buffer,"rst  7"); flags = DASMFLAG_STEP_OVER; break;
577577#endif
578578   }
579579   return (pc - PC) | flags | DASMFLAG_SUPPORTED;
src/emu/cpu/i8085/i8085.c
r3535r3536
148148   UINT32   IRQ1;      /* executed interrupt address */
149149   UINT8   STATUS;      /* status word */
150150   INT8   irq_state[4];
151   int    (*irq_callback)(int);
151   cpu_irq_callback irq_callback;
152   const device_config *device;
152153   void   (*sod_callback)(int state);
153154   int      (*sid_callback)(void);
154155}   i8085_Regs;
r3535r3536
12431244   if( I.ISRV == IM_INTR )
12441245   {
12451246      LOG(("Interrupt get INTR vector\n"));
1246      I.IRQ1 = (I.irq_callback)(0);
1247      I.IRQ1 = (I.irq_callback)(I.device, 0);
12471248   }
12481249
12491250   if( I.cputype )
r3535r3536
12511252      if( I.ISRV == IM_RST55 )
12521253      {
12531254         LOG(("Interrupt get RST5.5 vector\n"));
1254         //I.IRQ1 = (I.irq_callback)(1);
1255         //I.IRQ1 = (I.irq_callback)(I.device, 1);
12551256         I.irq_state[I8085_RST55_LINE] = CLEAR_LINE; //AT: processing RST5.5, reset interrupt line
12561257      }
12571258
12581259      if( I.ISRV == IM_RST65   )
12591260      {
12601261         LOG(("Interrupt get RST6.5 vector\n"));
1261         //I.IRQ1 = (I.irq_callback)(2);
1262         //I.IRQ1 = (I.irq_callback)(I.device, 2);
12621263         I.irq_state[I8085_RST65_LINE] = CLEAR_LINE; //AT: processing RST6.5, reset interrupt line
12631264      }
12641265
12651266      if( I.ISRV == IM_RST75 )
12661267      {
12671268         LOG(("Interrupt get RST7.5 vector\n"));
1268         //I.IRQ1 = (I.irq_callback)(3);
1269         //I.IRQ1 = (I.irq_callback)(I.device, 3);
12691270         I.irq_state[I8085_RST75_LINE] = CLEAR_LINE; //AT: processing RST7.5, reset interrupt line
12701271      }
12711272   }
r3535r3536
13011302   }
13021303}
13031304
1304static int i8085_execute(int cycles)
1305static CPU_EXECUTE( i8085 )
13051306{
13061307
13071308   i8085_ICount = cycles;
r3535r3536
13561357/****************************************************************************
13571358 * Init the 8085 emulation
13581359 ****************************************************************************/
1359static void i8085_init(int index, int clock, const void *config, int (*irqcallback)(int))
1360static CPU_INIT( i8085 )
13601361{
13611362   init_tables();
13621363   I.cputype = 1;
13631364   I.irq_callback = irqcallback;
1365   I.device = device;
13641366
13651367   state_save_register_item("i8085", index, I.AF.w.l);
13661368   state_save_register_item("i8085", index, I.BC.w.l);
r3535r3536
13821384/****************************************************************************
13831385 * Reset the 8085 emulation
13841386 ****************************************************************************/
1385static void i8085_reset(void)
1387static CPU_RESET( i8085 )
13861388{
1387   int (*save_irqcallback)(int);
1389   cpu_irq_callback save_irqcallback;
1390   const device_config *save_device;
13881391   void (*save_sodcallback)(int);
13891392   int (*save_sidcallback)(void);
13901393   int cputype_bak = I.cputype;
13911394
13921395   init_tables();
1396   save_device = I.device;
13931397   save_irqcallback = I.irq_callback;
13941398   save_sodcallback = I.sod_callback;
13951399   save_sidcallback = I.sid_callback;
13961400   memset(&I, 0, sizeof(i8085_Regs));
1401   I.device = save_device;
13971402   I.irq_callback = save_irqcallback;
13981403   I.sod_callback = save_sodcallback;
13991404   I.sid_callback = save_sidcallback;
r3535r3536
14051410/****************************************************************************
14061411 * Shut down the CPU emulation
14071412 ****************************************************************************/
1408static void i8085_exit(void)
1413static CPU_EXIT( i8085 )
14091414{
14101415   /* nothing to do */
14111416}
r3535r3536
14131418/****************************************************************************
14141419 * Get the current 8085 context
14151420 ****************************************************************************/
1416static void i8085_get_context(void *dst)
1421static CPU_GET_CONTEXT( i8085 )
14171422{
14181423   if( dst )
14191424      *(i8085_Regs*)dst = I;
r3535r3536
14221427/****************************************************************************
14231428 * Set the current 8085 context
14241429 ****************************************************************************/
1425static void i8085_set_context(void *src)
1430static CPU_SET_CONTEXT( i8085 )
14261431{
14271432   if( src )
14281433   {
r3535r3536
15911596 **************************************************************************/
15921597#if (HAS_8080)
15931598
1594static void i8080_init(int index, int clock, const void *config, int (*irqcallback)(int))
1599static CPU_INIT( i8080 )
15951600{
15961601   init_tables();
15971602   I.cputype = 0;
15981603   I.irq_callback = irqcallback;
1604   I.device = device;
15991605
16001606   state_save_register_item("i8080", index, I.AF.w.l);
16011607   state_save_register_item("i8080", index, I.BC.w.l);
r3535r3536
16431649 * Generic set_info
16441650 **************************************************************************/
16451651
1646static void i8085_set_info(UINT32 state, cpuinfo *info)
1652static CPU_SET_INFO( i8085 )
16471653{
16481654   switch (state)
16491655   {
r3535r3536
16831689 * Generic get_info
16841690 **************************************************************************/
16851691
1686void i8085_get_info(UINT32 state, cpuinfo *info)
1692CPU_GET_INFO( i8085 )
16871693{
16881694   switch (state)
16891695   {
r3535r3536
17331739      case CPUINFO_INT_REGISTER + I8085_STATUS:      info->i = I.STATUS;                  break;
17341740
17351741      /* --- the following bits of info are returned as pointers to data or functions --- */
1736      case CPUINFO_PTR_SET_INFO:                  info->setinfo = i8085_set_info;         break;
1737      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = i8085_get_context;   break;
1738      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = i8085_set_context;   break;
1739      case CPUINFO_PTR_INIT:                     info->init = i8085_init;            break;
1740      case CPUINFO_PTR_RESET:                     info->reset = i8085_reset;            break;
1741      case CPUINFO_PTR_EXIT:                     info->exit = i8085_exit;            break;
1742      case CPUINFO_PTR_EXECUTE:                  info->execute = i8085_execute;         break;
1742      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(i8085);         break;
1743      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(i8085);   break;
1744      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(i8085);   break;
1745      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i8085);            break;
1746      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(i8085);            break;
1747      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(i8085);            break;
1748      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(i8085);         break;
17431749      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1744      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = i8085_dasm;         break;
1750      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i8085);         break;
17451751      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &i8085_ICount;         break;
17461752
17471753      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
17841790 * CPU-specific get_info/set_info
17851791 **************************************************************************/
17861792
1787static void i8080_set_info(UINT32 state, cpuinfo *info)
1793static CPU_SET_INFO( i8080 )
17881794{
17891795   switch (state)
17901796   {
r3535r3536
17921798      case CPUINFO_INT_INPUT_STATE + I8080_INTR_LINE:   i8080_set_irq_line(I8080_INTR_LINE, info->i); break;
17931799      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   i8080_set_irq_line(INPUT_LINE_NMI, info->i); break;
17941800
1795      default:                              i8085_set_info(state, info);         break;
1801      default:                              CPU_SET_INFO_CALL(i8085); break;
17961802   }
17971803}
17981804
1799void i8080_get_info(UINT32 state, cpuinfo *info)
1805CPU_GET_INFO( i8080 )
18001806{
18011807   switch (state)
18021808   {
r3535r3536
18071813      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   info->i = (I.IREQ & IM_TRAP) ? ASSERT_LINE : CLEAR_LINE; break;
18081814
18091815      /* --- the following bits of info are returned as pointers to data or functions --- */
1810      case CPUINFO_PTR_SET_INFO:                  info->setinfo = i8080_set_info;         break;
1811      case CPUINFO_PTR_INIT:                     info->init = i8080_init;            break;
1816      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(i8080);         break;
1817      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i8080);            break;
18121818
18131819      /* --- the following bits of info are returned as NULL-terminated strings --- */
18141820      case CPUINFO_STR_NAME:                     strcpy(info->s, "8080");            break;
18151821
1816      default:                              i8085_get_info(state, info);         break;
1822      default:                              CPU_GET_INFO_CALL(i8085); break;
18171823   }
18181824}
18191825#endif
src/emu/cpu/powerpc/ppc403.c
r3535r3536
140140   }
141141}
142142
143static void ppc403_reset(void)
143static CPU_RESET( ppc403 )
144144{
145145   ppc.pc = ppc.npc = 0xfffffffc;
146146
r3535r3536
148148   change_pc(ppc.pc);
149149}
150150
151static int ppc403_execute(int cycles)
151static CPU_EXECUTE( ppc403 )
152152{
153153   UINT32 fit_trigger_cycle;
154154   ppc_icount = cycles;
r3535r3536
424424
425425            if (ppc.irq_callback)
426426            {
427               ppc.irq_callback(irqline);
427               ppc.irq_callback(ppc.device, irqline);
428428            }
429429         }
430430      }
src/emu/cpu/powerpc/ppc602.c
r3535r3536
173173      ppc.interrupt_pending |= 0x1;
174174      if (ppc.irq_callback)
175175      {
176         ppc.irq_callback(irqline);
176         ppc.irq_callback(ppc.device, irqline);
177177      }
178178   }
179179}
r3535r3536
207207   }
208208}
209209
210static void ppc602_reset(void)
210static CPU_RESET( ppc602 )
211211{
212212   ppc.pc = ppc.npc = 0xfff00100;
213213
r3535r3536
219219   ppc.interrupt_pending = 0;
220220}
221221
222static int ppc602_execute(int cycles)
222static CPU_EXECUTE( ppc602 )
223223{
224224   int exception_type;
225225   UINT32 opcode;
src/emu/cpu/powerpc/ppcdrc.c
r3535r3536
534534    ppcdrc_init - initialize the processor
535535-------------------------------------------------*/
536536
537static void ppcdrc_init(powerpc_flavor flavor, UINT8 cap, int tb_divisor, int index, int clock, const powerpc_config *config, int (*irqcallback)(int))
537static void ppcdrc_init(powerpc_flavor flavor, UINT8 cap, int tb_divisor, const device_config *device, int index, int clock, const powerpc_config *config, cpu_irq_callback irqcallback)
538538{
539539   drcfe_config feconfig =
540540   {
r3535r3536
558558   memset(ppc, 0, sizeof(*ppc));
559559
560560   /* initialize the core */
561   ppccom_init(ppc, flavor, cap, tb_divisor, index, clock, config, irqcallback);
561   ppccom_init(ppc, flavor, cap, tb_divisor, device, index, clock, config, irqcallback);
562562
563563   /* allocate the implementation-specific state from the full cache */
564564   ppc->impstate = drccache_memory_alloc_near(cache, sizeof(*ppc->impstate));
r3535r3536
670670    ppcdrc_reset - reset the processor
671671-------------------------------------------------*/
672672
673static void ppcdrc_reset(void)
673static CPU_RESET( ppcdrc )
674674{
675675   /* reset the common code and mark the cache dirty */
676676   ppccom_reset(ppc);
r3535r3536
684684    specified number of cycles
685685-------------------------------------------------*/
686686
687static int ppcdrc_execute(int cycles)
687static CPU_EXECUTE( ppcdrc )
688688{
689689   drcuml_state *drcuml = ppc->impstate->drcuml;
690690   int execute_result;
r3535r3536
720720    ppcdrc_exit - cleanup from execution
721721-------------------------------------------------*/
722722
723static void ppcdrc_exit(void)
723static CPU_EXIT( ppcdrc )
724724{
725725   ppccom_exit(ppc);
726726
r3535r3536
736736    current context
737737-------------------------------------------------*/
738738
739static void ppcdrc_get_context(void *dst)
739static CPU_GET_CONTEXT( ppcdrc )
740740{
741741   if (dst != NULL)
742742      *(powerpc_state **)dst = ppc;
r3535r3536
748748    into the global state
749749-------------------------------------------------*/
750750
751static void ppcdrc_set_context(void *src)
751static CPU_SET_CONTEXT( ppcdrc )
752752{
753753   if (src != NULL)
754754      ppc = *(powerpc_state **)src;
r3535r3536
760760    address translation
761761-------------------------------------------------*/
762762
763static int ppcdrc_translate(int space, int intention, offs_t *address)
763static CPU_TRANSLATE( ppcdrc )
764764{
765765   return ppccom_translate_address(ppc, space, intention, address);
766766}
r3535r3536
770770    ppcdrc_dasm - disassemble an instruction
771771-------------------------------------------------*/
772772
773static offs_t ppcdrc_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
773static CPU_DISASSEMBLE( ppcdrc )
774774{
775775   return ppccom_dasm(ppc, buffer, pc, oprom, opram);
776776}
r3535r3536
781781    CPU instance
782782-------------------------------------------------*/
783783
784static void ppcdrc_set_info(UINT32 state, cpuinfo *info)
784static CPU_SET_INFO( ppcdrc )
785785{
786786   switch (state)
787787   {
r3535r3536
812812    CPU instance
813813-------------------------------------------------*/
814814
815static void ppcdrc_get_info(UINT32 state, cpuinfo *info)
815static CPU_GET_INFO( ppcdrc )
816816{
817817   switch (state)
818818   {
r3535r3536
821821      case CPUINFO_INT_PREVIOUSPC:               /* not implemented */               break;
822822
823823      /* --- the following bits of info are returned as pointers to data or functions --- */
824      case CPUINFO_PTR_SET_INFO:                  info->setinfo = ppcdrc_set_info;      break;
825      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = ppcdrc_get_context;   break;
826      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = ppcdrc_set_context;   break;
824      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(ppcdrc);      break;
825      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(ppcdrc);   break;
826      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(ppcdrc);   break;
827827      case CPUINFO_PTR_INIT:                     /* provided per-CPU */               break;
828      case CPUINFO_PTR_RESET:                     info->reset = ppcdrc_reset;            break;
829      case CPUINFO_PTR_EXIT:                     info->exit = ppcdrc_exit;            break;
830      case CPUINFO_PTR_EXECUTE:                  info->execute = ppcdrc_execute;         break;
831      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = ppcdrc_dasm;      break;
832      case CPUINFO_PTR_TRANSLATE:                  info->translate = ppcdrc_translate;      break;
828      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(ppcdrc);            break;
829      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(ppcdrc);            break;
830      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(ppcdrc);         break;
831      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(ppcdrc);      break;
832      case CPUINFO_PTR_TRANSLATE:                  info->translate = CPU_TRANSLATE_NAME(ppcdrc);      break;
833833      case CPUINFO_PTR_CONTEXT:                  info->p = ppc;                     break;
834834
835835      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
41904190    information getter
41914191-------------------------------------------------*/
41924192
4193static void ppcdrc4xx_get_info(UINT32 state, cpuinfo *info)
4193static CPU_GET_INFO( ppcdrc4xx )
41944194{
4195   ppcdrc_get_info(state, info);
4195   CPU_GET_INFO_CALL(ppcdrc);
41964196   ppc4xx_get_info(ppc, state, info);
41974197}
41984198
r3535r3536
42024202    information setter
42034203-------------------------------------------------*/
42044204
4205static void ppcdrc4xx_set_info(UINT32 state, cpuinfo *info)
4205static CPU_SET_INFO( ppcdrc4xx )
42064206{
4207   ppcdrc_set_info(state, info);
4207   CPU_SET_INFO_CALL(ppcdrc);
42084208   ppc4xx_set_info(ppc, state, info);
42094209}
42104210
r3535r3536
42184218    initialization
42194219-------------------------------------------------*/
42204220
4221static void ppc403ga_init(int index, int clock, const void *config, int (*irqcallback)(int))
4221static CPU_INIT( ppc403ga )
42224222{
4223   ppcdrc_init(PPC_MODEL_403GA, PPCCAP_4XX, 1, index, clock, config, irqcallback);
4223   ppcdrc_init(PPC_MODEL_403GA, PPCCAP_4XX, 1, device, index, clock, config, irqcallback);
42244224}
42254225
42264226
r3535r3536
42294229    information getter
42304230-------------------------------------------------*/
42314231
4232void ppc403ga_get_info(UINT32 state, cpuinfo *info)
4232CPU_GET_INFO( ppc403ga )
42334233{
42344234   switch (state)
42354235   {
42364236      /* --- the following bits of info are returned as 64-bit signed integers --- */
42374237
42384238      /* --- the following bits of info are returned as pointers to data or functions --- */
4239      case CPUINFO_PTR_INIT:                     info->init = ppc403ga_init;            break;
4240      case CPUINFO_PTR_SET_INFO:                  info->setinfo = ppcdrc4xx_set_info;      break;
4239      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ppc403ga);            break;
4240      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(ppcdrc4xx);      break;
42414241
42424242      /* --- the following bits of info are returned as NULL-terminated strings --- */
42434243      case CPUINFO_STR_NAME:                     strcpy(info->s, "PowerPC 403GA");      break;
42444244
42454245      /* --- everything else is handled generically --- */
4246      default:                              ppcdrc4xx_get_info(state, info);      break;
4246      default:                              CPU_GET_INFO_CALL(ppcdrc4xx);      break;
42474247   }
42484248}
42494249
r3535r3536
42574257    initialization
42584258-------------------------------------------------*/
42594259
4260static void ppc403gcx_init(int index, int clock, const void *config, int (*irqcallback)(int))
4260static CPU_INIT( ppc403gcx )
42614261{
4262   ppcdrc_init(PPC_MODEL_403GCX, PPCCAP_4XX, 1, index, clock, config, irqcallback);
4262   ppcdrc_init(PPC_MODEL_403GCX, PPCCAP_4XX, 1, device, index, clock, config, irqcallback);
42634263}
42644264
42654265
r3535r3536
42684268    information getter
42694269-------------------------------------------------*/
42704270
4271void ppc403gcx_get_info(UINT32 state, cpuinfo *info)
4271CPU_GET_INFO( ppc403gcx )
42724272{
42734273   switch (state)
42744274   {
42754275      /* --- the following bits of info are returned as 64-bit signed integers --- */
42764276
42774277      /* --- the following bits of info are returned as pointers to data or functions --- */
4278      case CPUINFO_PTR_INIT:                     info->init = ppc403gcx_init;         break;
4279      case CPUINFO_PTR_SET_INFO:                  info->setinfo = ppcdrc4xx_set_info;      break;
4278      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ppc403gcx);         break;
4279      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(ppcdrc4xx);      break;
42804280
42814281      /* --- the following bits of info are returned as NULL-terminated strings --- */
42824282      case CPUINFO_STR_NAME:                     strcpy(info->s, "PowerPC 403GCX");      break;
42834283
42844284      /* --- everything else is handled generically --- */
4285      default:                              ppcdrc4xx_get_info(state, info);      break;
4285      default:                              CPU_GET_INFO_CALL(ppcdrc4xx);      break;
42864286   }
42874287}
42884288
r3535r3536
43014301    initialization
43024302-------------------------------------------------*/
43034303
4304static void ppc601_init(int index, int clock, const void *config, int (*irqcallback)(int))
4304static CPU_INIT( ppc601 )
43054305{
4306   ppcdrc_init(PPC_MODEL_601, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED, 0/* no TB */, index, clock, config, irqcallback);
4306   ppcdrc_init(PPC_MODEL_601, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED, 0/* no TB */, device, index, clock, config, irqcallback);
43074307}
43084308
43094309
r3535r3536
43124312    information getter
43134313-------------------------------------------------*/
43144314
4315void ppc601_get_info(UINT32 state, cpuinfo *info)
4315CPU_GET_INFO( ppc601 )
43164316{
43174317   switch (state)
43184318   {
43194319      /* --- the following bits of info are returned as 64-bit signed integers --- */
43204320
43214321      /* --- the following bits of info are returned as pointers to data or functions --- */
4322      case CPUINFO_PTR_INIT:                     info->init = ppc601_init;            break;
4322      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ppc601);            break;
43234323
43244324      /* --- the following bits of info are returned as NULL-terminated strings --- */
43254325      case CPUINFO_STR_NAME:                     strcpy(info->s, "PowerPC 601");         break;
43264326
43274327      /* --- everything else is handled generically --- */
4328      default:                              ppcdrc_get_info(state, info);         break;
4328      default:                              CPU_GET_INFO_CALL(ppcdrc);         break;
43294329   }
43304330}
43314331
r3535r3536
43394339    initialization
43404340-------------------------------------------------*/
43414341
4342static void ppc602_init(int index, int clock, const void *config, int (*irqcallback)(int))
4342static CPU_INIT( ppc602 )
43434343{
4344   ppcdrc_init(PPC_MODEL_602, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_603_MMU, 4, index, clock, config, irqcallback);
4344   ppcdrc_init(PPC_MODEL_602, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_603_MMU, 4, device, index, clock, config, irqcallback);
43454345}
43464346
43474347
r3535r3536
43504350    information getter
43514351-------------------------------------------------*/
43524352
4353void ppc602_get_info(UINT32 state, cpuinfo *info)
4353CPU_GET_INFO( ppc602 )
43544354{
43554355   switch (state)
43564356   {
43574357      /* --- the following bits of info are returned as 64-bit signed integers --- */
43584358
43594359      /* --- the following bits of info are returned as pointers to data or functions --- */
4360      case CPUINFO_PTR_INIT:                     info->init = ppc602_init;            break;
4360      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ppc602);            break;
43614361
43624362      /* --- the following bits of info are returned as NULL-terminated strings --- */
43634363      case CPUINFO_STR_NAME:                     strcpy(info->s, "PowerPC 602");         break;
43644364
43654365      /* --- everything else is handled generically --- */
4366      default:                              ppcdrc_get_info(state, info);         break;
4366      default:                              CPU_GET_INFO_CALL(ppcdrc);         break;
43674367   }
43684368}
43694369
r3535r3536
43774377    initialization
43784378-------------------------------------------------*/
43794379
4380static void ppc603_init(int index, int clock, const void *config, int (*irqcallback)(int))
4380static CPU_INIT( ppc603 )
43814381{
4382   ppcdrc_init(PPC_MODEL_603, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_603_MMU, 4, index, clock, config, irqcallback);
4382   ppcdrc_init(PPC_MODEL_603, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_603_MMU, 4, device, index, clock, config, irqcallback);
43834383}
43844384
43854385
r3535r3536
43884388    information getter
43894389-------------------------------------------------*/
43904390
4391void ppc603_get_info(UINT32 state, cpuinfo *info)
4391CPU_GET_INFO( ppc603 )
43924392{
43934393   switch (state)
43944394   {
43954395      /* --- the following bits of info are returned as 64-bit signed integers --- */
43964396
43974397      /* --- the following bits of info are returned as pointers to data or functions --- */
4398      case CPUINFO_PTR_INIT:                     info->init = ppc603_init;            break;
4398      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ppc603);            break;
43994399
44004400      /* --- the following bits of info are returned as NULL-terminated strings --- */
44014401      case CPUINFO_STR_NAME:                     strcpy(info->s, "PowerPC 603");         break;
44024402
44034403      /* --- everything else is handled generically --- */
4404      default:                              ppcdrc_get_info(state, info);         break;
4404      default:                              CPU_GET_INFO_CALL(ppcdrc);         break;
44054405   }
44064406}
44074407
r3535r3536
44154415    initialization
44164416-------------------------------------------------*/
44174417
4418static void ppc603e_init(int index, int clock, const void *config, int (*irqcallback)(int))
4418static CPU_INIT( ppc603e )
44194419{
4420   ppcdrc_init(PPC_MODEL_603E, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_603_MMU, 4, index, clock, config, irqcallback);
4420   ppcdrc_init(PPC_MODEL_603E, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_603_MMU, 4, device, index, clock, config, irqcallback);
44214421}
44224422
44234423
r3535r3536
44264426    information getter
44274427-------------------------------------------------*/
44284428
4429void ppc603e_get_info(UINT32 state, cpuinfo *info)
4429CPU_GET_INFO( ppc603e )
44304430{
44314431   switch (state)
44324432   {
44334433      /* --- the following bits of info are returned as 64-bit signed integers --- */
44344434
44354435      /* --- the following bits of info are returned as pointers to data or functions --- */
4436      case CPUINFO_PTR_INIT:                     info->init = ppc603e_init;            break;
4436      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ppc603e);            break;
44374437
44384438      /* --- the following bits of info are returned as NULL-terminated strings --- */
44394439      case CPUINFO_STR_NAME:                     strcpy(info->s, "PowerPC 603e");      break;
44404440
44414441      /* --- everything else is handled generically --- */
4442      default:                              ppcdrc_get_info(state, info);         break;
4442      default:                              CPU_GET_INFO_CALL(ppcdrc);         break;
44434443   }
44444444}
44454445
r3535r3536
44534453    initialization
44544454-------------------------------------------------*/
44554455
4456static void ppc603r_init(int index, int clock, const void *config, int (*irqcallback)(int))
4456static CPU_INIT( ppc603r )
44574457{
4458   ppcdrc_init(PPC_MODEL_603R, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_603_MMU, 4, index, clock, config, irqcallback);
4458   ppcdrc_init(PPC_MODEL_603R, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_603_MMU, 4, device, index, clock, config, irqcallback);
44594459}
44604460
44614461
r3535r3536
44644464    information getter
44654465-------------------------------------------------*/
44664466
4467void ppc603r_get_info(UINT32 state, cpuinfo *info)
4467CPU_GET_INFO( ppc603r )
44684468{
44694469   switch (state)
44704470   {
44714471      /* --- the following bits of info are returned as 64-bit signed integers --- */
44724472
44734473      /* --- the following bits of info are returned as pointers to data or functions --- */
4474      case CPUINFO_PTR_INIT:                     info->init = ppc603r_init;            break;
4474      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ppc603r);            break;
44754475
44764476      /* --- the following bits of info are returned as NULL-terminated strings --- */
44774477      case CPUINFO_STR_NAME:                     strcpy(info->s, "PowerPC 603R");      break;
44784478
44794479      /* --- everything else is handled generically --- */
4480      default:                              ppcdrc_get_info(state, info);         break;
4480      default:                              CPU_GET_INFO_CALL(ppcdrc);         break;
44814481   }
44824482}
44834483
r3535r3536
44914491    initialization
44924492-------------------------------------------------*/
44934493
4494static void ppc604_init(int index, int clock, const void *config, int (*irqcallback)(int))
4494static CPU_INIT( ppc604 )
44954495{
4496   ppcdrc_init(PPC_MODEL_604, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED, 4, index, clock, config, irqcallback);
4496   ppcdrc_init(PPC_MODEL_604, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED, 4, device, index, clock, config, irqcallback);
44974497}
44984498
44994499
r3535r3536
45024502    information getter
45034503-------------------------------------------------*/
45044504
4505void ppc604_get_info(UINT32 state, cpuinfo *info)
4505CPU_GET_INFO( ppc604 )
45064506{
45074507   switch (state)
45084508   {
45094509      /* --- the following bits of info are returned as 64-bit signed integers --- */
45104510
45114511      /* --- the following bits of info are returned as pointers to data or functions --- */
4512      case CPUINFO_PTR_INIT:                     info->init = ppc604_init;            break;
4512      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ppc604);            break;
45134513
45144514      /* --- the following bits of info are returned as NULL-terminated strings --- */
45154515      case CPUINFO_STR_NAME:                     strcpy(info->s, "PowerPC 604");         break;
45164516
45174517      /* --- everything else is handled generically --- */
4518      default:                              ppcdrc_get_info(state, info);         break;
4518      default:                              CPU_GET_INFO_CALL(ppcdrc);         break;
45194519   }
45204520}
45214521
r3535r3536
45344534    initialization
45354535-------------------------------------------------*/
45364536
4537static void mpc8240_init(int index, int clock, const void *config, int (*irqcallback)(int))
4537static CPU_INIT( mpc8240 )
45384538{
4539   ppcdrc_init(PPC_MODEL_MPC8240, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED, 4/* unknown */, index, clock, config, irqcallback);
4539   ppcdrc_init(PPC_MODEL_MPC8240, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED, 4/* unknown */, device, index, clock, config, irqcallback);
45404540}
45414541
45424542
r3535r3536
45454545    information getter
45464546-------------------------------------------------*/
45474547
4548void mpc8240_get_info(UINT32 state, cpuinfo *info)
4548CPU_GET_INFO( mpc8240 )
45494549{
45504550   switch (state)
45514551   {
45524552      /* --- the following bits of info are returned as 64-bit signed integers --- */
45534553
45544554      /* --- the following bits of info are returned as pointers to data or functions --- */
4555      case CPUINFO_PTR_INIT:                     info->init = mpc8240_init;            break;
4555      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(mpc8240);            break;
45564556
45574557      /* --- the following bits of info are returned as NULL-terminated strings --- */
45584558      case CPUINFO_STR_NAME:                     strcpy(info->s, "PowerPC MPC8240");      break;
45594559
45604560      /* --- everything else is handled generically --- */
4561      default:                              ppcdrc_get_info(state, info);         break;
4561      default:                              CPU_GET_INFO_CALL(ppcdrc);         break;
45624562   }
45634563}
45644564
src/emu/cpu/powerpc/ppc603.c
r3535r3536
178178      ppc.interrupt_pending |= 0x1;
179179      if (ppc.irq_callback)
180180      {
181         ppc.irq_callback(irqline);
181         ppc.irq_callback(ppc.device, irqline);
182182      }
183183   }
184184}
r3535r3536
214214   }
215215}
216216
217static void ppc603_reset(void)
217static CPU_RESET( ppc603 )
218218{
219219   ppc.pc = ppc.npc = 0xfff00100;
220220
r3535r3536
227227}
228228
229229
230static int ppc603_execute(int cycles)
230static CPU_EXECUTE( ppc603 )
231231{
232232   int exception_type;
233233   UINT32 opcode;
src/emu/cpu/powerpc/ppc_mem.c
r3535r3536
371371/***********************************************************************/
372372
373373
374static offs_t ppc_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
374static CPU_DISASSEMBLE( ppc )
375375{
376376   UINT32 op;
377377   op = BIG_ENDIANIZE_INT32(*((UINT32 *) oprom));
r3535r3536
381381/***********************************************************************/
382382
383383#if (HAS_PPC601||HAS_PPC602||HAS_PPC603||HAS_PPC604||HAS_MPC8240)
384static int ppc_readop(UINT32 offset, int size, UINT64 *value)
384static CPU_READOP( ppc )
385385{
386386   if (!(ppc.msr & MSR_IR))
387387      return 0;
r3535r3536
402402   return 1;
403403}
404404
405static int ppc_read(int space, UINT32 offset, int size, UINT64 *value)
405static CPU_READ( ppc )
406406{
407407   if (!(ppc.msr & MSR_DR))
408408      return 0;
r3535r3536
423423   return 1;
424424}
425425
426static int ppc_write(int space, UINT32 offset, int size, UINT64 value)
426static CPU_WRITE( ppc )
427427{
428428   if (!(ppc.msr & MSR_DR))
429429      return 0;
src/emu/cpu/powerpc/ppccom.c
r3535r3536
183183    structure based on the configured type
184184-------------------------------------------------*/
185185
186void ppccom_init(powerpc_state *ppc, powerpc_flavor flavor, UINT8 cap, int tb_divisor, int index, int clock, const powerpc_config *config, int (*irqcallback)(int))
186void ppccom_init(powerpc_state *ppc, powerpc_flavor flavor, UINT8 cap, int tb_divisor, const device_config *device, int index, int clock, const powerpc_config *config, cpu_irq_callback irqcallback)
187187{
188188   /* initialize based on the config */
189189   memset(ppc, 0, sizeof(*ppc));
r3535r3536
194194   ppc->tb_divisor = tb_divisor;
195195   ppc->cpu_clock = clock;
196196   ppc->irq_callback = irqcallback;
197   ppc->device = device;
197198   ppc->system_clock = (config != NULL) ? config->bus_frequency : clock;
198199   ppc->tb_divisor = (ppc->tb_divisor * clock + ppc->system_clock / 2 - 1) / ppc->system_clock;
199200
r3535r3536
18661867
18671868      /* --- the following bits of info are returned as pointers to data or functions --- */
18681869      case CPUINFO_PTR_INIT:                     /* provided per-CPU */               break;
1869      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_internal_ppc4xx; break;
1870      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(internal_ppc4xx); break;
18701871
18711872      /* --- everything else is handled generically --- */
18721873      default:                              ppccom_get_info(ppc, state, info);      break;
src/emu/cpu/powerpc/ppc.c
r3535r3536
312312
313313   UINT64 tb;         /* 56-bit timebase register */
314314
315   int (*irq_callback)(int irqline);
315   cpu_irq_callback irq_callback;
316   const device_config *device;
316317
317
318318   // STUFF added for the 6xx series
319319   UINT32 dec, dec_frac;
320320   UINT32 fpscr;
r3535r3536
974974
975975// !!! probably should move this stuff elsewhere !!!
976976#if HAS_PPC403
977static void ppc403_init(int index, int clock, const void *_config, int (*irqcallback)(int))
977static CPU_INIT( ppc403 )
978978{
979   const ppc_config *config = _config;
979   const ppc_config *configdata = config;
980980
981981   ppc_init();
982982
r3535r3536
10091009   ppc.write32_unaligned = ppc403_write32_unaligned;
10101010
10111011   ppc.irq_callback = irqcallback;
1012   ppc.device = device;
10121013
1013   ppc.pvr = config->pvr;
1014   ppc.pvr = configdata->pvr;
10141015}
10151016
1016static void ppc403_exit(void)
1017static CPU_EXIT( ppc403 )
10171018{
10181019
10191020}
r3535r3536
10211022
10221023
10231024#if (HAS_PPC603)
1024static void ppc603_init(int index, int clock, const void *_config, int (*irqcallback)(int))
1025static CPU_INIT( ppc603 )
10251026{
1026   const ppc_config *config = _config;
1027   const ppc_config *configdata = config;
10271028   int pll_config = 0;
10281029   float multiplier;
10291030   int i ;
r3535r3536
11351136   ppc.write64_unaligned = ppc_write64_unaligned;
11361137
11371138   ppc.irq_callback = irqcallback;
1139   ppc.device = device;
11381140
1139   ppc.pvr = config->pvr;
1141   ppc.pvr = configdata->pvr;
11401142
1141   multiplier = (float)((config->bus_frequency_multiplier >> 4) & 0xf) +
1142             (float)(config->bus_frequency_multiplier & 0xf) / 10.0f;
1143   multiplier = (float)((configdata->bus_frequency_multiplier >> 4) & 0xf) +
1144             (float)(configdata->bus_frequency_multiplier & 0xf) / 10.0f;
11431145   bus_freq_multiplier = (int)(multiplier * 2);
11441146
11451147   switch(config->pvr)
11461148   {
1147      case PPC_MODEL_603E:   pll_config = mpc603e_pll_config[bus_freq_multiplier-1][config->bus_frequency]; break;
1148      case PPC_MODEL_603EV:   pll_config = mpc603ev_pll_config[bus_freq_multiplier-1][config->bus_frequency]; break;
1149      case PPC_MODEL_603R:   pll_config = mpc603r_pll_config[bus_freq_multiplier-1][config->bus_frequency]; break;
1149      case PPC_MODEL_603E:   pll_config = mpc603e_pll_config[bus_freq_multiplier-1][configdata->bus_frequency]; break;
1150      case PPC_MODEL_603EV:   pll_config = mpc603ev_pll_config[bus_freq_multiplier-1][configdata->bus_frequency]; break;
1151      case PPC_MODEL_603R:   pll_config = mpc603r_pll_config[bus_freq_multiplier-1][configdata->bus_frequency]; break;
11501152      default: break;
11511153   }
11521154
r3535r3536
11581160   ppc.hid1 = pll_config << 28;
11591161}
11601162
1161static void ppc603_exit(void)
1163static CPU_EXIT( ppc603 )
11621164{
11631165
11641166}
11651167#endif
11661168
11671169#if (HAS_PPC602)
1168static void ppc602_init(int index, int clock, const void *_config, int (*irqcallback)(int))
1170static CPU_INIT( ppc602 )
11691171{
11701172   float multiplier;
1171   const ppc_config *config = _config;
1173   const ppc_config *configdata = config;
11721174
11731175   int i ;
11741176
r3535r3536
12831285   ppc.write64_unaligned = ppc_write64_unaligned;
12841286
12851287   ppc.irq_callback = irqcallback;
1288   ppc.device = device;
12861289
1287   ppc.pvr = config->pvr;
1290   ppc.pvr = configdata->pvr;
12881291
1289   multiplier = (float)((config->bus_frequency_multiplier >> 4) & 0xf) +
1290             (float)(config->bus_frequency_multiplier & 0xf) / 10.0f;
1292   multiplier = (float)((configdata->bus_frequency_multiplier >> 4) & 0xf) +
1293             (float)(configdata->bus_frequency_multiplier & 0xf) / 10.0f;
12911294   bus_freq_multiplier = (int)(multiplier * 2);
12921295}
12931296
1294static void ppc602_exit(void)
1297static CPU_EXIT( ppc602 )
12951298{
12961299
12971300}
r3535r3536
13091312
13101313}
13111314
1312static void mpc8240_init(int index, int clock, const void *_config, int (*irqcallback)(int))
1315static CPU_INIT( mpc8240 )
13131316{
13141317   float multiplier;
1315   const ppc_config *config = _config;
1318   const ppc_config *configdata = config;
13161319
13171320   int i ;
13181321
r3535r3536
14251428   ppc.write64_unaligned = ppc_write64_unaligned;
14261429
14271430   ppc.irq_callback = irqcallback;
1431   ppc.device = device;
14281432
1429   ppc.pvr = config->pvr;
1433   ppc.pvr = configdata->pvr;
14301434
1431   multiplier = (float)((config->bus_frequency_multiplier >> 4) & 0xf) +
1432             (float)(config->bus_frequency_multiplier & 0xf) / 10.0f;
1435   multiplier = (float)((configdata->bus_frequency_multiplier >> 4) & 0xf) +
1436             (float)(configdata->bus_frequency_multiplier & 0xf) / 10.0f;
14331437   bus_freq_multiplier = (int)(multiplier * 2);
14341438}
14351439
1436static void mpc8240_exit(void)
1440static CPU_EXIT( mpc8240 )
14371441{
14381442
14391443}
r3535r3536
14411445
14421446
14431447#if (HAS_PPC601)
1444static void ppc601_init(int index, int clock, const void *_config, int (*irqcallback)(int))
1448static CPU_INIT( ppc601 )
14451449{
1446   const ppc_config *config = _config;
1450   const ppc_config *configdata = config;
14471451   float multiplier;
14481452   int i ;
14491453
r3535r3536
15521556   ppc.write64_unaligned = ppc_write64_unaligned;
15531557
15541558   ppc.irq_callback = irqcallback;
1559   ppc.device = device;
15551560
1556   ppc.pvr = config->pvr;
1561   ppc.pvr = configdata->pvr;
15571562
1558   multiplier = (float)((config->bus_frequency_multiplier >> 4) & 0xf) +
1559             (float)(config->bus_frequency_multiplier & 0xf) / 10.0f;
1563   multiplier = (float)((configdata->bus_frequency_multiplier >> 4) & 0xf) +
1564             (float)(configdata->bus_frequency_multiplier & 0xf) / 10.0f;
15601565   bus_freq_multiplier = (int)(multiplier * 2);
15611566
15621567   ppc.hid1 = 0;
15631568}
15641569
1565static void ppc601_exit(void)
1570static CPU_EXIT( ppc601 )
15661571{
15671572
15681573}
15691574#endif
15701575
15711576#if (HAS_PPC604)
1572static void ppc604_init(int index, int clock, const void *_config, int (*irqcallback)(int))
1577static CPU_INIT( ppc604 )
15731578{
1574   const ppc_config *config = _config;
1579   const ppc_config *configdata = config;
15751580   float multiplier;
15761581   int i ;
15771582
r3535r3536
16821687   ppc.write64_unaligned = ppc_write64_unaligned;
16831688
16841689   ppc.irq_callback = irqcallback;
1690   ppc.device = device;
16851691
1686   ppc.pvr = config->pvr;
1692   ppc.pvr = configdata->pvr;
16871693
1688   multiplier = (float)((config->bus_frequency_multiplier >> 4) & 0xf) +
1689             (float)(config->bus_frequency_multiplier & 0xf) / 10.0f;
1694   multiplier = (float)((configdata->bus_frequency_multiplier >> 4) & 0xf) +
1695             (float)(configdata->bus_frequency_multiplier & 0xf) / 10.0f;
16901696   bus_freq_multiplier = (int)(multiplier * 2);
16911697
16921698   ppc.hid1 = 0;
16931699}
16941700
1695static void ppc604_exit(void)
1701static CPU_EXIT( ppc604 )
16961702{
16971703
16981704}
r3535r3536
17001706
17011707
17021708
1703static void ppc_get_context(void *dst)
1709static CPU_GET_CONTEXT( ppc )
17041710{
17051711   /* copy the context */
17061712   if (dst)
r3535r3536
17081714}
17091715
17101716
1711static void ppc_set_context(void *src)
1717static CPU_SET_CONTEXT( ppc )
17121718{
17131719   /* copy the context */
17141720   if (src)
r3535r3536
17211727 * Generic set_info
17221728 **************************************************************************/
17231729
1724static void ppc_set_info(UINT32 state, cpuinfo *info)
1730static CPU_SET_INFO( ppc )
17251731{
17261732   switch (state)
17271733   {
r3535r3536
17711777}
17721778
17731779#if (HAS_PPC403)
1774static void ppc403_set_info(UINT32 state, cpuinfo *info)
1780static CPU_SET_INFO( ppc403 )
17751781{
17761782   if (state >= CPUINFO_INT_INPUT_STATE && state <= CPUINFO_INT_INPUT_STATE + 8)
17771783   {
r3535r3536
17881794#endif
17891795
17901796#if (HAS_PPC603)
1791static void ppc603_set_info(UINT32 state, cpuinfo *info)
1797static CPU_SET_INFO( ppc603 )
17921798{
17931799   if (state >= CPUINFO_INT_INPUT_STATE && state <= CPUINFO_INT_INPUT_STATE + 5)
17941800   {
r3535r3536
18041810}
18051811#endif
18061812
1807static void ppc_get_info(UINT32 state, cpuinfo *info)
1813static CPU_GET_INFO( ppc )
18081814{
18091815   switch(state)
18101816   {
r3535r3536
18801886
18811887
18821888      /* --- the following bits of info are returned as pointers to data or functions --- */
1883      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = ppc_get_context;      break;
1884      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = ppc_set_context;      break;
1889      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(ppc);      break;
1890      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(ppc);      break;
18851891      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1886      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = ppc_dasm;         break;
1892      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(ppc);         break;
18871893      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &ppc_icount;            break;
18881894
18891895      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
19401946}
19411947
19421948#if (HAS_PPC403)
1943void ppc403_get_info(UINT32 state, cpuinfo *info)
1949CPU_GET_INFO( ppc403 )
19441950{
19451951   switch(state)
19461952   {
r3535r3536
19511957      case CPUINFO_INT_REGISTER + PPC_EXISR:         info->i = EXISR;                  break;
19521958
19531959      /* --- the following bits of info are returned as pointers to data or functions --- */
1954      case CPUINFO_PTR_SET_INFO:                  info->setinfo = ppc403_set_info;      break;
1955      case CPUINFO_PTR_INIT:                     info->init = ppc403_init;            break;
1956      case CPUINFO_PTR_RESET:                     info->reset = ppc403_reset;            break;
1957      case CPUINFO_PTR_EXIT:                     info->exit = ppc403_exit;            break;
1958      case CPUINFO_PTR_EXECUTE:                  info->execute = ppc403_execute;         break;
1960      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(ppc403);      break;
1961      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ppc403);            break;
1962      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(ppc403);            break;
1963      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(ppc403);            break;
1964      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(ppc403);         break;
19591965
19601966      /* --- the following bits of info are returned as NULL-terminated strings --- */
19611967      case CPUINFO_STR_NAME:                     strcpy(info->s, "PPC403");            break;
r3535r3536
19681974#endif
19691975
19701976#if (HAS_PPC603)
1971void ppc603_get_info(UINT32 state, cpuinfo *info)
1977CPU_GET_INFO( ppc603 )
19721978{
19731979   switch(state)
19741980   {
r3535r3536
19831989      case CPUINFO_INT_REGISTER + PPC_DEC:         info->i = read_decrementer();         break;
19841990
19851991      /* --- the following bits of info are returned as pointers to data or functions --- */
1986      case CPUINFO_PTR_SET_INFO:                  info->setinfo = ppc603_set_info;      break;
1987      case CPUINFO_PTR_INIT:                     info->init = ppc603_init;            break;
1988      case CPUINFO_PTR_RESET:                     info->reset = ppc603_reset;            break;
1989      case CPUINFO_PTR_EXIT:                     info->exit = ppc603_exit;            break;
1990      case CPUINFO_PTR_EXECUTE:                  info->execute = ppc603_execute;         break;
1991      case CPUINFO_PTR_READ:                     info->read = ppc_read;               break;
1992      case CPUINFO_PTR_WRITE:                     info->write = ppc_write;            break;
1993      case CPUINFO_PTR_READOP:                  info->readop = ppc_readop;            break;
1992      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(ppc603);      break;
1993      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ppc603);            break;
1994      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(ppc603);            break;
1995      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(ppc603);            break;
1996      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(ppc603);         break;
1997      case CPUINFO_PTR_READ:                     info->read = CPU_GET_READ_NAME(ppc);               break;
1998      case CPUINFO_PTR_WRITE:                     info->write = CPU_GET_WRITE_NAME(ppc);            break;
1999      case CPUINFO_PTR_READOP:                  info->readop = CPU_GET_READOP_NAME(ppc);            break;
19942000      case CPUINFO_PTR_TRANSLATE:                  info->translate = ppc_translate_address_cb;   break;
19952001
19962002      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
20052011/* PowerPC 602 */
20062012
20072013#if (HAS_PPC602)
2008static void ppc602_set_info(UINT32 state, cpuinfo *info)
2014static CPU_SET_INFO( ppc602 )
20092015{
20102016   if (state >= CPUINFO_INT_INPUT_STATE && state <= CPUINFO_INT_INPUT_STATE + 5)
20112017   {
r3535r3536
20192025   }
20202026}
20212027
2022void ppc602_get_info(UINT32 state, cpuinfo *info)
2028CPU_GET_INFO( ppc602 )
20232029{
20242030   switch(state)
20252031   {
r3535r3536
20322038      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32;               break;
20332039
20342040      /* --- the following bits of info are returned as pointers to data or functions --- */
2035      case CPUINFO_PTR_SET_INFO:                  info->setinfo = ppc602_set_info;      break;
2036      case CPUINFO_PTR_INIT:                     info->init = ppc602_init;            break;
2037      case CPUINFO_PTR_RESET:                     info->reset = ppc602_reset;            break;
2038      case CPUINFO_PTR_EXIT:                     info->exit = ppc602_exit;            break;
2039      case CPUINFO_PTR_EXECUTE:                  info->execute = ppc602_execute;         break;
2040      case CPUINFO_PTR_READ:                     info->read = ppc_read;               break;
2041      case CPUINFO_PTR_WRITE:                     info->write = ppc_write;            break;
2042      case CPUINFO_PTR_READOP:                  info->readop = ppc_readop;            break;
2041      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(ppc602);      break;
2042      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ppc602);            break;
2043      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(ppc602);            break;
2044      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(ppc602);            break;
2045      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(ppc602);         break;
2046      case CPUINFO_PTR_READ:                     info->read = CPU_GET_READ_NAME(ppc);               break;
2047      case CPUINFO_PTR_WRITE:                     info->write = CPU_GET_WRITE_NAME(ppc);            break;
2048      case CPUINFO_PTR_READOP:                  info->readop = CPU_GET_READOP_NAME(ppc);            break;
20432049      case CPUINFO_PTR_TRANSLATE:                  info->translate = ppc_translate_address_cb;   break;
20442050
20452051      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
20542060/* Motorola MPC8240 */
20552061
20562062#if (HAS_MPC8240)
2057static void mpc8240_set_info(UINT32 state, cpuinfo *info)
2063static CPU_SET_INFO( mpc8240 )
20582064{
20592065   if (state >= CPUINFO_INT_INPUT_STATE && state <= CPUINFO_INT_INPUT_STATE + 5)
20602066   {
r3535r3536
20672073   }
20682074}
20692075
2070void mpc8240_get_info(UINT32 state, cpuinfo *info)
2076CPU_GET_INFO( mpc8240 )
20712077{
20722078   switch(state)
20732079   {
r3535r3536
20792085      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32;               break;
20802086
20812087      /* --- the following bits of info are returned as pointers to data or functions --- */
2082      case CPUINFO_PTR_SET_INFO:                  info->setinfo = mpc8240_set_info;      break;
2083      case CPUINFO_PTR_INIT:                     info->init = mpc8240_init;            break;
2084      case CPUINFO_PTR_RESET:                     info->reset = ppc603_reset;            break;
2085      case CPUINFO_PTR_EXIT:                     info->exit = mpc8240_exit;            break;
2086      case CPUINFO_PTR_EXECUTE:                  info->execute = ppc603_execute;         break;
2087      case CPUINFO_PTR_READ:                     info->read = ppc_read;               break;
2088      case CPUINFO_PTR_WRITE:                     info->write = ppc_write;            break;
2089      case CPUINFO_PTR_READOP:                  info->readop = ppc_readop;            break;
2088      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(mpc8240);      break;
2089      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(mpc8240);            break;
2090      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(ppc603);            break;
2091      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(mpc8240);            break;
2092      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(ppc603);         break;
2093      case CPUINFO_PTR_READ:                     info->read = CPU_GET_READ_NAME(ppc);               break;
2094      case CPUINFO_PTR_WRITE:                     info->write = CPU_GET_WRITE_NAME(ppc);            break;
2095      case CPUINFO_PTR_READOP:                  info->readop = CPU_GET_READOP_NAME(ppc);            break;
20902096
20912097      /* --- the following bits of info are returned as NULL-terminated strings --- */
20922098      case CPUINFO_STR_NAME:                     strcpy(info->s, "MPC8240");            break;
r3535r3536
20992105/* PPC601 */
21002106
21012107#if (HAS_PPC601)
2102static void ppc601_set_info(UINT32 state, cpuinfo *info)
2108static CPU_SET_INFO( ppc601 )
21032109{
21042110   if (state >= CPUINFO_INT_INPUT_STATE && state <= CPUINFO_INT_INPUT_STATE + 5)
21052111   {
r3535r3536
21122118   }
21132119}
21142120
2115void ppc601_get_info(UINT32 state, cpuinfo *info)
2121CPU_GET_INFO( ppc601 )
21162122{
21172123   switch(state)
21182124   {
r3535r3536
21242130      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32;               break;
21252131
21262132      /* --- the following bits of info are returned as pointers to data or functions --- */
2127      case CPUINFO_PTR_SET_INFO:                  info->setinfo = ppc601_set_info;      break;
2128      case CPUINFO_PTR_INIT:                     info->init = ppc601_init;            break;
2129      case CPUINFO_PTR_RESET:                     info->reset = ppc603_reset;            break;
2130      case CPUINFO_PTR_EXIT:                     info->exit = ppc601_exit;            break;
2131      case CPUINFO_PTR_EXECUTE:                  info->execute = ppc603_execute;         break;
2132      case CPUINFO_PTR_READ:                     info->read = ppc_read;               break;
2133      case CPUINFO_PTR_WRITE:                     info->write = ppc_write;            break;
2134      case CPUINFO_PTR_READOP:                  info->readop = ppc_readop;            break;
2133      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(ppc601);      break;
2134      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ppc601);            break;
2135      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(ppc603);            break;
2136      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(ppc601);            break;
2137      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(ppc603);         break;
2138      case CPUINFO_PTR_READ:                     info->read = CPU_GET_READ_NAME(ppc);               break;
2139      case CPUINFO_PTR_WRITE:                     info->write = CPU_GET_WRITE_NAME(ppc);            break;
2140      case CPUINFO_PTR_READOP:                  info->readop = CPU_GET_READOP_NAME(ppc);            break;
21352141
21362142      /* --- the following bits of info are returned as NULL-terminated strings --- */
21372143      case CPUINFO_STR_NAME:                     strcpy(info->s, "PPC601");            break;
r3535r3536
21442150/* PPC604 */
21452151
21462152#if (HAS_PPC604)
2147static void ppc604_set_info(UINT32 state, cpuinfo *info)
2153static CPU_SET_INFO( ppc604 )
21482154{
21492155   if (state >= CPUINFO_INT_INPUT_STATE && state <= CPUINFO_INT_INPUT_STATE + 5)
21502156   {
r3535r3536
21572163   }
21582164}
21592165
2160void ppc604_get_info(UINT32 state, cpuinfo *info)
2166CPU_GET_INFO( ppc604 )
21612167{
21622168   switch(state)
21632169   {
r3535r3536
21692175      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32;               break;
21702176
21712177      /* --- the following bits of info are returned as pointers to data or functions --- */
2172      case CPUINFO_PTR_SET_INFO:                  info->setinfo = ppc604_set_info;      break;
2173      case CPUINFO_PTR_INIT:                     info->init = ppc604_init;            break;
2174      case CPUINFO_PTR_RESET:                     info->reset = ppc603_reset;            break;
2175      case CPUINFO_PTR_EXIT:                     info->exit = ppc604_exit;            break;
2176      case CPUINFO_PTR_EXECUTE:                  info->execute = ppc603_execute;         break;
2177      case CPUINFO_PTR_READ:                     info->read = ppc_read;               break;
2178      case CPUINFO_PTR_WRITE:                     info->write = ppc_write;            break;
2179      case CPUINFO_PTR_READOP:                  info->readop = ppc_readop;            break;
2178      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(ppc604);      break;
2179      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ppc604);            break;
2180      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(ppc603);            break;
2181      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(ppc604);            break;
2182      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(ppc603);         break;
2183      case CPUINFO_PTR_READ:                     info->read = CPU_GET_READ_NAME(ppc);               break;
2184      case CPUINFO_PTR_WRITE:                     info->write = CPU_GET_WRITE_NAME(ppc);            break;
2185      case CPUINFO_PTR_READOP:                  info->readop = CPU_GET_READOP_NAME(ppc);            break;
21802186
21812187      /* --- the following bits of info are returned as NULL-terminated strings --- */
21822188      case CPUINFO_STR_NAME:                     strcpy(info->s, "PPC604");            break;
src/emu/cpu/powerpc/ppccom.h
r3535r3536
552552
553553   /* internal stuff */
554554   int            cpunum;
555   int          (*irq_callback)(int irqline);
555   cpu_irq_callback irq_callback;
556   const device_config *device;
556557   UINT32         irq_pending;
557558   UINT32         system_clock;
558559   UINT32         cpu_clock;
r3535r3536
570571    FUNCTION PROTOTYPES
571572***************************************************************************/
572573
573void ppccom_init(powerpc_state *ppc, powerpc_flavor flavor, UINT8 cap, int tb_divisor, int index, int clock, const powerpc_config *config, int (*irqcallback)(int));
574void ppccom_init(powerpc_state *ppc, powerpc_flavor flavor, UINT8 cap, int tb_divisor, const device_config *device, int index, int clock, const powerpc_config *config, cpu_irq_callback irqcallback);
574575void ppccom_exit(powerpc_state *ppc);
575576
576577void ppccom_reset(powerpc_state *ppc);
src/emu/cpu/powerpc/ppc.h
r3535r3536
151151***************************************************************************/
152152
153153#if (HAS_PPC403GA)
154void ppc403ga_get_info(UINT32 state, cpuinfo *info);
154CPU_GET_INFO( ppc403ga );
155155#endif
156156
157157#if (HAS_PPC403GCX)
158void ppc403gcx_get_info(UINT32 state, cpuinfo *info);
158CPU_GET_INFO( ppc403gcx );
159159#endif
160160
161161#if (HAS_PPC601)
162void ppc601_get_info(UINT32 state, cpuinfo *info);
162CPU_GET_INFO( ppc601 );
163163#endif
164164
165165#if (HAS_PPC602)
166void ppc602_get_info(UINT32 state, cpuinfo *info);
166CPU_GET_INFO( ppc602 );
167167#endif
168168
169169#if (HAS_PPC603)
170void ppc603_get_info(UINT32 state, cpuinfo *info);
170CPU_GET_INFO( ppc603 );
171171#endif
172172
173173#if (HAS_PPC603E)
174void ppc603e_get_info(UINT32 state, cpuinfo *info);
174CPU_GET_INFO( ppc603e );
175175#endif
176176
177177#if (HAS_PPC603R)
178void ppc603r_get_info(UINT32 state, cpuinfo *info);
178CPU_GET_INFO( ppc603r );
179179#endif
180180
181181#if (HAS_PPC604)
182void ppc604_get_info(UINT32 state, cpuinfo *info);
182CPU_GET_INFO( ppc604 );
183183#endif
184184
185185#if (HAS_MPC8240)
186void mpc8240_get_info(UINT32 state, cpuinfo *info);
186CPU_GET_INFO( mpc8240 );
187187#endif
188188
189189
src/emu/cpu/powerpc/drc_ops.c
r3535r3536
5151   drconfig.pcptr            = (UINT32 *)&ppc.pc;
5252   drconfig.icountptr        = (UINT32 *)&ppc_icount;
5353   drconfig.esiptr           = NULL;
54   drconfig.cb_reset         = ppcdrc_reset;
54   drconfig.cb_reset         = CPU_RESET_NAME(ppcdrc);
5555   drconfig.cb_recompile     = ppcdrc_recompile;
5656   drconfig.cb_entrygen      = ppcdrc_entrygen;
5757
r3535r3536
110110   }
111111}
112112
113static void ppcdrc_exit(void)
113static CPU_EXIT( ppcdrc )
114114{
115115   drc_exit(ppc.drc);
116116}
src/emu/cpu/arm/arm.c
r3535r3536
230230   UINT32 coproRegister[16];
231231   UINT8 pendingIrq;
232232   UINT8 pendingFiq;
233   int (*irq_callback)(int);
233   cpu_irq_callback irq_callback;
234   const device_config *device;
234235} ARM_REGS;
235236
236237static ARM_REGS arm;
r3535r3536
300301
301302/***************************************************************************/
302303
303static void arm_reset(void)
304static CPU_RESET( arm )
304305{
305   int (*save_irqcallback)(int) = arm.irq_callback;
306   cpu_irq_callback save_irqcallback = arm.irq_callback;
307   const device_config *save_device = arm.device;
306308   memset(&arm, 0, sizeof(arm));
307309   arm.irq_callback = save_irqcallback;
310   arm.device = save_device;
308311
309312   /* start up in SVC mode with interrupts disabled. */
310313   R15 = eARM_MODE_SVC|I_MASK|F_MASK;
311314   change_pc(R15 & ADDRESS_MASK);
312315}
313316
314static void arm_exit(void)
317static CPU_EXIT( arm )
315318{
316319   /* nothing to do here */
317320}
318321
319static int arm_execute( int cycles )
322static CPU_EXECUTE( arm )
320323{
321324   UINT32 pc;
322325   UINT32 insn;
r3535r3536
431434} /* arm_execute */
432435
433436
434static void arm_get_context(void *dst)
437static CPU_GET_CONTEXT( arm )
435438{
436439   if( dst )
437440   {
r3535r3536
439442   }
440443}
441444
442static void arm_set_context(void *src)
445static CPU_SET_CONTEXT( arm )
443446{
444447   if (src)
445448   {
r3535r3536
503506   arm_check_irq_state();
504507}
505508
506static offs_t arm_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
509static CPU_DISASSEMBLE( arm )
507510{
508511   UINT32 opcode = oprom[0] | (oprom[1] << 8) | (oprom[2] << 16) | (oprom[3] << 24);
509512   return 4 | arm_disasm(buffer, pc, opcode);
510513}
511514
512static void arm_init(int index, int clock, const void *config, int (*irqcallback)(int))
515static CPU_INIT( arm )
513516{
514517   arm.irq_callback = irqcallback;
518   arm.device = device;
515519
516520   state_save_register_item_array("arm", index, arm.sArmRegister);
517521   state_save_register_item_array("arm", index, arm.coproRegister);
r3535r3536
14101414 * Generic set_info
14111415 **************************************************************************/
14121416
1413static void arm_set_info(UINT32 state, cpuinfo *info)
1417static CPU_SET_INFO( arm )
14141418{
14151419   switch (state)
14161420   {
r3535r3536
14581462 * Generic get_info
14591463 **************************************************************************/
14601464
1461void arm_get_info(UINT32 state, cpuinfo *info)
1465CPU_GET_INFO( arm )
14621466{
14631467   switch (state)
14641468   {
r3535r3536
15221526      case CPUINFO_INT_REGISTER + ARM32_SR14:         info->i = arm.sArmRegister[eR14_SVC];   break;
15231527
15241528      /* --- the following bits of info are returned as pointers to data or functions --- */
1525      case CPUINFO_PTR_SET_INFO:                  info->setinfo = arm_set_info;         break;
1526      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = arm_get_context;      break;
1527      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = arm_set_context;      break;
1528      case CPUINFO_PTR_INIT:                     info->init = arm_init;               break;
1529      case CPUINFO_PTR_RESET:                     info->reset = arm_reset;            break;
1530      case CPUINFO_PTR_EXIT:                     info->exit = arm_exit;               break;
1531      case CPUINFO_PTR_EXECUTE:                  info->execute = arm_execute;         break;
1529      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(arm);         break;
1530      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(arm);      break;
1531      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(arm);      break;
1532      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(arm);               break;
1533      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(arm);            break;
1534      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(arm);               break;
1535      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(arm);         break;
15321536      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1533      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = arm_dasm;         break;
1537      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(arm);         break;
15341538      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &arm_icount;            break;
15351539
15361540      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/arm/arm.h
r3535r3536
1616 *  PUBLIC FUNCTIONS
1717 ***************************************************************************************************/
1818
19extern void arm_get_info(UINT32 state, cpuinfo *info);
19extern CPU_GET_INFO( arm );
2020
2121extern UINT32 arm_disasm(char *pBuf, UINT32 pc, UINT32 opcode);
2222
src/emu/cpu/lr35902/lr35902.c
r3535r3536
6363   UINT8   IF;
6464   int   irq_state;
6565   int   ei_delay;
66   int   (*irq_callback)(int irqline);
66   cpu_irq_callback irq_callback;
67   const device_config *device;
6768   /* Timer stuff */
6869   void   (*timer_fired_func)(int cycles);
6970   /* Fetch & execute related */
r3535r3536
178179    8, 8, 8, 8, 8, 8,16, 8, 8, 8, 8, 8, 8, 8,16, 8
179180};
180181
181static void lr35902_init(int index, int clock, const void *config, int (*irqcallback)(int))
182static CPU_INIT( lr35902 )
182183{
183184   Regs.w.config = (const lr35902_cpu_core *) config;
184185   Regs.w.irq_callback = irqcallback;
186   Regs.w.device = device;
185187}
186188
187189/*** Reset lr353902 registers: ******************************/
r3535r3536
189191/*** file before starting execution with lr35902_execute()***/
190192/*** It sets the registers to their initial values.       ***/
191193/************************************************************/
192static void lr35902_reset(void)
194static CPU_RESET( lr35902 )
193195{
194196   Regs.w.AF = 0x0000;
195197   Regs.w.BC = 0x0000;
r3535r3536
273275            }
274276            if ( Regs.w.enable & IME ) {
275277               if ( Regs.w.irq_callback )
276                  (*Regs.w.irq_callback)(irqline);
278                  (*Regs.w.irq_callback)(Regs.w.device, irqline);
277279               Regs.w.enable &= ~IME;
278280               Regs.w.IF &= ~(1 << irqline);
279281               CYCLES_PASSED( 20 );
r3535r3536
292294/*** Execute lr35902 code for cycles cycles, return nr of ***/
293295/*** cycles actually executed.                            ***/
294296/************************************************************/
295static int lr35902_execute (int cycles)
297static CPU_EXECUTE( lr35902 )
296298{
297299   lr35902_ICount = cycles;
298300
r3535r3536
326328   return cycles - lr35902_ICount;
327329}
328330
329static void lr35902_burn(int cycles)
331static CPU_BURN( lr35902 )
330332{
331333    if( cycles > 0 )
332334    {
r3535r3536
339341/****************************************************************************/
340342/* Set all registers to given values                                        */
341343/****************************************************************************/
342static void lr35902_set_context (void *src)
344static CPU_SET_CONTEXT( lr35902 )
343345{
344346   if( src )
345347      Regs = *(lr35902_regs *)src;
r3535r3536
349351/****************************************************************************/
350352/* Get all registers in given buffer                                        */
351353/****************************************************************************/
352static void lr35902_get_context (void *dst)
354static CPU_GET_CONTEXT( lr35902 )
353355{
354356   if( dst )
355357      *(lr35902_regs *)dst = Regs;
r3535r3536
387389}
388390#endif
389391
390static void lr35902_set_info(UINT32 state, cpuinfo *info)
392static CPU_SET_INFO( lr35902 )
391393{
392394   switch (state)
393395   {
r3535r3536
413415   }
414416}
415417
416void lr35902_get_info(UINT32 state, cpuinfo *info)
418CPU_GET_INFO( lr35902 )
417419{
418420   switch (state)
419421   {
r3535r3536
460462   case CPUINFO_INT_REGISTER + LR35902_SPEED:      info->i = 0x7E | ( ( Regs.w.gb_speed - 1 ) << 7 ) | Regs.w.gb_speed_change_pending; break;
461463
462464   /* --- the following bits of info are returned as pointers to data or functions --- */
463   case CPUINFO_PTR_SET_INFO:                  info->setinfo = lr35902_set_info;      break;
464   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = lr35902_get_context;   break;
465   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = lr35902_set_context;   break;
466   case CPUINFO_PTR_INIT:                     info->init = lr35902_init;            break;
467   case CPUINFO_PTR_RESET:                     info->reset = lr35902_reset;         break;
468   case CPUINFO_PTR_EXECUTE:                  info->execute = lr35902_execute;      break;
469   case CPUINFO_PTR_BURN:                     info->burn = lr35902_burn;            break;
470   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = lr35902_dasm;      break;
465   case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(lr35902);      break;
466   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(lr35902);   break;
467   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(lr35902);   break;
468   case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(lr35902);            break;
469   case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(lr35902);         break;
470   case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(lr35902);      break;
471   case CPUINFO_PTR_BURN:                     info->burn = CPU_BURN_NAME(lr35902);            break;
472   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(lr35902);      break;
471473   case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &lr35902_ICount;         break;
472474
473475   /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/lr35902/lr35902d.c
r3535r3536
201201 * Disassemble opcode at PC and return number of bytes it takes
202202 ****************************************************************************/
203203
204unsigned lr35902_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram )
204CPU_DISASSEMBLE( lr35902 )
205205{
206206   const lr35902dasm *d;
207207   const char *symbol, *src;
src/emu/cpu/lr35902/lr35902.h
r3535r3536
2828/****************************************************************************/
2929/* Return register contents                                                 */
3030/****************************************************************************/
31extern void lr35902_get_info(UINT32 state, cpuinfo *info);
31extern CPU_GET_INFO( lr35902 );
3232
33extern unsigned lr35902_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram );
33extern CPU_DISASSEMBLE( lr35902 );
3434
3535#endif /* __LR35902_H__ */
src/emu/cpu/z8000/z8000cpu.h
r3535r3536
191191/* opcode execution table */
192192extern Z8000_exec *z8000_exec;
193193
194extern void z8000_init(int index, int clock, const void *config, int (*irqcallback)(int));
194extern CPU_INIT( z8000 );
195195extern void z8000_deinit(void);
196196
src/emu/cpu/z8000/z8000.c
r3535r3536
7878    z8000_reg_file regs;/* registers */
7979   int nmi_state;      /* NMI line state */
8080   int irq_state[2];   /* IRQ line states (NVI, VI) */
81    int (*irq_callback)(int irqline);
81   cpu_irq_callback irq_callback;
82   const device_config *device;
8283}   z8000_Regs;
8384
8485static int z8000_ICount;
r3535r3536
367368
368369    if (IRQ_REQ & Z8000_NVI)
369370    {
370        int type = (*Z.irq_callback)(0);
371        int type = (*Z.irq_callback)(Z.device, 0);
371372        set_irq(type);
372373    }
373374
374375    if (IRQ_REQ & Z8000_VI)
375376    {
376        int type = (*Z.irq_callback)(1);
377        int type = (*Z.irq_callback)(Z.device, 1);
377378        set_irq(type);
378379    }
379380
r3535r3536
459460}
460461
461462
462static void z8000_reset(void)
463static CPU_RESET( z8000 )
463464{
464   int (*save_irqcallback)(int) = Z.irq_callback;
465   cpu_irq_callback save_irqcallback = Z.irq_callback;
466   const device_config *save_device = Z.device;
465467   memset(&Z, 0, sizeof(z8000_Regs));
466468   Z.irq_callback = save_irqcallback;
469   Z.device = save_device;
467470   FCW = RDMEM_W( 2 ); /* get reset FCW */
468471   PC   = RDMEM_W( 4 ); /* get reset PC  */
469472   change_pc(PC);
470473}
471474
472static void z8000_exit(void)
475static CPU_EXIT( z8000 )
473476{
474477   z8000_deinit();
475478}
476479
477static int z8000_execute(int cycles)
480static CPU_EXECUTE( z8000 )
478481{
479482    z8000_ICount = cycles;
480483
r3535r3536
511514
512515}
513516
514static void z8000_get_context(void *dst)
517static CPU_GET_CONTEXT( z8000 )
515518{
516519   if( dst )
517520      *(z8000_Regs*)dst = Z;
518521}
519522
520static void z8000_set_context(void *src)
523static CPU_SET_CONTEXT( z8000 )
521524{
522525   if( src )
523526   {
r3535r3536
581584 * Generic set_info
582585 **************************************************************************/
583586
584static void z8000_set_info(UINT32 state, cpuinfo *info)
587static CPU_SET_INFO( z8000 )
585588{
586589   switch (state)
587590   {
r3535r3536
625628 * Generic get_info
626629 **************************************************************************/
627630
628void z8000_get_info(UINT32 state, cpuinfo *info)
631CPU_GET_INFO( z8000 )
629632{
630633   switch (state)
631634   {
r3535r3536
685688      case CPUINFO_INT_REGISTER + Z8000_R15:         info->i = RW(15);                  break;
686689
687690      /* --- the following bits of info are returned as pointers to data or functions --- */
688      case CPUINFO_PTR_SET_INFO:                  info->setinfo = z8000_set_info;         break;
689      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = z8000_get_context;   break;
690      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = z8000_set_context;   break;
691      case CPUINFO_PTR_INIT:                     info->init = z8000_init;            break;
692      case CPUINFO_PTR_RESET:                     info->reset = z8000_reset;            break;
693      case CPUINFO_PTR_EXIT:                     info->exit = z8000_exit;            break;
694      case CPUINFO_PTR_EXECUTE:                  info->execute = z8000_execute;         break;
691      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(z8000);         break;
692      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(z8000);   break;
693      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(z8000);   break;
694      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(z8000);            break;
695      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(z8000);            break;
696      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(z8000);            break;
697      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(z8000);         break;
695698      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
696      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = z8000_dasm;         break;
699      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(z8000);         break;
697700      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &z8000_ICount;         break;
698701
699702      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/z8000/z8000tbl.c
r3535r3536
535535{0,    0,      0,   0,   0,0,                            0},
536536};
537537
538void z8000_init(int index, int clock, const void *config, int (*irqcallback)(int))
538CPU_INIT( z8000 )
539539{
540540    int i;
541541   const Z8000_init *init;
r3535r3536
584584   }
585585
586586   Z.irq_callback = irqcallback;
587   Z.device = device;
587588}
588589
589590void z8000_deinit(void)
src/emu/cpu/z8000/z8000.h
r3535r3536
2525#define Z8000_HALT      0x0100   /* halted flag  */
2626
2727/* PUBLIC FUNCTIONS */
28extern void z8000_get_info(UINT32 state, cpuinfo *info);
28extern CPU_GET_INFO( z8000 );
2929
30offs_t z8000_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
30CPU_DISASSEMBLE( z8000 );
3131
3232#endif /* __Z8000_H__ */
src/emu/cpu/z8000/8000dasm.c
r3535r3536
7878   "",    "vi",  "nvi",   "vi,nvi"
7979};
8080
81offs_t z8000_dasm(char *buff, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
81CPU_DISASSEMBLE( z8000 )
8282{
8383   int new_pc = pc, i, tmp;
84   char *dst = buff;
84   char *dst = buffer;
8585   const char *src;
8686   Z8000_exec *o;
8787   UINT32 flags = 0;
src/emu/cpu/tms32010/tms32010.h
r3535r3536
5151 *  Public Functions
5252 */
5353
54void tms32010_get_info(UINT32 state, cpuinfo *info);
54CPU_GET_INFO( tms32010 );
5555
5656
5757
r3535r3536
126126
127127
128128
129offs_t tms32010_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
129CPU_DISASSEMBLE( tms32010 );
130130
131131#endif   /* __TMS32010_H__ */
src/emu/cpu/tms32010/32010dsm.c
r3535r3536
225225   OpInizialized = 1;
226226}
227227
228offs_t tms32010_dasm(char *str, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
228CPU_DISASSEMBLE( tms32010 )
229229{
230230   UINT32 flags = 0;
231231   int a, b, d, k, m, n, p, r, s, w;   /* these can all be filled in by parsing an instruction */
r3535r3536
234234   int cnt = 1;
235235   int code;
236236   int bit;
237   char *strtmp;
237   char *buffertmp;
238238   const char *cp;            /* character pointer in OpFormats */
239239
240240   if (!OpInizialized) InitDasm32010();
r3535r3536
255255   }
256256   if (op == -1)
257257   {
258      sprintf(str,"???? dw %04Xh",code);
258      sprintf(buffer,"???? dw %04Xh",code);
259259      return cnt | DASMFLAG_SUPPORTED;
260260   }
261   strtmp = str;
261   buffertmp = buffer;
262262   if (Op[op].extcode)
263263   {
264264      bit = 31;
r3535r3536
326326            default:
327327               fatalerror("illegal escape character in format '%s'",Op[op].fmt);
328328         }
329         q = num; while (*q) *str++ = *q++;
330         *str = '\0';
329         q = num; while (*q) *buffer++ = *q++;
330         *buffer = '\0';
331331      }
332332      else
333333      {
334         *str++ = *cp++;
335         *str = '\0';
334         *buffer++ = *cp++;
335         *buffer = '\0';
336336      }
337337   }
338338   return cnt | flags | DASMFLAG_SUPPORTED;
src/emu/cpu/tms32010/tms32010.c
r3535r3536
710710/****************************************************************************
711711 *  Inits CPU emulation
712712 ****************************************************************************/
713static void tms32010_init (int index, int clock, const void *config, int (*irqcallback)(int))
713static CPU_INIT( tms32010 )
714714{
715715   state_save_register_item("tms32010", index, R.PC);
716716   state_save_register_item("tms32010", index, R.PREVPC);
r3535r3536
732732/****************************************************************************
733733 *  Reset registers to their initial values
734734 ****************************************************************************/
735static void tms32010_reset (void)
735static CPU_RESET( tms32010 )
736736{
737737   R.PC    = 0;
738738   R.STR   = 0x7efe;   // OV cleared
r3535r3536
748748/****************************************************************************
749749 *  Shut down CPU emulation
750750 ****************************************************************************/
751static void tms32010_exit (void)
751static CPU_EXIT( tms32010 )
752752{
753753   /* nothing to do ? */
754754}
r3535r3536
776776/****************************************************************************
777777 *  Execute IPeriod. Return 0 if emulation should be stopped
778778 ****************************************************************************/
779static int tms32010_execute(int cycles)
779static CPU_EXECUTE( tms32010 )
780780{
781781   tms32010_icount = cycles;
782782
r3535r3536
811811/****************************************************************************
812812 *  Get all registers in given buffer
813813 ****************************************************************************/
814static void tms32010_get_context (void *dst)
814static CPU_GET_CONTEXT( tms32010 )
815815{
816816   if( dst )
817817      *(tms32010_Regs*)dst = R;
r3535r3536
820820/****************************************************************************
821821 *  Set all registers to given values
822822 ****************************************************************************/
823static void tms32010_set_context (void *src)
823static CPU_SET_CONTEXT( tms32010 )
824824{
825825   if (src)
826826      R = *(tms32010_Regs*)src;
r3535r3536
851851 *  Generic set_info
852852 **************************************************************************/
853853
854static void tms32010_set_info(UINT32 state, cpuinfo *info)
854static CPU_SET_INFO( tms32010 )
855855{
856856   switch (state)
857857   {
r3535r3536
879879 *  Generic get_info
880880 **************************************************************************/
881881
882void tms32010_get_info(UINT32 state, cpuinfo *info)
882CPU_GET_INFO( tms32010 )
883883{
884884   switch (state)
885885   {
r3535r3536
922922      case CPUINFO_INT_REGISTER + TMS32010_AR1:       info->i = R.AR[1];                  break;
923923
924924      /* --- the following bits of info are returned as pointers to data or functions --- */
925      case CPUINFO_PTR_SET_INFO:                  info->setinfo = tms32010_set_info;      break;
926      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = tms32010_get_context; break;
927      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = tms32010_set_context; break;
928      case CPUINFO_PTR_INIT:                     info->init = tms32010_init;            break;
929      case CPUINFO_PTR_RESET:                     info->reset = tms32010_reset;         break;
930      case CPUINFO_PTR_EXIT:                     info->exit = tms32010_exit;            break;
931      case CPUINFO_PTR_EXECUTE:                  info->execute = tms32010_execute;      break;
925      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(tms32010);      break;
926      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(tms32010); break;
927      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(tms32010); break;
928      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(tms32010);            break;
929      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(tms32010);         break;
930      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(tms32010);            break;
931      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(tms32010);      break;
932932      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
933      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = tms32010_dasm;      break;
933      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(tms32010);      break;
934934      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &tms32010_icount;      break;
935      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:   info->internal_map16 = address_map_tms32010_ram; break;
935      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:   info->internal_map16 = ADDRESS_MAP_NAME(tms32010_ram); break;
936936
937937      /* --- the following bits of info are returned as NULL-terminated strings --- */
938938      case CPUINFO_STR_NAME:                     strcpy(info->s, "TMS32010");         break;
src/emu/cpu/sh2/sh2comn.h
r3535r3536
111111   UINT32 pcflushes[16];         // pcflush entries
112112
113113   INT8   irq_line_state[17];
114   int    (*irq_callback)(int irqline);
114   cpu_irq_callback irq_callback;
115   const device_config *device;
115116   UINT32   *m;
116117   INT8  nmi_line_state;
117118
r3535r3536
169170TIMER_CALLBACK( sh2_timer_callback );
170171TIMER_CALLBACK( sh2_dmac_callback );
171172
172void sh2_common_init(int alloc, int index, int clock, const void *config, int (*irqcallback)(int));
173void sh2_common_init(int alloc, const device_config *device, int index, int clock, const void *config, cpu_irq_callback irqcallback);
173174void sh2_recalc_irq(void);
174175void sh2_set_irq_line(int irqline, int state);
175176void sh2_set_frt_input(int cpunum, int state);
src/emu/cpu/sh2/sh2.h
r3535r3536
9292  int  (*dma_callback_kludge)(UINT32 src, UINT32 dst, UINT32 data, int size);
9393};
9494
95extern void sh2_get_info(UINT32 state, cpuinfo *info);
95extern CPU_GET_INFO( sh2 );
9696
9797WRITE32_HANDLER( sh2_internal_w );
9898READ32_HANDLER( sh2_internal_r );
src/emu/cpu/sh2/sh2drc.c
r3535r3536
663663    sh2_init - initialize the processor
664664-------------------------------------------------*/
665665
666static void sh2_init(int index, int clock, const void *config, int (*irqcallback)(int))
666static CPU_INIT( sh2 )
667667{
668668   drcfe_config feconfig =
669669   {
r3535r3536
687687   memset(sh2, 0, sizeof(SH2));
688688
689689   /* initialize the common core parts */
690   sh2_common_init(0, index, clock, config, irqcallback);
690   sh2_common_init(0, device, index, clock, config, irqcallback);
691691
692692   /* allocate the implementation-specific state from the full cache */
693693   sh2->cache = cache;
r3535r3536
764764    sh2_exit - cleanup from execution
765765-------------------------------------------------*/
766766
767static void sh2_exit(void)
767static CPU_EXIT( sh2 )
768768{
769769   /* clean up the DRC */
770770   drcfe_exit(sh2->drcfe);
r3535r3536
777777    sh2_reset - reset the processor
778778-------------------------------------------------*/
779779
780static void sh2_reset(void)
780static CPU_RESET( sh2 )
781781{
782782   void *tsave, *tsaved0, *tsaved1;
783783   UINT32 *m;
784784   int cpunum;
785785
786786   void (*f)(UINT32 data);
787   int (*save_irqcallback)(int);
787   cpu_irq_callback save_irqcallback;
788   const device_config *save_device;
788789
789790   cpunum = sh2->cpu_number;
790791   m = sh2->m;
r3535r3536
794795
795796   f = sh2->ftcsr_read_callback;
796797   save_irqcallback = sh2->irq_callback;
798   save_device = sh2->device;
797799
798800   sh2->ppc = sh2->pc = sh2->pr = sh2->sr = sh2->gbr = sh2->vbr = sh2->mach = sh2->macl = 0;
799801   sh2->evec = sh2->irqsr = 0;
r3535r3536
809811
810812   sh2->ftcsr_read_callback = f;
811813   sh2->irq_callback = save_irqcallback;
814   sh2->device = save_device;
812815
813816   sh2->timer = tsave;
814817   sh2->dma_timer[0] = tsaved0;
r3535r3536
833836    sh1_reset - reset the processor
834837-------------------------------------------------*/
835838
836static void sh1_reset(void)
839static CPU_RESET( sh1 )
837840{
838   sh2_reset();
841   CPU_RESET_CALL(sh2);
839842   sh2->cpu_type = CPU_TYPE_SH1;
840843}
841844
r3535r3536
866869}
867870
868871/* Execute cycles - returns number of cycles actually run */
869static int sh2_execute(int cycles)
872static CPU_EXECUTE( sh2 )
870873{
871874   drcuml_state *drcuml = sh2->drcuml;
872875   int execute_result;
r3535r3536
32853288    current context
32863289-------------------------------------------------*/
32873290
3288static void sh2_get_context(void *dst)
3291static CPU_GET_CONTEXT( sh2 )
32893292{
32903293   if( dst )
32913294      *(SH2 **)dst = sh2;
r3535r3536
32963299    into the global state
32973300-------------------------------------------------*/
32983301
3299static void sh2_set_context(void *src)
3302static CPU_SET_CONTEXT( sh2 )
33003303{
33013304   if( src )
33023305      sh2 = *(SH2 **)src;
r3535r3536
33063309    sh2_dasm - disassemble an instruction
33073310-------------------------------------------------*/
33083311
3309static offs_t sh2_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
3312static CPU_DISASSEMBLE( sh2 )
33103313{
33113314   return DasmSH2( buffer, pc, (oprom[0] << 8) | oprom[1] );
33123315}
r3535r3536
33363339    CPU instance
33373340-------------------------------------------------*/
33383341
3339static void sh2_set_info(UINT32 state, cpuinfo *info)
3342static CPU_SET_INFO( sh2 )
33403343{
33413344   switch (state)
33423345   {
r3535r3536
34043407    given CPU instance
34053408-------------------------------------------------*/
34063409
3407void sh2_get_info(UINT32 state, cpuinfo *info)
3410CPU_GET_INFO( sh2 )
34083411{
34093412   switch (state)
34103413   {
r3535r3536
34313434      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = 0;               break;
34323435
34333436      // Internal maps
3434      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_sh2_internal_map; break;
3437      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(sh2_internal_map); break;
34353438      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map32 = NULL;   break;
34363439      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO:      info->internal_map32 = NULL;   break;
34373440
r3535r3536
34843487      case CPUINFO_INT_REGISTER + SH2_EA:            info->i = sh2->ea;                  break;
34853488
34863489      /* --- the following bits of info are returned as pointers to data or functions --- */
3487      case CPUINFO_PTR_SET_INFO:                  info->setinfo = sh2_set_info;         break;
3488      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = sh2_get_context;      break;
3489      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = sh2_set_context;      break;
3490      case CPUINFO_PTR_INIT:                     info->init = sh2_init;               break;
3491      case CPUINFO_PTR_RESET:                     info->reset = sh2_reset;            break;
3492      case CPUINFO_PTR_EXIT:                     info->exit = sh2_exit;               break;
3493      case CPUINFO_PTR_EXECUTE:                  info->execute = sh2_execute;         break;
3490      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(sh2);         break;
3491      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(sh2);      break;
3492      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(sh2);      break;
3493      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(sh2);               break;
3494      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(sh2);            break;
3495      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(sh2);               break;
3496      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(sh2);         break;
34943497      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
3495      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = sh2_dasm;         break;
3498      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(sh2);         break;
34963499      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &sh2->icount;            break;
34973500
34983501      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
35463549    given CPU instance
35473550-------------------------------------------------*/
35483551
3549void sh1_get_info(UINT32 state, cpuinfo *info)
3552CPU_GET_INFO( sh1 )
35503553{
35513554   switch (state)
35523555   {
35533556      /* --- the following bits of info are returned as pointers to data or functions --- */
3554      case CPUINFO_PTR_RESET:                  info->reset = sh1_reset;            break;
3557      case CPUINFO_PTR_RESET:                  info->reset = CPU_RESET_NAME(sh1);            break;
35553558
35563559      /* --- the following bits of info are returned as NULL-terminated strings --- */
35573560      case CPUINFO_STR_NAME:                      strcpy(info->s, "SH-1");            break;
35583561
3559      default:                     sh2_get_info(state, info);         break;
3562      default:                     CPU_GET_INFO_CALL(sh2);         break;
35603563   }
35613564}
35623565
src/emu/cpu/sh2/sh2comn.c
r3535r3536
651651      {
652652         if(sh2->m[0x38] & 0x00010000)
653653         {
654            vector = sh2->irq_callback(irqline);
654            vector = sh2->irq_callback(sh2->device, irqline);
655655            LOG(("SH-2 #%d exception #%d (external vector: $%x) after [%s]\n", cpu_getactivecpu(), irqline, vector, message));
656656         }
657657         else
658658         {
659            sh2->irq_callback(irqline);
659            sh2->irq_callback(sh2->device, irqline);
660660            vector = 64 + irqline/2;
661661            LOG(("SH-2 #%d exception #%d (autovector: $%x) after [%s]\n", cpu_getactivecpu(), irqline, vector, message));
662662         }
r3535r3536
698698   #endif
699699}
700700
701void sh2_common_init(int alloc, int index, int clock, const void *config, int (*irqcallback)(int))
701void sh2_common_init(int alloc, const device_config *device, int index, int clock, const void *config, cpu_irq_callback irqcallback)
702702{
703703   const sh2_cpu_core *conf = config;
704704
r3535r3536
732732   }
733733   sh2->cpu_number = index;
734734   sh2->irq_callback = irqcallback;
735   sh2->device = device;
735736
736737   state_save_register_item("sh2", index, sh2->pc);
737738   state_save_register_item("sh2", index, sh2->r[15]);
src/emu/cpu/sh2/sh2.c
r3535r3536
21372137 *  MAME CPU INTERFACE
21382138 *****************************************************************************/
21392139
2140static void sh2_reset(void)
2140static CPU_RESET( sh2 )
21412141{
21422142   void *tsave, *tsaved0, *tsaved1;
21432143   UINT32 *m;
r3535r3536
21452145   int save_is_slave;
21462146
21472147   void (*f)(UINT32 data);
2148   int (*save_irqcallback)(int);
2148   cpu_irq_callback save_irqcallback;
2149   const device_config *save_device;
21492150
21502151   cpunum = sh2->cpu_number;
21512152   m = sh2->m;
r3535r3536
21552156
21562157   f = sh2->ftcsr_read_callback;
21572158   save_irqcallback = sh2->irq_callback;
2159   save_device = sh2->device;
21582160   save_is_slave = sh2->is_slave;
21592161   dma_callback_kludge = sh2->dma_callback_kludge;
21602162
r3535r3536
21642166   sh2->is_slave = save_is_slave;
21652167   sh2->ftcsr_read_callback = f;
21662168   sh2->irq_callback = save_irqcallback;
2169   sh2->device = save_device;
21672170
21682171   sh2->timer = tsave;
21692172   sh2->dma_timer[0] = tsaved0;
r3535r3536
21842187    sh1_reset - reset the processor
21852188-------------------------------------------------*/
21862189
2187static void sh1_reset(void)
2190static CPU_RESET( sh1 )
21882191{
21892192   sh2_reset();
21902193   sh2->cpu_type = CPU_TYPE_SH1;
21912194}
21922195
21932196/* Execute cycles - returns number of cycles actually run */
2194static int sh2_execute(int cycles)
2197static CPU_EXECUTE( sh2 )
21952198{
21962199   sh2_icount = cycles;
21972200
r3535r3536
22492252}
22502253
22512254/* Get registers, return context size */
2252static void sh2_get_context(void *dst)
2255static CPU_GET_CONTEXT( sh2 )
22532256{
22542257   if( dst )
22552258      *(SH2 **)dst = sh2;
22562259}
22572260
22582261/* Set registers */
2259static void sh2_set_context(void *src)
2262static CPU_SET_CONTEXT( sh2 )
22602263{
22612264   if( src )
22622265      sh2 = *(SH2 **)src;
22632266}
22642267
2265static offs_t sh2_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
2268static CPU_DISASSEMBLE( sh2 )
22662269{
22672270   return DasmSH2( buffer, pc, (oprom[0] << 8) | oprom[1] );
22682271}
22692272
2270static void sh2_init(int index, int clock, const void *config, int (*irqcallback)(int))
2273static CPU_INIT( sh2 )
22712274{
22722275   /* allocate the core memory */
22732276   sh2 = auto_malloc(sizeof(SH2));
22742277   memset(sh2, 0, sizeof(SH2));
22752278
22762279   /* initialize the common core parts */
2277   sh2_common_init(0, index, clock, config, irqcallback);
2280   sh2_common_init(0, device, index, clock, config, irqcallback);
22782281}
22792282
22802283/**************************************************************************
22812284 * Generic set_info
22822285 **************************************************************************/
22832286
2284static void sh2_set_info(UINT32 state, cpuinfo *info)
2287static CPU_SET_INFO( sh2 )
22852288{
22862289   switch (state)
22872290   {
r3535r3536
23452348 * Generic get_info
23462349 **************************************************************************/
23472350
2348void sh2_get_info(UINT32 state, cpuinfo *info)
2351CPU_GET_INFO( sh2 )
23492352{
23502353   switch (state)
23512354   {
r3535r3536
24202423      case CPUINFO_INT_REGISTER + SH2_EA:            info->i = sh2->ea;                  break;
24212424
24222425      /* --- the following bits of info are returned as pointers to data or functions --- */
2423      case CPUINFO_PTR_SET_INFO:                  info->setinfo = sh2_set_info;         break;
2424      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = sh2_get_context;      break;
2425      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = sh2_set_context;      break;
2426      case CPUINFO_PTR_INIT:                     info->init = sh2_init;               break;
2427      case CPUINFO_PTR_RESET:                     info->reset = sh2_reset;            break;
2428      case CPUINFO_PTR_EXECUTE:                  info->execute = sh2_execute;         break;
2426      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(sh2);         break;
2427      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(sh2);      break;
2428      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(sh2);      break;
2429      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(sh2);               break;
2430      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(sh2);            break;
2431      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(sh2);         break;
24292432      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
2430      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = sh2_dasm;         break;
2433      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(sh2);         break;
24312434      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &sh2_icount;            break;
24322435
24332436      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
24762479   }
24772480}
24782481
2479void sh1_get_info(UINT32 state, cpuinfo *info)
2482CPU_GET_INFO( sh1 )
24802483{
24812484   switch (state)
24822485   {
24832486      /* --- the following bits of info are returned as pointers to data or functions --- */
2484      case CPUINFO_PTR_RESET:                  info->reset = sh1_reset;            break;
2487      case CPUINFO_PTR_RESET:                  info->reset = CPU_RESET_NAME(sh1);            break;
24852488
24862489      /* --- the following bits of info are returned as NULL-terminated strings --- */
24872490      case CPUINFO_STR_NAME:                      strcpy(info->s, "SH-1");            break;
src/emu/cpu/sm8500/sm8500d.c
r3535r3536
171171
172172};
173173
174unsigned sm8500_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram )
174CPU_DISASSEMBLE( sm8500 )
175175{
176176   const sm8500dasm *instr;
177177   char *dst;
src/emu/cpu/sm8500/sm8500.h
r3535r3536
3535
3636extern UINT8* sm8500_internal_ram( void ) ;
3737extern unsigned sm8500_get_reg( int regnum );
38extern void sm8500_get_info(UINT32 state, cpuinfo *info);
38extern CPU_GET_INFO( sm8500 );
3939
4040UINT8 sm85cpu_mem_readbyte( UINT32 offset );
4141void sm85cpu_mem_writebyte( UINT32 offset, UINT8 data );
r3535r3536
5353   sm85cpu_mem_writebyte( ( address + 1 ) & 0xffff, value & 0xff );
5454}
5555
56extern unsigned sm8500_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram );
56extern CPU_DISASSEMBLE( sm8500 );
5757
5858#endif /* __SM8500_H__ */
src/emu/cpu/sm8500/sm8500.c
r3535r3536
4747   UINT8 IFLAGS;
4848   UINT8 CheckInterrupts;
4949   int halted;
50   int (*irq_callback)(int irqline);
50   cpu_irq_callback irq_callback;
51   const device_config *device;
5152   UINT8 internal_ram[0x500];
5253} sm8500_regs;
5354
r3535r3536
7778   return regs.internal_ram;
7879}
7980
80static void sm8500_init(int index, int clock, const void *config, int (*irqcallback)(int)) {
81static CPU_INIT( sm8500 ) {
8182   regs.irq_callback = irqcallback;
83   regs.device = device;
8284   if ( config != NULL ) {
8385      regs.config.handle_dma = ((SM8500_CONFIG *)config)->handle_dma;
8486      regs.config.handle_timers = ((SM8500_CONFIG *)config)->handle_timers;
r3535r3536
8991   regs.register_base = regs.internal_ram;
9092}
9193
92static void sm8500_reset( void )
94static CPU_RESET( sm8500 )
9395{
9496   regs.PC = 0x1020;
9597   regs.IE0 = 0;
r3535r3536
107109   regs.halted = 0;
108110}
109111
110static void sm8500_exit( void )
112static CPU_EXIT( sm8500 )
111113{
112114}
113115
r3535r3536
201203   }
202204}
203205
204static int sm8500_execute( int cycles )
206static CPU_EXECUTE( sm8500 )
205207{
206208   UINT8   op;
207209   UINT16 oldpc;
r3535r3536
241243   return cycles - sm8500_icount;
242244}
243245
244static void sm8500_burn( int cycles )
246static CPU_BURN( sm8500 )
245247{
246248   if ( cycles > 0 ) {
247249      /* burn a number of 4 cycles */
r3535r3536
250252   }
251253}
252254
253static void sm8500_set_context( void *src )
255static CPU_SET_CONTEXT( sm8500 )
254256{
255257}
256258
257static void sm8500_get_context( void *dst )
259static CPU_GET_CONTEXT( sm8500 )
258260{
259261}
260262
r3535r3536
370372   }
371373}
372374
373static void sm8500_set_info( UINT32 state, cpuinfo *info )
375static CPU_SET_INFO( sm8500 )
374376{
375377   switch(state)
376378   {
r3535r3536
422424   }
423425}
424426
425void sm8500_get_info( UINT32 state, cpuinfo *info )
427CPU_GET_INFO( sm8500 )
426428{
427429   switch(state)
428430   {
r3535r3536
489491   case CPUINFO_INT_PREVIOUSPC:            info->i = 0x0000; break;
490492
491493
492   case CPUINFO_PTR_SET_INFO:            info->setinfo = sm8500_set_info; break;
493   case CPUINFO_PTR_GET_CONTEXT:            info->getcontext = sm8500_get_context; break;
494   case CPUINFO_PTR_SET_CONTEXT:            info->setcontext = sm8500_set_context; break;
495   case CPUINFO_PTR_INIT:               info->init = sm8500_init; break;
496   case CPUINFO_PTR_RESET:               info->reset = sm8500_reset; break;
497   case CPUINFO_PTR_EXIT:               info->exit = sm8500_exit; break;
498   case CPUINFO_PTR_EXECUTE:            info->execute = sm8500_execute; break;
499   case CPUINFO_PTR_BURN:               info->burn = sm8500_burn; break;
500   case CPUINFO_PTR_DISASSEMBLE:         info->disassemble = sm8500_dasm; break;
494   case CPUINFO_PTR_SET_INFO:            info->setinfo = CPU_SET_INFO_NAME(sm8500); break;
495   case CPUINFO_PTR_GET_CONTEXT:            info->getcontext = CPU_GET_CONTEXT_NAME(sm8500); break;
496   case CPUINFO_PTR_SET_CONTEXT:            info->setcontext = CPU_SET_CONTEXT_NAME(sm8500); break;
497   case CPUINFO_PTR_INIT:               info->init = CPU_INIT_NAME(sm8500); break;
498   case CPUINFO_PTR_RESET:               info->reset = CPU_RESET_NAME(sm8500); break;
499   case CPUINFO_PTR_EXIT:               info->exit = CPU_EXIT_NAME(sm8500); break;
500   case CPUINFO_PTR_EXECUTE:            info->execute = CPU_EXECUTE_NAME(sm8500); break;
501   case CPUINFO_PTR_BURN:               info->burn = CPU_BURN_NAME(sm8500); break;
502   case CPUINFO_PTR_DISASSEMBLE:         info->disassemble = CPU_DISASSEMBLE_NAME(sm8500); break;
501503   case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &sm8500_icount; break;
502504
503505   case CPUINFO_STR_NAME:               strcpy( info->s = cpuintrf_temp_str(), "sm8500" ); break;
src/emu/cpu/mb88xx/mb88xx.c
r3535r3536
5252
5353    /* IRQ handling */
5454    int   pending_interrupt;
55    int (*irqcallback)(int);
55    cpu_irq_callback irqcallback;
56    const device_config *device;
5657} mb88Regs;
5758
5859/***************************************************************************
r3535r3536
99100    CONTEXT SWITCHING
100101***************************************************************************/
101102
102static void mb88_get_context(void *dst)
103static CPU_GET_CONTEXT( mb88 )
103104{
104105   /* copy the context */
105106   *(mb88Regs *)dst = mb88;
106107}
107108
108109
109static void mb88_set_context(void *src)
110static CPU_SET_CONTEXT( mb88 )
110111{
111112   /* copy the context */
112113   if (src)
r3535r3536
118119    INITIALIZATION AND SHUTDOWN
119120***************************************************************************/
120121
121static void mb88_init(int index, int clock, const void *config, int (*irqcallback)(int))
122static CPU_INIT( mb88 )
122123{
123124   if ( config )
124125   {
r3535r3536
127128   }
128129
129130   mb88.irqcallback = irqcallback;
131   mb88.device = device;
130132
131133   state_save_register_item("mb88", clock, mb88.PC);
132134   state_save_register_item("mb88", clock, mb88.PA);
r3535r3536
151153   state_save_register_item("mb88", clock, mb88.pending_interrupt);
152154}
153155
154static void mb88_reset(void)
156static CPU_RESET( mb88 )
155157{
156158   /* zero registers and flags */
157159   mb88.PC = 0;
r3535r3536
208210   {
209211      /* no vectors supported, just do the callback to clear irq_state if needed */
210212      if (mb88.irqcallback)
211         (*mb88.irqcallback)(0);
213         (*mb88.irqcallback)(mb88.device, 0);
212214
213215      mb88.SP[mb88.SI] = GETPC();
214216      mb88.SP[mb88.SI] |= TEST_CF() << 15;
r3535r3536
228230   /* TODO: add support for serial and timer */
229231}
230232
231static int mb88_execute(int cycles)
233static CPU_EXECUTE( mb88 )
232234{
233235   mb88_icount = cycles;
234236
r3535r3536
753755    INFORMATION SETTERS
754756***************************************************************************/
755757
756static void mb88_set_info(UINT32 state, cpuinfo *info)
758static CPU_SET_INFO( mb88 )
757759{
758760   switch (state)
759761   {
r3535r3536
791793    INFORMATION GETTERS
792794***************************************************************************/
793795
794void mb88_get_info(UINT32 state, cpuinfo *info)
796CPU_GET_INFO( mb88 )
795797{
796798   switch (state)
797799   {
r3535r3536
843845      case CPUINFO_INT_REGISTER + MB88_SB:          info->i = mb88.SB;                  break;
844846
845847      /* --- the following bits of info are returned as pointers to data or functions --- */
846      case CPUINFO_PTR_SET_INFO:                  info->setinfo = mb88_set_info;         break;
847      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = mb88_get_context;   break;
848      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = mb88_set_context;   break;
849      case CPUINFO_PTR_INIT:                     info->init = mb88_init;               break;
850      case CPUINFO_PTR_RESET:                     info->reset = mb88_reset;            break;
848      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(mb88);         break;
849      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(mb88);   break;
850      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(mb88);   break;
851      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(mb88);               break;
852      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(mb88);            break;
851853      case CPUINFO_PTR_EXIT:                     info->exit = NULL;                  break;
852      case CPUINFO_PTR_EXECUTE:                  info->execute = mb88_execute;         break;
854      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(mb88);         break;
853855      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
854      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = mb88_dasm;         break;
856      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(mb88);         break;
855857      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &mb88_icount;         break;
856858
857859      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
894896   }
895897}
896898
897void mb8841_get_info(UINT32 state, cpuinfo *info)
899CPU_GET_INFO( mb8841 )
898900{
899901   switch (state)
900902   {
r3535r3536
905907      /* --- the following bits of info are returned as NULL-terminated strings --- */
906908      case CPUINFO_STR_NAME:                     strcpy(info->s, "MB8841");            break;
907909
908      default:                              mb88_get_info(state, info);         break;
910      default:                              CPU_GET_INFO_CALL(mb88);         break;
909911   }
910912}
911913
912void mb8842_get_info(UINT32 state, cpuinfo *info)
914CPU_GET_INFO( mb8842 )
913915{
914916   switch (state)
915917   {
r3535r3536
920922      /* --- the following bits of info are returned as NULL-terminated strings --- */
921923      case CPUINFO_STR_NAME:                     strcpy(info->s, "MB8842");            break;
922924
923      default:                              mb88_get_info(state, info);         break;
925      default:                              CPU_GET_INFO_CALL(mb88);         break;
924926   }
925927}
926928
927void mb8843_get_info(UINT32 state, cpuinfo *info)
929CPU_GET_INFO( mb8843 )
928930{
929931   switch (state)
930932   {
r3535r3536
935937      /* --- the following bits of info are returned as NULL-terminated strings --- */
936938      case CPUINFO_STR_NAME:                     strcpy(info->s, "MB8843");            break;
937939
938      default:                              mb88_get_info(state, info);         break;
940      default:                              CPU_GET_INFO_CALL(mb88);         break;
939941   }
940942}
941943
942void mb8844_get_info(UINT32 state, cpuinfo *info)
944CPU_GET_INFO( mb8844 )
943945{
944946   switch (state)
945947   {
r3535r3536
950952      /* --- the following bits of info are returned as NULL-terminated strings --- */
951953      case CPUINFO_STR_NAME:                     strcpy(info->s, "MB8844");            break;
952954
953      default:                              mb88_get_info(state, info);         break;
955      default:                              CPU_GET_INFO_CALL(mb88);         break;
954956   }
955957}
src/emu/cpu/mb88xx/mb88dasm.c
r3535r3536
1010#include "mb88xx.h"
1111
1212
13offs_t mb88_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
13CPU_DISASSEMBLE( mb88 )
1414{
1515   unsigned startpc = pc;
1616   UINT8 op = oprom[pc++ - startpc];
src/emu/cpu/mb88xx/mb88xx.h
r3535r3536
6868    PUBLIC FUNCTIONS
6969***************************************************************************/
7070
71void mb88_get_info(UINT32 state, cpuinfo *info);
72void mb8841_get_info(UINT32 state, cpuinfo *info);
73void mb8842_get_info(UINT32 state, cpuinfo *info);
74void mb8843_get_info(UINT32 state, cpuinfo *info);
75void mb8844_get_info(UINT32 state, cpuinfo *info);
71CPU_GET_INFO( mb88 );
72CPU_GET_INFO( mb8841 );
73CPU_GET_INFO( mb8842 );
74CPU_GET_INFO( mb8843 );
75CPU_GET_INFO( mb8844 );
7676
77offs_t mb88_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
77CPU_DISASSEMBLE( mb88 );
7878
7979#endif /* __MB88XX_H__ */
src/emu/cpu/sh4/sh4.c
r3535r3536
32373237 *  MAME CPU INTERFACE
32383238 *****************************************************************************/
32393239
3240static void sh4_reset(void)
3240static CPU_RESET( sh4 )
32413241{
32423242   void *tsaved[4];
32433243   emu_timer *tsave[5];
r3535r3536
32473247   int   savecpu_clock, savebus_clock, savepm_clock;
32483248
32493249   void (*f)(UINT32 data);
3250   int (*save_irqcallback)(int);
3250   cpu_irq_callback save_irqcallback;
3251   const device_config *save_device;
32513252
32523253   cpunum = sh4.cpu_number;
32533254   m = sh4.m;
r3535r3536
32633264
32643265   f = sh4.ftcsr_read_callback;
32653266   save_irqcallback = sh4.irq_callback;
3267   save_device = sh4.device;
32663268   save_is_slave = sh4.is_slave;
32673269   savecpu_clock = sh4.cpu_clock;
32683270   savebus_clock = sh4.bus_clock;
r3535r3536
32743276   sh4.pm_clock = savepm_clock;
32753277   sh4.ftcsr_read_callback = f;
32763278   sh4.irq_callback = save_irqcallback;
3279   sh4.device = save_device;
32773280
32783281   sh4.dma_timer[0] = tsaved[0];
32793282   sh4.dma_timer[1] = tsaved[1];
r3535r3536
33143317}
33153318
33163319/* Execute cycles - returns number of cycles actually run */
3317static int sh4_execute(int cycles)
3320static CPU_EXECUTE( sh4 )
33183321{
33193322   sh4.sh4_icount = cycles;
33203323
r3535r3536
33713374}
33723375
33733376/* Get registers, return context size */
3374static void sh4_get_context(void *dst)
3377static CPU_GET_CONTEXT( sh4 )
33753378{
33763379   if( dst )
33773380      memcpy(dst, &sh4, sizeof(SH4));
33783381}
33793382
33803383/* Set registers */
3381static void sh4_set_context(void *src)
3384static CPU_SET_CONTEXT( sh4 )
33823385{
33833386   if( src )
33843387      memcpy(&sh4, src, sizeof(SH4));
33853388}
33863389
3387static offs_t sh4_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
3390static CPU_DISASSEMBLE( sh4 )
33883391{
33893392   return DasmSH4( buffer, pc, (oprom[1] << 8) | oprom[0] );
33903393}
33913394
3392static void sh4_init(int index, int clock, const void *config, int (*irqcallback)(int))
3395static CPU_INIT( sh4 )
33933396{
33943397   const struct sh4_config *conf = config;
33953398
r3535r3536
33993402
34003403   sh4.cpu_number = index;
34013404   sh4.irq_callback = irqcallback;
3405   sh4.device = device;
34023406   sh4_default_exception_priorities();
34033407   sh4.irln = 15;
34043408   sh4.test_irq = 0;
r3535r3536
34743478 * Generic set_info
34753479 **************************************************************************/
34763480
3477static void sh4_set_info(UINT32 state, cpuinfo *info)
3481static CPU_SET_INFO( sh4 )
34783482{
34793483   switch (state)
34803484   {
r3535r3536
36363640 * Generic get_info
36373641 **************************************************************************/
36383642
3639void sh4_get_info(UINT32 state, cpuinfo *info)
3643CPU_GET_INFO( sh4 )
36403644{
36413645   switch (state)
36423646   {
r3535r3536
36623666      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 8;               break;
36633667      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = 0;               break;
36643668
3665      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map64 = address_map_sh4_internal_map; break;
3669      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map64 = ADDRESS_MAP_NAME(sh4_internal_map); break;
36663670
36673671      case CPUINFO_INT_INPUT_STATE + SH4_IRL0:      info->i = sh4.irq_line_state[SH4_IRL0]; break;
36683672      case CPUINFO_INT_INPUT_STATE + SH4_IRL1:      info->i = sh4.irq_line_state[SH4_IRL1]; break;
r3535r3536
37013705      case CPUINFO_INT_REGISTER + SH4_EA:            info->i = sh4.ea;                  break;
37023706
37033707      /* --- the following bits of info are returned as pointers to data or functions --- */
3704      case CPUINFO_PTR_SET_INFO:                  info->setinfo = sh4_set_info;         break;
3705      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = sh4_get_context;      break;
3706      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = sh4_set_context;      break;
3707      case CPUINFO_PTR_INIT:                     info->init = sh4_init;               break;
3708      case CPUINFO_PTR_RESET:                     info->reset = sh4_reset;            break;
3709      case CPUINFO_PTR_EXECUTE:                  info->execute = sh4_execute;         break;
3708      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(sh4);         break;
3709      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(sh4);      break;
3710      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(sh4);      break;
3711      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(sh4);               break;
3712      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(sh4);            break;
3713      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(sh4);         break;
37103714      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
3711      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = sh4_dasm;         break;
3715      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(sh4);         break;
37123716      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &sh4.sh4_icount;            break;
37133717
37143718      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/sh4/sh4comn.h
r3535r3536
6060   int      exception_requesting[128];
6161
6262   INT8   irq_line_state[17];
63   int    (*irq_callback)(int irqline);
63   cpu_irq_callback irq_callback;
64   const device_config *device;
6465   UINT32   *m;
6566   INT8   nmi_line_state;
6667
src/emu/cpu/sh4/sh4.h
r3535r3536
101101   int mode;
102102};
103103
104extern void sh4_get_info(UINT32 state, cpuinfo *info);
104extern CPU_GET_INFO( sh4 );
105105
106106WRITE32_HANDLER( sh4_internal_w );
107107READ32_HANDLER( sh4_internal_r );
src/emu/cpu/sh4/sh4comn.c
r3535r3536
171171      sh4.m[ICR] &= ~0x200;
172172      sh4.m[INTEVT] = 0x1c0;
173173      vector = 0x600;
174      sh4.irq_callback(INPUT_LINE_NMI);
174      sh4.irq_callback(sh4.device, INPUT_LINE_NMI);
175175      LOG(("SH-4 #%d nmi exception after [%s]\n", cpu_getactivecpu(), message));
176176   } else {
177177//      if ((sh4.m[ICR] & 0x4000) && (sh4.nmi_line_state == ASSERT_LINE))
r3535r3536
183183      sh4.m[INTEVT] = exception_codes[exception];
184184      vector = 0x600;
185185      if ((exception >= SH4_INTC_IRL0) && (exception <= SH4_INTC_IRL3))
186         sh4.irq_callback(SH4_INTC_IRL0-exception+SH4_IRL0);
186         sh4.irq_callback(sh4.device, SH4_INTC_IRL0-exception+SH4_IRL0);
187187      else
188         sh4.irq_callback(SH4_IRL3+1);
188         sh4.irq_callback(sh4.device, SH4_IRL3+1);
189189      LOG(("SH-4 #%d interrupt exception #%d after [%s]\n", cpu_getactivecpu(), exception, message));
190190   }
191191   sh4_exception_checkunrequest(exception);
src/emu/cpu/tms32051/tms32051.c
r3535r3536
146146      INT32 treg2;
147147   } shadow;
148148
149   int (*irq_callback)(int irqline);
149   cpu_irq_callback irq_callback;
150   const device_config *device;
150151} TMS_REGS;
151152
152153static TMS_REGS tms;
r3535r3536
209210
210211/*****************************************************************************/
211212
212static void tms_init(int index, int clock, const void *_config, int (*irqcallback)(int))
213static CPU_INIT( tms )
213214{
214215
215216}
216217
217static void tms_reset(void)
218static CPU_RESET( tms )
218219{
219220   int i;
220221   UINT16 src, dst, length;
r3535r3536
314315   check_interrupts();
315316}
316317
317static void tms_exit(void)
318static CPU_EXIT( tms )
318319{
319320   /* TODO */
320321}
321322
322static void tms_get_context(void *dst)
323static CPU_GET_CONTEXT( tms )
323324{
324325   /* copy the context */
325326   if (dst)
326327      *(TMS_REGS *)dst = tms;
327328}
328329
329static void tms_set_context(void *src)
330static CPU_SET_CONTEXT( tms )
330331{
331332   /* copy the context */
332333   if (src)
r3535r3536
335336   CHANGE_PC(tms.pc);
336337}
337338
338static int tms_execute(int num_cycles)
339static CPU_EXECUTE( tms )
339340{
340   tms_icount = num_cycles;
341   tms_icount = cycles;
341342
342343   while(tms_icount > 0)
343344   {
r3535r3536
395396         }
396397      }
397398   }
398   return num_cycles - tms_icount;
399   return cycles - tms_icount;
399400}
400401
401402
r3535r3536
543544 * Generic set_info
544545 **************************************************************************/
545546
546static void tms_set_info(UINT32 state, cpuinfo *info)
547static CPU_SET_INFO( tms )
547548{
548549   switch (state)
549550   {
r3535r3536
552553   }
553554}
554555
555static int tms_debug_read(int space, UINT32 offset, int size, UINT64 *value)
556static CPU_READ( tms )
556557{
557558   if (space == ADDRESS_SPACE_PROGRAM)
558559   {
r3535r3536
565566   return 1;
566567}
567568
568static void tms_get_info(UINT32 state, cpuinfo *info)
569static CPU_GET_INFO( tms )
569570{
570571   switch(state)
571572   {
r3535r3536
622623      case CPUINFO_INT_REGISTER + TMS32051_AR7:      info->i = tms.ar[7];               break;
623624
624625      /* --- the following bits of info are returned as pointers to data or functions --- */
625      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = tms_get_context;      break;
626      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = tms_set_context;      break;
627      case CPUINFO_PTR_INIT:                     info->init = tms_init;               break;
628      case CPUINFO_PTR_RESET:                     info->reset = tms_reset;            break;
629      case CPUINFO_PTR_EXIT:                     info->exit = tms_exit;               break;
630      case CPUINFO_PTR_EXECUTE:                  info->execute = tms_execute;         break;
626      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(tms);      break;
627      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(tms);      break;
628      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(tms);               break;
629      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(tms);            break;
630      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(tms);               break;
631      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(tms);         break;
631632      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
632      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = tms32051_dasm;      break;
633      case CPUINFO_PTR_READ:                     info->read = tms_debug_read;         break;
633      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(tms32051);      break;
634      case CPUINFO_PTR_READ:                     info->read = CPU_READ_NAME(tms);         break;
634635      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &tms_icount;            break;
635      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = address_map_internal_pgm; break;
636      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map16 = address_map_internal_data; break;
636      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(internal_pgm); break;
637      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map16 = ADDRESS_MAP_NAME(internal_data); break;
637638
638639      /* --- the following bits of info are returned as NULL-terminated strings --- */
639640      case CPUINFO_STR_CORE_FAMILY:               strcpy(info->s, "TMS3205x");         break;
r3535r3536
671672}
672673
673674#if (HAS_TMS32051)
674static void tms32051_set_info(UINT32 state, cpuinfo *info)
675static CPU_SET_INFO( tms32051 )
675676{
676677   if (state >= CPUINFO_INT_INPUT_STATE && state <= CPUINFO_INT_INPUT_STATE + 5)
677678   {
r3535r3536
704705      case CPUINFO_INT_REGISTER + TMS32051_AR6:      tms.ar[6] = info->i;                break;
705706      case CPUINFO_INT_REGISTER + TMS32051_AR7:      tms.ar[7] = info->i;                break;
706707
707      default:                              tms_set_info(state, info);            break;
708      default:                              CPU_SET_INFO_CALL(tms);            break;
708709   }
709710}
710711
711void tms32051_get_info(UINT32 state, cpuinfo *info)
712CPU_GET_INFO( tms32051 )
712713{
713714   switch(state)
714715   {
715716      /* --- the following bits of info are returned as pointers to data or functions --- */
716      case CPUINFO_PTR_SET_INFO:                  info->setinfo = tms32051_set_info;      break;
717      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(tms32051);      break;
717718
718719      /* --- the following bits of info are returned as NULL-terminated strings --- */
719720      case CPUINFO_STR_NAME:                     strcpy(info->s, "TMS32051");         break;
720721
721      default:                              tms_get_info(state, info);            break;
722      default:                              CPU_GET_INFO_CALL(tms);            break;
722723   }
723724}
724725#endif
src/emu/cpu/tms32051/tms32051.h
r3535r3536
44#define __TMS32051_H__
55
66#if (HAS_TMS32051)
7void tms32051_get_info(UINT32 state, cpuinfo *info);
7CPU_GET_INFO( tms32051 );
88#endif
99
10offs_t tms32051_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
10CPU_DISASSEMBLE( tms32051 );
1111
1212#endif /* __TMS32051_H__ */
src/emu/cpu/tms32051/dis32051.c
r3535r3536
257257   }
258258}
259259
260offs_t tms32051_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
260CPU_DISASSEMBLE( tms32051 )
261261{
262262   UINT32 flags = 0;
263263   UINT16 opcode;
src/emu/cpu/alph8201/8201dasm.c
r3535r3536
336336   OpInizialized = 1;
337337}
338338
339offs_t ALPHA8201_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
339CPU_DISASSEMBLE( ALPHA8201 )
340340{
341341   offs_t dasmflags = 0;
342342   int i;
src/emu/cpu/alph8201/alph8201.c
r3535r3536
662662/****************************************************************************
663663 * Initialize emulation
664664 ****************************************************************************/
665static void ALPHA8201_init (int index, int clock, const void *config, int (*irqcallback)(int))
665static CPU_INIT( ALPHA8201 )
666666{
667667   state_save_register_item_array("ALPHA8201", index, R.RAM);
668668   state_save_register_item("ALPHA8201", index, R.PREVPC);
r3535r3536
689689/****************************************************************************
690690 * Reset registers to their initial values
691691 ****************************************************************************/
692static void ALPHA8201_reset (void)
692static CPU_RESET( ALPHA8201 )
693693{
694694   PC     = 0;
695695   regPTR = 0;
r3535r3536
712712/****************************************************************************
713713 * Shut down CPU emulation
714714 ****************************************************************************/
715static void ALPHA8201_exit (void)
715static CPU_EXIT( ALPHA8201 )
716716{
717717   /* nothing to do ? */
718718}
r3535r3536
802802}
803803
804804#if (HAS_ALPHA8201)
805static int ALPHA8201_execute(int cycles) { return alpha8xxx_execute(opcode_8201,cycles); }
805static CPU_EXECUTE( ALPHA8201 ) { return alpha8xxx_execute(opcode_8201,cycles); }
806806#endif
807807
808808#if (HAS_ALPHA8301)
809static int ALPHA8301_execute(int cycles) { return alpha8xxx_execute(opcode_8301,cycles); }
809static CPU_EXECUTE( ALPHA8301 ) { return alpha8xxx_execute(opcode_8301,cycles); }
810810#endif
811811
812812/****************************************************************************
813813 * Get all registers in given buffer
814814 ****************************************************************************/
815static void ALPHA8201_get_context (void *dst)
815static CPU_GET_CONTEXT( ALPHA8201 )
816816{
817817   if( dst )
818818      *(ALPHA8201_Regs*)dst = R;
r3535r3536
821821/****************************************************************************
822822 * Set all registers to given values
823823 ****************************************************************************/
824static void ALPHA8201_set_context (void *src)
824static CPU_SET_CONTEXT( ALPHA8201 )
825825{
826826   if( src )
827827      R = *(ALPHA8201_Regs*)src;
r3535r3536
846846 * Generic set_info
847847 **************************************************************************/
848848
849static void ALPHA8201_set_info(UINT32 state, cpuinfo *info)
849static CPU_SET_INFO( ALPHA8201 )
850850{
851851   switch (state)
852852   {
r3535r3536
889889 **************************************************************************/
890890
891891/* 8201 and 8301 */
892static void alpha8xxx_get_info(UINT32 state, cpuinfo *info)
892static CPU_GET_INFO( alpha8xxx )
893893{
894894   switch (state)
895895   {
r3535r3536
944944      case CPUINFO_INT_REGISTER + ALPHA8201_R7:         info->i = RD_REG(7);            break;
945945
946946      /* --- the following bits of info are returned as pointers to data or functions --- */
947      case CPUINFO_PTR_SET_INFO:                  info->setinfo = ALPHA8201_set_info;      break;
948      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = ALPHA8201_get_context; break;
949      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = ALPHA8201_set_context; break;
950      case CPUINFO_PTR_INIT:                     info->init = ALPHA8201_init;         break;
951      case CPUINFO_PTR_RESET:                     info->reset = ALPHA8201_reset;         break;
952      case CPUINFO_PTR_EXIT:                     info->exit = ALPHA8201_exit;         break;
947      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(ALPHA8201);      break;
948      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(ALPHA8201); break;
949      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(ALPHA8201); break;
950      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(ALPHA8201);         break;
951      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(ALPHA8201);         break;
952      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(ALPHA8201);         break;
953953      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
954      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = ALPHA8201_dasm;      break;
954      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(ALPHA8201);      break;
955955      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &ALPHA8201_ICount;      break;
956956
957957      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
987987   }
988988}
989989#if (HAS_ALPHA8201)
990void alpha8201_get_info(UINT32 state, cpuinfo *info)
990CPU_GET_INFO( alpha8201 )
991991{
992992   switch (state)
993993   {
994994   case CPUINFO_STR_NAME:                     strcpy(info->s, "ALPHA-8201");            break;
995   case CPUINFO_PTR_EXECUTE:                  info->execute = ALPHA8201_execute;         break;
995   case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(ALPHA8201);         break;
996996   default:
997997      /* 8201 / 8301 */
998      alpha8xxx_get_info(state,info);
998      CPU_GET_INFO_CALL(alpha8xxx);
999999   }
10001000}
10011001#endif
10021002
10031003#if (HAS_ALPHA8301)
1004void alpha8301_get_info(UINT32 state, cpuinfo *info)
1004CPU_GET_INFO( alpha8301 )
10051005{
10061006   switch (state)
10071007   {
10081008   case CPUINFO_STR_NAME:                     strcpy(info->s, "ALPHA-8301");            break;
1009   case CPUINFO_PTR_EXECUTE:                  info->execute = ALPHA8301_execute;         break;
1009   case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(ALPHA8301);         break;
10101010   default:
10111011      /* 8201 / 8301 */
1012      alpha8xxx_get_info(state,info);
1012      CPU_GET_INFO_CALL(alpha8xxx);
10131013   }
10141014}
10151015#endif
src/emu/cpu/alph8201/alph8201.h
r3535r3536
4141   ALPHA8201_R4,ALPHA8201_R5,ALPHA8201_R6,ALPHA8201_R7
4242};
4343
44extern void alpha8201_get_info(UINT32 state, cpuinfo *info);
45extern void alpha8301_get_info(UINT32 state, cpuinfo *info);
44extern CPU_GET_INFO( alpha8201 );
45extern CPU_GET_INFO( alpha8301 );
4646
4747/*
4848 *   Read a UINT8 from given memory location
r3535r3536
6868 */
6969#define ALPHA8201_RDOP_ARG(A) ((unsigned)cpu_readop_arg(A))
7070
71offs_t ALPHA8201_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
71CPU_DISASSEMBLE( ALPHA8201 );
7272
7373#endif  /* __ALPH8201_H__ */
src/emu/cpu/apexc/apexc.c
r3535r3536
768768}
769769
770770
771static void apexc_init(int index, int clock, const void *config, int (*irqcallback)(int))
771static CPU_INIT( apexc )
772772{
773773}
774774
775static void apexc_reset(void)
775static CPU_RESET( apexc )
776776{
777777   /* mmmh...  I don't know what happens on reset with an actual APEXC. */
778778
r3535r3536
785785                                which enables easy booting (just press run on the panel) */
786786}
787787
788static void apexc_get_context(void *dst)
788static CPU_GET_CONTEXT( apexc )
789789{
790790   if (dst)
791791      * ((apexc_regs*) dst) = apexc;
792792}
793793
794static void apexc_set_context(void *src)
794static CPU_SET_CONTEXT( apexc )
795795{
796796   if (src)
797797      apexc = * ((apexc_regs*)src);
798798}
799799
800static int apexc_execute(int cycles)
800static CPU_EXECUTE( apexc )
801801{
802802   apexc_ICount = cycles;
803803
r3535r3536
816816   return cycles - apexc_ICount;
817817}
818818
819static void apexc_set_info(UINT32 state, cpuinfo *info)
819static CPU_SET_INFO( apexc )
820820{
821821   switch (state)
822822   {
r3535r3536
849849   }
850850}
851851
852void apexc_get_info(UINT32 state, cpuinfo *info)
852CPU_GET_INFO( apexc )
853853{
854854   switch (state)
855855   {
r3535r3536
892892   case CPUINFO_INT_REGISTER + APEXC_STATE:      info->i = apexc.running;            break;
893893   case CPUINFO_INT_REGISTER + APEXC_ML_FULL:      info->i = effective_address(apexc.ml);   break;
894894
895   case CPUINFO_PTR_SET_INFO:                  info->setinfo = apexc_set_info;         break;
896   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = apexc_get_context;   break;
897   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = apexc_set_context;   break;
898   case CPUINFO_PTR_INIT:                     info->init = apexc_init;            break;
899   case CPUINFO_PTR_RESET:                     info->reset = apexc_reset;            break;
900   case CPUINFO_PTR_EXECUTE:                  info->execute = apexc_execute;         break;
895   case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(apexc);         break;
896   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(apexc);   break;
897   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(apexc);   break;
898   case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(apexc);            break;
899   case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(apexc);            break;
900   case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(apexc);         break;
901901   case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
902   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = apexc_dasm;         break;
902   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(apexc);         break;
903903   case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &apexc_ICount;         break;
904904
905905   case CPUINFO_STR_NAME:                     strcpy(info->s = cpuintrf_temp_str(), "APEXC"); break;
src/emu/cpu/apexc/apexcdsm.c
r3535r3536
7070   { "A",      store },      { "S",      swap }
7171};
7272
73unsigned apexc_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
73CPU_DISASSEMBLE( apexc )
7474{
7575   UINT32 instruction;         /* 32-bit machine instruction */
7676   int x, y, function, c6, vector;   /* instruction fields */
src/emu/cpu/apexc/apexc.h
r3535r3536
1818                    from the contents of ML and WS */
1919};
2020
21void apexc_get_info(UINT32 state, cpuinfo *info);
21CPU_GET_INFO( apexc );
2222
2323#ifndef SUPPORT_ODD_WORD_SIZES
2424#define apexc_readmem(address)   program_read_dword_32be((address)<<2)
r3535r3536
3333#define apexc_writemem_masked(address, data, mask)   cpu_writemem13_32masked((address), (data), (mask))
3434#endif
3535
36unsigned apexc_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
36CPU_DISASSEMBLE( apexc );
3737
3838#define apexc_readop(address)   apexc_readmem(address)
3939
src/emu/cpu/g65816/g65816.c
r3535r3536
9595uint g65816i_source;
9696uint g65816i_destination;
9797
98static int g65816_readop(UINT32 offset, int size, UINT64 *value)
98static CPU_READOP( g65816 )
9999{
100100   *value = g65816_read_8_immediate(offset);
101101
r3535r3536
182182/* ======================================================================== */
183183
184184
185static void g65816_reset(void)
185static CPU_RESET( g65816 )
186186{
187187      /* Start the CPU */
188188      CPU_STOPPED = 0;
r3535r3536
225225}
226226
227227/* Exit and clean up */
228static void g65816_exit(void)
228static CPU_EXIT( g65816 )
229229{
230230   /* nothing to do yet */
231231}
232232
233233/* Execute some instructions */
234static int g65816_execute(int cycles)
234static CPU_EXECUTE( g65816 )
235235{
236236   return FTABLE_EXECUTE(cycles);
237237}
238238
239239
240240/* Get the current CPU context */
241static void g65816_get_context(void *dst_context)
241static CPU_GET_CONTEXT( g65816 )
242242{
243   if(dst_context)
244      *(g65816i_cpu_struct*)dst_context = g65816i_cpu;
243   if(dst)
244      *(g65816i_cpu_struct*)dst = g65816i_cpu;
245245}
246246
247247/* Set the current CPU context */
248static void g65816_set_context(void *src_context)
248static CPU_SET_CONTEXT( g65816 )
249249{
250   if(src_context)
250   if(src)
251251   {
252      g65816i_cpu = *(g65816i_cpu_struct*)src_context;
252      g65816i_cpu = *(g65816i_cpu_struct*)src;
253253      g65816i_jumping(REGISTER_PB | REGISTER_PC);
254254   }
255255}
r3535r3536
303303}
304304
305305/* Set the callback that is called when servicing an interrupt */
306static void g65816_set_irq_callback(int (*callback)(int))
306static void g65816_set_irq_callback(cpu_irq_callback callback)
307307{
308308   INT_ACK = callback;
309309}
r3535r3536
312312/* Disassemble an instruction */
313313#include "g65816ds.h"
314314
315static offs_t g65816_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
315static CPU_DISASSEMBLE( g65816 )
316316{
317317   return g65816_disassemble(buffer, (pc & 0x00ffff), (pc & 0xff0000) >> 16, oprom, FLAG_M, FLAG_X);
318318}
r3535r3536
326326   g65816i_jumping(REGISTER_PB | REGISTER_PC);
327327}
328328
329static void g65816_init(int index, int clock, const void *config, int (*irqcallback)(int))
329static CPU_INIT( g65816 )
330330{
331331   g65816_set_irq_callback(irqcallback);
332   g65816i_cpu.device = device;
332333
333334   state_save_register_item("G65816", index, g65816i_cpu.a);
334335   state_save_register_item("G65816", index, g65816i_cpu.b);
r3535r3536
362363 * Generic set_info
363364 **************************************************************************/
364365
365static void g65816_set_info(UINT32 state, cpuinfo *info)
366static CPU_SET_INFO( g65816 )
366367{
367368   switch (state)
368369   {
r3535r3536
401402 * Generic get_info
402403 **************************************************************************/
403404
404void g65816_get_info(UINT32 state, cpuinfo *info)
405CPU_GET_INFO( g65816 )
405406{
406407   switch (state)
407408   {
r3535r3536
453454      case CPUINFO_INT_REGISTER + G65816_IRQ_STATE:   info->i = g65816_get_reg(G65816_IRQ_STATE); break;
454455
455456      /* --- the following bits of info are returned as pointers to data or functions --- */
456      case CPUINFO_PTR_SET_INFO:                  info->setinfo = g65816_set_info;      break;
457      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = g65816_get_context;   break;
458      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = g65816_set_context;   break;
459      case CPUINFO_PTR_INIT:                     info->init = g65816_init;            break;
460      case CPUINFO_PTR_RESET:                     info->reset = g65816_reset;            break;
461      case CPUINFO_PTR_EXIT:                     info->exit = g65816_exit;            break;
462      case CPUINFO_PTR_EXECUTE:                  info->execute = g65816_execute;         break;
457      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(g65816);      break;
458      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(g65816);   break;
459      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(g65816);   break;
460      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(g65816);            break;
461      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(g65816);            break;
462      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(g65816);            break;
463      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(g65816);         break;
463464      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
464      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = g65816_dasm;      break;
465      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(g65816);      break;
465466      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &g65816_ICount;         break;
466467      case CPUINFO_PTR_G65816_READVECTOR_CALLBACK:   info->f = (genf *) READ_VECTOR;         break;
467468
468      case CPUINFO_PTR_READOP:                  info->readop = g65816_readop;         break;
469      case CPUINFO_PTR_READOP:                  info->readop = CPU_READOP_NAME(g65816);         break;
469470
470471      /* --- the following bits of info are returned as NULL-terminated strings --- */
471472      case CPUINFO_STR_NAME:                     strcpy(info->s, "G65C816");            break;
src/emu/cpu/g65816/g65816op.h
r3535r3536
384384   g65816i_set_flag_i(IFLAG_SET);
385385   REGISTER_PB = 0;
386386   g65816i_jump_16(g65816i_read_16_vector(vector));
387   if(INT_ACK) INT_ACK(0);
387   if(INT_ACK) INT_ACK(g65816i_cpu.device, 0);
388388#else
389389   CLK(8);
390390   g65816i_push_8(REGISTER_PB>>16);
r3535r3536
394394   g65816i_set_flag_i(IFLAG_SET);
395395   REGISTER_PB = 0;
396396   g65816i_jump_16(g65816i_read_16_vector(vector));
397   if(INT_ACK) INT_ACK(0);
397   if(INT_ACK) INT_ACK(g65816i_cpu.device, 0);
398398#endif
399399}
400400
src/emu/cpu/g65816/g65816.h
r3535r3536
8989};
9090
9191/* Main interface function */
92void g65816_get_info(UINT32 state, cpuinfo *info);
92CPU_GET_INFO( g65816 );
9393
9494#undef G65816_CALL_DEBUGGER
9595#define G65816_CALL_DEBUGGER(x) debugger_instruction_hook(Machine, x)
src/emu/cpu/g65816/g65816cm.h
r3535r3536
8888   uint line_nmi;      /* Status of the NMI line */
8989   uint ir;         /* Instruction Register */
9090   uint irq_delay;      /* delay 1 instruction before checking irq */
91   int (*int_ack)(int); /* Interrupt Acknowledge */
91   cpu_irq_callback int_ack; /* Interrupt Acknowledge */
92   const device_config *device;
9293   read8_machine_func read_vector;   /* Read vector override */
9394   uint stopped;      /* Sets how the CPU is stopped */
9495   void (*const *opcodes)(void);
src/emu/cpu/nec/nec.c
r3535r3536
161161   UINT32   poll_state;
162162   UINT8   no_interrupt;
163163
164   int     (*irq_callback)(int irqline);
164   cpu_irq_callback irq_callback;
165   const device_config *device;
165166
166167   memory_interface   mem;
167168
r3535r3536
273274
274275/***************************************************************************/
275276
276static void nec_reset (void)
277static CPU_RESET( nec )
277278{
278279    unsigned int i,j,c;
279280    static const BREGS reg_name[8]={ AL, CL, DL, BL, AH, CH, DH, BH };
r3535r3536
331332   I.poll_state = 1;
332333}
333334
334static void nec_exit (void)
335static CPU_EXIT( nec )
335336{
336337
337338}
r3535r3536
346347
347348   if (int_num == -1)
348349   {
349      int_num = (*I.irq_callback)(0);
350      int_num = (*I.irq_callback)(I.device, 0);
350351
351352      I.irq_state = CLEAR_LINE;
352353      I.pending_irq &= ~INT_IRQ;
r3535r3536
10551056
10561057/*****************************************************************************/
10571058
1058static void nec_get_context(void *dst)
1059static CPU_GET_CONTEXT( nec )
10591060{
10601061   if( dst )
10611062      *(nec_Regs*)dst = I;
10621063}
10631064
1064static void nec_set_context(void *src)
1065static CPU_SET_CONTEXT( nec )
10651066{
10661067   if( src )
10671068   {
r3535r3536
11021103   I.poll_state = state;
11031104}
11041105
1105static offs_t nec_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
1106static CPU_DISASSEMBLE( nec )
11061107{
11071108   return necv_dasm_one(buffer, pc, oprom, I.config);
11081109}
11091110
1110static void nec_init(int index, int clock, const void *_config, int (*irqcallback)(int), int type)
1111static void nec_init(const device_config *device, int index, int clock, const void *_config, cpu_irq_callback irqcallback, int type)
11111112{
11121113   const nec_config *config = _config ? _config : &default_config;
11131114
r3535r3536
11381139   state_save_register_item(names[type], index, I.ParityVal);
11391140
11401141   I.irq_callback = irqcallback;
1142   I.device = device;
11411143}
11421144
11431145
r3535r3536
12281230}
12291231#endif
12301232
1231static int necv_execute(int cycles)
1233static CPU_EXECUTE( necv )
12321234{
12331235   int prev_ICount;
12341236
r3535r3536
12581260
12591261/* Wrappers for the different CPU types */
12601262#if (HAS_V20||HAS_V25)
1261static void v20_init(int index, int clock, const void *config, int (*irqcallback)(int))
1263static CPU_INIT( v20 )
12621264{
1263   nec_init(index, clock, config, irqcallback, 0);
1265   nec_init(device, index, clock, config, irqcallback, 0);
12641266   configure_memory_8bit();
12651267   I.chip_type=V20;
12661268   I.prefetch_size = 4;      /* 3 words */
r3535r3536
12691271#endif
12701272
12711273#if (HAS_V30||HAS_V35)
1272static void v30_init(int index, int clock, const void *config, int (*irqcallback)(int))
1274static CPU_INIT( v30 )
12731275{
1274   nec_init(index, clock, config, irqcallback, 1);
1276   nec_init(device, index, clock, config, irqcallback, 1);
12751277   configure_memory_16bit();
12761278   I.chip_type=V30;
12771279   I.prefetch_size = 6;      /* 3 words */
r3535r3536
12811283#endif
12821284
12831285#if (HAS_V33)
1284static void v33_init(int index, int clock, const void *config, int (*irqcallback)(int))
1286static CPU_INIT( v33 )
12851287{
1286   nec_init(index, clock, config, irqcallback, 2);
1288   nec_init(device, index, clock, config, irqcallback, 2);
12871289   I.chip_type=V33;
12881290   I.prefetch_size = 6;      /* ???? */
12891291   I.prefetch_cycles = 2;      /* two cycles per byte / four per word */
r3535r3536
12981300 * Generic set_info
12991301 **************************************************************************/
13001302
1301static void nec_set_info(UINT32 state, cpuinfo *info)
1303static CPU_SET_INFO( nec )
13021304{
13031305   switch (state)
13041306   {
r3535r3536
13541356 * Generic get_info
13551357 **************************************************************************/
13561358
1357static void nec_get_info(UINT32 state, cpuinfo *info)
1359static CPU_GET_INFO( nec )
13581360{
13591361   int flags;
13601362
r3535r3536
14091411      case CPUINFO_INT_REGISTER + NEC_PENDING:      info->i = I.pending_irq;            break;
14101412
14111413      /* --- the following bits of info are returned as pointers to data or functions --- */
1412      case CPUINFO_PTR_SET_INFO:                  info->setinfo = nec_set_info;         break;
1413      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = nec_get_context;      break;
1414      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = nec_set_context;      break;
1414      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(nec);         break;
1415      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(nec);      break;
1416      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(nec);      break;
14151417      case CPUINFO_PTR_INIT:                     /* set per-CPU */                  break;
1416      case CPUINFO_PTR_RESET:                     info->reset = nec_reset;            break;
1417      case CPUINFO_PTR_EXIT:                     info->exit = nec_exit;               break;
1418      case CPUINFO_PTR_EXECUTE:                  info->execute = necv_execute;         break;
1418      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(nec);            break;
1419      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(nec);               break;
1420      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(necv);         break;
14191421      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1420      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = nec_dasm;         break;
1422      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(nec);         break;
14211423      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &nec_ICount;            break;
14221424
14231425      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
14731475 * CPU-specific set_info
14741476 **************************************************************************/
14751477
1476void v20_get_info(UINT32 state, cpuinfo *info)
1478CPU_GET_INFO( v20 )
14771479{
14781480   switch (state)
14791481   {
r3535r3536
14821484      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 8;               break;
14831485
14841486      /* --- the following bits of info are returned as pointers to data or functions --- */
1485      case CPUINFO_PTR_INIT:                     info->init = v20_init;               break;
1487      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(v20);               break;
14861488
14871489      /* --- the following bits of info are returned as NULL-terminated strings --- */
14881490      case CPUINFO_STR_NAME:                     strcpy(info->s, "V20");               break;
14891491
1490      default:                              nec_get_info(state, info);            break;
1492      default:                              CPU_GET_INFO_CALL(nec);            break;
14911493   }
14921494}
14931495#endif
r3535r3536
14981500 * CPU-specific set_info
14991501 **************************************************************************/
15001502
1501void v25_get_info(UINT32 state, cpuinfo *info)
1503CPU_GET_INFO( v25 )
15021504{
15031505   switch (state)
15041506   {
r3535r3536
15071509      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 8;               break;
15081510
15091511      /* --- the following bits of info are returned as pointers to data or functions --- */
1510      case CPUINFO_PTR_INIT:                     info->init = v20_init;               break;
1512      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(v20);               break;
15111513
15121514      /* --- the following bits of info are returned as NULL-terminated strings --- */
15131515      case CPUINFO_STR_NAME:                     strcpy(info->s, "V25");               break;
15141516
1515      default:                              nec_get_info(state, info);            break;
1517      default:                              CPU_GET_INFO_CALL(nec);            break;
15161518   }
15171519}
15181520#endif
r3535r3536
15231525 * CPU-specific set_info
15241526 **************************************************************************/
15251527
1526void v30_get_info(UINT32 state, cpuinfo *info)
1528CPU_GET_INFO( v30 )
15271529{
15281530   switch (state)
15291531   {
15301532      /* --- the following bits of info are returned as pointers to data or functions --- */
1531      case CPUINFO_PTR_INIT:                     info->init = v30_init;               break;
1533      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(v30);               break;
15321534
15331535      /* --- the following bits of info are returned as NULL-terminated strings --- */
15341536      case CPUINFO_STR_NAME:                     strcpy(info->s, "V30");               break;
15351537
1536      default:                              nec_get_info(state, info);            break;
1538      default:                              CPU_GET_INFO_CALL(nec);            break;
15371539   }
15381540}
15391541#endif
r3535r3536
15441546 * CPU-specific set_info
15451547 **************************************************************************/
15461548
1547void v33_get_info(UINT32 state, cpuinfo *info)
1549CPU_GET_INFO( v33 )
15481550{
15491551   switch (state)
15501552   {
15511553      /* --- the following bits of info are returned as pointers to data or functions --- */
1552      case CPUINFO_PTR_INIT:                     info->init = v33_init;               break;
1554      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(v33);               break;
15531555
15541556      /* --- the following bits of info are returned as NULL-terminated strings --- */
15551557      case CPUINFO_STR_NAME:                     strcpy(info->s, "V33");               break;
15561558
1557      default:                              nec_get_info(state, info);            break;
1559      default:                              CPU_GET_INFO_CALL(nec);            break;
15581560   }
15591561}
15601562#endif
r3535r3536
15651567 * CPU-specific set_info
15661568 **************************************************************************/
15671569
1568void v35_get_info(UINT32 state, cpuinfo *info)
1570CPU_GET_INFO( v35 )
15691571{
15701572   switch (state)
15711573   {
15721574      /* --- the following bits of info are returned as pointers to data or functions --- */
1573      case CPUINFO_PTR_INIT:                     info->init = v30_init;               break;
1575      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(v30);               break;
15741576
15751577      /* --- the following bits of info are returned as NULL-terminated strings --- */
15761578      case CPUINFO_STR_NAME:                     strcpy(info->s, "V35");               break;
15771579
1578      default:                              nec_get_info(state, info);            break;
1580      default:                              CPU_GET_INFO_CALL(nec);            break;
15791581   }
15801582}
15811583#endif
src/emu/cpu/nec/necintrf.h
r3535r3536
1313};
1414
1515/* Public functions */
16extern void v20_get_info(UINT32 state, cpuinfo *info);
17extern void v30_get_info(UINT32 state, cpuinfo *info);
18extern void v33_get_info(UINT32 state, cpuinfo *info);
16extern CPU_GET_INFO( v20 );
17extern CPU_GET_INFO( v30 );
18extern CPU_GET_INFO( v33 );
1919
2020#endif
src/emu/cpu/mips/mips3com.h
r3535r3536
193193
194194   /* internal stuff */
195195   mips3_flavor   flavor;
196   int          (*irq_callback)(int irqline);
196   cpu_irq_callback irq_callback;
197   const device_config *device;
197198   UINT32         system_clock;
198199   UINT32         cpu_clock;
199200   UINT64         count_zero_time;
r3535r3536
222223    FUNCTION PROTOTYPES
223224***************************************************************************/
224225
225void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, int index, int clock, const mips3_config *config, int (*irqcallback)(int));
226void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, const device_config *device, int index, int clock, const mips3_config *config, cpu_irq_callback irqcallback);
226227void mips3com_exit(mips3_state *mips);
227228
228229void mips3com_reset(mips3_state *mips);
src/emu/cpu/mips/mips3.h
r3535r3536
226226***************************************************************************/
227227
228228#if (HAS_R4600)
229void r4600be_get_info(UINT32 state, cpuinfo *info);
230void r4600le_get_info(UINT32 state, cpuinfo *info);
229CPU_GET_INFO( r4600be );
230CPU_GET_INFO( r4600le );
231231#endif
232232
233233#if (HAS_R4700)
234void r4700be_get_info(UINT32 state, cpuinfo *info);
235void r4700le_get_info(UINT32 state, cpuinfo *info);
234CPU_GET_INFO( r4700be );
235CPU_GET_INFO( r4700le );
236236#endif
237237
238238#if (HAS_R5000)
239void r5000be_get_info(UINT32 state, cpuinfo *info);
240void r5000le_get_info(UINT32 state, cpuinfo *info);
239CPU_GET_INFO( r5000be );
240CPU_GET_INFO( r5000le );
241241#endif
242242
243243#if (HAS_QED5271)
244void qed5271be_get_info(UINT32 state, cpuinfo *info);
245void qed5271le_get_info(UINT32 state, cpuinfo *info);
244CPU_GET_INFO( qed5271be );
245CPU_GET_INFO( qed5271le );
246246#endif
247247
248248#if (HAS_RM7000)
249void rm7000be_get_info(UINT32 state, cpuinfo *info);
250void rm7000le_get_info(UINT32 state, cpuinfo *info);
249CPU_GET_INFO( rm7000be );
250CPU_GET_INFO( rm7000le );
251251#endif
252252
253253
src/emu/cpu/mips/r3000.c
r3535r3536
11/***************************************************************************
22
3    r3000.c
3    r3000->c
44    Core implementation for the portable MIPS R3000 emulator.
55    Written by Aaron Giles
66
r3535r3536
8181#define RDREG      ((op >> 11) & 31)
8282#define SHIFT      ((op >> 6) & 31)
8383
84#define RSVAL      (r3000.r[RSREG])
85#define RTVAL      (r3000.r[RTREG])
86#define RDVAL      (r3000.r[RDREG])
84#define RSVAL      (r3000->r[RSREG])
85#define RTVAL      (r3000->r[RTREG])
86#define RDVAL      (r3000->r[RDREG])
8787
8888#define SIMMVAL      ((INT16)op)
8989#define UIMMVAL      ((UINT16)op)
9090#define LIMMVAL      (op & 0x03ffffff)
9191
92#define ADDPC(x)   r3000.nextpc = r3000.pc + ((x) << 2)
93#define ADDPCL(x,l)   { r3000.nextpc = r3000.pc + ((x) << 2); r3000.r[l] = r3000.pc + 4; }
94#define ABSPC(x)   r3000.nextpc = (r3000.pc & 0xf0000000) | ((x) << 2)
95#define ABSPCL(x,l)   { r3000.nextpc = (r3000.pc & 0xf0000000) | ((x) << 2); r3000.r[l] = r3000.pc + 4; }
96#define SETPC(x)   r3000.nextpc = (x)
97#define SETPCL(x,l)   { r3000.nextpc = (x); r3000.r[l] = r3000.pc + 4; }
92#define ADDPC(x)   r3000->nextpc = r3000->pc + ((x) << 2)
93#define ADDPCL(x,l)   { r3000->nextpc = r3000->pc + ((x) << 2); r3000->r[l] = r3000->pc + 4; }
94#define ABSPC(x)   r3000->nextpc = (r3000->pc & 0xf0000000) | ((x) << 2)
95#define ABSPCL(x,l)   { r3000->nextpc = (r3000->pc & 0xf0000000) | ((x) << 2); r3000->r[l] = r3000->pc + 4; }
96#define SETPC(x)   r3000->nextpc = (x)
97#define SETPCL(x,l)   { r3000->nextpc = (x); r3000->r[l] = r3000->pc + 4; }
9898
99#define RBYTE(x)   (*r3000.cur.readbyte)(x)
100#define RWORD(x)   (*r3000.cur.readword)(x)
101#define RLONG(x)   (*r3000.cur.readlong)(x)
99#define RBYTE(x)   (*r3000->cur.readbyte)(x)
100#define RWORD(x)   (*r3000->cur.readword)(x)
101#define RLONG(x)   (*r3000->cur.readlong)(x)
102102
103#define WBYTE(x,v)   (*r3000.cur.writebyte)(x,v)
104#define WWORD(x,v)   (*r3000.cur.writeword)(x,v)
105#define WLONG(x,v)   (*r3000.cur.writelong)(x,v)
103#define WBYTE(x,v)   (*r3000->cur.writebyte)(x,v)
104#define WWORD(x,v)   (*r3000->cur.writeword)(x,v)
105#define WLONG(x,v)   (*r3000->cur.writelong)(x,v)
106106
107#define HIVAL      r3000.hi
108#define LOVAL      r3000.lo
109#define SR         r3000.cpr[0][COP0_Status]
110#define CAUSE      r3000.cpr[0][COP0_Cause]
107#define HIVAL      r3000->hi
108#define LOVAL      r3000->lo
109#define SR         r3000->cpr[0][COP0_Status]
110#define CAUSE      r3000->cpr[0][COP0_Cause]
111111
112112
113113
r3535r3536
127127} memory_accessors;
128128
129129/* R3000 Registers */
130typedef struct
130typedef struct _r3000_state r3000_state;
131struct _r3000_state
131132{
132133   /* core registers */
133134   UINT32      pc;
r3535r3536
144145   UINT32      ppc;
145146   UINT32      nextpc;
146147   int         op;
148   int         icount;
147149   int         interrupt_cycles;
148150   int         hasfpu;
149   int       (*irq_callback)(int irqline);
151   cpu_irq_callback irq_callback;
152   const device_config *device;
150153
151154   /* endian-dependent load/store */
152   void      (*lwl)(UINT32 op);
153   void      (*lwr)(UINT32 op);
154   void      (*swl)(UINT32 op);
155   void      (*swr)(UINT32 op);
155   void      (*lwl)(r3000_state *r3000, UINT32 op);
156   void      (*lwr)(r3000_state *r3000, UINT32 op);
157   void      (*swl)(r3000_state *r3000, UINT32 op);
158   void      (*swr)(r3000_state *r3000, UINT32 op);
156159
157160   /* memory accesses */
158161   UINT8      bigendian;
r3535r3536
167170   size_t      cache_size;
168171   size_t      icache_size;
169172   size_t      dcache_size;
170} r3000_regs;
173};
171174
172175
173176
r3535r3536
175178    FUNCTION PROTOTYPES
176179***************************************************************************/
177180
178static void lwl_be(UINT32 op);
179static void lwr_be(UINT32 op);
180static void swl_be(UINT32 op);
181static void swr_be(UINT32 op);
181static void lwl_be(r3000_state *r3000, UINT32 op);
182static void lwr_be(r3000_state *r3000, UINT32 op);
183static void swl_be(r3000_state *r3000, UINT32 op);
184static void swr_be(r3000_state *r3000, UINT32 op);
182185
183static void lwl_le(UINT32 op);
184static void lwr_le(UINT32 op);
185static void swl_le(UINT32 op);
186static void swr_le(UINT32 op);
186static void lwl_le(r3000_state *r3000, UINT32 op);
187static void lwr_le(r3000_state *r3000, UINT32 op);
188static void swl_le(r3000_state *r3000, UINT32 op);
189static void swr_le(r3000_state *r3000, UINT32 op);
187190
188191static UINT8 readcache_be(offs_t offset);
189192static UINT16 readcache_be_word(offs_t offset);
r3535r3536
201204
202205
203206/***************************************************************************
204    PUBLIC GLOBAL VARIABLES
205***************************************************************************/
206
207static int   r3000_icount;
208
209
210
211/***************************************************************************
212207    PRIVATE GLOBAL VARIABLES
213208***************************************************************************/
214209
215static r3000_regs r3000;
210static void *token;
216211
217212
218213static const memory_accessors be_memory =
r3535r3536
253248    EXECEPTION HANDLING
254249***************************************************************************/
255250
256INLINE void generate_exception(int exception)
251INLINE void generate_exception(r3000_state *r3000, int exception)
257252{
258253   /* set the exception PC */
259   r3000.cpr[0][COP0_EPC] = r3000.pc;
254   r3000->cpr[0][COP0_EPC] = r3000->pc;
260255
261256   /* put the cause in the low 8 bits and clear the branch delay flag */
262257   CAUSE = (CAUSE & ~0x800000ff) | (exception << 2);
263258
264259   /* if we were in a branch delay slot, adjust */
265   if (r3000.nextpc != ~0)
260   if (r3000->nextpc != ~0)
266261   {
267      r3000.nextpc = ~0;
268      r3000.cpr[0][COP0_EPC] -= 4;
262      r3000->nextpc = ~0;
263      r3000->cpr[0][COP0_EPC] -= 4;
269264      CAUSE |= 0x80000000;
270265   }
271266
r3535r3536
273268   SR = (SR & 0xffffffc0) | ((SR << 2) & 0x3c);
274269
275270   /* based on the BEV bit, we either go to ROM or RAM */
276   r3000.pc = (SR & SR_BEV) ? 0xbfc00000 : 0x80000000;
271   r3000->pc = (SR & SR_BEV) ? 0xbfc00000 : 0x80000000;
277272
278273   /* most exceptions go to offset 0x180, except for TLB stuff */
279274   if (exception >= EXCEPTION_TLBMOD && exception <= EXCEPTION_TLBSTORE)
280      r3000.pc += 0x80;
275      r3000->pc += 0x80;
281276   else
282      r3000.pc += 0x180;
277      r3000->pc += 0x180;
283278
284279   /* swap to the new space */
285   change_pc(r3000.pc);
280   change_pc(r3000->pc);
286281}
287282
288283
289INLINE void invalid_instruction(UINT32 op)
284INLINE void invalid_instruction(r3000_state *r3000, UINT32 op)
290285{
291   generate_exception(EXCEPTION_INVALIDOP);
286   generate_exception(r3000, EXCEPTION_INVALIDOP);
292287}
293288
294289
r3535r3536
297292    IRQ HANDLING
298293***************************************************************************/
299294
300static void check_irqs(void)
295static void check_irqs(r3000_state *r3000)
301296{
302297   if ((CAUSE & SR & 0xff00) && (SR & SR_IEc))
303      generate_exception(EXCEPTION_INTERRUPT);
298      generate_exception(r3000, EXCEPTION_INTERRUPT);
304299}
305300
306301
307static void set_irq_line(int irqline, int state)
302static void set_irq_line(r3000_state *r3000, int irqline, int state)
308303{
309304   if (state != CLEAR_LINE)
310305      CAUSE |= 0x400 << irqline;
311306   else
312307      CAUSE &= ~(0x400 << irqline);
313   check_irqs();
308   check_irqs(r3000);
314309}
315310
316311
r3535r3536
319314    CONTEXT SWITCHING
320315***************************************************************************/
321316
322static void r3000_get_context(void *dst)
317static CPU_GET_CONTEXT( r3000 )
323318{
324   /* copy the context */
325   if (dst)
326      *(r3000_regs *)dst = r3000;
327319}
328320
329321
330static void r3000_set_context(void *src)
322static CPU_SET_CONTEXT( r3000 )
331323{
324   r3000_state *r3000;
325
332326   /* copy the context */
333327   if (src)
334      r3000 = *(r3000_regs *)src;
328      token = src;
335329
336   change_pc(r3000.pc);
330   r3000 = token;
331   change_pc(r3000->pc);
337332
338333   /* check for IRQs */
339   check_irqs();
334   check_irqs(r3000);
340335}
341336
342337
r3535r3536
345340    INITIALIZATION AND SHUTDOWN
346341***************************************************************************/
347342
348static void r3000_init(int index, int clock, const void *_config, int (*irqcallback)(int))
343static CPU_INIT( r3000 )
349344{
350   const r3000_cpu_core *config = _config;
345   const r3000_cpu_core *configdata = config;
346   r3000_state *r3000 = device->token;
351347
348   token = device->token;   // temporary
349
352350   /* allocate memory */
353   r3000.icache = auto_malloc(config->icache);
354   r3000.dcache = auto_malloc(config->dcache);
351   r3000->icache = auto_malloc(configdata->icache);
352   r3000->dcache = auto_malloc(configdata->dcache);
355353
356   r3000.icache_size = config->icache;
357   r3000.dcache_size = config->dcache;
358   r3000.hasfpu = config->hasfpu;
354   r3000->icache_size = configdata->icache;
355   r3000->dcache_size = configdata->dcache;
356   r3000->hasfpu = configdata->hasfpu;
359357
360   r3000.irq_callback = irqcallback;
358   r3000->irq_callback = irqcallback;
359   r3000->device = device;
361360}
362361
363362
364static void r3000_reset(int bigendian)
363static void r3000_reset(r3000_state *r3000, int bigendian)
365364{
366365   /* set up the endianness */
367   r3000.bigendian = bigendian;
368   if (r3000.bigendian)
366   r3000->bigendian = bigendian;
367   if (r3000->bigendian)
369368   {
370      r3000.memory_hand = &be_memory;
371      r3000.cache_hand = &be_cache;
372      r3000.lwl = lwl_be;
373      r3000.lwr = lwr_be;
374      r3000.swl = swl_be;
375      r3000.swr = swr_be;
369      r3000->memory_hand = &be_memory;
370      r3000->cache_hand = &be_cache;
371      r3000->lwl = lwl_be;
372      r3000->lwr = lwr_be;
373      r3000->swl = swl_be;
374      r3000->swr = swr_be;
376375   }
377376   else
378377   {
379      r3000.memory_hand = &le_memory;
380      r3000.cache_hand = &le_cache;
381      r3000.lwl = lwl_le;
382      r3000.lwr = lwr_le;
383      r3000.swl = swl_le;
384      r3000.swr = swr_le;
378      r3000->memory_hand = &le_memory;
379      r3000->cache_hand = &le_cache;
380      r3000->lwl = lwl_le;
381      r3000->lwr = lwr_le;
382      r3000->swl = swl_le;
383      r3000->swr = swr_le;
385384   }
386385
387386   /* initialize the rest of the config */
388   r3000.cur = *r3000.memory_hand;
389   r3000.cache = r3000.dcache;
390   r3000.cache_size = r3000.dcache_size;
387   r3000->cur = *r3000->memory_hand;
388   r3000->cache = r3000->dcache;
389   r3000->cache_size = r3000->dcache_size;
391390
392391   /* initialize the state */
393   r3000.pc = 0xbfc00000;
394   r3000.nextpc = ~0;
395   r3000.cpr[0][COP0_PRId] = 0x0200;
396   r3000.cpr[0][COP0_Status] = 0x0000;
397   change_pc(r3000.pc);
392   r3000->pc = 0xbfc00000;
393   r3000->nextpc = ~0;
394   r3000->cpr[0][COP0_PRId] = 0x0200;
395   r3000->cpr[0][COP0_Status] = 0x0000;
396   change_pc(r3000->pc);
398397}
399398
400static void r3000be_reset(void)
399static CPU_RESET( r3000be )
401400{
402   r3000_reset(1);
401   r3000_reset(device->token, 1);
403402}
404403
405static void r3000le_reset(void)
404static CPU_RESET( r3000le )
406405{
407   r3000_reset(0);
406   r3000_reset(device->token, 0);
408407}
409408
410409
411static void r3000_exit(void)
410static CPU_EXIT( r3000 )
412411{
413412}
414413
r3535r3536
418417    COP0 (SYSTEM) EXECUTION HANDLING
419418***************************************************************************/
420419
421INLINE UINT32 get_cop0_reg(int idx)
420INLINE UINT32 get_cop0_reg(r3000_state *r3000, int idx)
422421{
423   return r3000.cpr[0][idx];
422   return r3000->cpr[0][idx];
424423}
425424
426INLINE void set_cop0_reg(int idx, UINT32 val)
425INLINE void set_cop0_reg(r3000_state *r3000, int idx, UINT32 val)
427426{
428427   if (idx == COP0_Cause)
429428   {
430429      CAUSE = (CAUSE & 0xfc00) | (val & ~0xfc00);
431430
432431      /* update interrupts -- software ints can occur this way */
433      check_irqs();
432      check_irqs(r3000);
434433   }
435434   else if (idx == COP0_Status)
436435   {
437      UINT32 oldsr = r3000.cpr[0][idx];
436      UINT32 oldsr = r3000->cpr[0][idx];
438437      UINT32 diff = oldsr ^ val;
439438
440439      /* handle cache isolation */
441440      if (diff & SR_IsC)
442441      {
443442         if (val & SR_IsC)
444            r3000.cur = *r3000.cache_hand;
443            r3000->cur = *r3000->cache_hand;
445444         else
446            r3000.cur = *r3000.memory_hand;
445            r3000->cur = *r3000->memory_hand;
447446      }
448447
449448      /* handle cache switching */
450449      if (diff & SR_SwC)
451450      {
452451         if (val & SR_SwC)
453            r3000.cache = r3000.icache, r3000.cache_size = r3000.icache_size;
452            r3000->cache = r3000->icache, r3000->cache_size = r3000->icache_size;
454453         else
455            r3000.cache = r3000.dcache, r3000.cache_size = r3000.dcache_size;
454            r3000->cache = r3000->dcache, r3000->cache_size = r3000->dcache_size;
456455      }
457      r3000.cpr[0][idx] = val;
456      r3000->cpr[0][idx] = val;
458457
459458      /* update interrupts */
460      check_irqs();
459      check_irqs(r3000);
461460   }
462461   else
463      r3000.cpr[0][idx] = val;
462      r3000->cpr[0][idx] = val;
464463}
465464
466INLINE UINT32 get_cop0_creg(int idx)
465INLINE UINT32 get_cop0_creg(r3000_state *r3000, int idx)
467466{
468   return r3000.ccr[0][idx];
467   return r3000->ccr[0][idx];
469468}
470469
471INLINE void set_cop0_creg(int idx, UINT32 val)
470INLINE void set_cop0_creg(r3000_state *r3000, int idx, UINT32 val)
472471{
473   r3000.ccr[0][idx] = val;
472   r3000->ccr[0][idx] = val;
474473}
475474
476INLINE void handle_cop0(UINT32 op)
475INLINE void handle_cop0(r3000_state *r3000, UINT32 op)
477476{
478477   if (!(SR & SR_COP0) && (SR & SR_KUc))
479      generate_exception(EXCEPTION_BADCOP);
478      generate_exception(r3000, EXCEPTION_BADCOP);
480479
481480   switch (RSREG)
482481   {
483      case 0x00:   /* MFCz */      if (RTREG) RTVAL = get_cop0_reg(RDREG);               break;
484      case 0x02:   /* CFCz */      if (RTREG) RTVAL = get_cop0_creg(RDREG);            break;
485      case 0x04:   /* MTCz */      set_cop0_reg(RDREG, RTVAL);                        break;
486      case 0x06:   /* CTCz */      set_cop0_creg(RDREG, RTVAL);                     break;
482      case 0x00:   /* MFCz */      if (RTREG) RTVAL = get_cop0_reg(r3000, RDREG);            break;
483      case 0x02:   /* CFCz */      if (RTREG) RTVAL = get_cop0_creg(r3000, RDREG);            break;
484      case 0x04:   /* MTCz */      set_cop0_reg(r3000, RDREG, RTVAL);                     break;
485      case 0x06:   /* CTCz */      set_cop0_creg(r3000, RDREG, RTVAL);                     break;
487486      case 0x08:   /* BC */
488487         switch (RTREG)
489488         {
490            case 0x00:   /* BCzF */   if (!r3000.cf[0]) ADDPC(SIMMVAL);               break;
491            case 0x01:   /* BCzF */   if (r3000.cf[0]) ADDPC(SIMMVAL);               break;
492            case 0x02:   /* BCzFL */   invalid_instruction(op);                     break;
493            case 0x03:   /* BCzTL */   invalid_instruction(op);                     break;
494            default:   invalid_instruction(op);                              break;
489            case 0x00:   /* BCzF */   if (!r3000->cf[0]) ADDPC(SIMMVAL);                  break;
490            case 0x01:   /* BCzF */   if (r3000->cf[0]) ADDPC(SIMMVAL);                  break;
491            case 0x02:   /* BCzFL */   invalid_instruction(r3000, op);                     break;
492            case 0x03:   /* BCzTL */   invalid_instruction(r3000, op);                     break;
493            default:   invalid_instruction(r3000, op);                              break;
495494         }
496495         break;
497496      case 0x10:
r3535r3536
512511      case 0x1f:   /* COP */
513512         switch (op & 0x01ffffff)
514513         {
515            case 0x01:   /* TLBR */                                          break;
516            case 0x02:   /* TLBWI */                                          break;
517            case 0x06:   /* TLBWR */                                          break;
518            case 0x08:   /* TLBP */                                          break;
519            case 0x10:   /* RFE */   SR = (SR & 0xfffffff0) | ((SR >> 2) & 0x0f);      break;
520            case 0x18:   /* ERET */   invalid_instruction(op);                     break;
521            default:   invalid_instruction(op);                              break;
514            case 0x01:   /* TLBR */                                             break;
515            case 0x02:   /* TLBWI */                                             break;
516            case 0x06:   /* TLBWR */                                             break;
517            case 0x08:   /* TLBP */                                             break;
518            case 0x10:   /* RFE */   SR = (SR & 0xfffffff0) | ((SR >> 2) & 0x0f);         break;
519            case 0x18:   /* ERET */   invalid_instruction(r3000, op);                     break;
520            default:   invalid_instruction(r3000, op);                              break;
522521         }
523522         break;
524      default:   invalid_instruction(op);                                    break;
523      default:   invalid_instruction(r3000, op);                                    break;
525524   }
526525}
527526
r3535r3536
531530    COP1 (FPU) EXECUTION HANDLING
532531***************************************************************************/
533532
534INLINE UINT32 get_cop1_reg(int idx)
533INLINE UINT32 get_cop1_reg(r3000_state *r3000, int idx)
535534{
536   return r3000.cpr[1][idx];
535   return r3000->cpr[1][idx];
537536}
538537
539INLINE void set_cop1_reg(int idx, UINT32 val)
538INLINE void set_cop1_reg(r3000_state *r3000, int idx, UINT32 val)
540539{
541   r3000.cpr[1][idx] = val;
540   r3000->cpr[1][idx] = val;
542541}
543542
544INLINE UINT32 get_cop1_creg(int idx)
543INLINE UINT32 get_cop1_creg(r3000_state *r3000, int idx)
545544{
546   return r3000.ccr[1][idx];
545   return r3000->ccr[1][idx];
547546}
548547
549INLINE void set_cop1_creg(int idx, UINT32 val)
548INLINE void set_cop1_creg(r3000_state *r3000, int idx, UINT32 val)
550549{
551   r3000.ccr[1][idx] = val;
550   r3000->ccr[1][idx] = val;
552551}
553552
554INLINE void handle_cop1(UINT32 op)
553INLINE void handle_cop1(r3000_state *r3000, UINT32 op)
555554{
556555   if (!(SR & SR_COP1))
557      generate_exception(EXCEPTION_BADCOP);
558   if (!r3000.hasfpu)
556      generate_exception(r3000, EXCEPTION_BADCOP);
557   if (!r3000->hasfpu)
559558      return;
560559
561560   switch (RSREG)
562561   {
563      case 0x00:   /* MFCz */      if (RTREG) RTVAL = get_cop1_reg(RDREG);               break;
564      case 0x02:   /* CFCz */      if (RTREG) RTVAL = get_cop1_creg(RDREG);            break;
565      case 0x04:   /* MTCz */      set_cop1_reg(RDREG, RTVAL);                        break;
566      case 0x06:   /* CTCz */      set_cop1_creg(RDREG, RTVAL);                     break;
562      case 0x00:   /* MFCz */      if (RTREG) RTVAL = get_cop1_reg(r3000, RDREG);            break;
563      case 0x02:   /* CFCz */      if (RTREG) RTVAL = get_cop1_creg(r3000, RDREG);            break;
564      case 0x04:   /* MTCz */      set_cop1_reg(r3000, RDREG, RTVAL);                     break;
565      case 0x06:   /* CTCz */      set_cop1_creg(r3000, RDREG, RTVAL);                     break;
567566      case 0x08:   /* BC */
568567         switch (RTREG)
569568         {
570            case 0x00:   /* BCzF */   if (!r3000.cf[1]) ADDPC(SIMMVAL);               break;
571            case 0x01:   /* BCzF */   if (r3000.cf[1]) ADDPC(SIMMVAL);               break;
572            case 0x02:   /* BCzFL */   invalid_instruction(op);                     break;
573            case 0x03:   /* BCzTL */   invalid_instruction(op);                     break;
574            default:   invalid_instruction(op);                              break;
569            case 0x00:   /* BCzF */   if (!r3000->cf[1]) ADDPC(SIMMVAL);                  break;
570            case 0x01:   /* BCzF */   if (r3000->cf[1]) ADDPC(SIMMVAL);                  break;
571            case 0x02:   /* BCzFL */   invalid_instruction(r3000, op);                     break;
572            case 0x03:   /* BCzTL */   invalid_instruction(r3000, op);                     break;
573            default:   invalid_instruction(r3000, op);                              break;
575574         }
576575         break;
577576      case 0x10:
r3535r3536
589588      case 0x1c:
590589      case 0x1d:
591590      case 0x1e:
592      case 0x1f:   /* COP */      invalid_instruction(op);                        break;
593      default:   invalid_instruction(op);                                    break;
591      case 0x1f:   /* COP */      invalid_instruction(r3000, op);                        break;
592      default:   invalid_instruction(r3000, op);                                    break;
594593   }
595594}
596595
r3535r3536
600599    COP2 (CUSTOM) EXECUTION HANDLING
601600***************************************************************************/
602601
603INLINE UINT32 get_cop2_reg(int idx)
602INLINE UINT32 get_cop2_reg(r3000_state *r3000, int idx)
604603{
605   return r3000.cpr[2][idx];
604   return r3000->cpr[2][idx];
606605}
607606
608INLINE void set_cop2_reg(int idx, UINT32 val)
607INLINE void set_cop2_reg(r3000_state *r3000, int idx, UINT32 val)
609608{
610   r3000.cpr[2][idx] = val;
609   r3000->cpr[2][idx] = val;
611610}
612611
613INLINE UINT32 get_cop2_creg(int idx)
612INLINE UINT32 get_cop2_creg(r3000_state *r3000, int idx)
614613{
615   return r3000.ccr[2][idx];
614   return r3000->ccr[2][idx];
616615}
617616
618INLINE void set_cop2_creg(int idx, UINT32 val)
617INLINE void set_cop2_creg(r3000_state *r3000, int idx, UINT32 val)
619618{
620   r3000.ccr[2][idx] = val;
619   r3000->ccr[2][idx] = val;
621620}
622621
623INLINE void handle_cop2(UINT32 op)
622INLINE void handle_cop2(r3000_state *r3000, UINT32 op)
624623{
625624   if (!(SR & SR_COP2))
626      generate_exception(EXCEPTION_BADCOP);
625      generate_exception(r3000, EXCEPTION_BADCOP);
627626
628627   switch (RSREG)
629628   {
630      case 0x00:   /* MFCz */      if (RTREG) RTVAL = get_cop2_reg(RDREG);               break;
631      case 0x02:   /* CFCz */      if (RTREG) RTVAL = get_cop2_creg(RDREG);            break;
632      case 0x04:   /* MTCz */      set_cop2_reg(RDREG, RTVAL);                        break;
633      case 0x06:   /* CTCz */      set_cop2_creg(RDREG, RTVAL);                     break;
629      case 0x00:   /* MFCz */      if (RTREG) RTVAL = get_cop2_reg(r3000, RDREG);            break;
630      case 0x02:   /* CFCz */      if (RTREG) RTVAL = get_cop2_creg(r3000, RDREG);            break;
631      case 0x04:   /* MTCz */      set_cop2_reg(r3000, RDREG, RTVAL);                     break;
632      case 0x06:   /* CTCz */      set_cop2_creg(r3000, RDREG, RTVAL);                     break;
634633      case 0x08:   /* BC */
635634         switch (RTREG)
636635         {
637            case 0x00:   /* BCzF */   if (!r3000.cf[2]) ADDPC(SIMMVAL);               break;
638            case 0x01:   /* BCzF */   if (r3000.cf[2]) ADDPC(SIMMVAL);               break;
639            case 0x02:   /* BCzFL */   invalid_instruction(op);                     break;
640            case 0x03:   /* BCzTL */   invalid_instruction(op);                     break;
641            default:   invalid_instruction(op);                              break;
636            case 0x00:   /* BCzF */   if (!r3000->cf[2]) ADDPC(SIMMVAL);                  break;
637            case 0x01:   /* BCzF */   if (r3000->cf[2]) ADDPC(SIMMVAL);                  break;
638            case 0x02:   /* BCzFL */   invalid_instruction(r3000, op);                     break;
639            case 0x03:   /* BCzTL */   invalid_instruction(r3000, op);                     break;
640            default:   invalid_instruction(r3000, op);                              break;
642641         }
643642         break;
644643      case 0x10:
r3535r3536
656655      case 0x1c:
657656      case 0x1d:
658657      case 0x1e:
659      case 0x1f:   /* COP */      invalid_instruction(op);                        break;
660      default:   invalid_instruction(op);                                    break;
658      case 0x1f:   /* COP */      invalid_instruction(r3000, op);                        break;
659      default:   invalid_instruction(r3000, op);                                    break;
661660   }
662661}
663662
r3535r3536
667666    COP3 (CUSTOM) EXECUTION HANDLING
668667***************************************************************************/
669668
670INLINE UINT32 get_cop3_reg(int idx)
669INLINE UINT32 get_cop3_reg(r3000_state *r3000, int idx)
671670{
672   return r3000.cpr[3][idx];
671   return r3000->cpr[3][idx];
673672}
674673
675INLINE void set_cop3_reg(int idx, UINT32 val)
674INLINE void set_cop3_reg(r3000_state *r3000, int idx, UINT32 val)
676675{
677   r3000.cpr[3][idx] = val;
676   r3000->cpr[3][idx] = val;
678677}
679678
680INLINE UINT32 get_cop3_creg(int idx)
679INLINE UINT32 get_cop3_creg(r3000_state *r3000, int idx)
681680{
682   return r3000.ccr[3][idx];
681   return r3000->ccr[3][idx];
683682}
684683
685INLINE void set_cop3_creg(int idx, UINT32 val)
684INLINE void set_cop3_creg(r3000_state *r3000, int idx, UINT32 val)
686685{
687   r3000.ccr[3][idx] = val;
686   r3000->ccr[3][idx] = val;
688687}
689688
690INLINE void handle_cop3(UINT32 op)
689INLINE void handle_cop3(r3000_state *r3000, UINT32 op)
691690{
692691   if (!(SR & SR_COP3))
693      generate_exception(EXCEPTION_BADCOP);
692      generate_exception(r3000, EXCEPTION_BADCOP);
694693
695694   switch (RSREG)
696695   {
697      case 0x00:   /* MFCz */      if (RTREG) RTVAL = get_cop3_reg(RDREG);               break;
698      case 0x02:   /* CFCz */      if (RTREG) RTVAL = get_cop3_creg(RDREG);            break;
699      case 0x04:   /* MTCz */      set_cop3_reg(RDREG, RTVAL);                        break;
700      case 0x06:   /* CTCz */      set_cop3_creg(RDREG, RTVAL);                     break;
696      case 0x00:   /* MFCz */      if (RTREG) RTVAL = get_cop3_reg(r3000, RDREG);            break;
697      case 0x02:   /* CFCz */      if (RTREG) RTVAL = get_cop3_creg(r3000, RDREG);            break;
698      case 0x04:   /* MTCz */      set_cop3_reg(r3000, RDREG, RTVAL);                     break;
699      case 0x06:   /* CTCz */      set_cop3_creg(r3000, RDREG, RTVAL);                     break;
701700      case 0x08:   /* BC */
702701         switch (RTREG)
703702         {
704            case 0x00:   /* BCzF */   if (!r3000.cf[3]) ADDPC(SIMMVAL);               break;
705            case 0x01:   /* BCzF */   if (r3000.cf[3]) ADDPC(SIMMVAL);               break;
706            case 0x02:   /* BCzFL */   invalid_instruction(op);                     break;
707            case 0x03:   /* BCzTL */   invalid_instruction(op);                     break;
708            default:   invalid_instruction(op);                              break;
703            case 0x00:   /* BCzF */   if (!r3000->cf[3]) ADDPC(SIMMVAL);                  break;
704            case 0x01:   /* BCzF */   if (r3000->cf[3]) ADDPC(SIMMVAL);                  break;
705            case 0x02:   /* BCzFL */   invalid_instruction(r3000, op);                     break;
706            case 0x03:   /* BCzTL */   invalid_instruction(r3000, op);                     break;
707            default:   invalid_instruction(r3000, op);                              break;
709708         }
710709         break;
711710      case 0x10:
r3535r3536
723722      case 0x1c:
724723      case 0x1d:
725724      case 0x1e:
726      case 0x1f:   /* COP */      invalid_instruction(op);                        break;
727      default:   invalid_instruction(op);                                    break;
725      case 0x1f:   /* COP */      invalid_instruction(r3000, op);                        break;
726      default:   invalid_instruction(r3000, op);                                    break;
728727   }
729728}
730729
r3535r3536
734733    CORE EXECUTION LOOP
735734***************************************************************************/
736735
737static int r3000_execute(int cycles)
736static CPU_EXECUTE( r3000 )
738737{
738   r3000_state *r3000 = device->token;
739
739740   /* count cycles and interrupt cycles */
740   r3000_icount = cycles;
741   r3000_icount -= r3000.interrupt_cycles;
742   r3000.interrupt_cycles = 0;
743   change_pc(r3000.pc);
741   r3000->icount = cycles;
742   r3000->icount -= r3000->interrupt_cycles;
743   r3000->interrupt_cycles = 0;
744   change_pc(r3000->pc);
744745
745746   /* core execution loop */
746747   do
r3535r3536
750751      int temp;
751752
752753      /* debugging */
753      r3000.ppc = r3000.pc;
754      debugger_instruction_hook(Machine, r3000.pc);
754      r3000->ppc = r3000->pc;
755      debugger_instruction_hook(Machine, r3000->pc);
755756
756757      /* instruction fetch */
757      op = ROPCODE(r3000.pc);
758      op = ROPCODE(r3000->pc);
758759
759760      /* adjust for next PC */
760      if (r3000.nextpc != ~0)
761      if (r3000->nextpc != ~0)
761762      {
762         r3000.pc = r3000.nextpc;
763         r3000.nextpc = ~0;
764         change_pc(r3000.pc);
763         r3000->pc = r3000->nextpc;
764         r3000->nextpc = ~0;
765         change_pc(r3000->pc);
765766      }
766767      else
767         r3000.pc += 4;
768         r3000->pc += 4;
768769
769770      /* parse the instruction */
770771      switch (op >> 26)
r3535r3536
772773         case 0x00:   /* SPECIAL */
773774            switch (op & 63)
774775            {
775               case 0x00:   /* SLL */      if (RDREG) RDVAL = RTVAL << SHIFT;                  break;
776               case 0x02:   /* SRL */      if (RDREG) RDVAL = RTVAL >> SHIFT;                  break;
777               case 0x03:   /* SRA */      if (RDREG) RDVAL = (INT32)RTVAL >> SHIFT;            break;
778               case 0x04:   /* SLLV */      if (RDREG) RDVAL = RTVAL << (RSVAL & 31);            break;
779               case 0x06:   /* SRLV */      if (RDREG) RDVAL = RTVAL >> (RSVAL & 31);            break;
780               case 0x07:   /* SRAV */      if (RDREG) RDVAL = (INT32)RTVAL >> (RSVAL & 31);      break;
781               case 0x08:   /* JR */      SETPC(RSVAL);                                 break;
782               case 0x09:   /* JALR */      SETPCL(RSVAL,RDREG);                           break;
783               case 0x0c:   /* SYSCALL */   generate_exception(EXCEPTION_SYSCALL);               break;
784               case 0x0d:   /* BREAK */      generate_exception(EXCEPTION_BREAK);               break;
785               case 0x0f:   /* SYNC */      invalid_instruction(op);                        break;
786               case 0x10:   /* MFHI */      if (RDREG) RDVAL = HIVAL;                        break;
787               case 0x11:   /* MTHI */      HIVAL = RSVAL;                                 break;
788               case 0x12:   /* MFLO */      if (RDREG) RDVAL = LOVAL;                        break;
789               case 0x13:   /* MTLO */      LOVAL = RSVAL;                                 break;
776               case 0x00:   /* SLL */      if (RDREG) RDVAL = RTVAL << SHIFT;                     break;
777               case 0x02:   /* SRL */      if (RDREG) RDVAL = RTVAL >> SHIFT;                     break;
778               case 0x03:   /* SRA */      if (RDREG) RDVAL = (INT32)RTVAL >> SHIFT;               break;
779               case 0x04:   /* SLLV */      if (RDREG) RDVAL = RTVAL << (RSVAL & 31);               break;
780               case 0x06:   /* SRLV */      if (RDREG) RDVAL = RTVAL >> (RSVAL & 31);               break;
781               case 0x07:   /* SRAV */      if (RDREG) RDVAL = (INT32)RTVAL >> (RSVAL & 31);         break;
782               case 0x08:   /* JR */      SETPC(RSVAL);                                    break;
783               case 0x09:   /* JALR */      SETPCL(RSVAL,RDREG);                              break;
784               case 0x0c:   /* SYSCALL */   generate_exception(r3000, EXCEPTION_SYSCALL);            break;
785               case 0x0d:   /* BREAK */      generate_exception(r3000, EXCEPTION_BREAK);               break;
786               case 0x0f:   /* SYNC */      invalid_instruction(r3000, op);                        break;
787               case 0x10:   /* MFHI */      if (RDREG) RDVAL = HIVAL;                           break;
788               case 0x11:   /* MTHI */      HIVAL = RSVAL;                                    break;
789               case 0x12:   /* MFLO */      if (RDREG) RDVAL = LOVAL;                           break;
790               case 0x13:   /* MTLO */      LOVAL = RSVAL;                                    break;
790791               case 0x18:   /* MULT */
791792                  temp64 = (INT64)(INT32)RSVAL * (INT64)(INT32)RTVAL;
792793                  LOVAL = (UINT32)temp64;
793794                  HIVAL = (UINT32)(temp64 >> 32);
794                  r3000_icount -= 11;
795                  r3000->icount -= 11;
795796                  break;
796797               case 0x19:   /* MULTU */
797798                  temp64 = (UINT64)RSVAL * (UINT64)RTVAL;
798799                  LOVAL = (UINT32)temp64;
799800                  HIVAL = (UINT32)(temp64 >> 32);
800                  r3000_icount -= 11;
801                  r3000->icount -= 11;
801802                  break;
802803               case 0x1a:   /* DIV */
803804                  if (RTVAL)
r3535r3536
805806                     LOVAL = (INT32)RSVAL / (INT32)RTVAL;
806807                     HIVAL = (INT32)RSVAL % (INT32)RTVAL;
807808                  }
808                  r3000_icount -= 34;
809                  r3000->icount -= 34;
809810                  break;
810811               case 0x1b:   /* DIVU */
811812                  if (RTVAL)
r3535r3536
813814                     LOVAL = RSVAL / RTVAL;
814815                     HIVAL = RSVAL % RTVAL;
815816                  }
816                  r3000_icount -= 34;
817                  r3000->icount -= 34;
817818                  break;
818819               case 0x20:   /* ADD */
819                  if (ENABLE_OVERFLOWS && RSVAL > ~RTVAL) generate_exception(EXCEPTION_OVERFLOW);
820                  if (ENABLE_OVERFLOWS && RSVAL > ~RTVAL) generate_exception(r3000, EXCEPTION_OVERFLOW);
820821                  else RDVAL = RSVAL + RTVAL;
821822                  break;
822               case 0x21:   /* ADDU */      if (RDREG) RDVAL = RSVAL + RTVAL;                  break;
823               case 0x21:   /* ADDU */      if (RDREG) RDVAL = RSVAL + RTVAL;                     break;
823824               case 0x22:   /* SUB */
824                  if (ENABLE_OVERFLOWS && RSVAL < RTVAL) generate_exception(EXCEPTION_OVERFLOW);
825                  if (ENABLE_OVERFLOWS && RSVAL < RTVAL) generate_exception(r3000, EXCEPTION_OVERFLOW);
825826                  else RDVAL = RSVAL - RTVAL;
826827                  break;
827               case 0x23:   /* SUBU */      if (RDREG) RDVAL = RSVAL - RTVAL;                  break;
828               case 0x24:   /* AND */      if (RDREG) RDVAL = RSVAL & RTVAL;                  break;
829               case 0x25:   /* OR */      if (RDREG) RDVAL = RSVAL | RTVAL;                  break;
830               case 0x26:   /* XOR */      if (RDREG) RDVAL = RSVAL ^ RTVAL;                  break;
831               case 0x27:   /* NOR */      if (RDREG) RDVAL = ~(RSVAL | RTVAL);               break;
832               case 0x2a:   /* SLT */      if (RDREG) RDVAL = (INT32)RSVAL < (INT32)RTVAL;         break;
833               case 0x2b:   /* SLTU */      if (RDREG) RDVAL = (UINT32)RSVAL < (UINT32)RTVAL;      break;
834               case 0x30:   /* TEQ */      invalid_instruction(op);                        break;
835               case 0x31:   /* TGEU */      invalid_instruction(op);                        break;
836               case 0x32:   /* TLT */      invalid_instruction(op);                        break;
837               case 0x33:   /* TLTU */      invalid_instruction(op);                        break;
838               case 0x34:   /* TGE */      invalid_instruction(op);                        break;
839               case 0x36:   /* TNE */      invalid_instruction(op);                        break;
840               default:   /* ??? */      invalid_instruction(op);                        break;
828               case 0x23:   /* SUBU */      if (RDREG) RDVAL = RSVAL - RTVAL;                     break;
829               case 0x24:   /* AND */      if (RDREG) RDVAL = RSVAL & RTVAL;                     break;
830               case 0x25:   /* OR */      if (RDREG) RDVAL = RSVAL | RTVAL;                     break;
831               case 0x26:   /* XOR */      if (RDREG) RDVAL = RSVAL ^ RTVAL;                     break;
832               case 0x27:   /* NOR */      if (RDREG) RDVAL = ~(RSVAL | RTVAL);                  break;
833               case 0x2a:   /* SLT */      if (RDREG) RDVAL = (INT32)RSVAL < (INT32)RTVAL;            break;
834               case 0x2b:   /* SLTU */      if (RDREG) RDVAL = (UINT32)RSVAL < (UINT32)RTVAL;         break;
835               case 0x30:   /* TEQ */      invalid_instruction(r3000, op);                        break;
836               case 0x31:   /* TGEU */      invalid_instruction(r3000, op);                        break;
837               case 0x32:   /* TLT */      invalid_instruction(r3000, op);                        break;
838               case 0x33:   /* TLTU */      invalid_instruction(r3000, op);                        break;
839               case 0x34:   /* TGE */      invalid_instruction(r3000, op);                        break;
840               case 0x36:   /* TNE */      invalid_instruction(r3000, op);                        break;
841               default:   /* ??? */      invalid_instruction(r3000, op);                        break;
841842            }
842843            break;
843844
844845         case 0x01:   /* REGIMM */
845846            switch (RTREG)
846847            {
847               case 0x00:   /* BLTZ */      if ((INT32)RSVAL < 0) ADDPC(SIMMVAL);               break;
848               case 0x01:   /* BGEZ */      if ((INT32)RSVAL >= 0) ADDPC(SIMMVAL);               break;
849               case 0x02:   /* BLTZL */      invalid_instruction(op);                        break;
850               case 0x03:   /* BGEZL */      invalid_instruction(op);                        break;
851               case 0x08:   /* TGEI */      invalid_instruction(op);                        break;
852               case 0x09:   /* TGEIU */      invalid_instruction(op);                        break;
853               case 0x0a:   /* TLTI */      invalid_instruction(op);                        break;
854               case 0x0b:   /* TLTIU */      invalid_instruction(op);                        break;
855               case 0x0c:   /* TEQI */      invalid_instruction(op);                        break;
856               case 0x0e:   /* TNEI */      invalid_instruction(op);                        break;
857               case 0x10:   /* BLTZAL */   if ((INT32)RSVAL < 0) ADDPCL(SIMMVAL,31);            break;
858               case 0x11:   /* BGEZAL */   if ((INT32)RSVAL >= 0) ADDPCL(SIMMVAL,31);            break;
859               case 0x12:   /* BLTZALL */   invalid_instruction(op);                        break;
860               case 0x13:   /* BGEZALL */   invalid_instruction(op);                        break;
861               default:   /* ??? */      invalid_instruction(op);                        break;
848               case 0x00:   /* BLTZ */      if ((INT32)RSVAL < 0) ADDPC(SIMMVAL);                  break;
849               case 0x01:   /* BGEZ */      if ((INT32)RSVAL >= 0) ADDPC(SIMMVAL);                  break;
850               case 0x02:   /* BLTZL */      invalid_instruction(r3000, op);                        break;
851               case 0x03:   /* BGEZL */      invalid_instruction(r3000, op);                        break;
852               case 0x08:   /* TGEI */      invalid_instruction(r3000, op);                        break;
853               case 0x09:   /* TGEIU */      invalid_instruction(r3000, op);                        break;
854               case 0x0a:   /* TLTI */      invalid_instruction(r3000, op);                        break;
855               case 0x0b:   /* TLTIU */      invalid_instruction(r3000, op);                        break;
856               case 0x0c:   /* TEQI */      invalid_instruction(r3000, op);                        break;
857               case 0x0e:   /* TNEI */      invalid_instruction(r3000, op);                        break;
858               case 0x10:   /* BLTZAL */   if ((INT32)RSVAL < 0) ADDPCL(SIMMVAL,31);               break;
859               case 0x11:   /* BGEZAL */   if ((INT32)RSVAL >= 0) ADDPCL(SIMMVAL,31);               break;
860               case 0x12:   /* BLTZALL */   invalid_instruction(r3000, op);                        break;
861               case 0x13:   /* BGEZALL */   invalid_instruction(r3000, op);                        break;
862               default:   /* ??? */      invalid_instruction(r3000, op);                        break;
862863            }
863864            break;
864865
865         case 0x02:   /* J */         ABSPC(LIMMVAL);                                       break;
866         case 0x03:   /* JAL */      ABSPCL(LIMMVAL,31);                                    break;
867         case 0x04:   /* BEQ */      if (RSVAL == RTVAL) ADDPC(SIMMVAL);                        break;
868         case 0x05:   /* BNE */      if (RSVAL != RTVAL) ADDPC(SIMMVAL);                        break;
869         case 0x06:   /* BLEZ */      if ((INT32)RSVAL <= 0) ADDPC(SIMMVAL);                     break;
870         case 0x07:   /* BGTZ */      if ((INT32)RSVAL > 0) ADDPC(SIMMVAL);                     break;
866         case 0x02:   /* J */         ABSPC(LIMMVAL);                                          break;
867         case 0x03:   /* JAL */      ABSPCL(LIMMVAL,31);                                       break;
868         case 0x04:   /* BEQ */      if (RSVAL == RTVAL) ADDPC(SIMMVAL);                           break;
869         case 0x05:   /* BNE */      if (RSVAL != RTVAL) ADDPC(SIMMVAL);                           break;
870         case 0x06:   /* BLEZ */      if ((INT32)RSVAL <= 0) ADDPC(SIMMVAL);                        break;
871         case 0x07:   /* BGTZ */      if ((INT32)RSVAL > 0) ADDPC(SIMMVAL);                        break;
871872         case 0x08:   /* ADDI */
872            if (ENABLE_OVERFLOWS && RSVAL > ~SIMMVAL) generate_exception(EXCEPTION_OVERFLOW);
873            if (ENABLE_OVERFLOWS && RSVAL > ~SIMMVAL) generate_exception(r3000, EXCEPTION_OVERFLOW);
873874            else if (RTREG) RTVAL = RSVAL + SIMMVAL;
874875            break;
875         case 0x09:   /* ADDIU */      if (RTREG) RTVAL = RSVAL + SIMMVAL;                        break;
876         case 0x0a:   /* SLTI */      if (RTREG) RTVAL = (INT32)RSVAL < (INT32)SIMMVAL;            break;
877         case 0x0b:   /* SLTIU */      if (RTREG) RTVAL = (UINT32)RSVAL < (UINT32)SIMMVAL;            break;
878         case 0x0c:   /* ANDI */      if (RTREG) RTVAL = RSVAL & UIMMVAL;                        break;
879         case 0x0d:   /* ORI */      if (RTREG) RTVAL = RSVAL | UIMMVAL;                        break;
880         case 0x0e:   /* XORI */      if (RTREG) RTVAL = RSVAL ^ UIMMVAL;                        break;
881         case 0x0f:   /* LUI */      if (RTREG) RTVAL = UIMMVAL << 16;                        break;
882         case 0x10:   /* COP0 */      handle_cop0(op);                                    break;
883         case 0x11:   /* COP1 */      handle_cop1(op);                                    break;
884         case 0x12:   /* COP2 */      handle_cop2(op);                                    break;
885         case 0x13:   /* COP3 */      handle_cop3(op);                                    break;
886         case 0x14:   /* BEQL */      invalid_instruction(op);                              break;
887         case 0x15:   /* BNEL */      invalid_instruction(op);                              break;
888         case 0x16:   /* BLEZL */      invalid_instruction(op);                              break;
889         case 0x17:   /* BGTZL */      invalid_instruction(op);                              break;
890         case 0x20:   /* LB */      temp = RBYTE(SIMMVAL+RSVAL); if (RTREG) RTVAL = (INT8)temp;      break;
891         case 0x21:   /* LH */      temp = RWORD(SIMMVAL+RSVAL); if (RTREG) RTVAL = (INT16)temp;   break;
892         case 0x22:   /* LWL */      (*r3000.lwl)(op);                                    break;
893         case 0x23:   /* LW */      temp = RLONG(SIMMVAL+RSVAL); if (RTREG) RTVAL = temp;         break;
894         case 0x24:   /* LBU */      temp = RBYTE(SIMMVAL+RSVAL); if (RTREG) RTVAL = (UINT8)temp;   break;
895         case 0x25:   /* LHU */      temp = RWORD(SIMMVAL+RSVAL); if (RTREG) RTVAL = (UINT16)temp;   break;
896         case 0x26:   /* LWR */      (*r3000.lwr)(op);                                    break;
897         case 0x28:   /* SB */      WBYTE(SIMMVAL+RSVAL, RTVAL);                           break;
898         case 0x29:   /* SH */      WWORD(SIMMVAL+RSVAL, RTVAL);                            break;
899         case 0x2a:   /* SWL */      (*r3000.swl)(op);                                    break;
900         case 0x2b:   /* SW */      WLONG(SIMMVAL+RSVAL, RTVAL);                           break;
901         case 0x2e:   /* SWR */      (*r3000.swr)(op);                                    break;
902         case 0x2f:   /* CACHE */      invalid_instruction(op);                              break;
903         case 0x30:   /* LL */      invalid_instruction(op);                              break;
904         case 0x31:   /* LWC1 */      set_cop1_reg(RTREG, RLONG(SIMMVAL+RSVAL));                  break;
905         case 0x32:   /* LWC2 */      set_cop2_reg(RTREG, RLONG(SIMMVAL+RSVAL));                  break;
906         case 0x33:   /* LWC3 */      set_cop3_reg(RTREG, RLONG(SIMMVAL+RSVAL));                  break;
907         case 0x34:   /* LDC0 */      invalid_instruction(op);                              break;
908         case 0x35:   /* LDC1 */      invalid_instruction(op);                              break;
909         case 0x36:   /* LDC2 */      invalid_instruction(op);                              break;
910         case 0x37:   /* LDC3 */      invalid_instruction(op);                              break;
911         case 0x38:   /* SC */      invalid_instruction(op);                              break;
912         case 0x39:   /* LWC1 */      WLONG(SIMMVAL+RSVAL, get_cop1_reg(RTREG));                  break;
913         case 0x3a:   /* LWC2 */      WLONG(SIMMVAL+RSVAL, get_cop2_reg(RTREG));                  break;
914         case 0x3b:   /* LWC3 */      WLONG(SIMMVAL+RSVAL, get_cop3_reg(RTREG));                  break;
915         case 0x3c:   /* SDC0 */      invalid_instruction(op);                              break;
916         case 0x3d:   /* SDC1 */      invalid_instruction(op);                              break;
917         case 0x3e:   /* SDC2 */      invalid_instruction(op);                              break;
918         case 0x3f:   /* SDC3 */      invalid_instruction(op);                              break;
919         default:   /* ??? */      invalid_instruction(op);                              break;
876         case 0x09:   /* ADDIU */      if (RTREG) RTVAL = RSVAL + SIMMVAL;                           break;
877         case 0x0a:   /* SLTI */      if (RTREG) RTVAL = (INT32)RSVAL < (INT32)SIMMVAL;               break;
878         case 0x0b:   /* SLTIU */      if (RTREG) RTVAL = (UINT32)RSVAL < (UINT32)SIMMVAL;               break;
879         case 0x0c:   /* ANDI */      if (RTREG) RTVAL = RSVAL & UIMMVAL;                           break;
880         case 0x0d:   /* ORI */      if (RTREG) RTVAL = RSVAL | UIMMVAL;                           break;
881         case 0x0e:   /* XORI */      if (RTREG) RTVAL = RSVAL ^ UIMMVAL;                           break;
882         case 0x0f:   /* LUI */      if (RTREG) RTVAL = UIMMVAL << 16;                           break;
883         case 0x10:   /* COP0 */      handle_cop0(r3000, op);                                    break;
884         case 0x11:   /* COP1 */      handle_cop1(r3000, op);                                    break;
885         case 0x12:   /* COP2 */      handle_cop2(r3000, op);                                    break;
886         case 0x13:   /* COP3 */      handle_cop3(r3000, op);                                    break;
887         case 0x14:   /* BEQL */      invalid_instruction(r3000, op);                              break;
888         case 0x15:   /* BNEL */      invalid_instruction(r3000, op);                              break;
889         case 0x16:   /* BLEZL */      invalid_instruction(r3000, op);                              break;
890         case 0x17:   /* BGTZL */      invalid_instruction(r3000, op);                              break;
891         case 0x20:   /* LB */      temp = RBYTE(SIMMVAL+RSVAL); if (RTREG) RTVAL = (INT8)temp;         break;
892         case 0x21:   /* LH */      temp = RWORD(SIMMVAL+RSVAL); if (RTREG) RTVAL = (INT16)temp;      break;
893         case 0x22:   /* LWL */      (*r3000->lwl)(r3000, op);                                 break;
894         case 0x23:   /* LW */      temp = RLONG(SIMMVAL+RSVAL); if (RTREG) RTVAL = temp;            break;
895         case 0x24:   /* LBU */      temp = RBYTE(SIMMVAL+RSVAL); if (RTREG) RTVAL = (UINT8)temp;      break;
896         case 0x25:   /* LHU */      temp = RWORD(SIMMVAL+RSVAL); if (RTREG) RTVAL = (UINT16)temp;      break;
897         case 0x26:   /* LWR */      (*r3000->lwr)(r3000, op);                                 break;
898         case 0x28:   /* SB */      WBYTE(SIMMVAL+RSVAL, RTVAL);                              break;
899         case 0x29:   /* SH */      WWORD(SIMMVAL+RSVAL, RTVAL);                               break;
900         case 0x2a:   /* SWL */      (*r3000->swl)(r3000, op);                                 break;
901         case 0x2b:   /* SW */      WLONG(SIMMVAL+RSVAL, RTVAL);                              break;
902         case 0x2e:   /* SWR */      (*r3000->swr)(r3000, op);                                 break;
903         case 0x2f:   /* CACHE */      invalid_instruction(r3000, op);                              break;
904         case 0x30:   /* LL */      invalid_instruction(r3000, op);                              break;
905         case 0x31:   /* LWC1 */      set_cop1_reg(r3000, RTREG, RLONG(SIMMVAL+RSVAL));               break;
906         case 0x32:   /* LWC2 */      set_cop2_reg(r3000, RTREG, RLONG(SIMMVAL+RSVAL));               break;
907         case 0x33:   /* LWC3 */      set_cop3_reg(r3000, RTREG, RLONG(SIMMVAL+RSVAL));               break;
908         case 0x34:   /* LDC0 */      invalid_instruction(r3000, op);                              break;
909         case 0x35:   /* LDC1 */      invalid_instruction(r3000, op);                              break;
910         case 0x36:   /* LDC2 */      invalid_instruction(r3000, op);                              break;
911         case 0x37:   /* LDC3 */      invalid_instruction(r3000, op);                              break;
912         case 0x38:   /* SC */      invalid_instruction(r3000, op);                              break;
913         case 0x39:   /* LWC1 */      WLONG(SIMMVAL+RSVAL, get_cop1_reg(r3000, RTREG));               break;
914         case 0x3a:   /* LWC2 */      WLONG(SIMMVAL+RSVAL, get_cop2_reg(r3000, RTREG));               break;
915         case 0x3b:   /* LWC3 */      WLONG(SIMMVAL+RSVAL, get_cop3_reg(r3000, RTREG));               break;
916         case 0x3c:   /* SDC0 */      invalid_instruction(r3000, op);                              break;
917         case 0x3d:   /* SDC1 */      invalid_instruction(r3000, op);                              break;
918         case 0x3e:   /* SDC2 */      invalid_instruction(r3000, op);                              break;
919         case 0x3f:   /* SDC3 */      invalid_instruction(r3000, op);                              break;
920         default:   /* ??? */      invalid_instruction(r3000, op);                              break;
920921      }
921      r3000_icount--;
922      r3000->icount--;
922923
923   } while (r3000_icount > 0 || r3000.nextpc != ~0);
924   } while (r3000->icount > 0 || r3000->nextpc != ~0);
924925
925   r3000_icount -= r3000.interrupt_cycles;
926   r3000.interrupt_cycles = 0;
927   return cycles - r3000_icount;
926   r3000->icount -= r3000->interrupt_cycles;
927   r3000->interrupt_cycles = 0;
928   return cycles - r3000->icount;
928929}
929930
930931
r3535r3536
933934    DISASSEMBLY HOOK
934935***************************************************************************/
935936
936static offs_t r3000_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
937static CPU_DISASSEMBLE( r3000 )
937938{
938939   extern unsigned dasmr3k(char *, unsigned, UINT32);
940   r3000_state *r3000 = token;
939941   UINT32 op = *(UINT32 *)oprom;
940   if (r3000.bigendian)
942   if (r3000->bigendian)
941943      op = BIG_ENDIANIZE_INT32(op);
942944   else
943945      op = LITTLE_ENDIANIZE_INT32(op);
r3535r3536
953955
954956static UINT8 readcache_be(offs_t offset)
955957{
958   r3000_state *r3000 = token;   /* fixme */
956959   offset &= 0x1fffffff;
957   return (offset * 4 < r3000.cache_size) ? r3000.cache[BYTE4_XOR_BE(offset)] : 0xff;
960   return (offset * 4 < r3000->cache_size) ? r3000->cache[BYTE4_XOR_BE(offset)] : 0xff;
958961}
959962
960963static UINT16 readcache_be_word(offs_t offset)
961964{
965   r3000_state *r3000 = token;   /* fixme */
962966   offset &= 0x1fffffff;
963   return (offset * 4 < r3000.cache_size) ? *(UINT16 *)&r3000.cache[WORD_XOR_BE(offset)] : 0xffff;
967   return (offset * 4 < r3000->cache_size) ? *(UINT16 *)&r3000->cache[WORD_XOR_BE(offset)] : 0xffff;
964968}
965969
966970static UINT32 readcache_be_dword(offs_t offset)
967971{
972   r3000_state *r3000 = token;   /* fixme */
968973   offset &= 0x1fffffff;
969   return (offset * 4 < r3000.cache_size) ? *(UINT32 *)&r3000.cache[offset] : 0xffffffff;
974   return (offset * 4 < r3000->cache_size) ? *(UINT32 *)&r3000->cache[offset] : 0xffffffff;
970975}
971976
972977static void writecache_be(offs_t offset, UINT8 data)
973978{
979   r3000_state *r3000 = token;   /* fixme */
974980   offset &= 0x1fffffff;
975   if (offset * 4 < r3000.cache_size) r3000.cache[BYTE4_XOR_BE(offset)] = data;
981   if (offset * 4 < r3000->cache_size) r3000->cache[BYTE4_XOR_BE(offset)] = data;
976982}
977983
978984static void writecache_be_word(offs_t offset, UINT16 data)
979985{
986   r3000_state *r3000 = token;   /* fixme */
980987   offset &= 0x1fffffff;
981   if (offset * 4 < r3000.cache_size) *(UINT16 *)&r3000.cache[WORD_XOR_BE(offset)] = data;
988   if (offset * 4 < r3000->cache_size) *(UINT16 *)&r3000->cache[WORD_XOR_BE(offset)] = data;
982989}
983990
984991static void writecache_be_dword(offs_t offset, UINT32 data)
985992{
993   r3000_state *r3000 = token;   /* fixme */
986994   offset &= 0x1fffffff;
987   if (offset * 4 < r3000.cache_size) *(UINT32 *)&r3000.cache[offset] = data;
995   if (offset * 4 < r3000->cache_size) *(UINT32 *)&r3000->cache[offset] = data;
988996}
989997
990998static UINT8 readcache_le(offs_t offset)
991999{
1000   r3000_state *r3000 = token;   /* fixme */
9921001   offset &= 0x1fffffff;
993   return (offset * 4 < r3000.cache_size) ? r3000.cache[BYTE4_XOR_LE(offset)] : 0xff;
1002   return (offset * 4 < r3000->cache_size) ? r3000->cache[BYTE4_XOR_LE(offset)] : 0xff;
9941003}
9951004
9961005static UINT16 readcache_le_word(offs_t offset)
9971006{
1007   r3000_state *r3000 = token;   /* fixme */
9981008   offset &= 0x1fffffff;
999   return (offset * 4 < r3000.cache_size) ? *(UINT16 *)&r3000.cache[WORD_XOR_LE(offset)] : 0xffff;
1009   return (offset * 4 < r3000->cache_size) ? *(UINT16 *)&r3000->cache[WORD_XOR_LE(offset)] : 0xffff;
10001010}
10011011
10021012static UINT32 readcache_le_dword(offs_t offset)
10031013{
1014   r3000_state *r3000 = token;   /* fixme */
10041015   offset &= 0x1fffffff;
1005   return (offset * 4 < r3000.cache_size) ? *(UINT32 *)&r3000.cache[offset] : 0xffffffff;
1016   return (offset * 4 < r3000->cache_size) ? *(UINT32 *)&r3000->cache[offset] : 0xffffffff;
10061017}
10071018
10081019static void writecache_le(offs_t offset, UINT8 data)
10091020{
1021   r3000_state *r3000 = token;   /* fixme */
10101022   offset &= 0x1fffffff;
1011   if (offset * 4 < r3000.cache_size) r3000.cache[BYTE4_XOR_LE(offset)] = data;
1023   if (offset * 4 < r3000->cache_size) r3000->cache[BYTE4_XOR_LE(offset)] = data;
10121024}
10131025
10141026static void writecache_le_word(offs_t offset, UINT16 data)
10151027{
1028   r3000_state *r3000 = token;   /* fixme */
10161029   offset &= 0x1fffffff;
1017   if (offset * 4 < r3000.cache_size) *(UINT16 *)&r3000.cache[WORD_XOR_LE(offset)] = data;
1030   if (offset * 4 < r3000->cache_size) *(UINT16 *)&r3000->cache[WORD_XOR_LE(offset)] = data;
10181031}
10191032
10201033static void writecache_le_dword(offs_t offset, UINT32 data)
10211034{
1035   r3000_state *r3000 = token;   /* fixme */
10221036   offset &= 0x1fffffff;
1023   if (offset * 4 < r3000.cache_size) *(UINT32 *)&r3000.cache[offset] = data;
1037   if (offset * 4 < r3000->cache_size) *(UINT32 *)&r3000->cache[offset] = data;
10241038}
10251039
10261040
r3535r3536
10291043    COMPLEX OPCODE IMPLEMENTATIONS
10301044***************************************************************************/
10311045
1032static void lwl_be(UINT32 op)
1046static void lwl_be(r3000_state *r3000, UINT32 op)
10331047{
10341048   offs_t offs = SIMMVAL + RSVAL;
10351049   UINT32 temp = RLONG(offs & ~3);
r3535r3536
10441058   }
10451059}
10461060
1047static void lwr_be(UINT32 op)
1061static void lwr_be(r3000_state *r3000, UINT32 op)
10481062{
10491063   offs_t offs = SIMMVAL + RSVAL;
10501064   UINT32 temp = RLONG(offs & ~3);
r3535r3536
10591073   }
10601074}
10611075
1062static void swl_be(UINT32 op)
1076static void swl_be(r3000_state *r3000, UINT32 op)
10631077{
10641078   offs_t offs = SIMMVAL + RSVAL;
10651079   if (!(offs & 3)) WLONG(offs, RTVAL);
r3535r3536
10721086}
10731087
10741088
1075static void swr_be(UINT32 op)
1089static void swr_be(r3000_state *r3000, UINT32 op)
10761090{
10771091   offs_t offs = SIMMVAL + RSVAL;
10781092   if ((offs & 3) == 3) WLONG(offs & ~3, RTVAL);
r3535r3536
10861100
10871101
10881102
1089static void lwl_le(UINT32 op)
1103static void lwl_le(r3000_state *r3000, UINT32 op)
10901104{
10911105   offs_t offs = SIMMVAL + RSVAL;
10921106   UINT32 temp = RLONG(offs & ~3);
r3535r3536
11011115   }
11021116}
11031117
1104static void lwr_le(UINT32 op)
1118static void lwr_le(r3000_state *r3000, UINT32 op)
11051119{
11061120   offs_t offs = SIMMVAL + RSVAL;
11071121   UINT32 temp = RLONG(offs & ~3);
r3535r3536
11161130   }
11171131}
11181132
1119static void swl_le(UINT32 op)
1133static void swl_le(r3000_state *r3000, UINT32 op)
11201134{
11211135   offs_t offs = SIMMVAL + RSVAL;
11221136   if (!(offs & 3)) WLONG(offs, RTVAL);
r3535r3536
11281142   }
11291143}
11301144
1131static void swr_le(UINT32 op)
1145static void swr_le(r3000_state *r3000, UINT32 op)
11321146{
11331147   offs_t offs = SIMMVAL + RSVAL;
11341148   if ((offs & 3) == 3) WLONG(offs & ~3, RTVAL);
r3535r3536
11461160 * Generic set_info
11471161 **************************************************************************/
11481162
1149static void r3000_set_info(UINT32 state, cpuinfo *info)
1163static CPU_SET_INFO( r3000 )
11501164{
1165   r3000_state *r3000 = token;
11511166   switch (state)
11521167   {
11531168      /* --- the following bits of info are set as 64-bit signed integers --- */
1154      case CPUINFO_INT_INPUT_STATE + R3000_IRQ0:      set_irq_line(R3000_IRQ0, info->i);      break;
1155      case CPUINFO_INT_INPUT_STATE + R3000_IRQ1:      set_irq_line(R3000_IRQ1, info->i);      break;
1156      case CPUINFO_INT_INPUT_STATE + R3000_IRQ2:      set_irq_line(R3000_IRQ2, info->i);      break;
1157      case CPUINFO_INT_INPUT_STATE + R3000_IRQ3:      set_irq_line(R3000_IRQ3, info->i);      break;
1158      case CPUINFO_INT_INPUT_STATE + R3000_IRQ4:      set_irq_line(R3000_IRQ4, info->i);      break;
1159      case CPUINFO_INT_INPUT_STATE + R3000_IRQ5:      set_irq_line(R3000_IRQ5, info->i);      break;
1169      case CPUINFO_INT_INPUT_STATE + R3000_IRQ0:      set_irq_line(r3000, R3000_IRQ0, info->i);   break;
1170      case CPUINFO_INT_INPUT_STATE + R3000_IRQ1:      set_irq_line(r3000, R3000_IRQ1, info->i);   break;
1171      case CPUINFO_INT_INPUT_STATE + R3000_IRQ2:      set_irq_line(r3000, R3000_IRQ2, info->i);   break;
1172      case CPUINFO_INT_INPUT_STATE + R3000_IRQ3:      set_irq_line(r3000, R3000_IRQ3, info->i);   break;
1173      case CPUINFO_INT_INPUT_STATE + R3000_IRQ4:      set_irq_line(r3000, R3000_IRQ4, info->i);   break;
1174      case CPUINFO_INT_INPUT_STATE + R3000_IRQ5:      set_irq_line(r3000, R3000_IRQ5, info->i);   break;
11601175
11611176      case CPUINFO_INT_PC:
1162      case CPUINFO_INT_REGISTER + R3000_PC:         r3000.pc = info->i;                  break;
1177      case CPUINFO_INT_REGISTER + R3000_PC:         r3000->pc = info->i;               break;
11631178      case CPUINFO_INT_REGISTER + R3000_SR:         SR = info->i;                     break;
11641179
1165      case CPUINFO_INT_REGISTER + R3000_R0:         r3000.r[0] = info->i;               break;
1166      case CPUINFO_INT_REGISTER + R3000_R1:         r3000.r[1] = info->i;               break;
1167      case CPUINFO_INT_REGISTER + R3000_R2:         r3000.r[2] = info->i;               break;
1168      case CPUINFO_INT_REGISTER + R3000_R3:         r3000.r[3] = info->i;               break;
1169      case CPUINFO_INT_REGISTER + R3000_R4:         r3000.r[4] = info->i;               break;
1170      case CPUINFO_INT_REGISTER + R3000_R5:         r3000.r[5] = info->i;               break;
1171      case CPUINFO_INT_REGISTER + R3000_R6:         r3000.r[6] = info->i;               break;
1172      case CPUINFO_INT_REGISTER + R3000_R7:         r3000.r[7] = info->i;               break;
1173      case CPUINFO_INT_REGISTER + R3000_R8:         r3000.r[8] = info->i;               break;
1174      case CPUINFO_INT_REGISTER + R3000_R9:         r3000.r[9] = info->i;               break;
1175      case CPUINFO_INT_REGISTER + R3000_R10:         r3000.r[10] = info->i;               break;
1176      case CPUINFO_INT_REGISTER + R3000_R11:         r3000.r[11] = info->i;               break;
1177      case CPUINFO_INT_REGISTER + R3000_R12:         r3000.r[12] = info->i;               break;
1178      case CPUINFO_INT_REGISTER + R3000_R13:         r3000.r[13] = info->i;               break;
1179      case CPUINFO_INT_REGISTER + R3000_R14:         r3000.r[14] = info->i;               break;
1180      case CPUINFO_INT_REGISTER + R3000_R15:         r3000.r[15] = info->i;               break;
1181      case CPUINFO_INT_REGISTER + R3000_R16:         r3000.r[16] = info->i;               break;
1182      case CPUINFO_INT_REGISTER + R3000_R17:         r3000.r[17] = info->i;               break;
1183      case CPUINFO_INT_REGISTER + R3000_R18:         r3000.r[18] = info->i;               break;
1184      case CPUINFO_INT_REGISTER + R3000_R19:         r3000.r[19] = info->i;               break;
1185      case CPUINFO_INT_REGISTER + R3000_R20:         r3000.r[20] = info->i;               break;
1186      case CPUINFO_INT_REGISTER + R3000_R21:         r3000.r[21] = info->i;               break;
1187      case CPUINFO_INT_REGISTER + R3000_R22:         r3000.r[22] = info->i;               break;
1188      case CPUINFO_INT_REGISTER + R3000_R23:         r3000.r[23] = info->i;               break;
1189      case CPUINFO_INT_REGISTER + R3000_R24:         r3000.r[24] = info->i;               break;
1190      case CPUINFO_INT_REGISTER + R3000_R25:         r3000.r[25] = info->i;               break;
1191      case CPUINFO_INT_REGISTER + R3000_R26:         r3000.r[26] = info->i;               break;
1192      case CPUINFO_INT_REGISTER + R3000_R27:         r3000.r[27] = info->i;               break;
1193      case CPUINFO_INT_REGISTER + R3000_R28:         r3000.r[28] = info->i;               break;
1194      case CPUINFO_INT_REGISTER + R3000_R29:         r3000.r[29] = info->i;               break;
1195      case CPUINFO_INT_REGISTER + R3000_R30:         r3000.r[30] = info->i;               break;
1180      case CPUINFO_INT_REGISTER + R3000_R0:         r3000->r[0] = info->i;               break;
1181      case CPUINFO_INT_REGISTER + R3000_R1:         r3000->r[1] = info->i;               break;
1182      case CPUINFO_INT_REGISTER + R3000_R2:         r3000->r[2] = info->i;               break;
1183      case CPUINFO_INT_REGISTER + R3000_R3:         r3000->r[3] = info->i;               break;
1184      case CPUINFO_INT_REGISTER + R3000_R4:         r3000->r[4] = info->i;               break;
1185      case CPUINFO_INT_REGISTER + R3000_R5:         r3000->r[5] = info->i;               break;
1186      case CPUINFO_INT_REGISTER + R3000_R6:         r3000->r[6] = info->i;               break;
1187      case CPUINFO_INT_REGISTER + R3000_R7:         r3000->r[7] = info->i;               break;
1188      case CPUINFO_INT_REGISTER + R3000_R8:         r3000->r[8] = info->i;               break;
1189      case CPUINFO_INT_REGISTER + R3000_R9:         r3000->r[9] = info->i;               break;
1190      case CPUINFO_INT_REGISTER + R3000_R10:         r3000->r[10] = info->i;               break;
1191      case CPUINFO_INT_REGISTER + R3000_R11:         r3000->r[11] = info->i;               break;
1192      case CPUINFO_INT_REGISTER + R3000_R12:         r3000->r[12] = info->i;               break;
1193      case CPUINFO_INT_REGISTER + R3000_R13:         r3000->r[13] = info->i;               break;
1194      case CPUINFO_INT_REGISTER + R3000_R14:         r3000->r[14] = info->i;               break;
1195      case CPUINFO_INT_REGISTER + R3000_R15:         r3000->r[15] = info->i;               break;
1196      case CPUINFO_INT_REGISTER + R3000_R16:         r3000->r[16] = info->i;               break;
1197      case CPUINFO_INT_REGISTER + R3000_R17:         r3000->r[17] = info->i;               break;
1198      case CPUINFO_INT_REGISTER + R3000_R18:         r3000->r[18] = info->i;               break;
1199      case CPUINFO_INT_REGISTER + R3000_R19:         r3000->r[19] = info->i;               break;
1200      case CPUINFO_INT_REGISTER + R3000_R20:         r3000->r[20] = info->i;               break;
1201      case CPUINFO_INT_REGISTER + R3000_R21:         r3000->r[21] = info->i;               break;
1202      case CPUINFO_INT_REGISTER + R3000_R22:         r3000->r[22] = info->i;               break;
1203      case CPUINFO_INT_REGISTER + R3000_R23:         r3000->r[23] = info->i;               break;
1204      case CPUINFO_INT_REGISTER + R3000_R24:         r3000->r[24] = info->i;               break;
1205      case CPUINFO_INT_REGISTER + R3000_R25:         r3000->r[25] = info->i;               break;
1206      case CPUINFO_INT_REGISTER + R3000_R26:         r3000->r[26] = info->i;               break;
1207      case CPUINFO_INT_REGISTER + R3000_R27:         r3000->r[27] = info->i;               break;
1208      case CPUINFO_INT_REGISTER + R3000_R28:         r3000->r[28] = info->i;               break;
1209      case CPUINFO_INT_REGISTER + R3000_R29:         r3000->r[29] = info->i;               break;
1210      case CPUINFO_INT_REGISTER + R3000_R30:         r3000->r[30] = info->i;               break;
11961211      case CPUINFO_INT_SP:
1197      case CPUINFO_INT_REGISTER + R3000_R31:         r3000.r[31] = info->i;               break;
1212      case CPUINFO_INT_REGISTER + R3000_R31:         r3000->r[31] = info->i;               break;
11981213   }
11991214}
12001215
r3535r3536
12041219 * Generic get_info
12051220 **************************************************************************/
12061221
1207static void r3000_get_info(UINT32 state, cpuinfo *info)
1222static CPU_GET_INFO( r3000 )
12081223{
1224   r3000_state *r3000 = token;
12091225   switch (state)
12101226   {
12111227      /* --- the following bits of info are returned as 64-bit signed integers --- */
1212      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(r3000);            break;
1228      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(r3000_state);         break;
12131229      case CPUINFO_INT_INPUT_LINES:               info->i = 6;                     break;
12141230      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:         info->i = 0;                     break;
12151231      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
r3535r3536
12301246      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 0;               break;
12311247      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = 0;               break;
12321248
1233      case CPUINFO_INT_INPUT_STATE + R3000_IRQ0:      info->i = (r3000.cpr[0][COP0_Cause] & 0x400) ? ASSERT_LINE : CLEAR_LINE; break;
1234      case CPUINFO_INT_INPUT_STATE + R3000_IRQ1:      info->i = (r3000.cpr[0][COP0_Cause] & 0x800) ? ASSERT_LINE : CLEAR_LINE; break;
1235      case CPUINFO_INT_INPUT_STATE + R3000_IRQ2:      info->i = (r3000.cpr[0][COP0_Cause] & 0x1000) ? ASSERT_LINE : CLEAR_LINE; break;
1236      case CPUINFO_INT_INPUT_STATE + R3000_IRQ3:      info->i = (r3000.cpr[0][COP0_Cause] & 0x2000) ? ASSERT_LINE : CLEAR_LINE; break;
1237      case CPUINFO_INT_INPUT_STATE + R3000_IRQ4:      info->i = (r3000.cpr[0][COP0_Cause] & 0x4000) ? ASSERT_LINE : CLEAR_LINE; break;
1238      case CPUINFO_INT_INPUT_STATE + R3000_IRQ5:      info->i = (r3000.cpr[0][COP0_Cause] & 0x8000) ? ASSERT_LINE : CLEAR_LINE; break;
1249      case CPUINFO_INT_INPUT_STATE + R3000_IRQ0:      info->i = (r3000->cpr[0][COP0_Cause] & 0x400) ? ASSERT_LINE : CLEAR_LINE; break;
1250      case CPUINFO_INT_INPUT_STATE + R3000_IRQ1:      info->i = (r3000->cpr[0][COP0_Cause] & 0x800) ? ASSERT_LINE : CLEAR_LINE; break;
1251      case CPUINFO_INT_INPUT_STATE + R3000_IRQ2:      info->i = (r3000->cpr[0][COP0_Cause] & 0x1000) ? ASSERT_LINE : CLEAR_LINE; break;
1252      case CPUINFO_INT_INPUT_STATE + R3000_IRQ3:      info->i = (r3000->cpr[0][COP0_Cause] & 0x2000) ? ASSERT_LINE : CLEAR_LINE; break;
1253      case CPUINFO_INT_INPUT_STATE + R3000_IRQ4:      info->i = (r3000->cpr[0][COP0_Cause] & 0x4000) ? ASSERT_LINE : CLEAR_LINE; break;
1254      case CPUINFO_INT_INPUT_STATE + R3000_IRQ5:      info->i = (r3000->cpr[0][COP0_Cause] & 0x8000) ? ASSERT_LINE : CLEAR_LINE; break;
12391255
1240      case CPUINFO_INT_PREVIOUSPC:               info->i = r3000.ppc;               break;
1256      case CPUINFO_INT_PREVIOUSPC:               info->i = r3000->ppc;               break;
12411257
1242      case CPUINFO_INT_PC:                     info->i = r3000.pc & 0x1fffffff;      break;
1243      case CPUINFO_INT_REGISTER + R3000_PC:         info->i = r3000.pc;                  break;
1258      case CPUINFO_INT_PC:                     info->i = r3000->pc & 0x1fffffff;      break;
1259      case CPUINFO_INT_REGISTER + R3000_PC:         info->i = r3000->pc;               break;
12441260      case CPUINFO_INT_REGISTER + R3000_SR:         info->i = SR;                     break;
12451261
1246      case CPUINFO_INT_REGISTER + R3000_R0:         info->i = r3000.r[0];               break;
1247      case CPUINFO_INT_REGISTER + R3000_R1:         info->i = r3000.r[1];               break;
1248      case CPUINFO_INT_REGISTER + R3000_R2:         info->i = r3000.r[2];               break;
1249      case CPUINFO_INT_REGISTER + R3000_R3:         info->i = r3000.r[3];               break;
1250      case CPUINFO_INT_REGISTER + R3000_R4:         info->i = r3000.r[4];               break;
1251      case CPUINFO_INT_REGISTER + R3000_R5:         info->i = r3000.r[5];               break;
1252      case CPUINFO_INT_REGISTER + R3000_R6:         info->i = r3000.r[6];               break;
1253      case CPUINFO_INT_REGISTER + R3000_R7:         info->i = r3000.r[7];               break;
1254      case CPUINFO_INT_REGISTER + R3000_R8:         info->i = r3000.r[8];               break;
1255      case CPUINFO_INT_REGISTER + R3000_R9:         info->i = r3000.r[9];               break;
1256      case CPUINFO_INT_REGISTER + R3000_R10:         info->i = r3000.r[10];               break;
1257      case CPUINFO_INT_REGISTER + R3000_R11:         info->i = r3000.r[11];               break;
1258      case CPUINFO_INT_REGISTER + R3000_R12:         info->i = r3000.r[12];               break;
1259      case CPUINFO_INT_REGISTER + R3000_R13:         info->i = r3000.r[13];               break;
1260      case CPUINFO_INT_REGISTER + R3000_R14:         info->i = r3000.r[14];               break;
1261      case CPUINFO_INT_REGISTER + R3000_R15:         info->i = r3000.r[15];               break;
1262      case CPUINFO_INT_REGISTER + R3000_R16:         info->i = r3000.r[16];               break;
1263      case CPUINFO_INT_REGISTER + R3000_R17:         info->i = r3000.r[17];               break;
1264      case CPUINFO_INT_REGISTER + R3000_R18:         info->i = r3000.r[18];               break;
1265      case CPUINFO_INT_REGISTER + R3000_R19:         info->i = r3000.r[19];               break;
1266      case CPUINFO_INT_REGISTER + R3000_R20:         info->i = r3000.r[20];               break;
1267      case CPUINFO_INT_REGISTER + R3000_R21:         info->i = r3000.r[21];               break;
1268      case CPUINFO_INT_REGISTER + R3000_R22:         info->i = r3000.r[22];               break;
1269      case CPUINFO_INT_REGISTER + R3000_R23:         info->i = r3000.r[23];               break;
1270      case CPUINFO_INT_REGISTER + R3000_R24:         info->i = r3000.r[24];               break;
1271      case CPUINFO_INT_REGISTER + R3000_R25:         info->i = r3000.r[25];               break;
1272      case CPUINFO_INT_REGISTER + R3000_R26:         info->i = r3000.r[26];               break;
1273      case CPUINFO_INT_REGISTER + R3000_R27:         info->i = r3000.r[27];               break;
1274      case CPUINFO_INT_REGISTER + R3000_R28:         info->i = r3000.r[28];               break;
1275      case CPUINFO_INT_REGISTER + R3000_R29:         info->i = r3000.r[29];               break;
1276      case CPUINFO_INT_REGISTER + R3000_R30:         info->i = r3000.r[30];               break;
1277      case CPUINFO_INT_SP:                     info->i = r3000.r[31] & 0x1fffffff;      break;
1278      case CPUINFO_INT_REGISTER + R3000_R31:         info->i = r3000.r[31];               break;
1262      case CPUINFO_INT_REGISTER + R3000_R0:         info->i = r3000->r[0];               break;
1263      case CPUINFO_INT_REGISTER + R3000_R1:         info->i = r3000->r[1];               break;
1264      case CPUINFO_INT_REGISTER + R3000_R2:         info->i = r3000->r[2];               break;
1265      case CPUINFO_INT_REGISTER + R3000_R3:         info->i = r3000->r[3];               break;
1266      case CPUINFO_INT_REGISTER + R3000_R4:         info->i = r3000->r[4];               break;
1267      case CPUINFO_INT_REGISTER + R3000_R5:         info->i = r3000->r[5];               break;
1268      case CPUINFO_INT_REGISTER + R3000_R6:         info->i = r3000->r[6];               break;
1269      case CPUINFO_INT_REGISTER + R3000_R7:         info->i = r3000->r[7];               break;
1270      case CPUINFO_INT_REGISTER + R3000_R8:         info->i = r3000->r[8];               break;
1271      case CPUINFO_INT_REGISTER + R3000_R9:         info->i = r3000->r[9];               break;
1272      case CPUINFO_INT_REGISTER + R3000_R10:         info->i = r3000->r[10];               break;
1273      case CPUINFO_INT_REGISTER + R3000_R11:         info->i = r3000->r[11];               break;
1274      case CPUINFO_INT_REGISTER + R3000_R12:         info->i = r3000->r[12];               break;
1275      case CPUINFO_INT_REGISTER + R3000_R13:         info->i = r3000->r[13];               break;
1276      case CPUINFO_INT_REGISTER + R3000_R14:         info->i = r3000->r[14];               break;
1277      case CPUINFO_INT_REGISTER + R3000_R15:         info->i = r3000->r[15];               break;
1278      case CPUINFO_INT_REGISTER + R3000_R16:         info->i = r3000->r[16];               break;
1279      case CPUINFO_INT_REGISTER + R3000_R17:         info->i = r3000->r[17];               break;
1280      case CPUINFO_INT_REGISTER + R3000_R18:         info->i = r3000->r[18];               break;
1281      case CPUINFO_INT_REGISTER + R3000_R19:         info->i = r3000->r[19];               break;
1282      case CPUINFO_INT_REGISTER + R3000_R20:         info->i = r3000->r[20];               break;
1283      case CPUINFO_INT_REGISTER + R3000_R21:         info->i = r3000->r[21];               break;
1284      case CPUINFO_INT_REGISTER + R3000_R22:         info->i = r3000->r[22];               break;
1285      case CPUINFO_INT_REGISTER + R3000_R23:         info->i = r3000->r[23];               break;
1286      case CPUINFO_INT_REGISTER + R3000_R24:         info->i = r3000->r[24];               break;
1287      case CPUINFO_INT_REGISTER + R3000_R25:         info->i = r3000->r[25];               break;
1288      case CPUINFO_INT_REGISTER + R3000_R26:         info->i = r3000->r[26];               break;
1289      case CPUINFO_INT_REGISTER + R3000_R27:         info->i = r3000->r[27];               break;
1290      case CPUINFO_INT_REGISTER + R3000_R28:         info->i = r3000->r[28];               break;
1291      case CPUINFO_INT_REGISTER + R3000_R29:         info->i = r3000->r[29];               break;
1292      case CPUINFO_INT_REGISTER + R3000_R30:         info->i = r3000->r[30];               break;
1293      case CPUINFO_INT_SP:                     info->i = r3000->r[31] & 0x1fffffff;   break;
1294      case CPUINFO_INT_REGISTER + R3000_R31:         info->i = r3000->r[31];               break;
12791295
12801296      /* --- the following bits of info are returned as pointers to data or functions --- */
1281      case CPUINFO_PTR_SET_INFO:                  info->setinfo = r3000_set_info;         break;
1282      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = r3000_get_context;   break;
1283      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = r3000_set_context;   break;
1284      case CPUINFO_PTR_INIT:                     info->init = r3000_init;            break;
1297      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(r3000);         break;
1298      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(r3000);   break;
1299      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(r3000);   break;
1300      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r3000);            break;
12851301      case CPUINFO_PTR_RESET:                     /* provided per-CPU */               break;
1286      case CPUINFO_PTR_EXIT:                     info->exit = r3000_exit;            break;
1287      case CPUINFO_PTR_EXECUTE:                  info->execute = r3000_execute;         break;
1302      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(r3000);            break;
1303      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(r3000);         break;
12881304      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1289      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = r3000_dasm;         break;
1290      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &r3000_icount;         break;
1305      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(r3000);         break;
1306      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &r3000->icount;         break;
12911307
12921308      /* --- the following bits of info are returned as NULL-terminated strings --- */
12931309      case CPUINFO_STR_NAME:                     strcpy(info->s, "R3000");            break;
r3535r3536
12981314
12991315      case CPUINFO_STR_FLAGS:                     strcpy(info->s, " ");               break;
13001316
1301      case CPUINFO_STR_REGISTER + R3000_PC:           sprintf(info->s, "PC: %08X", r3000.pc); break;
1302      case CPUINFO_STR_REGISTER + R3000_SR:           sprintf(info->s, "SR: %08X", r3000.cpr[0][COP0_Status]); break;
1317      case CPUINFO_STR_REGISTER + R3000_PC:           sprintf(info->s, "PC: %08X", r3000->pc); break;
1318      case CPUINFO_STR_REGISTER + R3000_SR:           sprintf(info->s, "SR: %08X", r3000->cpr[0][COP0_Status]); break;
13031319
1304      case CPUINFO_STR_REGISTER + R3000_R0:         sprintf(info->s, "R0: %08X", r3000.r[0]); break;
1305      case CPUINFO_STR_REGISTER + R3000_R1:         sprintf(info->s, "R1: %08X", r3000.r[1]); break;
1306      case CPUINFO_STR_REGISTER + R3000_R2:         sprintf(info->s, "R2: %08X", r3000.r[2]); break;
1307      case CPUINFO_STR_REGISTER + R3000_R3:         sprintf(info->s, "R3: %08X", r3000.r[3]); break;
1308      case CPUINFO_STR_REGISTER + R3000_R4:         sprintf(info->s, "R4: %08X", r3000.r[4]); break;
1309      case CPUINFO_STR_REGISTER + R3000_R5:         sprintf(info->s, "R5: %08X", r3000.r[5]); break;
1310      case CPUINFO_STR_REGISTER + R3000_R6:         sprintf(info->s, "R6: %08X", r3000.r[6]); break;
1311      case CPUINFO_STR_REGISTER + R3000_R7:         sprintf(info->s, "R7: %08X", r3000.r[7]); break;
1312      case CPUINFO_STR_REGISTER + R3000_R8:         sprintf(info->s, "R8: %08X", r3000.r[8]); break;
1313      case CPUINFO_STR_REGISTER + R3000_R9:         sprintf(info->s, "R9: %08X", r3000.r[9]); break;
1314      case CPUINFO_STR_REGISTER + R3000_R10:         sprintf(info->s, "R10:%08X", r3000.r[10]); break;
1315      case CPUINFO_STR_REGISTER + R3000_R11:         sprintf(info->s, "R11:%08X", r3000.r[11]); break;
1316      case CPUINFO_STR_REGISTER + R3000_R12:         sprintf(info->s, "R12:%08X", r3000.r[12]); break;
1317      case CPUINFO_STR_REGISTER + R3000_R13:         sprintf(info->s, "R13:%08X", r3000.r[13]); break;
1318      case CPUINFO_STR_REGISTER + R3000_R14:         sprintf(info->s, "R14:%08X", r3000.r[14]); break;
1319      case CPUINFO_STR_REGISTER + R3000_R15:         sprintf(info->s, "R15:%08X", r3000.r[15]); break;
1320      case CPUINFO_STR_REGISTER + R3000_R16:         sprintf(info->s, "R16:%08X", r3000.r[16]); break;
1321      case CPUINFO_STR_REGISTER + R3000_R17:         sprintf(info->s, "R17:%08X", r3000.r[17]); break;
1322      case CPUINFO_STR_REGISTER + R3000_R18:         sprintf(info->s, "R18:%08X", r3000.r[18]); break;
1323      case CPUINFO_STR_REGISTER + R3000_R19:         sprintf(info->s, "R19:%08X", r3000.r[19]); break;
1324      case CPUINFO_STR_REGISTER + R3000_R20:         sprintf(info->s, "R20:%08X", r3000.r[20]); break;
1325      case CPUINFO_STR_REGISTER + R3000_R21:         sprintf(info->s, "R21:%08X", r3000.r[21]); break;
1326      case CPUINFO_STR_REGISTER + R3000_R22:         sprintf(info->s, "R22:%08X", r3000.r[22]); break;
1327      case CPUINFO_STR_REGISTER + R3000_R23:         sprintf(info->s, "R23:%08X", r3000.r[23]); break;
1328      case CPUINFO_STR_REGISTER + R3000_R24:         sprintf(info->s, "R24:%08X", r3000.r[24]); break;
1329      case CPUINFO_STR_REGISTER + R3000_R25:         sprintf(info->s, "R25:%08X", r3000.r[25]); break;
1330      case CPUINFO_STR_REGISTER + R3000_R26:         sprintf(info->s, "R26:%08X", r3000.r[26]); break;
1331      case CPUINFO_STR_REGISTER + R3000_R27:         sprintf(info->s, "R27:%08X", r3000.r[27]); break;
1332      case CPUINFO_STR_REGISTER + R3000_R28:         sprintf(info->s, "R28:%08X", r3000.r[28]); break;
1333      case CPUINFO_STR_REGISTER + R3000_R29:         sprintf(info->s, "R29:%08X", r3000.r[29]); break;
1334      case CPUINFO_STR_REGISTER + R3000_R30:         sprintf(info->s, "R30:%08X", r3000.r[30]); break;
1335      case CPUINFO_STR_REGISTER + R3000_R31:         sprintf(info->s, "R31:%08X", r3000.r[31]); break;
1320      case CPUINFO_STR_REGISTER + R3000_R0:         sprintf(info->s, "R0: %08X", r3000->r[0]); break;
1321      case CPUINFO_STR_REGISTER + R3000_R1:         sprintf(info->s, "R1: %08X", r3000->r[1]); break;
1322      case CPUINFO_STR_REGISTER + R3000_R2:         sprintf(info->s, "R2: %08X", r3000->r[2]); break;
1323      case CPUINFO_STR_REGISTER + R3000_R3:         sprintf(info->s, "R3: %08X", r3000->r[3]); break;
1324      case CPUINFO_STR_REGISTER + R3000_R4:         sprintf(info->s, "R4: %08X", r3000->r[4]); break;
1325      case CPUINFO_STR_REGISTER + R3000_R5:         sprintf(info->s, "R5: %08X", r3000->r[5]); break;
1326      case CPUINFO_STR_REGISTER + R3000_R6:         sprintf(info->s, "R6: %08X", r3000->r[6]); break;
1327      case CPUINFO_STR_REGISTER + R3000_R7:         sprintf(info->s, "R7: %08X", r3000->r[7]); break;
1328      case CPUINFO_STR_REGISTER + R3000_R8:         sprintf(info->s, "R8: %08X", r3000->r[8]); break;
1329      case CPUINFO_STR_REGISTER + R3000_R9:         sprintf(info->s, "R9: %08X", r3000->r[9]); break;
1330      case CPUINFO_STR_REGISTER + R3000_R10:         sprintf(info->s, "R10:%08X", r3000->r[10]); break;
1331      case CPUINFO_STR_REGISTER + R3000_R11:         sprintf(info->s, "R11:%08X", r3000->r[11]); break;
1332      case CPUINFO_STR_REGISTER + R3000_R12:         sprintf(info->s, "R12:%08X", r3000->r[12]); break;
1333      case CPUINFO_STR_REGISTER + R3000_R13:         sprintf(info->s, "R13:%08X", r3000->r[13]); break;
1334      case CPUINFO_STR_REGISTER + R3000_R14:         sprintf(info->s, "R14:%08X", r3000->r[14]); break;
1335      case CPUINFO_STR_REGISTER + R3000_R15:         sprintf(info->s, "R15:%08X", r3000->r[15]); break;
1336      case CPUINFO_STR_REGISTER + R3000_R16:         sprintf(info->s, "R16:%08X", r3000->r[16]); break;
1337      case CPUINFO_STR_REGISTER + R3000_R17:         sprintf(info->s, "R17:%08X", r3000->r[17]); break;
1338      case CPUINFO_STR_REGISTER + R3000_R18:         sprintf(info->s, "R18:%08X", r3000->r[18]); break;
1339      case CPUINFO_STR_REGISTER + R3000_R19:         sprintf(info->s, "R19:%08X", r3000->r[19]); break;
1340      case CPUINFO_STR_REGISTER + R3000_R20:         sprintf(info->s, "R20:%08X", r3000->r[20]); break;
1341      case CPUINFO_STR_REGISTER + R3000_R21:         sprintf(info->s, "R21:%08X", r3000->r[21]); break;
1342      case CPUINFO_STR_REGISTER + R3000_R22:         sprintf(info->s, "R22:%08X", r3000->r[22]); break;
1343      case CPUINFO_STR_REGISTER + R3000_R23:         sprintf(info->s, "R23:%08X", r3000->r[23]); break;
1344      case CPUINFO_STR_REGISTER + R3000_R24:         sprintf(info->s, "R24:%08X", r3000->r[24]); break;
1345      case CPUINFO_STR_REGISTER + R3000_R25:         sprintf(info->s, "R25:%08X", r3000->r[25]); break;
1346      case CPUINFO_STR_REGISTER + R3000_R26:         sprintf(info->s, "R26:%08X", r3000->r[26]); break;
1347      case CPUINFO_STR_REGISTER + R3000_R27:         sprintf(info->s, "R27:%08X", r3000->r[27]); break;
1348      case CPUINFO_STR_REGISTER + R3000_R28:         sprintf(info->s, "R28:%08X", r3000->r[28]); break;
1349      case CPUINFO_STR_REGISTER + R3000_R29:         sprintf(info->s, "R29:%08X", r3000->r[29]); break;
1350      case CPUINFO_STR_REGISTER + R3000_R30:         sprintf(info->s, "R30:%08X", r3000->r[30]); break;
1351      case CPUINFO_STR_REGISTER + R3000_R31:         sprintf(info->s, "R31:%08X", r3000->r[31]); break;
13361352   }
13371353}
13381354
r3535r3536
13411357 * CPU-specific set_info
13421358 **************************************************************************/
13431359
1344void r3000be_get_info(UINT32 state, cpuinfo *info)
1360CPU_GET_INFO( r3000be )
13451361{
13461362   switch (state)
13471363   {
r3535r3536
13491365      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
13501366
13511367      /* --- the following bits of info are returned as pointers to data or functions --- */
1352      case CPUINFO_PTR_RESET:                     info->reset = r3000be_reset;         break;
1368      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(r3000be);         break;
13531369
13541370      /* --- the following bits of info are returned as NULL-terminated strings --- */
13551371      case CPUINFO_STR_NAME:                     strcpy(info->s, "R3000 (big)");         break;
13561372
1357      default:                              r3000_get_info(state, info);         break;
1373      default:                              CPU_GET_INFO_CALL(r3000);         break;
13581374   }
13591375}
13601376
13611377
1362void r3000le_get_info(UINT32 state, cpuinfo *info)
1378CPU_GET_INFO( r3000le )
13631379{
13641380   switch (state)
13651381   {
r3535r3536
13671383      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
13681384
13691385      /* --- the following bits of info are returned as pointers to data or functions --- */
1370      case CPUINFO_PTR_RESET:                     info->reset = r3000le_reset;         break;
1386      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(r3000le);         break;
13711387
13721388      /* --- the following bits of info are returned as NULL-terminated strings --- */
13731389      case CPUINFO_STR_NAME:                     strcpy(info->s, "R3000 (little)");      break;
13741390
1375      default:                              r3000_get_info(state, info);         break;
1391      default:                              CPU_GET_INFO_CALL(r3000);         break;
13761392   }
13771393}
13781394
13791395
1380void r3041be_get_info(UINT32 state, cpuinfo *info)
1396CPU_GET_INFO( r3041be )
13811397{
13821398   switch (state)
13831399   {
r3535r3536
13851401      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
13861402
13871403      /* --- the following bits of info are returned as pointers to data or functions --- */
1388      case CPUINFO_PTR_RESET:                     info->reset = r3000be_reset;         break;
1404      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(r3000be);         break;
13891405
13901406      /* --- the following bits of info are returned as NULL-terminated strings --- */
13911407      case CPUINFO_STR_NAME:                     strcpy(info->s, "R3041 (big)");         break;
13921408
1393      default:                              r3000_get_info(state, info);         break;
1409      default:                              CPU_GET_INFO_CALL(r3000);         break;
13941410   }
13951411}
13961412
13971413
1398void r3041le_get_info(UINT32 state, cpuinfo *info)
1414CPU_GET_INFO( r3041le )
13991415{
14001416   switch (state)
14011417   {
r3535r3536
14031419      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
14041420
14051421      /* --- the following bits of info are returned as pointers to data or functions --- */
1406      case CPUINFO_PTR_RESET:                     info->reset = r3000le_reset;         break;
1422      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(r3000le);         break;
14071423
14081424      /* --- the following bits of info are returned as NULL-terminated strings --- */
14091425      case CPUINFO_STR_NAME:                     strcpy(info->s, "R3041 (little)");      break;
14101426
1411      default:                              r3000_get_info(state, info);         break;
1427      default:                              CPU_GET_INFO_CALL(r3000);         break;
14121428   }
14131429}
src/emu/cpu/mips/r3000.h
r3535r3536
6060    PUBLIC FUNCTIONS
6161***************************************************************************/
6262
63extern void r3000be_get_info(UINT32 state, cpuinfo *info);
64extern void r3000le_get_info(UINT32 state, cpuinfo *info);
63extern CPU_GET_INFO( r3000be );
64extern CPU_GET_INFO( r3000le );
6565
66extern void r3041be_get_info(UINT32 state, cpuinfo *info);
67extern void r3041le_get_info(UINT32 state, cpuinfo *info);
66extern CPU_GET_INFO( r3041be );
67extern CPU_GET_INFO( r3041le );
6868
6969#endif /* __R3000_H__ */
src/emu/cpu/mips/psx.c
r3535r3536
180180   int multiplier_operation;
181181   UINT32 multiplier_operand1;
182182   UINT32 multiplier_operand2;
183   int (*irq_callback)(int irqline);
183   cpu_irq_callback irq_callback;
184   const device_config *device;
184185   UINT8 (*readbyte)( UINT32 );
185186   UINT16 (*readhalf)( UINT32 );
186187   UINT32 (*readword)( UINT32 );
r3535r3536
15801581   state_save_register_postload( Machine, mips_postload, NULL );
15811582}
15821583
1583static void mips_init( int index, int clock, const void *config, int (*irqcallback)(int) )
1584static CPU_INIT( mips )
15841585{
15851586   mipscpu.irq_callback = irqcallback;
1587   mipscpu.device = device;
15861588
15871589   mips_state_register( "psxcpu", index );
15881590}
15891591
1590static void mips_reset( void )
1592static CPU_RESET( mips )
15911593{
15921594   mipscpu.delayr = 0;
15931595   mipscpu.delayv = 0;
r3535r3536
16071609   mips_set_pc( 0xbfc00000 );
16081610}
16091611
1610static void mips_exit( void )
1612static CPU_EXIT( mips )
16111613{
16121614}
16131615
r3535r3536
17881790   }
17891791}
17901792
1791static int mips_execute( int cycles )
1793static CPU_EXECUTE( mips )
17921794{
17931795   mips_ICount = cycles;
17941796   do
r3535r3536
27862788   return cycles - mips_ICount;
27872789}
27882790
2789static void mips_get_context( void *dst )
2791static CPU_GET_CONTEXT( mips )
27902792{
27912793   if( dst )
27922794   {
r3535r3536
27942796   }
27952797}
27962798
2797static void mips_set_context( void *src )
2799static CPU_SET_CONTEXT( mips )
27982800{
27992801   if( src )
28002802   {
r3535r3536
28542856            There is also a problem with PULSE_LINE interrupts as the interrupt
28552857            pending bits aren't latched the emulated code won't know what caused
28562858            the interrupt. */
2857         (*mipscpu.irq_callback)( irqline );
2859         (*mipscpu.irq_callback)( mipscpu.device, irqline );
28582860      }
28592861      break;
28602862   }
r3535r3536
29022904 * Return a formatted string for a register
29032905 ****************************************************************************/
29042906
2905static offs_t mips_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
2907static CPU_DISASSEMBLE( mips )
29062908{
29072909   return DasmMIPS( buffer, pc, opram );
29082910}
r3535r3536
38553857 * Generic set_info
38563858 **************************************************************************/
38573859
3858static void mips_set_info(UINT32 state, cpuinfo *info)
3860static CPU_SET_INFO( mips )
38593861{
38603862   switch (state)
38613863   {
r3535r3536
39963998 * Generic get_info
39973999 **************************************************************************/
39984000
3999static void mips_get_info(UINT32 state, cpuinfo *info)
4001static CPU_GET_INFO( mips )
40004002{
40014003   switch (state)
40024004   {
r3535r3536
41574159      case CPUINFO_INT_REGISTER + MIPS_CP2CR31:      info->i = mipscpu.cp2cr[ 31 ].d;      break;
41584160
41594161      /* --- the following bits of info are returned as pointers to data or functions --- */
4160      case CPUINFO_PTR_SET_INFO:                  info->setinfo = mips_set_info;         break;
4161      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = mips_get_context;   break;
4162      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = mips_set_context;   break;
4163      case CPUINFO_PTR_INIT:                     info->init = mips_init;               break;
4164      case CPUINFO_PTR_RESET:                     info->reset = mips_reset;            break;
4165      case CPUINFO_PTR_EXIT:                     info->exit = mips_exit;               break;
4166      case CPUINFO_PTR_EXECUTE:                  info->execute = mips_execute;         break;
4162      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(mips);         break;
4163      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(mips);   break;
4164      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(mips);   break;
4165      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(mips);               break;
4166      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(mips);            break;
4167      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(mips);               break;
4168      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(mips);         break;
41674169      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
4168      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = mips_dasm;         break;
4170      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(mips);         break;
41694171      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &mips_ICount;         break;
41704172
4171      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_psxcpu_internal_map; break;
4173      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(psxcpu_internal_map); break;
41724174      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:    info->internal_map32 = 0; break;
41734175      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO:      info->internal_map32 = 0; break;
41744176
r3535r3536
43084310 * CPU-specific set_info
43094311 **************************************************************************/
43104312
4311void psxcpu_get_info(UINT32 state, cpuinfo *info)
4313CPU_GET_INFO( psxcpu )
43124314{
43134315   switch (state)
43144316   {
r3535r3536
43164318      case CPUINFO_STR_NAME:                     strcpy(info->s, "PSX CPU"); break;
43174319
43184320      default:
4319         mips_get_info(state, info);
4321         CPU_GET_INFO_CALL(mips);
43204322         break;
43214323   }
43224324}
r3535r3536
43244326
43254327#if (HAS_CXD8661R)
43264328
4327void cxd8661r_get_info(UINT32 state, cpuinfo *info)
4329CPU_GET_INFO( cxd8661r )
43284330{
43294331   switch (state)
43304332   {
4331      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = address_map_cxd8661r_internal_map; break;
4333      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(cxd8661r_internal_map); break;
43324334
43334335         /* --- the following bits of info are returned as NULL-terminated strings --- */
43344336      case CPUINFO_STR_NAME:                     strcpy(info->s, "CXD8661R"); break;
43354337
43364338      default:
4337         mips_get_info(state, info);
4339         CPU_GET_INFO_CALL(mips);
43384340         break;
43394341   }
43404342}
src/emu/cpu/mips/psx.h
r3535r3536
208208extern unsigned DasmMIPS( char *buffer, UINT32 pc, const UINT8 *opram );
209209
210210#if (HAS_PSXCPU)
211extern void psxcpu_get_info(UINT32 state, cpuinfo *info);
211extern CPU_GET_INFO( psxcpu );
212212#endif
213213
214214#endif /* __PSX_H__ */
src/emu/cpu/mips/mips3drc.c
r3535r3536
342342    mips3_init - initialize the processor
343343-------------------------------------------------*/
344344
345static void mips3_init(mips3_flavor flavor, int bigendian, int index, int clock, const mips3_config *config, int (*irqcallback)(int))
345static void mips3_init(mips3_flavor flavor, int bigendian, const device_config *device, int index, int clock, const mips3_config *config, cpu_irq_callback irqcallback)
346346{
347347   drcfe_config feconfig =
348348   {
r3535r3536
366366   memset(mips3, 0, sizeof(*mips3));
367367
368368   /* initialize the core */
369   mips3com_init(mips3, flavor, bigendian, index, clock, config, irqcallback);
369   mips3com_init(mips3, flavor, bigendian, device, index, clock, config, irqcallback);
370370
371371   /* allocate the implementation-specific state from the full cache */
372372   mips3->impstate = drccache_memory_alloc_near(cache, sizeof(*mips3->impstate));
r3535r3536
474474    mips3_reset - reset the processor
475475-------------------------------------------------*/
476476
477static void mips3_reset(void)
477static CPU_RESET( mips3 )
478478{
479479   /* reset the common code and mark the cache dirty */
480480   mips3com_reset(mips3);
r3535r3536
488488    specified number of cycles
489489-------------------------------------------------*/
490490
491static int mips3_execute(int cycles)
491static CPU_EXECUTE( mips3 )
492492{
493493   drcuml_state *drcuml = mips3->impstate->drcuml;
494494   int execute_result;
r3535r3536
524524    mips3_exit - cleanup from execution
525525-------------------------------------------------*/
526526
527static void mips3_exit(void)
527static CPU_EXIT( mips3 )
528528{
529529   mips3com_exit(mips3);
530530
r3535r3536
540540    current context
541541-------------------------------------------------*/
542542
543static void mips3_get_context(void *dst)
543static CPU_GET_CONTEXT( mips3 )
544544{
545545   if (dst != NULL)
546546      *(mips3_state **)dst = mips3;
r3535r3536
552552    into the global state
553553-------------------------------------------------*/
554554
555static void mips3_set_context(void *src)
555static CPU_SET_CONTEXT( mips3 )
556556{
557557   if (src != NULL)
558558      mips3 = *(mips3_state **)src;
r3535r3536
564564    address translation
565565-------------------------------------------------*/
566566
567static int mips3_translate(int space, int intention, offs_t *address)
567static CPU_TRANSLATE( mips3 )
568568{
569569   return mips3com_translate_address(mips3, space, intention, address);
570570}
r3535r3536
574574    mips3_dasm - disassemble an instruction
575575-------------------------------------------------*/
576576
577static offs_t mips3_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
577static CPU_DISASSEMBLE( mips3 )
578578{
579579   return mips3com_dasm(mips3, buffer, pc, oprom, opram);
580580}
r3535r3536
585585    CPU instance
586586-------------------------------------------------*/
587587
588static void mips3_set_info(UINT32 state, cpuinfo *info)
588static CPU_SET_INFO( mips3 )
589589{
590590   switch (state)
591591   {
r3535r3536
616616    given CPU instance
617617-------------------------------------------------*/
618618
619static void mips3_get_info(UINT32 state, cpuinfo *info)
619static CPU_GET_INFO( mips3 )
620620{
621621   switch (state)
622622   {
r3535r3536
625625      case CPUINFO_INT_PREVIOUSPC:               /* not implemented */               break;
626626
627627      /* --- the following bits of info are returned as pointers to data or functions --- */
628      case CPUINFO_PTR_SET_INFO:                  info->setinfo = mips3_set_info;         break;
629      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = mips3_get_context;   break;
630      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = mips3_set_context;   break;
628      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(mips3);         break;
629      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(mips3);   break;
630      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(mips3);   break;
631631      case CPUINFO_PTR_INIT:                     /* provided per-CPU */               break;
632      case CPUINFO_PTR_RESET:                     info->reset = mips3_reset;            break;
633      case CPUINFO_PTR_EXIT:                     info->exit = mips3_exit;            break;
634      case CPUINFO_PTR_EXECUTE:                  info->execute = mips3_execute;         break;
635      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = mips3_dasm;         break;
636      case CPUINFO_PTR_TRANSLATE:                  info->translate = mips3_translate;      break;
632      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(mips3);            break;
633      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(mips3);            break;
634      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(mips3);         break;
635      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(mips3);         break;
636      case CPUINFO_PTR_TRANSLATE:                  info->translate = CPU_TRANSLATE_NAME(mips3);      break;
637637
638638      /* --- the following bits of info are returned as NULL-terminated strings --- */
639639      case CPUINFO_STR_CORE_FILE:                  strcpy(info->s, __FILE__);            break;
r3535r3536
36193619***************************************************************************/
36203620
36213621#if (HAS_R4600)
3622static void r4600be_init(int index, int clock, const void *config, int (*irqcallback)(int))
3622static CPU_INIT( r4600be )
36233623{
3624   mips3_init(MIPS3_TYPE_R4600, TRUE, index, clock, config, irqcallback);
3624   mips3_init(MIPS3_TYPE_R4600, TRUE, device, index, clock, config, irqcallback);
36253625}
36263626
3627static void r4600le_init(int index, int clock, const void *config, int (*irqcallback)(int))
3627static CPU_INIT( r4600le )
36283628{
3629   mips3_init(MIPS3_TYPE_R4600, FALSE, index, clock, config, irqcallback);
3629   mips3_init(MIPS3_TYPE_R4600, FALSE, device, index, clock, config, irqcallback);
36303630}
36313631
3632void r4600be_get_info(UINT32 state, cpuinfo *info)
3632CPU_GET_INFO( r4600be )
36333633{
36343634   switch (state)
36353635   {
r3535r3536
36373637      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
36383638
36393639      /* --- the following bits of info are returned as pointers to data or functions --- */
3640      case CPUINFO_PTR_INIT:                     info->init = r4600be_init;            break;
3640      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r4600be);            break;
36413641
36423642      /* --- the following bits of info are returned as NULL-terminated strings --- */
36433643      case CPUINFO_STR_NAME:                     strcpy(info->s, "R4600 (big)");         break;
36443644
36453645      /* --- everything else is handled generically --- */
3646      default:                              mips3_get_info(state, info);         break;
3646      default:                              CPU_GET_INFO_CALL(mips3);         break;
36473647   }
36483648}
36493649
3650void r4600le_get_info(UINT32 state, cpuinfo *info)
3650CPU_GET_INFO( r4600le )
36513651{
36523652   switch (state)
36533653   {
r3535r3536
36553655      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
36563656
36573657      /* --- the following bits of info are returned as pointers to data or functions --- */
3658      case CPUINFO_PTR_INIT:                     info->init = r4600le_init;            break;
3658      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r4600le);            break;
36593659
36603660      /* --- the following bits of info are returned as NULL-terminated strings --- */
36613661      case CPUINFO_STR_NAME:                     strcpy(info->s, "R4600 (little)");      break;
36623662
36633663      /* --- everything else is handled generically --- */
3664      default:                              mips3_get_info(state, info);         break;
3664      default:                              CPU_GET_INFO_CALL(mips3);         break;
36653665   }
36663666}
36673667#endif
r3535r3536
36733673***************************************************************************/
36743674
36753675#if (HAS_R4650)
3676static void r4650be_init(int index, int clock, const void *config, int (*irqcallback)(int))
3676static CPU_INIT( r4650be )
36773677{
3678   mips3_init(MIPS3_TYPE_R4650, TRUE, index, clock, config, irqcallback);
3678   mips3_init(MIPS3_TYPE_R4650, TRUE, device, index, clock, config, irqcallback);
36793679}
36803680
3681static void r4650le_init(int index, int clock, const void *config, int (*irqcallback)(int))
3681static CPU_INIT( r4650le )
36823682{
3683   mips3_init(MIPS3_TYPE_R4650, FALSE, index, clock, config, irqcallback);
3683   mips3_init(MIPS3_TYPE_R4650, FALSE, device, index, clock, config, irqcallback);
36843684}
36853685
3686void r4650be_get_info(UINT32 state, cpuinfo *info)
3686CPU_GET_INFO( r4650be )
36873687{
36883688   switch (state)
36893689   {
r3535r3536
36913691      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
36923692
36933693      /* --- the following bits of info are returned as pointers to data or functions --- */
3694      case CPUINFO_PTR_INIT:                     info->init = r4650be_init;            break;
3694      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r4650be);            break;
36953695
36963696      /* --- the following bits of info are returned as NULL-terminated strings --- */
36973697      case CPUINFO_STR_NAME:                     strcpy(info->s, "IDT R4650 (big)");      break;
36983698
36993699      /* --- everything else is handled generically --- */
3700      default:                              mips3_get_info(state, info);         break;
3700      default:                              CPU_GET_INFO_CALL(mips3);         break;
37013701   }
37023702}
37033703
3704void r4650le_get_info(UINT32 state, cpuinfo *info)
3704CPU_GET_INFO( r4650le )
37053705{
37063706   switch (state)
37073707   {
r3535r3536
37093709      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
37103710
37113711      /* --- the following bits of info are returned as pointers to data or functions --- */
3712      case CPUINFO_PTR_INIT:                     info->init = r4650le_init;            break;
3712      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r4650le);            break;
37133713
37143714      /* --- the following bits of info are returned as NULL-terminated strings --- */
37153715      case CPUINFO_STR_NAME:                     strcpy(info->s, "IDT R4650 (little)");   break;
37163716
37173717      /* --- everything else is handled generically --- */
3718      default:                              mips3_get_info(state, info);         break;
3718      default:                              CPU_GET_INFO_CALL(mips3);         break;
37193719   }
37203720}
37213721#endif
r3535r3536
37273727***************************************************************************/
37283728
37293729#if (HAS_R4700)
3730static void r4700be_init(int index, int clock, const void *config, int (*irqcallback)(int))
3730static CPU_INIT( r4700be )
37313731{
3732   mips3_init(MIPS3_TYPE_R4700, TRUE, index, clock, config, irqcallback);
3732   mips3_init(MIPS3_TYPE_R4700, TRUE, device, index, clock, config, irqcallback);
37333733}
37343734
3735static void r4700le_init(int index, int clock, const void *config, int (*irqcallback)(int))
3735static CPU_INIT( r4700le )
37363736{
3737   mips3_init(MIPS3_TYPE_R4700, FALSE, index, clock, config, irqcallback);
3737   mips3_init(MIPS3_TYPE_R4700, FALSE, device, index, clock, config, irqcallback);
37383738}
37393739
3740void r4700be_get_info(UINT32 state, cpuinfo *info)
3740CPU_GET_INFO( r4700be )
37413741{
37423742   switch (state)
37433743   {
r3535r3536
37453745      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
37463746
37473747      /* --- the following bits of info are returned as pointers to data or functions --- */
3748      case CPUINFO_PTR_INIT:                     info->init = r4700be_init;            break;
3748      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r4700be);            break;
37493749
37503750      /* --- the following bits of info are returned as NULL-terminated strings --- */
37513751      case CPUINFO_STR_NAME:                     strcpy(info->s, "R4700 (big)");         break;
37523752
37533753      /* --- everything else is handled generically --- */
3754      default:                              mips3_get_info(state, info);         break;
3754      default:                              CPU_GET_INFO_CALL(mips3);         break;
37553755   }
37563756}
37573757
3758void r4700le_get_info(UINT32 state, cpuinfo *info)
3758CPU_GET_INFO( r4700le )
37593759{
37603760   switch (state)
37613761   {
r3535r3536
37633763      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
37643764
37653765      /* --- the following bits of info are returned as pointers to data or functions --- */
3766      case CPUINFO_PTR_INIT:                     info->init = r4700le_init;            break;
3766      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r4700le);            break;
37673767
37683768      /* --- the following bits of info are returned as NULL-terminated strings --- */
37693769      case CPUINFO_STR_NAME:                     strcpy(info->s, "R4700 (little)");      break;
37703770
37713771      /* --- everything else is handled generically --- */
3772      default:                              mips3_get_info(state, info);         break;
3772      default:                              CPU_GET_INFO_CALL(mips3);         break;
37733773   }
37743774}
37753775#endif
r3535r3536
37813781***************************************************************************/
37823782
37833783#if (HAS_R5000)
3784static void r5000be_init(int index, int clock, const void *config, int (*irqcallback)(int))
3784static CPU_INIT( r5000be )
37853785{
3786   mips3_init(MIPS3_TYPE_R5000, TRUE, index, clock, config, irqcallback);
3786   mips3_init(MIPS3_TYPE_R5000, TRUE, device, index, clock, config, irqcallback);
37873787}
37883788
3789static void r5000le_init(int index, int clock, const void *config, int (*irqcallback)(int))
3789static CPU_INIT( r5000le )
37903790{
3791   mips3_init(MIPS3_TYPE_R5000, FALSE, index, clock, config, irqcallback);
3791   mips3_init(MIPS3_TYPE_R5000, FALSE, device, index, clock, config, irqcallback);
37923792}
37933793
3794void r5000be_get_info(UINT32 state, cpuinfo *info)
3794CPU_GET_INFO( r5000be )
37953795{
37963796   switch (state)
37973797   {
r3535r3536
37993799      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
38003800
38013801      /* --- the following bits of info are returned as pointers to data or functions --- */
3802      case CPUINFO_PTR_INIT:                     info->init = r5000be_init;            break;
3802      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r5000be);            break;
38033803
38043804      /* --- the following bits of info are returned as NULL-terminated strings --- */
38053805      case CPUINFO_STR_NAME:                     strcpy(info->s, "R5000 (big)");         break;
38063806
38073807      /* --- everything else is handled generically --- */
3808      default:                              mips3_get_info(state, info);         break;
3808      default:                              CPU_GET_INFO_CALL(mips3);         break;
38093809   }
38103810}
38113811
3812void r5000le_get_info(UINT32 state, cpuinfo *info)
3812CPU_GET_INFO( r5000le )
38133813{
38143814   switch (state)
38153815   {
r3535r3536
38173817      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
38183818
38193819      /* --- the following bits of info are returned as pointers to data or functions --- */
3820      case CPUINFO_PTR_INIT:                     info->init = r5000le_init;            break;
3820      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r5000le);            break;
38213821
38223822      /* --- the following bits of info are returned as NULL-terminated strings --- */
38233823      case CPUINFO_STR_NAME:                     strcpy(info->s, "R5000 (little)");      break;
38243824
38253825      /* --- everything else is handled generically --- */
3826      default:                              mips3_get_info(state, info);         break;
3826      default:                              CPU_GET_INFO_CALL(mips3);         break;
38273827   }
38283828}
38293829#endif
r3535r3536
38353835***************************************************************************/
38363836
38373837#if (HAS_QED5271)
3838static void qed5271be_init(int index, int clock, const void *config, int (*irqcallback)(int))
3838static CPU_INIT( qed5271be )
38393839{
3840   mips3_init(MIPS3_TYPE_QED5271, TRUE, index, clock, config, irqcallback);
3840   mips3_init(MIPS3_TYPE_QED5271, TRUE, device, index, clock, config, irqcallback);
38413841}
38423842
3843static void qed5271le_init(int index, int clock, const void *config, int (*irqcallback)(int))
3843static CPU_INIT( qed5271le )
38443844{
3845   mips3_init(MIPS3_TYPE_QED5271, FALSE, index, clock, config, irqcallback);
3845   mips3_init(MIPS3_TYPE_QED5271, FALSE, device, index, clock, config, irqcallback);
38463846}
38473847
3848void qed5271be_get_info(UINT32 state, cpuinfo *info)
3848CPU_GET_INFO( qed5271be )
38493849{
38503850   switch (state)
38513851   {
r3535r3536
38533853      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
38543854
38553855      /* --- the following bits of info are returned as pointers to data or functions --- */
3856      case CPUINFO_PTR_INIT:                     info->init = qed5271be_init;         break;
3856      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(qed5271be);         break;
38573857
38583858      /* --- the following bits of info are returned as NULL-terminated strings --- */
38593859      case CPUINFO_STR_NAME:                     strcpy(info->s, "QED5271 (big)");      break;
38603860
38613861      /* --- everything else is handled generically --- */
3862      default:                              mips3_get_info(state, info);         break;
3862      default:                              CPU_GET_INFO_CALL(mips3);         break;
38633863   }
38643864}
38653865
3866void qed5271le_get_info(UINT32 state, cpuinfo *info)
3866CPU_GET_INFO( qed5271le )
38673867{
38683868   switch (state)
38693869   {
r3535r3536
38713871      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
38723872
38733873      /* --- the following bits of info are returned as pointers to data or functions --- */
3874      case CPUINFO_PTR_INIT:                     info->init = qed5271le_init;         break;
3874      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(qed5271le);         break;
38753875
38763876      /* --- the following bits of info are returned as NULL-terminated strings --- */
38773877      case CPUINFO_STR_NAME:                     strcpy(info->s, "QED5271 (little)");   break;
38783878
38793879      /* --- everything else is handled generically --- */
3880      default:                              mips3_get_info(state, info);         break;
3880      default:                              CPU_GET_INFO_CALL(mips3);         break;
38813881   }
38823882}
38833883#endif
r3535r3536
38893889***************************************************************************/
38903890
38913891#if (HAS_RM7000)
3892static void rm7000be_init(int index, int clock, const void *config, int (*irqcallback)(int))
3892static CPU_INIT( rm7000be )
38933893{
3894   mips3_init(MIPS3_TYPE_RM7000, TRUE, index, clock, config, irqcallback);
3894   mips3_init(MIPS3_TYPE_RM7000, TRUE, device, index, clock, config, irqcallback);
38953895}
38963896
3897static void rm7000le_init(int index, int clock, const void *config, int (*irqcallback)(int))
3897static CPU_INIT( rm7000le )
38983898{
3899   mips3_init(MIPS3_TYPE_RM7000, FALSE, index, clock, config, irqcallback);
3899   mips3_init(MIPS3_TYPE_RM7000, FALSE, device, index, clock, config, irqcallback);
39003900}
39013901
3902void rm7000be_get_info(UINT32 state, cpuinfo *info)
3902CPU_GET_INFO( rm7000be )
39033903{
39043904   switch (state)
39053905   {
r3535r3536
39073907      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
39083908
39093909      /* --- the following bits of info are returned as pointers to data or functions --- */
3910      case CPUINFO_PTR_INIT:                     info->init = rm7000be_init;            break;
3910      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(rm7000be);            break;
39113911
39123912      /* --- the following bits of info are returned as NULL-terminated strings --- */
39133913      case CPUINFO_STR_NAME:                     strcpy(info->s, "RM7000 (big)");      break;
39143914
39153915      /* --- everything else is handled generically --- */
3916      default:                              mips3_get_info(state, info);         break;
3916      default:                              CPU_GET_INFO_CALL(mips3);         break;
39173917   }
39183918}
39193919
3920void rm7000le_get_info(UINT32 state, cpuinfo *info)
3920CPU_GET_INFO( rm7000le )
39213921{
39223922   switch (state)
39233923   {
r3535r3536
39253925      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
39263926
39273927      /* --- the following bits of info are returned as pointers to data or functions --- */
3928      case CPUINFO_PTR_INIT:                     info->init = rm7000le_init;            break;
3928      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(rm7000le);            break;
39293929
39303930      /* --- the following bits of info are returned as NULL-terminated strings --- */
39313931      case CPUINFO_STR_NAME:                     strcpy(info->s, "RM7000 (little)");      break;
39323932
39333933      /* --- everything else is handled generically --- */
3934      default:                              mips3_get_info(state, info);         break;
3934      default:                              CPU_GET_INFO_CALL(mips3);         break;
39353935   }
39363936}
39373937#endif
src/emu/cpu/mips/mips3com.c
r3535r3536
6969    structure based on the configured type
7070-------------------------------------------------*/
7171
72void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, int index, int clock, const mips3_config *config, int (*irqcallback)(int))
72void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, const device_config *device, int index, int clock, const mips3_config *config, cpu_irq_callback irqcallback)
7373{
7474   int tlbindex;
7575
r3535r3536
7979   mips->bigendian = bigendian;
8080   mips->cpu_clock = clock;
8181   mips->irq_callback = irqcallback;
82   mips->device = device;
8283   mips->icache_size = config->icache;
8384   mips->dcache_size = config->dcache;
8485   mips->system_clock = config->system_clock;
src/emu/cpu/mips/mips3.c
r3535r3536
244244    CORE CALLBACKS
245245***************************************************************************/
246246
247static void mips3_get_context(void *dst)
247static CPU_GET_CONTEXT( mips3 )
248248{
249249   if (dst != NULL)
250250      *(mips3_regs *)dst = mips3;
251251}
252252
253253
254static void mips3_set_context(void *src)
254static CPU_SET_CONTEXT( mips3 )
255255{
256256   if (src != NULL)
257257      mips3 = *(mips3_regs *)src;
258258}
259259
260260
261static void mips3_reset(void)
261static CPU_RESET( mips3 )
262262{
263263   /* common reset */
264264   mips3com_reset(&mips3.core);
r3535r3536
290290}
291291
292292
293static int mips3_translate(int space, int intention, offs_t *address)
293static CPU_TRANSLATE( mips3 )
294294{
295295   /* common translate */
296296   return mips3com_translate_address(&mips3.core, space, intention, address);
297297}
298298
299299
300offs_t mips3_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
300CPU_DISASSEMBLE( mips3 )
301301{
302302   /* common disassemble */
303303   return mips3com_dasm(&mips3.core, buffer, pc, oprom, opram);
r3535r3536
16501650    CORE EXECUTION LOOP
16511651***************************************************************************/
16521652
1653int mips3_execute(int cycles)
1653CPU_EXECUTE( mips3 )
16541654{
16551655   /* count cycles and interrupt cycles */
16561656   mips3.core.icount = cycles;
r3535r3536
21122112    GENERIC GET/SET INFO
21132113***************************************************************************/
21142114
2115static void mips3_set_info(UINT32 state, cpuinfo *info)
2115static CPU_SET_INFO( mips3 )
21162116{
21172117   /* everything is handled generically here */
21182118   mips3com_set_info(&mips3.core, state, info);
21192119}
21202120
21212121
2122void mips3_get_info(UINT32 state, cpuinfo *info)
2122CPU_GET_INFO( mips3 )
21232123{
21242124   switch (state)
21252125   {
r3535r3536
21282128      case CPUINFO_INT_PREVIOUSPC:               info->i = mips3.ppc;               break;
21292129
21302130      /* --- the following bits of info are returned as pointers to data or functions --- */
2131      case CPUINFO_PTR_SET_INFO:                  info->setinfo = mips3_set_info;         break;
2132      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = mips3_get_context;   break;
2133      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = mips3_set_context;   break;
2131      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(mips3);         break;
2132      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(mips3);   break;
2133      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(mips3);   break;
21342134      case CPUINFO_PTR_INIT:                     /* provided per-CPU */               break;
2135      case CPUINFO_PTR_RESET:                     info->reset = mips3_reset;            break;
2136      case CPUINFO_PTR_EXECUTE:                  info->execute = mips3_execute;         break;
2137      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = mips3_dasm;         break;
2138      case CPUINFO_PTR_TRANSLATE:                  info->translate = mips3_translate;      break;
2135      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(mips3);            break;
2136      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(mips3);         break;
2137      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(mips3);         break;
2138      case CPUINFO_PTR_TRANSLATE:                  info->translate = CPU_GET_TRANSLATE_NAME(mips3);      break;
21392139
21402140      /* --- the following bits of info are returned as NULL-terminated strings --- */
21412141      case CPUINFO_STR_CORE_FILE:                  strcpy(info->s, __FILE__);            break;
r3535r3536
21522152***************************************************************************/
21532153
21542154#if (HAS_R4600)
2155static void r4600be_init(int index, int clock, const void *config, int (*irqcallback)(int))
2155static CPU_INIT( r4600be )
21562156{
2157   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R4600, TRUE, index, clock, config, irqcallback, NULL);
2157   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R4600, TRUE, device, index, clock, config, irqcallback, NULL);
21582158   void *memory = auto_malloc(memsize);
21592159   mips3com_init(&mips3.core, MIPS3_TYPE_R4600, TRUE, index, clock, config, irqcallback, memory);
21602160}
21612161
2162static void r4600le_init(int index, int clock, const void *config, int (*irqcallback)(int))
2162static CPU_INIT( r4600le )
21632163{
2164   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R4600, FALSE, index, clock, config, irqcallback, NULL);
2164   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R4600, FALSE, device, index, clock, config, irqcallback, NULL);
21652165   void *memory = auto_malloc(memsize);
21662166   mips3com_init(&mips3.core, MIPS3_TYPE_R4600, FALSE, index, clock, config, irqcallback, memory);
21672167}
21682168
2169void r4600be_get_info(UINT32 state, cpuinfo *info)
2169CPU_GET_INFO( r4600be )
21702170{
21712171   switch (state)
21722172   {
r3535r3536
21742174      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
21752175
21762176      /* --- the following bits of info are returned as pointers to data or functions --- */
2177      case CPUINFO_PTR_INIT:                     info->init = r4600be_init;            break;
2177      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r4600be);            break;
21782178
21792179      /* --- the following bits of info are returned as NULL-terminated strings --- */
21802180      case CPUINFO_STR_NAME:                     strcpy(info->s, "R4600 (big)");         break;
r3535r3536
21842184   }
21852185}
21862186
2187void r4600le_get_info(UINT32 state, cpuinfo *info)
2187CPU_GET_INFO( r4600le )
21882188{
21892189   switch (state)
21902190   {
r3535r3536
21922192      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
21932193
21942194      /* --- the following bits of info are returned as pointers to data or functions --- */
2195      case CPUINFO_PTR_INIT:                     info->init = r4600le_init;            break;
2195      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r4600le);            break;
21962196
21972197      /* --- the following bits of info are returned as NULL-terminated strings --- */
21982198      case CPUINFO_STR_NAME:                     strcpy(info->s, "R4600 (little)");      break;
r3535r3536
22102210***************************************************************************/
22112211
22122212#if (HAS_R4650)
2213static void r4650be_init(int index, int clock, const void *config, int (*irqcallback)(int))
2213static CPU_INIT( r4650be )
22142214{
2215   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R4650, TRUE, index, clock, config, irqcallback, NULL);
2215   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R4650, TRUE, device, index, clock, config, irqcallback, NULL);
22162216   void *memory = auto_malloc(memsize);
22172217   mips3com_init(&mips3.core, MIPS3_TYPE_R4650, TRUE, index, clock, config, irqcallback, memory);
22182218}
22192219
2220static void r4650le_init(int index, int clock, const void *config, int (*irqcallback)(int))
2220static CPU_INIT( r4650le )
22212221{
2222   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R4650, FALSE, index, clock, config, irqcallback, NULL);
2222   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R4650, FALSE, device, index, clock, config, irqcallback, NULL);
22232223   void *memory = auto_malloc(memsize);
22242224   mips3com_init(&mips3.core, MIPS3_TYPE_R4650, FALSE, index, clock, config, irqcallback, memory);
22252225}
22262226
2227void r4650be_get_info(UINT32 state, cpuinfo *info)
2227CPU_GET_INFO( r4650be )
22282228{
22292229   switch (state)
22302230   {
r3535r3536
22322232      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
22332233
22342234      /* --- the following bits of info are returned as pointers to data or functions --- */
2235      case CPUINFO_PTR_INIT:                     info->init = r4650be_init;            break;
2235      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r4650be);            break;
22362236
22372237      /* --- the following bits of info are returned as NULL-terminated strings --- */
22382238      case CPUINFO_STR_NAME:                     strcpy(info->s, "IDT R4650 (big)");      break;
r3535r3536
22422242   }
22432243}
22442244
2245void r4650le_get_info(UINT32 state, cpuinfo *info)
2245CPU_GET_INFO( r4650le )
22462246{
22472247   switch (state)
22482248   {
r3535r3536
22502250      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
22512251
22522252      /* --- the following bits of info are returned as pointers to data or functions --- */
2253      case CPUINFO_PTR_INIT:                     info->init = r4650le_init;            break;
2253      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r4650le);            break;
22542254
22552255      /* --- the following bits of info are returned as NULL-terminated strings --- */
22562256      case CPUINFO_STR_NAME:                     strcpy(info->s, "IDT R4650 (little)");   break;
r3535r3536
22682268***************************************************************************/
22692269
22702270#if (HAS_R4700)
2271static void r4700be_init(int index, int clock, const void *config, int (*irqcallback)(int))
2271static CPU_INIT( r4700be )
22722272{
2273   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R4700, TRUE, index, clock, config, irqcallback, NULL);
2273   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R4700, TRUE, device, index, clock, config, irqcallback, NULL);
22742274   void *memory = auto_malloc(memsize);
22752275   mips3com_init(&mips3.core, MIPS3_TYPE_R4700, TRUE, index, clock, config, irqcallback, memory);
22762276}
22772277
2278static void r4700le_init(int index, int clock, const void *config, int (*irqcallback)(int))
2278static CPU_INIT( r4700le )
22792279{
2280   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R4700, FALSE, index, clock, config, irqcallback, NULL);
2280   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R4700, FALSE, device, index, clock, config, irqcallback, NULL);
22812281   void *memory = auto_malloc(memsize);
22822282   mips3com_init(&mips3.core, MIPS3_TYPE_R4700, FALSE, index, clock, config, irqcallback, memory);
22832283}
22842284
2285void r4700be_get_info(UINT32 state, cpuinfo *info)
2285CPU_GET_INFO( r4700be )
22862286{
22872287   switch (state)
22882288   {
r3535r3536
22902290      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
22912291
22922292      /* --- the following bits of info are returned as pointers to data or functions --- */
2293      case CPUINFO_PTR_INIT:                     info->init = r4700be_init;            break;
2293      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r4700be);            break;
22942294
22952295      /* --- the following bits of info are returned as NULL-terminated strings --- */
22962296      case CPUINFO_STR_NAME:                     strcpy(info->s, "R4700 (big)");         break;
r3535r3536
23012301}
23022302
23032303
2304void r4700le_get_info(UINT32 state, cpuinfo *info)
2304CPU_GET_INFO( r4700le )
23052305{
23062306   switch (state)
23072307   {
r3535r3536
23092309      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
23102310
23112311      /* --- the following bits of info are returned as pointers to data or functions --- */
2312      case CPUINFO_PTR_INIT:                     info->init = r4700le_init;            break;
2312      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r4700le);            break;
23132313
23142314      /* --- the following bits of info are returned as NULL-terminated strings --- */
23152315      case CPUINFO_STR_NAME:                     strcpy(info->s, "R4700 (little)");      break;
r3535r3536
23272327***************************************************************************/
23282328
23292329#if (HAS_R5000)
2330static void r5000be_init(int index, int clock, const void *config, int (*irqcallback)(int))
2330static CPU_INIT( r5000be )
23312331{
2332   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R5000, TRUE, index, clock, config, irqcallback, NULL);
2332   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R5000, TRUE, device, index, clock, config, irqcallback, NULL);
23332333   void *memory = auto_malloc(memsize);
23342334   mips3com_init(&mips3.core, MIPS3_TYPE_R5000, TRUE, index, clock, config, irqcallback, memory);
23352335}
23362336
2337static void r5000le_init(int index, int clock, const void *config, int (*irqcallback)(int))
2337static CPU_INIT( r5000le )
23382338{
2339   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R5000, FALSE, index, clock, config, irqcallback, NULL);
2339   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_R5000, FALSE, device, index, clock, config, irqcallback, NULL);
23402340   void *memory = auto_malloc(memsize);
23412341   mips3com_init(&mips3.core, MIPS3_TYPE_R5000, FALSE, index, clock, config, irqcallback, memory);
23422342}
23432343
2344void r5000be_get_info(UINT32 state, cpuinfo *info)
2344CPU_GET_INFO( r5000be )
23452345{
23462346   switch (state)
23472347   {
r3535r3536
23492349      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
23502350
23512351      /* --- the following bits of info are returned as pointers to data or functions --- */
2352      case CPUINFO_PTR_INIT:                     info->init = r5000be_init;            break;
2352      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r5000be);            break;
23532353
23542354      /* --- the following bits of info are returned as NULL-terminated strings --- */
23552355      case CPUINFO_STR_NAME:                     strcpy(info->s, "R5000 (big)");         break;
r3535r3536
23592359   }
23602360}
23612361
2362void r5000le_get_info(UINT32 state, cpuinfo *info)
2362CPU_GET_INFO( r5000le )
23632363{
23642364   switch (state)
23652365   {
r3535r3536
23672367      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
23682368
23692369      /* --- the following bits of info are returned as pointers to data or functions --- */
2370      case CPUINFO_PTR_INIT:                     info->init = r5000le_init;            break;
2370      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(r5000le);            break;
23712371
23722372      /* --- the following bits of info are returned as NULL-terminated strings --- */
23732373      case CPUINFO_STR_NAME:                     strcpy(info->s, "R5000 (little)");      break;
r3535r3536
23852385***************************************************************************/
23862386
23872387#if (HAS_QED5271)
2388static void qed5271be_init(int index, int clock, const void *config, int (*irqcallback)(int))
2388static CPU_INIT( qed5271be )
23892389{
2390   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_QED5271, TRUE, index, clock, config, irqcallback, NULL);
2390   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_QED5271, TRUE, device, index, clock, config, irqcallback, NULL);
23912391   void *memory = auto_malloc(memsize);
23922392   mips3com_init(&mips3.core, MIPS3_TYPE_QED5271, TRUE, index, clock, config, irqcallback, memory);
23932393}
23942394
2395static void qed5271le_init(int index, int clock, const void *config, int (*irqcallback)(int))
2395static CPU_INIT( qed5271le )
23962396{
2397   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_QED5271, FALSE, index, clock, config, irqcallback, NULL);
2397   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_QED5271, FALSE, device, index, clock, config, irqcallback, NULL);
23982398   void *memory = auto_malloc(memsize);
23992399   mips3com_init(&mips3.core, MIPS3_TYPE_QED5271, FALSE, index, clock, config, irqcallback, memory);
24002400}
24012401
2402void qed5271be_get_info(UINT32 state, cpuinfo *info)
2402CPU_GET_INFO( qed5271be )
24032403{
24042404   switch (state)
24052405   {
r3535r3536
24072407      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
24082408
24092409      /* --- the following bits of info are returned as pointers to data or functions --- */
2410      case CPUINFO_PTR_INIT:                     info->init = qed5271be_init;         break;
2410      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(qed5271be);         break;
24112411
24122412      /* --- the following bits of info are returned as NULL-terminated strings --- */
24132413      case CPUINFO_STR_NAME:                     strcpy(info->s, "QED5271 (big)");      break;
r3535r3536
24172417   }
24182418}
24192419
2420void qed5271le_get_info(UINT32 state, cpuinfo *info)
2420CPU_GET_INFO( qed5271le )
24212421{
24222422   switch (state)
24232423   {
r3535r3536
24252425      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
24262426
24272427      /* --- the following bits of info are returned as pointers to data or functions --- */
2428      case CPUINFO_PTR_INIT:                     info->init = qed5271le_init;         break;
2428      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(qed5271le);         break;
24292429
24302430      /* --- the following bits of info are returned as NULL-terminated strings --- */
24312431      case CPUINFO_STR_NAME:                     strcpy(info->s, "QED5271 (little)");   break;
r3535r3536
24432443***************************************************************************/
24442444
24452445#if (HAS_RM7000)
2446static void rm7000be_init(int index, int clock, const void *config, int (*irqcallback)(int))
2446static CPU_INIT( rm7000be )
24472447{
2448   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_RM7000, TRUE, index, clock, config, irqcallback, NULL);
2448   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_RM7000, TRUE, device, index, clock, config, irqcallback, NULL);
24492449   void *memory = auto_malloc(memsize);
24502450   mips3com_init(&mips3.core, MIPS3_TYPE_RM7000, TRUE, index, clock, config, irqcallback, memory);
24512451}
24522452
2453static void rm7000le_init(int index, int clock, const void *config, int (*irqcallback)(int))
2453static CPU_INIT( rm7000le )
24542454{
2455   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_RM7000, FALSE, index, clock, config, irqcallback, NULL);
2455   size_t memsize = mips3com_init(&mips3.core, MIPS3_TYPE_RM7000, FALSE, device, index, clock, config, irqcallback, NULL);
24562456   void *memory = auto_malloc(memsize);
24572457   mips3com_init(&mips3.core, MIPS3_TYPE_RM7000, FALSE, index, clock, config, irqcallback, memory);
24582458}
24592459
2460void rm7000be_get_info(UINT32 state, cpuinfo *info)
2460CPU_GET_INFO( rm7000be )
24612461{
24622462   switch (state)
24632463   {
r3535r3536
24652465      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
24662466
24672467      /* --- the following bits of info are returned as pointers to data or functions --- */
2468      case CPUINFO_PTR_INIT:                     info->init = rm7000be_init;            break;
2468      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(rm7000be);            break;
24692469
24702470      /* --- the following bits of info are returned as NULL-terminated strings --- */
24712471      case CPUINFO_STR_NAME:                     strcpy(info->s, "RM7000 (big)");      break;
r3535r3536
24752475   }
24762476}
24772477
2478void rm7000le_get_info(UINT32 state, cpuinfo *info)
2478CPU_GET_INFO( rm7000le )
24792479{
24802480   switch (state)
24812481   {
r3535r3536
24832483      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_LE;               break;
24842484
24852485      /* --- the following bits of info are returned as pointers to data or functions --- */
2486      case CPUINFO_PTR_INIT:                     info->init = rm7000le_init;            break;
2486      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(rm7000le);            break;
24872487
24882488      /* --- the following bits of info are returned as NULL-terminated strings --- */
24892489      case CPUINFO_STR_NAME:                     strcpy(info->s, "RM7000 (little)");      break;
src/emu/cpu/tms7000/tms7000.h
r3535r3536
4848
4949/* PUBLIC FUNCTIONS */
5050extern void tms7000_A6EC1( void ); /* External event counter */
51extern void tms7000_get_info(UINT32 state, cpuinfo *info);
52extern void tms7000_exl_get_info(UINT32 state, cpuinfo *info);
51extern CPU_GET_INFO( tms7000 );
52extern CPU_GET_INFO( tms7000_exl );
5353
54extern unsigned tms7000_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram );
54extern CPU_DISASSEMBLE( tms7000 );
5555
5656#endif /* __TMS7000_H__ */
src/emu/cpu/tms7000/tms7000.c
r3535r3536
4040/* Private prototypes */
4141
4242static void tms7000_set_irq_line(int irqline, int state);
43static void tms7000_get_context(void *dst);
44static void tms7000_set_context(void *src);
43static CPU_GET_CONTEXT( tms7000 );
44static CPU_SET_CONTEXT( tms7000 );
4545static void tms7000_check_IRQ_lines( void );
4646static void tms7000_do_interrupt( UINT16 address, UINT8 line );
47static int tms7000_execute(int cycles);
48static int tms7000_exl_execute(int cycles);
47static CPU_EXECUTE( tms7000 );
48static CPU_EXECUTE( tms7000_exl );
4949static void tms7000_service_timer1( void );
5050static UINT16 bcd_add( UINT16 a, UINT16 b );
5151static UINT16 bcd_tencomp( UINT16 a );
r3535r3536
105105   UINT8      irq_state[3];   /* State of the three IRQs */
106106   UINT8      rf[0x80];   /* Register file (SJE) */
107107   UINT8      pf[0x100];   /* Perpherial file */
108   int       (*irq_callback)(int irqline);
108   cpu_irq_callback irq_callback;
109   const device_config *device;
109110   UINT8      t1_capture_latch; /* Timer 1 capture latch */
110111   INT8      t1_prescaler;   /* Timer 1 prescaler (5 bits) */
111112   INT16      t1_decrementer;   /* Timer 1 decrementer (8 bits) */
r3535r3536
166167 * Get all registers in given buffer
167168 ****************************************************************************/
168169
169static void tms7000_get_context(void *dst)
170static CPU_GET_CONTEXT( tms7000 )
170171{
171172   if( dst )
172173      *(tms7000_Regs*)dst = tms7000;
r3535r3536
175176/****************************************************************************
176177 * Set all registers to given values
177178 ****************************************************************************/
178static void tms7000_set_context(void *src)
179static CPU_SET_CONTEXT( tms7000 )
179180{
180181   if( src )
181182      tms7000 = *(tms7000_Regs*)src;
r3535r3536
183184        tms7000_check_IRQ_lines();
184185}
185186
186static void tms7000_init(int index, int clock, const void *config, int (*irqcallback)(int))
187static CPU_INIT( tms7000 )
187188{
188189   int cpu = cpu_getactivecpu();
189190
190191   tms7000.irq_callback = irqcallback;
192   tms7000.device = device;
191193
192194   memset(tms7000.pf, 0, 0x100);
193195   memset(tms7000.rf, 0, 0x80);
r3535r3536
210212   state_save_register_item("tms7000", cpu, tms7000.t1_decrementer);
211213
212214   state_save_register_item("tms7000", cpu, tms7000.idle_state);
213
214   tms7000.irq_callback = irqcallback;
215215}
216216
217static void tms7000_reset(void)
217static CPU_RESET( tms7000 )
218218{
219219//  tms7000.architecture = (int)param;
220220
r3535r3536
257257 * Generic set_info
258258 **************************************************************************/
259259
260static void tms7000_set_info(UINT32 state, cpuinfo *info)
260static CPU_SET_INFO( tms7000 )
261261{
262262    switch (state)
263263    {
r3535r3536
282282 * Generic get_info
283283 **************************************************************************/
284284
285void tms7000_get_info(UINT32 state, cpuinfo *info)
285CPU_GET_INFO( tms7000 )
286286{
287287
288288    switch( state )
r3535r3536
326326      case CPUINFO_INT_REGISTER + TMS7000_T1_DEC: info->i = tms7000.t1_decrementer; break;
327327
328328        /* --- the following bits of info are returned as pointers to data or functions --- */
329        case CPUINFO_PTR_SET_INFO:   info->setinfo = tms7000_set_info;   break;
330        case CPUINFO_PTR_GET_CONTEXT:   info->getcontext = tms7000_get_context;   break;
331        case CPUINFO_PTR_SET_CONTEXT:   info->setcontext = tms7000_set_context;   break;
332        case CPUINFO_PTR_INIT:   info->init = tms7000_init;   break;
333        case CPUINFO_PTR_RESET:   info->reset = tms7000_reset;   break;
334        case CPUINFO_PTR_EXECUTE:   info->execute = tms7000_execute;   break;
329        case CPUINFO_PTR_SET_INFO:   info->setinfo = CPU_SET_INFO_NAME(tms7000);   break;
330        case CPUINFO_PTR_GET_CONTEXT:   info->getcontext = CPU_GET_CONTEXT_NAME(tms7000);   break;
331        case CPUINFO_PTR_SET_CONTEXT:   info->setcontext = CPU_SET_CONTEXT_NAME(tms7000);   break;
332        case CPUINFO_PTR_INIT:   info->init = CPU_INIT_NAME(tms7000);   break;
333        case CPUINFO_PTR_RESET:   info->reset = CPU_RESET_NAME(tms7000);   break;
334        case CPUINFO_PTR_EXECUTE:   info->execute = CPU_EXECUTE_NAME(tms7000);   break;
335335        case CPUINFO_PTR_BURN:   info->burn = NULL;   /* Not supported */break;
336        case CPUINFO_PTR_DISASSEMBLE:   info->disassemble = tms7000_dasm;   break;
336        case CPUINFO_PTR_DISASSEMBLE:   info->disassemble = CPU_DISASSEMBLE_NAME(tms7000);   break;
337337        case CPUINFO_PTR_INSTRUCTION_COUNTER:   info->icount = &tms7000_icount;   break;
338      case CPUINFO_PTR_INTERNAL_MEMORY_MAP:   info->internal_map8 = address_map_tms7000_mem; break;
338      case CPUINFO_PTR_INTERNAL_MEMORY_MAP:   info->internal_map8 = ADDRESS_MAP_NAME(tms7000_mem); break;
339339
340340        /* --- the following bits of info are returned as NULL-terminated strings --- */
341341        case CPUINFO_STR_NAME:   strcpy(info->s = cpuintrf_temp_str(), "TMS7000"); break;
r3535r3536
367367    }
368368}
369369
370void tms7000_exl_get_info(UINT32 state, cpuinfo *info)
370CPU_GET_INFO( tms7000_exl )
371371{
372372    switch( state )
373373    {
374374      case CPUINFO_PTR_EXECUTE:
375         info->execute = tms7000_exl_execute;
375         info->execute = CPU_EXECUTE_NAME(tms7000_exl);
376376         break;
377377      default:
378         tms7000_get_info(state, info);
378         CPU_GET_INFO_CALL(tms7000);
379379         break;
380380   }
381381}
r3535r3536
456456      tms7000.idle_state = 0;
457457   }
458458
459   (void)(*tms7000.irq_callback)(line);
459   (void)(*tms7000.irq_callback)(tms7000.device, line);
460460}
461461
462462#include "tms70op.c"
463463#include "tms70tb.c"
464464
465static int tms7000_execute(int cycles)
465static CPU_EXECUTE( tms7000 )
466466{
467467   int op;
468468
r3535r3536
501501   return cycles - tms7000_icount;
502502}
503503
504static int tms7000_exl_execute(int cycles)
504static CPU_EXECUTE( tms7000_exl )
505505{
506506   int op;
507507
src/emu/cpu/tms7000/7000dasm.c
r3535r3536
358358   {0x00, "NOP", 23, 0 }
359359};
360360
361unsigned tms7000_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram )
361CPU_DISASSEMBLE( tms7000 )
362362{
363363   int opcode, i, size = 1;
364364   int pos = 0;
src/emu/cpu/f8/f8.h
r3535r3536
4747#define F8_INT_NONE  0
4848#define F8_INT_INTR  1
4949
50void f8_get_info(UINT32 state, cpuinfo *info);
50CPU_GET_INFO( f8 );
5151
5252#ifdef __cplusplus
5353}
src/emu/cpu/f8/f8dasm.c
r3535r3536
77   "R8", "J",  "HU", "HL", "KU", "KL", "QU", "QL"
88};
99
10unsigned f8_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
10CPU_DISASSEMBLE( f8 )
1111{
1212   unsigned size = 0;
1313   UINT8 op = oprom[size++];
src/emu/cpu/f8/f3853.c
r3535r3536
9393   f3853.timer = timer_alloc(f3853_timer_callback, NULL);
9494}
9595
96void f3853_reset(void)
96CPU_RESET( f3853 )
9797{
9898    // registers indeterminate
9999}
src/emu/cpu/f8/f3853.h
r3535r3536
2121};
2222
2323void f3853_init(const f3853_config *config);
24void f3853_reset(void);
24CPU_RESET( f3853 );
2525
2626// ports 0x0c - 0x0f
2727 READ8_HANDLER(f3853_r);
src/emu/cpu/f8/f8.c
r3535r3536
5050   UINT8   dbus;   /* data bus value */
5151   UINT16   io;    /* last I/O address */
5252    UINT16  irq_vector;
53   int    (*irq_callback)(int irqline);
53    cpu_irq_callback irq_callback;
54    const device_config *device;
5455    UINT8   r[64];  /* scratchpad RAM */
5556    int     irq_request;
5657}   f8_Regs;
r3535r3536
278279     * must move the contents of the data bus into the low order
279280     * byte of PC0.
280281     */
281    f8.irq_vector = (*f8.irq_callback)(0);
282    f8.irq_vector = (*f8.irq_callback)(f8.device, 0);
282283    f8.dbus = f8.irq_vector & 0x00ff;
283284    f8.pc1 = f8.pc0;
284285    f8.pc0 = (f8.pc0 & 0xff00) | f8.dbus;
r3535r3536
15301531   f8.is = (f8.is & 0x38) | ((f8.is - 1) & 0x07);
15311532}
15321533
1533static void f8_reset(void)
1534static CPU_RESET( f8 )
15341535{
15351536   UINT8 data;
15361537   int i;
1537   int (*old_callback)(int);
1538   cpu_irq_callback save_callback;
1539   const device_config *save_device;
15381540
1539   old_callback = f8.irq_callback;
1541   save_callback = f8.irq_callback;
1542   save_device = f8.device;
15401543   memset(&f8, 0, sizeof(f8_Regs));
1541   f8.irq_callback = old_callback;
1544   f8.irq_callback = save_callback;
1545   f8.device = save_device;
15421546    f8.w&=~I;
15431547
15441548   /* save PC0 to PC1 and reset PC0 */
r3535r3536
15691573}
15701574
15711575/* Execute cycles - returns number of cycles actually run */
1572static int f8_execute(int cycles)
1576static CPU_EXECUTE( f8 )
15731577{
15741578    f8_icount = cycles;
15751579
r3535r3536
18791883    return cycles - f8_icount;
18801884}
18811885
1882static void f8_get_context (void *dst)
1886static CPU_GET_CONTEXT( f8 )
18831887{
18841888   if (dst)
18851889      *(f8_Regs *) dst = f8;
18861890}
18871891
1888static void f8_set_context (void *src)
1892static CPU_SET_CONTEXT( f8 )
18891893{
18901894   if (src)
18911895      f8 = *(f8_Regs *) src;
18921896}
18931897
1894unsigned f8_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
1898CPU_DISASSEMBLE( f8 );
18951899
1896static void f8_init (int index, int clock, const void *config, int (*irqcallback)(int))
1900static CPU_INIT( f8 )
18971901{
18981902   f8.irq_callback = irqcallback;
1903   f8.device = device;
18991904}
19001905
1901static void f8_set_info(UINT32 state, cpuinfo *info)
1906static CPU_SET_INFO( f8 )
19021907{
19031908   switch (state)
19041909   {
r3535r3536
19962001   return;
19972002}
19982003
1999void f8_get_info(UINT32 state, cpuinfo *info)
2004CPU_GET_INFO( f8 )
20002005{
20012006   switch (state)
20022007   {
r3535r3536
21062111       info->i = f8.r[state - (CPUINFO_INT_REGISTER + F8_R16) + 16];   break;
21072112
21082113   /* --- the following bits of info are returned as pointers to data or functions --- */
2109   case CPUINFO_PTR_SET_INFO:                  info->setinfo = f8_set_info;         break;
2110   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = f8_get_context;      break;
2111   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = f8_set_context;      break;
2112   case CPUINFO_PTR_INIT:                     info->init = f8_init;               break;
2113   case CPUINFO_PTR_RESET:                     info->reset = f8_reset;               break;
2114   case CPUINFO_PTR_EXECUTE:                  info->execute = f8_execute;            break;
2114   case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(f8);         break;
2115   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(f8);      break;
2116   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(f8);      break;
2117   case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(f8);               break;
2118   case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(f8);               break;
2119   case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(f8);            break;
21152120   case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
21162121
2117   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = f8_dasm;         break;
2122   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(f8);         break;
21182123   case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &f8_icount;            break;
21192124
21202125   /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/z80/z80.c
r3535r3536
11/*****************************************************************************
22 *
33 *   z80.c
4 *   Portable Z80 emulator V3.5
4 *   Portable Z80 emulator V3.8
55 *
66 *   Copyright Juergen Buchmueller, all rights reserved.
77 *
r3535r3536
1717 *     terms of its usage and license at any time, including retroactively
1818 *   - This entire notice must remain in the source code.
1919 *
20 *   Changes in 3.8 [Miodrag Milanovic]
21 *   - Added MEMPTR register (according to informations provided
22 *     by Vladimir Kladov
23 *   - BIT n,(HL) now return valid values due to use of MEMPTR
24 *   - Fixed BIT 6,(XY+o) undocumented instructions
2025 *   Changes in 3.7 [Aaron Giles]
2126 *   - Changed NMI handling. NMIs are now latched in set_irq_state
2227 *     but are not taken there. Instead they are taken at the start of the
r3535r3536
117122
118123/****************************************************************************/
119124/* The Z80 registers. HALT is set to 1 when the CPU is halted, the refresh  */
120/* register is calculated as follows: refresh=(Z80.r&127)|(Z80.r2&128)      */
125/* register is calculated as follows: refresh=(z80->r&127)|(z80->r2&128)      */
121126/****************************************************************************/
122typedef struct
127typedef struct _z80_state z80_state;
128struct _z80_state
123129{
124   PAIR   prvpc,pc,sp,af,bc,de,hl,ix,iy;
130   PAIR   prvpc,pc,sp,af,bc,de,hl,ix,iy,memptr;
125131   PAIR   af2,bc2,de2,hl2;
126132   UINT8   r,r2,iff1,iff2,halt,im,i;
127133   UINT8   nmi_state;         /* nmi line state */
128134   UINT8   nmi_pending;      /* nmi pending */
129135   UINT8   irq_state;         /* irq line state */
130136   UINT8   after_ei;         /* are we in the EI shadow? */
131   int      (*irq_callback)(int irqline);
137   UINT32   ea;
138   cpu_irq_callback irq_callback;
139   const device_config *device;
140   int      icount;
132141   z80_daisy_state *daisy;
133}   Z80_Regs;
142};
134143
135144#define CF   0x01
136145#define NF   0x02
r3535r3536
145154#define INT_IRQ 0x01
146155#define NMI_IRQ 0x02
147156
148#define PRVPC Z80.prvpc.d      /* previous program counter */
157#define PRVPC z80->prvpc.d      /* previous program counter */
149158
150#define PCD   Z80.pc.d
151#define PC Z80.pc.w.l
159#define PCD   z80->pc.d
160#define PC z80->pc.w.l
152161
153#define SPD Z80.sp.d
154#define SP Z80.sp.w.l
162#define SPD z80->sp.d
163#define SP z80->sp.w.l
155164
156#define AFD Z80.af.d
157#define AF Z80.af.w.l
158#define A Z80.af.b.h
159#define F Z80.af.b.l
165#define AFD z80->af.d
166#define AF z80->af.w.l
167#define A z80->af.b.h
168#define F z80->af.b.l
160169
161#define BCD Z80.bc.d
162#define BC Z80.bc.w.l
163#define B Z80.bc.b.h
164#define C Z80.bc.b.l
170#define BCD z80->bc.d
171#define BC z80->bc.w.l
172#define B z80->bc.b.h
173#define C z80->bc.b.l
165174
166#define DED Z80.de.d
167#define DE Z80.de.w.l
168#define D Z80.de.b.h
169#define E Z80.de.b.l
175#define DED z80->de.d
176#define DE z80->de.w.l
177#define D z80->de.b.h
178#define E z80->de.b.l
170179
171#define HLD Z80.hl.d
172#define HL Z80.hl.w.l
173#define H Z80.hl.b.h
174#define L Z80.hl.b.l
180#define HLD z80->hl.d
181#define HL z80->hl.w.l
182#define H z80->hl.b.h
183#define L z80->hl.b.l
175184
176#define IXD Z80.ix.d
177#define IX Z80.ix.w.l
178#define HX Z80.ix.b.h
179#define LX Z80.ix.b.l
185#define IXD z80->ix.d
186#define IX z80->ix.w.l
187#define HX z80->ix.b.h
188#define LX z80->ix.b.l
180189
181#define IYD Z80.iy.d
182#define IY Z80.iy.w.l
183#define HY Z80.iy.b.h
184#define LY Z80.iy.b.l
190#define IYD z80->iy.d
191#define IY z80->iy.w.l
192#define HY z80->iy.b.h
193#define LY z80->iy.b.l
185194
186#define I Z80.i
187#define R Z80.r
188#define R2 Z80.r2
189#define IM Z80.im
190#define IFF1 Z80.iff1
191#define IFF2 Z80.iff2
192#define HALT Z80.halt
195#define MEMPTR z80->memptr.w.l
196#define MEMPTR_H z80->memptr.b.h
197#define MEMPTR_L z80->memptr.b.l
193198
194static int z80_ICount;
195static Z80_Regs Z80;
196static UINT32 EA;
199#define EA z80->ea
197200
201
202#define I z80->i
203#define R z80->r
204#define R2 z80->r2
205#define IM z80->im
206#define IFF1 z80->iff1
207#define IFF2 z80->iff2
208#define HALT z80->halt
209
210static z80_state *token;
211
198212static UINT8 SZ[256];      /* zero and sign flags */
199213static UINT8 SZ_BIT[256];   /* zero, sign and parity/overflow (=zero) flags for BIT opcode */
200214static UINT8 SZP[256];      /* zero, sign and parity flags */
r3535r3536
319333#define Z80_TABLE_dd   Z80_TABLE_xy
320334#define Z80_TABLE_fd   Z80_TABLE_xy
321335
322static void take_interrupt(void);
323static void z80_burn(int cycles);
336static void take_interrupt(z80_state *z80);
337static CPU_BURN( z80 );
324338
325typedef void (*funcptr)(void);
339typedef void (*funcptr)(z80_state *z80);
326340
327341#define PROTOTYPES(tablename,prefix) \
328   INLINE void prefix##_00(void); INLINE void prefix##_01(void); INLINE void prefix##_02(void); INLINE void prefix##_03(void); \
329   INLINE void prefix##_04(void); INLINE void prefix##_05(void); INLINE void prefix##_06(void); INLINE void prefix##_07(void); \
330   INLINE void prefix##_08(void); INLINE void prefix##_09(void); INLINE void prefix##_0a(void); INLINE void prefix##_0b(void); \
331   INLINE void prefix##_0c(void); INLINE void prefix##_0d(void); INLINE void prefix##_0e(void); INLINE void prefix##_0f(void); \
332   INLINE void prefix##_10(void); INLINE void prefix##_11(void); INLINE void prefix##_12(void); INLINE void prefix##_13(void); \
333   INLINE void prefix##_14(void); INLINE void prefix##_15(void); INLINE void prefix##_16(void); INLINE void prefix##_17(void); \
334   INLINE void prefix##_18(void); INLINE void prefix##_19(void); INLINE void prefix##_1a(void); INLINE void prefix##_1b(void); \
335   INLINE void prefix##_1c(void); INLINE void prefix##_1d(void); INLINE void prefix##_1e(void); INLINE void prefix##_1f(void); \
336   INLINE void prefix##_20(void); INLINE void prefix##_21(void); INLINE void prefix##_22(void); INLINE void prefix##_23(void); \
337   INLINE void prefix##_24(void); INLINE void prefix##_25(void); INLINE void prefix##_26(void); INLINE void prefix##_27(void); \
338   INLINE void prefix##_28(void); INLINE void prefix##_29(void); INLINE void prefix##_2a(void); INLINE void prefix##_2b(void); \
339   INLINE void prefix##_2c(void); INLINE void prefix##_2d(void); INLINE void prefix##_2e(void); INLINE void prefix##_2f(void); \
340   INLINE void prefix##_30(void); INLINE void prefix##_31(void); INLINE void prefix##_32(void); INLINE void prefix##_33(void); \
341   INLINE void prefix##_34(void); INLINE void prefix##_35(void); INLINE void prefix##_36(void); INLINE void prefix##_37(void); \
342   INLINE void prefix##_38(void); INLINE void prefix##_39(void); INLINE void prefix##_3a(void); INLINE void prefix##_3b(void); \
343   INLINE void prefix##_3c(void); INLINE void prefix##_3d(void); INLINE void prefix##_3e(void); INLINE void prefix##_3f(void); \
344   INLINE void prefix##_40(void); INLINE void prefix##_41(void); INLINE void prefix##_42(void); INLINE void prefix##_43(void); \
345   INLINE void prefix##_44(void); INLINE void prefix##_45(void); INLINE void prefix##_46(void); INLINE void prefix##_47(void); \
346   INLINE void prefix##_48(void); INLINE void prefix##_49(void); INLINE void prefix##_4a(void); INLINE void prefix##_4b(void); \
347   INLINE void prefix##_4c(void); INLINE void prefix##_4d(void); INLINE void prefix##_4e(void); INLINE void prefix##_4f(void); \
348   INLINE void prefix##_50(void); INLINE void prefix##_51(void); INLINE void prefix##_52(void); INLINE void prefix##_53(void); \
349   INLINE void prefix##_54(void); INLINE void prefix##_55(void); INLINE void prefix##_56(void); INLINE void prefix##_57(void); \
350   INLINE void prefix##_58(void); INLINE void prefix##_59(void); INLINE void prefix##_5a(void); INLINE void prefix##_5b(void); \
351   INLINE void prefix##_5c(void); INLINE void prefix##_5d(void); INLINE void prefix##_5e(void); INLINE void prefix##_5f(void); \
352   INLINE void prefix##_60(void); INLINE void prefix##_61(void); INLINE void prefix##_62(void); INLINE void prefix##_63(void); \
353   INLINE void prefix##_64(void); INLINE void prefix##_65(void); INLINE void prefix##_66(void); INLINE void prefix##_67(void); \
354   INLINE void prefix##_68(void); INLINE void prefix##_69(void); INLINE void prefix##_6a(void); INLINE void prefix##_6b(void); \
355   INLINE void prefix##_6c(void); INLINE void prefix##_6d(void); INLINE void prefix##_6e(void); INLINE void prefix##_6f(void); \
356   INLINE void prefix##_70(void); INLINE void prefix##_71(void); INLINE void prefix##_72(void); INLINE void prefix##_73(void); \
357   INLINE void prefix##_74(void); INLINE void prefix##_75(void); INLINE void prefix##_76(void); INLINE void prefix##_77(void); \
358   INLINE void prefix##_78(void); INLINE void prefix##_79(void); INLINE void prefix##_7a(void); INLINE void prefix##_7b(void); \
359   INLINE void prefix##_7c(void); INLINE void prefix##_7d(void); INLINE void prefix##_7e(void); INLINE void prefix##_7f(void); \
360   INLINE void prefix##_80(void); INLINE void prefix##_81(void); INLINE void prefix##_82(void); INLINE void prefix##_83(void); \
361   INLINE void prefix##_84(void); INLINE void prefix##_85(void); INLINE void prefix##_86(void); INLINE void prefix##_87(void); \
362   INLINE void prefix##_88(void); INLINE void prefix##_89(void); INLINE void prefix##_8a(void); INLINE void prefix##_8b(void); \
363   INLINE void prefix##_8c(void); INLINE void prefix##_8d(void); INLINE void prefix##_8e(void); INLINE void prefix##_8f(void); \
364   INLINE void prefix##_90(void); INLINE void prefix##_91(void); INLINE void prefix##_92(void); INLINE void prefix##_93(void); \
365   INLINE void prefix##_94(void); INLINE void prefix##_95(void); INLINE void prefix##_96(void); INLINE void prefix##_97(void); \
366   INLINE void prefix##_98(void); INLINE void prefix##_99(void); INLINE void prefix##_9a(void); INLINE void prefix##_9b(void); \
367   INLINE void prefix##_9c(void); INLINE void prefix##_9d(void); INLINE void prefix##_9e(void); INLINE void prefix##_9f(void); \
368   INLINE void prefix##_a0(void); INLINE void prefix##_a1(void); INLINE void prefix##_a2(void); INLINE void prefix##_a3(void); \
369   INLINE void prefix##_a4(void); INLINE void prefix##_a5(void); INLINE void prefix##_a6(void); INLINE void prefix##_a7(void); \
370   INLINE void prefix##_a8(void); INLINE void prefix##_a9(void); INLINE void prefix##_aa(void); INLINE void prefix##_ab(void); \
371   INLINE void prefix##_ac(void); INLINE void prefix##_ad(void); INLINE void prefix##_ae(void); INLINE void prefix##_af(void); \
372   INLINE void prefix##_b0(void); INLINE void prefix##_b1(void); INLINE void prefix##_b2(void); INLINE void prefix##_b3(void); \
373   INLINE void prefix##_b4(void); INLINE void prefix##_b5(void); INLINE void prefix##_b6(void); INLINE void prefix##_b7(void); \
374   INLINE void prefix##_b8(void); INLINE void prefix##_b9(void); INLINE void prefix##_ba(void); INLINE void prefix##_bb(void); \
375   INLINE void prefix##_bc(void); INLINE void prefix##_bd(void); INLINE void prefix##_be(void); INLINE void prefix##_bf(void); \
376   INLINE void prefix##_c0(void); INLINE void prefix##_c1(void); INLINE void prefix##_c2(void); INLINE void prefix##_c3(void); \
377   INLINE void prefix##_c4(void); INLINE void prefix##_c5(void); INLINE void prefix##_c6(void); INLINE void prefix##_c7(void); \
378   INLINE void prefix##_c8(void); INLINE void prefix##_c9(void); INLINE void prefix##_ca(void); INLINE void prefix##_cb(void); \
379   INLINE void prefix##_cc(void); INLINE void prefix##_cd(void); INLINE void prefix##_ce(void); INLINE void prefix##_cf(void); \
380   INLINE void prefix##_d0(void); INLINE void prefix##_d1(void); INLINE void prefix##_d2(void); INLINE void prefix##_d3(void); \
381   INLINE void prefix##_d4(void); INLINE void prefix##_d5(void); INLINE void prefix##_d6(void); INLINE void prefix##_d7(void); \
382   INLINE void prefix##_d8(void); INLINE void prefix##_d9(void); INLINE void prefix##_da(void); INLINE void prefix##_db(void); \
383   INLINE void prefix##_dc(void); INLINE void prefix##_dd(void); INLINE void prefix##_de(void); INLINE void prefix##_df(void); \
384   INLINE void prefix##_e0(void); INLINE void prefix##_e1(void); INLINE void prefix##_e2(void); INLINE void prefix##_e3(void); \
385   INLINE void prefix##_e4(void); INLINE void prefix##_e5(void); INLINE void prefix##_e6(void); INLINE void prefix##_e7(void); \
386   INLINE void prefix##_e8(void); INLINE void prefix##_e9(void); INLINE void prefix##_ea(void); INLINE void prefix##_eb(void); \
387   INLINE void prefix##_ec(void); INLINE void prefix##_ed(void); INLINE void prefix##_ee(void); INLINE void prefix##_ef(void); \
388   INLINE void prefix##_f0(void); INLINE void prefix##_f1(void); INLINE void prefix##_f2(void); INLINE void prefix##_f3(void); \
389   INLINE void prefix##_f4(void); INLINE void prefix##_f5(void); INLINE void prefix##_f6(void); INLINE void prefix##_f7(void); \
390   INLINE void prefix##_f8(void); INLINE void prefix##_f9(void); INLINE void prefix##_fa(void); INLINE void prefix##_fb(void); \
391   INLINE void prefix##_fc(void); INLINE void prefix##_fd(void); INLINE void prefix##_fe(void); INLINE void prefix##_ff(void); \
342   INLINE void prefix##_00(z80_state *z80); INLINE void prefix##_01(z80_state *z80); INLINE void prefix##_02(z80_state *z80); INLINE void prefix##_03(z80_state *z80); \
343   INLINE void prefix##_04(z80_state *z80); INLINE void prefix##_05(z80_state *z80); INLINE void prefix##_06(z80_state *z80); INLINE void prefix##_07(z80_state *z80); \
344   INLINE void prefix##_08(z80_state *z80); INLINE void prefix##_09(z80_state *z80); INLINE void prefix##_0a(z80_state *z80); INLINE void prefix##_0b(z80_state *z80); \
345   INLINE void prefix##_0c(z80_state *z80); INLINE void prefix##_0d(z80_state *z80); INLINE void prefix##_0e(z80_state *z80); INLINE void prefix##_0f(z80_state *z80); \
346   INLINE void prefix##_10(z80_state *z80); INLINE void prefix##_11(z80_state *z80); INLINE void prefix##_12(z80_state *z80); INLINE void prefix##_13(z80_state *z80); \
347   INLINE void prefix##_14(z80_state *z80); INLINE void prefix##_15(z80_state *z80); INLINE void prefix##_16(z80_state *z80); INLINE void prefix##_17(z80_state *z80); \
348   INLINE void prefix##_18(z80_state *z80); INLINE void prefix##_19(z80_state *z80); INLINE void prefix##_1a(z80_state *z80); INLINE void prefix##_1b(z80_state *z80); \
349   INLINE void prefix##_1c(z80_state *z80); INLINE void prefix##_1d(z80_state *z80); INLINE void prefix##_1e(z80_state *z80); INLINE void prefix##_1f(z80_state *z80); \
350   INLINE void prefix##_20(z80_state *z80); INLINE void prefix##_21(z80_state *z80); INLINE void prefix##_22(z80_state *z80); INLINE void prefix##_23(z80_state *z80); \
351   INLINE void prefix##_24(z80_state *z80); INLINE void prefix##_25(z80_state *z80); INLINE void prefix##_26(z80_state *z80); INLINE void prefix##_27(z80_state *z80); \
352   INLINE void prefix##_28(z80_state *z80); INLINE void prefix##_29(z80_state *z80); INLINE void prefix##_2a(z80_state *z80); INLINE void prefix##_2b(z80_state *z80); \
353   INLINE void prefix##_2c(z80_state *z80); INLINE void prefix##_2d(z80_state *z80); INLINE void prefix##_2e(z80_state *z80); INLINE void prefix##_2f(z80_state *z80); \
354   INLINE void prefix##_30(z80_state *z80); INLINE void prefix##_31(z80_state *z80); INLINE void prefix##_32(z80_state *z80); INLINE void prefix##_33(z80_state *z80); \
355   INLINE void prefix##_34(z80_state *z80); INLINE void prefix##_35(z80_state *z80); INLINE void prefix##_36(z80_state *z80); INLINE void prefix##_37(z80_state *z80); \
356   INLINE void prefix##_38(z80_state *z80); INLINE void prefix##_39(z80_state *z80); INLINE void prefix##_3a(z80_state *z80); INLINE void prefix##_3b(z80_state *z80); \
357   INLINE void prefix##_3c(z80_state *z80); INLINE void prefix##_3d(z80_state *z80); INLINE void prefix##_3e(z80_state *z80); INLINE void prefix##_3f(z80_state *z80); \
358   INLINE void prefix##_40(z80_state *z80); INLINE void prefix##_41(z80_state *z80); INLINE void prefix##_42(z80_state *z80); INLINE void prefix##_43(z80_state *z80); \
359   INLINE void prefix##_44(z80_state *z80); INLINE void prefix##_45(z80_state *z80); INLINE void prefix##_46(z80_state *z80); INLINE void prefix##_47(z80_state *z80); \
360   INLINE void prefix##_48(z80_state *z80); INLINE void prefix##_49(z80_state *z80); INLINE void prefix##_4a(z80_state *z80); INLINE void prefix##_4b(z80_state *z80); \
361   INLINE void prefix##_4c(z80_state *z80); INLINE void prefix##_4d(z80_state *z80); INLINE void prefix##_4e(z80_state *z80); INLINE void prefix##_4f(z80_state *z80); \
362   INLINE void prefix##_50(z80_state *z80); INLINE void prefix##_51(z80_state *z80); INLINE void prefix##_52(z80_state *z80); INLINE void prefix##_53(z80_state *z80); \
363   INLINE void prefix##_54(z80_state *z80); INLINE void prefix##_55(z80_state *z80); INLINE void prefix##_56(z80_state *z80); INLINE void prefix##_57(z80_state *z80); \
364   INLINE void prefix##_58(z80_state *z80); INLINE void prefix##_59(z80_state *z80); INLINE void prefix##_5a(z80_state *z80); INLINE void prefix##_5b(z80_state *z80); \
365   INLINE void prefix##_5c(z80_state *z80); INLINE void prefix##_5d(z80_state *z80); INLINE void prefix##_5e(z80_state *z80); INLINE void prefix##_5f(z80_state *z80); \
366   INLINE void prefix##_60(z80_state *z80); INLINE void prefix##_61(z80_state *z80); INLINE void prefix##_62(z80_state *z80); INLINE void prefix##_63(z80_state *z80); \
367   INLINE void prefix##_64(z80_state *z80); INLINE void prefix##_65(z80_state *z80); INLINE void prefix##_66(z80_state *z80); INLINE void prefix##_67(z80_state *z80); \
368   INLINE void prefix##_68(z80_state *z80); INLINE void prefix##_69(z80_state *z80); INLINE void prefix##_6a(z80_state *z80); INLINE void prefix##_6b(z80_state *z80); \
369   INLINE void prefix##_6c(z80_state *z80); INLINE void prefix##_6d(z80_state *z80); INLINE void prefix##_6e(z80_state *z80); INLINE void prefix##_6f(z80_state *z80); \
370   INLINE void prefix##_70(z80_state *z80); INLINE void prefix##_71(z80_state *z80); INLINE void prefix##_72(z80_state *z80); INLINE void prefix##_73(z80_state *z80); \
371   INLINE void prefix##_74(z80_state *z80); INLINE void prefix##_75(z80_state *z80); INLINE void prefix##_76(z80_state *z80); INLINE void prefix##_77(z80_state *z80); \
372   INLINE void prefix##_78(z80_state *z80); INLINE void prefix##_79(z80_state *z80); INLINE void prefix##_7a(z80_state *z80); INLINE void prefix##_7b(z80_state *z80); \
373   INLINE void prefix##_7c(z80_state *z80); INLINE void prefix##_7d(z80_state *z80); INLINE void prefix##_7e(z80_state *z80); INLINE void prefix##_7f(z80_state *z80); \
374   INLINE void prefix##_80(z80_state *z80); INLINE void prefix##_81(z80_state *z80); INLINE void prefix##_82(z80_state *z80); INLINE void prefix##_83(z80_state *z80); \
375   INLINE void prefix##_84(z80_state *z80); INLINE void prefix##_85(z80_state *z80); INLINE void prefix##_86(z80_state *z80); INLINE void prefix##_87(z80_state *z80); \
376   INLINE void prefix##_88(z80_state *z80); INLINE void prefix##_89(z80_state *z80); INLINE void prefix##_8a(z80_state *z80); INLINE void prefix##_8b(z80_state *z80); \
377   INLINE void prefix##_8c(z80_state *z80); INLINE void prefix##_8d(z80_state *z80); INLINE void prefix##_8e(z80_state *z80); INLINE void prefix##_8f(z80_state *z80); \
378   INLINE void prefix##_90(z80_state *z80); INLINE void prefix##_91(z80_state *z80); INLINE void prefix##_92(z80_state *z80); INLINE void prefix##_93(z80_state *z80); \
379   INLINE void prefix##_94(z80_state *z80); INLINE void prefix##_95(z80_state *z80); INLINE void prefix##_96(z80_state *z80); INLINE void prefix##_97(z80_state *z80); \
380   INLINE void prefix##_98(z80_state *z80); INLINE void prefix##_99(z80_state *z80); INLINE void prefix##_9a(z80_state *z80); INLINE void prefix##_9b(z80_state *z80); \
381   INLINE void prefix##_9c(z80_state *z80); INLINE void prefix##_9d(z80_state *z80); INLINE void prefix##_9e(z80_state *z80); INLINE void prefix##_9f(z80_state *z80); \
382   INLINE void prefix##_a0(z80_state *z80); INLINE void prefix##_a1(z80_state *z80); INLINE void prefix##_a2(z80_state *z80); INLINE void prefix##_a3(z80_state *z80); \
383   INLINE void prefix##_a4(z80_state *z80); INLINE void prefix##_a5(z80_state *z80); INLINE void prefix##_a6(z80_state *z80); INLINE void prefix##_a7(z80_state *z80); \
384   INLINE void prefix##_a8(z80_state *z80); INLINE void prefix##_a9(z80_state *z80); INLINE void prefix##_aa(z80_state *z80); INLINE void prefix##_ab(z80_state *z80); \
385   INLINE void prefix##_ac(z80_state *z80); INLINE void prefix##_ad(z80_state *z80); INLINE void prefix##_ae(z80_state *z80); INLINE void prefix##_af(z80_state *z80); \
386   INLINE void prefix##_b0(z80_state *z80); INLINE void prefix##_b1(z80_state *z80); INLINE void prefix##_b2(z80_state *z80); INLINE void prefix##_b3(z80_state *z80); \
387   INLINE void prefix##_b4(z80_state *z80); INLINE void prefix##_b5(z80_state *z80); INLINE void prefix##_b6(z80_state *z80); INLINE void prefix##_b7(z80_state *z80); \
388   INLINE void prefix##_b8(z80_state *z80); INLINE void prefix##_b9(z80_state *z80); INLINE void prefix##_ba(z80_state *z80); INLINE void prefix##_bb(z80_state *z80); \
389   INLINE void prefix##_bc(z80_state *z80); INLINE void prefix##_bd(z80_state *z80); INLINE void prefix##_be(z80_state *z80); INLINE void prefix##_bf(z80_state *z80); \
390   INLINE void prefix##_c0(z80_state *z80); INLINE void prefix##_c1(z80_state *z80); INLINE void prefix##_c2(z80_state *z80); INLINE void prefix##_c3(z80_state *z80); \
391   INLINE void prefix##_c4(z80_state *z80); INLINE void prefix##_c5(z80_state *z80); INLINE void prefix##_c6(z80_state *z80); INLINE void prefix##_c7(z80_state *z80); \
392   INLINE void prefix##_c8(z80_state *z80); INLINE void prefix##_c9(z80_state *z80); INLINE void prefix##_ca(z80_state *z80); INLINE void prefix##_cb(z80_state *z80); \
393   INLINE void prefix##_cc(z80_state *z80); INLINE void prefix##_cd(z80_state *z80); INLINE void prefix##_ce(z80_state *z80); INLINE void prefix##_cf(z80_state *z80); \
394   INLINE void prefix##_d0(z80_state *z80); INLINE void prefix##_d1(z80_state *z80); INLINE void prefix##_d2(z80_state *z80); INLINE void prefix##_d3(z80_state *z80); \
395   INLINE void prefix##_d4(z80_state *z80); INLINE void prefix##_d5(z80_state *z80); INLINE void prefix##_d6(z80_state *z80); INLINE void prefix##_d7(z80_state *z80); \
396   INLINE void prefix##_d8(z80_state *z80); INLINE void prefix##_d9(z80_state *z80); INLINE void prefix##_da(z80_state *z80); INLINE void prefix##_db(z80_state *z80); \
397   INLINE void prefix##_dc(z80_state *z80); INLINE void prefix##_dd(z80_state *z80); INLINE void prefix##_de(z80_state *z80); INLINE void prefix##_df(z80_state *z80); \
398   INLINE void prefix##_e0(z80_state *z80); INLINE void prefix##_e1(z80_state *z80); INLINE void prefix##_e2(z80_state *z80); INLINE void prefix##_e3(z80_state *z80); \
399   INLINE void prefix##_e4(z80_state *z80); INLINE void prefix##_e5(z80_state *z80); INLINE void prefix##_e6(z80_state *z80); INLINE void prefix##_e7(z80_state *z80); \
400   INLINE void prefix##_e8(z80_state *z80); INLINE void prefix##_e9(z80_state *z80); INLINE void prefix##_ea(z80_state *z80); INLINE void prefix##_eb(z80_state *z80); \
401   INLINE void prefix##_ec(z80_state *z80); INLINE void prefix##_ed(z80_state *z80); INLINE void prefix##_ee(z80_state *z80); INLINE void prefix##_ef(z80_state *z80); \
402   INLINE void prefix##_f0(z80_state *z80); INLINE void prefix##_f1(z80_state *z80); INLINE void prefix##_f2(z80_state *z80); INLINE void prefix##_f3(z80_state *z80); \
403   INLINE void prefix##_f4(z80_state *z80); INLINE void prefix##_f5(z80_state *z80); INLINE void prefix##_f6(z80_state *z80); INLINE void prefix##_f7(z80_state *z80); \
404   INLINE void prefix##_f8(z80_state *z80); INLINE void prefix##_f9(z80_state *z80); INLINE void prefix##_fa(z80_state *z80); INLINE void prefix##_fb(z80_state *z80); \
405   INLINE void prefix##_fc(z80_state *z80); INLINE void prefix##_fd(z80_state *z80); INLINE void prefix##_fe(z80_state *z80); INLINE void prefix##_ff(z80_state *z80); \
392406static const funcptr tablename[0x100] = {   \
393407   prefix##_00,prefix##_01,prefix##_02,prefix##_03,prefix##_04,prefix##_05,prefix##_06,prefix##_07, \
394408   prefix##_08,prefix##_09,prefix##_0a,prefix##_0b,prefix##_0c,prefix##_0d,prefix##_0e,prefix##_0f, \
r3535r3536
435449/* Burn an odd amount of cycles, that is instructions taking something      */
436450/* different from 4 T-states per opcode (and R increment)                   */
437451/****************************************************************************/
438INLINE void BURNODD(int cycles, int opcodes, int cyclesum)
452INLINE void BURNODD(z80_state *z80, int cycles, int opcodes, int cyclesum)
439453{
440454   if( cycles > 0 )
441455   {
442456      R += (cycles / cyclesum) * opcodes;
443      z80_ICount -= (cycles / cyclesum) * cyclesum;
457      z80->icount -= (cycles / cyclesum) * cyclesum;
444458   }
445459}
446460
447461/***************************************************************
448462 * define an opcode function
449463 ***************************************************************/
450#define OP(prefix,opcode)  INLINE void prefix##_##opcode(void)
464#define OP(prefix,opcode)  INLINE void prefix##_##opcode(z80_state *z80)
451465
452466/***************************************************************
453467 * adjust cycle count by n T-states
454468 ***************************************************************/
455#define CC(prefix,opcode) z80_ICount -= cc[Z80_TABLE_##prefix][opcode]
469#define CC(prefix,opcode) z80->icount -= cc[Z80_TABLE_##prefix][opcode]
456470
457471/***************************************************************
458472 * execute an opcode
459473 ***************************************************************/
460#define EXEC(prefix,opcode)                              \
474#define EXEC(z80,prefix,opcode)                           \
461475{                                                \
462476   unsigned op = opcode;                              \
463477   CC(prefix,op);                                    \
464   (*Z80##prefix[op])();                              \
478   (*Z80##prefix[op])(z80);                           \
465479}
466480
467481#if BIG_SWITCH
468#define EXEC_INLINE(prefix,opcode)                        \
482#define EXEC_INLINE(z80,prefix,opcode)                     \
469483{                                                \
470484   unsigned op = opcode;                              \
471485   CC(prefix,op);                                    \
472486   switch(op)                                       \
473487   {                                             \
474   case 0x00:prefix##_##00();break; case 0x01:prefix##_##01();break; case 0x02:prefix##_##02();break; case 0x03:prefix##_##03();break; \
475   case 0x04:prefix##_##04();break; case 0x05:prefix##_##05();break; case 0x06:prefix##_##06();break; case 0x07:prefix##_##07();break; \
476   case 0x08:prefix##_##08();break; case 0x09:prefix##_##09();break; case 0x0a:prefix##_##0a();break; case 0x0b:prefix##_##0b();break; \
477   case 0x0c:prefix##_##0c();break; case 0x0d:prefix##_##0d();break; case 0x0e:prefix##_##0e();break; case 0x0f:prefix##_##0f();break; \
478   case 0x10:prefix##_##10();break; case 0x11:prefix##_##11();break; case 0x12:prefix##_##12();break; case 0x13:prefix##_##13();break; \
479   case 0x14:prefix##_##14();break; case 0x15:prefix##_##15();break; case 0x16:prefix##_##16();break; case 0x17:prefix##_##17();break; \
480   case 0x18:prefix##_##18();break; case 0x19:prefix##_##19();break; case 0x1a:prefix##_##1a();break; case 0x1b:prefix##_##1b();break; \
481   case 0x1c:prefix##_##1c();break; case 0x1d:prefix##_##1d();break; case 0x1e:prefix##_##1e();break; case 0x1f:prefix##_##1f();break; \
482   case 0x20:prefix##_##20();break; case 0x21:prefix##_##21();break; case 0x22:prefix##_##22();break; case 0x23:prefix##_##23();break; \
483   case 0x24:prefix##_##24();break; case 0x25:prefix##_##25();break; case 0x26:prefix##_##26();break; case 0x27:prefix##_##27();break; \
484   case 0x28:prefix##_##28();break; case 0x29:prefix##_##29();break; case 0x2a:prefix##_##2a();break; case 0x2b:prefix##_##2b();break; \
485   case 0x2c:prefix##_##2c();break; case 0x2d:prefix##_##2d();break; case 0x2e:prefix##_##2e();break; case 0x2f:prefix##_##2f();break; \
486   case 0x30:prefix##_##30();break; case 0x31:prefix##_##31();break; case 0x32:prefix##_##32();break; case 0x33:prefix##_##33();break; \
487   case 0x34:prefix##_##34();break; case 0x35:prefix##_##35();break; case 0x36:prefix##_##36();break; case 0x37:prefix##_##37();break; \
488   case 0x38:prefix##_##38();break; case 0x39:prefix##_##39();break; case 0x3a:prefix##_##3a();break; case 0x3b:prefix##_##3b();break; \
489   case 0x3c:prefix##_##3c();break; case 0x3d:prefix##_##3d();break; case 0x3e:prefix##_##3e();break; case 0x3f:prefix##_##3f();break; \
490   case 0x40:prefix##_##40();break; case 0x41:prefix##_##41();break; case 0x42:prefix##_##42();break; case 0x43:prefix##_##43();break; \
491   case 0x44:prefix##_##44();break; case 0x45:prefix##_##45();break; case 0x46:prefix##_##46();break; case 0x47:prefix##_##47();break; \
492   case 0x48:prefix##_##48();break; case 0x49:prefix##_##49();break; case 0x4a:prefix##_##4a();break; case 0x4b:prefix##_##4b();break; \
493   case 0x4c:prefix##_##4c();break; case 0x4d:prefix##_##4d();break; case 0x4e:prefix##_##4e();break; case 0x4f:prefix##_##4f();break; \
494   case 0x50:prefix##_##50();break; case 0x51:prefix##_##51();break; case 0x52:prefix##_##52();break; case 0x53:prefix##_##53();break; \
495   case 0x54:prefix##_##54();break; case 0x55:prefix##_##55();break; case 0x56:prefix##_##56();break; case 0x57:prefix##_##57();break; \
496   case 0x58:prefix##_##58();break; case 0x59:prefix##_##59();break; case 0x5a:prefix##_##5a();break; case 0x5b:prefix##_##5b();break; \
497   case 0x5c:prefix##_##5c();break; case 0x5d:prefix##_##5d();break; case 0x5e:prefix##_##5e();break; case 0x5f:prefix##_##5f();break; \
498   case 0x60:prefix##_##60();break; case 0x61:prefix##_##61();break; case 0x62:prefix##_##62();break; case 0x63:prefix##_##63();break; \
499   case 0x64:prefix##_##64();break; case 0x65:prefix##_##65();break; case 0x66:prefix##_##66();break; case 0x67:prefix##_##67();break; \
500   case 0x68:prefix##_##68();break; case 0x69:prefix##_##69();break; case 0x6a:prefix##_##6a();break; case 0x6b:prefix##_##6b();break; \
501   case 0x6c:prefix##_##6c();break; case 0x6d:prefix##_##6d();break; case 0x6e:prefix##_##6e();break; case 0x6f:prefix##_##6f();break; \
502   case 0x70:prefix##_##70();break; case 0x71:prefix##_##71();break; case 0x72:prefix##_##72();break; case 0x73:prefix##_##73();break; \
503   case 0x74:prefix##_##74();break; case 0x75:prefix##_##75();break; case 0x76:prefix##_##76();break; case 0x77:prefix##_##77();break; \
504   case 0x78:prefix##_##78();break; case 0x79:prefix##_##79();break; case 0x7a:prefix##_##7a();break; case 0x7b:prefix##_##7b();break; \
505   case 0x7c:prefix##_##7c();break; case 0x7d:prefix##_##7d();break; case 0x7e:prefix##_##7e();break; case 0x7f:prefix##_##7f();break; \
506   case 0x80:prefix##_##80();break; case 0x81:prefix##_##81();break; case 0x82:prefix##_##82();break; case 0x83:prefix##_##83();break; \
507   case 0x84:prefix##_##84();break; case 0x85:prefix##_##85();break; case 0x86:prefix##_##86();break; case 0x87:prefix##_##87();break; \
508   case 0x88:prefix##_##88();break; case 0x89:prefix##_##89();break; case 0x8a:prefix##_##8a();break; case 0x8b:prefix##_##8b();break; \
509   case 0x8c:prefix##_##8c();break; case 0x8d:prefix##_##8d();break; case 0x8e:prefix##_##8e();break; case 0x8f:prefix##_##8f();break; \
510   case 0x90:prefix##_##90();break; case 0x91:prefix##_##91();break; case 0x92:prefix##_##92();break; case 0x93:prefix##_##93();break; \
511   case 0x94:prefix##_##94();break; case 0x95:prefix##_##95();break; case 0x96:prefix##_##96();break; case 0x97:prefix##_##97();break; \
512   case 0x98:prefix##_##98();break; case 0x99:prefix##_##99();break; case 0x9a:prefix##_##9a();break; case 0x9b:prefix##_##9b();break; \
513   case 0x9c:prefix##_##9c();break; case 0x9d:prefix##_##9d();break; case 0x9e:prefix##_##9e();break; case 0x9f:prefix##_##9f();break; \
514   case 0xa0:prefix##_##a0();break; case 0xa1:prefix##_##a1();break; case 0xa2:prefix##_##a2();break; case 0xa3:prefix##_##a3();break; \
515   case 0xa4:prefix##_##a4();break; case 0xa5:prefix##_##a5();break; case 0xa6:prefix##_##a6();break; case 0xa7:prefix##_##a7();break; \
516   case 0xa8:prefix##_##a8();break; case 0xa9:prefix##_##a9();break; case 0xaa:prefix##_##aa();break; case 0xab:prefix##_##ab();break; \
517   case 0xac:prefix##_##ac();break; case 0xad:prefix##_##ad();break; case 0xae:prefix##_##ae();break; case 0xaf:prefix##_##af();break; \
518   case 0xb0:prefix##_##b0();break; case 0xb1:prefix##_##b1();break; case 0xb2:prefix##_##b2();break; case 0xb3:prefix##_##b3();break; \
519   case 0xb4:prefix##_##b4();break; case 0xb5:prefix##_##b5();break; case 0xb6:prefix##_##b6();break; case 0xb7:prefix##_##b7();break; \
520   case 0xb8:prefix##_##b8();break; case 0xb9:prefix##_##b9();break; case 0xba:prefix##_##ba();break; case 0xbb:prefix##_##bb();break; \
521   case 0xbc:prefix##_##bc();break; case 0xbd:prefix##_##bd();break; case 0xbe:prefix##_##be();break; case 0xbf:prefix##_##bf();break; \
522   case 0xc0:prefix##_##c0();break; case 0xc1:prefix##_##c1();break; case 0xc2:prefix##_##c2();break; case 0xc3:prefix##_##c3();break; \
523   case 0xc4:prefix##_##c4();break; case 0xc5:prefix##_##c5();break; case 0xc6:prefix##_##c6();break; case 0xc7:prefix##_##c7();break; \
524   case 0xc8:prefix##_##c8();break; case 0xc9:prefix##_##c9();break; case 0xca:prefix##_##ca();break; case 0xcb:prefix##_##cb();break; \
525   case 0xcc:prefix##_##cc();break; case 0xcd:prefix##_##cd();break; case 0xce:prefix##_##ce();break; case 0xcf:prefix##_##cf();break; \
526   case 0xd0:prefix##_##d0();break; case 0xd1:prefix##_##d1();break; case 0xd2:prefix##_##d2();break; case 0xd3:prefix##_##d3();break; \
527   case 0xd4:prefix##_##d4();break; case 0xd5:prefix##_##d5();break; case 0xd6:prefix##_##d6();break; case 0xd7:prefix##_##d7();break; \
528   case 0xd8:prefix##_##d8();break; case 0xd9:prefix##_##d9();break; case 0xda:prefix##_##da();break; case 0xdb:prefix##_##db();break; \
529   case 0xdc:prefix##_##dc();break; case 0xdd:prefix##_##dd();break; case 0xde:prefix##_##de();break; case 0xdf:prefix##_##df();break; \
530   case 0xe0:prefix##_##e0();break; case 0xe1:prefix##_##e1();break; case 0xe2:prefix##_##e2();break; case 0xe3:prefix##_##e3();break; \
531   case 0xe4:prefix##_##e4();break; case 0xe5:prefix##_##e5();break; case 0xe6:prefix##_##e6();break; case 0xe7:prefix##_##e7();break; \
532   case 0xe8:prefix##_##e8();break; case 0xe9:prefix##_##e9();break; case 0xea:prefix##_##ea();break; case 0xeb:prefix##_##eb();break; \
533   case 0xec:prefix##_##ec();break; case 0xed:prefix##_##ed();break; case 0xee:prefix##_##ee();break; case 0xef:prefix##_##ef();break; \
534   case 0xf0:prefix##_##f0();break; case 0xf1:prefix##_##f1();break; case 0xf2:prefix##_##f2();break; case 0xf3:prefix##_##f3();break; \
535   case 0xf4:prefix##_##f4();break; case 0xf5:prefix##_##f5();break; case 0xf6:prefix##_##f6();break; case 0xf7:prefix##_##f7();break; \
536   case 0xf8:prefix##_##f8();break; case 0xf9:prefix##_##f9();break; case 0xfa:prefix##_##fa();break; case 0xfb:prefix##_##fb();break; \
537   case 0xfc:prefix##_##fc();break; case 0xfd:prefix##_##fd();break; case 0xfe:prefix##_##fe();break; case 0xff:prefix##_##ff();break; \
488   case 0x00:prefix##_##00(z80);break; case 0x01:prefix##_##01(z80);break; case 0x02:prefix##_##02(z80);break; case 0x03:prefix##_##03(z80);break; \
489   case 0x04:prefix##_##04(z80);break; case 0x05:prefix##_##05(z80);break; case 0x06:prefix##_##06(z80);break; case 0x07:prefix##_##07(z80);break; \
490   case 0x08:prefix##_##08(z80);break; case 0x09:prefix##_##09(z80);break; case 0x0a:prefix##_##0a(z80);break; case 0x0b:prefix##_##0b(z80);break; \
491   case 0x0c:prefix##_##0c(z80);break; case 0x0d:prefix##_##0d(z80);break; case 0x0e:prefix##_##0e(z80);break; case 0x0f:prefix##_##0f(z80);break; \
492   case 0x10:prefix##_##10(z80);break; case 0x11:prefix##_##11(z80);break; case 0x12:prefix##_##12(z80);break; case 0x13:prefix##_##13(z80);break; \
493   case 0x14:prefix##_##14(z80);break; case 0x15:prefix##_##15(z80);break; case 0x16:prefix##_##16(z80);break; case 0x17:prefix##_##17(z80);break; \
494   case 0x18:prefix##_##18(z80);break; case 0x19:prefix##_##19(z80);break; case 0x1a:prefix##_##1a(z80);break; case 0x1b:prefix##_##1b(z80);break; \
495   case 0x1c:prefix##_##1c(z80);break; case 0x1d:prefix##_##1d(z80);break; case 0x1e:prefix##_##1e(z80);break; case 0x1f:prefix##_##1f(z80);break; \
496   case 0x20:prefix##_##20(z80);break; case 0x21:prefix##_##21(z80);break; case 0x22:prefix##_##22(z80);break; case 0x23:prefix##_##23(z80);break; \
497   case 0x24:prefix##_##24(z80);break; case 0x25:prefix##_##25(z80);break; case 0x26:prefix##_##26(z80);break; case 0x27:prefix##_##27(z80);break; \
498   case 0x28:prefix##_##28(z80);break; case 0x29:prefix##_##29(z80);break; case 0x2a:prefix##_##2a(z80);break; case 0x2b:prefix##_##2b(z80);break; \
499   case 0x2c:prefix##_##2c(z80);break; case 0x2d:prefix##_##2d(z80);break; case 0x2e:prefix##_##2e(z80);break; case 0x2f:prefix##_##2f(z80);break; \
500   case 0x30:prefix##_##30(z80);break; case 0x31:prefix##_##31(z80);break; case 0x32:prefix##_##32(z80);break; case 0x33:prefix##_##33(z80);break; \
501   case 0x34:prefix##_##34(z80);break; case 0x35:prefix##_##35(z80);break; case 0x36:prefix##_##36(z80);break; case 0x37:prefix##_##37(z80);break; \
502   case 0x38:prefix##_##38(z80);break; case 0x39:prefix##_##39(z80);break; case 0x3a:prefix##_##3a(z80);break; case 0x3b:prefix##_##3b(z80);break; \
503   case 0x3c:prefix##_##3c(z80);break; case 0x3d:prefix##_##3d(z80);break; case 0x3e:prefix##_##3e(z80);break; case 0x3f:prefix##_##3f(z80);break; \
504   case 0x40:prefix##_##40(z80);break; case 0x41:prefix##_##41(z80);break; case 0x42:prefix##_##42(z80);break; case 0x43:prefix##_##43(z80);break; \
505   case 0x44:prefix##_##44(z80);break; case 0x45:prefix##_##45(z80);break; case 0x46:prefix##_##46(z80);break; case 0x47:prefix##_##47(z80);break; \
506   case 0x48:prefix##_##48(z80);break; case 0x49:prefix##_##49(z80);break; case 0x4a:prefix##_##4a(z80);break; case 0x4b:prefix##_##4b(z80);break; \
507   case 0x4c:prefix##_##4c(z80);break; case 0x4d:prefix##_##4d(z80);break; case 0x4e:prefix##_##4e(z80);break; case 0x4f:prefix##_##4f(z80);break; \
508   case 0x50:prefix##_##50(z80);break; case 0x51:prefix##_##51(z80);break; case 0x52:prefix##_##52(z80);break; case 0x53:prefix##_##53(z80);break; \
509   case 0x54:prefix##_##54(z80);break; case 0x55:prefix##_##55(z80);break; case 0x56:prefix##_##56(z80);break; case 0x57:prefix##_##57(z80);break; \
510   case 0x58:prefix##_##58(z80);break; case 0x59:prefix##_##59(z80);break; case 0x5a:prefix##_##5a(z80);break; case 0x5b:prefix##_##5b(z80);break; \
511   case 0x5c:prefix##_##5c(z80);break; case 0x5d:prefix##_##5d(z80);break; case 0x5e:prefix##_##5e(z80);break; case 0x5f:prefix##_##5f(z80);break; \
512   case 0x60:prefix##_##60(z80);break; case 0x61:prefix##_##61(z80);break; case 0x62:prefix##_##62(z80);break; case 0x63:prefix##_##63(z80);break; \
513   case 0x64:prefix##_##64(z80);break; case 0x65:prefix##_##65(z80);break; case 0x66:prefix##_##66(z80);break; case 0x67:prefix##_##67(z80);break; \
514   case 0x68:prefix##_##68(z80);break; case 0x69:prefix##_##69(z80);break; case 0x6a:prefix##_##6a(z80);break; case 0x6b:prefix##_##6b(z80);break; \
515   case 0x6c:prefix##_##6c(z80);break; case 0x6d:prefix##_##6d(z80);break; case 0x6e:prefix##_##6e(z80);break; case 0x6f:prefix##_##6f(z80);break; \
516   case 0x70:prefix##_##70(z80);break; case 0x71:prefix##_##71(z80);break; case 0x72:prefix##_##72(z80);break; case 0x73:prefix##_##73(z80);break; \
517   case 0x74:prefix##_##74(z80);break; case 0x75:prefix##_##75(z80);break; case 0x76:prefix##_##76(z80);break; case 0x77:prefix##_##77(z80);break; \
518   case 0x78:prefix##_##78(z80);break; case 0x79:prefix##_##79(z80);break; case 0x7a:prefix##_##7a(z80);break; case 0x7b:prefix##_##7b(z80);break; \
519   case 0x7c:prefix##_##7c(z80);break; case 0x7d:prefix##_##7d(z80);break; case 0x7e:prefix##_##7e(z80);break; case 0x7f:prefix##_##7f(z80);break; \
520   case 0x80:prefix##_##80(z80);break; case 0x81:prefix##_##81(z80);break; case 0x82:prefix##_##82(z80);break; case 0x83:prefix##_##83(z80);break; \
521   case 0x84:prefix##_##84(z80);break; case 0x85:prefix##_##85(z80);break; case 0x86:prefix##_##86(z80);break; case 0x87:prefix##_##87(z80);break; \
522   case 0x88:prefix##_##88(z80);break; case 0x89:prefix##_##89(z80);break; case 0x8a:prefix##_##8a(z80);break; case 0x8b:prefix##_##8b(z80);break; \
523   case 0x8c:prefix##_##8c(z80);break; case 0x8d:prefix##_##8d(z80);break; case 0x8e:prefix##_##8e(z80);break; case 0x8f:prefix##_##8f(z80);break; \
524   case 0x90:prefix##_##90(z80);break; case 0x91:prefix##_##91(z80);break; case 0x92:prefix##_##92(z80);break; case 0x93:prefix##_##93(z80);break; \
525   case 0x94:prefix##_##94(z80);break; case 0x95:prefix##_##95(z80);break; case 0x96:prefix##_##96(z80);break; case 0x97:prefix##_##97(z80);break; \
526   case 0x98:prefix##_##98(z80);break; case 0x99:prefix##_##99(z80);break; case 0x9a:prefix##_##9a(z80);break; case 0x9b:prefix##_##9b(z80);break; \
527   case 0x9c:prefix##_##9c(z80);break; case 0x9d:prefix##_##9d(z80);break; case 0x9e:prefix##_##9e(z80);break; case 0x9f:prefix##_##9f(z80);break; \
528   case 0xa0:prefix##_##a0(z80);break; case 0xa1:prefix##_##a1(z80);break; case 0xa2:prefix##_##a2(z80);break; case 0xa3:prefix##_##a3(z80);break; \
529   case 0xa4:prefix##_##a4(z80);break; case 0xa5:prefix##_##a5(z80);break; case 0xa6:prefix##_##a6(z80);break; case 0xa7:prefix##_##a7(z80);break; \
530   case 0xa8:prefix##_##a8(z80);break; case 0xa9:prefix##_##a9(z80);break; case 0xaa:prefix##_##aa(z80);break; case 0xab:prefix##_##ab(z80);break; \
531   case 0xac:prefix##_##ac(z80);break; case 0xad:prefix##_##ad(z80);break; case 0xae:prefix##_##ae(z80);break; case 0xaf:prefix##_##af(z80);break; \
532   case 0xb0:prefix##_##b0(z80);break; case 0xb1:prefix##_##b1(z80);break; case 0xb2:prefix##_##b2(z80);break; case 0xb3:prefix##_##b3(z80);break; \
533   case 0xb4:prefix##_##b4(z80);break; case 0xb5:prefix##_##b5(z80);break; case 0xb6:prefix##_##b6(z80);break; case 0xb7:prefix##_##b7(z80);break; \
534   case 0xb8:prefix##_##b8(z80);break; case 0xb9:prefix##_##b9(z80);break; case 0xba:prefix##_##ba(z80);break; case 0xbb:prefix##_##bb(z80);break; \
535   case 0xbc:prefix##_##bc(z80);break; case 0xbd:prefix##_##bd(z80);break; case 0xbe:prefix##_##be(z80);break; case 0xbf:prefix##_##bf(z80);break; \
536   case 0xc0:prefix##_##c0(z80);break; case 0xc1:prefix##_##c1(z80);break; case 0xc2:prefix##_##c2(z80);break; case 0xc3:prefix##_##c3(z80);break; \
537   case 0xc4:prefix##_##c4(z80);break; case 0xc5:prefix##_##c5(z80);break; case 0xc6:prefix##_##c6(z80);break; case 0xc7:prefix##_##c7(z80);break; \
538   case 0xc8:prefix##_##c8(z80);break; case 0xc9:prefix##_##c9(z80);break; case 0xca:prefix##_##ca(z80);break; case 0xcb:prefix##_##cb(z80);break; \
539   case 0xcc:prefix##_##cc(z80);break; case 0xcd:prefix##_##cd(z80);break; case 0xce:prefix##_##ce(z80);break; case 0xcf:prefix##_##cf(z80);break; \
540   case 0xd0:prefix##_##d0(z80);break; case 0xd1:prefix##_##d1(z80);break; case 0xd2:prefix##_##d2(z80);break; case 0xd3:prefix##_##d3(z80);break; \
541   case 0xd4:prefix##_##d4(z80);break; case 0xd5:prefix##_##d5(z80);break; case 0xd6:prefix##_##d6(z80);break; case 0xd7:prefix##_##d7(z80);break; \
542   case 0xd8:prefix##_##d8(z80);break; case 0xd9:prefix##_##d9(z80);break; case 0xda:prefix##_##da(z80);break; case 0xdb:prefix##_##db(z80);break; \
543   case 0xdc:prefix##_##dc(z80);break; case 0xdd:prefix##_##dd(z80);break; case 0xde:prefix##_##de(z80);break; case 0xdf:prefix##_##df(z80);break; \
544   case 0xe0:prefix##_##e0(z80);break; case 0xe1:prefix##_##e1(z80);break; case 0xe2:prefix##_##e2(z80);break; case 0xe3:prefix##_##e3(z80);break; \
545   case 0xe4:prefix##_##e4(z80);break; case 0xe5:prefix##_##e5(z80);break; case 0xe6:prefix##_##e6(z80);break; case 0xe7:prefix##_##e7(z80);break; \
546   case 0xe8:prefix##_##e8(z80);break; case 0xe9:prefix##_##e9(z80);break; case 0xea:prefix##_##ea(z80);break; case 0xeb:prefix##_##eb(z80);break; \
547   case 0xec:prefix##_##ec(z80);break; case 0xed:prefix##_##ed(z80);break; case 0xee:prefix##_##ee(z80);break; case 0xef:prefix##_##ef(z80);break; \
548   case 0xf0:prefix##_##f0(z80);break; case 0xf1:prefix##_##f1(z80);break; case 0xf2:prefix##_##f2(z80);break; case 0xf3:prefix##_##f3(z80);break; \
549   case 0xf4:prefix##_##f4(z80);break; case 0xf5:prefix##_##f5(z80);break; case 0xf6:prefix##_##f6(z80);break; case 0xf7:prefix##_##f7(z80);break; \
550   case 0xf8:prefix##_##f8(z80);break; case 0xf9:prefix##_##f9(z80);break; case 0xfa:prefix##_##fa(z80);break; case 0xfb:prefix##_##fb(z80);break; \
551   case 0xfc:prefix##_##fc(z80);break; case 0xfd:prefix##_##fd(z80);break; case 0xfe:prefix##_##fe(z80);break; case 0xff:prefix##_##ff(z80);break; \
538552   }                                                                                                   \
539553}
540554#else
r3535r3536
548562#define ENTER_HALT {                                 \
549563   PC--;                                          \
550564   HALT = 1;                                       \
551   if( Z80.irq_state == CLEAR_LINE )                     \
552      z80_burn( z80_ICount );                           \
565   if( z80->irq_state == CLEAR_LINE )                     \
566      CPU_BURN_NAME(z80)( z80->device, z80->icount );         \
553567}
554568
555569/***************************************************************
r3535r3536
606620 * reading opcodes. In case of system with memory mapped I/O,
607621 * this function can be used to greatly speed up emulation
608622 ***************************************************************/
609INLINE UINT8 ROP(void)
623INLINE UINT8 ROP(z80_state *z80)
610624{
611625   unsigned pc = PCD;
612626   PC++;
r3535r3536
614628}
615629
616630/****************************************************************
617 * ARG() is identical to ROP() except it is used
631 * ARG(z80) is identical to ROP() except it is used
618632 * for reading opcode arguments. This difference can be used to
619633 * support systems that use different encoding mechanisms for
620634 * opcodes and opcode arguments
621635 ***************************************************************/
622INLINE UINT8 ARG(void)
636INLINE UINT8 ARG(z80_state *z80)
623637{
624638   unsigned pc = PCD;
625639   PC++;
626640   return cpu_readop_arg(pc);
627641}
628642
629INLINE UINT32 ARG16(void)
643INLINE UINT32 ARG16(z80_state *z80)
630644{
631645   unsigned pc = PCD;
632646   PC += 2;
r3535r3536
637651 * Calculate the effective address EA of an opcode using
638652 * IX+offset resp. IY+offset addressing.
639653 ***************************************************************/
640#define EAX EA = (UINT32)(UINT16)(IX + (INT8)ARG())
641#define EAY EA = (UINT32)(UINT16)(IY + (INT8)ARG())
654#define EAX EA = (UINT32)(UINT16)(IX + (INT8)ARG(z80)); MEMPTR = EA
655#define EAY EA = (UINT32)(UINT16)(IY + (INT8)ARG(z80)); MEMPTR = EA
642656
643657/***************************************************************
644658 * POP
645659 ***************************************************************/
646#define POP(DR) do { RM16( SPD, &Z80.DR ); SP += 2; } while (0)
660#define POP(DR) do { RM16( SPD, &z80->DR ); SP += 2; } while (0)
647661
648662/***************************************************************
649663 * PUSH
650664 ***************************************************************/
651#define PUSH(SR) do { SP -= 2; WM16( SPD, &Z80.SR ); } while (0)
665#define PUSH(SR) do { SP -= 2; WM16( SPD, &z80->SR ); } while (0)
652666
653667/***************************************************************
654668 * JP
r3535r3536
656670#if BUSY_LOOP_HACKS
657671#define JP {                                       \
658672   unsigned oldpc = PCD-1;                              \
659   PCD = ARG16();                                    \
673   PCD = ARG16(z80);                                 \
674   MEMPTR = PCD;                                    \
660675   change_pc(PCD);                                    \
661676   /* speed up busy loop */                           \
662677   if( PCD == oldpc )                                 \
663678   {                                             \
664      if( Z80.irq_state == CLEAR_LINE )                  \
665         BURNODD( z80_ICount, 1, cc[Z80_TABLE_op][0xc3] );   \
679      if( z80->irq_state == CLEAR_LINE )                  \
680         BURNODD( z80, z80->icount, 1, cc[Z80_TABLE_op][0xc3] );   \
666681   }                                             \
667682   else                                          \
668683   {                                             \
r3535r3536
672687         /* NOP - JP $-1 or EI - JP $-1 */               \
673688         if ( op == 0x00 || op == 0xfb )                  \
674689         {                                       \
675            if( Z80.irq_state == CLEAR_LINE )            \
676               BURNODD( z80_ICount-cc[Z80_TABLE_op][0x00], \
690            if( z80->irq_state == CLEAR_LINE )            \
691               BURNODD( z80, z80->icount-cc[Z80_TABLE_op][0x00], \
677692                  2, cc[Z80_TABLE_op][0x00]+cc[Z80_TABLE_op][0xc3]); \
678693         }                                       \
679694      }                                          \
r3535r3536
681696      /* LD SP,#xxxx - JP $-3 (Galaga) */                  \
682697      if( PCD == oldpc-3 && op == 0x31 )                  \
683698      {                                          \
684         if( Z80.irq_state == CLEAR_LINE )               \
685            BURNODD( z80_ICount-cc[Z80_TABLE_op][0x31],      \
699         if( z80->irq_state == CLEAR_LINE )               \
700            BURNODD( z80, z80->icount-cc[Z80_TABLE_op][0x31],\
686701               2, cc[Z80_TABLE_op][0x31]+cc[Z80_TABLE_op][0xc3]); \
687702      }                                          \
688703   }                                             \
689704}
690705#else
691706#define JP {                                       \
692   PCD = ARG16();                                    \
707   PCD = ARG16(z80);                                 \
708   MEMPTR = PCD;                                    \
693709   change_pc(PCD);                                    \
694710}
695711#endif
r3535r3536
701717#define JP_COND(cond)                                 \
702718   if( cond )                                       \
703719   {                                             \
704      PCD = ARG16();                                 \
720      PCD = ARG16(z80);                              \
721      MEMPTR = PCD;                                 \
705722      change_pc(PCD);                                 \
706723   }                                             \
707724   else                                          \
708725   {                                             \
709      PC += 2;                                    \
726      MEMPTR = ARG16(z80); /* implicit do PC += 2 */         \
710727   }
711728
712729/***************************************************************
r3535r3536
715732#define JR()                                       \
716733{                                                \
717734   unsigned oldpc = PCD-1;                              \
718   INT8 arg = (INT8)ARG(); /* ARG() also increments PC */      \
735   INT8 arg = (INT8)ARG(z80); /* ARG() also increments PC */   \
719736   PC += arg;            /* so don't do PC += ARG() */      \
737   MEMPTR = PC;                                    \
720738   change_pc(PCD);                                    \
721739   /* speed up busy loop */                           \
722740   if( PCD == oldpc )                                 \
723741   {                                             \
724      if( Z80.irq_state == CLEAR_LINE )                  \
725         BURNODD( z80_ICount, 1, cc[Z80_TABLE_op][0x18] );   \
742      if( z80->irq_state == CLEAR_LINE )                  \
743         BURNODD( z80, z80->icount, 1, cc[Z80_TABLE_op][0x18] );   \
726744   }                                             \
727745   else                                          \
728746   {                                             \
r3535r3536
732750         /* NOP - JR $-1 or EI - JR $-1 */               \
733751         if ( op == 0x00 || op == 0xfb )                  \
734752         {                                       \
735            if( Z80.irq_state == CLEAR_LINE )            \
736               BURNODD( z80_ICount-cc[Z80_TABLE_op][0x00],   \
753            if( z80->irq_state == CLEAR_LINE )            \
754               BURNODD( z80, z80->icount-cc[Z80_TABLE_op][0x00],   \
737755                  2, cc[Z80_TABLE_op][0x00]+cc[Z80_TABLE_op][0x18]); \
738756         }                                       \
739757      }                                          \
r3535r3536
741759      /* LD SP,#xxxx - JR $-3 */                        \
742760      if( PCD == oldpc-3 && op == 0x31 )                  \
743761      {                                          \
744         if( Z80.irq_state == CLEAR_LINE )               \
745            BURNODD( z80_ICount-cc[Z80_TABLE_op][0x31],      \
762         if( z80->irq_state == CLEAR_LINE )               \
763            BURNODD( z80, z80->icount-cc[Z80_TABLE_op][0x31],   \
746764               2, cc[Z80_TABLE_op][0x31]+cc[Z80_TABLE_op][0x18]); \
747765      }                                          \
748766   }                                             \
r3535r3536
754772#define JR_COND(cond,opcode)                           \
755773   if( cond )                                       \
756774   {                                             \
757      INT8 arg = (INT8)ARG(); /* ARG() also increments PC */   \
775      INT8 arg = (INT8)ARG(z80); /* ARG() also increments PC */\
758776      PC += arg;            /* so don't do PC += ARG() */   \
777      MEMPTR=PC;                                    \
759778      CC(ex,opcode);                                 \
760779      change_pc(PCD);                                 \
761780   }                                             \
r3535r3536
765784 * CALL
766785 ***************************************************************/
767786#define CALL()                                       \
768   EA = ARG16();                                    \
787   EA = ARG16(z80);                                 \
788   MEMPTR = EA;                                    \
769789   PUSH( pc );                                       \
770790   PCD = EA;                                       \
771791   change_pc(PCD)
r3535r3536
776796#define CALL_COND(cond,opcode)                           \
777797   if( cond )                                       \
778798   {                                             \
779      EA = ARG16();                                 \
799      EA = ARG16(z80);                              \
800      MEMPTR = EA;                                 \
780801      PUSH( pc );                                    \
781802      PCD = EA;                                    \
782803      CC(ex,opcode);                                 \
r3535r3536
784805   }                                             \
785806   else                                          \
786807   {                                             \
787      PC+=2;                                       \
808      MEMPTR = ARG16(z80);  /* implicit call PC+=2;   */      \
788809   }
789810
790811/***************************************************************
r3535r3536
794815   if( cond )                                       \
795816   {                                             \
796817      POP( pc );                                    \
818      MEMPTR = PC;                                 \
797819      change_pc(PCD);                                 \
798820      CC(ex,opcode);                                 \
799821   }
r3535r3536
804826#define RETN   {                                    \
805827   LOG(("Z80 #%d RETN IFF1:%d IFF2:%d\n", cpu_getactivecpu(), IFF1, IFF2)); \
806828   POP( pc );                                       \
829   MEMPTR = PC;                                    \
807830   change_pc(PCD);                                    \
808831   IFF1 = IFF2;                                    \
809832}
r3535r3536
813836 ***************************************************************/
814837#define RETI   {                                    \
815838   POP( pc );                                       \
839   MEMPTR = PC;                                    \
816840   change_pc(PCD);                                    \
817841/* according to http://www.msxnet.org/tech/z80-documented.pdf */\
818842   IFF1 = IFF2;                                    \
819   if (Z80.daisy)                                    \
820      z80daisy_call_reti_device(Z80.daisy);               \
843   if (z80->daisy)                                    \
844      z80daisy_call_reti_device(z80->daisy);               \
821845}
822846
823847/***************************************************************
r3535r3536
857881#define RST(addr)                                    \
858882   PUSH( pc );                                       \
859883   PCD = addr;                                       \
860   change_pc(PCD)
884   MEMPTR = PC;                                    \
885   change_pc(PCD);
861886
862887/***************************************************************
863888 * INC  r8
864889 ***************************************************************/
865INLINE UINT8 INC(UINT8 value)
890INLINE UINT8 INC(z80_state *z80, UINT8 value)
866891{
867892   UINT8 res = value + 1;
868893   F = (F & CF) | SZHV_inc[res];
r3535r3536
872897/***************************************************************
873898 * DEC  r8
874899 ***************************************************************/
875INLINE UINT8 DEC(UINT8 value)
900INLINE UINT8 DEC(z80_state *z80, UINT8 value)
876901{
877902   UINT8 res = value - 1;
878903   F = (F & CF) | SZHV_dec[res];
r3535r3536
919944 ***************************************************************/
920945#define RRD {                                       \
921946   UINT8 n = RM(HL);                                 \
947   MEMPTR = HL+1;                                    \
922948   WM( HL, (n >> 4) | (A << 4) );                        \
923949   A = (A & 0xf0) | (n & 0x0f);                        \
924950   F = (F & CF) | SZP[A];                              \
r3535r3536
929955 ***************************************************************/
930956#define RLD {                                       \
931957   UINT8 n = RM(HL);                                 \
958   MEMPTR = HL+1;                                    \
932959   WM( HL, (n << 4) | (A & 0x0f) );                     \
933960   A = (A & 0xf0) | (n >> 4);                           \
934961   F = (F & CF) | SZP[A];                              \
r3535r3536
11261153 ***************************************************************/
11271154#define EX_AF {                                       \
11281155   PAIR tmp;                                       \
1129   tmp = Z80.af; Z80.af = Z80.af2; Z80.af2 = tmp;            \
1156   tmp = z80->af; z80->af = z80->af2; z80->af2 = tmp;         \
11301157}
11311158
11321159/***************************************************************
r3535r3536
11341161 ***************************************************************/
11351162#define EX_DE_HL {                                    \
11361163   PAIR tmp;                                       \
1137   tmp = Z80.de; Z80.de = Z80.hl; Z80.hl = tmp;            \
1164   tmp = z80->de; z80->de = z80->hl; z80->hl = tmp;         \
11381165}
11391166
11401167/***************************************************************
r3535r3536
11421169 ***************************************************************/
11431170#define EXX {                                       \
11441171   PAIR tmp;                                       \
1145   tmp = Z80.bc; Z80.bc = Z80.bc2; Z80.bc2 = tmp;            \
1146   tmp = Z80.de; Z80.de = Z80.de2; Z80.de2 = tmp;            \
1147   tmp = Z80.hl; Z80.hl = Z80.hl2; Z80.hl2 = tmp;            \
1172   tmp = z80->bc; z80->bc = z80->bc2; z80->bc2 = tmp;         \
1173   tmp = z80->de; z80->de = z80->de2; z80->de2 = tmp;         \
1174   tmp = z80->hl; z80->hl = z80->hl2; z80->hl2 = tmp;         \
11481175}
11491176
11501177/***************************************************************
r3535r3536
11541181{                                                \
11551182   PAIR tmp = { { 0, 0, 0, 0 } };                        \
11561183   RM16( SPD, &tmp );                                 \
1157   WM16( SPD, &Z80.DR );                              \
1158   Z80.DR = tmp;                                    \
1184   WM16( SPD, &z80->DR );                              \
1185   z80->DR = tmp;                                    \
1186   MEMPTR = z80->DR.d;                                 \
11591187}
11601188
11611189
r3535r3536
11641192 ***************************************************************/
11651193#define ADD16(DR,SR)                                 \
11661194{                                                \
1167   UINT32 res = Z80.DR.d + Z80.SR.d;                     \
1195   UINT32 res = z80->DR.d + z80->SR.d;                     \
1196   MEMPTR = z80->DR.d + 1;                              \
11681197   F = (F & (SF | ZF | VF)) |                           \
1169      (((Z80.DR.d ^ res ^ Z80.SR.d) >> 8) & HF) |            \
1198      (((z80->DR.d ^ res ^ z80->SR.d) >> 8) & HF) |         \
11701199      ((res >> 16) & CF) | ((res >> 8) & (YF | XF));         \
1171   Z80.DR.w.l = (UINT16)res;                           \
1200   z80->DR.w.l = (UINT16)res;                           \
11721201}
11731202
11741203/***************************************************************
r3535r3536
11761205 ***************************************************************/
11771206#define ADC16(Reg)                                    \
11781207{                                                \
1179   UINT32 res = HLD + Z80.Reg.d + (F & CF);               \
1180   F = (((HLD ^ res ^ Z80.Reg.d) >> 8) & HF) |               \
1208   UINT32 res = HLD + z80->Reg.d + (F & CF);               \
1209   MEMPTR = HL + 1;                                 \
1210   F = (((HLD ^ res ^ z80->Reg.d) >> 8) & HF) |            \
11811211      ((res >> 16) & CF) |                           \
11821212      ((res >> 8) & (SF | YF | XF)) |                     \
11831213      ((res & 0xffff) ? 0 : ZF) |                        \
1184      (((Z80.Reg.d ^ HLD ^ 0x8000) & (Z80.Reg.d ^ res) & 0x8000) >> 13); \
1214      (((z80->Reg.d ^ HLD ^ 0x8000) & (z80->Reg.d ^ res) & 0x8000) >> 13); \
11851215   HL = (UINT16)res;                                 \
11861216}
11871217
r3535r3536
11901220 ***************************************************************/
11911221#define SBC16(Reg)                                    \
11921222{                                                \
1193   UINT32 res = HLD - Z80.Reg.d - (F & CF);               \
1194   F = (((HLD ^ res ^ Z80.Reg.d) >> 8) & HF) | NF |         \
1223   UINT32 res = HLD - z80->Reg.d - (F & CF);               \
1224   MEMPTR = HL + 1;                                 \
1225   F = (((HLD ^ res ^ z80->Reg.d) >> 8) & HF) | NF |         \
11951226      ((res >> 16) & CF) |                           \
11961227      ((res >> 8) & (SF | YF | XF)) |                     \
11971228      ((res & 0xffff) ? 0 : ZF) |                        \
1198      (((Z80.Reg.d ^ HLD) & (HLD ^ res) &0x8000) >> 13);      \
1229      (((z80->Reg.d ^ HLD) & (HLD ^ res) &0x8000) >> 13);      \
11991230   HL = (UINT16)res;                                 \
12001231}
12011232
12021233/***************************************************************
12031234 * RLC  r8
12041235 ***************************************************************/
1205INLINE UINT8 RLC(UINT8 value)
1236INLINE UINT8 RLC(z80_state *z80, UINT8 value)
12061237{
12071238   unsigned res = value;
12081239   unsigned c = (res & 0x80) ? CF : 0;
r3535r3536
12141245/***************************************************************
12151246 * RRC  r8
12161247 ***************************************************************/
1217INLINE UINT8 RRC(UINT8 value)
1248INLINE UINT8 RRC(z80_state *z80, UINT8 value)
12181249{
12191250   unsigned res = value;
12201251   unsigned c = (res & 0x01) ? CF : 0;
r3535r3536
12261257/***************************************************************
12271258 * RL   r8
12281259 ***************************************************************/
1229INLINE UINT8 RL(UINT8 value)
1260INLINE UINT8 RL(z80_state *z80, UINT8 value)
12301261{
12311262   unsigned res = value;
12321263   unsigned c = (res & 0x80) ? CF : 0;
r3535r3536
12381269/***************************************************************
12391270 * RR   r8
12401271 ***************************************************************/
1241INLINE UINT8 RR(UINT8 value)
1272INLINE UINT8 RR(z80_state *z80, UINT8 value)
12421273{
12431274   unsigned res = value;
12441275   unsigned c = (res & 0x01) ? CF : 0;
r3535r3536
12501281/***************************************************************
12511282 * SLA  r8
12521283 ***************************************************************/
1253INLINE UINT8 SLA(UINT8 value)
1284INLINE UINT8 SLA(z80_state *z80, UINT8 value)
12541285{
12551286   unsigned res = value;
12561287   unsigned c = (res & 0x80) ? CF : 0;
r3535r3536
12621293/***************************************************************
12631294 * SRA  r8
12641295 ***************************************************************/
1265INLINE UINT8 SRA(UINT8 value)
1296INLINE UINT8 SRA(z80_state *z80, UINT8 value)
12661297{
12671298   unsigned res = value;
12681299   unsigned c = (res & 0x01) ? CF : 0;
r3535r3536
12741305/***************************************************************
12751306 * SLL  r8
12761307 ***************************************************************/
1277INLINE UINT8 SLL(UINT8 value)
1308INLINE UINT8 SLL(z80_state *z80, UINT8 value)
12781309{
12791310   unsigned res = value;
12801311   unsigned c = (res & 0x80) ? CF : 0;
r3535r3536
12861317/***************************************************************
12871318 * SRL  r8
12881319 ***************************************************************/
1289INLINE UINT8 SRL(UINT8 value)
1320INLINE UINT8 SRL(z80_state *z80, UINT8 value)
12901321{
12911322   unsigned res = value;
12921323   unsigned c = (res & 0x01) ? CF : 0;
r3535r3536
13031334   F = (F & CF) | HF | SZ_BIT[reg & (1<<bit)]
13041335
13051336/***************************************************************
1337 * BIT  bit,(HL)
1338 ***************************************************************/
1339#define BIT_HL(bit,reg)                                 \
1340   F = (F & CF) | HF | (SZ_BIT[reg & (1<<bit)] & ~(YF|XF)) | (MEMPTR_H & (YF|XF))
1341
1342/***************************************************************
13061343 * BIT  bit,(IX/Y+o)
13071344 ***************************************************************/
13081345
r3535r3536
13441381#define CPI {                                       \
13451382   UINT8 val = RM(HL);                                 \
13461383   UINT8 res = A - val;                              \
1384   MEMPTR++;                                       \
13471385   HL++; BC--;                                       \
13481386   F = (F & CF) | (SZ[res]&~(YF|XF)) | ((A^val^res)&HF) | NF;   \
13491387   if( F & HF ) res -= 1;                              \
r3535r3536
13581396#define INI {                                       \
13591397   unsigned t;                                       \
13601398   UINT8 io = IN(BC);                                 \
1399   MEMPTR = BC + 1;                                 \
13611400   B--;                                          \
13621401   WM( HL, io );                                    \
13631402   HL++;                                          \
r3535r3536
13751414   unsigned t;                                       \
13761415   UINT8 io = RM(HL);                                 \
13771416   B--;                                          \
1417   MEMPTR = BC + 1;                                 \
13781418   OUT( BC, io );                                    \
13791419   HL++;                                          \
13801420   F = SZ[B];                                       \
r3535r3536
14031443#define CPD {                                       \
14041444   UINT8 val = RM(HL);                                 \
14051445   UINT8 res = A - val;                              \
1446   MEMPTR--;                                       \
14061447   HL--; BC--;                                       \
14071448   F = (F & CF) | (SZ[res]&~(YF|XF)) | ((A^val^res)&HF) | NF;   \
14081449   if( F & HF ) res -= 1;                              \
r3535r3536
14171458#define IND {                                       \
14181459   unsigned t;                                       \
14191460   UINT8 io = IN(BC);                                 \
1461   MEMPTR = BC - 1;                                 \
14201462   B--;                                          \
14211463   WM( HL, io );                                    \
14221464   HL--;                                          \
r3535r3536
14341476   unsigned t;                                       \
14351477   UINT8 io = RM(HL);                                 \
14361478   B--;                                          \
1479   MEMPTR = BC - 1;                                 \
14371480   OUT( BC, io );                                    \
14381481   HL--;                                          \
14391482   F = SZ[B];                                       \
r3535r3536
14511494   if( BC )                                       \
14521495   {                                             \
14531496      PC -= 2;                                    \
1497      MEMPTR = PC + 1;                              \
14541498      CC(ex,0xb0);                                 \
14551499   }
14561500
r3535r3536
14621506   if( BC && !(F & ZF) )                              \
14631507   {                                             \
14641508      PC -= 2;                                    \
1509      MEMPTR = PC + 1;                              \
14651510      CC(ex,0xb1);                                 \
14661511   }
14671512
r3535r3536
14951540   if( BC )                                       \
14961541   {                                             \
14971542      PC -= 2;                                    \
1543      MEMPTR = PC + 1;                              \
14981544      CC(ex,0xb8);                                 \
14991545   }
15001546
r3535r3536
15061552   if( BC && !(F & ZF) )                              \
15071553   {                                             \
15081554      PC -= 2;                                    \
1555      MEMPTR = PC + 1;                              \
15091556      CC(ex,0xb9);                                 \
15101557   }
15111558
r3535r3536
15361583 ***************************************************************/
15371584#define EI {                                       \
15381585   IFF1 = IFF2 = 1;                                 \
1539   Z80.after_ei = TRUE;                              \
1586   z80->after_ei = TRUE;                              \
15401587}
15411588
15421589/**********************************************************
15431590 * opcodes with CB prefix
15441591 * rotate, shift and bit operations
15451592 **********************************************************/
1546OP(cb,00) { B = RLC(B);                                 } /* RLC  B           */
1547OP(cb,01) { C = RLC(C);                                 } /* RLC  C           */
1548OP(cb,02) { D = RLC(D);                                 } /* RLC  D           */
1549OP(cb,03) { E = RLC(E);                                 } /* RLC  E           */
1550OP(cb,04) { H = RLC(H);                                 } /* RLC  H           */
1551OP(cb,05) { L = RLC(L);                                 } /* RLC  L           */
1552OP(cb,06) { WM( HL, RLC(RM(HL)) );                        } /* RLC  (HL)        */
1553OP(cb,07) { A = RLC(A);                                 } /* RLC  A           */
1593OP(cb,00) { B = RLC(z80, B);                              } /* RLC  B           */
1594OP(cb,01) { C = RLC(z80, C);                              } /* RLC  C           */
1595OP(cb,02) { D = RLC(z80, D);                              } /* RLC  D           */
1596OP(cb,03) { E = RLC(z80, E);                              } /* RLC  E           */
1597OP(cb,04) { H = RLC(z80, H);                              } /* RLC  H           */
1598OP(cb,05) { L = RLC(z80, L);                              } /* RLC  L           */
1599OP(cb,06) { WM( HL, RLC(z80, RM(HL)) );                        } /* RLC  (HL)        */
1600OP(cb,07) { A = RLC(z80, A);                              } /* RLC  A           */
15541601
1555OP(cb,08) { B = RRC(B);                                 } /* RRC  B           */
1556OP(cb,09) { C = RRC(C);                                 } /* RRC  C           */
1557OP(cb,0a) { D = RRC(D);                                 } /* RRC  D           */
1558OP(cb,0b) { E = RRC(E);                                 } /* RRC  E           */
1559OP(cb,0c) { H = RRC(H);                                 } /* RRC  H           */
1560OP(cb,0d) { L = RRC(L);                                 } /* RRC  L           */
1561OP(cb,0e) { WM( HL, RRC(RM(HL)) );                        } /* RRC  (HL)        */
1562OP(cb,0f) { A = RRC(A);                                 } /* RRC  A           */
1602OP(cb,08) { B = RRC(z80, B);                              } /* RRC  B           */
1603OP(cb,09) { C = RRC(z80, C);                              } /* RRC  C           */
1604OP(cb,0a) { D = RRC(z80, D);                              } /* RRC  D           */
1605OP(cb,0b) { E = RRC(z80, E);                              } /* RRC  E           */
1606OP(cb,0c) { H = RRC(z80, H);                              } /* RRC  H           */
1607OP(cb,0d) { L = RRC(z80, L);                              } /* RRC  L           */
1608OP(cb,0e) { WM( HL, RRC(z80, RM(HL)) );                        } /* RRC  (HL)        */
1609OP(cb,0f) { A = RRC(z80, A);                              } /* RRC  A           */
15631610
1564OP(cb,10) { B = RL(B);                                 } /* RL   B           */
1565OP(cb,11) { C = RL(C);                                 } /* RL   C           */
1566OP(cb,12) { D = RL(D);                                 } /* RL   D           */
1567OP(cb,13) { E = RL(E);                                 } /* RL   E           */
1568OP(cb,14) { H = RL(H);                                 } /* RL   H           */
1569OP(cb,15) { L = RL(L);                                 } /* RL   L           */
1570OP(cb,16) { WM( HL, RL(RM(HL)) );                        } /* RL   (HL)        */
1571OP(cb,17) { A = RL(A);                                 } /* RL   A           */
1611OP(cb,10) { B = RL(z80, B);                                 } /* RL   B           */
1612OP(cb,11) { C = RL(z80, C);                                 } /* RL   C           */
1613OP(cb,12) { D = RL(z80, D);                                 } /* RL   D           */
1614OP(cb,13) { E = RL(z80, E);                                 } /* RL   E           */
1615OP(cb,14) { H = RL(z80, H);                                 } /* RL   H           */
1616OP(cb,15) { L = RL(z80, L);                                 } /* RL   L           */
1617OP(cb,16) { WM( HL, RL(z80, RM(HL)) );                        } /* RL   (HL)        */
1618OP(cb,17) { A = RL(z80, A);                                 } /* RL   A           */
15721619
1573OP(cb,18) { B = RR(B);                                 } /* RR   B           */
1574OP(cb,19) { C = RR(C);                                 } /* RR   C           */
1575OP(cb,1a) { D = RR(D);                                 } /* RR   D           */
1576OP(cb,1b) { E = RR(E);                                 } /* RR   E           */
1577OP(cb,1c) { H = RR(H);                                 } /* RR   H           */
1578OP(cb,1d) { L = RR(L);                                 } /* RR   L           */
1579OP(cb,1e) { WM( HL, RR(RM(HL)) );                        } /* RR   (HL)        */
1580OP(cb,1f) { A = RR(A);                                 } /* RR   A           */
1620OP(cb,18) { B = RR(z80, B);                                 } /* RR   B           */
1621OP(cb,19) { C = RR(z80, C);                                 } /* RR   C           */
1622OP(cb,1a) { D = RR(z80, D);                                 } /* RR   D           */
1623OP(cb,1b) { E = RR(z80, E);                                 } /* RR   E           */
1624OP(cb,1c) { H = RR(z80, H);                                 } /* RR   H           */
1625OP(cb,1d) { L = RR(z80, L);                                 } /* RR   L           */
1626OP(cb,1e) { WM( HL, RR(z80, RM(HL)) );                        } /* RR   (HL)        */
1627OP(cb,1f) { A = RR(z80, A);                                 } /* RR   A           */
15811628
1582OP(cb,20) { B = SLA(B);                                 } /* SLA  B           */
1583OP(cb,21) { C = SLA(C);                                 } /* SLA  C           */
1584OP(cb,22) { D = SLA(D);                                 } /* SLA  D           */
1585OP(cb,23) { E = SLA(E);                                 } /* SLA  E           */
1586OP(cb,24) { H = SLA(H);                                 } /* SLA  H           */
1587OP(cb,25) { L = SLA(L);                                 } /* SLA  L           */
1588OP(cb,26) { WM( HL, SLA(RM(HL)) );                        } /* SLA  (HL)        */
1589OP(cb,27) { A = SLA(A);                                 } /* SLA  A           */
1629OP(cb,20) { B = SLA(z80, B);                              } /* SLA  B           */
1630OP(cb,21) { C = SLA(z80, C);                              } /* SLA  C           */
1631OP(cb,22) { D = SLA(z80, D);                              } /* SLA  D           */
1632OP(cb,23) { E = SLA(z80, E);                              } /* SLA  E           */
1633OP(cb,24) { H = SLA(z80, H);                              } /* SLA  H           */
1634OP(cb,25) { L = SLA(z80, L);                              } /* SLA  L           */
1635OP(cb,26) { WM( HL, SLA(z80, RM(HL)) );                        } /* SLA  (HL)        */
1636OP(cb,27) { A = SLA(z80, A);                              } /* SLA  A           */
15901637
1591OP(cb,28) { B = SRA(B);                                 } /* SRA  B           */
1592OP(cb,29) { C = SRA(C);                                 } /* SRA  C           */
1593OP(cb,2a) { D = SRA(D);                                 } /* SRA  D           */
1594OP(cb,2b) { E = SRA(E);                                 } /* SRA  E           */
1595OP(cb,2c) { H = SRA(H);                                 } /* SRA  H           */
1596OP(cb,2d) { L = SRA(L);                                 } /* SRA  L           */
1597OP(cb,2e) { WM( HL, SRA(RM(HL)) );                        } /* SRA  (HL)        */
1598OP(cb,2f) { A = SRA(A);                                 } /* SRA  A           */
1638OP(cb,28) { B = SRA(z80, B);                              } /* SRA  B           */
1639OP(cb,29) { C = SRA(z80, C);                              } /* SRA  C           */
1640OP(cb,2a) { D = SRA(z80, D);                              } /* SRA  D           */
1641OP(cb,2b) { E = SRA(z80, E);                              } /* SRA  E           */
1642OP(cb,2c) { H = SRA(z80, H);                              } /* SRA  H           */
1643OP(cb,2d) { L = SRA(z80, L);                              } /* SRA  L           */
1644OP(cb,2e) { WM( HL, SRA(z80, RM(HL)) );                        } /* SRA  (HL)        */
1645OP(cb,2f) { A = SRA(z80, A);                              } /* SRA  A           */
15991646
1600OP(cb,30) { B = SLL(B);                                 } /* SLL  B           */
1601OP(cb,31) { C = SLL(C);                                 } /* SLL  C           */
1602OP(cb,32) { D = SLL(D);                                 } /* SLL  D           */
1603OP(cb,33) { E = SLL(E);                                 } /* SLL  E           */
1604OP(cb,34) { H = SLL(H);                                 } /* SLL  H           */
1605OP(cb,35) { L = SLL(L);                                 } /* SLL  L           */
1606OP(cb,36) { WM( HL, SLL(RM(HL)) );                        } /* SLL  (HL)        */
1607OP(cb,37) { A = SLL(A);                                 } /* SLL  A           */
1647OP(cb,30) { B = SLL(z80, B);                              } /* SLL  B           */
1648OP(cb,31) { C = SLL(z80, C);                              } /* SLL  C           */
1649OP(cb,32) { D = SLL(z80, D);                              } /* SLL  D           */
1650OP(cb,33) { E = SLL(z80, E);                              } /* SLL  E           */
1651OP(cb,34) { H = SLL(z80, H);                              } /* SLL  H           */
1652OP(cb,35) { L = SLL(z80, L);                              } /* SLL  L           */
1653OP(cb,36) { WM( HL, SLL(z80, RM(HL)) );                        } /* SLL  (HL)        */
1654OP(cb,37) { A = SLL(z80, A);                              } /* SLL  A           */
16081655
1609OP(cb,38) { B = SRL(B);                                 } /* SRL  B           */
1610OP(cb,39) { C = SRL(C);                                 } /* SRL  C           */
1611OP(cb,3a) { D = SRL(D);                                 } /* SRL  D           */
1612OP(cb,3b) { E = SRL(E);                                 } /* SRL  E           */
1613OP(cb,3c) { H = SRL(H);                                 } /* SRL  H           */
1614OP(cb,3d) { L = SRL(L);                                 } /* SRL  L           */
1615OP(cb,3e) { WM( HL, SRL(RM(HL)) );                        } /* SRL  (HL)        */
1616OP(cb,3f) { A = SRL(A);                                 } /* SRL  A           */
1656OP(cb,38) { B = SRL(z80, B);                              } /* SRL  B           */
1657OP(cb,39) { C = SRL(z80, C);                              } /* SRL  C           */
1658OP(cb,3a) { D = SRL(z80, D);                              } /* SRL  D           */
1659OP(cb,3b) { E = SRL(z80, E);                              } /* SRL  E           */
1660OP(cb,3c) { H = SRL(z80, H);                              } /* SRL  H           */
1661OP(cb,3d) { L = SRL(z80, L);                              } /* SRL  L           */
1662OP(cb,3e) { WM( HL, SRL(z80, RM(HL)) );                        } /* SRL  (HL)        */
1663OP(cb,3f) { A = SRL(z80, A);                              } /* SRL  A           */
16171664
1618OP(cb,40) { BIT(0,B);                                 } /* BIT  0,B         */
1619OP(cb,41) { BIT(0,C);                                 } /* BIT  0,C         */
1620OP(cb,42) { BIT(0,D);                                 } /* BIT  0,D         */
1621OP(cb,43) { BIT(0,E);                                 } /* BIT  0,E         */
1622OP(cb,44) { BIT(0,H);                                 } /* BIT  0,H         */
1623OP(cb,45) { BIT(0,L);                                 } /* BIT  0,L         */
1624OP(cb,46) { BIT(0,RM(HL));                              } /* BIT  0,(HL)      */
1625OP(cb,47) { BIT(0,A);                                 } /* BIT  0,A         */
1665OP(cb,40) { BIT(0,B);                                    } /* BIT  0,B         */
1666OP(cb,41) { BIT(0,C);                                    } /* BIT  0,C         */
1667OP(cb,42) { BIT(0,D);                                    } /* BIT  0,D         */
1668OP(cb,43) { BIT(0,E);                                    } /* BIT  0,E         */
1669OP(cb,44) { BIT(0,H);                                    } /* BIT  0,H         */
1670OP(cb,45) { BIT(0,L);                                    } /* BIT  0,L         */
1671OP(cb,46) { BIT_HL(0,RM(HL));                              } /* BIT  0,(HL)      */
1672OP(cb,47) { BIT(0,A);                                    } /* BIT  0,A         */
16261673
1627OP(cb,48) { BIT(1,B);                                 } /* BIT  1,B         */
1628OP(cb,49) { BIT(1,C);                                 } /* BIT  1,C         */
1629OP(cb,4a) { BIT(1,D);                                 } /* BIT  1,D         */
1630OP(cb,4b) { BIT(1,E);                                 } /* BIT  1,E         */
1631OP(cb,4c) { BIT(1,H);                                 } /* BIT  1,H         */
1632OP(cb,4d) { BIT(1,L);                                 } /* BIT  1,L         */
1633OP(cb,4e) { BIT(1,RM(HL));                              } /* BIT  1,(HL)      */
1634OP(cb,4f) { BIT(1,A);                                 } /* BIT  1,A         */
1674OP(cb,48) { BIT(1,B);                                    } /* BIT  1,B         */
1675OP(cb,49) { BIT(1,C);                                    } /* BIT  1,C         */
1676OP(cb,4a) { BIT(1,D);                                    } /* BIT  1,D         */
1677OP(cb,4b) { BIT(1,E);                                    } /* BIT  1,E         */
1678OP(cb,4c) { BIT(1,H);                                    } /* BIT  1,H         */
1679OP(cb,4d) { BIT(1,L);                                    } /* BIT  1,L         */
1680OP(cb,4e) { BIT_HL(1,RM(HL));                              } /* BIT  1,(HL)      */
1681OP(cb,4f) { BIT(1,A);                                    } /* BIT  1,A         */
16351682
1636OP(cb,50) { BIT(2,B);                                 } /* BIT  2,B         */
1637OP(cb,51) { BIT(2,C);                                 } /* BIT  2,C         */
1638OP(cb,52) { BIT(2,D);                                 } /* BIT  2,D         */
1639OP(cb,53) { BIT(2,E);                                 } /* BIT  2,E         */
1640OP(cb,54) { BIT(2,H);                                 } /* BIT  2,H         */
1641OP(cb,55) { BIT(2,L);                                 } /* BIT  2,L         */
1642OP(cb,56) { BIT(2,RM(HL));                              } /* BIT  2,(HL)      */
1643OP(cb,57) { BIT(2,A);                                 } /* BIT  2,A         */
1683OP(cb,50) { BIT(2,B);                                    } /* BIT  2,B         */
1684OP(cb,51) { BIT(2,C);                                    } /* BIT  2,C         */
1685OP(cb,52) { BIT(2,D);                                    } /* BIT  2,D         */
1686OP(cb,53) { BIT(2,E);                                    } /* BIT  2,E         */
1687OP(cb,54) { BIT(2,H);                                    } /* BIT  2,H         */
1688OP(cb,55) { BIT(2,L);                                    } /* BIT  2,L         */
1689OP(cb,56) { BIT_HL(2,RM(HL));                              } /* BIT  2,(HL)      */
1690OP(cb,57) { BIT(2,A);                                    } /* BIT  2,A         */
16441691
1645OP(cb,58) { BIT(3,B);                                 } /* BIT  3,B         */
1646OP(cb,59) { BIT(3,C);                                 } /* BIT  3,C         */
1647OP(cb,5a) { BIT(3,D);                                 } /* BIT  3,D         */
1648OP(cb,5b) { BIT(3,E);                                 } /* BIT  3,E         */
1649OP(cb,5c) { BIT(3,H);                                 } /* BIT  3,H         */
1650OP(cb,5d) { BIT(3,L);                                 } /* BIT  3,L         */
1651OP(cb,5e) { BIT(3,RM(HL));                              } /* BIT  3,(HL)      */
1652OP(cb,5f) { BIT(3,A);                                 } /* BIT  3,A         */
1692OP(cb,58) { BIT(3,B);                                    } /* BIT  3,B         */
1693OP(cb,59) { BIT(3,C);                                    } /* BIT  3,C         */
1694OP(cb,5a) { BIT(3,D);                                    } /* BIT  3,D         */
1695OP(cb,5b) { BIT(3,E);                                    } /* BIT  3,E         */
1696OP(cb,5c) { BIT(3,H);                                    } /* BIT  3,H         */
1697OP(cb,5d) { BIT(3,L);                                    } /* BIT  3,L         */
1698OP(cb,5e) { BIT_HL(3,RM(HL));                              } /* BIT  3,(HL)      */
1699OP(cb,5f) { BIT(3,A);                                    } /* BIT  3,A         */
16531700
1654OP(cb,60) { BIT(4,B);                                 } /* BIT  4,B         */
1655OP(cb,61) { BIT(4,C);                                 } /* BIT  4,C         */
1656OP(cb,62) { BIT(4,D);                                 } /* BIT  4,D         */
1657OP(cb,63) { BIT(4,E);                                 } /* BIT  4,E         */
1658OP(cb,64) { BIT(4,H);                                 } /* BIT  4,H         */
1659OP(cb,65) { BIT(4,L);                                 } /* BIT  4,L         */
1660OP(cb,66) { BIT(4,RM(HL));                              } /* BIT  4,(HL)      */
1661OP(cb,67) { BIT(4,A);                                 } /* BIT  4,A         */
1701OP(cb,60) { BIT(4,B);                                    } /* BIT  4,B         */
1702OP(cb,61) { BIT(4,C);                                    } /* BIT  4,C         */
1703OP(cb,62) { BIT(4,D);                                    } /* BIT  4,D         */
1704OP(cb,63) { BIT(4,E);                                    } /* BIT  4,E         */
1705OP(cb,64) { BIT(4,H);                                    } /* BIT  4,H         */
1706OP(cb,65) { BIT(4,L);                                    } /* BIT  4,L         */
1707OP(cb,66) { BIT_HL(4,RM(HL));                              } /* BIT  4,(HL)      */
1708OP(cb,67) { BIT(4,A);                                    } /* BIT  4,A         */
16621709
1663OP(cb,68) { BIT(5,B);                                 } /* BIT  5,B         */
1664OP(cb,69) { BIT(5,C);                                 } /* BIT  5,C         */
1665OP(cb,6a) { BIT(5,D);                                 } /* BIT  5,D         */
1666OP(cb,6b) { BIT(5,E);                                 } /* BIT  5,E         */
1667OP(cb,6c) { BIT(5,H);                                 } /* BIT  5,H         */
1668OP(cb,6d) { BIT(5,L);                                 } /* BIT  5,L         */
1669OP(cb,6e) { BIT(5,RM(HL));                              } /* BIT  5,(HL)      */
1670OP(cb,6f) { BIT(5,A);                                 } /* BIT  5,A         */
1710OP(cb,68) { BIT(5,B);                                    } /* BIT  5,B         */
1711OP(cb,69) { BIT(5,C);                                    } /* BIT  5,C         */
1712OP(cb,6a) { BIT(5,D);                                    } /* BIT  5,D         */
1713OP(cb,6b) { BIT(5,E);                                    } /* BIT  5,E         */
1714OP(cb,6c) { BIT(5,H);                                    } /* BIT  5,H         */
1715OP(cb,6d) { BIT(5,L);                                    } /* BIT  5,L         */
1716OP(cb,6e) { BIT_HL(5,RM(HL));                              } /* BIT  5,(HL)      */
1717OP(cb,6f) { BIT(5,A);                                    } /* BIT  5,A         */
16711718
1672OP(cb,70) { BIT(6,B);                                 } /* BIT  6,B         */
1673OP(cb,71) { BIT(6,C);                                 } /* BIT  6,C         */
1674OP(cb,72) { BIT(6,D);                                 } /* BIT  6,D         */
1675OP(cb,73) { BIT(6,E);                                 } /* BIT  6,E         */
1676OP(cb,74) { BIT(6,H);                                 } /* BIT  6,H         */
1677OP(cb,75) { BIT(6,L);                                 } /* BIT  6,L         */
1678OP(cb,76) { BIT(6,RM(HL));                              } /* BIT  6,(HL)      */
1679OP(cb,77) { BIT(6,A);                                 } /* BIT  6,A         */
1719OP(cb,70) { BIT(6,B);                                    } /* BIT  6,B         */
1720OP(cb,71) { BIT(6,C);                                    } /* BIT  6,C         */
1721OP(cb,72) { BIT(6,D);                                    } /* BIT  6,D         */
1722OP(cb,73) { BIT(6,E);                                    } /* BIT  6,E         */
1723OP(cb,74) { BIT(6,H);                                    } /* BIT  6,H         */
1724OP(cb,75) { BIT(6,L);                                    } /* BIT  6,L         */
1725OP(cb,76) { BIT_HL(6,RM(HL));                              } /* BIT  6,(HL)      */
1726OP(cb,77) { BIT(6,A);                                    } /* BIT  6,A         */
16801727
1681OP(cb,78) { BIT(7,B);                                 } /* BIT  7,B         */
1682OP(cb,79) { BIT(7,C);                                 } /* BIT  7,C         */
1683OP(cb,7a) { BIT(7,D);                                 } /* BIT  7,D         */
1684OP(cb,7b) { BIT(7,E);                                 } /* BIT  7,E         */
1685OP(cb,7c) { BIT(7,H);                                 } /* BIT  7,H         */
1686OP(cb,7d) { BIT(7,L);                                 } /* BIT  7,L         */
1687OP(cb,7e) { BIT(7,RM(HL));                              } /* BIT  7,(HL)      */
1688OP(cb,7f) { BIT(7,A);                                 } /* BIT  7,A         */
1728OP(cb,78) { BIT(7,B);                                    } /* BIT  7,B         */
1729OP(cb,79) { BIT(7,C);                                    } /* BIT  7,C         */
1730OP(cb,7a) { BIT(7,D);                                    } /* BIT  7,D         */
1731OP(cb,7b) { BIT(7,E);                                    } /* BIT  7,E         */
1732OP(cb,7c) { BIT(7,H);                                    } /* BIT  7,H         */
1733OP(cb,7d) { BIT(7,L);                                    } /* BIT  7,L         */
1734OP(cb,7e) { BIT_HL(7,RM(HL));                              } /* BIT  7,(HL)      */
1735OP(cb,7f) { BIT(7,A);                                    } /* BIT  7,A         */
16891736
1690OP(cb,80) { B = RES(0,B);                              } /* RES  0,B         */
1691OP(cb,81) { C = RES(0,C);                              } /* RES  0,C         */
1692OP(cb,82) { D = RES(0,D);                              } /* RES  0,D         */
1693OP(cb,83) { E = RES(0,E);                              } /* RES  0,E         */
1694OP(cb,84) { H = RES(0,H);                              } /* RES  0,H         */
1695OP(cb,85) { L = RES(0,L);                              } /* RES  0,L         */
1696OP(cb,86) { WM( HL, RES(0,RM(HL)) );                     } /* RES  0,(HL)      */
1697OP(cb,87) { A = RES(0,A);                              } /* RES  0,A         */
1737OP(cb,80) { B = RES(0,B);                                 } /* RES  0,B         */
1738OP(cb,81) { C = RES(0,C);                                 } /* RES  0,C         */
1739OP(cb,82) { D = RES(0,D);                                 } /* RES  0,D         */
1740OP(cb,83) { E = RES(0,E);                                 } /* RES  0,E         */
1741OP(cb,84) { H = RES(0,H);                                 } /* RES  0,H         */
1742OP(cb,85) { L = RES(0,L);                                 } /* RES  0,L         */
1743OP(cb,86) { WM( HL, RES(0,RM(HL)) );                        } /* RES  0,(HL)      */
1744OP(cb,87) { A = RES(0,A);                                 } /* RES  0,A         */
16981745
1699OP(cb,88) { B = RES(1,B);                              } /* RES  1,B         */
1700OP(cb,89) { C = RES(1,C);                              } /* RES  1,C         */
1701OP(cb,8a) { D = RES(1,D);                              } /* RES  1,D         */
1702OP(cb,8b) { E = RES(1,E);                              } /* RES  1,E         */
1703OP(cb,8c) { H = RES(1,H);                              } /* RES  1,H         */
1704OP(cb,8d) { L = RES(1,L);                              } /* RES  1,L         */
1705OP(cb,8e) { WM( HL, RES(1,RM(HL)) );                     } /* RES  1,(HL)      */
1706OP(cb,8f) { A = RES(1,A);                              } /* RES  1,A         */
1746OP(cb,88) { B = RES(1,B);                                 } /* RES  1,B         */
1747OP(cb,89) { C = RES(1,C);                                 } /* RES  1,C         */
1748OP(cb,8a) { D = RES(1,D);                                 } /* RES  1,D         */
1749OP(cb,8b) { E = RES(1,E);                                 } /* RES  1,E         */
1750OP(cb,8c) { H = RES(1,H);                                 } /* RES  1,H         */
1751OP(cb,8d) { L = RES(1,L);                                 } /* RES  1,L         */
1752OP(cb,8e) { WM( HL, RES(1,RM(HL)) );                        } /* RES  1,(HL)      */
1753OP(cb,8f) { A = RES(1,A);                                 } /* RES  1,A         */
17071754
1708OP(cb,90) { B = RES(2,B);                              } /* RES  2,B         */
1709OP(cb,91) { C = RES(2,C);                              } /* RES  2,C         */
1710OP(cb,92) { D = RES(2,D);                              } /* RES  2,D         */
1711OP(cb,93) { E = RES(2,E);                              } /* RES  2,E         */
1712OP(cb,94) { H = RES(2,H);                              } /* RES  2,H         */
1713OP(cb,95) { L = RES(2,L);                              } /* RES  2,L         */
1714OP(cb,96) { WM( HL, RES(2,RM(HL)) );                     } /* RES  2,(HL)      */
1715OP(cb,97) { A = RES(2,A);                              } /* RES  2,A         */
1755OP(cb,90) { B = RES(2,B);                                 } /* RES  2,B         */
1756OP(cb,91) { C = RES(2,C);                                 } /* RES  2,C         */
1757OP(cb,92) { D = RES(2,D);                                 } /* RES  2,D         */
1758OP(cb,93) { E = RES(2,E);                                 } /* RES  2,E         */
1759OP(cb,94) { H = RES(2,H);                                 } /* RES  2,H         */
1760OP(cb,95) { L = RES(2,L);                                 } /* RES  2,L         */
1761OP(cb,96) { WM( HL, RES(2,RM(HL)) );                        } /* RES  2,(HL)      */
1762OP(cb,97) { A = RES(2,A);                                 } /* RES  2,A         */
17161763
1717OP(cb,98) { B = RES(3,B);                              } /* RES  3,B         */
1718OP(cb,99) { C = RES(3,C);                              } /* RES  3,C         */
1719OP(cb,9a) { D = RES(3,D);                              } /* RES  3,D         */
1720OP(cb,9b) { E = RES(3,E);                              } /* RES  3,E         */
1721OP(cb,9c) { H = RES(3,H);                              } /* RES  3,H         */
1722OP(cb,9d) { L = RES(3,L);                              } /* RES  3,L         */
1723OP(cb,9e) { WM( HL, RES(3,RM(HL)) );                     } /* RES  3,(HL)      */
1724OP(cb,9f) { A = RES(3,A);                              } /* RES  3,A         */
1764OP(cb,98) { B = RES(3,B);                                 } /* RES  3,B         */
1765OP(cb,99) { C = RES(3,C);                                 } /* RES  3,C         */
1766OP(cb,9a) { D = RES(3,D);                                 } /* RES  3,D         */
1767OP(cb,9b) { E = RES(3,E);                                 } /* RES  3,E         */
1768OP(cb,9c) { H = RES(3,H);                                 } /* RES  3,H         */
1769OP(cb,9d) { L = RES(3,L);                                 } /* RES  3,L         */
1770OP(cb,9e) { WM( HL, RES(3,RM(HL)) );                        } /* RES  3,(HL)      */
1771OP(cb,9f) { A = RES(3,A);                                 } /* RES  3,A         */
17251772
1726OP(cb,a0) { B = RES(4,B);                              } /* RES  4,B         */
1727OP(cb,a1) { C = RES(4,C);                              } /* RES  4,C         */
1728OP(cb,a2) { D = RES(4,D);                              } /* RES  4,D         */
1729OP(cb,a3) { E = RES(4,E);                              } /* RES  4,E         */
1730OP(cb,a4) { H = RES(4,H);                              } /* RES  4,H         */
1731OP(cb,a5) { L = RES(4,L);                              } /* RES  4,L         */
1732OP(cb,a6) { WM( HL, RES(4,RM(HL)) );                     } /* RES  4,(HL)      */
1733OP(cb,a7) { A = RES(4,A);                              } /* RES  4,A         */
1773OP(cb,a0) { B = RES(4,B);                                 } /* RES  4,B         */
1774OP(cb,a1) { C = RES(4,C);                                 } /* RES  4,C         */
1775OP(cb,a2) { D = RES(4,D);                                 } /* RES  4,D         */
1776OP(cb,a3) { E = RES(4,E);                                 } /* RES  4,E         */
1777OP(cb,a4) { H = RES(4,H);                                 } /* RES  4,H         */
1778OP(cb,a5) { L = RES(4,L);                                 } /* RES  4,L         */
1779OP(cb,a6) { WM( HL, RES(4,RM(HL)) );                        } /* RES  4,(HL)      */
1780OP(cb,a7) { A = RES(4,A);                                 } /* RES  4,A         */
17341781
1735OP(cb,a8) { B = RES(5,B);                              } /* RES  5,B         */
1736OP(cb,a9) { C = RES(5,C);                              } /* RES  5,C         */
1737OP(cb,aa) { D = RES(5,D);                              } /* RES  5,D         */
1738OP(cb,ab) { E = RES(5,E);                              } /* RES  5,E         */
1739OP(cb,ac) { H = RES(5,H);                              } /* RES  5,H         */
1740OP(cb,ad) { L = RES(5,L);                              } /* RES  5,L         */
1741OP(cb,ae) { WM( HL, RES(5,RM(HL)) );                     } /* RES  5,(HL)      */
1742OP(cb,af) { A = RES(5,A);                              } /* RES  5,A         */
1782OP(cb,a8) { B = RES(5,B);                                 } /* RES  5,B         */
1783OP(cb,a9) { C = RES(5,C);                                 } /* RES  5,C         */
1784OP(cb,aa) { D = RES(5,D);                                 } /* RES  5,D         */
1785OP(cb,ab) { E = RES(5,E);                                 } /* RES  5,E         */
1786OP(cb,ac) { H = RES(5,H);                                 } /* RES  5,H         */
1787OP(cb,ad) { L = RES(5,L);                                 } /* RES  5,L         */
1788OP(cb,ae) { WM( HL, RES(5,RM(HL)) );                        } /* RES  5,(HL)      */
1789OP(cb,af) { A = RES(5,A);                                 } /* RES  5,A         */
17431790
1744OP(cb,b0) { B = RES(6,B);                              } /* RES  6,B         */
1745OP(cb,b1) { C = RES(6,C);                              } /* RES  6,C         */
1746OP(cb,b2) { D = RES(6,D);                              } /* RES  6,D         */
1747OP(cb,b3) { E = RES(6,E);                              } /* RES  6,E         */
1748OP(cb,b4) { H = RES(6,H);                              } /* RES  6,H         */
1749OP(cb,b5) { L = RES(6,L);                              } /* RES  6,L         */
1750OP(cb,b6) { WM( HL, RES(6,RM(HL)) );                     } /* RES  6,(HL)      */
1751OP(cb,b7) { A = RES(6,A);                              } /* RES  6,A         */
1791OP(cb,b0) { B = RES(6,B);                                 } /* RES  6,B         */
1792OP(cb,b1) { C = RES(6,C);                                 } /* RES  6,C         */
1793OP(cb,b2) { D = RES(6,D);                                 } /* RES  6,D         */
1794OP(cb,b3) { E = RES(6,E);                                 } /* RES  6,E         */
1795OP(cb,b4) { H = RES(6,H);                                 } /* RES  6,H         */
1796OP(cb,b5) { L = RES(6,L);                                 } /* RES  6,L         */
1797OP(cb,b6) { WM( HL, RES(6,RM(HL)) );                        } /* RES  6,(HL)      */
1798OP(cb,b7) { A = RES(6,A);                                 } /* RES  6,A         */
17521799
1753OP(cb,b8) { B = RES(7,B);                              } /* RES  7,B         */
1754OP(cb,b9) { C = RES(7,C);                              } /* RES  7,C         */
1755OP(cb,ba) { D = RES(7,D);                              } /* RES  7,D         */
1756OP(cb,bb) { E = RES(7,E);                              } /* RES  7,E         */
1757OP(cb,bc) { H = RES(7,H);                              } /* RES  7,H         */
1758OP(cb,bd) { L = RES(7,L);                              } /* RES  7,L         */
1759OP(cb,be) { WM( HL, RES(7,RM(HL)) );                     } /* RES  7,(HL)      */
1760OP(cb,bf) { A = RES(7,A);                              } /* RES  7,A         */
1800OP(cb,b8) { B = RES(7,B);                                 } /* RES  7,B         */
1801OP(cb,b9) { C = RES(7,C);                                 } /* RES  7,C         */
1802OP(cb,ba) { D = RES(7,D);                                 } /* RES  7,D         */
1803OP(cb,bb) { E = RES(7,E);                                 } /* RES  7,E         */
1804OP(cb,bc) { H = RES(7,H);                                 } /* RES  7,H         */
1805OP(cb,bd) { L = RES(7,L);                                 } /* RES  7,L         */
1806OP(cb,be) { WM( HL, RES(7,RM(HL)) );                        } /* RES  7,(HL)      */
1807OP(cb,bf) { A = RES(7,A);                                 } /* RES  7,A         */
17611808
1762OP(cb,c0) { B = SET(0,B);                              } /* SET  0,B         */
1763OP(cb,c1) { C = SET(0,C);                              } /* SET  0,C         */
1764OP(cb,c2) { D = SET(0,D);                              } /* SET  0,D         */
1765OP(cb,c3) { E = SET(0,E);                              } /* SET  0,E         */
1766OP(cb,c4) { H = SET(0,H);                              } /* SET  0,H         */
1767OP(cb,c5) { L = SET(0,L);                              } /* SET  0,L         */
1768OP(cb,c6) { WM( HL, SET(0,RM(HL)) );                     } /* SET  0,(HL)      */
1769OP(cb,c7) { A = SET(0,A);                              } /* SET  0,A         */
1809OP(cb,c0) { B = SET(0,B);                                 } /* SET  0,B         */
1810OP(cb,c1) { C = SET(0,C);                                 } /* SET  0,C         */
1811OP(cb,c2) { D = SET(0,D);                                 } /* SET  0,D         */
1812OP(cb,c3) { E = SET(0,E);                                 } /* SET  0,E         */
1813OP(cb,c4) { H = SET(0,H);                                 } /* SET  0,H         */
1814OP(cb,c5) { L = SET(0,L);                                 } /* SET  0,L         */
1815OP(cb,c6) { WM( HL, SET(0,RM(HL)) );                        } /* SET  0,(HL)      */
1816OP(cb,c7) { A = SET(0,A);                                 } /* SET  0,A         */
17701817
1771OP(cb,c8) { B = SET(1,B);                              } /* SET  1,B         */
1772OP(cb,c9) { C = SET(1,C);                              } /* SET  1,C         */
1773OP(cb,ca) { D = SET(1,D);                              } /* SET  1,D         */
1774OP(cb,cb) { E = SET(1,E);                              } /* SET  1,E         */
1775OP(cb,cc) { H = SET(1,H);                              } /* SET  1,H         */
1776OP(cb,cd) { L = SET(1,L);                              } /* SET  1,L         */
1777OP(cb,ce) { WM( HL, SET(1,RM(HL)) );                     } /* SET  1,(HL)      */
1778OP(cb,cf) { A = SET(1,A);                              } /* SET  1,A         */
1818OP(cb,c8) { B = SET(1,B);                                 } /* SET  1,B         */
1819OP(cb,c9) { C = SET(1,C);                                 } /* SET  1,C         */
1820OP(cb,ca) { D = SET(1,D);                                 } /* SET  1,D         */
1821OP(cb,cb) { E = SET(1,E);                                 } /* SET  1,E         */
1822OP(cb,cc) { H = SET(1,H);                                 } /* SET  1,H         */
1823OP(cb,cd) { L = SET(1,L);                                 } /* SET  1,L         */
1824OP(cb,ce) { WM( HL, SET(1,RM(HL)) );                        } /* SET  1,(HL)      */
1825OP(cb,cf) { A = SET(1,A);                                 } /* SET  1,A         */
17791826
1780OP(cb,d0) { B = SET(2,B);                              } /* SET  2,B         */
1781OP(cb,d1) { C = SET(2,C);                              } /* SET  2,C         */
1782OP(cb,d2) { D = SET(2,D);                              } /* SET  2,D         */
1783OP(cb,d3) { E = SET(2,E);                              } /* SET  2,E         */
1784OP(cb,d4) { H = SET(2,H);                              } /* SET  2,H         */
1785OP(cb,d5) { L = SET(2,L);                              } /* SET  2,L         */
1786OP(cb,d6) { WM( HL, SET(2,RM(HL)) );                     } /* SET  2,(HL)      */
1787OP(cb,d7) { A = SET(2,A);                              } /* SET  2,A         */
1827OP(cb,d0) { B = SET(2,B);                                 } /* SET  2,B         */
1828OP(cb,d1) { C = SET(2,C);                                 } /* SET  2,C         */
1829OP(cb,d2) { D = SET(2,D);                                 } /* SET  2,D         */
1830OP(cb,d3) { E = SET(2,E);                                 } /* SET  2,E         */
1831OP(cb,d4) { H = SET(2,H);                                 } /* SET  2,H         */
1832OP(cb,d5) { L = SET(2,L);                                 } /* SET  2,L         */
1833OP(cb,d6) { WM( HL, SET(2,RM(HL)) );                        } /* SET  2,(HL)      */
1834OP(cb,d7) { A = SET(2,A);                                 } /* SET  2,A         */
17881835
1789OP(cb,d8) { B = SET(3,B);                              } /* SET  3,B         */
1790OP(cb,d9) { C = SET(3,C);                              } /* SET  3,C         */
1791OP(cb,da) { D = SET(3,D);                              } /* SET  3,D         */
1792OP(cb,db) { E = SET(3,E);                              } /* SET  3,E         */
1793OP(cb,dc) { H = SET(3,H);                              } /* SET  3,H         */
1794OP(cb,dd) { L = SET(3,L);                              } /* SET  3,L         */
1795OP(cb,de) { WM( HL, SET(3,RM(HL)) );                     } /* SET  3,(HL)      */
1796OP(cb,df) { A = SET(3,A);                              } /* SET  3,A         */
1836OP(cb,d8) { B = SET(3,B);                                 } /* SET  3,B         */
1837OP(cb,d9) { C = SET(3,C);                                 } /* SET  3,C         */
1838OP(cb,da) { D = SET(3,D);                                 } /* SET  3,D         */
1839OP(cb,db) { E = SET(3,E);                                 } /* SET  3,E         */
1840OP(cb,dc) { H = SET(3,H);                                 } /* SET  3,H         */
1841OP(cb,dd) { L = SET(3,L);                                 } /* SET  3,L         */
1842OP(cb,de) { WM( HL, SET(3,RM(HL)) );                        } /* SET  3,(HL)      */
1843OP(cb,df) { A = SET(3,A);                                 } /* SET  3,A         */
17971844
1798OP(cb,e0) { B = SET(4,B);                              } /* SET  4,B         */
1799OP(cb,e1) { C = SET(4,C);                              } /* SET  4,C         */
1800OP(cb,e2) { D = SET(4,D);                              } /* SET  4,D         */
1801OP(cb,e3) { E = SET(4,E);                              } /* SET  4,E         */
1802OP(cb,e4) { H = SET(4,H);                              } /* SET  4,H         */
1803OP(cb,e5) { L = SET(4,L);                              } /* SET  4,L         */
1804OP(cb,e6) { WM( HL, SET(4,RM(HL)) );                     } /* SET  4,(HL)      */
1805OP(cb,e7) { A = SET(4,A);                              } /* SET  4,A         */
1845OP(cb,e0) { B = SET(4,B);                                 } /* SET  4,B         */
1846OP(cb,e1) { C = SET(4,C);                                 } /* SET  4,C         */
1847OP(cb,e2) { D = SET(4,D);                                 } /* SET  4,D         */
1848OP(cb,e3) { E = SET(4,E);                                 } /* SET  4,E         */
1849OP(cb,e4) { H = SET(4,H);                                 } /* SET  4,H         */
1850OP(cb,e5) { L = SET(4,L);                                 } /* SET  4,L         */
1851OP(cb,e6) { WM( HL, SET(4,RM(HL)) );                        } /* SET  4,(HL)      */
1852OP(cb,e7) { A = SET(4,A);                                 } /* SET  4,A         */
18061853
1807OP(cb,e8) { B = SET(5,B);                              } /* SET  5,B         */
1808OP(cb,e9) { C = SET(5,C);                              } /* SET  5,C         */
1809OP(cb,ea) { D = SET(5,D);                              } /* SET  5,D         */
1810OP(cb,eb) { E = SET(5,E);                              } /* SET  5,E         */
1811OP(cb,ec) { H = SET(5,H);                              } /* SET  5,H         */
1812OP(cb,ed) { L = SET(5,L);                              } /* SET  5,L         */
1813OP(cb,ee) { WM( HL, SET(5,RM(HL)) );                     } /* SET  5,(HL)      */
1814OP(cb,ef) { A = SET(5,A);                              } /* SET  5,A         */
1854OP(cb,e8) { B = SET(5,B);                                 } /* SET  5,B         */
1855OP(cb,e9) { C = SET(5,C);                                 } /* SET  5,C         */
1856OP(cb,ea) { D = SET(5,D);                                 } /* SET  5,D         */
1857OP(cb,eb) { E = SET(5,E);                                 } /* SET  5,E         */
1858OP(cb,ec) { H = SET(5,H);                                 } /* SET  5,H         */
1859OP(cb,ed) { L = SET(5,L);                                 } /* SET  5,L         */
1860OP(cb,ee) { WM( HL, SET(5,RM(HL)) );                        } /* SET  5,(HL)      */
1861OP(cb,ef) { A = SET(5,A);                                 } /* SET  5,A         */
18151862
1816OP(cb,f0) { B = SET(6,B);                              } /* SET  6,B         */
1817OP(cb,f1) { C = SET(6,C);                              } /* SET  6,C         */
1818OP(cb,f2) { D = SET(6,D);                              } /* SET  6,D         */
1819OP(cb,f3) { E = SET(6,E);                              } /* SET  6,E         */
1820OP(cb,f4) { H = SET(6,H);                              } /* SET  6,H         */
1821OP(cb,f5) { L = SET(6,L);                              } /* SET  6,L         */
1822OP(cb,f6) { WM( HL, SET(6,RM(HL)) );                     } /* SET  6,(HL)      */
1823OP(cb,f7) { A = SET(6,A);                              } /* SET  6,A         */
1863OP(cb,f0) { B = SET(6,B);                                 } /* SET  6,B         */
1864OP(cb,f1) { C = SET(6,C);                                 } /* SET  6,C         */
1865OP(cb,f2) { D = SET(6,D);                                 } /* SET  6,D         */
1866OP(cb,f3) { E = SET(6,E);                                 } /* SET  6,E         */
1867OP(cb,f4) { H = SET(6,H);                                 } /* SET  6,H         */
1868OP(cb,f5) { L = SET(6,L);                                 } /* SET  6,L         */
1869OP(cb,f6) { WM( HL, SET(6,RM(HL)) );                        } /* SET  6,(HL)      */
1870OP(cb,f7) { A = SET(6,A);                                 } /* SET  6,A         */
18241871
1825OP(cb,f8) { B = SET(7,B);                              } /* SET  7,B         */
1826OP(cb,f9) { C = SET(7,C);                              } /* SET  7,C         */
1827OP(cb,fa) { D = SET(7,D);                              } /* SET  7,D         */
1828OP(cb,fb) { E = SET(7,E);                              } /* SET  7,E         */
1829OP(cb,fc) { H = SET(7,H);                              } /* SET  7,H         */
1830OP(cb,fd) { L = SET(7,L);                              } /* SET  7,L         */
1831OP(cb,fe) { WM( HL, SET(7,RM(HL)) );                     } /* SET  7,(HL)      */
1832OP(cb,ff) { A = SET(7,A);                              } /* SET  7,A         */
1872OP(cb,f8) { B = SET(7,B);                                 } /* SET  7,B         */
1873OP(cb,f9) { C = SET(7,C);                                 } /* SET  7,C         */
1874OP(cb,fa) { D = SET(7,D);                                 } /* SET  7,D         */
1875OP(cb,fb) { E = SET(7,E);                                 } /* SET  7,E         */
1876OP(cb,fc) { H = SET(7,H);                                 } /* SET  7,H         */
1877OP(cb,fd) { L = SET(7,L);                                 } /* SET  7,L         */
1878OP(cb,fe) { WM( HL, SET(7,RM(HL)) );                        } /* SET  7,(HL)      */
1879OP(cb,ff) { A = SET(7,A);                                 } /* SET  7,A         */
18331880
18341881
18351882/**********************************************************
18361883* opcodes with DD/FD CB prefix
18371884* rotate, shift and bit operations with (IX+o)
18381885**********************************************************/
1839OP(xycb,00) { B = RLC( RM(EA) ); WM( EA,B );               } /* RLC  B=(XY+o)    */
1840OP(xycb,01) { C = RLC( RM(EA) ); WM( EA,C );               } /* RLC  C=(XY+o)    */
1841OP(xycb,02) { D = RLC( RM(EA) ); WM( EA,D );               } /* RLC  D=(XY+o)    */
1842OP(xycb,03) { E = RLC( RM(EA) ); WM( EA,E );               } /* RLC  E=(XY+o)    */
1843OP(xycb,04) { H = RLC( RM(EA) ); WM( EA,H );               } /* RLC  H=(XY+o)    */
1844OP(xycb,05) { L = RLC( RM(EA) ); WM( EA,L );               } /* RLC  L=(XY+o)    */
1845OP(xycb,06) { WM( EA, RLC( RM(EA) ) );                     } /* RLC  (XY+o)      */
1846OP(xycb,07) { A = RLC( RM(EA) ); WM( EA,A );               } /* RLC  A=(XY+o)    */
1886OP(xycb,00) { B = RLC(z80,  RM(EA) ); WM( EA,B );               } /* RLC  B=(XY+o)    */
1887OP(xycb,01) { C = RLC(z80,  RM(EA) ); WM( EA,C );               } /* RLC  C=(XY+o)    */
1888OP(xycb,02) { D = RLC(z80,  RM(EA) ); WM( EA,D );               } /* RLC  D=(XY+o)    */
1889OP(xycb,03) { E = RLC(z80,  RM(EA) ); WM( EA,E );               } /* RLC  E=(XY+o)    */
1890OP(xycb,04) { H = RLC(z80,  RM(EA) ); WM( EA,H );               } /* RLC  H=(XY+o)    */
1891OP(xycb,05) { L = RLC(z80,  RM(EA) ); WM( EA,L );               } /* RLC  L=(XY+o)    */
1892OP(xycb,06) { WM( EA, RLC(z80,  RM(EA) ) );                     } /* RLC  (XY+o)      */
1893OP(xycb,07) { A = RLC(z80,  RM(EA) ); WM( EA,A );               } /* RLC  A=(XY+o)    */
18471894
1848OP(xycb,08) { B = RRC( RM(EA) ); WM( EA,B );               } /* RRC  B=(XY+o)    */
1849OP(xycb,09) { C = RRC( RM(EA) ); WM( EA,C );               } /* RRC  C=(XY+o)    */
1850OP(xycb,0a) { D = RRC( RM(EA) ); WM( EA,D );               } /* RRC  D=(XY+o)    */
1851OP(xycb,0b) { E = RRC( RM(EA) ); WM( EA,E );               } /* RRC  E=(XY+o)    */
1852OP(xycb,0c) { H = RRC( RM(EA) ); WM( EA,H );               } /* RRC  H=(XY+o)    */
1853OP(xycb,0d) { L = RRC( RM(EA) ); WM( EA,L );               } /* RRC  L=(XY+o)    */
1854OP(xycb,0e) { WM( EA,RRC( RM(EA) ) );                     } /* RRC  (XY+o)      */
1855OP(xycb,0f) { A = RRC( RM(EA) ); WM( EA,A );               } /* RRC  A=(XY+o)    */
1895OP(xycb,08) { B = RRC(z80,  RM(EA) ); WM( EA,B );               } /* RRC  B=(XY+o)    */
1896OP(xycb,09) { C = RRC(z80,  RM(EA) ); WM( EA,C );               } /* RRC  C=(XY+o)    */
1897OP(xycb,0a) { D = RRC(z80,  RM(EA) ); WM( EA,D );               } /* RRC  D=(XY+o)    */
1898OP(xycb,0b) { E = RRC(z80,  RM(EA) ); WM( EA,E );               } /* RRC  E=(XY+o)    */
1899OP(xycb,0c) { H = RRC(z80,  RM(EA) ); WM( EA,H );               } /* RRC  H=(XY+o)    */
1900OP(xycb,0d) { L = RRC(z80,  RM(EA) ); WM( EA,L );               } /* RRC  L=(XY+o)    */
1901OP(xycb,0e) { WM( EA,RRC(z80,  RM(EA) ) );                     } /* RRC  (XY+o)      */
1902OP(xycb,0f) { A = RRC(z80,  RM(EA) ); WM( EA,A );               } /* RRC  A=(XY+o)    */
18561903
1857OP(xycb,10) { B = RL( RM(EA) ); WM( EA,B );                  } /* RL   B=(XY+o)    */
1858OP(xycb,11) { C = RL( RM(EA) ); WM( EA,C );                  } /* RL   C=(XY+o)    */
1859OP(xycb,12) { D = RL( RM(EA) ); WM( EA,D );                  } /* RL   D=(XY+o)    */
1860OP(xycb,13) { E = RL( RM(EA) ); WM( EA,E );                  } /* RL   E=(XY+o)    */
1861OP(xycb,14) { H = RL( RM(EA) ); WM( EA,H );                  } /* RL   H=(XY+o)    */
1862OP(xycb,15) { L = RL( RM(EA) ); WM( EA,L );                  } /* RL   L=(XY+o)    */
1863OP(xycb,16) { WM( EA,RL( RM(EA) ) );                     } /* RL   (XY+o)      */
1864OP(xycb,17) { A = RL( RM(EA) ); WM( EA,A );                  } /* RL   A=(XY+o)    */
1904OP(xycb,10) { B = RL(z80,  RM(EA) ); WM( EA,B );               } /* RL   B=(XY+o)    */
1905OP(xycb,11) { C = RL(z80,  RM(EA) ); WM( EA,C );               } /* RL   C=(XY+o)    */
1906OP(xycb,12) { D = RL(z80,  RM(EA) ); WM( EA,D );               } /* RL   D=(XY+o)    */
1907OP(xycb,13) { E = RL(z80,  RM(EA) ); WM( EA,E );               } /* RL   E=(XY+o)    */
1908OP(xycb,14) { H = RL(z80,  RM(EA) ); WM( EA,H );               } /* RL   H=(XY+o)    */
1909OP(xycb,15) { L = RL(z80,  RM(EA) ); WM( EA,L );               } /* RL   L=(XY+o)    */
1910OP(xycb,16) { WM( EA,RL(z80,  RM(EA) ) );                     } /* RL   (XY+o)      */
1911OP(xycb,17) { A = RL(z80,  RM(EA) ); WM( EA,A );               } /* RL   A=(XY+o)    */
18651912
1866OP(xycb,18) { B = RR( RM(EA) ); WM( EA,B );                  } /* RR   B=(XY+o)    */
1867OP(xycb,19) { C = RR( RM(EA) ); WM( EA,C );                  } /* RR   C=(XY+o)    */
1868OP(xycb,1a) { D = RR( RM(EA) ); WM( EA,D );                  } /* RR   D=(XY+o)    */
1869OP(xycb,1b) { E = RR( RM(EA) ); WM( EA,E );                  } /* RR   E=(XY+o)    */
1870OP(xycb,1c) { H = RR( RM(EA) ); WM( EA,H );                  } /* RR   H=(XY+o)    */
1871OP(xycb,1d) { L = RR( RM(EA) ); WM( EA,L );                  } /* RR   L=(XY+o)    */
1872OP(xycb,1e) { WM( EA,RR( RM(EA) ) );                     } /* RR   (XY+o)      */
1873OP(xycb,1f) { A = RR( RM(EA) ); WM( EA,A );                  } /* RR   A=(XY+o)    */
1913OP(xycb,18) { B = RR(z80,  RM(EA) ); WM( EA,B );               } /* RR   B=(XY+o)    */
1914OP(xycb,19) { C = RR(z80,  RM(EA) ); WM( EA,C );               } /* RR   C=(XY+o)    */
1915OP(xycb,1a) { D = RR(z80,  RM(EA) ); WM( EA,D );               } /* RR   D=(XY+o)    */
1916OP(xycb,1b) { E = RR(z80,  RM(EA) ); WM( EA,E );               } /* RR   E=(XY+o)    */
1917OP(xycb,1c) { H = RR(z80,  RM(EA) ); WM( EA,H );               } /* RR   H=(XY+o)    */
1918OP(xycb,1d) { L = RR(z80,  RM(EA) ); WM( EA,L );               } /* RR   L=(XY+o)    */
1919OP(xycb,1e) { WM( EA,RR(z80,  RM(EA) ) );                     } /* RR   (XY+o)      */
1920OP(xycb,1f) { A = RR(z80,  RM(EA) ); WM( EA,A );               } /* RR   A=(XY+o)    */
18741921
1875OP(xycb,20) { B = SLA( RM(EA) ); WM( EA,B );               } /* SLA  B=(XY+o)    */
1876OP(xycb,21) { C = SLA( RM(EA) ); WM( EA,C );               } /* SLA  C=(XY+o)    */
1877OP(xycb,22) { D = SLA( RM(EA) ); WM( EA,D );               } /* SLA  D=(XY+o)    */
1878OP(xycb,23) { E = SLA( RM(EA) ); WM( EA,E );               } /* SLA  E=(XY+o)    */
1879OP(xycb,24) { H = SLA( RM(EA) ); WM( EA,H );               } /* SLA  H=(XY+o)    */
1880OP(xycb,25) { L = SLA( RM(EA) ); WM( EA,L );               } /* SLA  L=(XY+o)    */
1881OP(xycb,26) { WM( EA,SLA( RM(EA) ) );                     } /* SLA  (XY+o)      */
1882OP(xycb,27) { A = SLA( RM(EA) ); WM( EA,A );               } /* SLA  A=(XY+o)    */
1922OP(xycb,20) { B = SLA(z80,  RM(EA) ); WM( EA,B );               } /* SLA  B=(XY+o)    */
1923OP(xycb,21) { C = SLA(z80,  RM(EA) ); WM( EA,C );               } /* SLA  C=(XY+o)    */
1924OP(xycb,22) { D = SLA(z80,  RM(EA) ); WM( EA,D );               } /* SLA  D=(XY+o)    */
1925OP(xycb,23) { E = SLA(z80,  RM(EA) ); WM( EA,E );               } /* SLA  E=(XY+o)    */
1926OP(xycb,24) { H = SLA(z80,  RM(EA) ); WM( EA,H );               } /* SLA  H=(XY+o)    */
1927OP(xycb,25) { L = SLA(z80,  RM(EA) ); WM( EA,L );               } /* SLA  L=(XY+o)    */
1928OP(xycb,26) { WM( EA,SLA(z80,  RM(EA) ) );                     } /* SLA  (XY+o)      */
1929OP(xycb,27) { A = SLA(z80,  RM(EA) ); WM( EA,A );               } /* SLA  A=(XY+o)    */
18831930
1884OP(xycb,28) { B = SRA( RM(EA) ); WM( EA,B );               } /* SRA  B=(XY+o)    */
1885OP(xycb,29) { C = SRA( RM(EA) ); WM( EA,C );               } /* SRA  C=(XY+o)    */
1886OP(xycb,2a) { D = SRA( RM(EA) ); WM( EA,D );               } /* SRA  D=(XY+o)    */
1887OP(xycb,2b) { E = SRA( RM(EA) ); WM( EA,E );               } /* SRA  E=(XY+o)    */
1888OP(xycb,2c) { H = SRA( RM(EA) ); WM( EA,H );               } /* SRA  H=(XY+o)    */
1889OP(xycb,2d) { L = SRA( RM(EA) ); WM( EA,L );               } /* SRA  L=(XY+o)    */
1890OP(xycb,2e) { WM( EA,SRA( RM(EA) ) );                     } /* SRA  (XY+o)      */
1891OP(xycb,2f) { A = SRA( RM(EA) ); WM( EA,A );               } /* SRA  A=(XY+o)    */
1931OP(xycb,28) { B = SRA(z80,  RM(EA) ); WM( EA,B );               } /* SRA  B=(XY+o)    */
1932OP(xycb,29) { C = SRA(z80,  RM(EA) ); WM( EA,C );               } /* SRA  C=(XY+o)    */
1933OP(xycb,2a) { D = SRA(z80,  RM(EA) ); WM( EA,D );               } /* SRA  D=(XY+o)    */
1934OP(xycb,2b) { E = SRA(z80,  RM(EA) ); WM( EA,E );               } /* SRA  E=(XY+o)    */
1935OP(xycb,2c) { H = SRA(z80,  RM(EA) ); WM( EA,H );               } /* SRA  H=(XY+o)    */
1936OP(xycb,2d) { L = SRA(z80,  RM(EA) ); WM( EA,L );               } /* SRA  L=(XY+o)    */
1937OP(xycb,2e) { WM( EA,SRA(z80,  RM(EA) ) );                     } /* SRA  (XY+o)      */
1938OP(xycb,2f) { A = SRA(z80,  RM(EA) ); WM( EA,A );               } /* SRA  A=(XY+o)    */
18921939
1893OP(xycb,30) { B = SLL( RM(EA) ); WM( EA,B );               } /* SLL  B=(XY+o)    */
1894OP(xycb,31) { C = SLL( RM(EA) ); WM( EA,C );               } /* SLL  C=(XY+o)    */
1895OP(xycb,32) { D = SLL( RM(EA) ); WM( EA,D );               } /* SLL  D=(XY+o)    */
1896OP(xycb,33) { E = SLL( RM(EA) ); WM( EA,E );               } /* SLL  E=(XY+o)    */
1897OP(xycb,34) { H = SLL( RM(EA) ); WM( EA,H );               } /* SLL  H=(XY+o)    */
1898OP(xycb,35) { L = SLL( RM(EA) ); WM( EA,L );               } /* SLL  L=(XY+o)    */
1899OP(xycb,36) { WM( EA,SLL( RM(EA) ) );                     } /* SLL  (XY+o)      */
1900OP(xycb,37) { A = SLL( RM(EA) ); WM( EA,A );               } /* SLL  A=(XY+o)    */
1940OP(xycb,30) { B = SLL(z80,  RM(EA) ); WM( EA,B );               } /* SLL  B=(XY+o)    */
1941OP(xycb,31) { C = SLL(z80,  RM(EA) ); WM( EA,C );               } /* SLL  C=(XY+o)    */
1942OP(xycb,32) { D = SLL(z80,  RM(EA) ); WM( EA,D );               } /* SLL  D=(XY+o)    */
1943OP(xycb,33) { E = SLL(z80,  RM(EA) ); WM( EA,E );               } /* SLL  E=(XY+o)    */
1944OP(xycb,34) { H = SLL(z80,  RM(EA) ); WM( EA,H );               } /* SLL  H=(XY+o)    */
1945OP(xycb,35) { L = SLL(z80,  RM(EA) ); WM( EA,L );               } /* SLL  L=(XY+o)    */
1946OP(xycb,36) { WM( EA,SLL(z80,  RM(EA) ) );                     } /* SLL  (XY+o)      */
1947OP(xycb,37) { A = SLL(z80,  RM(EA) ); WM( EA,A );               } /* SLL  A=(XY+o)    */
19011948
1902OP(xycb,38) { B = SRL( RM(EA) ); WM( EA,B );               } /* SRL  B=(XY+o)    */
1903OP(xycb,39) { C = SRL( RM(EA) ); WM( EA,C );               } /* SRL  C=(XY+o)    */
1904OP(xycb,3a) { D = SRL( RM(EA) ); WM( EA,D );               } /* SRL  D=(XY+o)    */
1905OP(xycb,3b) { E = SRL( RM(EA) ); WM( EA,E );               } /* SRL  E=(XY+o)    */
1906OP(xycb,3c) { H = SRL( RM(EA) ); WM( EA,H );               } /* SRL  H=(XY+o)    */
1907OP(xycb,3d) { L = SRL( RM(EA) ); WM( EA,L );               } /* SRL  L=(XY+o)    */
1908OP(xycb,3e) { WM( EA,SRL( RM(EA) ) );                     } /* SRL  (XY+o)      */
1909OP(xycb,3f) { A = SRL( RM(EA) ); WM( EA,A );               } /* SRL  A=(XY+o)    */
1949OP(xycb,38) { B = SRL(z80,  RM(EA) ); WM( EA,B );               } /* SRL  B=(XY+o)    */
1950OP(xycb,39) { C = SRL(z80,  RM(EA) ); WM( EA,C );               } /* SRL  C=(XY+o)    */
1951OP(xycb,3a) { D = SRL(z80,  RM(EA) ); WM( EA,D );               } /* SRL  D=(XY+o)    */
1952OP(xycb,3b) { E = SRL(z80,  RM(EA) ); WM( EA,E );               } /* SRL  E=(XY+o)    */
1953OP(xycb,3c) { H = SRL(z80,  RM(EA) ); WM( EA,H );               } /* SRL  H=(XY+o)    */
1954OP(xycb,3d) { L = SRL(z80,  RM(EA) ); WM( EA,L );               } /* SRL  L=(XY+o)    */
1955OP(xycb,3e) { WM( EA,SRL(z80,  RM(EA) ) );                     } /* SRL  (XY+o)      */
1956OP(xycb,3f) { A = SRL(z80,  RM(EA) ); WM( EA,A );               } /* SRL  A=(XY+o)    */
19101957
1911OP(xycb,40) { xycb_46();                              } /* BIT  0,(XY+o)    */
1912OP(xycb,41) { xycb_46();                              } /* BIT  0,(XY+o)    */
1913OP(xycb,42) { xycb_46();                              } /* BIT  0,(XY+o)    */
1914OP(xycb,43) { xycb_46();                              } /* BIT  0,(XY+o)    */
1915OP(xycb,44) { xycb_46();                              } /* BIT  0,(XY+o)    */
1916OP(xycb,45) { xycb_46();                              } /* BIT  0,(XY+o)    */
1917OP(xycb,46) { BIT_XY(0,RM(EA));                           } /* BIT  0,(XY+o)    */
1918OP(xycb,47) { xycb_46();                              } /* BIT  0,(XY+o)    */
1958OP(xycb,40) { xycb_46(z80);                                 } /* BIT  0,(XY+o)    */
1959OP(xycb,41) { xycb_46(z80);                                 } /* BIT  0,(XY+o)    */
1960OP(xycb,42) { xycb_46(z80);                                 } /* BIT  0,(XY+o)    */
1961OP(xycb,43) { xycb_46(z80);                                 } /* BIT  0,(XY+o)    */
1962OP(xycb,44) { xycb_46(z80);                                 } /* BIT  0,(XY+o)    */
1963OP(xycb,45) { xycb_46(z80);                                 } /* BIT  0,(XY+o)    */
1964OP(xycb,46) { BIT_XY(0,RM(EA));                              } /* BIT  0,(XY+o)    */
1965OP(xycb,47) { xycb_46(z80);                                 } /* BIT  0,(XY+o)    */
19191966
1920OP(xycb,48) { xycb_4e();                              } /* BIT  1,(XY+o)    */
1921OP(xycb,49) { xycb_4e();                              } /* BIT  1,(XY+o)    */
1922OP(xycb,4a) { xycb_4e();                              } /* BIT  1,(XY+o)    */
1923OP(xycb,4b) { xycb_4e();                              } /* BIT  1,(XY+o)    */
1924OP(xycb,4c) { xycb_4e();                              } /* BIT  1,(XY+o)    */
1925OP(xycb,4d) { xycb_4e();                              } /* BIT  1,(XY+o)    */
1926OP(xycb,4e) { BIT_XY(1,RM(EA));                           } /* BIT  1,(XY+o)    */
1927OP(xycb,4f) { xycb_4e();                              } /* BIT  1,(XY+o)    */
1967OP(xycb,48) { xycb_4e(z80);                                 } /* BIT  1,(XY+o)    */
1968OP(xycb,49) { xycb_4e(z80);                                 } /* BIT  1,(XY+o)    */
1969OP(xycb,4a) { xycb_4e(z80);                                 } /* BIT  1,(XY+o)    */
1970OP(xycb,4b) { xycb_4e(z80);                                 } /* BIT  1,(XY+o)    */
1971OP(xycb,4c) { xycb_4e(z80);                                 } /* BIT  1,(XY+o)    */
1972OP(xycb,4d) { xycb_4e(z80);                                 } /* BIT  1,(XY+o)    */
1973OP(xycb,4e) { BIT_XY(1,RM(EA));                              } /* BIT  1,(XY+o)    */
1974OP(xycb,4f) { xycb_4e(z80);                                 } /* BIT  1,(XY+o)    */
19281975
1929OP(xycb,50) { xycb_56();                              } /* BIT  2,(XY+o)    */
1930OP(xycb,51) { xycb_56();                              } /* BIT  2,(XY+o)    */
1931OP(xycb,52) { xycb_56();                              } /* BIT  2,(XY+o)    */
1932OP(xycb,53) { xycb_56();                              } /* BIT  2,(XY+o)    */
1933OP(xycb,54) { xycb_56();                              } /* BIT  2,(XY+o)    */
1934OP(xycb,55) { xycb_56();                              } /* BIT  2,(XY+o)    */
1935OP(xycb,56) { BIT_XY(2,RM(EA));                           } /* BIT  2,(XY+o)    */
1936OP(xycb,57) { xycb_56();                              } /* BIT  2,(XY+o)    */
1976OP(xycb,50) { xycb_56(z80);                                 } /* BIT  2,(XY+o)    */
1977OP(xycb,51) { xycb_56(z80);                                 } /* BIT  2,(XY+o)    */
1978OP(xycb,52) { xycb_56(z80);                                 } /* BIT  2,(XY+o)    */
1979OP(xycb,53) { xycb_56(z80);                                 } /* BIT  2,(XY+o)    */
1980OP(xycb,54) { xycb_56(z80);                                 } /* BIT  2,(XY+o)    */
1981OP(xycb,55) { xycb_56(z80);                                 } /* BIT  2,(XY+o)    */
1982OP(xycb,56) { BIT_XY(2,RM(EA));                              } /* BIT  2,(XY+o)    */
1983OP(xycb,57) { xycb_56(z80);                                 } /* BIT  2,(XY+o)    */
19371984
1938OP(xycb,58) { xycb_5e();                              } /* BIT  3,(XY+o)    */
1939OP(xycb,59) { xycb_5e();                              } /* BIT  3,(XY+o)    */
1940OP(xycb,5a) { xycb_5e();                              } /* BIT  3,(XY+o)    */
1941OP(xycb,5b) { xycb_5e();                              } /* BIT  3,(XY+o)    */
1942OP(xycb,5c) { xycb_5e();                              } /* BIT  3,(XY+o)    */
1943OP(xycb,5d) { xycb_5e();                              } /* BIT  3,(XY+o)    */
1944OP(xycb,5e) { BIT_XY(3,RM(EA));                           } /* BIT  3,(XY+o)    */
1945OP(xycb,5f) { xycb_5e();                              } /* BIT  3,(XY+o)    */
1985OP(xycb,58) { xycb_5e(z80);                                 } /* BIT  3,(XY+o)    */
1986OP(xycb,59) { xycb_5e(z80);                                 } /* BIT  3,(XY+o)    */
1987OP(xycb,5a) { xycb_5e(z80);                                 } /* BIT  3,(XY+o)    */
1988OP(xycb,5b) { xycb_5e(z80);                                 } /* BIT  3,(XY+o)    */
1989OP(xycb,5c) { xycb_5e(z80);                                 } /* BIT  3,(XY+o)    */
1990OP(xycb,5d) { xycb_5e(z80);                                 } /* BIT  3,(XY+o)    */
1991OP(xycb,5e) { BIT_XY(3,RM(EA));                              } /* BIT  3,(XY+o)    */
1992OP(xycb,5f) { xycb_5e(z80);                                 } /* BIT  3,(XY+o)    */
19461993
1947OP(xycb,60) { xycb_66();                              } /* BIT  4,(XY+o)    */
1948OP(xycb,61) { xycb_66();                              } /* BIT  4,(XY+o)    */
1949OP(xycb,62) { xycb_66();                              } /* BIT  4,(XY+o)    */
1950OP(xycb,63) { xycb_66();                              } /* BIT  4,(XY+o)    */
1951OP(xycb,64) { xycb_66();                              } /* BIT  4,(XY+o)    */
1952OP(xycb,65) { xycb_66();                              } /* BIT  4,(XY+o)    */
1953OP(xycb,66) { BIT_XY(4,RM(EA));                           } /* BIT  4,(XY+o)    */
1954OP(xycb,67) { xycb_66();                              } /* BIT  4,(XY+o)    */
1994OP(xycb,60) { xycb_66(z80);                                 } /* BIT  4,(XY+o)    */
1995OP(xycb,61) { xycb_66(z80);                                 } /* BIT  4,(XY+o)    */
1996OP(xycb,62) { xycb_66(z80);                                 } /* BIT  4,(XY+o)    */
1997OP(xycb,63) { xycb_66(z80);                                 } /* BIT  4,(XY+o)    */
1998OP(xycb,64) { xycb_66(z80);                                 } /* BIT  4,(XY+o)    */
1999OP(xycb,65) { xycb_66(z80);                                 } /* BIT  4,(XY+o)    */
2000OP(xycb,66) { BIT_XY(4,RM(EA));                              } /* BIT  4,(XY+o)    */
2001OP(xycb,67) { xycb_66(z80);                                 } /* BIT  4,(XY+o)    */
19552002
1956OP(xycb,68) { xycb_6e();                              } /* BIT  5,(XY+o)    */
1957OP(xycb,69) { xycb_6e();                              } /* BIT  5,(XY+o)    */
1958OP(xycb,6a) { xycb_6e();                              } /* BIT  5,(XY+o)    */
1959OP(xycb,6b) { xycb_6e();                              } /* BIT  5,(XY+o)    */
1960OP(xycb,6c) { xycb_6e();                              } /* BIT  5,(XY+o)    */
1961OP(xycb,6d) { xycb_6e();                              } /* BIT  5,(XY+o)    */
1962OP(xycb,6e) { BIT_XY(5,RM(EA));                           } /* BIT  5,(XY+o)    */
1963OP(xycb,6f) { xycb_6e();                              } /* BIT  5,(XY+o)    */
2003OP(xycb,68) { xycb_6e(z80);                                 } /* BIT  5,(XY+o)    */
2004OP(xycb,69) { xycb_6e(z80);                                 } /* BIT  5,(XY+o)    */
2005OP(xycb,6a) { xycb_6e(z80);                                 } /* BIT  5,(XY+o)    */
2006OP(xycb,6b) { xycb_6e(z80);                                 } /* BIT  5,(XY+o)    */
2007OP(xycb,6c) { xycb_6e(z80);                                 } /* BIT  5,(XY+o)    */
2008OP(xycb,6d) { xycb_6e(z80);                                 } /* BIT  5,(XY+o)    */
2009OP(xycb,6e) { BIT_XY(5,RM(EA));                              } /* BIT  5,(XY+o)    */
2010OP(xycb,6f) { xycb_6e(z80);                                 } /* BIT  5,(XY+o)    */
19642011
1965OP(xycb,70) { xycb_66();                              } /* BIT  6,(XY+o)    */
1966OP(xycb,71) { xycb_66();                              } /* BIT  6,(XY+o)    */
1967OP(xycb,72) { xycb_66();                              } /* BIT  6,(XY+o)    */
1968OP(xycb,73) { xycb_66();                              } /* BIT  6,(XY+o)    */
1969OP(xycb,74) { xycb_66();                              } /* BIT  6,(XY+o)    */
1970OP(xycb,75) { xycb_66();                              } /* BIT  6,(XY+o)    */
1971OP(xycb,76) { BIT_XY(6,RM(EA));                           } /* BIT  6,(XY+o)    */
1972OP(xycb,77) { xycb_66();                              } /* BIT  6,(XY+o)    */
2012OP(xycb,70) { xycb_76(z80);                                 } /* BIT  6,(XY+o)    */
2013OP(xycb,71) { xycb_76(z80);                                 } /* BIT  6,(XY+o)    */
2014OP(xycb,72) { xycb_76(z80);                                 } /* BIT  6,(XY+o)    */
2015OP(xycb,73) { xycb_76(z80);                                 } /* BIT  6,(XY+o)    */
2016OP(xycb,74) { xycb_76(z80);                                 } /* BIT  6,(XY+o)    */
2017OP(xycb,75) { xycb_76(z80);                                 } /* BIT  6,(XY+o)    */
2018OP(xycb,76) { BIT_XY(6,RM(EA));                              } /* BIT  6,(XY+o)    */
2019OP(xycb,77) { xycb_76(z80);                                 } /* BIT  6,(XY+o)    */
19732020
1974OP(xycb,78) { xycb_7e();                              } /* BIT  7,(XY+o)    */
1975OP(xycb,79) { xycb_7e();                              } /* BIT  7,(XY+o)    */
1976OP(xycb,7a) { xycb_7e();                              } /* BIT  7,(XY+o)    */
1977OP(xycb,7b) { xycb_7e();                              } /* BIT  7,(XY+o)    */
1978OP(xycb,7c) { xycb_7e();                              } /* BIT  7,(XY+o)    */
1979OP(xycb,7d) { xycb_7e();                              } /* BIT  7,(XY+o)    */
1980OP(xycb,7e) { BIT_XY(7,RM(EA));                           } /* BIT  7,(XY+o)    */
1981OP(xycb,7f) { xycb_7e();                              } /* BIT  7,(XY+o)    */
2021OP(xycb,78) { xycb_7e(z80);                                 } /* BIT  7,(XY+o)    */
2022OP(xycb,79) { xycb_7e(z80);                                 } /* BIT  7,(XY+o)    */
2023OP(xycb,7a) { xycb_7e(z80);                                 } /* BIT  7,(XY+o)    */
2024OP(xycb,7b) { xycb_7e(z80);                                 } /* BIT  7,(XY+o)    */
2025OP(xycb,7c) { xycb_7e(z80);                                 } /* BIT  7,(XY+o)    */
2026OP(xycb,7d) { xycb_7e(z80);                                 } /* BIT  7,(XY+o)    */
2027OP(xycb,7e) { BIT_XY(7,RM(EA));                              } /* BIT  7,(XY+o)    */
2028OP(xycb,7f) { xycb_7e(z80);                                 } /* BIT  7,(XY+o)    */
19822029
1983OP(xycb,80) { B = RES(0, RM(EA) ); WM( EA,B );               } /* RES  0,B=(XY+o)  */
1984OP(xycb,81) { C = RES(0, RM(EA) ); WM( EA,C );               } /* RES  0,C=(XY+o)  */
1985OP(xycb,82) { D = RES(0, RM(EA) ); WM( EA,D );               } /* RES  0,D=(XY+o)  */
1986OP(xycb,83) { E = RES(0, RM(EA) ); WM( EA,E );               } /* RES  0,E=(XY+o)  */
1987OP(xycb,84) { H = RES(0, RM(EA) ); WM( EA,H );               } /* RES  0,H=(XY+o)  */
1988OP(xycb,85) { L = RES(0, RM(EA) ); WM( EA,L );               } /* RES  0,L=(XY+o)  */
1989OP(xycb,86) { WM( EA, RES(0,RM(EA)) );                     } /* RES  0,(XY+o)    */
1990OP(xycb,87) { A = RES(0, RM(EA) ); WM( EA,A );               } /* RES  0,A=(XY+o)  */
2030OP(xycb,80) { B = RES(0, RM(EA) ); WM( EA,B );                  } /* RES  0,B=(XY+o)  */
2031OP(xycb,81) { C = RES(0, RM(EA) ); WM( EA,C );                  } /* RES  0,C=(XY+o)  */
2032OP(xycb,82) { D = RES(0, RM(EA) ); WM( EA,D );                  } /* RES  0,D=(XY+o)  */
2033OP(xycb,83) { E = RES(0, RM(EA) ); WM( EA,E );                  } /* RES  0,E=(XY+o)  */
2034OP(xycb,84) { H = RES(0, RM(EA) ); WM( EA,H );                  } /* RES  0,H=(XY+o)  */
2035OP(xycb,85) { L = RES(0, RM(EA) ); WM( EA,L );                  } /* RES  0,L=(XY+o)  */
2036OP(xycb,86) { WM( EA, RES(0,RM(EA)) );                        } /* RES  0,(XY+o)    */
2037OP(xycb,87) { A = RES(0, RM(EA) ); WM( EA,A );                  } /* RES  0,A=(XY+o)  */
19912038
1992OP(xycb,88) { B = RES(1, RM(EA) ); WM( EA,B );               } /* RES  1,B=(XY+o)  */
1993OP(xycb,89) { C = RES(1, RM(EA) ); WM( EA,C );               } /* RES  1,C=(XY+o)  */
1994OP(xycb,8a) { D = RES(1, RM(EA) ); WM( EA,D );               } /* RES  1,D=(XY+o)  */
1995OP(xycb,8b) { E = RES(1, RM(EA) ); WM( EA,E );               } /* RES  1,E=(XY+o)  */
1996OP(xycb,8c) { H = RES(1, RM(EA) ); WM( EA,H );               } /* RES  1,H=(XY+o)  */
1997OP(xycb,8d) { L = RES(1, RM(EA) ); WM( EA,L );               } /* RES  1,L=(XY+o)  */
1998OP(xycb,8e) { WM( EA, RES(1,RM(EA)) );                     } /* RES  1,(XY+o)    */
1999OP(xycb,8f) { A = RES(1, RM(EA) ); WM( EA,A );               } /* RES  1,A=(XY+o)  */
2039OP(xycb,88) { B = RES(1, RM(EA) ); WM( EA,B );                  } /* RES  1,B=(XY+o)  */
2040OP(xycb,89) { C = RES(1, RM(EA) ); WM( EA,C );                  } /* RES  1,C=(XY+o)  */
2041OP(xycb,8a) { D = RES(1, RM(EA) ); WM( EA,D );                  } /* RES  1,D=(XY+o)  */
2042OP(xycb,8b) { E = RES(1, RM(EA) ); WM( EA,E );                  } /* RES  1,E=(XY+o)  */
2043OP(xycb,8c) { H = RES(1, RM(EA) ); WM( EA,H );                  } /* RES  1,H=(XY+o)  */
2044OP(xycb,8d) { L = RES(1, RM(EA) ); WM( EA,L );                  } /* RES  1,L=(XY+o)  */
2045OP(xycb,8e) { WM( EA, RES(1,RM(EA)) );                        } /* RES  1,(XY+o)    */
2046OP(xycb,8f) { A = RES(1, RM(EA) ); WM( EA,A );                  } /* RES  1,A=(XY+o)  */
20002047
2001OP(xycb,90) { B = RES(2, RM(EA) ); WM( EA,B );               } /* RES  2,B=(XY+o)  */
2002OP(xycb,91) { C = RES(2, RM(EA) ); WM( EA,C );               } /* RES  2,C=(XY+o)  */
2003OP(xycb,92) { D = RES(2, RM(EA) ); WM( EA,D );               } /* RES  2,D=(XY+o)  */
2004OP(xycb,93) { E = RES(2, RM(EA) ); WM( EA,E );               } /* RES  2,E=(XY+o)  */
2005OP(xycb,94) { H = RES(2, RM(EA) ); WM( EA,H );               } /* RES  2,H=(XY+o)  */
2006OP(xycb,95) { L = RES(2, RM(EA) ); WM( EA,L );               } /* RES  2,L=(XY+o)  */
2007OP(xycb,96) { WM( EA, RES(2,RM(EA)) );                     } /* RES  2,(XY+o)    */
2008OP(xycb,97) { A = RES(2, RM(EA) ); WM( EA,A );               } /* RES  2,A=(XY+o)  */
2048OP(xycb,90) { B = RES(2, RM(EA) ); WM( EA,B );                  } /* RES  2,B=(XY+o)  */
2049OP(xycb,91) { C = RES(2, RM(EA) ); WM( EA,C );                  } /* RES  2,C=(XY+o)  */
2050OP(xycb,92) { D = RES(2, RM(EA) ); WM( EA,D );                  } /* RES  2,D=(XY+o)  */
2051OP(xycb,93) { E = RES(2, RM(EA) ); WM( EA,E );                  } /* RES  2,E=(XY+o)  */
2052OP(xycb,94) { H = RES(2, RM(EA) ); WM( EA,H );                  } /* RES  2,H=(XY+o)  */
2053OP(xycb,95) { L = RES(2, RM(EA) ); WM( EA,L );                  } /* RES  2,L=(XY+o)  */
2054OP(xycb,96) { WM( EA, RES(2,RM(EA)) );                        } /* RES  2,(XY+o)    */
2055OP(xycb,97) { A = RES(2, RM(EA) ); WM( EA,A );                  } /* RES  2,A=(XY+o)  */
20092056
2010OP(xycb,98) { B = RES(3, RM(EA) ); WM( EA,B );               } /* RES  3,B=(XY+o)  */
2011OP(xycb,99) { C = RES(3, RM(EA) ); WM( EA,C );               } /* RES  3,C=(XY+o)  */
2012OP(xycb,9a) { D = RES(3, RM(EA) ); WM( EA,D );               } /* RES  3,D=(XY+o)  */
2013OP(xycb,9b) { E = RES(3, RM(EA) ); WM( EA,E );               } /* RES  3,E=(XY+o)  */
2014OP(xycb,9c) { H = RES(3, RM(EA) ); WM( EA,H );               } /* RES  3,H=(XY+o)  */
2015OP(xycb,9d) { L = RES(3, RM(EA) ); WM( EA,L );               } /* RES  3,L=(XY+o)  */
2016OP(xycb,9e) { WM( EA, RES(3,RM(EA)) );                     } /* RES  3,(XY+o)    */
2017OP(xycb,9f) { A = RES(3, RM(EA) ); WM( EA,A );               } /* RES  3,A=(XY+o)  */
2057OP(xycb,98) { B = RES(3, RM(EA) ); WM( EA,B );                  } /* RES  3,B=(XY+o)  */
2058OP(xycb,99) { C = RES(3, RM(EA) ); WM( EA,C );                  } /* RES  3,C=(XY+o)  */
2059OP(xycb,9a) { D = RES(3, RM(EA) ); WM( EA,D );                  } /* RES  3,D=(XY+o)  */
2060OP(xycb,9b) { E = RES(3, RM(EA) ); WM( EA,E );                  } /* RES  3,E=(XY+o)  */
2061OP(xycb,9c) { H = RES(3, RM(EA) ); WM( EA,H );                  } /* RES  3,H=(XY+o)  */
2062OP(xycb,9d) { L = RES(3, RM(EA) ); WM( EA,L );                  } /* RES  3,L=(XY+o)  */
2063OP(xycb,9e) { WM( EA, RES(3,RM(EA)) );                        } /* RES  3,(XY+o)    */
2064OP(xycb,9f) { A = RES(3, RM(EA) ); WM( EA,A );                  } /* RES  3,A=(XY+o)  */
20182065
2019OP(xycb,a0) { B = RES(4, RM(EA) ); WM( EA,B );               } /* RES  4,B=(XY+o)  */
2020OP(xycb,a1) { C = RES(4, RM(EA) ); WM( EA,C );               } /* RES  4,C=(XY+o)  */
2021OP(xycb,a2) { D = RES(4, RM(EA) ); WM( EA,D );               } /* RES  4,D=(XY+o)  */
2022OP(xycb,a3) { E = RES(4, RM(EA) ); WM( EA,E );               } /* RES  4,E=(XY+o)  */
2023OP(xycb,a4) { H = RES(4, RM(EA) ); WM( EA,H );               } /* RES  4,H=(XY+o)  */
2024OP(xycb,a5) { L = RES(4, RM(EA) ); WM( EA,L );               } /* RES  4,L=(XY+o)  */
2025OP(xycb,a6) { WM( EA, RES(4,RM(EA)) );                     } /* RES  4,(XY+o)    */
2026OP(xycb,a7) { A = RES(4, RM(EA) ); WM( EA,A );               } /* RES  4,A=(XY+o)  */
2066OP(xycb,a0) { B = RES(4, RM(EA) ); WM( EA,B );                  } /* RES  4,B=(XY+o)  */
2067OP(xycb,a1) { C = RES(4, RM(EA) ); WM( EA,C );                  } /* RES  4,C=(XY+o)  */
2068OP(xycb,a2) { D = RES(4, RM(EA) ); WM( EA,D );                  } /* RES  4,D=(XY+o)  */
2069OP(xycb,a3) { E = RES(4, RM(EA) ); WM( EA,E );                  } /* RES  4,E=(XY+o)  */
2070OP(xycb,a4) { H = RES(4, RM(EA) ); WM( EA,H );                  } /* RES  4,H=(XY+o)  */
2071OP(xycb,a5) { L = RES(4, RM(EA) ); WM( EA,L );                  } /* RES  4,L=(XY+o)  */
2072OP(xycb,a6) { WM( EA, RES(4,RM(EA)) );                        } /* RES  4,(XY+o)    */
2073OP(xycb,a7) { A = RES(4, RM(EA) ); WM( EA,A );                  } /* RES  4,A=(XY+o)  */
20272074
2028OP(xycb,a8) { B = RES(5, RM(EA) ); WM( EA,B );               } /* RES  5,B=(XY+o)  */
2029OP(xycb,a9) { C = RES(5, RM(EA) ); WM( EA,C );               } /* RES  5,C=(XY+o)  */
2030OP(xycb,aa) { D = RES(5, RM(EA) ); WM( EA,D );               } /* RES  5,D=(XY+o)  */
2031OP(xycb,ab) { E = RES(5, RM(EA) ); WM( EA,E );               } /* RES  5,E=(XY+o)  */
2032OP(xycb,ac) { H = RES(5, RM(EA) ); WM( EA,H );               } /* RES  5,H=(XY+o)  */
2033OP(xycb,ad) { L = RES(5, RM(EA) ); WM( EA,L );               } /* RES  5,L=(XY+o)  */
2034OP(xycb,ae) { WM( EA, RES(5,RM(EA)) );                     } /* RES  5,(XY+o)    */
2035OP(xycb,af) { A = RES(5, RM(EA) ); WM( EA,A );               } /* RES  5,A=(XY+o)  */
2075OP(xycb,a8) { B = RES(5, RM(EA) ); WM( EA,B );                  } /* RES  5,B=(XY+o)  */
2076OP(xycb,a9) { C = RES(5, RM(EA) ); WM( EA,C );                  } /* RES  5,C=(XY+o)  */
2077OP(xycb,aa) { D = RES(5, RM(EA) ); WM( EA,D );                  } /* RES  5,D=(XY+o)  */
2078OP(xycb,ab) { E = RES(5, RM(EA) ); WM( EA,E );                  } /* RES  5,E=(XY+o)  */
2079OP(xycb,ac) { H = RES(5, RM(EA) ); WM( EA,H );                  } /* RES  5,H=(XY+o)  */
2080OP(xycb,ad) { L = RES(5, RM(EA) ); WM( EA,L );                  } /* RES  5,L=(XY+o)  */
2081OP(xycb,ae) { WM( EA, RES(5,RM(EA)) );                        } /* RES  5,(XY+o)    */
2082OP(xycb,af) { A = RES(5, RM(EA) ); WM( EA,A );                  } /* RES  5,A=(XY+o)  */
20362083
2037OP(xycb,b0) { B = RES(6, RM(EA) ); WM( EA,B );               } /* RES  6,B=(XY+o)  */
2038OP(xycb,b1) { C = RES(6, RM(EA) ); WM( EA,C );               } /* RES  6,C=(XY+o)  */
2039OP(xycb,b2) { D = RES(6, RM(EA) ); WM( EA,D );               } /* RES  6,D=(XY+o)  */
2040OP(xycb,b3) { E = RES(6, RM(EA) ); WM( EA,E );               } /* RES  6,E=(XY+o)  */
2041OP(xycb,b4) { H = RES(6, RM(EA) ); WM( EA,H );               } /* RES  6,H=(XY+o)  */
2042OP(xycb,b5) { L = RES(6, RM(EA) ); WM( EA,L );               } /* RES  6,L=(XY+o)  */
2043OP(xycb,b6) { WM( EA, RES(6,RM(EA)) );                     } /* RES  6,(XY+o)    */
2044OP(xycb,b7) { A = RES(6, RM(EA) ); WM( EA,A );               } /* RES  6,A=(XY+o)  */
2084OP(xycb,b0) { B = RES(6, RM(EA) ); WM( EA,B );                  } /* RES  6,B=(XY+o)  */
2085OP(xycb,b1) { C = RES(6, RM(EA) ); WM( EA,C );                  } /* RES  6,C=(XY+o)  */
2086OP(xycb,b2) { D = RES(6, RM(EA) ); WM( EA,D );                  } /* RES  6,D=(XY+o)  */
2087OP(xycb,b3) { E = RES(6, RM(EA) ); WM( EA,E );                  } /* RES  6,E=(XY+o)  */
2088OP(xycb,b4) { H = RES(6, RM(EA) ); WM( EA,H );                  } /* RES  6,H=(XY+o)  */
2089OP(xycb,b5) { L = RES(6, RM(EA) ); WM( EA,L );                  } /* RES  6,L=(XY+o)  */
2090OP(xycb,b6) { WM( EA, RES(6,RM(EA)) );                        } /* RES  6,(XY+o)    */
2091OP(xycb,b7) { A = RES(6, RM(EA) ); WM( EA,A );                  } /* RES  6,A=(XY+o)  */
20452092
2046OP(xycb,b8) { B = RES(7, RM(EA) ); WM( EA,B );               } /* RES  7,B=(XY+o)  */
2047OP(xycb,b9) { C = RES(7, RM(EA) ); WM( EA,C );               } /* RES  7,C=(XY+o)  */
2048OP(xycb,ba) { D = RES(7, RM(EA) ); WM( EA,D );               } /* RES  7,D=(XY+o)  */
2049OP(xycb,bb) { E = RES(7, RM(EA) ); WM( EA,E );               } /* RES  7,E=(XY+o)  */
2050OP(xycb,bc) { H = RES(7, RM(EA) ); WM( EA,H );               } /* RES  7,H=(XY+o)  */
2051OP(xycb,bd) { L = RES(7, RM(EA) ); WM( EA,L );               } /* RES  7,L=(XY+o)  */
2052OP(xycb,be) { WM( EA, RES(7,RM(EA)) );                     } /* RES  7,(XY+o)    */
2053OP(xycb,bf) { A = RES(7, RM(EA) ); WM( EA,A );               } /* RES  7,A=(XY+o)  */
2093OP(xycb,b8) { B = RES(7, RM(EA) ); WM( EA,B );                  } /* RES  7,B=(XY+o)  */
2094OP(xycb,b9) { C = RES(7, RM(EA) ); WM( EA,C );                  } /* RES  7,C=(XY+o)  */
2095OP(xycb,ba) { D = RES(7, RM(EA) ); WM( EA,D );                  } /* RES  7,D=(XY+o)  */
2096OP(xycb,bb) { E = RES(7, RM(EA) ); WM( EA,E );                  } /* RES  7,E=(XY+o)  */
2097OP(xycb,bc) { H = RES(7, RM(EA) ); WM( EA,H );                  } /* RES  7,H=(XY+o)  */
2098OP(xycb,bd) { L = RES(7, RM(EA) ); WM( EA,L );                  } /* RES  7,L=(XY+o)  */
2099OP(xycb,be) { WM( EA, RES(7,RM(EA)) );                        } /* RES  7,(XY+o)    */
2100OP(xycb,bf) { A = RES(7, RM(EA) ); WM( EA,A );                  } /* RES  7,A=(XY+o)  */
20542101
2055OP(xycb,c0) { B = SET(0, RM(EA) ); WM( EA,B );               } /* SET  0,B=(XY+o)  */
2056OP(xycb,c1) { C = SET(0, RM(EA) ); WM( EA,C );               } /* SET  0,C=(XY+o)  */
2057OP(xycb,c2) { D = SET(0, RM(EA) ); WM( EA,D );               } /* SET  0,D=(XY+o)  */
2058OP(xycb,c3) { E = SET(0, RM(EA) ); WM( EA,E );               } /* SET  0,E=(XY+o)  */
2059OP(xycb,c4) { H = SET(0, RM(EA) ); WM( EA,H );               } /* SET  0,H=(XY+o)  */
2060OP(xycb,c5) { L = SET(0, RM(EA) ); WM( EA,L );               } /* SET  0,L=(XY+o)  */
2061OP(xycb,c6) { WM( EA, SET(0,RM(EA)) );                     } /* SET  0,(XY+o)    */
2062OP(xycb,c7) { A = SET(0, RM(EA) ); WM( EA,A );               } /* SET  0,A=(XY+o)  */
2102OP(xycb,c0) { B = SET(0, RM(EA) ); WM( EA,B );                  } /* SET  0,B=(XY+o)  */
2103OP(xycb,c1) { C = SET(0, RM(EA) ); WM( EA,C );                  } /* SET  0,C=(XY+o)  */
2104OP(xycb,c2) { D = SET(0, RM(EA) ); WM( EA,D );                  } /* SET  0,D=(XY+o)  */
2105OP(xycb,c3) { E = SET(0, RM(EA) ); WM( EA,E );                  } /* SET  0,E=(XY+o)  */
2106OP(xycb,c4) { H = SET(0, RM(EA) ); WM( EA,H );                  } /* SET  0,H=(XY+o)  */
2107OP(xycb,c5) { L = SET(0, RM(EA) ); WM( EA,L );                  } /* SET  0,L=(XY+o)  */
2108OP(xycb,c6) { WM( EA, SET(0,RM(EA)) );                        } /* SET  0,(XY+o)    */
2109OP(xycb,c7) { A = SET(0, RM(EA) ); WM( EA,A );                  } /* SET  0,A=(XY+o)  */
20632110
2064OP(xycb,c8) { B = SET(1, RM(EA) ); WM( EA,B );               } /* SET  1,B=(XY+o)  */
2065OP(xycb,c9) { C = SET(1, RM(EA) ); WM( EA,C );               } /* SET  1,C=(XY+o)  */
2066OP(xycb,ca) { D = SET(1, RM(EA) ); WM( EA,D );               } /* SET  1,D=(XY+o)  */
2067OP(xycb,cb) { E = SET(1, RM(EA) ); WM( EA,E );               } /* SET  1,E=(XY+o)  */
2068OP(xycb,cc) { H = SET(1, RM(EA) ); WM( EA,H );               } /* SET  1,H=(XY+o)  */
2069OP(xycb,cd) { L = SET(1, RM(EA) ); WM( EA,L );               } /* SET  1,L=(XY+o)  */
2070OP(xycb,ce) { WM( EA, SET(1,RM(EA)) );                     } /* SET  1,(XY+o)    */
2071OP(xycb,cf) { A = SET(1, RM(EA) ); WM( EA,A );               } /* SET  1,A=(XY+o)  */
2111OP(xycb,c8) { B = SET(1, RM(EA) ); WM( EA,B );                  } /* SET  1,B=(XY+o)  */
2112OP(xycb,c9) { C = SET(1, RM(EA) ); WM( EA,C );                  } /* SET  1,C=(XY+o)  */
2113OP(xycb,ca) { D = SET(1, RM(EA) ); WM( EA,D );                  } /* SET  1,D=(XY+o)  */
2114OP(xycb,cb) { E = SET(1, RM(EA) ); WM( EA,E );                  } /* SET  1,E=(XY+o)  */
2115OP(xycb,cc) { H = SET(1, RM(EA) ); WM( EA,H );                  } /* SET  1,H=(XY+o)  */
2116OP(xycb,cd) { L = SET(1, RM(EA) ); WM( EA,L );                  } /* SET  1,L=(XY+o)  */
2117OP(xycb,ce) { WM( EA, SET(1,RM(EA)) );                        } /* SET  1,(XY+o)    */
2118OP(xycb,cf) { A = SET(1, RM(EA) ); WM( EA,A );                  } /* SET  1,A=(XY+o)  */
20722119
2073OP(xycb,d0) { B = SET(2, RM(EA) ); WM( EA,B );               } /* SET  2,B=(XY+o)  */
2074OP(xycb,d1) { C = SET(2, RM(EA) ); WM( EA,C );               } /* SET  2,C=(XY+o)  */
2075OP(xycb,d2) { D = SET(2, RM(EA) ); WM( EA,D );               } /* SET  2,D=(XY+o)  */
2076OP(xycb,d3) { E = SET(2, RM(EA) ); WM( EA,E );               } /* SET  2,E=(XY+o)  */
2077OP(xycb,d4) { H = SET(2, RM(EA) ); WM( EA,H );               } /* SET  2,H=(XY+o)  */
2078OP(xycb,d5) { L = SET(2, RM(EA) ); WM( EA,L );               } /* SET  2,L=(XY+o)  */
2079OP(xycb,d6) { WM( EA, SET(2,RM(EA)) );                     } /* SET  2,(XY+o)    */
2080OP(xycb,d7) { A = SET(2, RM(EA) ); WM( EA,A );               } /* SET  2,A=(XY+o)  */
2120OP(xycb,d0) { B = SET(2, RM(EA) ); WM( EA,B );                  } /* SET  2,B=(XY+o)  */
2121OP(xycb,d1) { C = SET(2, RM(EA) ); WM( EA,C );                  } /* SET  2,C=(XY+o)  */
2122OP(xycb,d2) { D = SET(2, RM(EA) ); WM( EA,D );                  } /* SET  2,D=(XY+o)  */
2123OP(xycb,d3) { E = SET(2, RM(EA) ); WM( EA,E );                  } /* SET  2,E=(XY+o)  */
2124OP(xycb,d4) { H = SET(2, RM(EA) ); WM( EA,H );                  } /* SET  2,H=(XY+o)  */
2125OP(xycb,d5) { L = SET(2, RM(EA) ); WM( EA,L );                  } /* SET  2,L=(XY+o)  */
2126OP(xycb,d6) { WM( EA, SET(2,RM(EA)) );                        } /* SET  2,(XY+o)    */
2127OP(xycb,d7) { A = SET(2, RM(EA) ); WM( EA,A );                  } /* SET  2,A=(XY+o)  */
20812128
2082OP(xycb,d8) { B = SET(3, RM(EA) ); WM( EA,B );               } /* SET  3,B=(XY+o)  */
2083OP(xycb,d9) { C = SET(3, RM(EA) ); WM( EA,C );               } /* SET  3,C=(XY+o)  */
2084OP(xycb,da) { D = SET(3, RM(EA) ); WM( EA,D );               } /* SET  3,D=(XY+o)  */
2085OP(xycb,db) { E = SET(3, RM(EA) ); WM( EA,E );               } /* SET  3,E=(XY+o)  */
2086OP(xycb,dc) { H = SET(3, RM(EA) ); WM( EA,H );               } /* SET  3,H=(XY+o)  */
2087OP(xycb,dd) { L = SET(3, RM(EA) ); WM( EA,L );               } /* SET  3,L=(XY+o)  */
2088OP(xycb,de) { WM( EA, SET(3,RM(EA)) );                     } /* SET  3,(XY+o)    */
2089OP(xycb,df) { A = SET(3, RM(EA) ); WM( EA,A );               } /* SET  3,A=(XY+o)  */
2129OP(xycb,d8) { B = SET(3, RM(EA) ); WM( EA,B );                  } /* SET  3,B=(XY+o)  */
2130OP(xycb,d9) { C = SET(3, RM(EA) ); WM( EA,C );                  } /* SET  3,C=(XY+o)  */
2131OP(xycb,da) { D = SET(3, RM(EA) ); WM( EA,D );                  } /* SET  3,D=(XY+o)  */
2132OP(xycb,db) { E = SET(3, RM(EA) ); WM( EA,E );                  } /* SET  3,E=(XY+o)  */
2133OP(xycb,dc) { H = SET(3, RM(EA) ); WM( EA,H );                  } /* SET  3,H=(XY+o)  */
2134OP(xycb,dd) { L = SET(3, RM(EA) ); WM( EA,L );                  } /* SET  3,L=(XY+o)  */
2135OP(xycb,de) { WM( EA, SET(3,RM(EA)) );                        } /* SET  3,(XY+o)    */
2136OP(xycb,df) { A = SET(3, RM(EA) ); WM( EA,A );                  } /* SET  3,A=(XY+o)  */
20902137
2091OP(xycb,e0) { B = SET(4, RM(EA) ); WM( EA,B );               } /* SET  4,B=(XY+o)  */
2092OP(xycb,e1) { C = SET(4, RM(EA) ); WM( EA,C );               } /* SET  4,C=(XY+o)  */
2093OP(xycb,e2) { D = SET(4, RM(EA) ); WM( EA,D );               } /* SET  4,D=(XY+o)  */
2094OP(xycb,e3) { E = SET(4, RM(EA) ); WM( EA,E );               } /* SET  4,E=(XY+o)  */
2095OP(xycb,e4) { H = SET(4, RM(EA) ); WM( EA,H );               } /* SET  4,H=(XY+o)  */
2096OP(xycb,e5) { L = SET(4, RM(EA) ); WM( EA,L );               } /* SET  4,L=(XY+o)  */
2097OP(xycb,e6) { WM( EA, SET(4,RM(EA)) );                     } /* SET  4,(XY+o)    */
2098OP(xycb,e7) { A = SET(4, RM(EA) ); WM( EA,A );               } /* SET  4,A=(XY+o)  */
2138OP(xycb,e0) { B = SET(4, RM(EA) ); WM( EA,B );                  } /* SET  4,B=(XY+o)  */
2139OP(xycb,e1) { C = SET(4, RM(EA) ); WM( EA,C );                  } /* SET  4,C=(XY+o)  */
2140OP(xycb,e2) { D = SET(4, RM(EA) ); WM( EA,D );                  } /* SET  4,D=(XY+o)  */
2141OP(xycb,e3) { E = SET(4, RM(EA) ); WM( EA,E );                  } /* SET  4,E=(XY+o)  */
2142OP(xycb,e4) { H = SET(4, RM(EA) ); WM( EA,H );                  } /* SET  4,H=(XY+o)  */
2143OP(xycb,e5) { L = SET(4, RM(EA) ); WM( EA,L );                  } /* SET  4,L=(XY+o)  */
2144OP(xycb,e6) { WM( EA, SET(4,RM(EA)) );                        } /* SET  4,(XY+o)    */
2145OP(xycb,e7) { A = SET(4, RM(EA) ); WM( EA,A );                  } /* SET  4,A=(XY+o)  */
20992146
2100OP(xycb,e8) { B = SET(5, RM(EA) ); WM( EA,B );               } /* SET  5,B=(XY+o)  */
2101OP(xycb,e9) { C = SET(5, RM(EA) ); WM( EA,C );               } /* SET  5,C=(XY+o)  */
2102OP(xycb,ea) { D = SET(5, RM(EA) ); WM( EA,D );               } /* SET  5,D=(XY+o)  */
2103OP(xycb,eb) { E = SET(5, RM(EA) ); WM( EA,E );               } /* SET  5,E=(XY+o)  */
2104OP(xycb,ec) { H = SET(5, RM(EA) ); WM( EA,H );               } /* SET  5,H=(XY+o)  */
2105OP(xycb,ed) { L = SET(5, RM(EA) ); WM( EA,L );               } /* SET  5,L=(XY+o)  */
2106OP(xycb,ee) { WM( EA, SET(5,RM(EA)) );                     } /* SET  5,(XY+o)    */
2107OP(xycb,ef) { A = SET(5, RM(EA) ); WM( EA,A );               } /* SET  5,A=(XY+o)  */
2147OP(xycb,e8) { B = SET(5, RM(EA) ); WM( EA,B );                  } /* SET  5,B=(XY+o)  */
2148OP(xycb,e9) { C = SET(5, RM(EA) ); WM( EA,C );                  } /* SET  5,C=(XY+o)  */
2149OP(xycb,ea) { D = SET(5, RM(EA) ); WM( EA,D );                  } /* SET  5,D=(XY+o)  */
2150OP(xycb,eb) { E = SET(5, RM(EA) ); WM( EA,E );                  } /* SET  5,E=(XY+o)  */
2151OP(xycb,ec) { H = SET(5, RM(EA) ); WM( EA,H );                  } /* SET  5,H=(XY+o)  */
2152OP(xycb,ed) { L = SET(5, RM(EA) ); WM( EA,L );                  } /* SET  5,L=(XY+o)  */
2153OP(xycb,ee) { WM( EA, SET(5,RM(EA)) );                        } /* SET  5,(XY+o)    */
2154OP(xycb,ef) { A = SET(5, RM(EA) ); WM( EA,A );                  } /* SET  5,A=(XY+o)  */
21082155
2109OP(xycb,f0) { B = SET(6, RM(EA) ); WM( EA,B );               } /* SET  6,B=(XY+o)  */
2110OP(xycb,f1) { C = SET(6, RM(EA) ); WM( EA,C );               } /* SET  6,C=(XY+o)  */
2111OP(xycb,f2) { D = SET(6, RM(EA) ); WM( EA,D );               } /* SET  6,D=(XY+o)  */
2112OP(xycb,f3) { E = SET(6, RM(EA) ); WM( EA,E );               } /* SET  6,E=(XY+o)  */
2113OP(xycb,f4) { H = SET(6, RM(EA) ); WM( EA,H );               } /* SET  6,H=(XY+o)  */
2114OP(xycb,f5) { L = SET(6, RM(EA) ); WM( EA,L );               } /* SET  6,L=(XY+o)  */
2156OP(xycb,f0) { B = SET(6, RM(EA) ); WM( EA,B );                  } /* SET  6,B=(XY+o)  */
2157OP(xycb,f1) { C = SET(6, RM(EA) ); WM( EA,C );                  } /* SET  6,C=(XY+o)  */
2158OP(xycb,f2) { D = SET(6, RM(EA) ); WM( EA,D );                  } /* SET  6,D=(XY+o)  */
2159OP(xycb,f3) { E = SET(6, RM(EA) ); WM( EA,E );                  } /* SET  6,E=(XY+o)  */
2160OP(xycb,f4) { H = SET(6, RM(EA) ); WM( EA,H );                  } /* SET  6,H=(XY+o)  */
2161OP(xycb,f5) { L = SET(6, RM(EA) ); WM( EA,L );                  } /* SET  6,L=(XY+o)  */
21152162OP(xycb,f6) { WM( EA, SET(6,RM(EA)) );                        } /* SET  6,(XY+o)    */
2116OP(xycb,f7) { A = SET(6, RM(EA) ); WM( EA,A );               } /* SET  6,A=(XY+o)  */
2163OP(xycb,f7) { A = SET(6, RM(EA) ); WM( EA,A );                  } /* SET  6,A=(XY+o)  */
21172164
2118OP(xycb,f8) { B = SET(7, RM(EA) ); WM( EA,B );               } /* SET  7,B=(XY+o)  */
2119OP(xycb,f9) { C = SET(7, RM(EA) ); WM( EA,C );               } /* SET  7,C=(XY+o)  */
2120OP(xycb,fa) { D = SET(7, RM(EA) ); WM( EA,D );               } /* SET  7,D=(XY+o)  */
2121OP(xycb,fb) { E = SET(7, RM(EA) ); WM( EA,E );               } /* SET  7,E=(XY+o)  */
2122OP(xycb,fc) { H = SET(7, RM(EA) ); WM( EA,H );               } /* SET  7,H=(XY+o)  */
2123OP(xycb,fd) { L = SET(7, RM(EA) ); WM( EA,L );               } /* SET  7,L=(XY+o)  */
2124OP(xycb,fe) { WM( EA, SET(7,RM(EA)) );                     } /* SET  7,(XY+o)    */
2125OP(xycb,ff) { A = SET(7, RM(EA) ); WM( EA,A );               } /* SET  7,A=(XY+o)  */
2165OP(xycb,f8) { B = SET(7, RM(EA) ); WM( EA,B );                  } /* SET  7,B=(XY+o)  */
2166OP(xycb,f9) { C = SET(7, RM(EA) ); WM( EA,C );                  } /* SET  7,C=(XY+o)  */
2167OP(xycb,fa) { D = SET(7, RM(EA) ); WM( EA,D );                  } /* SET  7,D=(XY+o)  */
2168OP(xycb,fb) { E = SET(7, RM(EA) ); WM( EA,E );                  } /* SET  7,E=(XY+o)  */
2169OP(xycb,fc) { H = SET(7, RM(EA) ); WM( EA,H );                  } /* SET  7,H=(XY+o)  */
2170OP(xycb,fd) { L = SET(7, RM(EA) ); WM( EA,L );                  } /* SET  7,L=(XY+o)  */
2171OP(xycb,fe) { WM( EA, SET(7,RM(EA)) );                        } /* SET  7,(XY+o)    */
2172OP(xycb,ff) { A = SET(7, RM(EA) ); WM( EA,A );                  } /* SET  7,A=(XY+o)  */
21262173
21272174OP(illegal,1) {
21282175   logerror("Z80 #%d ill. opcode $%02x $%02x\n",
r3535r3536
21322179/**********************************************************
21332180 * IX register related opcodes (DD prefix)
21342181 **********************************************************/
2135OP(dd,00) { illegal_1(); op_00();                        } /* DB   DD          */
2136OP(dd,01) { illegal_1(); op_01();                        } /* DB   DD          */
2137OP(dd,02) { illegal_1(); op_02();                        } /* DB   DD          */
2138OP(dd,03) { illegal_1(); op_03();                        } /* DB   DD          */
2139OP(dd,04) { illegal_1(); op_04();                        } /* DB   DD          */
2140OP(dd,05) { illegal_1(); op_05();                        } /* DB   DD          */
2141OP(dd,06) { illegal_1(); op_06();                        } /* DB   DD          */
2142OP(dd,07) { illegal_1(); op_07();                        } /* DB   DD          */
2182OP(dd,00) { illegal_1(z80); op_00(z80);                        } /* DB   DD          */
2183OP(dd,01) { illegal_1(z80); op_01(z80);                        } /* DB   DD          */
2184OP(dd,02) { illegal_1(z80); op_02(z80);                        } /* DB   DD          */
2185OP(dd,03) { illegal_1(z80); op_03(z80);                        } /* DB   DD          */
2186OP(dd,04) { illegal_1(z80); op_04(z80);                        } /* DB   DD          */
2187OP(dd,05) { illegal_1(z80); op_05(z80);                        } /* DB   DD          */
2188OP(dd,06) { illegal_1(z80); op_06(z80);                        } /* DB   DD          */
2189OP(dd,07) { illegal_1(z80); op_07(z80);                        } /* DB   DD          */
21432190
2144OP(dd,08) { illegal_1(); op_08();                        } /* DB   DD          */
2145OP(dd,09) { ADD16(ix,bc);                           } /* ADD  IX,BC       */
2146OP(dd,0a) { illegal_1(); op_0a();                        } /* DB   DD          */
2147OP(dd,0b) { illegal_1(); op_0b();                        } /* DB   DD          */
2148OP(dd,0c) { illegal_1(); op_0c();                        } /* DB   DD          */
2149OP(dd,0d) { illegal_1(); op_0d();                        } /* DB   DD          */
2150OP(dd,0e) { illegal_1(); op_0e();                        } /* DB   DD          */
2151OP(dd,0f) { illegal_1(); op_0f();                        } /* DB   DD          */
2191OP(dd,08) { illegal_1(z80); op_08(z80);                        } /* DB   DD          */
2192OP(dd,09) { ADD16(ix,bc);                                 } /* ADD  IX,BC       */
2193OP(dd,0a) { illegal_1(z80); op_0a(z80);                        } /* DB   DD          */
2194OP(dd,0b) { illegal_1(z80); op_0b(z80);                        } /* DB   DD          */
2195OP(dd,0c) { illegal_1(z80); op_0c(z80);                        } /* DB   DD          */
2196OP(dd,0d) { illegal_1(z80); op_0d(z80);                        } /* DB   DD          */
2197OP(dd,0e) { illegal_1(z80); op_0e(z80);                        } /* DB   DD          */
2198OP(dd,0f) { illegal_1(z80); op_0f(z80);                        } /* DB   DD          */
21522199
2153OP(dd,10) { illegal_1(); op_10();                        } /* DB   DD          */
2154OP(dd,11) { illegal_1(); op_11();                        } /* DB   DD          */
2155OP(dd,12) { illegal_1(); op_12();                        } /* DB   DD          */
2156OP(dd,13) { illegal_1(); op_13();                        } /* DB   DD          */
2157OP(dd,14) { illegal_1(); op_14();                        } /* DB   DD          */
2158OP(dd,15) { illegal_1(); op_15();                        } /* DB   DD          */
2159OP(dd,16) { illegal_1(); op_16();                        } /* DB   DD          */
2160OP(dd,17) { illegal_1(); op_17();                        } /* DB   DD          */
2200OP(dd,10) { illegal_1(z80); op_10(z80);                        } /* DB   DD          */
2201OP(dd,11) { illegal_1(z80); op_11(z80);                        } /* DB   DD          */
2202OP(dd,12) { illegal_1(z80); op_12(z80);                        } /* DB   DD          */
2203OP(dd,13) { illegal_1(z80); op_13(z80);                        } /* DB   DD          */
2204OP(dd,14) { illegal_1(z80); op_14(z80);                        } /* DB   DD          */
2205OP(dd,15) { illegal_1(z80); op_15(z80);                        } /* DB   DD          */
2206OP(dd,16) { illegal_1(z80); op_16(z80);                        } /* DB   DD          */
2207OP(dd,17) { illegal_1(z80); op_17(z80);                        } /* DB   DD          */
21612208
2162OP(dd,18) { illegal_1(); op_18();                        } /* DB   DD          */
2163OP(dd,19) { ADD16(ix,de);                           } /* ADD  IX,DE       */
2164OP(dd,1a) { illegal_1(); op_1a();                        } /* DB   DD          */
2165OP(dd,1b) { illegal_1(); op_1b();                        } /* DB   DD          */
2166OP(dd,1c) { illegal_1(); op_1c();                        } /* DB   DD          */
2167OP(dd,1d) { illegal_1(); op_1d();                        } /* DB   DD          */
2168OP(dd,1e) { illegal_1(); op_1e();                        } /* DB   DD          */
2169OP(dd,1f) { illegal_1(); op_1f();                        } /* DB   DD          */
2209OP(dd,18) { illegal_1(z80); op_18(z80);                        } /* DB   DD          */
2210OP(dd,19) { ADD16(ix,de);                                 } /* ADD  IX,DE       */
2211OP(dd,1a) { illegal_1(z80); op_1a(z80);                        } /* DB   DD          */
2212OP(dd,1b) { illegal_1(z80); op_1b(z80);                        } /* DB   DD          */
2213OP(dd,1c) { illegal_1(z80); op_1c(z80);                        } /* DB   DD          */
2214OP(dd,1d) { illegal_1(z80); op_1d(z80);                        } /* DB   DD          */
2215OP(dd,1e) { illegal_1(z80); op_1e(z80);                        } /* DB   DD          */
2216OP(dd,1f) { illegal_1(z80); op_1f(z80);                        } /* DB   DD          */
21702217
2171OP(dd,20) { illegal_1(); op_20();                        } /* DB   DD          */
2172OP(dd,21) { IX = ARG16();                           } /* LD   IX,w        */
2173OP(dd,22) { EA = ARG16(); WM16( EA, &Z80.ix );            } /* LD   (w),IX      */
2174OP(dd,23) { IX++;                                 } /* INC  IX          */
2175OP(dd,24) { HX = INC(HX);                           } /* INC  HX          */
2176OP(dd,25) { HX = DEC(HX);                           } /* DEC  HX          */
2177OP(dd,26) { HX = ARG();                           } /* LD   HX,n        */
2178OP(dd,27) { illegal_1(); op_27();                        } /* DB   DD          */
2218OP(dd,20) { illegal_1(z80); op_20(z80);                        } /* DB   DD          */
2219OP(dd,21) { IX = ARG16(z80);                              } /* LD   IX,w        */
2220OP(dd,22) { EA = ARG16(z80); WM16( EA, &z80->ix );   MEMPTR = EA+1;   } /* LD   (w),IX      */
2221OP(dd,23) { IX++;                                       } /* INC  IX          */
2222OP(dd,24) { HX = INC(z80, HX);                              } /* INC  HX          */
2223OP(dd,25) { HX = DEC(z80, HX);                              } /* DEC  HX          */
2224OP(dd,26) { HX = ARG(z80);                                 } /* LD   HX,n        */
2225OP(dd,27) { illegal_1(z80); op_27(z80);                        } /* DB   DD          */
21792226
2180OP(dd,28) { illegal_1(); op_28();                        } /* DB   DD          */
2181OP(dd,29) { ADD16(ix,ix);                           } /* ADD  IX,IX       */
2182OP(dd,2a) { EA = ARG16(); RM16( EA, &Z80.ix );            } /* LD   IX,(w)      */
2183OP(dd,2b) { IX--;                                 } /* DEC  IX          */
2184OP(dd,2c) { LX = INC(LX);                           } /* INC  LX          */
2185OP(dd,2d) { LX = DEC(LX);                           } /* DEC  LX          */
2186OP(dd,2e) { LX = ARG();                           } /* LD   LX,n        */
2187OP(dd,2f) { illegal_1(); op_2f();                        } /* DB   DD          */
2227OP(dd,28) { illegal_1(z80); op_28(z80);                        } /* DB   DD          */
2228OP(dd,29) { ADD16(ix,ix);                                 } /* ADD  IX,IX       */
2229OP(dd,2a) { EA = ARG16(z80); RM16( EA, &z80->ix );   MEMPTR = EA+1;   } /* LD   IX,(w)      */
2230OP(dd,2b) { IX--;                                       } /* DEC  IX          */
2231OP(dd,2c) { LX = INC(z80, LX);                              } /* INC  LX          */
2232OP(dd,2d) { LX = DEC(z80, LX);                              } /* DEC  LX          */
2233OP(dd,2e) { LX = ARG(z80);                                 } /* LD   LX,n        */
2234OP(dd,2f) { illegal_1(z80); op_2f(z80);                        } /* DB   DD          */
21882235
2189OP(dd,30) { illegal_1(); op_30();                        } /* DB   DD          */
2190OP(dd,31) { illegal_1(); op_31();                        } /* DB   DD          */
2191OP(dd,32) { illegal_1(); op_32();                        } /* DB   DD          */
2192OP(dd,33) { illegal_1(); op_33();                        } /* DB   DD          */
2193OP(dd,34) { EAX; WM( EA, INC(RM(EA)) );               } /* INC  (IX+o)      */
2194OP(dd,35) { EAX; WM( EA, DEC(RM(EA)) );               } /* DEC  (IX+o)      */
2195OP(dd,36) { EAX; WM( EA, ARG() );                     } /* LD   (IX+o),n    */
2196OP(dd,37) { illegal_1(); op_37();                        } /* DB   DD          */
2236OP(dd,30) { illegal_1(z80); op_30(z80);                        } /* DB   DD          */
2237OP(dd,31) { illegal_1(z80); op_31(z80);                        } /* DB   DD          */
2238OP(dd,32) { illegal_1(z80); op_32(z80);                        } /* DB   DD          */
2239OP(dd,33) { illegal_1(z80); op_33(z80);                        } /* DB   DD          */
2240OP(dd,34) { EAX; WM( EA, INC(z80, RM(EA)) );                  } /* INC  (IX+o)      */
2241OP(dd,35) { EAX; WM( EA, DEC(z80, RM(EA)) );                  } /* DEC  (IX+o)      */
2242OP(dd,36) { EAX; WM( EA, ARG(z80) );                        } /* LD   (IX+o),n    */
2243OP(dd,37) { illegal_1(z80); op_37(z80);                        } /* DB   DD          */
21972244
2198OP(dd,38) { illegal_1(); op_38();                        } /* DB   DD          */
2199OP(dd,39) { ADD16(ix,sp);                           } /* ADD  IX,SP       */
2200OP(dd,3a) { illegal_1(); op_3a();                        } /* DB   DD          */
2201OP(dd,3b) { illegal_1(); op_3b();                        } /* DB   DD          */
2202OP(dd,3c) { illegal_1(); op_3c();                        } /* DB   DD          */
2203OP(dd,3d) { illegal_1(); op_3d();                        } /* DB   DD          */
2204OP(dd,3e) { illegal_1(); op_3e();                        } /* DB   DD          */
2205OP(dd,3f) { illegal_1(); op_3f();                        } /* DB   DD          */
2245OP(dd,38) { illegal_1(z80); op_38(z80);                        } /* DB   DD          */
2246OP(dd,39) { ADD16(ix,sp);                                 } /* ADD  IX,SP       */
2247OP(dd,3a) { illegal_1(z80); op_3a(z80);                        } /* DB   DD          */
2248OP(dd,3b) { illegal_1(z80); op_3b(z80);                        } /* DB   DD          */
2249OP(dd,3c) { illegal_1(z80); op_3c(z80);                        } /* DB   DD          */
2250OP(dd,3d) { illegal_1(z80); op_3d(z80);                        } /* DB   DD          */
2251OP(dd,3e) { illegal_1(z80); op_3e(z80);                        } /* DB   DD          */
2252OP(dd,3f) { illegal_1(z80); op_3f(z80);                        } /* DB   DD          */
22062253
2207OP(dd,40) { illegal_1(); op_40();                        } /* DB   DD          */
2208OP(dd,41) { illegal_1(); op_41();                        } /* DB   DD          */
2209OP(dd,42) { illegal_1(); op_42();                        } /* DB   DD          */
2210OP(dd,43) { illegal_1(); op_43();                        } /* DB   DD          */
2211OP(dd,44) { B = HX;                              } /* LD   B,HX        */
2212OP(dd,45) { B = LX;                              } /* LD   B,LX        */
2213OP(dd,46) { EAX; B = RM(EA);                        } /* LD   B,(IX+o)    */
2214OP(dd,47) { illegal_1(); op_47();                        } /* DB   DD          */
2254OP(dd,40) { illegal_1(z80); op_40(z80);                        } /* DB   DD          */
2255OP(dd,41) { illegal_1(z80); op_41(z80);                        } /* DB   DD          */
2256OP(dd,42) { illegal_1(z80); op_42(z80);                        } /* DB   DD          */
2257OP(dd,43) { illegal_1(z80); op_43(z80);                        } /* DB   DD          */
2258OP(dd,44) { B = HX;                                       } /* LD   B,HX        */
2259OP(dd,45) { B = LX;                                       } /* LD   B,LX        */
2260OP(dd,46) { EAX; B = RM(EA);                              } /* LD   B,(IX+o)    */
2261OP(dd,47) { illegal_1(z80); op_47(z80);                        } /* DB   DD          */
22152262
2216OP(dd,48) { illegal_1(); op_48();                        } /* DB   DD          */
2217OP(dd,49) { illegal_1(); op_49();                        } /* DB   DD          */
2218OP(dd,4a) { illegal_1(); op_4a();                        } /* DB   DD          */
2219OP(dd,4b) { illegal_1(); op_4b();                        } /* DB   DD          */
2220OP(dd,4c) { C = HX;                              } /* LD   C,HX        */
2221OP(dd,4d) { C = LX;                              } /* LD   C,LX        */
2222OP(dd,4e) { EAX; C = RM(EA);                        } /* LD   C,(IX+o)    */
2223OP(dd,4f) { illegal_1(); op_4f();                        } /* DB   DD          */
2263OP(dd,48) { illegal_1(z80); op_48(z80);                        } /* DB   DD          */
2264OP(dd,49) { illegal_1(z80); op_49(z80);                        } /* DB   DD          */
2265OP(dd,4a) { illegal_1(z80); op_4a(z80);                        } /* DB   DD          */
2266OP(dd,4b) { illegal_1(z80); op_4b(z80);                        } /* DB   DD          */
2267OP(dd,4c) { C = HX;                                       } /* LD   C,HX        */
2268OP(dd,4d) { C = LX;                                       } /* LD   C,LX        */
2269OP(dd,4e) { EAX; C = RM(EA);                              } /* LD   C,(IX+o)    */
2270OP(dd,4f) { illegal_1(z80); op_4f(z80);                        } /* DB   DD          */
22242271
2225OP(dd,50) { illegal_1(); op_50();                        } /* DB   DD          */
2226OP(dd,51) { illegal_1(); op_51();                        } /* DB   DD          */
2227OP(dd,52) { illegal_1(); op_52();                        } /* DB   DD          */
2228OP(dd,53) { illegal_1(); op_53();                        } /* DB   DD          */
2229OP(dd,54) { D = HX;                              } /* LD   D,HX        */
2230OP(dd,55) { D = LX;                              } /* LD   D,LX        */
2231OP(dd,56) { EAX; D = RM(EA);                        } /* LD   D,(IX+o)    */
2232OP(dd,57) { illegal_1(); op_57();                        } /* DB   DD          */
2272OP(dd,50) { illegal_1(z80); op_50(z80);                        } /* DB   DD          */
2273OP(dd,51) { illegal_1(z80); op_51(z80);                        } /* DB   DD          */
2274OP(dd,52) { illegal_1(z80); op_52(z80);                        } /* DB   DD          */
2275OP(dd,53) { illegal_1(z80); op_53(z80);                        } /* DB   DD          */
2276OP(dd,54) { D = HX;                                       } /* LD   D,HX        */
2277OP(dd,55) { D = LX;                                       } /* LD   D,LX        */
2278OP(dd,56) { EAX; D = RM(EA);                              } /* LD   D,(IX+o)    */
2279OP(dd,57) { illegal_1(z80); op_57(z80);                        } /* DB   DD          */
22332280
2234OP(dd,58) { illegal_1(); op_58();                        } /* DB   DD          */
2235OP(dd,59) { illegal_1(); op_59();                        } /* DB   DD          */
2236OP(dd,5a) { illegal_1(); op_5a();                        } /* DB   DD          */
2237OP(dd,5b) { illegal_1(); op_5b();                        } /* DB   DD          */
2238OP(dd,5c) { E = HX;                              } /* LD   E,HX        */
2239OP(dd,5d) { E = LX;                              } /* LD   E,LX        */
2240OP(dd,5e) { EAX; E = RM(EA);                        } /* LD   E,(IX+o)    */
2241OP(dd,5f) { illegal_1(); op_5f();                        } /* DB   DD          */
2281OP(dd,58) { illegal_1(z80); op_58(z80);                        } /* DB   DD          */
2282OP(dd,59) { illegal_1(z80); op_59(z80);                        } /* DB   DD          */
2283OP(dd,5a) { illegal_1(z80); op_5a(z80);                        } /* DB   DD          */
2284OP(dd,5b) { illegal_1(z80); op_5b(z80);                        } /* DB   DD          */
2285OP(dd,5c) { E = HX;                                       } /* LD   E,HX        */
2286OP(dd,5d) { E = LX;                                       } /* LD   E,LX        */
2287OP(dd,5e) { EAX; E = RM(EA);                              } /* LD   E,(IX+o)    */
2288OP(dd,5f) { illegal_1(z80); op_5f(z80);                        } /* DB   DD          */
22422289
2243OP(dd,60) { HX = B;                              } /* LD   HX,B        */
2244OP(dd,61) { HX = C;                              } /* LD   HX,C        */
2245OP(dd,62) { HX = D;                              } /* LD   HX,D        */
2246OP(dd,63) { HX = E;                              } /* LD   HX,E        */
2247OP(dd,64) {                                          } /* LD   HX,HX       */
2248OP(dd,65) { HX = LX;                              } /* LD   HX,LX       */
2249OP(dd,66) { EAX; H = RM(EA);                        } /* LD   H,(IX+o)    */
2250OP(dd,67) { HX = A;                              } /* LD   HX,A        */
2290OP(dd,60) { HX = B;                                       } /* LD   HX,B        */
2291OP(dd,61) { HX = C;                                       } /* LD   HX,C        */
2292OP(dd,62) { HX = D;                                       } /* LD   HX,D        */
2293OP(dd,63) { HX = E;                                       } /* LD   HX,E        */
2294OP(dd,64) {                                             } /* LD   HX,HX       */
2295OP(dd,65) { HX = LX;                                    } /* LD   HX,LX       */
2296OP(dd,66) { EAX; H = RM(EA);                              } /* LD   H,(IX+o)    */
2297OP(dd,67) { HX = A;                                       } /* LD   HX,A        */
22512298
2252OP(dd,68) { LX = B;                              } /* LD   LX,B        */
2253OP(dd,69) { LX = C;                              } /* LD   LX,C        */
2254OP(dd,6a) { LX = D;                              } /* LD   LX,D        */
2255OP(dd,6b) { LX = E;                              } /* LD   LX,E        */
2256OP(dd,6c) { LX = HX;                              } /* LD   LX,HX       */
2257OP(dd,6d) {                                          } /* LD   LX,LX       */
2258OP(dd,6e) { EAX; L = RM(EA);                        } /* LD   L,(IX+o)    */
2259OP(dd,6f) { LX = A;                              } /* LD   LX,A        */
2299OP(dd,68) { LX = B;                                       } /* LD   LX,B        */
2300OP(dd,69) { LX = C;                                       } /* LD   LX,C        */
2301OP(dd,6a) { LX = D;                                       } /* LD   LX,D        */
2302OP(dd,6b) { LX = E;                                       } /* LD   LX,E        */
2303OP(dd,6c) { LX = HX;                                    } /* LD   LX,HX       */
2304OP(dd,6d) {                                             } /* LD   LX,LX       */
2305OP(dd,6e) { EAX; L = RM(EA);                              } /* LD   L,(IX+o)    */
2306OP(dd,6f) { LX = A;                                       } /* LD   LX,A        */
22602307
2261OP(dd,70) { EAX; WM( EA, B );                        } /* LD   (IX+o),B    */
2262OP(dd,71) { EAX; WM( EA, C );                        } /* LD   (IX+o),C    */
2263OP(dd,72) { EAX; WM( EA, D );                        } /* LD   (IX+o),D    */
2264OP(dd,73) { EAX; WM( EA, E );                        } /* LD   (IX+o),E    */
2265OP(dd,74) { EAX; WM( EA, H );                        } /* LD   (IX+o),H    */
2266OP(dd,75) { EAX; WM( EA, L );                        } /* LD   (IX+o),L    */
2267OP(dd,76) { illegal_1(); op_76();                        } /* DB   DD          */
2268OP(dd,77) { EAX; WM( EA, A );                        } /* LD   (IX+o),A    */
2308OP(dd,70) { EAX; WM( EA, B );                              } /* LD   (IX+o),B    */
2309OP(dd,71) { EAX; WM( EA, C );                              } /* LD   (IX+o),C    */
2310OP(dd,72) { EAX; WM( EA, D );                              } /* LD   (IX+o),D    */
2311OP(dd,73) { EAX; WM( EA, E );                              } /* LD   (IX+o),E    */
2312OP(dd,74) { EAX; WM( EA, H );                              } /* LD   (IX+o),H    */
2313OP(dd,75) { EAX; WM( EA, L );                              } /* LD   (IX+o),L    */
2314OP(dd,76) { illegal_1(z80); op_76(z80);                        } /* DB   DD          */
2315OP(dd,77) { EAX; WM( EA, A );                              } /* LD   (IX+o),A    */
22692316
2270OP(dd,78) { illegal_1(); op_78();                        } /* DB   DD          */
2271OP(dd,79) { illegal_1(); op_79();                        } /* DB   DD          */
2272OP(dd,7a) { illegal_1(); op_7a();                        } /* DB   DD          */
2273OP(dd,7b) { illegal_1(); op_7b();                        } /* DB   DD          */
2274OP(dd,7c) { A = HX;                              } /* LD   A,HX        */
2275OP(dd,7d) { A = LX;                              } /* LD   A,LX        */
2276OP(dd,7e) { EAX; A = RM(EA);                        } /* LD   A,(IX+o)    */
2277OP(dd,7f) { illegal_1(); op_7f();                        } /* DB   DD          */
2317OP(dd,78) { illegal_1(z80); op_78(z80);                        } /* DB   DD          */
2318OP(dd,79) { illegal_1(z80); op_79(z80);                        } /* DB   DD          */
2319OP(dd,7a) { illegal_1(z80); op_7a(z80);                        } /* DB   DD          */
2320OP(dd,7b) { illegal_1(z80); op_7b(z80);                        } /* DB   DD          */
2321OP(dd,7c) { A = HX;                                       } /* LD   A,HX        */
2322OP(dd,7d) { A = LX;                                       } /* LD   A,LX        */
2323OP(dd,7e) { EAX; A = RM(EA);                              } /* LD   A,(IX+o)    */
2324OP(dd,7f) { illegal_1(z80); op_7f(z80);                        } /* DB   DD          */
22782325
2279OP(dd,80) { illegal_1(); op_80();                        } /* DB   DD          */
2280OP(dd,81) { illegal_1(); op_81();                        } /* DB   DD          */
2281OP(dd,82) { illegal_1(); op_82();                        } /* DB   DD          */
2282OP(dd,83) { illegal_1(); op_83();                        } /* DB   DD          */
2283OP(dd,84) { ADD(HX);                              } /* ADD  A,HX        */
2284OP(dd,85) { ADD(LX);                              } /* ADD  A,LX        */
2285OP(dd,86) { EAX; ADD(RM(EA));                        } /* ADD  A,(IX+o)    */
2286OP(dd,87) { illegal_1(); op_87();                        } /* DB   DD          */
2326OP(dd,80) { illegal_1(z80); op_80(z80);                        } /* DB   DD          */
2327OP(dd,81) { illegal_1(z80); op_81(z80);                        } /* DB   DD          */
2328OP(dd,82) { illegal_1(z80); op_82(z80);                        } /* DB   DD          */
2329OP(dd,83) { illegal_1(z80); op_83(z80);                        } /* DB   DD          */
2330OP(dd,84) { ADD(HX);                                    } /* ADD  A,HX        */
2331OP(dd,85) { ADD(LX);                                    } /* ADD  A,LX        */
2332OP(dd,86) { EAX; ADD(RM(EA));                              } /* ADD  A,(IX+o)    */
2333OP(dd,87) { illegal_1(z80); op_87(z80);                        } /* DB   DD          */
22872334
2288OP(dd,88) { illegal_1(); op_88();                        } /* DB   DD          */
2289OP(dd,89) { illegal_1(); op_89();                        } /* DB   DD          */
2290OP(dd,8a) { illegal_1(); op_8a();                        } /* DB   DD          */
2291OP(dd,8b) { illegal_1(); op_8b();                        } /* DB   DD          */
2292OP(dd,8c) { ADC(HX);                              } /* ADC  A,HX        */
2293OP(dd,8d) { ADC(LX);                              } /* ADC  A,LX        */
2294OP(dd,8e) { EAX; ADC(RM(EA));                        } /* ADC  A,(IX+o)    */
2295OP(dd,8f) { illegal_1(); op_8f();                        } /* DB   DD          */
2335OP(dd,88) { illegal_1(z80); op_88(z80);                        } /* DB   DD          */
2336OP(dd,89) { illegal_1(z80); op_89(z80);                        } /* DB   DD          */
2337OP(dd,8a) { illegal_1(z80); op_8a(z80);                        } /* DB   DD          */
2338OP(dd,8b) { illegal_1(z80); op_8b(z80);                        } /* DB   DD          */
2339OP(dd,8c) { ADC(HX);                                    } /* ADC  A,HX        */
2340OP(dd,8d) { ADC(LX);                                    } /* ADC  A,LX        */
2341OP(dd,8e) { EAX; ADC(RM(EA));                              } /* ADC  A,(IX+o)    */
2342OP(dd,8f) { illegal_1(z80); op_8f(z80);                        } /* DB   DD          */
22962343
2297OP(dd,90) { illegal_1(); op_90();                        } /* DB   DD          */
2298OP(dd,91) { illegal_1(); op_91();                        } /* DB   DD          */
2299OP(dd,92) { illegal_1(); op_92();                        } /* DB   DD          */
2300OP(dd,93) { illegal_1(); op_93();                        } /* DB   DD          */
2301OP(dd,94) { SUB(HX);                              } /* SUB  HX          */
2302OP(dd,95) { SUB(LX);                              } /* SUB  LX          */
2303OP(dd,96) { EAX; SUB(RM(EA));                        } /* SUB  (IX+o)      */
2304OP(dd,97) { illegal_1(); op_97();                        } /* DB   DD          */
2344OP(dd,90) { illegal_1(z80); op_90(z80);                        } /* DB   DD          */
2345OP(dd,91) { illegal_1(z80); op_91(z80);                        } /* DB   DD          */
2346OP(dd,92) { illegal_1(z80); op_92(z80);                        } /* DB   DD          */
2347OP(dd,93) { illegal_1(z80); op_93(z80);                        } /* DB   DD          */
2348OP(dd,94) { SUB(HX);                                    } /* SUB  HX          */
2349OP(dd,95) { SUB(LX);                                    } /* SUB  LX          */
2350OP(dd,96) { EAX; SUB(RM(EA));                              } /* SUB  (IX+o)      */
2351OP(dd,97) { illegal_1(z80); op_97(z80);                        } /* DB   DD          */
23052352
2306OP(dd,98) { illegal_1(); op_98();                        } /* DB   DD          */
2307OP(dd,99) { illegal_1(); op_99();                        } /* DB   DD          */
2308OP(dd,9a) { illegal_1(); op_9a();                        } /* DB   DD          */
2309OP(dd,9b) { illegal_1(); op_9b();                        } /* DB   DD          */
2310OP(dd,9c) { SBC(HX);                              } /* SBC  A,HX        */
2311OP(dd,9d) { SBC(LX);                              } /* SBC  A,LX        */
2312OP(dd,9e) { EAX; SBC(RM(EA));                        } /* SBC  A,(IX+o)    */
2313OP(dd,9f) { illegal_1(); op_9f();                        } /* DB   DD          */
2353OP(dd,98) { illegal_1(z80); op_98(z80);                        } /* DB   DD          */
2354OP(dd,99) { illegal_1(z80); op_99(z80);                        } /* DB   DD          */
2355OP(dd,9a) { illegal_1(z80); op_9a(z80);                        } /* DB   DD          */
2356OP(dd,9b) { illegal_1(z80); op_9b(z80);                        } /* DB   DD          */
2357OP(dd,9c) { SBC(HX);                                    } /* SBC  A,HX        */
2358OP(dd,9d) { SBC(LX);                                    } /* SBC  A,LX        */
2359OP(dd,9e) { EAX; SBC(RM(EA));                              } /* SBC  A,(IX+o)    */
2360OP(dd,9f) { illegal_1(z80); op_9f(z80);                        } /* DB   DD          */
23142361
2315OP(dd,a0) { illegal_1(); op_a0();                        } /* DB   DD          */
2316OP(dd,a1) { illegal_1(); op_a1();                        } /* DB   DD          */
2317OP(dd,a2) { illegal_1(); op_a2();                        } /* DB   DD          */
2318OP(dd,a3) { illegal_1(); op_a3();                        } /* DB   DD          */
2319OP(dd,a4) { AND(HX);                              } /* AND  HX          */
2320OP(dd,a5) { AND(LX);                              } /* AND  LX          */
2321OP(dd,a6) { EAX; AND(RM(EA));                        } /* AND  (IX+o)      */
2322OP(dd,a7) { illegal_1(); op_a7();                        } /* DB   DD          */
2362OP(dd,a0) { illegal_1(z80); op_a0(z80);                        } /* DB   DD          */
2363OP(dd,a1) { illegal_1(z80); op_a1(z80);                        } /* DB   DD          */
2364OP(dd,a2) { illegal_1(z80); op_a2(z80);                        } /* DB   DD          */
2365OP(dd,a3) { illegal_1(z80); op_a3(z80);                        } /* DB   DD          */
2366OP(dd,a4) { AND(HX);                                    } /* AND  HX          */
2367OP(dd,a5) { AND(LX);                                    } /* AND  LX          */
2368OP(dd,a6) { EAX; AND(RM(EA));                              } /* AND  (IX+o)      */
2369OP(dd,a7) { illegal_1(z80); op_a7(z80);                        } /* DB   DD          */
23232370
2324OP(dd,a8) { illegal_1(); op_a8();                        } /* DB   DD          */
2325OP(dd,a9) { illegal_1(); op_a9();                        } /* DB   DD          */
2326OP(dd,aa) { illegal_1(); op_aa();                        } /* DB   DD          */
2327OP(dd,ab) { illegal_1(); op_ab();                        } /* DB   DD          */
2328OP(dd,ac) { XOR(HX);                              } /* XOR  HX          */
2329OP(dd,ad) { XOR(LX);                              } /* XOR  LX          */
2330OP(dd,ae) { EAX; XOR(RM(EA));                        } /* XOR  (IX+o)      */
2331OP(dd,af) { illegal_1(); op_af();                        } /* DB   DD          */
2371OP(dd,a8) { illegal_1(z80); op_a8(z80);                        } /* DB   DD          */
2372OP(dd,a9) { illegal_1(z80); op_a9(z80);                        } /* DB   DD          */
2373OP(dd,aa) { illegal_1(z80); op_aa(z80);                        } /* DB   DD          */
2374OP(dd,ab) { illegal_1(z80); op_ab(z80);                        } /* DB   DD          */
2375OP(dd,ac) { XOR(HX);                                    } /* XOR  HX          */
2376OP(dd,ad) { XOR(LX);                                    } /* XOR  LX          */
2377OP(dd,ae) { EAX; XOR(RM(EA));                              } /* XOR  (IX+o)      */
2378OP(dd,af) { illegal_1(z80); op_af(z80);                        } /* DB   DD          */
23322379
2333OP(dd,b0) { illegal_1(); op_b0();                        } /* DB   DD          */
2334OP(dd,b1) { illegal_1(); op_b1();                        } /* DB   DD          */
2335OP(dd,b2) { illegal_1(); op_b2();                        } /* DB   DD          */
2336OP(dd,b3) { illegal_1(); op_b3();                        } /* DB   DD          */
2337OP(dd,b4) { OR(HX);                              } /* OR   HX          */
2338OP(dd,b5) { OR(LX);                              } /* OR   LX          */
2339OP(dd,b6) { EAX; OR(RM(EA));                        } /* OR   (IX+o)      */
2340OP(dd,b7) { illegal_1(); op_b7();                        } /* DB   DD          */
2380OP(dd,b0) { illegal_1(z80); op_b0(z80);                        } /* DB   DD          */
2381OP(dd,b1) { illegal_1(z80); op_b1(z80);                        } /* DB   DD          */
2382OP(dd,b2) { illegal_1(z80); op_b2(z80);                        } /* DB   DD          */
2383OP(dd,b3) { illegal_1(z80); op_b3(z80);                        } /* DB   DD          */
2384OP(dd,b4) { OR(HX);                                       } /* OR   HX          */
2385OP(dd,b5) { OR(LX);                                       } /* OR   LX          */
2386OP(dd,b6) { EAX; OR(RM(EA));                              } /* OR   (IX+o)      */
2387OP(dd,b7) { illegal_1(z80); op_b7(z80);                        } /* DB   DD          */
23412388
2342OP(dd,b8) { illegal_1(); op_b8();                        } /* DB   DD          */
2343OP(dd,b9) { illegal_1(); op_b9();                        } /* DB   DD          */
2344OP(dd,ba) { illegal_1(); op_ba();                        } /* DB   DD          */
2345OP(dd,bb) { illegal_1(); op_bb();                        } /* DB   DD          */
2346OP(dd,bc) { CP(HX);                              } /* CP   HX          */
2347OP(dd,bd) { CP(LX);                              } /* CP   LX          */
2348OP(dd,be) { EAX; CP(RM(EA));                        } /* CP   (IX+o)      */
2349OP(dd,bf) { illegal_1(); op_bf();                        } /* DB   DD          */
2389OP(dd,b8) { illegal_1(z80); op_b8(z80);                        } /* DB   DD          */
2390OP(dd,b9) { illegal_1(z80); op_b9(z80);                        } /* DB   DD          */
2391OP(dd,ba) { illegal_1(z80); op_ba(z80);                        } /* DB   DD          */
2392OP(dd,bb) { illegal_1(z80); op_bb(z80);                        } /* DB   DD          */
2393OP(dd,bc) { CP(HX);                                       } /* CP   HX          */
2394OP(dd,bd) { CP(LX);                                       } /* CP   LX          */
2395OP(dd,be) { EAX; CP(RM(EA));                              } /* CP   (IX+o)      */
2396OP(dd,bf) { illegal_1(z80); op_bf(z80);                        } /* DB   DD          */
23502397
2351OP(dd,c0) { illegal_1(); op_c0();                        } /* DB   DD          */
2352OP(dd,c1) { illegal_1(); op_c1();                        } /* DB   DD          */
2353OP(dd,c2) { illegal_1(); op_c2();                        } /* DB   DD          */
2354OP(dd,c3) { illegal_1(); op_c3();                        } /* DB   DD          */
2355OP(dd,c4) { illegal_1(); op_c4();                        } /* DB   DD          */
2356OP(dd,c5) { illegal_1(); op_c5();                        } /* DB   DD          */
2357OP(dd,c6) { illegal_1(); op_c6();                        } /* DB   DD          */
2358OP(dd,c7) { illegal_1(); op_c7();                        }        /* DB   DD          */
2398OP(dd,c0) { illegal_1(z80); op_c0(z80);                        } /* DB   DD          */
2399OP(dd,c1) { illegal_1(z80); op_c1(z80);                        } /* DB   DD          */
2400OP(dd,c2) { illegal_1(z80); op_c2(z80);                        } /* DB   DD          */
2401OP(dd,c3) { illegal_1(z80); op_c3(z80);                        } /* DB   DD          */
2402OP(dd,c4) { illegal_1(z80); op_c4(z80);                        } /* DB   DD          */
2403OP(dd,c5) { illegal_1(z80); op_c5(z80);                        } /* DB   DD          */
2404OP(dd,c6) { illegal_1(z80); op_c6(z80);                        } /* DB   DD          */
2405OP(dd,c7) { illegal_1(z80); op_c7(z80);                        } /* DB   DD          */
23592406
2360OP(dd,c8) { illegal_1(); op_c8();                        } /* DB   DD          */
2361OP(dd,c9) { illegal_1(); op_c9();                        } /* DB   DD          */
2362OP(dd,ca) { illegal_1(); op_ca();                        } /* DB   DD          */
2363OP(dd,cb) { EAX; EXEC(xycb,ARG());                     } /* **   DD CB xx    */
2364OP(dd,cc) { illegal_1(); op_cc();                        } /* DB   DD          */
2365OP(dd,cd) { illegal_1(); op_cd();                        } /* DB   DD          */
2366OP(dd,ce) { illegal_1(); op_ce();                        } /* DB   DD          */
2367OP(dd,cf) { illegal_1(); op_cf();                        } /* DB   DD          */
2407OP(dd,c8) { illegal_1(z80); op_c8(z80);                        } /* DB   DD          */
2408OP(dd,c9) { illegal_1(z80); op_c9(z80);                        } /* DB   DD          */
2409OP(dd,ca) { illegal_1(z80); op_ca(z80);                        } /* DB   DD          */
2410OP(dd,cb) { EAX; EXEC(z80,xycb,ARG(z80));                     } /* **   DD CB xx    */
2411OP(dd,cc) { illegal_1(z80); op_cc(z80);                        } /* DB   DD          */
2412OP(dd,cd) { illegal_1(z80); op_cd(z80);                        } /* DB   DD          */
2413OP(dd,ce) { illegal_1(z80); op_ce(z80);                        } /* DB   DD          */
2414OP(dd,cf) { illegal_1(z80); op_cf(z80);                        } /* DB   DD          */
23682415
2369OP(dd,d0) { illegal_1(); op_d0();                        } /* DB   DD          */
2370OP(dd,d1) { illegal_1(); op_d1();                        } /* DB   DD          */
2371OP(dd,d2) { illegal_1(); op_d2();                        } /* DB   DD          */
2372OP(dd,d3) { illegal_1(); op_d3();                        } /* DB   DD          */
2373OP(dd,d4) { illegal_1(); op_d4();                        } /* DB   DD          */
2374OP(dd,d5) { illegal_1(); op_d5();                        } /* DB   DD          */
2375OP(dd,d6) { illegal_1(); op_d6();                        } /* DB   DD          */
2376OP(dd,d7) { illegal_1(); op_d7();                        } /* DB   DD          */
2416OP(dd,d0) { illegal_1(z80); op_d0(z80);                        } /* DB   DD          */
2417OP(dd,d1) { illegal_1(z80); op_d1(z80);                        } /* DB   DD          */
2418OP(dd,d2) { illegal_1(z80); op_d2(z80);                        } /* DB   DD          */
2419OP(dd,d3) { illegal_1(z80); op_d3(z80);                        } /* DB   DD          */
2420OP(dd,d4) { illegal_1(z80); op_d4(z80);                        } /* DB   DD          */
2421OP(dd,d5) { illegal_1(z80); op_d5(z80);                        } /* DB   DD          */
2422OP(dd,d6) { illegal_1(z80); op_d6(z80);                        } /* DB   DD          */
2423OP(dd,d7) { illegal_1(z80); op_d7(z80);                        } /* DB   DD          */
23772424
2378OP(dd,d8) { illegal_1(); op_d8();                        } /* DB   DD          */
2379OP(dd,d9) { illegal_1(); op_d9();                        } /* DB   DD          */
2380OP(dd,da) { illegal_1(); op_da();                        } /* DB   DD          */
2381OP(dd,db) { illegal_1(); op_db();                        } /* DB   DD          */
2382OP(dd,dc) { illegal_1(); op_dc();                        } /* DB   DD          */
2383OP(dd,dd) { illegal_1(); op_dd();                        } /* DB   DD          */
2384OP(dd,de) { illegal_1(); op_de();                        } /* DB   DD          */
2385OP(dd,df) { illegal_1(); op_df();                        } /* DB   DD          */
2425OP(dd,d8) { illegal_1(z80); op_d8(z80);                        } /* DB   DD          */
2426OP(dd,d9) { illegal_1(z80); op_d9(z80);                        } /* DB   DD          */
2427OP(dd,da) { illegal_1(z80); op_da(z80);                        } /* DB   DD          */
2428OP(dd,db) { illegal_1(z80); op_db(z80);                        } /* DB   DD          */
2429OP(dd,dc) { illegal_1(z80); op_dc(z80);                        } /* DB   DD          */
2430OP(dd,dd) { illegal_1(z80); op_dd(z80);                        } /* DB   DD          */
2431OP(dd,de) { illegal_1(z80); op_de(z80);                        } /* DB   DD          */
2432OP(dd,df) { illegal_1(z80); op_df(z80);                        } /* DB   DD          */
23862433
2387OP(dd,e0) { illegal_1(); op_e0();                        } /* DB   DD          */
2388OP(dd,e1) { POP( ix );                              } /* POP  IX          */
2389OP(dd,e2) { illegal_1(); op_e2();                        } /* DB   DD          */
2390OP(dd,e3) { EXSP( ix );                           } /* EX   (SP),IX     */
2391OP(dd,e4) { illegal_1(); op_e4();                        } /* DB   DD          */
2392OP(dd,e5) { PUSH( ix );                           } /* PUSH IX          */
2393OP(dd,e6) { illegal_1(); op_e6();                        } /* DB   DD          */
2394OP(dd,e7) { illegal_1(); op_e7();                        } /* DB   DD          */
2434OP(dd,e0) { illegal_1(z80); op_e0(z80);                        } /* DB   DD          */
2435OP(dd,e1) { POP( ix );                                    } /* POP  IX          */
2436OP(dd,e2) { illegal_1(z80); op_e2(z80);                        } /* DB   DD          */
2437OP(dd,e3) { EXSP( ix );                                    } /* EX   (SP),IX     */
2438OP(dd,e4) { illegal_1(z80); op_e4(z80);                        } /* DB   DD          */
2439OP(dd,e5) { PUSH( ix );                                    } /* PUSH IX          */
2440OP(dd,e6) { illegal_1(z80); op_e6(z80);                        } /* DB   DD          */
2441OP(dd,e7) { illegal_1(z80); op_e7(z80);                        } /* DB   DD          */
23952442
2396OP(dd,e8) { illegal_1(); op_e8();                        } /* DB   DD          */
2397OP(dd,e9) { PC = IX; change_pc(PCD);                  } /* JP   (IX)        */
2398OP(dd,ea) { illegal_1(); op_ea();                        } /* DB   DD          */
2399OP(dd,eb) { illegal_1(); op_eb();                        } /* DB   DD          */
2400OP(dd,ec) { illegal_1(); op_ec();                        } /* DB   DD          */
2401OP(dd,ed) { illegal_1(); op_ed();                        } /* DB   DD          */
2402OP(dd,ee) { illegal_1(); op_ee();                        } /* DB   DD          */
2403OP(dd,ef) { illegal_1(); op_ef();                        } /* DB   DD          */
2443OP(dd,e8) { illegal_1(z80); op_e8(z80);                        } /* DB   DD          */
2444OP(dd,e9) { PC = IX; change_pc(PCD);                        } /* JP   (IX)        */
2445OP(dd,ea) { illegal_1(z80); op_ea(z80);                        } /* DB   DD          */
2446OP(dd,eb) { illegal_1(z80); op_eb(z80);                        } /* DB   DD          */
2447OP(dd,ec) { illegal_1(z80); op_ec(z80);                        } /* DB   DD          */
2448OP(dd,ed) { illegal_1(z80); op_ed(z80);                        } /* DB   DD          */
2449OP(dd,ee) { illegal_1(z80); op_ee(z80);                        } /* DB   DD          */
2450OP(dd,ef) { illegal_1(z80); op_ef(z80);                        } /* DB   DD          */
24042451
2405OP(dd,f0) { illegal_1(); op_f0();                        } /* DB   DD          */
2406OP(dd,f1) { illegal_1(); op_f1();                        } /* DB   DD          */
2407OP(dd,f2) { illegal_1(); op_f2();                        } /* DB   DD          */
2408OP(dd,f3) { illegal_1(); op_f3();                        } /* DB   DD          */
2409OP(dd,f4) { illegal_1(); op_f4();                        } /* DB   DD          */
2410OP(dd,f5) { illegal_1(); op_f5();                        } /* DB   DD          */
2411OP(dd,f6) { illegal_1(); op_f6();                        } /* DB   DD          */
2412OP(dd,f7) { illegal_1(); op_f7();                        } /* DB   DD          */
2452OP(dd,f0) { illegal_1(z80); op_f0(z80);                        } /* DB   DD          */
2453OP(dd,f1) { illegal_1(z80); op_f1(z80);                        } /* DB   DD          */
2454OP(dd,f2) { illegal_1(z80); op_f2(z80);                        } /* DB   DD          */
2455OP(dd,f3) { illegal_1(z80); op_f3(z80);                        } /* DB   DD          */
2456OP(dd,f4) { illegal_1(z80); op_f4(z80);                        } /* DB   DD          */
2457OP(dd,f5) { illegal_1(z80); op_f5(z80);                        } /* DB   DD          */
2458OP(dd,f6) { illegal_1(z80); op_f6(z80);                        } /* DB   DD          */
2459OP(dd,f7) { illegal_1(z80); op_f7(z80);                        } /* DB   DD          */
24132460
2414OP(dd,f8) { illegal_1(); op_f8();                        } /* DB   DD          */
2415OP(dd,f9) { SP = IX;                              } /* LD   SP,IX       */
2416OP(dd,fa) { illegal_1(); op_fa();                        } /* DB   DD          */
2417OP(dd,fb) { illegal_1(); op_fb();                        } /* DB   DD          */
2418OP(dd,fc) { illegal_1(); op_fc();                        } /* DB   DD          */
2419OP(dd,fd) { illegal_1(); op_fd();                        } /* DB   DD          */
2420OP(dd,fe) { illegal_1(); op_fe();                        } /* DB   DD          */
2421OP(dd,ff) { illegal_1(); op_ff();                        } /* DB   DD          */
2461OP(dd,f8) { illegal_1(z80); op_f8(z80);                        } /* DB   DD          */
2462OP(dd,f9) { SP = IX;                                    } /* LD   SP,IX       */
2463OP(dd,fa) { illegal_1(z80); op_fa(z80);                        } /* DB   DD          */
2464OP(dd,fb) { illegal_1(z80); op_fb(z80);                        } /* DB   DD          */
2465OP(dd,fc) { illegal_1(z80); op_fc(z80);                        } /* DB   DD          */
2466OP(dd,fd) { illegal_1(z80); op_fd(z80);                        } /* DB   DD          */
2467OP(dd,fe) { illegal_1(z80); op_fe(z80);                        } /* DB   DD          */
2468OP(dd,ff) { illegal_1(z80); op_ff(z80);                        } /* DB   DD          */
24222469
24232470/**********************************************************
24242471 * IY register related opcodes (FD prefix)
24252472 **********************************************************/
2426OP(fd,00) { illegal_1(); op_00();                        } /* DB   FD          */
2427OP(fd,01) { illegal_1(); op_01();                        } /* DB   FD          */
2428OP(fd,02) { illegal_1(); op_02();                        } /* DB   FD          */
2429OP(fd,03) { illegal_1(); op_03();                        } /* DB   FD          */
2430OP(fd,04) { illegal_1(); op_04();                        } /* DB   FD          */
2431OP(fd,05) { illegal_1(); op_05();                        } /* DB   FD          */
2432OP(fd,06) { illegal_1(); op_06();                        } /* DB   FD          */
2433OP(fd,07) { illegal_1(); op_07();                        } /* DB   FD          */
2473OP(fd,00) { illegal_1(z80); op_00(z80);                        } /* DB   FD          */
2474OP(fd,01) { illegal_1(z80); op_01(z80);                        } /* DB   FD          */
2475OP(fd,02) { illegal_1(z80); op_02(z80);                        } /* DB   FD          */
2476OP(fd,03) { illegal_1(z80); op_03(z80);                        } /* DB   FD          */
2477OP(fd,04) { illegal_1(z80); op_04(z80);                        } /* DB   FD          */
2478OP(fd,05) { illegal_1(z80); op_05(z80);                        } /* DB   FD          */
2479OP(fd,06) { illegal_1(z80); op_06(z80);                        } /* DB   FD          */
2480OP(fd,07) { illegal_1(z80); op_07(z80);                        } /* DB   FD          */
24342481
2435OP(fd,08) { illegal_1(); op_08();                        } /* DB   FD          */
2436OP(fd,09) { ADD16(iy,bc);                           } /* ADD  IY,BC       */
2437OP(fd,0a) { illegal_1(); op_0a();                        } /* DB   FD          */
2438OP(fd,0b) { illegal_1(); op_0b();                        } /* DB   FD          */
2439OP(fd,0c) { illegal_1(); op_0c();                        } /* DB   FD          */
2440OP(fd,0d) { illegal_1(); op_0d();                        } /* DB   FD          */
2441OP(fd,0e) { illegal_1(); op_0e();                        } /* DB   FD          */
2442OP(fd,0f) { illegal_1(); op_0f();                        } /* DB   FD          */
2482OP(fd,08) { illegal_1(z80); op_08(z80);                        } /* DB   FD          */
2483OP(fd,09) { ADD16(iy,bc);                                 } /* ADD  IY,BC       */
2484OP(fd,0a) { illegal_1(z80); op_0a(z80);                        } /* DB   FD          */
2485OP(fd,0b) { illegal_1(z80); op_0b(z80);                        } /* DB   FD          */
2486OP(fd,0c) { illegal_1(z80); op_0c(z80);                        } /* DB   FD          */
2487OP(fd,0d) { illegal_1(z80); op_0d(z80);                        } /* DB   FD          */
2488OP(fd,0e) { illegal_1(z80); op_0e(z80);                        } /* DB   FD          */
2489OP(fd,0f) { illegal_1(z80); op_0f(z80);                        } /* DB   FD          */
24432490
2444OP(fd,10) { illegal_1(); op_10();                        } /* DB   FD          */
2445OP(fd,11) { illegal_1(); op_11();                        } /* DB   FD          */
2446OP(fd,12) { illegal_1(); op_12();                        } /* DB   FD          */
2447OP(fd,13) { illegal_1(); op_13();                        } /* DB   FD          */
2448OP(fd,14) { illegal_1(); op_14();                        } /* DB   FD          */
2449OP(fd,15) { illegal_1(); op_15();                        } /* DB   FD          */
2450OP(fd,16) { illegal_1(); op_16();                        } /* DB   FD          */
2451OP(fd,17) { illegal_1(); op_17();                        } /* DB   FD          */
2491OP(fd,10) { illegal_1(z80); op_10(z80);                        } /* DB   FD          */
2492OP(fd,11) { illegal_1(z80); op_11(z80);                        } /* DB   FD          */
2493OP(fd,12) { illegal_1(z80); op_12(z80);                        } /* DB   FD          */
2494OP(fd,13) { illegal_1(z80); op_13(z80);                        } /* DB   FD          */
2495OP(fd,14) { illegal_1(z80); op_14(z80);                        } /* DB   FD          */
2496OP(fd,15) { illegal_1(z80); op_15(z80);                        } /* DB   FD          */
2497OP(fd,16) { illegal_1(z80); op_16(z80);                        } /* DB   FD          */
2498OP(fd,17) { illegal_1(z80); op_17(z80);                        } /* DB   FD          */
24522499
2453OP(fd,18) { illegal_1(); op_18();                        } /* DB   FD          */
2454OP(fd,19) { ADD16(iy,de);                           } /* ADD  IY,DE       */
2455OP(fd,1a) { illegal_1(); op_1a();                        } /* DB   FD          */
2456OP(fd,1b) { illegal_1(); op_1b();                        } /* DB   FD          */
2457OP(fd,1c) { illegal_1(); op_1c();                        } /* DB   FD          */
2458OP(fd,1d) { illegal_1(); op_1d();                        } /* DB   FD          */
2459OP(fd,1e) { illegal_1(); op_1e();                        } /* DB   FD          */
2460OP(fd,1f) { illegal_1(); op_1f();                        } /* DB   FD          */
2500OP(fd,18) { illegal_1(z80); op_18(z80);                        } /* DB   FD          */
2501OP(fd,19) { ADD16(iy,de);                                 } /* ADD  IY,DE       */
2502OP(fd,1a) { illegal_1(z80); op_1a(z80);                        } /* DB   FD          */
2503OP(fd,1b) { illegal_1(z80); op_1b(z80);                        } /* DB   FD          */
2504OP(fd,1c) { illegal_1(z80); op_1c(z80);                        } /* DB   FD          */
2505OP(fd,1d) { illegal_1(z80); op_1d(z80);                        } /* DB   FD          */
2506OP(fd,1e) { illegal_1(z80); op_1e(z80);                        } /* DB   FD          */
2507OP(fd,1f) { illegal_1(z80); op_1f(z80);                        } /* DB   FD          */
24612508
2462OP(fd,20) { illegal_1(); op_20();                        } /* DB   FD          */
2463OP(fd,21) { IY = ARG16();                           } /* LD   IY,w        */
2464OP(fd,22) { EA = ARG16(); WM16( EA, &Z80.iy );            } /* LD   (w),IY      */
2465OP(fd,23) { IY++;                                 } /* INC  IY          */
2466OP(fd,24) { HY = INC(HY);                           } /* INC  HY          */
2467OP(fd,25) { HY = DEC(HY);                           } /* DEC  HY          */
2468OP(fd,26) { HY = ARG();                           } /* LD   HY,n        */
2469OP(fd,27) { illegal_1(); op_27();                        } /* DB   FD          */
2509OP(fd,20) { illegal_1(z80); op_20(z80);                        } /* DB   FD          */
2510OP(fd,21) { IY = ARG16(z80);                              } /* LD   IY,w        */
2511OP(fd,22) { EA = ARG16(z80); WM16( EA, &z80->iy ); MEMPTR = EA+1;   } /* LD   (w),IY      */
2512OP(fd,23) { IY++;                                       } /* INC  IY          */
2513OP(fd,24) { HY = INC(z80, HY);                              } /* INC  HY          */
2514OP(fd,25) { HY = DEC(z80, HY);                              } /* DEC  HY          */
2515OP(fd,26) { HY = ARG(z80);                                 } /* LD   HY,n        */
2516OP(fd,27) { illegal_1(z80); op_27(z80);                        } /* DB   FD          */
24702517
2471OP(fd,28) { illegal_1(); op_28();                        } /* DB   FD          */
2472OP(fd,29) { ADD16(iy,iy);                           } /* ADD  IY,IY       */
2473OP(fd,2a) { EA = ARG16(); RM16( EA, &Z80.iy );            } /* LD   IY,(w)      */
2474OP(fd,2b) { IY--;                                 } /* DEC  IY          */
2475OP(fd,2c) { LY = INC(LY);                           } /* INC  LY          */
2476OP(fd,2d) { LY = DEC(LY);                           } /* DEC  LY          */
2477OP(fd,2e) { LY = ARG();                           } /* LD   LY,n        */
2478OP(fd,2f) { illegal_1(); op_2f();                        } /* DB   FD          */
2518OP(fd,28) { illegal_1(z80); op_28(z80);                        } /* DB   FD          */
2519OP(fd,29) { ADD16(iy,iy);                                 } /* ADD  IY,IY       */
2520OP(fd,2a) { EA = ARG16(z80); RM16( EA, &z80->iy ); MEMPTR = EA+1;   } /* LD   IY,(w)      */
2521OP(fd,2b) { IY--;                                       } /* DEC  IY          */
2522OP(fd,2c) { LY = INC(z80, LY);                              } /* INC  LY          */
2523OP(fd,2d) { LY = DEC(z80, LY);                              } /* DEC  LY          */
2524OP(fd,2e) { LY = ARG(z80);                                 } /* LD   LY,n        */
2525OP(fd,2f) { illegal_1(z80); op_2f(z80);                        } /* DB   FD          */
24792526
2480OP(fd,30) { illegal_1(); op_30();                        } /* DB   FD          */
2481OP(fd,31) { illegal_1(); op_31();                        } /* DB   FD          */
2482OP(fd,32) { illegal_1(); op_32();                        } /* DB   FD          */
2483OP(fd,33) { illegal_1(); op_33();                        } /* DB   FD          */
2484OP(fd,34) { EAY; WM( EA, INC(RM(EA)) );               } /* INC  (IY+o)      */
2485OP(fd,35) { EAY; WM( EA, DEC(RM(EA)) );               } /* DEC  (IY+o)      */
2486OP(fd,36) { EAY; WM( EA, ARG() );                     } /* LD   (IY+o),n    */
2487OP(fd,37) { illegal_1(); op_37();                        } /* DB   FD          */
2527OP(fd,30) { illegal_1(z80); op_30(z80);                        } /* DB   FD          */
2528OP(fd,31) { illegal_1(z80); op_31(z80);                        } /* DB   FD          */
2529OP(fd,32) { illegal_1(z80); op_32(z80);                        } /* DB   FD          */
2530OP(fd,33) { illegal_1(z80); op_33(z80);                        } /* DB   FD          */
2531OP(fd,34) { EAY; WM( EA, INC(z80, RM(EA)) );                  } /* INC  (IY+o)      */
2532OP(fd,35) { EAY; WM( EA, DEC(z80, RM(EA)) );                  } /* DEC  (IY+o)      */
2533OP(fd,36) { EAY; WM( EA, ARG(z80) );                        } /* LD   (IY+o),n    */
2534OP(fd,37) { illegal_1(z80); op_37(z80);                        } /* DB   FD          */
24882535
2489OP(fd,38) { illegal_1(); op_38();                        } /* DB   FD          */
2490OP(fd,39) { ADD16(iy,sp);                           } /* ADD  IY,SP       */
2491OP(fd,3a) { illegal_1(); op_3a();                        } /* DB   FD          */
2492OP(fd,3b) { illegal_1(); op_3b();                        } /* DB   FD          */
2493OP(fd,3c) { illegal_1(); op_3c();                        } /* DB   FD          */
2494OP(fd,3d) { illegal_1(); op_3d();                        } /* DB   FD          */
2495OP(fd,3e) { illegal_1(); op_3e();                        } /* DB   FD          */
2496OP(fd,3f) { illegal_1(); op_3f();                        } /* DB   FD          */
2536OP(fd,38) { illegal_1(z80); op_38(z80);                        } /* DB   FD          */
2537OP(fd,39) { ADD16(iy,sp);                                 } /* ADD  IY,SP       */
2538OP(fd,3a) { illegal_1(z80); op_3a(z80);                        } /* DB   FD          */
2539OP(fd,3b) { illegal_1(z80); op_3b(z80);                        } /* DB   FD          */
2540OP(fd,3c) { illegal_1(z80); op_3c(z80);                        } /* DB   FD          */
2541OP(fd,3d) { illegal_1(z80); op_3d(z80);                        } /* DB   FD          */
2542OP(fd,3e) { illegal_1(z80); op_3e(z80);                        } /* DB   FD          */
2543OP(fd,3f) { illegal_1(z80); op_3f(z80);                        } /* DB   FD          */
24972544
2498OP(fd,40) { illegal_1(); op_40();                        } /* DB   FD          */
2499OP(fd,41) { illegal_1(); op_41();                        } /* DB   FD          */
2500OP(fd,42) { illegal_1(); op_42();                        } /* DB   FD          */
2501OP(fd,43) { illegal_1(); op_43();                        } /* DB   FD          */
2502OP(fd,44) { B = HY;                              } /* LD   B,HY        */
2503OP(fd,45) { B = LY;                              } /* LD   B,LY        */
2504OP(fd,46) { EAY; B = RM(EA);                        } /* LD   B,(IY+o)    */
2505OP(fd,47) { illegal_1(); op_47();                        } /* DB   FD          */
2545OP(fd,40) { illegal_1(z80); op_40(z80);                        } /* DB   FD          */
2546OP(fd,41) { illegal_1(z80); op_41(z80);                        } /* DB   FD          */
2547OP(fd,42) { illegal_1(z80); op_42(z80);                        } /* DB   FD          */
2548OP(fd,43) { illegal_1(z80); op_43(z80);                        } /* DB   FD          */
2549OP(fd,44) { B = HY;                                       } /* LD   B,HY        */
2550OP(fd,45) { B = LY;                                       } /* LD   B,LY        */
2551OP(fd,46) { EAY; B = RM(EA);                              } /* LD   B,(IY+o)    */
2552OP(fd,47) { illegal_1(z80); op_47(z80);                        } /* DB   FD          */
25062553
2507OP(fd,48) { illegal_1(); op_48();                        } /* DB   FD          */
2508OP(fd,49) { illegal_1(); op_49();                        } /* DB   FD          */
2509OP(fd,4a) { illegal_1(); op_4a();                        } /* DB   FD          */
2510OP(fd,4b) { illegal_1(); op_4b();                        } /* DB   FD          */
2511OP(fd,4c) { C = HY;                              } /* LD   C,HY        */
2512OP(fd,4d) { C = LY;                              } /* LD   C,LY        */
2513OP(fd,4e) { EAY; C = RM(EA);                        } /* LD   C,(IY+o)    */
2514OP(fd,4f) { illegal_1(); op_4f();                        } /* DB   FD          */
2554OP(fd,48) { illegal_1(z80); op_48(z80);                        } /* DB   FD          */
2555OP(fd,49) { illegal_1(z80); op_49(z80);                        } /* DB   FD          */
2556OP(fd,4a) { illegal_1(z80); op_4a(z80);                        } /* DB   FD          */
2557OP(fd,4b) { illegal_1(z80); op_4b(z80);                        } /* DB   FD          */
2558OP(fd,4c) { C = HY;                                       } /* LD   C,HY        */
2559OP(fd,4d) { C = LY;                                       } /* LD   C,LY        */
2560OP(fd,4e) { EAY; C = RM(EA);                              } /* LD   C,(IY+o)    */
2561OP(fd,4f) { illegal_1(z80); op_4f(z80);                        } /* DB   FD          */
25152562
2516OP(fd,50) { illegal_1(); op_50();                        } /* DB   FD          */
2517OP(fd,51) { illegal_1(); op_51();                        } /* DB   FD          */
2518OP(fd,52) { illegal_1(); op_52();                        } /* DB   FD          */
2519OP(fd,53) { illegal_1(); op_53();                        } /* DB   FD          */
2520OP(fd,54) { D = HY;                              } /* LD   D,HY        */
2521OP(fd,55) { D = LY;                              } /* LD   D,LY        */
2522OP(fd,56) { EAY; D = RM(EA);                        } /* LD   D,(IY+o)    */
2523OP(fd,57) { illegal_1(); op_57();                        } /* DB   FD          */
2563OP(fd,50) { illegal_1(z80); op_50(z80);                        } /* DB   FD          */
2564OP(fd,51) { illegal_1(z80); op_51(z80);                        } /* DB   FD          */
2565OP(fd,52) { illegal_1(z80); op_52(z80);                        } /* DB   FD          */
2566OP(fd,53) { illegal_1(z80); op_53(z80);                        } /* DB   FD          */
2567OP(fd,54) { D = HY;                                       } /* LD   D,HY        */
2568OP(fd,55) { D = LY;                                       } /* LD   D,LY        */
2569OP(fd,56) { EAY; D = RM(EA);                              } /* LD   D,(IY+o)    */
2570OP(fd,57) { illegal_1(z80); op_57(z80);                        } /* DB   FD          */
25242571
2525OP(fd,58) { illegal_1(); op_58();                        } /* DB   FD          */
2526OP(fd,59) { illegal_1(); op_59();                        } /* DB   FD          */
2527OP(fd,5a) { illegal_1(); op_5a();                        } /* DB   FD          */
2528OP(fd,5b) { illegal_1(); op_5b();                        } /* DB   FD          */
2529OP(fd,5c) { E = HY;                              } /* LD   E,HY        */
2530OP(fd,5d) { E = LY;                              } /* LD   E,LY        */
2531OP(fd,5e) { EAY; E = RM(EA);                        } /* LD   E,(IY+o)    */
2532OP(fd,5f) { illegal_1(); op_5f();                        } /* DB   FD          */
2572OP(fd,58) { illegal_1(z80); op_58(z80);                        } /* DB   FD          */
2573OP(fd,59) { illegal_1(z80); op_59(z80);                        } /* DB   FD          */
2574OP(fd,5a) { illegal_1(z80); op_5a(z80);                        } /* DB   FD          */
2575OP(fd,5b) { illegal_1(z80); op_5b(z80);                        } /* DB   FD          */
2576OP(fd,5c) { E = HY;                                       } /* LD   E,HY        */
2577OP(fd,5d) { E = LY;                                       } /* LD   E,LY        */
2578OP(fd,5e) { EAY; E = RM(EA);                              } /* LD   E,(IY+o)    */
2579OP(fd,5f) { illegal_1(z80); op_5f(z80);                        } /* DB   FD          */
25332580
2534OP(fd,60) { HY = B;                              } /* LD   HY,B        */
2535OP(fd,61) { HY = C;                              } /* LD   HY,C        */
2536OP(fd,62) { HY = D;                              } /* LD   HY,D        */
2537OP(fd,63) { HY = E;                              } /* LD   HY,E        */
2538OP(fd,64) {                                    } /* LD   HY,HY       */
2539OP(fd,65) { HY = LY;                              } /* LD   HY,LY       */
2540OP(fd,66) { EAY; H = RM(EA);                        } /* LD   H,(IY+o)    */
2541OP(fd,67) { HY = A;                              } /* LD   HY,A        */
2581OP(fd,60) { HY = B;                                       } /* LD   HY,B        */
2582OP(fd,61) { HY = C;                                       } /* LD   HY,C        */
2583OP(fd,62) { HY = D;                                       } /* LD   HY,D        */
2584OP(fd,63) { HY = E;                                       } /* LD   HY,E        */
2585OP(fd,64) {                                             } /* LD   HY,HY       */
2586OP(fd,65) { HY = LY;                                    } /* LD   HY,LY       */
2587OP(fd,66) { EAY; H = RM(EA);                              } /* LD   H,(IY+o)    */
2588OP(fd,67) { HY = A;                                       } /* LD   HY,A        */
25422589
2543OP(fd,68) { LY = B;                              } /* LD   LY,B        */
2544OP(fd,69) { LY = C;                              } /* LD   LY,C        */
2545OP(fd,6a) { LY = D;                              } /* LD   LY,D        */
2546OP(fd,6b) { LY = E;                              } /* LD   LY,E        */
2547OP(fd,6c) { LY = HY;                              } /* LD   LY,HY       */
2548OP(fd,6d) {                                    } /* LD   LY,LY       */
2549OP(fd,6e) { EAY; L = RM(EA);                        } /* LD   L,(IY+o)    */
2550OP(fd,6f) { LY = A;                              } /* LD   LY,A        */
2590OP(fd,68) { LY = B;                                       } /* LD   LY,B        */
2591OP(fd,69) { LY = C;                                       } /* LD   LY,C        */
2592OP(fd,6a) { LY = D;                                       } /* LD   LY,D        */
2593OP(fd,6b) { LY = E;                                       } /* LD   LY,E        */
2594OP(fd,6c) { LY = HY;                                    } /* LD   LY,HY       */
2595OP(fd,6d) {                                             } /* LD   LY,LY       */
2596OP(fd,6e) { EAY; L = RM(EA);                              } /* LD   L,(IY+o)    */
2597OP(fd,6f) { LY = A;                                       } /* LD   LY,A        */
25512598
2552OP(fd,70) { EAY; WM( EA, B );                        } /* LD   (IY+o),B    */
2553OP(fd,71) { EAY; WM( EA, C );                        } /* LD   (IY+o),C    */
2554OP(fd,72) { EAY; WM( EA, D );                        } /* LD   (IY+o),D    */
2555OP(fd,73) { EAY; WM( EA, E );                        } /* LD   (IY+o),E    */
2556OP(fd,74) { EAY; WM( EA, H );                        } /* LD   (IY+o),H    */
2557OP(fd,75) { EAY; WM( EA, L );                        } /* LD   (IY+o),L    */
2558OP(fd,76) { illegal_1(); op_76();                        } /* DB   FD          */
2559OP(fd,77) { EAY; WM( EA, A );                        } /* LD   (IY+o),A    */
2599OP(fd,70) { EAY; WM( EA, B );                              } /* LD   (IY+o),B    */
2600OP(fd,71) { EAY; WM( EA, C );                              } /* LD   (IY+o),C    */
2601OP(fd,72) { EAY; WM( EA, D );                              } /* LD   (IY+o),D    */
2602OP(fd,73) { EAY; WM( EA, E );                              } /* LD   (IY+o),E    */
2603OP(fd,74) { EAY; WM( EA, H );                              } /* LD   (IY+o),H    */
2604OP(fd,75) { EAY; WM( EA, L );                              } /* LD   (IY+o),L    */
2605OP(fd,76) { illegal_1(z80); op_76(z80);                        } /* DB   FD          */
2606OP(fd,77) { EAY; WM( EA, A );                              } /* LD   (IY+o),A    */
25602607
2561OP(fd,78) { illegal_1(); op_78();                        } /* DB   FD          */
2562OP(fd,79) { illegal_1(); op_79();                        } /* DB   FD          */
2563OP(fd,7a) { illegal_1(); op_7a();                        } /* DB   FD          */
2564OP(fd,7b) { illegal_1(); op_7b();                        } /* DB   FD          */
2565OP(fd,7c) { A = HY;                              } /* LD   A,HY        */
2566OP(fd,7d) { A = LY;                              } /* LD   A,LY        */
2567OP(fd,7e) { EAY; A = RM(EA);                        } /* LD   A,(IY+o)    */
2568OP(fd,7f) { illegal_1(); op_7f();                        } /* DB   FD          */
2608OP(fd,78) { illegal_1(z80); op_78(z80);                        } /* DB   FD          */
2609OP(fd,79) { illegal_1(z80); op_79(z80);                        } /* DB   FD          */
2610OP(fd,7a) { illegal_1(z80); op_7a(z80);                        } /* DB   FD          */
2611OP(fd,7b) { illegal_1(z80); op_7b(z80);                        } /* DB   FD          */
2612OP(fd,7c) { A = HY;                                       } /* LD   A,HY        */
2613OP(fd,7d) { A = LY;                                       } /* LD   A,LY        */
2614OP(fd,7e) { EAY; A = RM(EA);                              } /* LD   A,(IY+o)    */
2615OP(fd,7f) { illegal_1(z80); op_7f(z80);                        } /* DB   FD          */
25692616
2570OP(fd,80) { illegal_1(); op_80();                        } /* DB   FD          */
2571OP(fd,81) { illegal_1(); op_81();                        } /* DB   FD          */
2572OP(fd,82) { illegal_1(); op_82();                        } /* DB   FD          */
2573OP(fd,83) { illegal_1(); op_83();                        } /* DB   FD          */
2574OP(fd,84) { ADD(HY);                              } /* ADD  A,HY        */
2575OP(fd,85) { ADD(LY);                              } /* ADD  A,LY        */
2576OP(fd,86) { EAY; ADD(RM(EA));                        } /* ADD  A,(IY+o)    */
2577OP(fd,87) { illegal_1(); op_87();                        } /* DB   FD          */
2617OP(fd,80) { illegal_1(z80); op_80(z80);                        } /* DB   FD          */
2618OP(fd,81) { illegal_1(z80); op_81(z80);                        } /* DB   FD          */
2619OP(fd,82) { illegal_1(z80); op_82(z80);                        } /* DB   FD          */
2620OP(fd,83) { illegal_1(z80); op_83(z80);                        } /* DB   FD          */
2621OP(fd,84) { ADD(HY);                                    } /* ADD  A,HY        */
2622OP(fd,85) { ADD(LY);                                    } /* ADD  A,LY        */
2623OP(fd,86) { EAY; ADD(RM(EA));                              } /* ADD  A,(IY+o)    */
2624OP(fd,87) { illegal_1(z80); op_87(z80);                        } /* DB   FD          */
25782625
2579OP(fd,88) { illegal_1(); op_88();                        } /* DB   FD          */
2580OP(fd,89) { illegal_1(); op_89();                        } /* DB   FD          */
2581OP(fd,8a) { illegal_1(); op_8a();                        } /* DB   FD          */
2582OP(fd,8b) { illegal_1(); op_8b();                        } /* DB   FD          */
2583OP(fd,8c) { ADC(HY);                              } /* ADC  A,HY        */
2584OP(fd,8d) { ADC(LY);                              } /* ADC  A,LY        */
2585OP(fd,8e) { EAY; ADC(RM(EA));                        } /* ADC  A,(IY+o)    */
2586OP(fd,8f) { illegal_1(); op_8f();                        } /* DB   FD          */
2626OP(fd,88) { illegal_1(z80); op_88(z80);                        } /* DB   FD          */
2627OP(fd,89) { illegal_1(z80); op_89(z80);                        } /* DB   FD          */
2628OP(fd,8a) { illegal_1(z80); op_8a(z80);                        } /* DB   FD          */
2629OP(fd,8b) { illegal_1(z80); op_8b(z80);                        } /* DB   FD          */
2630OP(fd,8c) { ADC(HY);                                    } /* ADC  A,HY        */
2631OP(fd,8d) { ADC(LY);                                    } /* ADC  A,LY        */
2632OP(fd,8e) { EAY; ADC(RM(EA));                              } /* ADC  A,(IY+o)    */
2633OP(fd,8f) { illegal_1(z80); op_8f(z80);                        } /* DB   FD          */
25872634
2588OP(fd,90) { illegal_1(); op_90();                        } /* DB   FD          */
2589OP(fd,91) { illegal_1(); op_91();                        } /* DB   FD          */
2590OP(fd,92) { illegal_1(); op_92();                        } /* DB   FD          */
2591OP(fd,93) { illegal_1(); op_93();                        } /* DB   FD          */
2592OP(fd,94) { SUB(HY);                              } /* SUB  HY          */
2593OP(fd,95) { SUB(LY);                              } /* SUB  LY          */
2594OP(fd,96) { EAY; SUB(RM(EA));                        } /* SUB  (IY+o)      */
2595OP(fd,97) { illegal_1(); op_97();                        } /* DB   FD          */
2635OP(fd,90) { illegal_1(z80); op_90(z80);                        } /* DB   FD          */
2636OP(fd,91) { illegal_1(z80); op_91(z80);                        } /* DB   FD          */
2637OP(fd,92) { illegal_1(z80); op_92(z80);                        } /* DB   FD          */
2638OP(fd,93) { illegal_1(z80); op_93(z80);                        } /* DB   FD          */
2639OP(fd,94) { SUB(HY);                                    } /* SUB  HY          */
2640OP(fd,95) { SUB(LY);                                    } /* SUB  LY          */
2641OP(fd,96) { EAY; SUB(RM(EA));                              } /* SUB  (IY+o)      */
2642OP(fd,97) { illegal_1(z80); op_97(z80);                        } /* DB   FD          */
25962643
2597OP(fd,98) { illegal_1(); op_98();                        } /* DB   FD          */
2598OP(fd,99) { illegal_1(); op_99();                        } /* DB   FD          */
2599OP(fd,9a) { illegal_1(); op_9a();                        } /* DB   FD          */
2600OP(fd,9b) { illegal_1(); op_9b();                        } /* DB   FD          */
2601OP(fd,9c) { SBC(HY);                              } /* SBC  A,HY        */
2602OP(fd,9d) { SBC(LY);                              } /* SBC  A,LY        */
2603OP(fd,9e) { EAY; SBC(RM(EA));                        } /* SBC  A,(IY+o)    */
2604OP(fd,9f) { illegal_1(); op_9f();                        } /* DB   FD          */
2644OP(fd,98) { illegal_1(z80); op_98(z80);                        } /* DB   FD          */
2645OP(fd,99) { illegal_1(z80); op_99(z80);                        } /* DB   FD          */
2646OP(fd,9a) { illegal_1(z80); op_9a(z80);                        } /* DB   FD          */
2647OP(fd,9b) { illegal_1(z80); op_9b(z80);                        } /* DB   FD          */
2648OP(fd,9c) { SBC(HY);                                    } /* SBC  A,HY        */
2649OP(fd,9d) { SBC(LY);                                    } /* SBC  A,LY        */
2650OP(fd,9e) { EAY; SBC(RM(EA));                              } /* SBC  A,(IY+o)    */
2651OP(fd,9f) { illegal_1(z80); op_9f(z80);                        } /* DB   FD          */
26052652
2606OP(fd,a0) { illegal_1(); op_a0();                        } /* DB   FD          */
2607OP(fd,a1) { illegal_1(); op_a1();                        } /* DB   FD          */
2608OP(fd,a2) { illegal_1(); op_a2();                        } /* DB   FD          */
2609OP(fd,a3) { illegal_1(); op_a3();                        } /* DB   FD          */
2610OP(fd,a4) { AND(HY);                              } /* AND  HY          */
2611OP(fd,a5) { AND(LY);                              } /* AND  LY          */
2612OP(fd,a6) { EAY; AND(RM(EA));                        } /* AND  (IY+o)      */
2613OP(fd,a7) { illegal_1(); op_a7();                        } /* DB   FD          */
2653OP(fd,a0) { illegal_1(z80); op_a0(z80);                        } /* DB   FD          */
2654OP(fd,a1) { illegal_1(z80); op_a1(z80);                        } /* DB   FD          */
2655OP(fd,a2) { illegal_1(z80); op_a2(z80);                        } /* DB   FD          */
2656OP(fd,a3) { illegal_1(z80); op_a3(z80);                        } /* DB   FD          */
2657OP(fd,a4) { AND(HY);                                    } /* AND  HY          */
2658OP(fd,a5) { AND(LY);                                    } /* AND  LY          */
2659OP(fd,a6) { EAY; AND(RM(EA));                              } /* AND  (IY+o)      */
2660OP(fd,a7) { illegal_1(z80); op_a7(z80);                        } /* DB   FD          */
26142661
2615OP(fd,a8) { illegal_1(); op_a8();                        } /* DB   FD          */
2616OP(fd,a9) { illegal_1(); op_a9();                        } /* DB   FD          */
2617OP(fd,aa) { illegal_1(); op_aa();                        } /* DB   FD          */
2618OP(fd,ab) { illegal_1(); op_ab();                        } /* DB   FD          */
2619OP(fd,ac) { XOR(HY);                              } /* XOR  HY          */
2620OP(fd,ad) { XOR(LY);                              } /* XOR  LY          */
2621OP(fd,ae) { EAY; XOR(RM(EA));                        } /* XOR  (IY+o)      */
2622OP(fd,af) { illegal_1(); op_af();                        } /* DB   FD          */
2662OP(fd,a8) { illegal_1(z80); op_a8(z80);                        } /* DB   FD          */
2663OP(fd,a9) { illegal_1(z80); op_a9(z80);                        } /* DB   FD          */
2664OP(fd,aa) { illegal_1(z80); op_aa(z80);                        } /* DB   FD          */
2665OP(fd,ab) { illegal_1(z80); op_ab(z80);                        } /* DB   FD          */
2666OP(fd,ac) { XOR(HY);                                    } /* XOR  HY          */
2667OP(fd,ad) { XOR(LY);                                    } /* XOR  LY          */
2668OP(fd,ae) { EAY; XOR(RM(EA));                              } /* XOR  (IY+o)      */
2669OP(fd,af) { illegal_1(z80); op_af(z80);                        } /* DB   FD          */
26232670
2624OP(fd,b0) { illegal_1(); op_b0();                        } /* DB   FD          */
2625OP(fd,b1) { illegal_1(); op_b1();                        } /* DB   FD          */
2626OP(fd,b2) { illegal_1(); op_b2();                        } /* DB   FD          */
2627OP(fd,b3) { illegal_1(); op_b3();                        } /* DB   FD          */
2628OP(fd,b4) { OR(HY);                              } /* OR   HY          */
2629OP(fd,b5) { OR(LY);                              } /* OR   LY          */
2630OP(fd,b6) { EAY; OR(RM(EA));                        } /* OR   (IY+o)      */
2631OP(fd,b7) { illegal_1(); op_b7();                        } /* DB   FD          */
2671OP(fd,b0) { illegal_1(z80); op_b0(z80);                        } /* DB   FD          */
2672OP(fd,b1) { illegal_1(z80); op_b1(z80);                        } /* DB   FD          */
2673OP(fd,b2) { illegal_1(z80); op_b2(z80);                        } /* DB   FD          */
2674OP(fd,b3) { illegal_1(z80); op_b3(z80);                        } /* DB   FD          */
2675OP(fd,b4) { OR(HY);                                       } /* OR   HY          */
2676OP(fd,b5) { OR(LY);                                       } /* OR   LY          */
2677OP(fd,b6) { EAY; OR(RM(EA));                              } /* OR   (IY+o)      */
2678OP(fd,b7) { illegal_1(z80); op_b7(z80);                        } /* DB   FD          */
26322679
2633OP(fd,b8) { illegal_1(); op_b8();                        } /* DB   FD          */
2634OP(fd,b9) { illegal_1(); op_b9();                        } /* DB   FD          */
2635OP(fd,ba) { illegal_1(); op_ba();                        } /* DB   FD          */
2636OP(fd,bb) { illegal_1(); op_bb();                        } /* DB   FD          */
2637OP(fd,bc) { CP(HY);                              } /* CP   HY          */
2638OP(fd,bd) { CP(LY);                              } /* CP   LY          */
2639OP(fd,be) { EAY; CP(RM(EA));                        } /* CP   (IY+o)      */
2640OP(fd,bf) { illegal_1(); op_bf();                        } /* DB   FD          */
2680OP(fd,b8) { illegal_1(z80); op_b8(z80);                        } /* DB   FD          */
2681OP(fd,b9) { illegal_1(z80); op_b9(z80);                        } /* DB   FD          */
2682OP(fd,ba) { illegal_1(z80); op_ba(z80);                        } /* DB   FD          */
2683OP(fd,bb) { illegal_1(z80); op_bb(z80);                        } /* DB   FD          */
2684OP(fd,bc) { CP(HY);                                       } /* CP   HY          */
2685OP(fd,bd) { CP(LY);                                       } /* CP   LY          */
2686OP(fd,be) { EAY; CP(RM(EA));                              } /* CP   (IY+o)      */
2687OP(fd,bf) { illegal_1(z80); op_bf(z80);                        } /* DB   FD          */
26412688
2642OP(fd,c0) { illegal_1(); op_c0();                        } /* DB   FD          */
2643OP(fd,c1) { illegal_1(); op_c1();                        } /* DB   FD          */
2644OP(fd,c2) { illegal_1(); op_c2();                        } /* DB   FD          */
2645OP(fd,c3) { illegal_1(); op_c3();                        } /* DB   FD          */
2646OP(fd,c4) { illegal_1(); op_c4();                        } /* DB   FD          */
2647OP(fd,c5) { illegal_1(); op_c5();                        } /* DB   FD          */
2648OP(fd,c6) { illegal_1(); op_c6();                        } /* DB   FD          */
2649OP(fd,c7) { illegal_1(); op_c7();                        } /* DB   FD          */
2689OP(fd,c0) { illegal_1(z80); op_c0(z80);                        } /* DB   FD          */
2690OP(fd,c1) { illegal_1(z80); op_c1(z80);                        } /* DB   FD          */
2691OP(fd,c2) { illegal_1(z80); op_c2(z80);                        } /* DB   FD          */
2692OP(fd,c3) { illegal_1(z80); op_c3(z80);                        } /* DB   FD          */
2693OP(fd,c4) { illegal_1(z80); op_c4(z80);                        } /* DB   FD          */
2694OP(fd,c5) { illegal_1(z80); op_c5(z80);                        } /* DB   FD          */
2695OP(fd,c6) { illegal_1(z80); op_c6(z80);                        } /* DB   FD          */
2696OP(fd,c7) { illegal_1(z80); op_c7(z80);                        } /* DB   FD          */
26502697
2651OP(fd,c8) { illegal_1(); op_c8();                        } /* DB   FD          */
2652OP(fd,c9) { illegal_1(); op_c9();                        } /* DB   FD          */
2653OP(fd,ca) { illegal_1(); op_ca();                        } /* DB   FD          */
2654OP(fd,cb) { EAY; EXEC(xycb,ARG());                     } /* **   FD CB xx    */
2655OP(fd,cc) { illegal_1(); op_cc();                        } /* DB   FD          */
2656OP(fd,cd) { illegal_1(); op_cd();                        } /* DB   FD          */
2657OP(fd,ce) { illegal_1(); op_ce();                        } /* DB   FD          */
2658OP(fd,cf) { illegal_1(); op_cf();                        } /* DB   FD          */
2698OP(fd,c8) { illegal_1(z80); op_c8(z80);                        } /* DB   FD          */
2699OP(fd,c9) { illegal_1(z80); op_c9(z80);                        } /* DB   FD          */
2700OP(fd,ca) { illegal_1(z80); op_ca(z80);                        } /* DB   FD          */
2701OP(fd,cb) { EAY; EXEC(z80,xycb,ARG(z80));                     } /* **   FD CB xx    */
2702OP(fd,cc) { illegal_1(z80); op_cc(z80);                        } /* DB   FD          */
2703OP(fd,cd) { illegal_1(z80); op_cd(z80);                        } /* DB   FD          */
2704OP(fd,ce) { illegal_1(z80); op_ce(z80);                        } /* DB   FD          */
2705OP(fd,cf) { illegal_1(z80); op_cf(z80);                        } /* DB   FD          */
26592706
2660OP(fd,d0) { illegal_1(); op_d0();                        } /* DB   FD          */
2661OP(fd,d1) { illegal_1(); op_d1();                        } /* DB   FD          */
2662OP(fd,d2) { illegal_1(); op_d2();                        } /* DB   FD          */
2663OP(fd,d3) { illegal_1(); op_d3();                        } /* DB   FD          */
2664OP(fd,d4) { illegal_1(); op_d4();                        } /* DB   FD          */
2665OP(fd,d5) { illegal_1(); op_d5();                        } /* DB   FD          */
2666OP(fd,d6) { illegal_1(); op_d6();                        } /* DB   FD          */
2667OP(fd,d7) { illegal_1(); op_d7();                        } /* DB   FD          */
2707OP(fd,d0) { illegal_1(z80); op_d0(z80);                        } /* DB   FD          */
2708OP(fd,d1) { illegal_1(z80); op_d1(z80);                        } /* DB   FD          */
2709OP(fd,d2) { illegal_1(z80); op_d2(z80);                        } /* DB   FD          */
2710OP(fd,d3) { illegal_1(z80); op_d3(z80);                        } /* DB   FD          */
2711OP(fd,d4) { illegal_1(z80); op_d4(z80);                        } /* DB   FD          */
2712OP(fd,d5) { illegal_1(z80); op_d5(z80);                        } /* DB   FD          */
2713OP(fd,d6) { illegal_1(z80); op_d6(z80);                        } /* DB   FD          */
2714OP(fd,d7) { illegal_1(z80); op_d7(z80);                        } /* DB   FD          */
26682715
2669OP(fd,d8) { illegal_1(); op_d8();                        } /* DB   FD          */
2670OP(fd,d9) { illegal_1(); op_d9();                        } /* DB   FD          */
2671OP(fd,da) { illegal_1(); op_da();                        } /* DB   FD          */
2672OP(fd,db) { illegal_1(); op_db();                        } /* DB   FD          */
2673OP(fd,dc) { illegal_1(); op_dc();                        } /* DB   FD          */
2674OP(fd,dd) { illegal_1(); op_dd();                        } /* DB   FD          */
2675OP(fd,de) { illegal_1(); op_de();                        } /* DB   FD          */
2676OP(fd,df) { illegal_1(); op_df();                        } /* DB   FD          */
2716OP(fd,d8) { illegal_1(z80); op_d8(z80);                        } /* DB   FD          */
2717OP(fd,d9) { illegal_1(z80); op_d9(z80);                        } /* DB   FD          */
2718OP(fd,da) { illegal_1(z80); op_da(z80);                        } /* DB   FD          */
2719OP(fd,db) { illegal_1(z80); op_db(z80);                        } /* DB   FD          */
2720OP(fd,dc) { illegal_1(z80); op_dc(z80);                        } /* DB   FD          */
2721OP(fd,dd) { illegal_1(z80); op_dd(z80);                        } /* DB   FD          */
2722OP(fd,de) { illegal_1(z80); op_de(z80);                        } /* DB   FD          */
2723OP(fd,df) { illegal_1(z80); op_df(z80);                        } /* DB   FD          */
26772724
2678OP(fd,e0) { illegal_1(); op_e0();                        } /* DB   FD          */
2679OP(fd,e1) { POP( iy );                              } /* POP  IY          */
2680OP(fd,e2) { illegal_1(); op_e2();                        } /* DB   FD          */
2681OP(fd,e3) { EXSP( iy );                           } /* EX   (SP),IY     */
2682OP(fd,e4) { illegal_1(); op_e4();                        } /* DB   FD          */
2683OP(fd,e5) { PUSH( iy );                           } /* PUSH IY          */
2684OP(fd,e6) { illegal_1(); op_e6();                        } /* DB   FD          */
2685OP(fd,e7) { illegal_1(); op_e7();                        } /* DB   FD          */
2725OP(fd,e0) { illegal_1(z80); op_e0(z80);                        } /* DB   FD          */
2726OP(fd,e1) { POP( iy );                                    } /* POP  IY          */
2727OP(fd,e2) { illegal_1(z80); op_e2(z80);                        } /* DB   FD          */
2728OP(fd,e3) { EXSP( iy );                                    } /* EX   (SP),IY     */
2729OP(fd,e4) { illegal_1(z80); op_e4(z80);                        } /* DB   FD          */
2730OP(fd,e5) { PUSH( iy );                                    } /* PUSH IY          */
2731OP(fd,e6) { illegal_1(z80); op_e6(z80);                        } /* DB   FD          */
2732OP(fd,e7) { illegal_1(z80); op_e7(z80);                        } /* DB   FD          */
26862733
2687OP(fd,e8) { illegal_1(); op_e8();                        } /* DB   FD          */
2688OP(fd,e9) { PC = IY; change_pc(PCD);                  } /* JP   (IY)        */
2689OP(fd,ea) { illegal_1(); op_ea();                        } /* DB   FD          */
2690OP(fd,eb) { illegal_1(); op_eb();                        } /* DB   FD          */
2691OP(fd,ec) { illegal_1(); op_ec();                        } /* DB   FD          */
2692OP(fd,ed) { illegal_1(); op_ed();                        } /* DB   FD          */
2693OP(fd,ee) { illegal_1(); op_ee();                        } /* DB   FD          */
2694OP(fd,ef) { illegal_1(); op_ef();                        } /* DB   FD          */
2734OP(fd,e8) { illegal_1(z80); op_e8(z80);                        } /* DB   FD          */
2735OP(fd,e9) { PC = IY; change_pc(PCD);                        } /* JP   (IY)        */
2736OP(fd,ea) { illegal_1(z80); op_ea(z80);                        } /* DB   FD          */
2737OP(fd,eb) { illegal_1(z80); op_eb(z80);                        } /* DB   FD          */
2738OP(fd,ec) { illegal_1(z80); op_ec(z80);                        } /* DB   FD          */
2739OP(fd,ed) { illegal_1(z80); op_ed(z80);                        } /* DB   FD          */
2740OP(fd,ee) { illegal_1(z80); op_ee(z80);                        } /* DB   FD          */
2741OP(fd,ef) { illegal_1(z80); op_ef(z80);                        } /* DB   FD          */
26952742
2696OP(fd,f0) { illegal_1(); op_f0();                        } /* DB   FD          */
2697OP(fd,f1) { illegal_1(); op_f1();                        } /* DB   FD          */
2698OP(fd,f2) { illegal_1(); op_f2();                        } /* DB   FD          */
2699OP(fd,f3) { illegal_1(); op_f3();                        } /* DB   FD          */
2700OP(fd,f4) { illegal_1(); op_f4();                        } /* DB   FD          */
2701OP(fd,f5) { illegal_1(); op_f5();                        } /* DB   FD          */
2702OP(fd,f6) { illegal_1(); op_f6();                        } /* DB   FD          */
2703OP(fd,f7) { illegal_1(); op_f7();                        } /* DB   FD          */
2743OP(fd,f0) { illegal_1(z80); op_f0(z80);                        } /* DB   FD          */
2744OP(fd,f1) { illegal_1(z80); op_f1(z80);                        } /* DB   FD          */
2745OP(fd,f2) { illegal_1(z80); op_f2(z80);                        } /* DB   FD          */
2746OP(fd,f3) { illegal_1(z80); op_f3(z80);                        } /* DB   FD          */
2747OP(fd,f4) { illegal_1(z80); op_f4(z80);                        } /* DB   FD          */
2748OP(fd,f5) { illegal_1(z80); op_f5(z80);                        } /* DB   FD          */
2749OP(fd,f6) { illegal_1(z80); op_f6(z80);                        } /* DB   FD          */
2750OP(fd,f7) { illegal_1(z80); op_f7(z80);                        } /* DB   FD          */
27042751
2705OP(fd,f8) { illegal_1(); op_f8();                        } /* DB   FD          */
2706OP(fd,f9) { SP = IY;                              } /* LD   SP,IY       */
2707OP(fd,fa) { illegal_1(); op_fa();                        } /* DB   FD          */
2708OP(fd,fb) { illegal_1(); op_fb();                        } /* DB   FD          */
2709OP(fd,fc) { illegal_1(); op_fc();                        } /* DB   FD          */
2710OP(fd,fd) { illegal_1(); op_fd();                        } /* DB   FD          */
2711OP(fd,fe) { illegal_1(); op_fe();                        } /* DB   FD          */
2712OP(fd,ff) { illegal_1(); op_ff();                        } /* DB   FD          */
2752OP(fd,f8) { illegal_1(z80); op_f8(z80);                        } /* DB   FD          */
2753OP(fd,f9) { SP = IY;                                    } /* LD   SP,IY       */
2754OP(fd,fa) { illegal_1(z80); op_fa(z80);                        } /* DB   FD          */
2755OP(fd,fb) { illegal_1(z80); op_fb(z80);                        } /* DB   FD          */
2756OP(fd,fc) { illegal_1(z80); op_fc(z80);                        } /* DB   FD          */
2757OP(fd,fd) { illegal_1(z80); op_fd(z80);                        } /* DB   FD          */
2758OP(fd,fe) { illegal_1(z80); op_fe(z80);                        } /* DB   FD          */
2759OP(fd,ff) { illegal_1(z80); op_ff(z80);                        } /* DB   FD          */
27132760
27142761OP(illegal,2)
27152762{
r3535r3536
27202767/**********************************************************
27212768 * special opcodes (ED prefix)
27222769 **********************************************************/
2723OP(ed,00) { illegal_2();                              } /* DB   ED          */
2724OP(ed,01) { illegal_2();                              } /* DB   ED          */
2725OP(ed,02) { illegal_2();                              } /* DB   ED          */
2726OP(ed,03) { illegal_2();                              } /* DB   ED          */
2727OP(ed,04) { illegal_2();                              } /* DB   ED          */
2728OP(ed,05) { illegal_2();                              } /* DB   ED          */
2729OP(ed,06) { illegal_2();                              } /* DB   ED          */
2730OP(ed,07) { illegal_2();                              } /* DB   ED          */
2770OP(ed,00) { illegal_2(z80);                                 } /* DB   ED          */
2771OP(ed,01) { illegal_2(z80);                                 } /* DB   ED          */
2772OP(ed,02) { illegal_2(z80);                                 } /* DB   ED          */
2773OP(ed,03) { illegal_2(z80);                                 } /* DB   ED          */
2774OP(ed,04) { illegal_2(z80);                                 } /* DB   ED          */
2775OP(ed,05) { illegal_2(z80);                                 } /* DB   ED          */
2776OP(ed,06) { illegal_2(z80);                                 } /* DB   ED          */
2777OP(ed,07) { illegal_2(z80);                                 } /* DB   ED          */
27312778
2732OP(ed,08) { illegal_2();                              } /* DB   ED          */
2733OP(ed,09) { illegal_2();                              } /* DB   ED          */
2734OP(ed,0a) { illegal_2();                              } /* DB   ED          */
2735OP(ed,0b) { illegal_2();                              } /* DB   ED          */
2736OP(ed,0c) { illegal_2();                              } /* DB   ED          */
2737OP(ed,0d) { illegal_2();                              } /* DB   ED          */
2738OP(ed,0e) { illegal_2();                              } /* DB   ED          */
2739OP(ed,0f) { illegal_2();                              } /* DB   ED          */
2779OP(ed,08) { illegal_2(z80);                                 } /* DB   ED          */
2780OP(ed,09) { illegal_2(z80);                                 } /* DB   ED          */
2781OP(ed,0a) { illegal_2(z80);                                 } /* DB   ED          */
2782OP(ed,0b) { illegal_2(z80);                                 } /* DB   ED          */
2783OP(ed,0c) { illegal_2(z80);                                 } /* DB   ED          */
2784OP(ed,0d) { illegal_2(z80);                                 } /* DB   ED          */
2785OP(ed,0e) { illegal_2(z80);                                 } /* DB   ED          */
2786OP(ed,0f) { illegal_2(z80);                                 } /* DB   ED          */
27402787
2741OP(ed,10) { illegal_2();                              } /* DB   ED          */
2742OP(ed,11) { illegal_2();                              } /* DB   ED          */
2743OP(ed,12) { illegal_2();                              } /* DB   ED          */
2744OP(ed,13) { illegal_2();                              } /* DB   ED          */
2745OP(ed,14) { illegal_2();                              } /* DB   ED          */
2746OP(ed,15) { illegal_2();                              } /* DB   ED          */
2747OP(ed,16) { illegal_2();                              } /* DB   ED          */
2748OP(ed,17) { illegal_2();                              } /* DB   ED          */
2788OP(ed,10) { illegal_2(z80);                                 } /* DB   ED          */
2789OP(ed,11) { illegal_2(z80);                                 } /* DB   ED          */
2790OP(ed,12) { illegal_2(z80);                                 } /* DB   ED          */
2791OP(ed,13) { illegal_2(z80);                                 } /* DB   ED          */
2792OP(ed,14) { illegal_2(z80);                                 } /* DB   ED          */
2793OP(ed,15) { illegal_2(z80);                                 } /* DB   ED          */
2794OP(ed,16) { illegal_2(z80);                                 } /* DB   ED          */
2795OP(ed,17) { illegal_2(z80);                                 } /* DB   ED          */
27492796
2750OP(ed,18) { illegal_2();                              } /* DB   ED          */
2751OP(ed,19) { illegal_2();                              } /* DB   ED          */
2752OP(ed,1a) { illegal_2();                              } /* DB   ED          */
2753OP(ed,1b) { illegal_2();                              } /* DB   ED          */
2754OP(ed,1c) { illegal_2();                              } /* DB   ED          */
2755OP(ed,1d) { illegal_2();                              } /* DB   ED          */
2756OP(ed,1e) { illegal_2();                              } /* DB   ED          */
2757OP(ed,1f) { illegal_2();                              } /* DB   ED          */
2797OP(ed,18) { illegal_2(z80);                                 } /* DB   ED          */
2798OP(ed,19) { illegal_2(z80);                                 } /* DB   ED          */
2799OP(ed,1a) { illegal_2(z80);                                 } /* DB   ED          */
2800OP(ed,1b) { illegal_2(z80);                                 } /* DB   ED          */
2801OP(ed,1c) { illegal_2(z80);                                 } /* DB   ED          */
2802OP(ed,1d) { illegal_2(z80);                                 } /* DB   ED          */
2803OP(ed,1e) { illegal_2(z80);                                 } /* DB   ED          */
2804OP(ed,1f) { illegal_2(z80);                                 } /* DB   ED          */
27582805
2759OP(ed,20) { illegal_2();                              } /* DB   ED          */
2760OP(ed,21) { illegal_2();                              } /* DB   ED          */
2761OP(ed,22) { illegal_2();                              } /* DB   ED          */
2762OP(ed,23) { illegal_2();                              } /* DB   ED          */
2763OP(ed,24) { illegal_2();                              } /* DB   ED          */
2764OP(ed,25) { illegal_2();                              } /* DB   ED          */
2765OP(ed,26) { illegal_2();                              } /* DB   ED          */
2766OP(ed,27) { illegal_2();                              } /* DB   ED          */
2806OP(ed,20) { illegal_2(z80);                                 } /* DB   ED          */
2807OP(ed,21) { illegal_2(z80);                                 } /* DB   ED          */
2808OP(ed,22) { illegal_2(z80);                                 } /* DB   ED          */
2809OP(ed,23) { illegal_2(z80);                                 } /* DB   ED          */
2810OP(ed,24) { illegal_2(z80);                                 } /* DB   ED          */
2811OP(ed,25) { illegal_2(z80);                                 } /* DB   ED          */
2812OP(ed,26) { illegal_2(z80);                                 } /* DB   ED          */
2813OP(ed,27) { illegal_2(z80);                                 } /* DB   ED          */
27672814
2768OP(ed,28) { illegal_2();                              } /* DB   ED          */
2769OP(ed,29) { illegal_2();                              } /* DB   ED          */
2770OP(ed,2a) { illegal_2();                              } /* DB   ED          */
2771OP(ed,2b) { illegal_2();                              } /* DB   ED          */
2772OP(ed,2c) { illegal_2();                              } /* DB   ED          */
2773OP(ed,2d) { illegal_2();                              } /* DB   ED          */
2774OP(ed,2e) { illegal_2();                              } /* DB   ED          */
2775OP(ed,2f) { illegal_2();                              } /* DB   ED          */
2815OP(ed,28) { illegal_2(z80);                                 } /* DB   ED          */
2816OP(ed,29) { illegal_2(z80);                                 } /* DB   ED          */
2817OP(ed,2a) { illegal_2(z80);                                 } /* DB   ED          */
2818OP(ed,2b) { illegal_2(z80);                                 } /* DB   ED          */
2819OP(ed,2c) { illegal_2(z80);                                 } /* DB   ED          */
2820OP(ed,2d) { illegal_2(z80);                                 } /* DB   ED          */
2821OP(ed,2e) { illegal_2(z80);                                 } /* DB   ED          */
2822OP(ed,2f) { illegal_2(z80);                                 } /* DB   ED          */
27762823
2777OP(ed,30) { illegal_2();                              } /* DB   ED          */
2778OP(ed,31) { illegal_2();                              } /* DB   ED          */
2779OP(ed,32) { illegal_2();                              } /* DB   ED          */
2780OP(ed,33) { illegal_2();                              } /* DB   ED          */
2781OP(ed,34) { illegal_2();                              } /* DB   ED          */
2782OP(ed,35) { illegal_2();                              } /* DB   ED          */
2783OP(ed,36) { illegal_2();                              } /* DB   ED          */
2784OP(ed,37) { illegal_2();                              } /* DB   ED          */
2824OP(ed,30) { illegal_2(z80);                                 } /* DB   ED          */
2825OP(ed,31) { illegal_2(z80);                                 } /* DB   ED          */
2826OP(ed,32) { illegal_2(z80);                                 } /* DB   ED          */
2827OP(ed,33) { illegal_2(z80);                                 } /* DB   ED          */
2828OP(ed,34) { illegal_2(z80);                                 } /* DB   ED          */
2829OP(ed,35) { illegal_2(z80);                                 } /* DB   ED          */
2830OP(ed,36) { illegal_2(z80);                                 } /* DB   ED          */
2831OP(ed,37) { illegal_2(z80);                                 } /* DB   ED          */
27852832
2786OP(ed,38) { illegal_2();                              } /* DB   ED          */
2787OP(ed,39) { illegal_2();                              } /* DB   ED          */
2788OP(ed,3a) { illegal_2();                              } /* DB   ED          */
2789OP(ed,3b) { illegal_2();                              } /* DB   ED          */
2790OP(ed,3c) { illegal_2();                              } /* DB   ED          */
2791OP(ed,3d) { illegal_2();                              } /* DB   ED          */
2792OP(ed,3e) { illegal_2();                              } /* DB   ED          */
2793OP(ed,3f) { illegal_2();                              } /* DB   ED          */
2833OP(ed,38) { illegal_2(z80);                                 } /* DB   ED          */
2834OP(ed,39) { illegal_2(z80);                                 } /* DB   ED          */
2835OP(ed,3a) { illegal_2(z80);                                 } /* DB   ED          */
2836OP(ed,3b) { illegal_2(z80);                                 } /* DB   ED          */
2837OP(ed,3c) { illegal_2(z80);                                 } /* DB   ED          */
2838OP(ed,3d) { illegal_2(z80);                                 } /* DB   ED          */
2839OP(ed,3e) { illegal_2(z80);                                 } /* DB   ED          */
2840OP(ed,3f) { illegal_2(z80);                                 } /* DB   ED          */
27942841
2795OP(ed,40) { B = IN(BC); F = (F & CF) | SZP[B];               } /* IN   B,(C)       */
2796OP(ed,41) { OUT(BC, B);                                 } /* OUT  (C),B       */
2797OP(ed,42) { SBC16( bc );                              } /* SBC  HL,BC       */
2798OP(ed,43) { EA = ARG16(); WM16( EA, &Z80.bc );               } /* LD   (w),BC      */
2799OP(ed,44) { NEG;                                    } /* NEG              */
2800OP(ed,45) { RETN;                                    } /* RETN;            */
2801OP(ed,46) { IM = 0;                                    } /* IM   0           */
2802OP(ed,47) { LD_I_A;                                    } /* LD   I,A         */
2842OP(ed,40) { B = IN(BC); F = (F & CF) | SZP[B];                  } /* IN   B,(C)       */
2843OP(ed,41) { OUT(BC, B);                                    } /* OUT  (C),B       */
2844OP(ed,42) { SBC16( bc );                                 } /* SBC  HL,BC       */
2845OP(ed,43) { EA = ARG16(z80); WM16( EA, &z80->bc ); MEMPTR = EA+1;   } /* LD   (w),BC      */
2846OP(ed,44) { NEG;                                       } /* NEG              */
2847OP(ed,45) { RETN;                                       } /* RETN;            */
2848OP(ed,46) { IM = 0;                                       } /* IM   0           */
2849OP(ed,47) { LD_I_A;                                       } /* LD   I,A         */
28032850
2804OP(ed,48) { C = IN(BC); F = (F & CF) | SZP[C];               } /* IN   C,(C)       */
2805OP(ed,49) { OUT(BC, C);                                 } /* OUT  (C),C       */
2806OP(ed,4a) { ADC16( bc );                              } /* ADC  HL,BC       */
2807OP(ed,4b) { EA = ARG16(); RM16( EA, &Z80.bc );               } /* LD   BC,(w)      */
2808OP(ed,4c) { NEG;                                    } /* NEG              */
2809OP(ed,4d) { RETI;                                    } /* RETI             */
2810OP(ed,4e) { IM = 0;                                    } /* IM   0           */
2811OP(ed,4f) { LD_R_A;                                    } /* LD   R,A         */
2851OP(ed,48) { C = IN(BC); F = (F & CF) | SZP[C];                  } /* IN   C,(C)       */
2852OP(ed,49) { OUT(BC, C);                                    } /* OUT  (C),C       */
2853OP(ed,4a) { ADC16( bc );                                 } /* ADC  HL,BC       */
2854OP(ed,4b) { EA = ARG16(z80); RM16( EA, &z80->bc ); MEMPTR = EA+1;   } /* LD   BC,(w)      */
2855OP(ed,4c) { NEG;                                       } /* NEG              */
2856OP(ed,4d) { RETI;                                       } /* RETI             */
2857OP(ed,4e) { IM = 0;                                       } /* IM   0           */
2858OP(ed,4f) { LD_R_A;                                       } /* LD   R,A         */
28122859
2813OP(ed,50) { D = IN(BC); F = (F & CF) | SZP[D];               } /* IN   D,(C)       */
2814OP(ed,51) { OUT(BC, D);                                 } /* OUT  (C),D       */
2815OP(ed,52) { SBC16( de );                              } /* SBC  HL,DE       */
2816OP(ed,53) { EA = ARG16(); WM16( EA, &Z80.de );               } /* LD   (w),DE      */
2817OP(ed,54) { NEG;                                    } /* NEG              */
2818OP(ed,55) { RETN;                                    } /* RETN;            */
2819OP(ed,56) { IM = 1;                                    } /* IM   1           */
2820OP(ed,57) { LD_A_I;                                    } /* LD   A,I         */
2860OP(ed,50) { D = IN(BC); F = (F & CF) | SZP[D];                  } /* IN   D,(C)       */
2861OP(ed,51) { OUT(BC, D);                                    } /* OUT  (C),D       */
2862OP(ed,52) { SBC16( de );                                 } /* SBC  HL,DE       */
2863OP(ed,53) { EA = ARG16(z80); WM16( EA, &z80->de ); MEMPTR = EA+1;   } /* LD   (w),DE      */
2864OP(ed,54) { NEG;                                       } /* NEG              */
2865OP(ed,55) { RETN;                                       } /* RETN;            */
2866OP(ed,56) { IM = 1;                                       } /* IM   1           */
2867OP(ed,57) { LD_A_I;                                       } /* LD   A,I         */
28212868
2822OP(ed,58) { E = IN(BC); F = (F & CF) | SZP[E];               } /* IN   E,(C)       */
2823OP(ed,59) { OUT(BC, E);                                 } /* OUT  (C),E       */
2824OP(ed,5a) { ADC16( de );                              } /* ADC  HL,DE       */
2825OP(ed,5b) { EA = ARG16(); RM16( EA, &Z80.de );               } /* LD   DE,(w)      */
2826OP(ed,5c) { NEG;                                    } /* NEG              */
2827OP(ed,5d) { RETI;                                    } /* RETI             */
2828OP(ed,5e) { IM = 2;                                    } /* IM   2           */
2829OP(ed,5f) { LD_A_R;                                    } /* LD   A,R         */
2869OP(ed,58) { E = IN(BC); F = (F & CF) | SZP[E];                  } /* IN   E,(C)       */
2870OP(ed,59) { OUT(BC, E);                                    } /* OUT  (C),E       */
2871OP(ed,5a) { ADC16( de );                                 } /* ADC  HL,DE       */
2872OP(ed,5b) { EA = ARG16(z80); RM16( EA, &z80->de ); MEMPTR = EA+1;   } /* LD   DE,(w)      */
2873OP(ed,5c) { NEG;                                       } /* NEG              */
2874OP(ed,5d) { RETI;                                       } /* RETI             */
2875OP(ed,5e) { IM = 2;                                       } /* IM   2           */
2876OP(ed,5f) { LD_A_R;                                       } /* LD   A,R         */
28302877
2831OP(ed,60) { H = IN(BC); F = (F & CF) | SZP[H];               } /* IN   H,(C)       */
2832OP(ed,61) { OUT(BC, H);                                 } /* OUT  (C),H       */
2833OP(ed,62) { SBC16( hl );                              } /* SBC  HL,HL       */
2834OP(ed,63) { EA = ARG16(); WM16( EA, &Z80.hl );               } /* LD   (w),HL      */
2835OP(ed,64) { NEG;                                    } /* NEG              */
2836OP(ed,65) { RETN;                                    } /* RETN;            */
2837OP(ed,66) { IM = 0;                                    } /* IM   0           */
2838OP(ed,67) { RRD;                                    } /* RRD  (HL)        */
2878OP(ed,60) { H = IN(BC); F = (F & CF) | SZP[H];                  } /* IN   H,(C)       */
2879OP(ed,61) { OUT(BC, H);                                    } /* OUT  (C),H       */
2880OP(ed,62) { SBC16( hl );                                 } /* SBC  HL,HL       */
2881OP(ed,63) { EA = ARG16(z80); WM16( EA, &z80->hl ); MEMPTR = EA+1;   } /* LD   (w),HL      */
2882OP(ed,64) { NEG;                                       } /* NEG              */
2883OP(ed,65) { RETN;                                       } /* RETN;            */
2884OP(ed,66) { IM = 0;                                       } /* IM   0           */
2885OP(ed,67) { RRD;                                       } /* RRD  (HL)        */
28392886
2840OP(ed,68) { L = IN(BC); F = (F & CF) | SZP[L];               } /* IN   L,(C)       */
2841OP(ed,69) { OUT(BC, L);                                 } /* OUT  (C),L       */
2842OP(ed,6a) { ADC16( hl );                              } /* ADC  HL,HL       */
2843OP(ed,6b) { EA = ARG16(); RM16( EA, &Z80.hl );               } /* LD   HL,(w)      */
2844OP(ed,6c) { NEG;                                    } /* NEG              */
2845OP(ed,6d) { RETI;                                    } /* RETI             */
2846OP(ed,6e) { IM = 0;                                    } /* IM   0           */
2847OP(ed,6f) { RLD;                                    } /* RLD  (HL)        */
2887OP(ed,68) { L = IN(BC); F = (F & CF) | SZP[L];                  } /* IN   L,(C)       */
2888OP(ed,69) { OUT(BC, L);                                    } /* OUT  (C),L       */
2889OP(ed,6a) { ADC16( hl );                                 } /* ADC  HL,HL       */
2890OP(ed,6b) { EA = ARG16(z80); RM16( EA, &z80->hl ); MEMPTR = EA+1;   } /* LD   HL,(w)      */
2891OP(ed,6c) { NEG;                                       } /* NEG              */
2892OP(ed,6d) { RETI;                                       } /* RETI             */
2893OP(ed,6e) { IM = 0;                                       } /* IM   0           */
2894OP(ed,6f) { RLD;                                       } /* RLD  (HL)        */
28482895
2849OP(ed,70) { UINT8 res = IN(BC); F = (F & CF) | SZP[res];      } /* IN   0,(C)       */
2850OP(ed,71) { OUT(BC, 0);                                 } /* OUT  (C),0       */
2851OP(ed,72) { SBC16( sp );                              } /* SBC  HL,SP       */
2852OP(ed,73) { EA = ARG16(); WM16( EA, &Z80.sp );               } /* LD   (w),SP      */
2853OP(ed,74) { NEG;                                    } /* NEG              */
2854OP(ed,75) { RETN;                                    } /* RETN;            */
2855OP(ed,76) { IM = 1;                                    } /* IM   1           */
2856OP(ed,77) { illegal_2();                              } /* DB   ED,77       */
2896OP(ed,70) { UINT8 res = IN(BC); F = (F & CF) | SZP[res];         } /* IN   0,(C)       */
2897OP(ed,71) { OUT(BC, 0);                                    } /* OUT  (C),0       */
2898OP(ed,72) { SBC16( sp );                                 } /* SBC  HL,SP       */
2899OP(ed,73) { EA = ARG16(z80); WM16( EA, &z80->sp ); MEMPTR = EA+1;    } /* LD   (w),SP      */
2900OP(ed,74) { NEG;                                       } /* NEG              */
2901OP(ed,75) { RETN;                                       } /* RETN;            */
2902OP(ed,76) { IM = 1;                                       } /* IM   1           */
2903OP(ed,77) { illegal_2(z80);                                 } /* DB   ED,77       */
28572904
2858OP(ed,78) { A = IN(BC); F = (F & CF) | SZP[A];               } /* IN   E,(C)       */
2859OP(ed,79) { OUT(BC, A);                                 } /* OUT  (C),A       */
2860OP(ed,7a) { ADC16( sp );                              } /* ADC  HL,SP       */
2861OP(ed,7b) { EA = ARG16(); RM16( EA, &Z80.sp );               } /* LD   SP,(w)      */
2862OP(ed,7c) { NEG;                                    } /* NEG              */
2863OP(ed,7d) { RETI;                                    } /* RETI             */
2864OP(ed,7e) { IM = 2;                                    } /* IM   2           */
2865OP(ed,7f) { illegal_2();                              } /* DB   ED,7F       */
2905OP(ed,78) { A = IN(BC); F = (F & CF) | SZP[A];   MEMPTR = BC + 1;   } /* IN   A,(C)       */
2906OP(ed,79) { OUT(BC, A);   MEMPTR = BC + 1;                     } /* OUT  (C),A       */
2907OP(ed,7a) { ADC16( sp );                                 } /* ADC  HL,SP       */
2908OP(ed,7b) { EA = ARG16(z80); RM16( EA, &z80->sp ); MEMPTR = EA+1;    } /* LD   SP,(w)      */
2909OP(ed,7c) { NEG;                                       } /* NEG              */
2910OP(ed,7d) { RETI;                                       } /* RETI             */
2911OP(ed,7e) { IM = 2;                                       } /* IM   2           */
2912OP(ed,7f) { illegal_2(z80);                                 } /* DB   ED,7F       */
28662913
2867OP(ed,80) { illegal_2();                              } /* DB   ED          */
2868OP(ed,81) { illegal_2();                              } /* DB   ED          */
2869OP(ed,82) { illegal_2();                              } /* DB   ED          */
2870OP(ed,83) { illegal_2();                              } /* DB   ED          */
2871OP(ed,84) { illegal_2();                              } /* DB   ED          */
2872OP(ed,85) { illegal_2();                              } /* DB   ED          */
2873OP(ed,86) { illegal_2();                              } /* DB   ED          */
2874OP(ed,87) { illegal_2();                              } /* DB   ED          */
2914OP(ed,80) { illegal_2(z80);                                 } /* DB   ED          */
2915OP(ed,81) { illegal_2(z80);                                 } /* DB   ED          */
2916OP(ed,82) { illegal_2(z80);                                 } /* DB   ED          */
2917OP(ed,83) { illegal_2(z80);                                 } /* DB   ED          */
2918OP(ed,84) { illegal_2(z80);                                 } /* DB   ED          */
2919OP(ed,85) { illegal_2(z80);                                 } /* DB   ED          */
2920OP(ed,86) { illegal_2(z80);                                 } /* DB   ED          */
2921OP(ed,87) { illegal_2(z80);                                 } /* DB   ED          */
28752922
2876OP(ed,88) { illegal_2();                              } /* DB   ED          */
2877OP(ed,89) { illegal_2();                              } /* DB   ED          */
2878OP(ed,8a) { illegal_2();                              } /* DB   ED          */
2879OP(ed,8b) { illegal_2();                              } /* DB   ED          */
2880OP(ed,8c) { illegal_2();                              } /* DB   ED          */
2881OP(ed,8d) { illegal_2();                              } /* DB   ED          */
2882OP(ed,8e) { illegal_2();                              } /* DB   ED          */
2883OP(ed,8f) { illegal_2();                              } /* DB   ED          */
2923OP(ed,88) { illegal_2(z80);                                 } /* DB   ED          */
2924OP(ed,89) { illegal_2(z80);                                 } /* DB   ED          */
2925OP(ed,8a) { illegal_2(z80);                                 } /* DB   ED          */
2926OP(ed,8b) { illegal_2(z80);                                 } /* DB   ED          */
2927OP(ed,8c) { illegal_2(z80);                                 } /* DB   ED          */
2928OP(ed,8d) { illegal_2(z80);                                 } /* DB   ED          */
2929OP(ed,8e) { illegal_2(z80);                                 } /* DB   ED          */
2930OP(ed,8f) { illegal_2(z80);                                 } /* DB   ED          */
28842931
2885OP(ed,90) { illegal_2();                              } /* DB   ED          */
2886OP(ed,91) { illegal_2();                              } /* DB   ED          */
2887OP(ed,92) { illegal_2();                              } /* DB   ED          */
2888OP(ed,93) { illegal_2();                              } /* DB   ED          */
2889OP(ed,94) { illegal_2();                              } /* DB   ED          */
2890OP(ed,95) { illegal_2();                              } /* DB   ED          */
2891OP(ed,96) { illegal_2();                              } /* DB   ED          */
2892OP(ed,97) { illegal_2();                              } /* DB   ED          */
2932OP(ed,90) { illegal_2(z80);                                 } /* DB   ED          */
2933OP(ed,91) { illegal_2(z80);                                 } /* DB   ED          */
2934OP(ed,92) { illegal_2(z80);                                 } /* DB   ED          */
2935OP(ed,93) { illegal_2(z80);                                 } /* DB   ED          */
2936OP(ed,94) { illegal_2(z80);                                 } /* DB   ED          */
2937OP(ed,95) { illegal_2(z80);                                 } /* DB   ED          */
2938OP(ed,96) { illegal_2(z80);                                 } /* DB   ED          */
2939OP(ed,97) { illegal_2(z80);                                 } /* DB   ED          */
28932940
2894OP(ed,98) { illegal_2();                              } /* DB   ED          */
2895OP(ed,99) { illegal_2();                              } /* DB   ED          */
2896OP(ed,9a) { illegal_2();                              } /* DB   ED          */
2897OP(ed,9b) { illegal_2();                              } /* DB   ED          */
2898OP(ed,9c) { illegal_2();                              } /* DB   ED          */
2899OP(ed,9d) { illegal_2();                              } /* DB   ED          */
2900OP(ed,9e) { illegal_2();                              } /* DB   ED          */
2901OP(ed,9f) { illegal_2();                              } /* DB   ED          */
2941OP(ed,98) { illegal_2(z80);                                 } /* DB   ED          */
2942OP(ed,99) { illegal_2(z80);                                 } /* DB   ED          */
2943OP(ed,9a) { illegal_2(z80);                                 } /* DB   ED          */
2944OP(ed,9b) { illegal_2(z80);                                 } /* DB   ED          */
2945OP(ed,9c) { illegal_2(z80);                                 } /* DB   ED          */
2946OP(ed,9d) { illegal_2(z80);                                 } /* DB   ED          */
2947OP(ed,9e) { illegal_2(z80);                                 } /* DB   ED          */
2948OP(ed,9f) { illegal_2(z80);                                 } /* DB   ED          */
29022949
2903OP(ed,a0) { LDI;                                    } /* LDI              */
2904OP(ed,a1) { CPI;                                    } /* CPI              */
2905OP(ed,a2) { INI;                                    } /* INI              */
2906OP(ed,a3) { OUTI;                                    } /* OUTI             */
2907OP(ed,a4) { illegal_2();                              } /* DB   ED          */
2908OP(ed,a5) { illegal_2();                              } /* DB   ED          */
2909OP(ed,a6) { illegal_2();                              } /* DB   ED          */
2910OP(ed,a7) { illegal_2();                              } /* DB   ED          */
2950OP(ed,a0) { LDI;                                       } /* LDI              */
2951OP(ed,a1) { CPI;                                       } /* CPI              */
2952OP(ed,a2) { INI;                                       } /* INI              */
2953OP(ed,a3) { OUTI;                                       } /* OUTI             */
2954OP(ed,a4) { illegal_2(z80);                                 } /* DB   ED          */
2955OP(ed,a5) { illegal_2(z80);                                 } /* DB   ED          */
2956OP(ed,a6) { illegal_2(z80);                                 } /* DB   ED          */
2957OP(ed,a7) { illegal_2(z80);                                 } /* DB   ED          */
29112958
2912OP(ed,a8) { LDD;                                    } /* LDD              */
2913OP(ed,a9) { CPD;                                    } /* CPD              */
2914OP(ed,aa) { IND;                                    } /* IND              */
2915OP(ed,ab) { OUTD;                                    } /* OUTD             */
2916OP(ed,ac) { illegal_2();                              } /* DB   ED          */
2917OP(ed,ad) { illegal_2();                              } /* DB   ED          */
2918OP(ed,ae) { illegal_2();                              } /* DB   ED          */
2919OP(ed,af) { illegal_2();                              } /* DB   ED          */
2959OP(ed,a8) { LDD;                                       } /* LDD              */
2960OP(ed,a9) { CPD;                                       } /* CPD              */
2961OP(ed,aa) { IND;                                       } /* IND              */
2962OP(ed,ab) { OUTD;                                        } /* OUTD             */
2963OP(ed,ac) { illegal_2(z80);                                 } /* DB   ED          */
2964OP(ed,ad) { illegal_2(z80);                                 } /* DB   ED          */
2965OP(ed,ae) { illegal_2(z80);                                 } /* DB   ED          */
2966OP(ed,af) { illegal_2(z80);                                 } /* DB   ED          */
29202967
2921OP(ed,b0) { LDIR;                                    } /* LDIR             */
2922OP(ed,b1) { CPIR;                                    } /* CPIR             */
2923OP(ed,b2) { INIR;                                    } /* INIR             */
2924OP(ed,b3) { OTIR;                                    } /* OTIR             */
2925OP(ed,b4) { illegal_2();                              } /* DB   ED          */
2926OP(ed,b5) { illegal_2();                              } /* DB   ED          */
2927OP(ed,b6) { illegal_2();                              } /* DB   ED          */
2928OP(ed,b7) { illegal_2();                              } /* DB   ED          */
2968OP(ed,b0) { LDIR;                                       } /* LDIR             */
2969OP(ed,b1) { CPIR;                                       } /* CPIR             */
2970OP(ed,b2) { INIR;                                       } /* INIR             */
2971OP(ed,b3) { OTIR;                                       } /* OTIR             */
2972OP(ed,b4) { illegal_2(z80);                                 } /* DB   ED          */
2973OP(ed,b5) { illegal_2(z80);                                 } /* DB   ED          */
2974OP(ed,b6) { illegal_2(z80);                                 } /* DB   ED          */
2975OP(ed,b7) { illegal_2(z80);                                 } /* DB   ED          */
29292976
2930OP(ed,b8) { LDDR;                                    } /* LDDR             */
2931OP(ed,b9) { CPDR;                                    } /* CPDR             */
2932OP(ed,ba) { INDR;                                    } /* INDR             */
2933OP(ed,bb) { OTDR;                                    } /* OTDR             */
2934OP(ed,bc) { illegal_2();                              } /* DB   ED          */
2935OP(ed,bd) { illegal_2();                              } /* DB   ED          */
2936OP(ed,be) { illegal_2();                              } /* DB   ED          */
2937OP(ed,bf) { illegal_2();                              } /* DB   ED          */
2977OP(ed,b8) { LDDR;                                       } /* LDDR             */
2978OP(ed,b9) { CPDR;                                       } /* CPDR             */
2979OP(ed,ba) { INDR;                                       } /* INDR             */
2980OP(ed,bb) { OTDR;                                       } /* OTDR             */
2981OP(ed,bc) { illegal_2(z80);                                 } /* DB   ED          */
2982OP(ed,bd) { illegal_2(z80);                                 } /* DB   ED          */
2983OP(ed,be) { illegal_2(z80);                                 } /* DB   ED          */
2984OP(ed,bf) { illegal_2(z80);                                 } /* DB   ED          */
29382985
2939OP(ed,c0) { illegal_2();                              } /* DB   ED          */
2940OP(ed,c1) { illegal_2();                              } /* DB   ED          */
2941OP(ed,c2) { illegal_2();                              } /* DB   ED          */
2942OP(ed,c3) { illegal_2();                              } /* DB   ED          */
2943OP(ed,c4) { illegal_2();                              } /* DB   ED          */
2944OP(ed,c5) { illegal_2();                              } /* DB   ED          */
2945OP(ed,c6) { illegal_2();                              } /* DB   ED          */
2946OP(ed,c7) { illegal_2();                              } /* DB   ED          */
2986OP(ed,c0) { illegal_2(z80);                                 } /* DB   ED          */
2987OP(ed,c1) { illegal_2(z80);                                 } /* DB   ED          */
2988OP(ed,c2) { illegal_2(z80);                                 } /* DB   ED          */
2989OP(ed,c3) { illegal_2(z80);                                 } /* DB   ED          */
2990OP(ed,c4) { illegal_2(z80);                                 } /* DB   ED          */
2991OP(ed,c5) { illegal_2(z80);                                 } /* DB   ED          */
2992OP(ed,c6) { illegal_2(z80);                                 } /* DB   ED          */
2993OP(ed,c7) { illegal_2(z80);                                 } /* DB   ED          */
29472994
2948OP(ed,c8) { illegal_2();                              } /* DB   ED          */
2949OP(ed,c9) { illegal_2();                              } /* DB   ED          */
2950OP(ed,ca) { illegal_2();                              } /* DB   ED          */
2951OP(ed,cb) { illegal_2();                              } /* DB   ED          */
2952OP(ed,cc) { illegal_2();                              } /* DB   ED          */
2953OP(ed,cd) { illegal_2();                              } /* DB   ED          */
2954OP(ed,ce) { illegal_2();                              } /* DB   ED          */
2955OP(ed,cf) { illegal_2();                              } /* DB   ED          */
2995OP(ed,c8) { illegal_2(z80);                                 } /* DB   ED          */
2996OP(ed,c9) { illegal_2(z80);                                 } /* DB   ED          */
2997OP(ed,ca) { illegal_2(z80);                                 } /* DB   ED          */
2998OP(ed,cb) { illegal_2(z80);                                 } /* DB   ED          */
2999OP(ed,cc) { illegal_2(z80);                                 } /* DB   ED          */
3000OP(ed,cd) { illegal_2(z80);                                 } /* DB   ED          */
3001OP(ed,ce) { illegal_2(z80);                                 } /* DB   ED          */
3002OP(ed,cf) { illegal_2(z80);                                 } /* DB   ED          */
29563003
2957OP(ed,d0) { illegal_2();                              } /* DB   ED          */
2958OP(ed,d1) { illegal_2();                              } /* DB   ED          */
2959OP(ed,d2) { illegal_2();                              } /* DB   ED          */
2960OP(ed,d3) { illegal_2();                              } /* DB   ED          */
2961OP(ed,d4) { illegal_2();                              } /* DB   ED          */
2962OP(ed,d5) { illegal_2();                              } /* DB   ED          */
2963OP(ed,d6) { illegal_2();                              } /* DB   ED          */
2964OP(ed,d7) { illegal_2();                              } /* DB   ED          */
3004OP(ed,d0) { illegal_2(z80);                                 } /* DB   ED          */
3005OP(ed,d1) { illegal_2(z80);                                 } /* DB   ED          */
3006OP(ed,d2) { illegal_2(z80);                                 } /* DB   ED          */
3007OP(ed,d3) { illegal_2(z80);                                 } /* DB   ED          */
3008OP(ed,d4) { illegal_2(z80);                                 } /* DB   ED          */
3009OP(ed,d5) { illegal_2(z80);                                 } /* DB   ED          */
3010OP(ed,d6) { illegal_2(z80);                                 } /* DB   ED          */
3011OP(ed,d7) { illegal_2(z80);                                 } /* DB   ED          */
29653012
2966OP(ed,d8) { illegal_2();                              } /* DB   ED          */
2967OP(ed,d9) { illegal_2();                              } /* DB   ED          */
2968OP(ed,da) { illegal_2();                              } /* DB   ED          */
2969OP(ed,db) { illegal_2();                              } /* DB   ED          */
2970OP(ed,dc) { illegal_2();                              } /* DB   ED          */
2971OP(ed,dd) { illegal_2();                              } /* DB   ED          */
2972OP(ed,de) { illegal_2();                              } /* DB   ED          */
2973OP(ed,df) { illegal_2();                              } /* DB   ED          */
3013OP(ed,d8) { illegal_2(z80);                                 } /* DB   ED          */
3014OP(ed,d9) { illegal_2(z80);                                 } /* DB   ED          */
3015OP(ed,da) { illegal_2(z80);                                 } /* DB   ED          */
3016OP(ed,db) { illegal_2(z80);                                 } /* DB   ED          */
3017OP(ed,dc) { illegal_2(z80);                                 } /* DB   ED          */
3018OP(ed,dd) { illegal_2(z80);                                 } /* DB   ED          */
3019OP(ed,de) { illegal_2(z80);                                 } /* DB   ED          */
3020OP(ed,df) { illegal_2(z80);                                 } /* DB   ED          */
29743021
2975OP(ed,e0) { illegal_2();                              } /* DB   ED          */
2976OP(ed,e1) { illegal_2();                              } /* DB   ED          */
2977OP(ed,e2) { illegal_2();                              } /* DB   ED          */
2978OP(ed,e3) { illegal_2();                              } /* DB   ED          */
2979OP(ed,e4) { illegal_2();                              } /* DB   ED          */
2980OP(ed,e5) { illegal_2();                              } /* DB   ED          */
2981OP(ed,e6) { illegal_2();                              } /* DB   ED          */
2982OP(ed,e7) { illegal_2();                              } /* DB   ED          */
3022OP(ed,e0) { illegal_2(z80);                                 } /* DB   ED          */
3023OP(ed,e1) { illegal_2(z80);                                 } /* DB   ED          */
3024OP(ed,e2) { illegal_2(z80);                                 } /* DB   ED          */
3025OP(ed,e3) { illegal_2(z80);                                 } /* DB   ED          */
3026OP(ed,e4) { illegal_2(z80);                                 } /* DB   ED          */
3027OP(ed,e5) { illegal_2(z80);                                 } /* DB   ED          */
3028OP(ed,e6) { illegal_2(z80);                                 } /* DB   ED          */
3029OP(ed,e7) { illegal_2(z80);                                 } /* DB   ED          */
29833030
2984OP(ed,e8) { illegal_2();                              } /* DB   ED          */
2985OP(ed,e9) { illegal_2();                              } /* DB   ED          */
2986OP(ed,ea) { illegal_2();                              } /* DB   ED          */
2987OP(ed,eb) { illegal_2();                              } /* DB   ED          */
2988OP(ed,ec) { illegal_2();                              } /* DB   ED          */
2989OP(ed,ed) { illegal_2();                              } /* DB   ED          */
2990OP(ed,ee) { illegal_2();                              } /* DB   ED          */
2991OP(ed,ef) { illegal_2();                              } /* DB   ED          */
3031OP(ed,e8) { illegal_2(z80);                                 } /* DB   ED          */
3032OP(ed,e9) { illegal_2(z80);                                 } /* DB   ED          */
3033OP(ed,ea) { illegal_2(z80);                                 } /* DB   ED          */
3034OP(ed,eb) { illegal_2(z80);                                 } /* DB   ED          */
3035OP(ed,ec) { illegal_2(z80);                                 } /* DB   ED          */
3036OP(ed,ed) { illegal_2(z80);                                 } /* DB   ED          */
3037OP(ed,ee) { illegal_2(z80);                                 } /* DB   ED          */
3038OP(ed,ef) { illegal_2(z80);                                 } /* DB   ED          */
29923039
2993OP(ed,f0) { illegal_2();                              } /* DB   ED          */
2994OP(ed,f1) { illegal_2();                              } /* DB   ED          */
2995OP(ed,f2) { illegal_2();                              } /* DB   ED          */
2996OP(ed,f3) { illegal_2();                              } /* DB   ED          */
2997OP(ed,f4) { illegal_2();                              } /* DB   ED          */
2998OP(ed,f5) { illegal_2();                              } /* DB   ED          */
2999OP(ed,f6) { illegal_2();                              } /* DB   ED          */
3000OP(ed,f7) { illegal_2();                              } /* DB   ED          */
3040OP(ed,f0) { illegal_2(z80);                                 } /* DB   ED          */
3041OP(ed,f1) { illegal_2(z80);                                 } /* DB   ED          */
3042OP(ed,f2) { illegal_2(z80);                                 } /* DB   ED          */
3043OP(ed,f3) { illegal_2(z80);                                 } /* DB   ED          */
3044OP(ed,f4) { illegal_2(z80);                                 } /* DB   ED          */
3045OP(ed,f5) { illegal_2(z80);                                 } /* DB   ED          */
3046OP(ed,f6) { illegal_2(z80);                                 } /* DB   ED          */
3047OP(ed,f7) { illegal_2(z80);                                 } /* DB   ED          */
30013048
3002OP(ed,f8) { illegal_2();                              } /* DB   ED          */
3003OP(ed,f9) { illegal_2();                              } /* DB   ED          */
3004OP(ed,fa) { illegal_2();                              } /* DB   ED          */
3005OP(ed,fb) { illegal_2();                              } /* DB   ED          */
3006OP(ed,fc) { illegal_2();                              } /* DB   ED          */
3007OP(ed,fd) { illegal_2();                              } /* DB   ED          */
3008OP(ed,fe) { illegal_2();                              } /* DB   ED          */
3009OP(ed,ff) { illegal_2();                              } /* DB   ED          */
3049OP(ed,f8) { illegal_2(z80);                                 } /* DB   ED          */
3050OP(ed,f9) { illegal_2(z80);                                 } /* DB   ED          */
3051OP(ed,fa) { illegal_2(z80);                                 } /* DB   ED          */
3052OP(ed,fb) { illegal_2(z80);                                 } /* DB   ED          */
3053OP(ed,fc) { illegal_2(z80);                                 } /* DB   ED          */
3054OP(ed,fd) { illegal_2(z80);                                 } /* DB   ED          */
3055OP(ed,fe) { illegal_2(z80);                                 } /* DB   ED          */
3056OP(ed,ff) { illegal_2(z80);                                 } /* DB   ED          */
30103057
30113058
30123059/**********************************************************
30133060 * main opcodes
30143061 **********************************************************/
3015OP(op,00) {                                          } /* NOP              */
3016OP(op,01) { BC = ARG16();                              } /* LD   BC,w        */
3017OP(op,02) { WM( BC, A );                              } /* LD   (BC),A      */
3018OP(op,03) { BC++;                                    } /* INC  BC          */
3019OP(op,04) { B = INC(B);                                 } /* INC  B           */
3020OP(op,05) { B = DEC(B);                                 } /* DEC  B           */
3021OP(op,06) { B = ARG();                                 } /* LD   B,n         */
3022OP(op,07) { RLCA;                                    } /* RLCA             */
3062OP(op,00) {                                             } /* NOP              */
3063OP(op,01) { BC = ARG16(z80);                              } /* LD   BC,w        */
3064OP(op,02) { WM(BC,A); MEMPTR_L = (BC + 1) & 0xFF;  MEMPTR_H = A;   } /* LD   (BC),A      */
3065OP(op,03) { BC++;                                       } /* INC  BC          */
3066OP(op,04) { B = INC(z80, B);                              } /* INC  B           */
3067OP(op,05) { B = DEC(z80, B);                              } /* DEC  B           */
3068OP(op,06) { B = ARG(z80);                                 } /* LD   B,n         */
3069OP(op,07) { RLCA;                                       } /* RLCA             */
30233070
3024OP(op,08) { EX_AF;                                    } /* EX   AF,AF'      */
3025OP(op,09) { ADD16(hl, bc);                              } /* ADD  HL,BC       */
3026OP(op,0a) { A = RM( BC );                              } /* LD   A,(BC)      */
3027OP(op,0b) { BC--;                                     } /* DEC  BC          */
3028OP(op,0c) { C = INC(C);                                 } /* INC  C           */
3029OP(op,0d) { C = DEC(C);                                 } /* DEC  C           */
3030OP(op,0e) { C = ARG();                                 } /* LD   C,n         */
3031OP(op,0f) { RRCA;                                    } /* RRCA             */
3071OP(op,08) { EX_AF;                                       } /* EX   AF,AF'      */
3072OP(op,09) { ADD16(hl, bc);                                 } /* ADD  HL,BC       */
3073OP(op,0a) { A = RM( BC );   MEMPTR=BC+1;                      } /* LD   A,(BC)      */
3074OP(op,0b) { BC--;                                        } /* DEC  BC          */
3075OP(op,0c) { C = INC(z80, C);                              } /* INC  C           */
3076OP(op,0d) { C = DEC(z80, C);                              } /* DEC  C           */
3077OP(op,0e) { C = ARG(z80);                                 } /* LD   C,n         */
3078OP(op,0f) { RRCA;                                       } /* RRCA             */
30323079
3033OP(op,10) { B--; JR_COND( B, 0x10 );                     } /* DJNZ o           */
3034OP(op,11) { DE = ARG16();                              } /* LD   DE,w        */
3035OP(op,12) { WM( DE, A );                              } /* LD   (DE),A      */
3036OP(op,13) { DE++;                                    } /* INC  DE          */
3037OP(op,14) { D = INC(D);                                 } /* INC  D           */
3038OP(op,15) { D = DEC(D);                                 } /* DEC  D           */
3039OP(op,16) { D = ARG();                                 } /* LD   D,n         */
3040OP(op,17) { RLA;                                    } /* RLA              */
3080OP(op,10) { B--; JR_COND( B, 0x10 );                        } /* DJNZ o           */
3081OP(op,11) { DE = ARG16(z80);                              } /* LD   DE,w        */
3082OP(op,12) { WM(DE,A); MEMPTR_L = (DE + 1) & 0xFF;  MEMPTR_H = A;   } /* LD   (DE),A      */
3083OP(op,13) { DE++;                                       } /* INC  DE          */
3084OP(op,14) { D = INC(z80, D);                              } /* INC  D           */
3085OP(op,15) { D = DEC(z80, D);                              } /* DEC  D           */
3086OP(op,16) { D = ARG(z80);                                 } /* LD   D,n         */
3087OP(op,17) { RLA;                                       } /* RLA              */
30413088
3042OP(op,18) { JR();                                    } /* JR   o           */
3043OP(op,19) { ADD16(hl, de);                              } /* ADD  HL,DE       */
3044OP(op,1a) { A = RM( DE );                              } /* LD   A,(DE)      */
3045OP(op,1b) { DE--;                                     } /* DEC  DE          */
3046OP(op,1c) { E = INC(E);                                 } /* INC  E           */
3047OP(op,1d) { E = DEC(E);                                 } /* DEC  E           */
3048OP(op,1e) { E = ARG();                                 } /* LD   E,n         */
3049OP(op,1f) { RRA;                                    } /* RRA              */
3089OP(op,18) { JR();                                       } /* JR   o           */
3090OP(op,19) { ADD16(hl, de);                                 } /* ADD  HL,DE       */
3091OP(op,1a) { A = RM( DE ); MEMPTR=DE+1;                         } /* LD   A,(DE)      */
3092OP(op,1b) { DE--;                                        } /* DEC  DE          */
3093OP(op,1c) { E = INC(z80, E);                              } /* INC  E           */
3094OP(op,1d) { E = DEC(z80, E);                              } /* DEC  E           */
3095OP(op,1e) { E = ARG(z80);                                 } /* LD   E,n         */
3096OP(op,1f) { RRA;                                       } /* RRA              */
30503097
3051OP(op,20) { JR_COND( !(F & ZF), 0x20 );                     } /* JR   NZ,o        */
3052OP(op,21) { HL = ARG16();                              } /* LD   HL,w        */
3053OP(op,22) { EA = ARG16(); WM16( EA, &Z80.hl );               } /* LD   (w),HL      */
3054OP(op,23) { HL++;                                    } /* INC  HL          */
3055OP(op,24) { H = INC(H);                                 } /* INC  H           */
3056OP(op,25) { H = DEC(H);                                 } /* DEC  H           */
3057OP(op,26) { H = ARG();                                 } /* LD   H,n         */
3058OP(op,27) { DAA;                                    } /* DAA              */
3098OP(op,20) { JR_COND( !(F & ZF), 0x20 );                        } /* JR   NZ,o        */
3099OP(op,21) { HL = ARG16(z80);                              } /* LD   HL,w        */
3100OP(op,22) { EA = ARG16(z80); WM16( EA, &z80->hl );   MEMPTR = EA+1;   } /* LD   (w),HL      */
3101OP(op,23) { HL++;                                       } /* INC  HL          */
3102OP(op,24) { H = INC(z80, H);                              } /* INC  H           */
3103OP(op,25) { H = DEC(z80, H);                              } /* DEC  H           */
3104OP(op,26) { H = ARG(z80);                                 } /* LD   H,n         */
3105OP(op,27) { DAA;                                       } /* DAA              */
30593106
3060OP(op,28) { JR_COND( F & ZF, 0x28 );                     } /* JR   Z,o         */
3061OP(op,29) { ADD16(hl, hl);                              } /* ADD  HL,HL       */
3062OP(op,2a) { EA = ARG16(); RM16( EA, &Z80.hl );               } /* LD   HL,(w)      */
3063OP(op,2b) { HL--;                                     } /* DEC  HL          */
3064OP(op,2c) { L = INC(L);                                 } /* INC  L           */
3065OP(op,2d) { L = DEC(L);                                 } /* DEC  L           */
3066OP(op,2e) { L = ARG();                                 } /* LD   L,n         */
3067OP(op,2f) { A ^= 0xff; F = (F&(SF|ZF|PF|CF))|HF|NF|(A&(YF|XF));   } /* CPL              */
3107OP(op,28) { JR_COND( F & ZF, 0x28 );                        } /* JR   Z,o         */
3108OP(op,29) { ADD16(hl, hl);                                 } /* ADD  HL,HL       */
3109OP(op,2a) { EA = ARG16(z80); RM16( EA, &z80->hl );   MEMPTR = EA+1;   } /* LD   HL,(w)      */
3110OP(op,2b) { HL--;                                        } /* DEC  HL          */
3111OP(op,2c) { L = INC(z80, L);                              } /* INC  L           */
3112OP(op,2d) { L = DEC(z80, L);                              } /* DEC  L           */
3113OP(op,2e) { L = ARG(z80);                                 } /* LD   L,n         */
3114OP(op,2f) { A ^= 0xff; F = (F&(SF|ZF|PF|CF))|HF|NF|(A&(YF|XF));      } /* CPL              */
30683115
3069OP(op,30) { JR_COND( !(F & CF), 0x30 );                     } /* JR   NC,o        */
3070OP(op,31) { SP = ARG16();                              } /* LD   SP,w        */
3071OP(op,32) { EA = ARG16(); WM( EA, A );                     } /* LD   (w),A       */
3072OP(op,33) { SP++;                                    } /* INC  SP          */
3073OP(op,34) { WM( HL, INC(RM(HL)) );                        } /* INC  (HL)        */
3074OP(op,35) { WM( HL, DEC(RM(HL)) );                        } /* DEC  (HL)        */
3075OP(op,36) { WM( HL, ARG() );                           } /* LD   (HL),n      */
3076OP(op,37) { F = (F & (SF|ZF|PF)) | CF | (A & (YF|XF));         } /* SCF              */
3116OP(op,30) { JR_COND( !(F & CF), 0x30 );                        } /* JR   NC,o        */
3117OP(op,31) { SP = ARG16(z80);                              } /* LD   SP,w        */
3118OP(op,32) { EA=ARG16(z80);WM(EA,A);MEMPTR_L=(EA+1)&0xFF;MEMPTR_H=A;   } /* LD   (w),A       */
3119OP(op,33) { SP++;                                       } /* INC  SP          */
3120OP(op,34) { WM( HL, INC(z80, RM(HL)) );                        } /* INC  (HL)        */
3121OP(op,35) { WM( HL, DEC(z80, RM(HL)) );                        } /* DEC  (HL)        */
3122OP(op,36) { WM( HL, ARG(z80) );                              } /* LD   (HL),n      */
3123OP(op,37) { F = (F & (SF|ZF|PF)) | CF | (A & (YF|XF));            } /* SCF              */
30773124
3078OP(op,38) { JR_COND( F & CF, 0x38 );                     } /* JR   C,o         */
3079OP(op,39) { ADD16(hl, sp);                              } /* ADD  HL,SP       */
3080OP(op,3a) { EA = ARG16(); A = RM( EA );                     } /* LD   A,(w)       */
3081OP(op,3b) { SP--;                                    } /* DEC  SP          */
3082OP(op,3c) { A = INC(A);                                 } /* INC  A           */
3083OP(op,3d) { A = DEC(A);                                 } /* DEC  A           */
3084OP(op,3e) { A = ARG();                                 } /* LD   A,n         */
3085OP(op,3f) { F = ((F&(SF|ZF|PF|CF))|((F&CF)<<4)|(A&(YF|XF)))^CF;   } /* CCF              */
3125OP(op,38) { JR_COND( F & CF, 0x38 );                        } /* JR   C,o         */
3126OP(op,39) { ADD16(hl, sp);                                 } /* ADD  HL,SP       */
3127OP(op,3a) { EA = ARG16(z80); A = RM( EA );   MEMPTR=EA+1;          } /* LD   A,(w)       */
3128OP(op,3b) { SP--;                                       } /* DEC  SP          */
3129OP(op,3c) { A = INC(z80, A);                              } /* INC  A           */
3130OP(op,3d) { A = DEC(z80, A);                              } /* DEC  A           */
3131OP(op,3e) { A = ARG(z80);                                 } /* LD   A,n         */
3132OP(op,3f) { F = ((F&(SF|ZF|PF|CF))|((F&CF)<<4)|(A&(YF|XF)))^CF;      } /* CCF              */
30863133
3087OP(op,40) {                                          } /* LD   B,B         */
3088OP(op,41) { B = C;                                    } /* LD   B,C         */
3089OP(op,42) { B = D;                                    } /* LD   B,D         */
3090OP(op,43) { B = E;                                    } /* LD   B,E         */
3091OP(op,44) { B = H;                                    } /* LD   B,H         */
3092OP(op,45) { B = L;                                    } /* LD   B,L         */
3093OP(op,46) { B = RM(HL);                                 } /* LD   B,(HL)      */
3094OP(op,47) { B = A;                                    } /* LD   B,A         */
3134OP(op,40) {                                             } /* LD   B,B         */
3135OP(op,41) { B = C;                                       } /* LD   B,C         */
3136OP(op,42) { B = D;                                       } /* LD   B,D         */
3137OP(op,43) { B = E;                                       } /* LD   B,E         */
3138OP(op,44) { B = H;                                       } /* LD   B,H         */
3139OP(op,45) { B = L;                                       } /* LD   B,L         */
3140OP(op,46) { B = RM(HL);                                    } /* LD   B,(HL)      */
3141OP(op,47) { B = A;                                       } /* LD   B,A         */
30953142
3096OP(op,48) { C = B;                                    } /* LD   C,B         */
3097OP(op,49) {                                          } /* LD   C,C         */
3098OP(op,4a) { C = D;                                    } /* LD   C,D         */
3099OP(op,4b) { C = E;                                    } /* LD   C,E         */
3100OP(op,4c) { C = H;                                    } /* LD   C,H         */
3101OP(op,4d) { C = L;                                    } /* LD   C,L         */
3102OP(op,4e) { C = RM(HL);                                 } /* LD   C,(HL)      */
3103OP(op,4f) { C = A;                                    } /* LD   C,A         */
3143OP(op,48) { C = B;                                       } /* LD   C,B         */
3144OP(op,49) {                                             } /* LD   C,C         */
3145OP(op,4a) { C = D;                                       } /* LD   C,D         */
3146OP(op,4b) { C = E;                                       } /* LD   C,E         */
3147OP(op,4c) { C = H;                                       } /* LD   C,H         */
3148OP(op,4d) { C = L;                                       } /* LD   C,L         */
3149OP(op,4e) { C = RM(HL);                                    } /* LD   C,(HL)      */
3150OP(op,4f) { C = A;                                       } /* LD   C,A         */
31043151
3105OP(op,50) { D = B;                                    } /* LD   D,B         */
3106OP(op,51) { D = C;                                    } /* LD   D,C         */
3107OP(op,52) {                                          } /* LD   D,D         */
3108OP(op,53) { D = E;                                    } /* LD   D,E         */
3109OP(op,54) { D = H;                                    } /* LD   D,H         */
3110OP(op,55) { D = L;                                    } /* LD   D,L         */
3111OP(op,56) { D = RM(HL);                                 } /* LD   D,(HL)      */
3112OP(op,57) { D = A;                                    } /* LD   D,A         */
3152OP(op,50) { D = B;                                       } /* LD   D,B         */
3153OP(op,51) { D = C;                                       } /* LD   D,C         */
3154OP(op,52) {                                             } /* LD   D,D         */
3155OP(op,53) { D = E;                                       } /* LD   D,E         */
3156OP(op,54) { D = H;                                       } /* LD   D,H         */
3157OP(op,55) { D = L;                                       } /* LD   D,L         */
3158OP(op,56) { D = RM(HL);                                    } /* LD   D,(HL)      */
3159OP(op,57) { D = A;                                       } /* LD   D,A         */
31133160
3114OP(op,58) { E = B;                                    } /* LD   E,B         */
3115OP(op,59) { E = C;                                    } /* LD   E,C         */
3116OP(op,5a) { E = D;                                    } /* LD   E,D         */
3117OP(op,5b) {                                          } /* LD   E,E         */
3118OP(op,5c) { E = H;                                    } /* LD   E,H         */
3119OP(op,5d) { E = L;                                    } /* LD   E,L         */
3120OP(op,5e) { E = RM(HL);                                 } /* LD   E,(HL)      */
3121OP(op,5f) { E = A;                                    } /* LD   E,A         */
3161OP(op,58) { E = B;                                       } /* LD   E,B         */
3162OP(op,59) { E = C;                                       } /* LD   E,C         */
3163OP(op,5a) { E = D;                                       } /* LD   E,D         */
3164OP(op,5b) {                                             } /* LD   E,E         */
3165OP(op,5c) { E = H;                                       } /* LD   E,H         */
3166OP(op,5d) { E = L;                                       } /* LD   E,L         */
3167OP(op,5e) { E = RM(HL);                                    } /* LD   E,(HL)      */
3168OP(op,5f) { E = A;                                       } /* LD   E,A         */
31223169
3123OP(op,60) { H = B;                                    } /* LD   H,B         */
3124OP(op,61) { H = C;                                    } /* LD   H,C         */
3125OP(op,62) { H = D;                                    } /* LD   H,D         */
3126OP(op,63) { H = E;                                    } /* LD   H,E         */
3127OP(op,64) {                                          } /* LD   H,H         */
3128OP(op,65) { H = L;                                    } /* LD   H,L         */
3129OP(op,66) { H = RM(HL);                                 } /* LD   H,(HL)      */
3130OP(op,67) { H = A;                                    } /* LD   H,A         */
3170OP(op,60) { H = B;                                       } /* LD   H,B         */
3171OP(op,61) { H = C;                                       } /* LD   H,C         */
3172OP(op,62) { H = D;                                       } /* LD   H,D         */
3173OP(op,63) { H = E;                                       } /* LD   H,E         */
3174OP(op,64) {                                             } /* LD   H,H         */
3175OP(op,65) { H = L;                                       } /* LD   H,L         */
3176OP(op,66) { H = RM(HL);                                    } /* LD   H,(HL)      */
3177OP(op,67) { H = A;                                       } /* LD   H,A         */
31313178
3132OP(op,68) { L = B;                                    } /* LD   L,B         */
3133OP(op,69) { L = C;                                    } /* LD   L,C         */
3134OP(op,6a) { L = D;                                    } /* LD   L,D         */
3135OP(op,6b) { L = E;                                    } /* LD   L,E         */
3136OP(op,6c) { L = H;                                    } /* LD   L,H         */
3137OP(op,6d) {                                          } /* LD   L,L         */
3138OP(op,6e) { L = RM(HL);                                 } /* LD   L,(HL)      */
3139OP(op,6f) { L = A;                                    } /* LD   L,A         */
3179OP(op,68) { L = B;                                       } /* LD   L,B         */
3180OP(op,69) { L = C;                                       } /* LD   L,C         */
3181OP(op,6a) { L = D;                                       } /* LD   L,D         */
3182OP(op,6b) { L = E;                                       } /* LD   L,E         */
3183OP(op,6c) { L = H;                                       } /* LD   L,H         */
3184OP(op,6d) {                                             } /* LD   L,L         */
3185OP(op,6e) { L = RM(HL);                                    } /* LD   L,(HL)      */
3186OP(op,6f) { L = A;                                       } /* LD   L,A         */
31403187
3141OP(op,70) { WM( HL, B );                              } /* LD   (HL),B      */
3142OP(op,71) { WM( HL, C );                              } /* LD   (HL),C      */
3143OP(op,72) { WM( HL, D );                              } /* LD   (HL),D      */
3144OP(op,73) { WM( HL, E );                              } /* LD   (HL),E      */
3145OP(op,74) { WM( HL, H );                              } /* LD   (HL),H      */
3146OP(op,75) { WM( HL, L );                              } /* LD   (HL),L      */
3147OP(op,76) { ENTER_HALT;                                 } /* HALT             */
3148OP(op,77) { WM( HL, A );                              } /* LD   (HL),A      */
3188OP(op,70) { WM( HL, B );                                 } /* LD   (HL),B      */
3189OP(op,71) { WM( HL, C );                                 } /* LD   (HL),C      */
3190OP(op,72) { WM( HL, D );                                 } /* LD   (HL),D      */
3191OP(op,73) { WM( HL, E );                                 } /* LD   (HL),E      */
3192OP(op,74) { WM( HL, H );                                 } /* LD   (HL),H      */
3193OP(op,75) { WM( HL, L );                                 } /* LD   (HL),L      */
3194OP(op,76) { ENTER_HALT;                                    } /* HALT             */
3195OP(op,77) { WM( HL, A );                                 } /* LD   (HL),A      */
31493196
3150OP(op,78) { A = B;                                    } /* LD   A,B         */
3151OP(op,79) { A = C;                                    } /* LD   A,C         */
3152OP(op,7a) { A = D;                                    } /* LD   A,D         */
3153OP(op,7b) { A = E;                                    } /* LD   A,E         */
3154OP(op,7c) { A = H;                                    } /* LD   A,H         */
3155OP(op,7d) { A = L;                                    } /* LD   A,L         */
3156OP(op,7e) { A = RM(HL);                                 } /* LD   A,(HL)      */
3157OP(op,7f) {                                          } /* LD   A,A         */
3197OP(op,78) { A = B;                                       } /* LD   A,B         */
3198OP(op,79) { A = C;                                       } /* LD   A,C         */
3199OP(op,7a) { A = D;                                       } /* LD   A,D         */
3200OP(op,7b) { A = E;                                       } /* LD   A,E         */
3201OP(op,7c) { A = H;                                       } /* LD   A,H         */
3202OP(op,7d) { A = L;                                       } /* LD   A,L         */
3203OP(op,7e) { A = RM(HL);                                    } /* LD   A,(HL)      */
3204OP(op,7f) {                                             } /* LD   A,A         */
31583205
3159OP(op,80) { ADD(B);                                    } /* ADD  A,B         */
3160OP(op,81) { ADD(C);                                    } /* ADD  A,C         */
3161OP(op,82) { ADD(D);                                    } /* ADD  A,D         */
3162OP(op,83) { ADD(E);                                    } /* ADD  A,E         */
3163OP(op,84) { ADD(H);                                    } /* ADD  A,H         */
3164OP(op,85) { ADD(L);                                    } /* ADD  A,L         */
3165OP(op,86) { ADD(RM(HL));                              } /* ADD  A,(HL)      */
3166OP(op,87) { ADD(A);                                    } /* ADD  A,A         */
3206OP(op,80) { ADD(B);                                       } /* ADD  A,B         */
3207OP(op,81) { ADD(C);                                       } /* ADD  A,C         */
3208OP(op,82) { ADD(D);                                       } /* ADD  A,D         */
3209OP(op,83) { ADD(E);                                       } /* ADD  A,E         */
3210OP(op,84) { ADD(H);                                       } /* ADD  A,H         */
3211OP(op,85) { ADD(L);                                       } /* ADD  A,L         */
3212OP(op,86) { ADD(RM(HL));                                 } /* ADD  A,(HL)      */
3213OP(op,87) { ADD(A);                                       } /* ADD  A,A         */
31673214
3168OP(op,88) { ADC(B);                                    } /* ADC  A,B         */
3169OP(op,89) { ADC(C);                                    } /* ADC  A,C         */
3170OP(op,8a) { ADC(D);                                    } /* ADC  A,D         */
3171OP(op,8b) { ADC(E);                                    } /* ADC  A,E         */
3172OP(op,8c) { ADC(H);                                    } /* ADC  A,H         */
3173OP(op,8d) { ADC(L);                                    } /* ADC  A,L         */
3174OP(op,8e) { ADC(RM(HL));                              } /* ADC  A,(HL)      */
3175OP(op,8f) { ADC(A);                                    } /* ADC  A,A         */
3215OP(op,88) { ADC(B);                                       } /* ADC  A,B         */
3216OP(op,89) { ADC(C);                                       } /* ADC  A,C         */
3217OP(op,8a) { ADC(D);                                       } /* ADC  A,D         */
3218OP(op,8b) { ADC(E);                                       } /* ADC  A,E         */
3219OP(op,8c) { ADC(H);                                       } /* ADC  A,H         */
3220OP(op,8d) { ADC(L);                                       } /* ADC  A,L         */
3221OP(op,8e) { ADC(RM(HL));                                 } /* ADC  A,(HL)      */
3222OP(op,8f) { ADC(A);                                       } /* ADC  A,A         */
31763223
3177OP(op,90) { SUB(B);                                    } /* SUB  B           */
3178OP(op,91) { SUB(C);                                    } /* SUB  C           */
3179OP(op,92) { SUB(D);                                    } /* SUB  D           */
3180OP(op,93) { SUB(E);                                    } /* SUB  E           */
3181OP(op,94) { SUB(H);                                    } /* SUB  H           */
3182OP(op,95) { SUB(L);                                    } /* SUB  L           */
3183OP(op,96) { SUB(RM(HL));                              } /* SUB  (HL)        */
3184OP(op,97) { SUB(A);                                    } /* SUB  A           */
3224OP(op,90) { SUB(B);                                       } /* SUB  B           */
3225OP(op,91) { SUB(C);                                       } /* SUB  C           */
3226OP(op,92) { SUB(D);                                       } /* SUB  D           */
3227OP(op,93) { SUB(E);                                       } /* SUB  E           */
3228OP(op,94) { SUB(H);                                       } /* SUB  H           */
3229OP(op,95) { SUB(L);                                       } /* SUB  L           */
3230OP(op,96) { SUB(RM(HL));                                 } /* SUB  (HL)        */
3231OP(op,97) { SUB(A);                                       } /* SUB  A           */
31853232
3186OP(op,98) { SBC(B);                                    } /* SBC  A,B         */
3187OP(op,99) { SBC(C);                                    } /* SBC  A,C         */
3188OP(op,9a) { SBC(D);                                    } /* SBC  A,D         */
3189OP(op,9b) { SBC(E);                                    } /* SBC  A,E         */
3190OP(op,9c) { SBC(H);                                    } /* SBC  A,H         */
3191OP(op,9d) { SBC(L);                                    } /* SBC  A,L         */
3192OP(op,9e) { SBC(RM(HL));                              } /* SBC  A,(HL)      */
3193OP(op,9f) { SBC(A);                                    } /* SBC  A,A         */
3233OP(op,98) { SBC(B);                                       } /* SBC  A,B         */
3234OP(op,99) { SBC(C);                                       } /* SBC  A,C         */
3235OP(op,9a) { SBC(D);                                       } /* SBC  A,D         */
3236OP(op,9b) { SBC(E);                                       } /* SBC  A,E         */
3237OP(op,9c) { SBC(H);                                       } /* SBC  A,H         */
3238OP(op,9d) { SBC(L);                                       } /* SBC  A,L         */
3239OP(op,9e) { SBC(RM(HL));                                 } /* SBC  A,(HL)      */
3240OP(op,9f) { SBC(A);                                       } /* SBC  A,A         */
31943241
3195OP(op,a0) { AND(B);                                    } /* AND  B           */
3196OP(op,a1) { AND(C);                                    } /* AND  C           */
3197OP(op,a2) { AND(D);                                    } /* AND  D           */
3198OP(op,a3) { AND(E);                                    } /* AND  E           */
3199OP(op,a4) { AND(H);                                    } /* AND  H           */
3200OP(op,a5) { AND(L);                                    } /* AND  L           */
3201OP(op,a6) { AND(RM(HL));                              } /* AND  (HL)        */
3202OP(op,a7) { AND(A);                                    } /* AND  A           */
3242OP(op,a0) { AND(B);                                       } /* AND  B           */
3243OP(op,a1) { AND(C);                                       } /* AND  C           */
3244OP(op,a2) { AND(D);                                       } /* AND  D           */
3245OP(op,a3) { AND(E);                                       } /* AND  E           */
3246OP(op,a4) { AND(H);                                       } /* AND  H           */
3247OP(op,a5) { AND(L);                                       } /* AND  L           */
3248OP(op,a6) { AND(RM(HL));                                 } /* AND  (HL)        */
3249OP(op,a7) { AND(A);                                       } /* AND  A           */
32033250
3204OP(op,a8) { XOR(B);                                    } /* XOR  B           */
3205OP(op,a9) { XOR(C);                                    } /* XOR  C           */
3206OP(op,aa) { XOR(D);                                    } /* XOR  D           */
3207OP(op,ab) { XOR(E);                                    } /* XOR  E           */
3208OP(op,ac) { XOR(H);                                    } /* XOR  H           */
3209OP(op,ad) { XOR(L);                                    } /* XOR  L           */
3210OP(op,ae) { XOR(RM(HL));                              } /* XOR  (HL)        */
3211OP(op,af) { XOR(A);                                    } /* XOR  A           */
3251OP(op,a8) { XOR(B);                                       } /* XOR  B           */
3252OP(op,a9) { XOR(C);                                       } /* XOR  C           */
3253OP(op,aa) { XOR(D);                                       } /* XOR  D           */
3254OP(op,ab) { XOR(E);                                       } /* XOR  E           */
3255OP(op,ac) { XOR(H);                                       } /* XOR  H           */
3256OP(op,ad) { XOR(L);                                       } /* XOR  L           */
3257OP(op,ae) { XOR(RM(HL));                                 } /* XOR  (HL)        */
3258OP(op,af) { XOR(A);                                       } /* XOR  A           */
32123259
3213OP(op,b0) { OR(B);                                    } /* OR   B           */
3214OP(op,b1) { OR(C);                                    } /* OR   C           */
3215OP(op,b2) { OR(D);                                    } /* OR   D           */
3216OP(op,b3) { OR(E);                                    } /* OR   E           */
3217OP(op,b4) { OR(H);                                    } /* OR   H           */
3218OP(op,b5) { OR(L);                                    } /* OR   L           */
3219OP(op,b6) { OR(RM(HL));                                 } /* OR   (HL)        */
3220OP(op,b7) { OR(A);                                    } /* OR   A           */
3260OP(op,b0) { OR(B);                                       } /* OR   B           */
3261OP(op,b1) { OR(C);                                       } /* OR   C           */
3262OP(op,b2) { OR(D);                                       } /* OR   D           */
3263OP(op,b3) { OR(E);                                       } /* OR   E           */
3264OP(op,b4) { OR(H);                                       } /* OR   H           */
3265OP(op,b5) { OR(L);                                       } /* OR   L           */
3266OP(op,b6) { OR(RM(HL));                                    } /* OR   (HL)        */
3267OP(op,b7) { OR(A);                                       } /* OR   A           */
32213268
3222OP(op,b8) { CP(B);                                    } /* CP   B           */
3223OP(op,b9) { CP(C);                                    } /* CP   C           */
3224OP(op,ba) { CP(D);                                    } /* CP   D           */
3225OP(op,bb) { CP(E);                                    } /* CP   E           */
3226OP(op,bc) { CP(H);                                    } /* CP   H           */
3227OP(op,bd) { CP(L);                                    } /* CP   L           */
3228OP(op,be) { CP(RM(HL));                                 } /* CP   (HL)        */
3229OP(op,bf) { CP(A);                                    } /* CP   A           */
3269OP(op,b8) { CP(B);                                       } /* CP   B           */
3270OP(op,b9) { CP(C);                                       } /* CP   C           */
3271OP(op,ba) { CP(D);                                       } /* CP   D           */
3272OP(op,bb) { CP(E);                                       } /* CP   E           */
3273OP(op,bc) { CP(H);                                       } /* CP   H           */
3274OP(op,bd) { CP(L);                                       } /* CP   L           */
3275OP(op,be) { CP(RM(HL));                                    } /* CP   (HL)        */
3276OP(op,bf) { CP(A);                                       } /* CP   A           */
32303277
3231OP(op,c0) { RET_COND( !(F & ZF), 0xc0 );                  } /* RET  NZ          */
3232OP(op,c1) { POP( bc );                                 } /* POP  BC          */
3233OP(op,c2) { JP_COND( !(F & ZF) );                        } /* JP   NZ,a        */
3234OP(op,c3) { JP;                                       } /* JP   a           */
3235OP(op,c4) { CALL_COND( !(F & ZF), 0xc4 );                  } /* CALL NZ,a        */
3236OP(op,c5) { PUSH( bc );                                 } /* PUSH BC          */
3237OP(op,c6) { ADD(ARG());                                 } /* ADD  A,n         */
3238OP(op,c7) { RST(0x00);                                 } /* RST  0           */
3278OP(op,c0) { RET_COND( !(F & ZF), 0xc0 );                     } /* RET  NZ          */
3279OP(op,c1) { POP( bc );                                    } /* POP  BC          */
3280OP(op,c2) { JP_COND( !(F & ZF) );                           } /* JP   NZ,a        */
3281OP(op,c3) { JP;                                          } /* JP   a           */
3282OP(op,c4) { CALL_COND( !(F & ZF), 0xc4 );                     } /* CALL NZ,a        */
3283OP(op,c5) { PUSH( bc );                                    } /* PUSH BC          */
3284OP(op,c6) { ADD(ARG(z80));                                 } /* ADD  A,n         */
3285OP(op,c7) { RST(0x00);                                    } /* RST  0           */
32393286
3240OP(op,c8) { RET_COND( F & ZF, 0xc8 );                     } /* RET  Z           */
3241OP(op,c9) { POP( pc ); change_pc(PCD);                     } /* RET              */
3242OP(op,ca) { JP_COND( F & ZF );                           } /* JP   Z,a         */
3243OP(op,cb) { R++; EXEC(cb,ROP());                        } /* **** CB xx       */
3244OP(op,cc) { CALL_COND( F & ZF, 0xcc );                     } /* CALL Z,a         */
3245OP(op,cd) { CALL();                                    } /* CALL a           */
3246OP(op,ce) { ADC(ARG());                                 } /* ADC  A,n         */
3247OP(op,cf) { RST(0x08);                                 } /* RST  1           */
3287OP(op,c8) { RET_COND( F & ZF, 0xc8 );                        } /* RET  Z           */
3288OP(op,c9) { POP( pc ); change_pc(PCD); MEMPTR=PCD;               } /* RET              */
3289OP(op,ca) { JP_COND( F & ZF );                              } /* JP   Z,a         */
3290OP(op,cb) { R++; EXEC(z80,cb,ROP(z80));                        } /* **** CB xx       */
3291OP(op,cc) { CALL_COND( F & ZF, 0xcc );                        } /* CALL Z,a         */
3292OP(op,cd) { CALL();                                       } /* CALL a           */
3293OP(op,ce) { ADC(ARG(z80));                                 } /* ADC  A,n         */
3294OP(op,cf) { RST(0x08);                                    } /* RST  1           */
32483295
3249OP(op,d0) { RET_COND( !(F & CF), 0xd0 );                  } /* RET  NC          */
3250OP(op,d1) { POP( de );                                 } /* POP  DE          */
3251OP(op,d2) { JP_COND( !(F & CF) );                        } /* JP   NC,a        */
3252OP(op,d3) { unsigned n = ARG() | (A << 8); OUT( n, A );         } /* OUT  (n),A       */
3253OP(op,d4) { CALL_COND( !(F & CF), 0xd4 );                  } /* CALL NC,a        */
3254OP(op,d5) { PUSH( de );                                 } /* PUSH DE          */
3255OP(op,d6) { SUB(ARG());                                 } /* SUB  n           */
3256OP(op,d7) { RST(0x10);                                 } /* RST  2           */
3296OP(op,d0) { RET_COND( !(F & CF), 0xd0 );                     } /* RET  NC          */
3297OP(op,d1) { POP( de );                                    } /* POP  DE          */
3298OP(op,d2) { JP_COND( !(F & CF) );                           } /* JP   NC,a        */
3299OP(op,d3) { unsigned n = ARG(z80) | (A << 8); OUT( n, A );   MEMPTR_L = ((n & 0xff) + 1) & 0xff;  MEMPTR_H = A;   } /* OUT  (n),A       */
3300OP(op,d4) { CALL_COND( !(F & CF), 0xd4 );                     } /* CALL NC,a        */
3301OP(op,d5) { PUSH( de );                                    } /* PUSH DE          */
3302OP(op,d6) { SUB(ARG(z80));                                 } /* SUB  n           */
3303OP(op,d7) { RST(0x10);                                    } /* RST  2           */
32573304
3258OP(op,d8) { RET_COND( F & CF, 0xd8 );                     } /* RET  C           */
3259OP(op,d9) { EXX;                                    } /* EXX              */
3260OP(op,da) { JP_COND( F & CF );                           } /* JP   C,a         */
3261OP(op,db) { unsigned n = ARG() | (A << 8); A = IN( n );         } /* IN   A,(n)       */
3262OP(op,dc) { CALL_COND( F & CF, 0xdc );                     } /* CALL C,a         */
3263OP(op,dd) { R++; EXEC(dd,ROP());                        } /* **** DD xx       */
3264OP(op,de) { SBC(ARG());                                 } /* SBC  A,n         */
3265OP(op,df) { RST(0x18);                                 } /* RST  3           */
3305OP(op,d8) { RET_COND( F & CF, 0xd8 );                        } /* RET  C           */
3306OP(op,d9) { EXX;                                       } /* EXX              */
3307OP(op,da) { JP_COND( F & CF );                              } /* JP   C,a         */
3308OP(op,db) { unsigned n = ARG(z80) | (A << 8); A = IN( n );   MEMPTR = n + 1;   } /* IN   A,(n)       */
3309OP(op,dc) { CALL_COND( F & CF, 0xdc );                        } /* CALL C,a         */
3310OP(op,dd) { R++; EXEC(z80,dd,ROP(z80));                        } /* **** DD xx       */
3311OP(op,de) { SBC(ARG(z80));                                 } /* SBC  A,n         */
3312OP(op,df) { RST(0x18);                                    } /* RST  3           */
32663313
3267OP(op,e0) { RET_COND( !(F & PF), 0xe0 );                  } /* RET  PO          */
3268OP(op,e1) { POP( hl );                                 } /* POP  HL          */
3269OP(op,e2) { JP_COND( !(F & PF) );                        } /* JP   PO,a        */
3270OP(op,e3) { EXSP( hl );                                 } /* EX   HL,(SP)     */
3271OP(op,e4) { CALL_COND( !(F & PF), 0xe4 );                  } /* CALL PO,a        */
3272OP(op,e5) { PUSH( hl );                                 } /* PUSH HL          */
3273OP(op,e6) { AND(ARG());                                 } /* AND  n           */
3274OP(op,e7) { RST(0x20);                                 } /* RST  4           */
3314OP(op,e0) { RET_COND( !(F & PF), 0xe0 );                     } /* RET  PO          */
3315OP(op,e1) { POP( hl );                                    } /* POP  HL          */
3316OP(op,e2) { JP_COND( !(F & PF) );                           } /* JP   PO,a        */
3317OP(op,e3) { EXSP( hl );                                    } /* EX   HL,(SP)     */
3318OP(op,e4) { CALL_COND( !(F & PF), 0xe4 );                     } /* CALL PO,a        */
3319OP(op,e5) { PUSH( hl );                                    } /* PUSH HL          */
3320OP(op,e6) { AND(ARG(z80));                                 } /* AND  n           */
3321OP(op,e7) { RST(0x20);                                    } /* RST  4           */
32753322
3276OP(op,e8) { RET_COND( F & PF, 0xe8 );                     } /* RET  PE          */
3277OP(op,e9) { PC = HL; change_pc(PCD);                     } /* JP   (HL)        */
3278OP(op,ea) { JP_COND( F & PF );                           } /* JP   PE,a        */
3279OP(op,eb) { EX_DE_HL;                                 } /* EX   DE,HL       */
3280OP(op,ec) { CALL_COND( F & PF, 0xec );                     } /* CALL PE,a        */
3281OP(op,ed) { R++; EXEC(ed,ROP());                        } /* **** ED xx       */
3282OP(op,ee) { XOR(ARG());                                 } /* XOR  n           */
3283OP(op,ef) { RST(0x28);                                 } /* RST  5           */
3323OP(op,e8) { RET_COND( F & PF, 0xe8 );                        } /* RET  PE          */
3324OP(op,e9) { PC = HL; change_pc(PCD);                        } /* JP   (HL)        */
3325OP(op,ea) { JP_COND( F & PF );                              } /* JP   PE,a        */
3326OP(op,eb) { EX_DE_HL;                                    } /* EX   DE,HL       */
3327OP(op,ec) { CALL_COND( F & PF, 0xec );                        } /* CALL PE,a        */
3328OP(op,ed) { R++; EXEC(z80,ed,ROP(z80));                        } /* **** ED xx       */
3329OP(op,ee) { XOR(ARG(z80));                                 } /* XOR  n           */
3330OP(op,ef) { RST(0x28);                                    } /* RST  5           */
32843331
3285OP(op,f0) { RET_COND( !(F & SF), 0xf0 );                  } /* RET  P           */
3286OP(op,f1) { POP( af );                                 } /* POP  AF          */
3287OP(op,f2) { JP_COND( !(F & SF) );                        } /* JP   P,a         */
3288OP(op,f3) { IFF1 = IFF2 = 0;                           } /* DI               */
3289OP(op,f4) { CALL_COND( !(F & SF), 0xf4 );                  } /* CALL P,a         */
3290OP(op,f5) { PUSH( af );                                 } /* PUSH AF          */
3291OP(op,f6) { OR(ARG());                                 } /* OR   n           */
3292OP(op,f7) { RST(0x30);                                 } /* RST  6           */
3332OP(op,f0) { RET_COND( !(F & SF), 0xf0 );                     } /* RET  P           */
3333OP(op,f1) { POP( af );                                    } /* POP  AF          */
3334OP(op,f2) { JP_COND( !(F & SF) );                           } /* JP   P,a         */
3335OP(op,f3) { IFF1 = IFF2 = 0;                              } /* DI               */
3336OP(op,f4) { CALL_COND( !(F & SF), 0xf4 );                     } /* CALL P,a         */
3337OP(op,f5) { PUSH( af );                                    } /* PUSH AF          */
3338OP(op,f6) { OR(ARG(z80));                                 } /* OR   n           */
3339OP(op,f7) { RST(0x30);                                    } /* RST  6           */
32933340
3294OP(op,f8) { RET_COND( F & SF, 0xf8 );                     } /* RET  M           */
3295OP(op,f9) { SP = HL;                                 } /* LD   SP,HL       */
3296OP(op,fa) { JP_COND(F & SF);                           } /* JP   M,a         */
3297OP(op,fb) { EI;                                       } /* EI               */
3298OP(op,fc) { CALL_COND( F & SF, 0xfc );                     } /* CALL M,a         */
3299OP(op,fd) { R++; EXEC(fd,ROP());                        } /* **** FD xx       */
3300OP(op,fe) { CP(ARG());                                 } /* CP   n           */
3301OP(op,ff) { RST(0x38);                                 } /* RST  7           */
3341OP(op,f8) { RET_COND( F & SF, 0xf8 );                        } /* RET  M           */
3342OP(op,f9) { SP = HL;                                    } /* LD   SP,HL       */
3343OP(op,fa) { JP_COND(F & SF);                              } /* JP   M,a         */
3344OP(op,fb) { EI;                                          } /* EI               */
3345OP(op,fc) { CALL_COND( F & SF, 0xfc );                        } /* CALL M,a         */
3346OP(op,fd) { R++; EXEC(z80,fd,ROP(z80));                        } /* **** FD xx       */
3347OP(op,fe) { CP(ARG(z80));                                 } /* CP   n           */
3348OP(op,ff) { RST(0x38);                                    } /* RST  7           */
33023349
33033350
3304static void take_interrupt(void)
3351static void take_interrupt(z80_state *z80)
33053352{
33063353   int irq_vector;
33073354
r3535r3536
33153362   IFF1 = IFF2 = 0;
33163363
33173364   /* Daisy chain mode? If so, call the requesting device */
3318   if (Z80.daisy)
3319      irq_vector = z80daisy_call_ack_device(Z80.daisy);
3365   if (z80->daisy)
3366      irq_vector = z80daisy_call_ack_device(z80->daisy);
33203367
33213368   /* else call back the cpu interface to retrieve the vector */
33223369   else
3323      irq_vector = (*Z80.irq_callback)(0);
3370      irq_vector = (*z80->irq_callback)(z80->device, 0);
33243371
33253372   LOG(("Z80 #%d single int. irq_vector $%02x\n", cpu_getactivecpu(), irq_vector));
33263373
3327   /* Interrupt mode 2. Call [Z80.i:databyte] */
3374   /* Interrupt mode 2. Call [z80->i:databyte] */
33283375   if( IM == 2 )
33293376   {
33303377      irq_vector = (irq_vector & 0xff) | (I << 8);
33313378      PUSH( pc );
3332      RM16( irq_vector, &Z80.pc );
3379      RM16( irq_vector, &z80->pc );
33333380      LOG(("Z80 #%d IM2 [$%04x] = $%04x\n",cpu_getactivecpu() , irq_vector, PCD));
33343381      /* CALL opcode timing */
3335      z80_ICount -= cc[Z80_TABLE_op][0xcd];
3382      z80->icount -= cc[Z80_TABLE_op][0xcd];
33363383   }
33373384   else
33383385   /* Interrupt mode 1. RST 38h */
r3535r3536
33423389      PUSH( pc );
33433390      PCD = 0x0038;
33443391      /* RST $38 + 'interrupt latency' cycles */
3345      z80_ICount -= cc[Z80_TABLE_op][0xff] + cc[Z80_TABLE_ex][0xff];
3392      z80->icount -= cc[Z80_TABLE_op][0xff] + cc[Z80_TABLE_ex][0xff];
33463393   }
33473394   else
33483395   {
r3535r3536
33563403            PUSH( pc );
33573404            PCD = irq_vector & 0xffff;
33583405             /* CALL $xxxx + 'interrupt latency' cycles */
3359            z80_ICount -= cc[Z80_TABLE_op][0xcd] + cc[Z80_TABLE_ex][0xff];
3406            z80->icount -= cc[Z80_TABLE_op][0xcd] + cc[Z80_TABLE_ex][0xff];
33603407            break;
33613408         case 0xc30000:   /* jump */
33623409            PCD = irq_vector & 0xffff;
33633410            /* JP $xxxx + 2 cycles */
3364            z80_ICount -= cc[Z80_TABLE_op][0xc3] + cc[Z80_TABLE_ex][0xff];
3411            z80->icount -= cc[Z80_TABLE_op][0xc3] + cc[Z80_TABLE_ex][0xff];
33653412            break;
33663413         default:      /* rst (or other opcodes?) */
33673414            PUSH( pc );
33683415            PCD = irq_vector & 0x0038;
33693416            /* RST $xx + 2 cycles */
3370            z80_ICount -= cc[Z80_TABLE_op][PCD] + cc[Z80_TABLE_ex][PCD];
3417            z80->icount -= cc[Z80_TABLE_op][PCD] + cc[Z80_TABLE_ex][PCD];
33713418            break;
33723419      }
33733420   }
33743421   change_pc(PCD);
3422   MEMPTR=PCD;
33753423}
33763424
33773425/****************************************************************************
33783426 * Processor initialization
33793427 ****************************************************************************/
3380static void z80_init(int index, int clock, const void *config, int (*irqcallback)(int))
3428static CPU_INIT( z80 )
33813429{
3430   z80_state *z80 = device->token;
33823431   int i, p;
33833432
3433   token = device->token;   // temporary
3434
33843435   /* setup cycle tables */
33853436   cc[Z80_TABLE_op] = cc_op;
33863437   cc[Z80_TABLE_cb] = cc_cb;
r3535r3536
34723523      if( (i & 0x0f) == 0x0f ) SZHV_dec[i] |= HF;
34733524   }
34743525
3475   state_save_register_item("z80", index, Z80.prvpc.w.l);
3476   state_save_register_item("z80", index, Z80.pc.w.l);
3477   state_save_register_item("z80", index, Z80.sp.w.l);
3478   state_save_register_item("z80", index, Z80.af.w.l);
3479   state_save_register_item("z80", index, Z80.bc.w.l);
3480   state_save_register_item("z80", index, Z80.de.w.l);
3481   state_save_register_item("z80", index, Z80.hl.w.l);
3482   state_save_register_item("z80", index, Z80.ix.w.l);
3483   state_save_register_item("z80", index, Z80.iy.w.l);
3484   state_save_register_item("z80", index, Z80.af2.w.l);
3485   state_save_register_item("z80", index, Z80.bc2.w.l);
3486   state_save_register_item("z80", index, Z80.de2.w.l);
3487   state_save_register_item("z80", index, Z80.hl2.w.l);
3488   state_save_register_item("z80", index, Z80.r);
3489   state_save_register_item("z80", index, Z80.r2);
3490   state_save_register_item("z80", index, Z80.iff1);
3491   state_save_register_item("z80", index, Z80.iff2);
3492   state_save_register_item("z80", index, Z80.halt);
3493   state_save_register_item("z80", index, Z80.im);
3494   state_save_register_item("z80", index, Z80.i);
3495   state_save_register_item("z80", index, Z80.nmi_state);
3496   state_save_register_item("z80", index, Z80.nmi_pending);
3497   state_save_register_item("z80", index, Z80.irq_state);
3498   state_save_register_item("z80", index, Z80.after_ei);
3526   state_save_register_item("z80", index, z80->prvpc.w.l);
3527   state_save_register_item("z80", index, z80->pc.w.l);
3528   state_save_register_item("z80", index, z80->sp.w.l);
3529   state_save_register_item("z80", index, z80->af.w.l);
3530   state_save_register_item("z80", index, z80->bc.w.l);
3531   state_save_register_item("z80", index, z80->de.w.l);
3532   state_save_register_item("z80", index, z80->hl.w.l);
3533   state_save_register_item("z80", index, z80->ix.w.l);
3534   state_save_register_item("z80", index, z80->iy.w.l);
3535   state_save_register_item("z80", index, z80->memptr.w.l);
3536   state_save_register_item("z80", index, z80->af2.w.l);
3537   state_save_register_item("z80", index, z80->bc2.w.l);
3538   state_save_register_item("z80", index, z80->de2.w.l);
3539   state_save_register_item("z80", index, z80->hl2.w.l);
3540   state_save_register_item("z80", index, z80->r);
3541   state_save_register_item("z80", index, z80->r2);
3542   state_save_register_item("z80", index, z80->iff1);
3543   state_save_register_item("z80", index, z80->iff2);
3544   state_save_register_item("z80", index, z80->halt);
3545   state_save_register_item("z80", index, z80->im);
3546   state_save_register_item("z80", index, z80->i);
3547   state_save_register_item("z80", index, z80->nmi_state);
3548   state_save_register_item("z80", index, z80->nmi_pending);
3549   state_save_register_item("z80", index, z80->irq_state);
3550   state_save_register_item("z80", index, z80->after_ei);
34993551
35003552   /* Reset registers to their initial values */
3501   memset(&Z80, 0, sizeof(Z80));
3553   memset(z80, 0, sizeof(*z80));
35023554   if (config != NULL)
3503      Z80.daisy = z80daisy_init(Machine, Machine->config->cpu[cpu_getactivecpu()].tag, config);
3504   Z80.irq_callback = irqcallback;
3555      z80->daisy = z80daisy_init(Machine, Machine->config->cpu[cpu_getactivecpu()].tag, config);
3556   z80->irq_callback = irqcallback;
3557   z80->device = device;
35053558   IX = IY = 0xffff; /* IX and IY are FFFF after a reset! */
35063559   F = ZF;         /* Zero flag is set */
35073560}
r3535r3536
35093562/****************************************************************************
35103563 * Do a reset
35113564 ****************************************************************************/
3512static void z80_reset(void)
3565static CPU_RESET( z80 )
35133566{
3567   z80_state *z80 = device->token;
3568
35143569   PC = 0x0000;
35153570   I = 0;
35163571   R = 0;
35173572   R2 = 0;
3518   Z80.nmi_state = CLEAR_LINE;
3519   Z80.nmi_pending = FALSE;
3520   Z80.irq_state = CLEAR_LINE;
3521   Z80.after_ei = FALSE;
3573   z80->nmi_state = CLEAR_LINE;
3574   z80->nmi_pending = FALSE;
3575   z80->irq_state = CLEAR_LINE;
3576   z80->after_ei = FALSE;
35223577
3523   if (Z80.daisy)
3524      z80daisy_reset(Z80.daisy);
3578   if (z80->daisy)
3579      z80daisy_reset(z80->daisy);
35253580
35263581   change_pc(PCD);
3582   MEMPTR=PCD;
35273583}
35283584
3529static void z80_exit(void)
3585static CPU_EXIT( z80 )
35303586{
35313587#if BIG_FLAGS_ARRAY
35323588   if (SZHVC_add) free(SZHVC_add);
r3535r3536
35393595/****************************************************************************
35403596 * Execute 'cycles' T-states. Return number of T-states really executed
35413597 ****************************************************************************/
3542static int z80_execute(int cycles)
3598static CPU_EXECUTE( z80 )
35433599{
3544   z80_ICount = cycles;
3600   z80_state *z80 = device->token;
35453601
3602   z80->icount = cycles;
3603
35463604   /* check for NMIs on the way in; they can only be set externally */
35473605   /* via timers, and can't be dynamically enabled, so it is safe */
35483606   /* to just check here */
3549   if (Z80.nmi_pending)
3607   if (z80->nmi_pending)
35503608   {
35513609      LOG(("Z80 #%d take NMI\n", cpu_getactivecpu()));
35523610      PRVPC = -1;         /* there isn't a valid previous program counter */
r3535r3536
35563614      PUSH( pc );
35573615      PCD = 0x0066;
35583616      change_pc(PCD);
3559      z80_ICount -= 11;
3560      Z80.nmi_pending = FALSE;
3617      MEMPTR=PCD;
3618      z80->icount -= 11;
3619      z80->nmi_pending = FALSE;
35613620   }
35623621
35633622   do
35643623   {
35653624      /* check for IRQs before each instruction */
3566      if (Z80.irq_state != CLEAR_LINE && IFF1 && !Z80.after_ei)
3567         take_interrupt();
3568      Z80.after_ei = FALSE;
3625      if (z80->irq_state != CLEAR_LINE && IFF1 && !z80->after_ei)
3626         take_interrupt(z80);
3627      z80->after_ei = FALSE;
35693628
35703629      PRVPC = PCD;
35713630      debugger_instruction_hook(Machine, PCD);
35723631      R++;
3573      EXEC_INLINE(op,ROP());
3574   } while( z80_ICount > 0 );
3632      EXEC_INLINE(z80,op,ROP(z80));
3633   } while( z80->icount > 0 );
35753634
3576   return cycles - z80_ICount;
3635   return cycles - z80->icount;
35773636}
35783637
35793638/****************************************************************************
35803639 * Burn 'cycles' T-states. Adjust R register for the lost time
35813640 ****************************************************************************/
3582static void z80_burn(int cycles)
3641static CPU_BURN( z80 )
35833642{
3643   z80_state *z80 = token;
3644
35843645   if( cycles > 0 )
35853646   {
35863647      /* NOP takes 4 cycles per instruction */
35873648      int n = (cycles + 3) / 4;
35883649      R += n;
3589      z80_ICount -= 4 * n;
3650      z80->icount -= 4 * n;
35903651   }
35913652}
35923653
35933654/****************************************************************************
35943655 * Get all registers in given buffer
35953656 ****************************************************************************/
3596static void z80_get_context (void *dst)
3657static CPU_GET_CONTEXT( z80 )
35973658{
3598   if( dst )
3599      *(Z80_Regs*)dst = Z80;
36003659}
36013660
36023661/****************************************************************************
36033662 * Set all registers to given values
36043663 ****************************************************************************/
3605static void z80_set_context (void *src)
3664static CPU_SET_CONTEXT( z80 )
36063665{
3666   z80_state *z80;
36073667   if( src )
3608      Z80 = *(Z80_Regs*)src;
3668      token = src;
3669   z80 = token;
36093670   change_pc(PCD);
36103671}
36113672
36123673/****************************************************************************
36133674 * Set IRQ line state
36143675 ****************************************************************************/
3615static void set_irq_line(int irqline, int state)
3676static void set_irq_line(z80_state *z80, int irqline, int state)
36163677{
36173678   if (irqline == INPUT_LINE_NMI)
36183679   {
36193680      /* mark an NMI pending on the rising edge */
3620      if (Z80.nmi_state == CLEAR_LINE && state != CLEAR_LINE)
3621         Z80.nmi_pending = TRUE;
3622      Z80.nmi_state = state;
3681      if (z80->nmi_state == CLEAR_LINE && state != CLEAR_LINE)
3682         z80->nmi_pending = TRUE;
3683      z80->nmi_state = state;
36233684   }
36243685   else
36253686   {
36263687      /* update the IRQ state via the daisy chain */
3627      Z80.irq_state = state;
3628      if (Z80.daisy)
3629         Z80.irq_state = z80daisy_update_irq_state(Z80.daisy);
3688      z80->irq_state = state;
3689      if (z80->daisy)
3690         z80->irq_state = z80daisy_update_irq_state(z80->daisy);
36303691
36313692      /* the main execute loop will take the interrupt */
36323693   }
r3535r3536
36383699 * Generic set_info
36393700 **************************************************************************/
36403701
3641static void z80_set_info(UINT32 state, cpuinfo *info)
3702static CPU_SET_INFO( z80 )
36423703{
3704   z80_state *z80 = token;
36433705   switch (state)
36443706   {
36453707      /* --- the following bits of info are set as 64-bit signed integers --- */
3646      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:      set_irq_line(INPUT_LINE_NMI, info->i); break;
3647      case CPUINFO_INT_INPUT_STATE + 0:               set_irq_line(0, info->i);         break;
3708      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:      set_irq_line(z80, INPUT_LINE_NMI, info->i); break;
3709      case CPUINFO_INT_INPUT_STATE + 0:               set_irq_line(z80, 0, info->i);      break;
36483710
36493711      case CPUINFO_INT_PC:                        PC = info->i; change_pc(PCD);      break;
3650      case CPUINFO_INT_REGISTER + Z80_PC:               Z80.pc.w.l = info->i;            break;
3712      case CPUINFO_INT_REGISTER + Z80_PC:               z80->pc.w.l = info->i;            break;
36513713      case CPUINFO_INT_SP:                        SP = info->i;                  break;
3652      case CPUINFO_INT_REGISTER + Z80_SP:               Z80.sp.w.l = info->i;            break;
3653      case CPUINFO_INT_REGISTER + Z80_A:               Z80.af.b.h = info->i;            break;
3654      case CPUINFO_INT_REGISTER + Z80_B:               Z80.bc.b.h = info->i;            break;
3655      case CPUINFO_INT_REGISTER + Z80_C:               Z80.bc.b.l = info->i;            break;
3656      case CPUINFO_INT_REGISTER + Z80_D:               Z80.de.b.h = info->i;            break;
3657      case CPUINFO_INT_REGISTER + Z80_E:               Z80.de.b.l = info->i;            break;
3658      case CPUINFO_INT_REGISTER + Z80_H:               Z80.hl.b.h = info->i;            break;
3659      case CPUINFO_INT_REGISTER + Z80_L:               Z80.hl.b.l = info->i;            break;
3660      case CPUINFO_INT_REGISTER + Z80_AF:               Z80.af.w.l = info->i;            break;
3661      case CPUINFO_INT_REGISTER + Z80_BC:               Z80.bc.w.l = info->i;            break;
3662      case CPUINFO_INT_REGISTER + Z80_DE:               Z80.de.w.l = info->i;            break;
3663      case CPUINFO_INT_REGISTER + Z80_HL:               Z80.hl.w.l = info->i;            break;
3664      case CPUINFO_INT_REGISTER + Z80_IX:               Z80.ix.w.l = info->i;            break;
3665      case CPUINFO_INT_REGISTER + Z80_IY:               Z80.iy.w.l = info->i;            break;
3666      case CPUINFO_INT_REGISTER + Z80_R:               Z80.r = info->i; Z80.r2 = info->i & 0x80; break;
3667      case CPUINFO_INT_REGISTER + Z80_I:               Z80.i = info->i;               break;
3668      case CPUINFO_INT_REGISTER + Z80_AF2:            Z80.af2.w.l = info->i;            break;
3669      case CPUINFO_INT_REGISTER + Z80_BC2:            Z80.bc2.w.l = info->i;            break;
3670      case CPUINFO_INT_REGISTER + Z80_DE2:            Z80.de2.w.l = info->i;            break;
3671      case CPUINFO_INT_REGISTER + Z80_HL2:            Z80.hl2.w.l = info->i;            break;
3672      case CPUINFO_INT_REGISTER + Z80_IM:               Z80.im = info->i;               break;
3673      case CPUINFO_INT_REGISTER + Z80_IFF1:            Z80.iff1 = info->i;               break;
3674      case CPUINFO_INT_REGISTER + Z80_IFF2:            Z80.iff2 = info->i;               break;
3675      case CPUINFO_INT_REGISTER + Z80_HALT:            Z80.halt = info->i;               break;
3714      case CPUINFO_INT_REGISTER + Z80_SP:               z80->sp.w.l = info->i;            break;
3715      case CPUINFO_INT_REGISTER + Z80_A:               z80->af.b.h = info->i;            break;
3716      case CPUINFO_INT_REGISTER + Z80_B:               z80->bc.b.h = info->i;            break;
3717      case CPUINFO_INT_REGISTER + Z80_C:               z80->bc.b.l = info->i;            break;
3718      case CPUINFO_INT_REGISTER + Z80_D:               z80->de.b.h = info->i;            break;
3719      case CPUINFO_INT_REGISTER + Z80_E:               z80->de.b.l = info->i;            break;
3720      case CPUINFO_INT_REGISTER + Z80_H:               z80->hl.b.h = info->i;            break;
3721      case CPUINFO_INT_REGISTER + Z80_L:               z80->hl.b.l = info->i;            break;
3722      case CPUINFO_INT_REGISTER + Z80_AF:               z80->af.w.l = info->i;            break;
3723      case CPUINFO_INT_REGISTER + Z80_BC:               z80->bc.w.l = info->i;            break;
3724      case CPUINFO_INT_REGISTER + Z80_DE:               z80->de.w.l = info->i;            break;
3725      case CPUINFO_INT_REGISTER + Z80_HL:               z80->hl.w.l = info->i;            break;
3726      case CPUINFO_INT_REGISTER + Z80_IX:               z80->ix.w.l = info->i;            break;
3727      case CPUINFO_INT_REGISTER + Z80_IY:               z80->iy.w.l = info->i;            break;
3728      case CPUINFO_INT_REGISTER + Z80_MEMPTR:            z80->memptr.w.l = info->i;         break;
3729      case CPUINFO_INT_REGISTER + Z80_R:               z80->r = info->i; z80->r2 = info->i & 0x80; break;
3730      case CPUINFO_INT_REGISTER + Z80_I:               z80->i = info->i;               break;
3731      case CPUINFO_INT_REGISTER + Z80_AF2:            z80->af2.w.l = info->i;            break;
3732      case CPUINFO_INT_REGISTER + Z80_BC2:            z80->bc2.w.l = info->i;            break;
3733      case CPUINFO_INT_REGISTER + Z80_DE2:            z80->de2.w.l = info->i;            break;
3734      case CPUINFO_INT_REGISTER + Z80_HL2:            z80->hl2.w.l = info->i;            break;
3735      case CPUINFO_INT_REGISTER + Z80_IM:               z80->im = info->i;               break;
3736      case CPUINFO_INT_REGISTER + Z80_IFF1:            z80->iff1 = info->i;            break;
3737      case CPUINFO_INT_REGISTER + Z80_IFF2:            z80->iff2 = info->i;            break;
3738      case CPUINFO_INT_REGISTER + Z80_HALT:            z80->halt = info->i;            break;
36763739
36773740      /* --- the following bits of info are set as pointers to data or functions --- */
36783741      case CPUINFO_PTR_Z80_CYCLE_TABLE + Z80_TABLE_op:   cc[Z80_TABLE_op] = info->p;         break;
r3535r3536
36903753 * Generic get_info
36913754 **************************************************************************/
36923755
3693void z80_get_info(UINT32 state, cpuinfo *info)
3756CPU_GET_INFO( z80 )
36943757{
3758   z80_state *z80 = token;
36953759   switch (state)
36963760   {
36973761      /* --- the following bits of info are returned as 64-bit signed integers --- */
3698      case CPUINFO_INT_CONTEXT_SIZE:            info->i = sizeof(Z80);                  break;
3762      case CPUINFO_INT_CONTEXT_SIZE:            info->i = sizeof(z80_state);            break;
36993763      case CPUINFO_INT_INPUT_LINES:            info->i = 1;                        break;
37003764      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:      info->i = 0xff;                        break;
37013765      case CPUINFO_INT_ENDIANNESS:            info->i = CPU_IS_LE;                  break;
r3535r3536
37033767      case CPUINFO_INT_CLOCK_DIVIDER:            info->i = 1;                        break;
37043768      case CPUINFO_INT_MIN_INSTRUCTION_BYTES:      info->i = 1;                        break;
37053769      case CPUINFO_INT_MAX_INSTRUCTION_BYTES:      info->i = 4;                        break;
3706      case CPUINFO_INT_MIN_CYCLES:            info->i = 1;                        break;
3770      case CPUINFO_INT_MIN_CYCLES:            info->i = 2;                        break;
37073771      case CPUINFO_INT_MAX_CYCLES:            info->i = 16;                        break;
37083772
37093773      case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 8;               break;
r3535r3536
37163780      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 16;               break;
37173781      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:      info->i = 0;               break;
37183782
3719      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   info->i = Z80.nmi_state;            break;
3720      case CPUINFO_INT_INPUT_STATE + 0:         info->i = Z80.irq_state;               break;
3783      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   info->i = z80->nmi_state;            break;
3784      case CPUINFO_INT_INPUT_STATE + 0:         info->i = z80->irq_state;               break;
37213785
3722      case CPUINFO_INT_PREVIOUSPC:            info->i = Z80.prvpc.w.l;               break;
3786      case CPUINFO_INT_PREVIOUSPC:            info->i = z80->prvpc.w.l;               break;
37233787
37243788      case CPUINFO_INT_PC:                  info->i = PCD;                        break;
3725      case CPUINFO_INT_REGISTER + Z80_PC:         info->i = Z80.pc.w.l;                  break;
3789      case CPUINFO_INT_REGISTER + Z80_PC:         info->i = z80->pc.w.l;                  break;
37263790      case CPUINFO_INT_SP:                  info->i = SPD;                        break;
3727      case CPUINFO_INT_REGISTER + Z80_SP:         info->i = Z80.sp.w.l;                  break;
3728      case CPUINFO_INT_REGISTER + Z80_A:         info->i = Z80.af.b.h;                  break;
3729      case CPUINFO_INT_REGISTER + Z80_B:         info->i = Z80.bc.b.h;                  break;
3730      case CPUINFO_INT_REGISTER + Z80_C:         info->i = Z80.bc.b.l;                  break;
3731      case CPUINFO_INT_REGISTER + Z80_D:         info->i = Z80.de.b.h;                  break;
3732      case CPUINFO_INT_REGISTER + Z80_E:         info->i = Z80.de.b.l;                  break;
3733      case CPUINFO_INT_REGISTER + Z80_H:         info->i = Z80.hl.b.h;                  break;
3734      case CPUINFO_INT_REGISTER + Z80_L:         info->i = Z80.hl.b.l;                  break;
3735      case CPUINFO_INT_REGISTER + Z80_AF:         info->i = Z80.af.w.l;                  break;
3736      case CPUINFO_INT_REGISTER + Z80_BC:         info->i = Z80.bc.w.l;                  break;
3737      case CPUINFO_INT_REGISTER + Z80_DE:         info->i = Z80.de.w.l;                  break;
3738      case CPUINFO_INT_REGISTER + Z80_HL:         info->i = Z80.hl.w.l;                  break;
3739      case CPUINFO_INT_REGISTER + Z80_IX:         info->i = Z80.ix.w.l;                  break;
3740      case CPUINFO_INT_REGISTER + Z80_IY:         info->i = Z80.iy.w.l;                  break;
3741      case CPUINFO_INT_REGISTER + Z80_R:         info->i = (Z80.r & 0x7f) | (Z80.r2 & 0x80);   break;
3742      case CPUINFO_INT_REGISTER + Z80_I:         info->i = Z80.i;                     break;
3743      case CPUINFO_INT_REGISTER + Z80_AF2:      info->i = Z80.af2.w.l;                  break;
3744      case CPUINFO_INT_REGISTER + Z80_BC2:      info->i = Z80.bc2.w.l;                  break;
3745      case CPUINFO_INT_REGISTER + Z80_DE2:      info->i = Z80.de2.w.l;                  break;
3746      case CPUINFO_INT_REGISTER + Z80_HL2:      info->i = Z80.hl2.w.l;                  break;
3747      case CPUINFO_INT_REGISTER + Z80_IM:         info->i = Z80.im;                     break;
3748      case CPUINFO_INT_REGISTER + Z80_IFF1:      info->i = Z80.iff1;                     break;
3749      case CPUINFO_INT_REGISTER + Z80_IFF2:      info->i = Z80.iff2;                     break;
3750      case CPUINFO_INT_REGISTER + Z80_HALT:      info->i = Z80.halt;                     break;
3791      case CPUINFO_INT_REGISTER + Z80_SP:         info->i = z80->sp.w.l;                  break;
3792      case CPUINFO_INT_REGISTER + Z80_A:         info->i = z80->af.b.h;                  break;
3793      case CPUINFO_INT_REGISTER + Z80_B:         info->i = z80->bc.b.h;                  break;
3794      case CPUINFO_INT_REGISTER + Z80_C:         info->i = z80->bc.b.l;                  break;
3795      case CPUINFO_INT_REGISTER + Z80_D:         info->i = z80->de.b.h;                  break;
3796      case CPUINFO_INT_REGISTER + Z80_E:         info->i = z80->de.b.l;                  break;
3797      case CPUINFO_INT_REGISTER + Z80_H:         info->i = z80->hl.b.h;                  break;
3798      case CPUINFO_INT_REGISTER + Z80_L:         info->i = z80->hl.b.l;                  break;
3799      case CPUINFO_INT_REGISTER + Z80_AF:         info->i = z80->af.w.l;                  break;
3800      case CPUINFO_INT_REGISTER + Z80_BC:         info->i = z80->bc.w.l;                  break;
3801      case CPUINFO_INT_REGISTER + Z80_DE:         info->i = z80->de.w.l;                  break;
3802      case CPUINFO_INT_REGISTER + Z80_HL:         info->i = z80->hl.w.l;                  break;
3803      case CPUINFO_INT_REGISTER + Z80_IX:         info->i = z80->ix.w.l;                  break;
3804      case CPUINFO_INT_REGISTER + Z80_IY:         info->i = z80->iy.w.l;                  break;
3805      case CPUINFO_INT_REGISTER + Z80_MEMPTR:      info->i = z80->memptr.w.l;               break;
3806      case CPUINFO_INT_REGISTER + Z80_R:         info->i = (z80->r & 0x7f) | (z80->r2 & 0x80);break;
3807      case CPUINFO_INT_REGISTER + Z80_I:         info->i = z80->i;                     break;
3808      case CPUINFO_INT_REGISTER + Z80_AF2:      info->i = z80->af2.w.l;                  break;
3809      case CPUINFO_INT_REGISTER + Z80_BC2:      info->i = z80->bc2.w.l;                  break;
3810      case CPUINFO_INT_REGISTER + Z80_DE2:      info->i = z80->de2.w.l;                  break;
3811      case CPUINFO_INT_REGISTER + Z80_HL2:      info->i = z80->hl2.w.l;                  break;
3812      case CPUINFO_INT_REGISTER + Z80_IM:         info->i = z80->im;                     break;
3813      case CPUINFO_INT_REGISTER + Z80_IFF1:      info->i = z80->iff1;                  break;
3814      case CPUINFO_INT_REGISTER + Z80_IFF2:      info->i = z80->iff2;                  break;
3815      case CPUINFO_INT_REGISTER + Z80_HALT:      info->i = z80->halt;                  break;
37513816
37523817      /* --- the following bits of info are returned as pointers to data or functions --- */
3753      case CPUINFO_PTR_SET_INFO:               info->setinfo = z80_set_info;            break;
3754      case CPUINFO_PTR_GET_CONTEXT:            info->getcontext = z80_get_context;         break;
3755      case CPUINFO_PTR_SET_CONTEXT:            info->setcontext = z80_set_context;         break;
3756      case CPUINFO_PTR_INIT:                  info->init = z80_init;                  break;
3757      case CPUINFO_PTR_RESET:                  info->reset = z80_reset;               break;
3758      case CPUINFO_PTR_EXIT:                  info->exit = z80_exit;                  break;
3759      case CPUINFO_PTR_EXECUTE:               info->execute = z80_execute;            break;
3818      case CPUINFO_PTR_SET_INFO:               info->setinfo = CPU_SET_INFO_NAME(z80);            break;
3819      case CPUINFO_PTR_GET_CONTEXT:            info->getcontext = CPU_GET_CONTEXT_NAME(z80);         break;
3820      case CPUINFO_PTR_SET_CONTEXT:            info->setcontext = CPU_SET_CONTEXT_NAME(z80);         break;
3821      case CPUINFO_PTR_INIT:                  info->init = CPU_INIT_NAME(z80);                  break;
3822      case CPUINFO_PTR_RESET:                  info->reset = CPU_RESET_NAME(z80);               break;
3823      case CPUINFO_PTR_EXIT:                  info->exit = CPU_EXIT_NAME(z80);                  break;
3824      case CPUINFO_PTR_EXECUTE:               info->execute = CPU_EXECUTE_NAME(z80);            break;
37603825      case CPUINFO_PTR_BURN:                  info->burn = NULL;                     break;
3761      case CPUINFO_PTR_DISASSEMBLE:            info->disassemble = z80_dasm;            break;
3762      case CPUINFO_PTR_INSTRUCTION_COUNTER:            info->icount = &z80_ICount;         break;
3826      case CPUINFO_PTR_DISASSEMBLE:            info->disassemble = CPU_DISASSEMBLE_NAME(z80);            break;
3827      case CPUINFO_PTR_INSTRUCTION_COUNTER:            info->icount = &z80->icount;      break;
37633828      case CPUINFO_PTR_Z80_CYCLE_TABLE + Z80_TABLE_op:   info->p = (void *)cc[Z80_TABLE_op];   break;
37643829      case CPUINFO_PTR_Z80_CYCLE_TABLE + Z80_TABLE_cb:   info->p = (void *)cc[Z80_TABLE_cb];   break;
37653830      case CPUINFO_PTR_Z80_CYCLE_TABLE + Z80_TABLE_ed:   info->p = (void *)cc[Z80_TABLE_ed];   break;
r3535r3536
37703835      /* --- the following bits of info are returned as NULL-terminated strings --- */
37713836      case CPUINFO_STR_NAME:                  strcpy(info->s, "Z80");                  break;
37723837      case CPUINFO_STR_CORE_FAMILY:            strcpy(info->s, "Zilog Z80");            break;
3773      case CPUINFO_STR_CORE_VERSION:            strcpy(info->s, "3.7");                  break;
3838      case CPUINFO_STR_CORE_VERSION:            strcpy(info->s, "3.8");                  break;
37743839      case CPUINFO_STR_CORE_FILE:               strcpy(info->s, __FILE__);               break;
37753840      case CPUINFO_STR_CORE_CREDITS:            strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break;
37763841
37773842      case CPUINFO_STR_FLAGS:
37783843         sprintf(info->s, "%c%c%c%c%c%c%c%c",
3779            Z80.af.b.l & 0x80 ? 'S':'.',
3780            Z80.af.b.l & 0x40 ? 'Z':'.',
3781            Z80.af.b.l & 0x20 ? '5':'.',
3782            Z80.af.b.l & 0x10 ? 'H':'.',
3783            Z80.af.b.l & 0x08 ? '3':'.',
3784            Z80.af.b.l & 0x04 ? 'P':'.',
3785            Z80.af.b.l & 0x02 ? 'N':'.',
3786            Z80.af.b.l & 0x01 ? 'C':'.');
3844            z80->af.b.l & 0x80 ? 'S':'.',
3845            z80->af.b.l & 0x40 ? 'Z':'.',
3846            z80->af.b.l & 0x20 ? '5':'.',
3847            z80->af.b.l & 0x10 ? 'H':'.',
3848            z80->af.b.l & 0x08 ? '3':'.',
3849            z80->af.b.l & 0x04 ? 'P':'.',
3850            z80->af.b.l & 0x02 ? 'N':'.',
3851            z80->af.b.l & 0x01 ? 'C':'.');
37873852         break;
37883853
3789      case CPUINFO_STR_REGISTER + Z80_PC:         sprintf(info->s, "PC:%04X", Z80.pc.w.l);   break;
3790      case CPUINFO_STR_REGISTER + Z80_SP:         sprintf(info->s, "SP:%04X", Z80.sp.w.l);   break;
3791      case CPUINFO_STR_REGISTER + Z80_A:         sprintf(info->s, "~A:%02X", Z80.af.b.h);   break;
3792      case CPUINFO_STR_REGISTER + Z80_B:         sprintf(info->s, "~B:%02X", Z80.bc.b.h);   break;
3793      case CPUINFO_STR_REGISTER + Z80_C:         sprintf(info->s, "~C:%02X", Z80.bc.b.l);   break;
3794      case CPUINFO_STR_REGISTER + Z80_D:         sprintf(info->s, "~D:%02X", Z80.de.b.h);   break;
3795      case CPUINFO_STR_REGISTER + Z80_E:         sprintf(info->s, "~E:%02X", Z80.de.b.l);   break;
3796      case CPUINFO_STR_REGISTER + Z80_H:         sprintf(info->s, "~H:%02X", Z80.hl.b.h);   break;
3797      case CPUINFO_STR_REGISTER + Z80_L:         sprintf(info->s, "~L:%02X", Z80.hl.b.l);   break;
3798      case CPUINFO_STR_REGISTER + Z80_AF:         sprintf(info->s, "AF:%04X", Z80.af.w.l);   break;
3799      case CPUINFO_STR_REGISTER + Z80_BC:         sprintf(info->s, "BC:%04X", Z80.bc.w.l);   break;
3800      case CPUINFO_STR_REGISTER + Z80_DE:         sprintf(info->s, "DE:%04X", Z80.de.w.l);   break;
3801      case CPUINFO_STR_REGISTER + Z80_HL:         sprintf(info->s, "HL:%04X", Z80.hl.w.l);   break;
3802      case CPUINFO_STR_REGISTER + Z80_IX:         sprintf(info->s, "IX:%04X", Z80.ix.w.l);   break;
3803      case CPUINFO_STR_REGISTER + Z80_IY:         sprintf(info->s, "IY:%04X", Z80.iy.w.l);
3804         break;
3805      case CPUINFO_STR_REGISTER + Z80_R:         sprintf(info->s, "R:%02X", (Z80.r & 0x7f) | (Z80.r2 & 0x80)); break;
3806      case CPUINFO_STR_REGISTER + Z80_I:         sprintf(info->s, "I:%02X", Z80.i);         break;
3807      case CPUINFO_STR_REGISTER + Z80_AF2:      sprintf(info->s, "AF2:%04X", Z80.af2.w.l);   break;
3808      case CPUINFO_STR_REGISTER + Z80_BC2:      sprintf(info->s, "BC2:%04X", Z80.bc2.w.l);   break;
3809      case CPUINFO_STR_REGISTER + Z80_DE2:      sprintf(info->s, "DE2:%04X", Z80.de2.w.l);   break;
3810      case CPUINFO_STR_REGISTER + Z80_HL2:      sprintf(info->s, "HL2:%04X", Z80.hl2.w.l);   break;
3811      case CPUINFO_STR_REGISTER + Z80_IM:         sprintf(info->s, "IM:%X", Z80.im);         break;
3812      case CPUINFO_STR_REGISTER + Z80_IFF1:      sprintf(info->s, "IFF1:%X", Z80.iff1);      break;
3813      case CPUINFO_STR_REGISTER + Z80_IFF2:      sprintf(info->s, "IFF2:%X", Z80.iff2);      break;
3814      case CPUINFO_STR_REGISTER + Z80_HALT:      sprintf(info->s, "HALT:%X", Z80.halt);      break;
3854      case CPUINFO_STR_REGISTER + Z80_PC:         sprintf(info->s, "PC:%04X", z80->pc.w.l);   break;
3855      case CPUINFO_STR_REGISTER + Z80_SP:         sprintf(info->s, "SP:%04X", z80->sp.w.l);   break;
3856      case CPUINFO_STR_REGISTER + Z80_A:         sprintf(info->s, "~A:%02X", z80->af.b.h);   break;
3857      case CPUINFO_STR_REGISTER + Z80_B:         sprintf(info->s, "~B:%02X", z80->bc.b.h);   break;
3858      case CPUINFO_STR_REGISTER + Z80_C:         sprintf(info->s, "~C:%02X", z80->bc.b.l);   break;
3859      case CPUINFO_STR_REGISTER + Z80_D:         sprintf(info->s, "~D:%02X", z80->de.b.h);   break;
3860      case CPUINFO_STR_REGISTER + Z80_E:         sprintf(info->s, "~E:%02X", z80->de.b.l);   break;
3861      case CPUINFO_STR_REGISTER + Z80_H:         sprintf(info->s, "~H:%02X", z80->hl.b.h);   break;
3862      case CPUINFO_STR_REGISTER + Z80_L:         sprintf(info->s, "~L:%02X", z80->hl.b.l);   break;
3863      case CPUINFO_STR_REGISTER + Z80_AF:         sprintf(info->s, "AF:%04X", z80->af.w.l);   break;
3864      case CPUINFO_STR_REGISTER + Z80_BC:         sprintf(info->s, "BC:%04X", z80->bc.w.l);   break;
3865      case CPUINFO_STR_REGISTER + Z80_DE:         sprintf(info->s, "DE:%04X", z80->de.w.l);   break;
3866      case CPUINFO_STR_REGISTER + Z80_HL:         sprintf(info->s, "HL:%04X", z80->hl.w.l);   break;
3867      case CPUINFO_STR_REGISTER + Z80_IX:         sprintf(info->s, "IX:%04X", z80->ix.w.l);   break;
3868      case CPUINFO_STR_REGISTER + Z80_IY:         sprintf(info->s, "IY:%04X", z80->iy.w.l);   break;
3869      case CPUINFO_STR_REGISTER + Z80_MEMPTR:      sprintf(info->s, "MEMPTR:%04X", z80->memptr.w.l);  break;
3870      case CPUINFO_STR_REGISTER + Z80_R:         sprintf(info->s, "R:%02X", (z80->r & 0x7f) | (z80->r2 & 0x80)); break;
3871      case CPUINFO_STR_REGISTER + Z80_I:         sprintf(info->s, "I:%02X", z80->i);         break;
3872      case CPUINFO_STR_REGISTER + Z80_AF2:      sprintf(info->s, "AF2:%04X", z80->af2.w.l);   break;
3873      case CPUINFO_STR_REGISTER + Z80_BC2:      sprintf(info->s, "BC2:%04X", z80->bc2.w.l);   break;
3874      case CPUINFO_STR_REGISTER + Z80_DE2:      sprintf(info->s, "DE2:%04X", z80->de2.w.l);   break;
3875      case CPUINFO_STR_REGISTER + Z80_HL2:      sprintf(info->s, "HL2:%04X", z80->hl2.w.l);   break;
3876      case CPUINFO_STR_REGISTER + Z80_IM:         sprintf(info->s, "IM:%X", z80->im);         break;
3877      case CPUINFO_STR_REGISTER + Z80_IFF1:      sprintf(info->s, "IFF1:%X", z80->iff1);      break;
3878      case CPUINFO_STR_REGISTER + Z80_IFF2:      sprintf(info->s, "IFF2:%X", z80->iff2);      break;
3879      case CPUINFO_STR_REGISTER + Z80_HALT:      sprintf(info->s, "HALT:%X", z80->halt);      break;
38153880   }
38163881}
src/emu/cpu/z80/z80.h
r3535r3536
1212   Z80_AF, Z80_BC, Z80_DE, Z80_HL,
1313   Z80_IX, Z80_IY,   Z80_AF2, Z80_BC2, Z80_DE2, Z80_HL2,
1414   Z80_R, Z80_I, Z80_IM, Z80_IFF1, Z80_IFF2, Z80_HALT,
15   Z80_DC0, Z80_DC1, Z80_DC2, Z80_DC3
15   Z80_DC0, Z80_DC1, Z80_DC2, Z80_DC3, Z80_MEMPTR
1616};
1717
1818enum
r3535r3536
3131   CPUINFO_PTR_Z80_CYCLE_TABLE_LAST = CPUINFO_PTR_Z80_CYCLE_TABLE + Z80_TABLE_ex
3232};
3333
34extern void z80_get_info(UINT32 state, cpuinfo *info);
34extern CPU_GET_INFO( z80 );
3535
36extern unsigned z80_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
36extern CPU_DISASSEMBLE( z80 );
3737
3838#endif /* __Z80_H__ */
src/emu/cpu/z80/z80dasm.c
r3535r3536
424424/****************************************************************************
425425 * Disassemble opcode at PC and return number of bytes it takes
426426 ****************************************************************************/
427unsigned z80_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
427CPU_DISASSEMBLE( z80 )
428428{
429429    const z80dasm *d;
430430   const char *src, *ixy;
src/emu/cpu/asap/asap.c
r3535r3536
8585   UINT32      nextpc;
8686   UINT8      irq_state;
8787   int         interrupt_cycles;
88   int       (*irq_callback)(int irqline);
88   cpu_irq_callback irq_callback;
89   const device_config *device;
8990} asap_regs;
9091
9192
r3535r3536
378379   if (asap.irq_state && asap.iflag)
379380   {
380381      generate_exception(EXCEPTION_INTERRUPT);
381      if (asap.irq_callback)
382         (*asap.irq_callback)(ASAP_IRQ0);
382      if (asap.irq_callback != NULL)
383         (*asap.irq_callback)(asap.device, ASAP_IRQ0);
383384   }
384385}
385386
r3535r3536
396397    CONTEXT SWITCHING
397398***************************************************************************/
398399
399static void asap_get_context(void *dst)
400static CPU_GET_CONTEXT( asap )
400401{
401402   /* copy the context */
402403   if (dst)
r3535r3536
408409}
409410
410411
411static void asap_set_context(void *src)
412static CPU_SET_CONTEXT( asap )
412413{
413414   /* copy the context */
414415   if (src)
r3535r3536
470471   }
471472}
472473
473static void asap_init(int index, int clock, const void *config, int (*irqcallback)(int))
474static CPU_INIT( asap )
474475{
475476   init_tables();
476477   asap.irq_callback = irqcallback;
478   asap.device = device;
477479}
478480
479static void asap_reset(void)
481static CPU_RESET( asap )
480482{
481483   /* initialize the state */
482484   src2val[REGBASE + 0] = 0;
r3535r3536
493495}
494496
495497
496static void asap_exit(void)
498static CPU_EXIT( asap )
497499{
498500   opcode = NULL;
499501   src2val = NULL;
r3535r3536
532534   (*opcode[asap.op.d >> 21])();
533535}
534536
535static int asap_execute(int cycles)
537static CPU_EXECUTE( asap )
536538{
537539   /* count cycles and interrupt cycles */
538540   asap_icount = cycles;
r3535r3536
602604    DISASSEMBLY HOOK
603605***************************************************************************/
604606
605extern offs_t asap_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
607extern CPU_DISASSEMBLE( asap );
606608
607609
608610
r3535r3536
17131715 * Generic set_info
17141716 **************************************************************************/
17151717
1716static void asap_set_info(UINT32 state, cpuinfo *info)
1718static CPU_SET_INFO( asap )
17171719{
17181720   switch (state)
17191721   {
r3535r3536
17661768 * Generic get_info
17671769 **************************************************************************/
17681770
1769void asap_get_info(UINT32 state, cpuinfo *info)
1771CPU_GET_INFO( asap )
17701772{
17711773   switch (state)
17721774   {
r3535r3536
18341836      case CPUINFO_INT_REGISTER + ASAP_R31:         info->i = src2val[REGBASE + 31];      break;
18351837
18361838      /* --- the following bits of info are returned as pointers to data or functions --- */
1837      case CPUINFO_PTR_SET_INFO:                  info->setinfo = asap_set_info;         break;
1838      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = asap_get_context;   break;
1839      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = asap_set_context;   break;
1840      case CPUINFO_PTR_INIT:                     info->init = asap_init;               break;
1841      case CPUINFO_PTR_RESET:                     info->reset = asap_reset;            break;
1842      case CPUINFO_PTR_EXIT:                     info->exit = asap_exit;               break;
1843      case CPUINFO_PTR_EXECUTE:                  info->execute = asap_execute;         break;
1839      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(asap);         break;
1840      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(asap);   break;
1841      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(asap);   break;
1842      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(asap);               break;
1843      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(asap);            break;
1844      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(asap);               break;
1845      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(asap);         break;
18441846      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1845      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = asap_dasm;         break;
1847      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(asap);         break;
18461848      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &asap_icount;         break;
18471849
18481850      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/asap/asap.h
r3535r3536
3939    PUBLIC FUNCTIONS
4040***************************************************************************/
4141
42extern void asap_get_info(UINT32 state, cpuinfo *info);
42extern CPU_GET_INFO( asap );
4343
4444#endif /* __ASAP_H__ */
src/emu/cpu/asap/asapdasm.c
r3535r3536
4949   return temp;
5050}
5151
52offs_t asap_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
52CPU_DISASSEMBLE( asap )
5353{
5454   UINT32 op = oprom[0] | (oprom[1] << 8) | (oprom[2] << 16) | (oprom[3] << 24);
5555   int opcode = op >> 27;
src/emu/cpu/tms9900/99xxcore.h
r3535r3536
9494#if (TMS99XX_MODEL == TI990_10_ID)
9595
9696   #define TMS99XX_PREFIX ti990_10
97   #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( ti990_10 )
9798   #define TMS99XX_CPU_NAME "TI990/10"
9899
99100#elif (TMS99XX_MODEL == TMS9900_ID)
100101
101102   #define TMS99XX_PREFIX tms9900
103   #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms9900 )
102104   #define TMS99XX_CPU_NAME "TMS9900"
103105
104106#elif (TMS99XX_MODEL == TMS9940_ID)
105107
106108   #define TMS99XX_PREFIX tms9940
109   #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms9940 )
107110   #define TMS99XX_CPU_NAME "TMS9940"
108111
109112   #error "tms9940 is not yet supported"
r3535r3536
111114#elif (TMS99XX_MODEL == TMS9980_ID)
112115
113116   #define TMS99XX_PREFIX tms9980a
117   #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms9980a )
114118   #define TMS99XX_CPU_NAME "TMS9980A/TMS9981"
115119
116120#elif (TMS99XX_MODEL == TMS9985_ID)
117121
118122   #define TMS99XX_PREFIX tms9985
123   #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms9985 )
119124   #define TMS99XX_CPU_NAME "TMS9985"
120125
121126   #error "tms9985 is not yet supported"
r3535r3536
123128#elif (TMS99XX_MODEL == TMS9989_ID)
124129
125130   #define TMS99XX_PREFIX tms9989
131   #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms9989 )
126132   #define TMS99XX_CPU_NAME "TMS9989"
127133
128134   #error "tms9989 is not yet supported"
r3535r3536
130136#elif (TMS99XX_MODEL == TMS9995_ID)
131137
132138   #define TMS99XX_PREFIX tms9995
139   #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms9995 )
133140   #define TMS99XX_CPU_NAME "TMS9995"
134141
135142#elif (TMS99XX_MODEL == TMS99000_ID)
136143
137144   #define TMS99XX_PREFIX tms99000
145   #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms99000 )
138146   #define TMS99XX_CPU_NAME "TMS99000"
139147
140148   #error "tms99000 is not yet supported"
r3535r3536
142150#elif (TMS99XX_MODEL == TMS99105A_ID)
143151
144152   #define TMS99XX_PREFIX tms99105a
153   #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms99105a )
145154   #define TMS99XX_CPU_NAME "TMS99105A"
146155
147156   #error "tms99105a is not yet supported"
r3535r3536
149158#elif (TMS99XX_MODEL == TMS99110A_ID)
150159
151160   #define TMS99XX_PREFIX tms99110a
161   #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms99110a )
152162   #define TMS99XX_CPU_NAME "TMS99110A"
153163
154164   #error "tms99110a is not yet supported"
r3535r3536
165175#define RESET_PARAM(prefix)         concat2(prefix,reset_param)
166176
167177#define TMS99XX_ICOUNT            ICOUNT(TMS99XX_PREFIX)
168#define TMS99XX_GET_INFO         GET_INFO(TMS99XX_PREFIX)
169178#define TMS99XX_RESET_PARAM         RESET_PARAM(TMS99XX_PREFIX)
170179
171180
r3535r3536
431440   /* interrupt callback */
432441   /* note that this callback is used by tms9900_set_irq_line() and tms9980a_set_irq_line() to
433442    retreive the value on IC0-IC3 (non-standard behaviour) */
434   int (*irq_callback)(int irq_line);
443   cpu_irq_callback irq_callback;
444   const device_config *device;
435445
436446   UINT8 IDLE;       /* nonzero if processor is IDLE - i.e waiting for interrupt while writing
437447                        special data on CRU bus */
r3535r3536
12681278}
12691279
12701280
1271static void tms99xx_init(int index, int clock, const void *config, int (*irqcallback)(int))
1281static CPU_INIT( tms99xx )
12721282{
12731283   const TMS99XX_RESET_PARAM *param = (const TMS99XX_RESET_PARAM *) config;
12741284
r3535r3536
12761286
12771287   I.irq_level = 16;
12781288   I.irq_callback = irqcallback;
1289   I.device = device;
12791290
12801291#if (TMS99XX_MODEL == TMS9995_ID)
12811292   I.timer = timer_alloc(decrementer_callback, NULL);
r3535r3536
13111322/*
13121323    TMS9900 hard reset
13131324*/
1314static void tms99xx_reset(void)
1325static CPU_RESET( tms99xx )
13151326{
13161327   I.STATUS = 0; /* TMS9980 and TMS9995 Data Books say so */
13171328   getstat();
r3535r3536
13641375   CYCLES(6, 26, 14);
13651376}
13661377
1367static void tms99xx_exit(void)
1378static CPU_EXIT( tms99xx )
13681379{
13691380   /* nothing to do ? */
13701381}
r3535r3536
13781389}
13791390
13801391
1381static int tms99xx_execute(int cycles)
1392static CPU_EXECUTE( tms99xx )
13821393         {
13831394   TMS99XX_ICOUNT = cycles;
13841395
r3535r3536
14531464
14541465               /* unlike tms9900, we can call the callback */
14551466               if (level == 1)
1456                  (* I.irq_callback)(0);
1467                  (* I.irq_callback)(I.device, 0);
14571468               else if (level == 4)
1458                  (* I.irq_callback)(1);
1469                  (* I.irq_callback)(I.device, 1);
14591470            }
14601471#endif
14611472
r3535r3536
15491560   return cycles - TMS99XX_ICOUNT;
15501561}
15511562
1552static void tms99xx_get_context(void *dst)
1563static CPU_GET_CONTEXT( tms99xx )
15531564{
15541565   setstat();
15551566
r3535r3536
15571568      *(tms99xx_Regs*)dst = I;
15581569}
15591570
1560static void tms99xx_set_context(void *src)
1571static CPU_SET_CONTEXT( tms99xx )
15611572{
15621573   if( src )
15631574   {
r3535r3536
16031614         I.irq_level = 16;
16041615         /* trick : 16 will always be bigger than the IM (0-15), so there will never be interrupts */
16051616      else
1606         I.irq_level = (* I.irq_callback)(0);
1617         I.irq_level = (* I.irq_callback)(I.device, 0);
16071618
16081619      field_interrupt();  /* interrupt state is likely to have changed */
16091620   }
r3535r3536
16991710         I.irq_level = 16;
17001711         /* trick : 16 will always be bigger than the IM (0-15), so there will never be interrupts */
17011712      else
1702         I.irq_level = (* I.irq_callback)(0);
1713         I.irq_level = (* I.irq_callback)(I.device, 0);
17031714
17041715      field_interrupt();  /* interrupt state is likely to have changed */
17051716   }
r3535r3536
17261737      if (irqline == INPUT_LINE_NMI)
17271738         level = 2;   /* translate MAME's convention to CPU's representation */
17281739      else
1729         level = (* I.irq_callback)(0);
1740         level = (* I.irq_callback)(I.device, 0);
17301741
17311742      switch (level)
17321743      {
r3535r3536
17351746         I.load_state = 0;
17361747         I.irq_state = 0;
17371748         I.irq_level = 16;
1738         tms99xx_reset();
1749         CPU_RESET_NAME(tms99xx)(I.device);
17391750         break;
17401751      case 2:
17411752         I.load_state = 1;
r3535r3536
19571968
19581969#endif
19591970
1960static unsigned tms99xx_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
1971static CPU_DISASSEMBLE( tms99xx )
19611972{
19621973   return Dasm9900(buffer, pc, TMS99XX_MODEL, oprom, opram);
19631974}
r3535r3536
45874598 * Generic set_info
45884599 **************************************************************************/
45894600
4590static void tms99xx_set_info(UINT32 state, cpuinfo *info)
4601static CPU_SET_INFO( tms99xx )
45914602{
45924603   switch (state)
45934604   {
r3535r3536
47924803      case CPUINFO_INT_REGISTER + TMS9900_R15:      info->i = READREG_DEBUG(R15);         break;
47934804
47944805      /* --- the following bits of info are returned as pointers to data or functions --- */
4795      case CPUINFO_PTR_SET_INFO:                  info->setinfo = tms99xx_set_info;      break;
4796      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = tms99xx_get_context;   break;
4797      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = tms99xx_set_context;   break;
4798      case CPUINFO_PTR_INIT:                     info->init = tms99xx_init;            break;
4799      case CPUINFO_PTR_RESET:                     info->reset = tms99xx_reset;         break;
4800      case CPUINFO_PTR_EXIT:                     info->exit = tms99xx_exit;            break;
4801      case CPUINFO_PTR_EXECUTE:                  info->execute = tms99xx_execute;      break;
4806      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(tms99xx);      break;
4807      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(tms99xx);   break;
4808      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(tms99xx);   break;
4809      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(tms99xx);            break;
4810      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(tms99xx);         break;
4811      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(tms99xx);            break;
4812      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(tms99xx);      break;
48024813      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
4803      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = tms99xx_dasm;      break;
4814      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(tms99xx);      break;
48044815      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &TMS99XX_ICOUNT;         break;
48054816
48064817      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/tms9900/tms9900.h
r3535r3536
4848
4949#if (HAS_TI990_10)
5050
51extern void ti990_10_get_info(UINT32 state, cpuinfo *info);
51extern CPU_GET_INFO( ti990_10 );
5252
5353/*
5454    structure with the parameters ti990_10_reset wants.
r3535r3536
7777
7878#if (HAS_TMS9900)
7979
80extern void tms9900_get_info(UINT32 state, cpuinfo *info);
80extern CPU_GET_INFO( tms9900 );
8181
8282/*
8383    structure with optional parameters for tms9900_reset.
r3535r3536
9191
9292#if (HAS_TMS9940)
9393
94extern void tms9940_get_info(UINT32 state, cpuinfo *info);
94extern CPU_GET_INFO( tms9940 );
9595
9696/*
9797    structure with optional parameters for tms9940_reset.
r3535r3536
105105
106106#if (HAS_TMS9980)
107107
108extern void tms9980a_get_info(UINT32 state, cpuinfo *info);
108extern CPU_GET_INFO( tms9980a );
109109
110110/*
111111    structure with optional parameters for tms9980a_reset.
r3535r3536
119119
120120#if (HAS_TMS9985)
121121
122extern void tms9985_get_info(UINT32 state, cpuinfo *info);
122extern CPU_GET_INFO( tms9985 );
123123
124124/*
125125    structure with optional parameters for tms9985_reset.
r3535r3536
133133
134134#if (HAS_TMS9989)
135135
136extern void tms9989_get_info(UINT32 state, cpuinfo *info);
136extern CPU_GET_INFO( tms9989 );
137137
138138/*
139139    structure with optional parameters for tms9989_reset.
r3535r3536
147147
148148#if (HAS_TMS9995)
149149
150extern void tms9995_get_info(UINT32 state, cpuinfo *info);
150extern CPU_GET_INFO( tms9995 );
151151
152152/*
153153  structure with the parameters tms9995_reset wants.
r3535r3536
177177
178178#if (HAS_TMS99000)
179179
180extern void tms99000_get_info(UINT32 state, cpuinfo *info);
180extern CPU_GET_INFO( tms99000 );
181181
182182/*
183183    structure with optional parameters for tms99000_reset.
r3535r3536
191191
192192#if (HAS_TMS99105A)
193193
194extern void tms99105a_get_info(UINT32 state, cpuinfo *info);
194extern CPU_GET_INFO( tms99105a );
195195
196196/*
197197    structure with optional parameters for tms99105a_reset.
r3535r3536
205205
206206#if (HAS_TMS99110A)
207207
208extern void tms99110a_get_info(UINT32 state, cpuinfo *info);
208extern CPU_GET_INFO( tms99110a );
209209
210210/*
211211    structure with optional parameters for tms99110a_reset.
src/emu/cpu/i960/i960.c
r3535r3536
3232
3333   int immediate_irq, immediate_vector, immediate_pri;
3434
35   int (*irq_cb)(int);
35   cpu_irq_callback irq_cb;
36   const device_config *device;
3637} i960_state;
3738
3839static int i960_icount;
r3535r3536
607608   }
608609}
609610
610static int i960_execute(int cycles)
611static CPU_EXECUTE( i960 )
611612{
612613   UINT32 opcode;
613614   UINT32 t1, t2;
r3535r3536
19631964   return cycles - i960_icount;
19641965}
19651966
1966static void i960_get_context(void *context)
1967static CPU_GET_CONTEXT( i960 )
19671968{
1968   *(i960_state *)context = i960;
1969   *(i960_state *)dst = i960;
19691970}
19701971
1971static void i960_set_context(void *context)
1972static CPU_SET_CONTEXT( i960 )
19721973{
1973   i960 = *(i960_state *)context;
1974   i960 = *(i960_state *)src;
19741975}
19751976
19761977static void set_irq_line(int irqline, int state)
r3535r3536
20372038      }
20382039
20392040      // and ack it to the core now that it's queued
2040      (*i960.irq_cb)(irqline);
2041      (*i960.irq_cb)(i960.device, irqline);
20412042   }
20422043}
20432044
2044static void i960_set_info(UINT32 state, cpuinfo *info)
2045static CPU_SET_INFO( i960 )
20452046{
20462047   if(state >= CPUINFO_INT_REGISTER+I960_R0 && state <= CPUINFO_INT_REGISTER + I960_G15) {
20472048      i960.r[state - (CPUINFO_INT_REGISTER + I960_R0)] = info->i;
r3535r3536
20612062   }
20622063}
20632064
2064static void i960_init(int index, int clock, const void *config, int (*irqcallback)(int))
2065static CPU_INIT( i960 )
20652066{
20662067   memset(&i960, 0, sizeof(i960));
20672068   i960.irq_cb = irqcallback;
2069   i960.device = device;
20682070
20692071   state_save_register_item("i960", index, i960.PIP);
20702072   state_save_register_item("i960", index, i960.SAT);
r3535r3536
20782080   state_save_register_item_array("i960", index, i960.rcache_frame_addr);
20792081}
20802082
2081static offs_t i960_disasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
2083static CPU_DISASSEMBLE( i960 )
20822084{
20832085   disassemble_t dis;
20842086
r3535r3536
20912093   return dis.IPinc | dis.disflags | DASMFLAG_SUPPORTED;
20922094}
20932095
2094static void i960_reset(void)
2096static CPU_RESET( i960 )
20952097{
20962098   i960.SAT        = program_read_dword_32le(0);
20972099   i960.PRCB       = program_read_dword_32le(4);
r3535r3536
21102112   i960.rcache_pos = 0;
21112113}
21122114
2113void i960_get_info(UINT32 state, cpuinfo *info)
2115CPU_GET_INFO( i960 )
21142116{
21152117   if(state >= CPUINFO_INT_REGISTER+I960_R0 && state <= CPUINFO_INT_REGISTER + I960_G15) {
21162118      info->i = i960.r[state - (CPUINFO_INT_REGISTER + I960_R0)];
r3535r3536
21192121
21202122   switch(state) {
21212123      // Interface functions and variables
2122   case CPUINFO_PTR_SET_INFO:               info->setinfo     = i960_set_info;            break;
2123   case CPUINFO_PTR_GET_CONTEXT:            info->getcontext  = i960_get_context;         break;
2124   case CPUINFO_PTR_SET_CONTEXT:            info->setcontext  = i960_set_context;         break;
2125   case CPUINFO_PTR_INIT:                  info->init        = i960_init;               break;
2126   case CPUINFO_PTR_RESET:                  info->reset       = i960_reset;               break;
2124   case CPUINFO_PTR_SET_INFO:               info->setinfo     = CPU_SET_INFO_NAME(i960);   break;
2125   case CPUINFO_PTR_GET_CONTEXT:            info->getcontext  = CPU_GET_CONTEXT_NAME(i960);   break;
2126   case CPUINFO_PTR_SET_CONTEXT:            info->setcontext  = CPU_SET_CONTEXT_NAME(i960);   break;
2127   case CPUINFO_PTR_INIT:                  info->init        = CPU_INIT_NAME(i960);      break;
2128   case CPUINFO_PTR_RESET:                  info->reset       = CPU_RESET_NAME(i960);      break;
21272129   case CPUINFO_PTR_EXIT:                  info->exit        = 0;                     break;
2128   case CPUINFO_PTR_EXECUTE:               info->execute     = i960_execute;            break;
2130   case CPUINFO_PTR_EXECUTE:               info->execute     = CPU_EXECUTE_NAME(i960);      break;
21292131   case CPUINFO_PTR_BURN:                  info->burn        = 0;                     break;
2130   case CPUINFO_PTR_DISASSEMBLE:            info->disassemble = i960_disasm;            break;
2132   case CPUINFO_PTR_DISASSEMBLE:            info->disassemble = CPU_DISASSEMBLE_NAME(i960);   break;
21312133   case CPUINFO_PTR_INSTRUCTION_COUNTER:      info->icount      = &i960_icount;            break;
21322134   case CPUINFO_INT_CONTEXT_SIZE:            info->i           = sizeof(i960_state);         break;
21332135   case CPUINFO_INT_MIN_INSTRUCTION_BYTES:      info->i           = 4;                     break;
src/emu/cpu/i960/i960.h
r3535r3536
6161  I960_IRQ3 = 3
6262};
6363
64void i960_get_info(UINT32 state, cpuinfo *info);
64CPU_GET_INFO( i960 );
6565void i960_noburst(void);
6666void i960_stall(void);
6767
src/emu/cpu/v810/v810.c
r3535r3536
2828   UINT32 reg[65];
2929   UINT8 irq_line;
3030   UINT8 nmi_line;
31   int (*irq_cb)(int irqline);
31   cpu_irq_callback irq_cb;
32   const device_config *device;
3233   UINT32 PPC;
3334   UINT32 op;
3435} v810info;
r3535r3536
946947   /* 0x3f */ opOUTW     // out.w reg2, disp16[reg1]     6b
947948};
948949
949static void v810_init(int index, int clock, const void *config, int (*irqcallback)(int))
950static CPU_INIT( v810 )
950951{
951952   v810.irq_line = CLEAR_LINE;
952953   v810.nmi_line = CLEAR_LINE;
953954   v810.irq_cb = irqcallback;
955   v810.device = device;
954956
955957   state_save_register_item_array("v810", index, v810.reg);
956958   state_save_register_item("v810", index, v810.irq_line);
r3535r3536
959961
960962}
961963
962static void v810_reset(void)
964static CPU_RESET( v810 )
963965{
964966   int i;
965967   for(i=0;i<64;i++)   v810.reg[i]=0;
r3535r3536
968970   ECR   = 0x0000fff0;
969971}
970972
971static int v810_execute(int cycles)
973static CPU_EXECUTE( v810 )
972974{
973975   v810_ICount = cycles;
974976   while(v810_ICount>=0)
r3535r3536
982984   return cycles-v810_ICount;
983985}
984986
985static void v810_get_context(void *dst)
987static CPU_GET_CONTEXT( v810 )
986988{
987989   if(dst)
988990      *(v810info *)dst = v810;
989991}
990992
991static void v810_set_context(void *src)
993static CPU_SET_CONTEXT( v810 )
992994{
993995   if(src)
994996      v810 = *(v810info *)src;
r3535r3536
10021004 * Generic set_info
10031005 **************************************************************************/
10041006
1005static void v810_set_info(UINT32 state, cpuinfo *info)
1007static CPU_SET_INFO( v810 )
10061008{
10071009   switch (state)
10081010   {
r3535r3536
10831085 * Generic get_info
10841086 **************************************************************************/
10851087
1086void v810_get_info(UINT32 state, cpuinfo *info)
1088CPU_GET_INFO( v810 )
10871089{
10881090   switch (state)
10891091   {
r3535r3536
11751177      case CPUINFO_INT_REGISTER + V810_ADTRE:         info->i = ADTRE;                  break;
11761178
11771179      /* --- the following bits of info are returned as pointers to data or functions --- */
1178      case CPUINFO_PTR_SET_INFO:                  info->setinfo = v810_set_info;         break;
1179      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = v810_get_context;   break;
1180      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = v810_set_context;   break;
1181      case CPUINFO_PTR_INIT:                     info->init = v810_init;               break;
1182      case CPUINFO_PTR_RESET:                     info->reset = v810_reset;            break;
1180      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(v810);         break;
1181      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(v810);   break;
1182      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(v810);   break;
1183      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(v810);               break;
1184      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(v810);            break;
11831185      case CPUINFO_PTR_EXIT:                     info->exit = NULL;                  break;
1184      case CPUINFO_PTR_EXECUTE:                  info->execute = v810_execute;         break;
1186      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(v810);         break;
11851187      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1186      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = v810_dasm;         break;
1188      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(v810);         break;
11871189      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &v810_ICount;         break;
11881190
11891191      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/v810/v810.h
r3535r3536
4848#define ADD(dst, src)      { UINT64 res=(UINT64)(dst)+(UINT64)(src); SetCF(res); SetOF_Add(res,src,dst); SetSZPF(res); dst=(UINT32)res; }
4949#define SUB(dst, src)      { UINT64 res=(UINT64)(dst)-(INT64)(src); SetCF(res); SetOF_Sub(res,src,dst); SetSZPF(res); dst=(UINT32)res; }
5050
51offs_t v810_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
51CPU_DISASSEMBLE( v810 );
5252
5353enum
5454{
src/emu/cpu/v810/v810dasm.c
r3535r3536
2929#define GET2s(opcode) dRegs[((opcode)>>5)&0x1f]
3030#define GETRs(opcode) dRegs[32+((opcode)&0x1f)]
3131
32offs_t v810_dasm(char *buffer, offs_t oldpc, const UINT8 *oprom, const UINT8 *opram)
32CPU_DISASSEMBLE( v810 )
3333{
3434   UINT32 flags = 0;
3535   UINT32 opc,opc2;
36   UINT32 pc=oldpc;
3736   unsigned size;
3837   opc = R_OP(pc);
3938   opc2 = R_OP(pc+2);
src/emu/cpu/tms32025/32025dsm.c
r3535r3536
392392   OpInizialized = 1;
393393}
394394
395offs_t tms32025_dasm(char *str, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
395CPU_DISASSEMBLE( tms32025 )
396396{
397397   UINT32 flags = 0;
398398   int a, b, c, d, k, m, n, p, r, s, t, w, x;   /* these can all be filled in by parsing an instruction */
r3535r3536
401401   int cnt = 1;
402402   int code;
403403   int bit;
404   char *strtmp;
404   char *buffertmp;
405405   const char *cp;            /* character pointer in OpFormats */
406406
407407   if (!OpInizialized) InitDasm32025();
r3535r3536
422422   }
423423   if (op == -1)
424424   {
425      sprintf(str,"???? dw %04Xh",code);
425      sprintf(buffer,"???? dw %04Xh",code);
426426      return cnt | DASMFLAG_SUPPORTED;
427427   }
428   strtmp = str;
428   buffertmp = buffer;
429429   if (Op[op].extcode)
430430   {
431431      bit = 31;
r3535r3536
499499            default:
500500               fatalerror("illegal escape character in format '%s'",Op[op].fmt);
501501         }
502         q = num; while (*q) *str++ = *q++;
503         *str = '\0';
502         q = num; while (*q) *buffer++ = *q++;
503         *buffer = '\0';
504504      }
505505      else
506506      {
507         *str++ = *cp++;
508         *str = '\0';
507         *buffer++ = *cp++;
508         *buffer = '\0';
509509      }
510510   }
511511   return cnt | flags | DASMFLAG_SUPPORTED;
src/emu/cpu/tms32025/tms32025.c
r3535r3536
208208   int      init_load_addr;         /* 0=No, 1=Yes, 2=Once for repeat mode */
209209   int      tms32025_irq_cycles;
210210   int      tms32025_dec_cycles;
211   int      (*irq_callback)(int irqline);
211   cpu_irq_callback irq_callback;
212   const device_config *device;
212213   UINT16 *datamap_save[16];
213214   UINT16 *pgmmap_save[12];
214215} tms32025_Regs;
r3535r3536
17281729/****************************************************************************
17291730 *  Inits CPU emulation
17301731 ****************************************************************************/
1731static void tms32025_init (int index, int clock, const void *config, int (*irqcallback)(int))
1732static CPU_INIT( tms32025 )
17321733{
17331734   R.intRAM = auto_malloc(0x800*2);
17341735   R.irq_callback = irqcallback;
1736   R.device = device;
17351737
17361738   state_save_register_item("tms32025", index, R.PC);
17371739   state_save_register_item("tms32025", index, R.STR0);
r3535r3536
17701772/****************************************************************************
17711773 *  Reset registers to their initial values
17721774 ****************************************************************************/
1773static void tms32025_reset (void)
1775static CPU_RESET( tms32025 )
17741776{
17751777   SET_PC(0);         /* Starting address on a reset */
17761778   R.STR0 |= 0x0600;   /* INTM and unused bit set to 1 */
r3535r3536
18041806}
18051807
18061808#if (HAS_TMS32026)
1807static void tms32026_reset (void)
1809static CPU_RESET( tms32026 )
18081810{
1809   tms32025_reset();
1811   CPU_RESET_CALL(tms32025);
18101812
18111813   /* Reset the Data/Program address banks */
18121814   memset(tms32025_pgmmap, 0, sizeof(tms32025_pgmmap));
r3535r3536
18321834/****************************************************************************
18331835 *  Shut down CPU emulation
18341836 ****************************************************************************/
1835static void tms32025_exit (void)
1837static CPU_EXIT( tms32025 )
18361838{
18371839}
18381840
r3535r3536
18581860      if ((R.IFR & 0x01) && (IMR & 0x01)) {      /* IRQ line 0 */
18591861         //logerror("TMS32025:  Active INT0\n");
18601862         SET_PC(0x0002);
1861         (*R.irq_callback)(0);
1863         (*R.irq_callback)(R.device, 0);
18621864         R.idle = 0;
18631865         R.IFR &= (~0x01);
18641866         SET0(INTM_FLAG);
r3535r3536
18671869      if ((R.IFR & 0x02) && (IMR & 0x02)) {      /* IRQ line 1 */
18681870         //logerror("TMS32025:  Active INT1\n");
18691871         SET_PC(0x0004);
1870         (*R.irq_callback)(1);
1872         (*R.irq_callback)(R.device, 1);
18711873         R.idle = 0;
18721874         R.IFR &= (~0x02);
18731875         SET0(INTM_FLAG);
r3535r3536
18761878      if ((R.IFR & 0x04) && (IMR & 0x04)) {      /* IRQ line 2 */
18771879         //logerror("TMS32025:  Active INT2\n");
18781880         SET_PC(0x0006);
1879         (*R.irq_callback)(2);
1881         (*R.irq_callback)(R.device, 2);
18801882         R.idle = 0;
18811883         R.IFR &= (~0x04);
18821884         SET0(INTM_FLAG);
r3535r3536
19521954/****************************************************************************
19531955 *  Execute ICount cycles. Exit when 0 or less
19541956 ****************************************************************************/
1955static int tms32025_execute(int cycles)
1957static CPU_EXECUTE( tms32025 )
19561958{
19571959   tms32025_icount = cycles;
19581960
r3535r3536
20912093/****************************************************************************
20922094 *  Get all registers in given buffer
20932095 ****************************************************************************/
2094static void tms32025_get_context (void *dst)
2096static CPU_GET_CONTEXT( tms32025 )
20952097{
20962098   if (dst)
20972099   {
r3535r3536
21052107/****************************************************************************
21062108 *  Set all registers to given values
21072109 ****************************************************************************/
2108static void tms32025_set_context (void *src)
2110static CPU_SET_CONTEXT( tms32025 )
21092111{
21102112   if (src)
21112113   {
r3535r3536
21342136/****************************************************************************
21352137 *  Opcode fetcher
21362138 ****************************************************************************/
2137static int tms32025_readop(UINT32 offset, int size, UINT64 *value)
2139static CPU_READOP( tms32025 )
21382140{
21392141   void *ptr;
21402142
r3535r3536
21572159/****************************************************************************
21582160 *  Memory reader
21592161 ****************************************************************************/
2160static int tms32025_read(int space, UINT32 offset, int size, UINT64 *value)
2162static CPU_READ( tms32025 )
21612163{
21622164   void *ptr = NULL;
21632165   UINT64 temp = 0;
r3535r3536
21892191         *value = ((UINT16 *)ptr)[(offset & 0xff) / 2];
21902192         break;
21912193      case 4:
2192         tms32025_read(space, offset + 0, 2, &temp);
2194         CPU_READ_NAME(tms32025)(space, offset + 0, 2, &temp);
21932195         *value = temp << 16;
2194         tms32025_read(space, offset + 2, 2, &temp);
2196         CPU_READ_NAME(tms32025)(space, offset + 2, 2, &temp);
21952197         *value |= temp & 0xffff;
21962198         break;
21972199      case 8:
2198         tms32025_read(space, offset + 0, 4, &temp);
2200         CPU_READ_NAME(tms32025)(space, offset + 0, 4, &temp);
21992201         *value = temp << 32;
2200         tms32025_read(space, offset + 4, 4, &temp);
2202         CPU_READ_NAME(tms32025)(space, offset + 4, 4, &temp);
22012203         *value |= temp & 0xffffffff;
22022204         break;
22032205   }
r3535r3536
22082210/****************************************************************************
22092211 *  Memory writer
22102212 ****************************************************************************/
2211static int tms32025_write(int space, UINT32 offset, int size, UINT64 value)
2213static CPU_WRITE( tms32025 )
22122214{
22132215   void *ptr = NULL;
22142216
r3535r3536
22392241         ((UINT16 *)ptr)[(offset & 0xff) / 2] = value;
22402242         break;
22412243      case 4:
2242         tms32025_write(space, offset + 0, 2, value >> 16);
2243         tms32025_write(space, offset + 2, 2, value);
2244         CPU_WRITE_NAME(tms32025)(space, offset + 0, 2, value >> 16);
2245         CPU_WRITE_NAME(tms32025)(space, offset + 2, 2, value);
22442246         break;
22452247      case 8:
2246         tms32025_write(space, offset + 0, 4, value >> 32);
2247         tms32025_write(space, offset + 4, 4, value);
2248         CPU_WRITE_NAME(tms32025)(space, offset + 0, 4, value >> 32);
2249         CPU_WRITE_NAME(tms32025)(space, offset + 4, 4, value);
22482250         break;
22492251   }
22502252   return 1;
r3535r3536
22552257 * Generic set_info
22562258 **************************************************************************/
22572259
2258static void tms32025_set_info(UINT32 state, cpuinfo *info)
2260static CPU_SET_INFO( tms32025 )
22592261{
22602262   switch (state)
22612263   {
r3535r3536
23092311 * Generic get_info
23102312 **************************************************************************/
23112313
2312void tms32025_get_info(UINT32 state, cpuinfo *info)
2314CPU_GET_INFO( tms32025 )
23132315{
23142316   switch (state)
23152317   {
r3535r3536
23792381      case CPUINFO_INT_REGISTER + TMS32025_GREG:      info->i = M_RDRAM(5);               break;
23802382
23812383      /* --- the following bits of info are returned as pointers to data or functions --- */
2382      case CPUINFO_PTR_SET_INFO:                  info->setinfo = tms32025_set_info;      break;
2383      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = tms32025_get_context; break;
2384      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = tms32025_set_context; break;
2385      case CPUINFO_PTR_INIT:                     info->init = tms32025_init;            break;
2386      case CPUINFO_PTR_RESET:                     info->reset = tms32025_reset;         break;
2387      case CPUINFO_PTR_EXIT:                     info->exit = tms32025_exit;            break;
2388      case CPUINFO_PTR_EXECUTE:                  info->execute = tms32025_execute;      break;
2384      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(tms32025);      break;
2385      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(tms32025); break;
2386      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(tms32025); break;
2387      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(tms32025);            break;
2388      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(tms32025);         break;
2389      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(tms32025);            break;
2390      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(tms32025);      break;
23892391      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
2390      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = tms32025_dasm;      break;
2391      case CPUINFO_PTR_READ:                     info->read = tms32025_read;            break;
2392      case CPUINFO_PTR_WRITE:                     info->write = tms32025_write;         break;
2393      case CPUINFO_PTR_READOP:                  info->readop = tms32025_readop;         break;
2392      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(tms32025);      break;
2393      case CPUINFO_PTR_READ:                     info->read = CPU_READ_NAME(tms32025);            break;
2394      case CPUINFO_PTR_WRITE:                     info->write = CPU_WRITE_NAME(tms32025);         break;
2395      case CPUINFO_PTR_READOP:                  info->readop = CPU_READOP_NAME(tms32025);         break;
23942396      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &tms32025_icount;      break;
23952397
23962398      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
24632465 * CPU-specific set_info
24642466 **************************************************************************/
24652467
2466void tms32026_get_info(UINT32 _state, cpuinfo *info)
2468CPU_GET_INFO( tms32026 )
24672469{
2468   switch (_state)
2470   switch (state)
24692471   {
24702472      /* --- the following bits of info are returned as pointers to data or functions --- */
2471      case CPUINFO_PTR_RESET:                     info->reset = tms32026_reset;         break;
2473      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(tms32026);         break;
24722474
24732475      /* --- the following bits of info are returned as NULL-terminated strings --- */
24742476      case CPUINFO_STR_NAME:                     strcpy(info->s, "TMS32026");         break;
24752477
2476      default:                              tms32025_get_info(_state, info);      break;
2478      default:                              CPU_GET_INFO_CALL(tms32025);         break;
24772479   }
24782480}
24792481#endif
src/emu/cpu/tms32025/tms32025.h
r3535r3536
7070 *  Public Functions
7171 */
7272
73extern void tms32025_get_info(UINT32 state, cpuinfo *info);
74extern void tms32026_get_info(UINT32 state, cpuinfo *info);
73extern CPU_GET_INFO( tms32025 );
74extern CPU_GET_INFO( tms32026 );
7575
7676
77offs_t tms32025_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
77CPU_DISASSEMBLE( tms32025 );
7878
7979#endif   /* __TMS32025_H__ */
src/emu/cpu/pic16c5x/pic16c5x.c
r3535r3536
690690 *  Inits CPU emulation
691691 ****************************************************************************/
692692
693static void pic16C5x_init(int index, int clock, const void *config, int (*irqcallback)(int))
693static CPU_INIT( pic16C5x )
694694{
695695   state_save_register_item("pic16C5x", index, old_data);
696696   state_save_register_item("pic16C5x", index, R.W);
r3535r3536
760760 *  Shut down CPU emulation
761761 ****************************************************************************/
762762
763static void pic16C5x_exit (void)
763static CPU_EXIT( pic16C5x )
764764{
765765   /* nothing to do */
766766}
r3535r3536
831831 *  Execute IPeriod. Return 0 if emulation should be stopped
832832 ****************************************************************************/
833833
834static int pic16C5x_execute(int cycles)
834static CPU_EXECUTE( pic16C5x )
835835{
836836   int T0_in;
837837   pic16C5x_icount = cycles;
r3535r3536
904904 *  Get all registers in given buffer
905905 ****************************************************************************/
906906
907static void pic16C5x_get_context (void *dst)
907static CPU_GET_CONTEXT( pic16C5x )
908908{
909909   if( dst )
910910      *(pic16C5x_Regs*)dst = R;
r3535r3536
915915 *  Set all registers to given values
916916 ****************************************************************************/
917917
918static void pic16C5x_set_context (void *src)
918static CPU_SET_CONTEXT( pic16C5x )
919919{
920920   if (src)
921921      R = *(pic16C5x_Regs*)src;
r3535r3536
926926 *  Generic set_info
927927 **************************************************************************/
928928
929static void pic16C5x_set_info(UINT32 state, cpuinfo *info)
929static CPU_SET_INFO( pic16C5x )
930930{
931931   switch (state)
932932   {
r3535r3536
958958 *  Generic get_info
959959 **************************************************************************/
960960
961static void pic16C5x_get_info(UINT32 state, cpuinfo *info)
961static CPU_GET_INFO( pic16C5x )
962962{
963963   switch (state)
964964   {
r3535r3536
10051005      case CPUINFO_INT_REGISTER + PIC16C5x_FSR:       info->i = (R.FSR & picRAMmask);         break;
10061006
10071007      /* --- the following bits of info are returned as pointers to data or functions --- */
1008      case CPUINFO_PTR_SET_INFO:                  info->setinfo = pic16C5x_set_info;      break;
1009      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = pic16C5x_get_context; break;
1010      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = pic16C5x_set_context; break;
1011      case CPUINFO_PTR_INIT:                     info->init = pic16C5x_init;            break;
1008      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(pic16C5x);      break;
1009      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(pic16C5x); break;
1010      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(pic16C5x); break;
1011      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(pic16C5x);            break;
10121012      case CPUINFO_PTR_RESET:                     /* set per-CPU */                  break;
1013      case CPUINFO_PTR_EXIT:                     info->exit = pic16C5x_exit;            break;
1014      case CPUINFO_PTR_EXECUTE:                  info->execute = pic16C5x_execute;      break;
1013      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(pic16C5x);            break;
1014      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(pic16C5x);      break;
10151015      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1016      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = pic16C5x_dasm;      break;
1016      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(pic16C5x);      break;
10171017      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &pic16C5x_icount;      break;
10181018
10191019      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
10781078 *  PIC16C54 Reset
10791079 ****************************************************************************/
10801080
1081static void pic16C54_reset(void)
1081static CPU_RESET( pic16C54 )
10821082{
10831083   picmodel = 0x16C54;
10841084   picRAMmask = 0x1f;
r3535r3536
10941094 *  CPU-specific get_info
10951095 **************************************************************************/
10961096
1097void pic16C54_get_info(UINT32 state, cpuinfo *info)
1097CPU_GET_INFO( pic16C54 )
10981098{
10991099   switch (state)
11001100   {
11011101      /* --- the following bits of info are returned as pointers to data or functions --- */
1102      case CPUINFO_PTR_RESET:                     info->reset = pic16C54_reset;         break;
1103      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map16 = address_map_pic16c54_rom; break;
1104      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:      info->internal_map8 = address_map_pic16c54_ram; break;
1102      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(pic16C54);         break;
1103      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map16 = ADDRESS_MAP_NAME(pic16c54_rom); break;
1104      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:      info->internal_map8 = ADDRESS_MAP_NAME(pic16c54_ram); break;
11051105
11061106      /* --- the following bits of info are returned as NULL-terminated strings --- */
11071107      case CPUINFO_STR_NAME:                     strcpy(info->s, "PIC16C54");         break;
11081108
1109      default:                              pic16C5x_get_info(state, info);         break;
1109      default:                              CPU_GET_INFO_CALL(pic16C5x);         break;
11101110   }
11111111}
11121112#endif
r3535r3536
11301130 *  PIC16C55 Reset
11311131 ****************************************************************************/
11321132
1133static void pic16C55_reset(void)
1133static CPU_RESET( pic16C55 )
11341134{
11351135   picmodel = 0x16C55;
11361136   picRAMmask = 0x1f;
r3535r3536
11461146 *  CPU-specific get_info
11471147 **************************************************************************/
11481148
1149void pic16C55_get_info(UINT32 state, cpuinfo *info)
1149CPU_GET_INFO( pic16C55 )
11501150{
11511151   switch (state)
11521152   {
11531153      /* --- the following bits of info are returned as pointers to data or functions --- */
1154      case CPUINFO_PTR_RESET:                     info->reset = pic16C55_reset;         break;
1155      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map16 = address_map_pic16c55_rom; break;
1156      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:      info->internal_map8 = address_map_pic16c55_ram; break;
1154      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(pic16C55);         break;
1155      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map16 = ADDRESS_MAP_NAME(pic16c55_rom); break;
1156      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:      info->internal_map8 = ADDRESS_MAP_NAME(pic16c55_ram); break;
11571157
11581158      /* --- the following bits of info are returned as NULL-terminated strings --- */
11591159      case CPUINFO_STR_NAME:                     strcpy(info->s, "PIC16C55");         break;
11601160
1161      default:                              pic16C5x_get_info(state, info);         break;
1161      default:                              CPU_GET_INFO_CALL(pic16C5x);         break;
11621162   }
11631163}
11641164#endif
r3535r3536
11821182 *  PIC16C56 Reset
11831183 ****************************************************************************/
11841184
1185static void pic16C56_reset(void)
1185static CPU_RESET( pic16C56 )
11861186{
11871187   picmodel = 0x16C56;
11881188   picRAMmask = 0x1f;
r3535r3536
11981198 *  CPU-specific get_info
11991199 **************************************************************************/
12001200
1201void pic16C56_get_info(UINT32 state, cpuinfo *info)
1201CPU_GET_INFO( pic16C56 )
12021202{
12031203   switch (state)
12041204   {
12051205      /* --- the following bits of info are returned as pointers to data or functions --- */
1206      case CPUINFO_PTR_RESET:                     info->reset = pic16C56_reset;         break;
1207      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map16 = address_map_pic16c56_rom; break;
1208      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:      info->internal_map8 = address_map_pic16c56_ram; break;
1206      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(pic16C56);         break;
1207      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map16 = ADDRESS_MAP_NAME(pic16c56_rom); break;
1208      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:      info->internal_map8 = ADDRESS_MAP_NAME(pic16c56_ram); break;
12091209
12101210      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 10;               break;
12111211
12121212      /* --- the following bits of info are returned as NULL-terminated strings --- */
12131213      case CPUINFO_STR_NAME:                     strcpy(info->s, "PIC16C56");         break;
12141214
1215      default:                              pic16C5x_get_info(state, info);         break;
1215      default:                              CPU_GET_INFO_CALL(pic16C5x);         break;
12161216   }
12171217}
12181218#endif
r3535r3536
12391239 *  PIC16C57 Reset
12401240 ****************************************************************************/
12411241
1242static void pic16C57_reset(void)
1242static CPU_RESET( pic16C57 )
12431243{
12441244   picmodel = 0x16C57;
12451245   picRAMmask = 0x7f;
r3535r3536
12551255 *  CPU-specific get_info
12561256 **************************************************************************/
12571257
1258void pic16C57_get_info(UINT32 state, cpuinfo *info)
1258CPU_GET_INFO( pic16C57 )
12591259{
12601260   switch (state)
12611261   {
12621262      /* --- the following bits of info are returned as pointers to data or functions --- */
1263      case CPUINFO_PTR_RESET:                     info->reset = pic16C57_reset;         break;
1264      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map16 = address_map_pic16c57_rom; break;
1265      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:      info->internal_map8 = address_map_pic16c57_ram; break;
1263      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(pic16C57);         break;
1264      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map16 = ADDRESS_MAP_NAME(pic16c57_rom); break;
1265      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:      info->internal_map8 = ADDRESS_MAP_NAME(pic16c57_ram); break;
12661266
12671267      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 11;               break;
12681268      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:    info->i = 7;               break;
r3535r3536
12701270      /* --- the following bits of info are returned as NULL-terminated strings --- */
12711271      case CPUINFO_STR_NAME:                     strcpy(info->s, "PIC16C57");         break;
12721272
1273      default:                              pic16C5x_get_info(state, info);         break;
1273      default:                              CPU_GET_INFO_CALL(pic16C5x);         break;
12741274   }
12751275}
12761276#endif
r3535r3536
12971297 *  PIC16C58 Reset
12981298 ****************************************************************************/
12991299
1300static void pic16C58_reset(void)
1300static CPU_RESET( pic16C58 )
13011301{
13021302   picmodel = 0x16C58;
13031303   picRAMmask = 0x7f;
r3535r3536
13131313 *  CPU-specific get_info
13141314 **************************************************************************/
13151315
1316void pic16C58_get_info(UINT32 state, cpuinfo *info)
1316CPU_GET_INFO( pic16C58 )
13171317{
13181318   switch (state)
13191319   {
13201320      /* --- the following bits of info are returned as pointers to data or functions --- */
1321      case CPUINFO_PTR_RESET:                     info->reset = pic16C58_reset;         break;
1322      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map16 = address_map_pic16c58_rom; break;
1323      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:      info->internal_map8 = address_map_pic16c58_ram; break;
1321      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(pic16C58);         break;
1322      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:   info->internal_map16 = ADDRESS_MAP_NAME(pic16c58_rom); break;
1323      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:      info->internal_map8 = ADDRESS_MAP_NAME(pic16c58_ram); break;
13241324
13251325      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 11;               break;
13261326      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:    info->i = 7;               break;
r3535r3536
13281328      /* --- the following bits of info are returned as NULL-terminated strings --- */
13291329      case CPUINFO_STR_NAME:                     strcpy(info->s, "PIC16C58");         break;
13301330
1331      default:                              pic16C5x_get_info(state, info);         break;
1331      default:                              CPU_GET_INFO_CALL(pic16C5x);         break;
13321332   }
13331333}
13341334#endif
src/emu/cpu/pic16c5x/pic16c5x.h
r3535r3536
104104
105105
106106#if (HAS_PIC16C54)
107void pic16C54_get_info(UINT32 state, cpuinfo *info);
107CPU_GET_INFO( pic16C54 );
108108#endif
109109
110110
111111#if (HAS_PIC16C55)
112void pic16C55_get_info(UINT32 state, cpuinfo *info);
112CPU_GET_INFO( pic16C55 );
113113#endif
114114
115115
116116#if (HAS_PIC16C56)
117void pic16C56_get_info(UINT32 state, cpuinfo *info);
117CPU_GET_INFO( pic16C56 );
118118#endif
119119
120120
121121#if (HAS_PIC16C57)
122void pic16C57_get_info(UINT32 state, cpuinfo *info);
122CPU_GET_INFO( pic16C57 );
123123#endif
124124
125125
126126#if (HAS_PIC16C58)
127void pic16C58_get_info(UINT32 state, cpuinfo *info);
127CPU_GET_INFO( pic16C58 );
128128#endif
129129
130130
131131#if (HAS_PIC16C54) || (HAS_PIC16C55) || (HAS_PIC16C56) || (HAS_PIC16C57) || (HAS_PIC16C58)
132offs_t pic16C5x_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
132CPU_DISASSEMBLE( pic16C5x );
133133#endif
134134
135135
src/emu/cpu/pic16c5x/16c5xdsm.c
r3535r3536
150150   OpInizialized = 1;
151151}
152152
153offs_t pic16C5x_dasm(char *str, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
153CPU_DISASSEMBLE( pic16C5x )
154154{
155155   int a, b, d, f, k;   /* these can all be filled in by parsing an instruction */
156156   int i;
r3535r3536
158158   int cnt = 1;
159159   int code;
160160   int bit;
161   char *strtmp;
161   char *buffertmp;
162162   const char *cp;            /* character pointer in OpFormats */
163163   UINT32 flags = 0;
164164
r3535r3536
184184   }
185185   if (op == -1)
186186   {
187      sprintf(str,"???? dw %04Xh",code);
187      sprintf(buffer,"???? dw %04Xh",code);
188188      return cnt;
189189   }
190   strtmp = str;
190   buffertmp = buffer;
191191   if (Op[op].extcode)      /* Actually, theres no double length opcodes */
192192   {
193193      bit = 27;
r3535r3536
244244            default:
245245               fatalerror("illegal escape character in format '%s'",Op[op].fmt);
246246         }
247         q = num; while (*q) *str++ = *q++;
248         *str = '\0';
247         q = num; while (*q) *buffer++ = *q++;
248         *buffer = '\0';
249249      }
250250      else
251251      {
252         *str++ = *cp++;
253         *str = '\0';
252         *buffer++ = *cp++;
253         *buffer = '\0';
254254      }
255255   }
256256   return cnt | flags | DASMFLAG_SUPPORTED;
src/emu/cpu/pdp1/tx0.h
r3535r3536
4444};
4545
4646/* PUBLIC FUNCTIONS */
47void tx0_64kw_get_info(UINT32 state, cpuinfo *info);
48void tx0_8kw_get_info(UINT32 state, cpuinfo *info);
47CPU_GET_INFO( tx0_64kw );
48CPU_GET_INFO( tx0_8kw );
4949
5050#define READ_TX0_18BIT(A) ((signed)program_read_dword_32be((A)<<2))
5151#define WRITE_TX0_18BIT(A,V) (program_write_dword_32be((A)<<2,(V)))
5252
53unsigned tx0_dasm_64kw(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
54unsigned tx0_dasm_8kw(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
53CPU_DISASSEMBLE( tx0_64kw );
54CPU_DISASSEMBLE( tx0_8kw );
5555
5656#endif /* __TX0_H__ */
src/emu/cpu/pdp1/tx0dasm.c
r3535r3536
22#include <string.h>
33#include "cpu/pdp1/tx0.h"
44
5unsigned tx0_dasm_64kw(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
5CPU_DISASSEMBLE( tx0_64kw )
66{
77   int md;
88   int x;
r3535r3536
2828   return 1;
2929}
3030
31unsigned tx0_dasm_8kw(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
31CPU_DISASSEMBLE( tx0_8kw )
3232{
3333   int md;
3434   int x;
src/emu/cpu/pdp1/pdp1.c
r3535r3536
526526}
527527
528528
529static void pdp1_init(int index, int clock, const void *config, int (*irqcallback)(int))
529static CPU_INIT( pdp1 )
530530{
531531   const pdp1_reset_param_t *param = config;
532532   int i;
r3535r3536
580580   pulse_start_clear();
581581}
582582
583static void pdp1_reset (void)
583static CPU_RESET( pdp1 )
584584{
585585   /* nothing to do */
586586}
587587
588static void pdp1_get_context (void *dst)
588static CPU_GET_CONTEXT( pdp1 )
589589{
590590   if (dst)
591591      *(pdp1_Regs *) dst = pdp1;
592592}
593593
594static void pdp1_set_context (void *src)
594static CPU_SET_CONTEXT( pdp1 )
595595{
596596   if (src)
597597      pdp1 = *(pdp1_Regs *) src;
r3535r3536
618618
619619
620620/* execute instructions on this CPU until icount expires */
621static int pdp1_execute(int cycles)
621static CPU_EXECUTE( pdp1 )
622622{
623623   pdp1_ICount = cycles;
624624
r3535r3536
864864}
865865
866866
867static void pdp1_set_info(UINT32 state, cpuinfo *info)
867static CPU_SET_INFO( pdp1 )
868868{
869869   switch (state)
870870   {
r3535r3536
930930}
931931
932932
933void pdp1_get_info(UINT32 state, cpuinfo *info)
933CPU_GET_INFO( pdp1 )
934934{
935935   switch (state)
936936   {
r3535r3536
10151015   case CPUINFO_INT_REGISTER + PDP1_IOS:         info->i = pdp1.ios;                  break;
10161016
10171017   /* --- the following bits of info are returned as pointers to data or functions --- */
1018   case CPUINFO_PTR_SET_INFO:                  info->setinfo = pdp1_set_info;         break;
1019   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = pdp1_get_context;   break;
1020   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = pdp1_set_context;   break;
1021   case CPUINFO_PTR_INIT:                     info->init = pdp1_init;               break;
1022   case CPUINFO_PTR_RESET:                     info->reset = pdp1_reset;            break;
1023   case CPUINFO_PTR_EXECUTE:                  info->execute = pdp1_execute;         break;
1018   case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(pdp1);         break;
1019   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(pdp1);   break;
1020   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(pdp1);   break;
1021   case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(pdp1);               break;
1022   case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(pdp1);            break;
1023   case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(pdp1);         break;
10241024   case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
10251025
1026   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = pdp1_dasm;         break;
1026   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(pdp1);         break;
10271027   case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &pdp1_ICount;         break;
10281028
10291029   /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/pdp1/pdp1.h
r3535r3536
4444#define IOT_NO_COMPLETION_PULSE -1
4545
4646/* PUBLIC FUNCTIONS */
47void pdp1_get_info(UINT32 state, cpuinfo *info);
47CPU_GET_INFO( pdp1 );
4848
4949#define READ_PDP_18BIT(A) ((signed)program_read_dword_32be((A)<<2))
5050#define WRITE_PDP_18BIT(A,V) (program_write_dword_32be((A)<<2,(V)))
r3535r3536
7777#define IOT 035
7878#define OPR 037
7979
80unsigned pdp1_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
80CPU_DISASSEMBLE( pdp1 );
8181
8282#endif /* __PDP1_H__ */
src/emu/cpu/pdp1/pdp1dasm.c
r3535r3536
1919
2020#define IN if (ib) sprintf(buffer+strlen(buffer)," i")
2121
22unsigned pdp1_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
22CPU_DISASSEMBLE( pdp1 )
2323{
2424   int md;
2525   int etime = 0;
src/emu/cpu/pdp1/tx0.c
r3535r3536
127127      ;
128128}
129129
130static void tx0_init_common(int is_64kw, int index, int clock, const void *config, int (*irqcallback)(int))
130static void tx0_init_common(int is_64kw, const device_config *device, int index, int clock, const void *config, cpu_irq_callback irqcallback)
131131{
132132   int i;
133133   tx0_reset_param_t *param = (tx0_reset_param_t *) config;
r3535r3536
145145   tx0.ir_mask = is_64kw ? 03 : 037;
146146}
147147
148static void tx0_init_64kw(int index, int clock, const void *config, int (*irqcallback)(int))
148static CPU_INIT( tx0_64kw )
149149{
150   tx0_init_common(1, index, clock, config, irqcallback);
150   tx0_init_common(1, device, index, clock, config, irqcallback);
151151}
152152
153static void tx0_init_8kw(int index, int clock, const void *config, int (*irqcallback)(int))
153static CPU_INIT( tx0_8kw)
154154{
155   tx0_init_common(0, index, clock, config, irqcallback);
155   tx0_init_common(0, device, index, clock, config, irqcallback);
156156}
157157
158static void tx0_reset(void)
158static CPU_RESET( tx0 )
159159{
160160   /* reset CPU flip-flops */
161161   pulse_reset();
r3535r3536
163163   tx0.gbl_cm_sel = 1;   /* HACK */
164164}
165165
166static void tx0_get_context(void *dst)
166static CPU_GET_CONTEXT( tx0 )
167167{
168168   if (dst)
169169      *(tx0_Regs *) dst = tx0;
170170}
171171
172static void tx0_set_context(void *src)
172static CPU_SET_CONTEXT( tx0 )
173173{
174174   if (src)
175175      tx0 = *(tx0_Regs *) src;
r3535r3536
177177
178178
179179/* execute instructions on this CPU until icount expires */
180static int tx0_execute_64kw(int cycles)
180static CPU_EXECUTE( tx0_64kw )
181181{
182182   tx0_ICount = cycles;
183183
r3535r3536
285285}
286286
287287/* execute instructions on this CPU until icount expires */
288static int tx0_execute_8kw(int cycles)
288static CPU_EXECUTE( tx0_8kw )
289289{
290290   tx0_ICount = cycles;
291291
r3535r3536
393393}
394394
395395
396static void tx0_set_info(UINT32 state, cpuinfo *info)
396static CPU_SET_INFO( tx0 )
397397{
398398   switch (state)
399399   {
r3535r3536
442442}
443443
444444
445void tx0_64kw_get_info(UINT32 state, cpuinfo *info)
445CPU_GET_INFO( tx0_64kw )
446446{
447447   switch (state)
448448   {
r3535r3536
510510   case CPUINFO_INT_REGISTER + TX0_IOS:         info->i = tx0.ios;                  break;
511511
512512   /* --- the following bits of info are returned as pointers to data or functions --- */
513   case CPUINFO_PTR_SET_INFO:                  info->setinfo = tx0_set_info;         break;
514   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = tx0_get_context;      break;
515   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = tx0_set_context;      break;
516   case CPUINFO_PTR_INIT:                     info->init = tx0_init_64kw;            break;
517   case CPUINFO_PTR_RESET:                     info->reset = tx0_reset;            break;
518   case CPUINFO_PTR_EXECUTE:                  info->execute = tx0_execute_64kw;      break;
513   case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(tx0);         break;
514   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(tx0);      break;
515   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(tx0);      break;
516   case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(tx0_64kw);   break;
517   case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(tx0);      break;
518   case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(tx0_64kw);   break;
519519   case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
520   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = tx0_dasm_64kw;      break;
520   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(tx0_64kw);      break;
521521   case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &tx0_ICount;            break;
522522
523523   /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
568568   }
569569}
570570
571void tx0_8kw_get_info(UINT32 state, cpuinfo *info)
571CPU_GET_INFO( tx0_8kw )
572572{
573573   switch (state)
574574   {
r3535r3536
636636   case CPUINFO_INT_REGISTER + TX0_IOS:         info->i = tx0.ios;                  break;
637637
638638   /* --- the following bits of info are returned as pointers to data or functions --- */
639   case CPUINFO_PTR_SET_INFO:                  info->setinfo = tx0_set_info;         break;
640   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = tx0_get_context;      break;
641   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = tx0_set_context;      break;
642   case CPUINFO_PTR_INIT:                     info->init = tx0_init_8kw;            break;
643   case CPUINFO_PTR_RESET:                     info->reset = tx0_reset;            break;
644   case CPUINFO_PTR_EXECUTE:                  info->execute = tx0_execute_8kw;      break;
639   case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(tx0);         break;
640   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(tx0);      break;
641   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(tx0);      break;
642   case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(tx0_8kw);   break;
643   case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(tx0);      break;
644   case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(tx0_8kw);   break;
645645   case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
646   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = tx0_dasm_8kw;   break;
646   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(tx0_8kw);      break;
647647   case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &tx0_ICount;            break;
648648
649649   /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/mb86233/mb86233.c
r3535r3536
9696    Context Switching
9797***************************************************************************/
9898
99static void mb86233_get_context(void *dst)
99static CPU_GET_CONTEXT( mb86233 )
100100{
101101   /* copy the context */
102102   *(MB86233_REGS *)dst = mb86233;
103103}
104104
105static void mb86233_set_context(void *src)
105static CPU_SET_CONTEXT( mb86233 )
106106{
107107   /* copy the context */
108108   if (src)
r3535r3536
115115    Initialization and Shutdown
116116***************************************************************************/
117117
118static void mb86233_init(int index, int clock, const void *config, int (*irqcallback)(int))
118static CPU_INIT( mb86233 )
119119{
120120   mb86233_cpu_core * _config = (mb86233_cpu_core *)config;
121121   (void)index;
r3535r3536
139139   state_save_register_global_pointer(mb86233.RAM,2 * 0x200 * sizeof(UINT32));
140140}
141141
142static void mb86233_reset(void)
142static CPU_RESET( mb86233 )
143143{
144144   /* zero registers and flags */
145145   mb86233.pc = 0;
r3535r3536
964964    Core Execution Loop
965965***************************************************************************/
966966
967static int mb86233_execute(int cycles)
967static CPU_EXECUTE( mb86233 )
968968{
969969
970970   mb86233_icount = cycles;
r3535r3536
15981598    DISASSEMBLY HOOK
15991599***************************************************************************/
16001600
1601static offs_t mb86233_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
1601static CPU_DISASSEMBLE( mb86233 )
16021602{
16031603   extern UINT32 dasm_mb86233(char *, UINT32);
16041604
r3535r3536
16121612    Information Setters
16131613***************************************************************************/
16141614
1615static void mb86233_set_info(UINT32 state, cpuinfo *info)
1615static CPU_SET_INFO( mb86233 )
16161616{
16171617   switch (state)
16181618   {
r3535r3536
16511651    Information Getters
16521652***************************************************************************/
16531653
1654void mb86233_get_info(UINT32 state, cpuinfo *info)
1654CPU_GET_INFO( mb86233 )
16551655{
16561656   switch (state)
16571657   {
r3535r3536
17091709      case CPUINFO_INT_REGISTER + MB86233_R15:      info->i = GETGPR(15);               break;
17101710
17111711      /* --- the following bits of info are returned as pointers to data or functions --- */
1712      case CPUINFO_PTR_SET_INFO:                  info->setinfo = mb86233_set_info;      break;
1713      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = mb86233_get_context;   break;
1714      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = mb86233_set_context;   break;
1715      case CPUINFO_PTR_INIT:                     info->init = mb86233_init;            break;
1716      case CPUINFO_PTR_RESET:                     info->reset = mb86233_reset;         break;
1712      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(mb86233);      break;
1713      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(mb86233);   break;
1714      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(mb86233);   break;
1715      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(mb86233);            break;
1716      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(mb86233);         break;
17171717      case CPUINFO_PTR_EXIT:                     info->exit = NULL;                  break;
1718      case CPUINFO_PTR_EXECUTE:                  info->execute = mb86233_execute;      break;
1718      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(mb86233);      break;
17191719      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1720      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = mb86233_dasm;      break;
1720      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(mb86233);      break;
17211721      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &mb86233_icount;         break;
17221722
17231723      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/mb86233/mb86233.h
r3535r3536
5151   const char *tablergn;
5252};
5353
54extern void mb86233_get_info(UINT32 state, cpuinfo *info);
54extern CPU_GET_INFO( mb86233 );
5555
5656#endif /* __MB86233_H__ */
src/emu/cpu/t11/t11.c
r3535r3536
3232    UINT8   wait_state;
3333    UINT8   irq_state;
3434    INT32   interrupt_cycles;
35    int      (*irq_callback)(int irqline);
35   cpu_irq_callback irq_callback;
36   const device_config *device;
3637} t11_Regs;
3738
3839static t11_Regs t11;
r3535r3536
208209      /* call the callback; if we don't get -1 back, use the return value as our vector */
209210      if (t11.irq_callback != NULL)
210211      {
211         int new_vector = (*t11.irq_callback)(t11.irq_state & 15);
212         int new_vector = (*t11.irq_callback)(t11.device, t11.irq_state & 15);
212213         if (new_vector != -1)
213214            vector = new_vector;
214215      }
r3535r3536
254255 *
255256 *************************************/
256257
257static void t11_get_context(void *dst)
258static CPU_GET_CONTEXT( t11 )
258259{
259260   if (dst)
260261      *(t11_Regs *)dst = t11;
r3535r3536
268269 *
269270 *************************************/
270271
271static void t11_set_context(void *src)
272static CPU_SET_CONTEXT( t11 )
272273{
273274   if (src)
274275      t11 = *(t11_Regs *)src;
r3535r3536
284285 *
285286 *************************************/
286287
287static void t11_init(int index, int clock, const void *config, int (*irqcallback)(int))
288static CPU_INIT( t11 )
288289{
289290   static const UINT16 initial_pc[] =
290291   {
r3535r3536
295296
296297   t11.initial_pc = initial_pc[setup->mode >> 13];
297298   t11.irq_callback = irqcallback;
299   t11.device = device;
298300
299301   state_save_register_item("t11", index, t11.ppc.w.l);
300302   state_save_register_item("t11", index, t11.reg[0].w.l);
r3535r3536
314316}
315317
316318
317static void t11_exit(void)
319static CPU_EXIT( t11 )
318320{
319321   /* nothing to do */
320322}
r3535r3536
327329 *
328330 *************************************/
329331
330static void t11_reset(void)
332static CPU_RESET( t11 )
331333{
332334   /* initial SP is 376 octal, or 0xfe */
333335   SP = 0x00fe;
r3535r3536
382384 *
383385 *************************************/
384386
385static int t11_execute(int cycles)
387static CPU_EXECUTE( t11 )
386388{
387389   t11_ICount = cycles;
388390   t11_ICount -= t11.interrupt_cycles;
r3535r3536
419421 * Generic set_info
420422 **************************************************************************/
421423
422static void t11_set_info(UINT32 state, cpuinfo *info)
424static CPU_SET_INFO( t11 )
423425{
424426   switch (state)
425427   {
r3535r3536
449451 * Generic get_info
450452 **************************************************************************/
451453
452void t11_get_info(UINT32 state, cpuinfo *info)
454CPU_GET_INFO( t11 )
453455{
454456   switch (state)
455457   {
r3535r3536
495497      case CPUINFO_INT_REGISTER + T11_R5:            info->i = REGD(5);                  break;
496498
497499      /* --- the following bits of info are returned as pointers to data or functions --- */
498      case CPUINFO_PTR_SET_INFO:                  info->setinfo = t11_set_info;         break;
499      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = t11_get_context;      break;
500      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = t11_set_context;      break;
501      case CPUINFO_PTR_INIT:                     info->init = t11_init;               break;
502      case CPUINFO_PTR_RESET:                     info->reset = t11_reset;            break;
503      case CPUINFO_PTR_EXIT:                     info->exit = t11_exit;               break;
504      case CPUINFO_PTR_EXECUTE:                  info->execute = t11_execute;         break;
500      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(t11);         break;
501      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(t11);      break;
502      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(t11);      break;
503      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(t11);               break;
504      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(t11);            break;
505      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(t11);               break;
506      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(t11);         break;
505507      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
506      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = t11_dasm;         break;
508      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(t11);         break;
507509      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &t11_ICount;            break;
508510
509511      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/t11/t11.h
r3535r3536
3333};
3434
3535
36extern void t11_get_info(UINT32 state, cpuinfo *info);
36extern CPU_GET_INFO( t11 );
3737
3838/****************************************************************************/
3939/* Read a byte from given memory location                                   */
r3535r3536
4747#define T11_WRMEM(A,V) (program_write_byte_16le(A,V))
4848#define T11_WRMEM_WORD(A,V) (program_write_word_16le(A,V))
4949
50offs_t t11_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
50CPU_DISASSEMBLE( t11 );
5151
5252#endif /* __T11_H__ */
src/emu/cpu/t11/t11dasm.c
r3535r3536
8383}
8484
8585
86offs_t t11_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
86CPU_DISASSEMBLE( t11 )
8787{
8888   char *ea1, *ea2;
8989   unsigned PC = pc;
src/emu/cpu/arm7/arm7core.c
r3535r3536
522522// CPU RESET
523523static void arm7_core_reset(void)
524524{
525    int (*save_irqcallback)(int) = ARM7.irq_callback;
525    cpu_irq_callback save_irqcallback = ARM7.irq_callback;
526    const device_config *save_device = ARM7.device;
526527
527528    memset(&ARM7, 0, sizeof(ARM7));
528529    ARM7.irq_callback = save_irqcallback;
530    ARM7.device = save_device;
529531
530532    /* start up in SVC mode with interrupts disabled. */
531533    SwitchMode(eARM7_MODE_SVC);
src/emu/cpu/arm7/arm7core.h
r3535r3536
6767    UINT8 pendingAbtP;                  \
6868    UINT8 pendingUnd;                   \
6969    UINT8 pendingSwi;                   \
70    int (*irq_callback)(int);
70    cpu_irq_callback irq_callback;      \
71    const device_config *device;
7172
7273
7374/****************************************************************************************************
src/emu/cpu/arm7/arm7.c
r3535r3536
8282/***************************************************************************
8383 * CPU SPECIFIC IMPLEMENTATIONS
8484 **************************************************************************/
85static void arm7_init(int index, int clock, const void *config, int (*irqcallback)(int))
85static CPU_INIT( arm7 )
8686{
8787    // must call core
8888    arm7_core_init("arm7", index);
8989
9090    ARM7.irq_callback = irqcallback;
91    ARM7.device = device;
9192
9293#if TEST_COPROC_FUNCS
9394    // setup co-proc callbacks example
r3535r3536
99100#endif
100101}
101102
102static void arm7_reset(void)
103static CPU_RESET( arm7 )
103104{
104105    // must call core reset
105106    arm7_core_reset();
106107}
107108
108static void arm7_exit(void)
109static CPU_EXIT( arm7 )
109110{
110111    /* nothing to do here */
111112}
112113
113static int arm7_execute(int cycles)
114static CPU_EXECUTE( arm7 )
114115{
115116/* include the arm7 core execute code */
116117#include "arm7exec.c"
r3535r3536
123124    arm7_core_set_irq_line(irqline,state);
124125}
125126
126static void arm7_get_context(void *dst)
127static CPU_GET_CONTEXT( arm7 )
127128{
128129    if (dst)
129130    {
r3535r3536
131132    }
132133}
133134
134static void arm7_set_context(void *src)
135static CPU_SET_CONTEXT( arm7 )
135136{
136137    if (src)
137138    {
r3535r3536
139140    }
140141}
141142
142static offs_t arm7_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
143static CPU_DISASSEMBLE( arm7 )
143144{
144145    if (T_IS_SET(GET_CPSR))
145146    {
r3535r3536
156157 * Generic set_info
157158 **************************************************************************/
158159
159static void arm7_set_info(UINT32 state, cpuinfo *info)
160static CPU_SET_INFO( arm7 )
160161{
161162    switch (state)
162163    {
r3535r3536
230231 * Generic get_info
231232 **************************************************************************/
232233
233void arm7_get_info(UINT32 state, cpuinfo *info)
234CPU_GET_INFO( arm7 )
234235{
235236    switch (state)
236237    {
r3535r3536
319320        case CPUINFO_INT_REGISTER + ARM7_USPSR: info->i = ARM7REG(eSPSR_UND);                   break;
320321
321322        /* --- the following bits of info are returned as pointers to data or functions --- */
322        case CPUINFO_PTR_SET_INFO:              info->setinfo = arm7_set_info;                  break;
323        case CPUINFO_PTR_GET_CONTEXT:           info->getcontext = arm7_get_context;            break;
324        case CPUINFO_PTR_SET_CONTEXT:           info->setcontext = arm7_set_context;            break;
325        case CPUINFO_PTR_INIT:                  info->init = arm7_init;                         break;
326        case CPUINFO_PTR_RESET:                 info->reset = arm7_reset;                       break;
327        case CPUINFO_PTR_EXIT:                  info->exit = arm7_exit;                         break;
328        case CPUINFO_PTR_EXECUTE:               info->execute = arm7_execute;                   break;
323        case CPUINFO_PTR_SET_INFO:              info->setinfo = CPU_SET_INFO_NAME(arm7);                  break;
324        case CPUINFO_PTR_GET_CONTEXT:           info->getcontext = CPU_GET_CONTEXT_NAME(arm7);            break;
325        case CPUINFO_PTR_SET_CONTEXT:           info->setcontext = CPU_SET_CONTEXT_NAME(arm7);            break;
326        case CPUINFO_PTR_INIT:                  info->init = CPU_INIT_NAME(arm7);                         break;
327        case CPUINFO_PTR_RESET:                 info->reset = CPU_RESET_NAME(arm7);                       break;
328        case CPUINFO_PTR_EXIT:                  info->exit = CPU_EXIT_NAME(arm7);                         break;
329        case CPUINFO_PTR_EXECUTE:               info->execute = CPU_EXECUTE_NAME(arm7);                   break;
329330        case CPUINFO_PTR_BURN:                  info->burn = NULL;                              break;
330        case CPUINFO_PTR_DISASSEMBLE:           info->disassemble = arm7_dasm;                  break;
331        case CPUINFO_PTR_DISASSEMBLE:           info->disassemble = CPU_DISASSEMBLE_NAME(arm7);                  break;
331332        case CPUINFO_PTR_INSTRUCTION_COUNTER:   info->icount = &ARM7_ICOUNT;                    break;
332333
333334        /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/arm7/arm7.h
r3535r3536
3838/****************************************************************************************************
3939 *  PUBLIC FUNCTIONS
4040 ***************************************************************************************************/
41extern void arm7_get_info(UINT32 state, cpuinfo *info);
41extern CPU_GET_INFO( arm7 );
4242
4343#endif /* __ARM7_H__ */
src/emu/cpu/arm7/arm7exec.c
r3535r3536
3131 *
3232 *         It should be included as follows in your cpu core:
3333 *
34 *         int arm7_execute(int cycles)
34 *         CPU_EXECUTE( arm7 )
3535 *         {
3636 *         #include "arm7exec.c"
3737 *         }
src/emu/cpu/h6280/h6280ops.h
r3535r3536
9898          !(h6280.irq_mask & 0x2) )                     \
9999      {                                          \
100100         DO_INTERRUPT(H6280_IRQ1_VEC);                  \
101         (*h6280.irq_callback)(0);                     \
101         (*h6280.irq_callback)(h6280.device, 0);            \
102102      } else                                       \
103103      if ( h6280.irq_state[1] != CLEAR_LINE &&            \
104104          !(h6280.irq_mask & 0x1) )                     \
105105      {                                          \
106106         DO_INTERRUPT(H6280_IRQ2_VEC);                  \
107         (*h6280.irq_callback)(1);                     \
107         (*h6280.irq_callback)(h6280.device, 1);            \
108108        }                                                       \
109109    }
110110
src/emu/cpu/h6280/6280dasm.c
r3535r3536
140140/*****************************************************************************
141141 *  Disassemble a single command and return the number of bytes it uses.
142142 *****************************************************************************/
143offs_t h6280_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
143CPU_DISASSEMBLE( h6280 )
144144{
145145   UINT32 flags = 0;
146146   int PC, OP, opc, arg;
src/emu/cpu/h6280/h6280.c
r3535r3536
137137    UINT8 nmi_state;
138138    UINT8 irq_state[3];
139139   UINT8 irq_pending;
140    int (*irq_callback)(int irqline);
140   cpu_irq_callback irq_callback;
141   const device_config *device;
141142
142143#if LAZY_FLAGS
143144    INT32 NZ;             /* last value (lazy N and Z flag) */
r3535r3536
156157#include "tblh6280.c"
157158
158159/*****************************************************************************/
159static void h6280_init(int index, int clock, const void *config, int (*irqcallback)(int))
160static CPU_INIT( h6280 )
160161{
161162   state_save_register_item("h6280", index, h6280.ppc.w.l);
162163   state_save_register_item("h6280", index, h6280.pc.w.l);
r3535r3536
186187   state_save_register_item("h6280", index, h6280.io_buffer);
187188
188189   h6280.irq_callback = irqcallback;
190   h6280.device = device;
189191}
190192
191static void h6280_reset(void)
193static CPU_RESET( h6280 )
192194{
193   int (*save_irqcallback)(int);
195   cpu_irq_callback save_irqcallback;
196   const device_config *save_device;
194197   int i;
195198
196199   /* wipe out the h6280 structure */
197200   save_irqcallback = h6280.irq_callback;
201   save_device = h6280.device;
198202   memset(&h6280, 0, sizeof(h6280_Regs));
199203   h6280.irq_callback = save_irqcallback;
204   h6280.device = save_device;
200205
201206   /* set I and B flags */
202207   P = _fI | _fB;
r3535r3536
224229   h6280.irq_pending = 0;
225230}
226231
227static void h6280_exit(void)
232static CPU_EXIT( h6280 )
228233{
229234   /* nothing */
230235}
231236
232static int h6280_execute(int cycles)
237static CPU_EXECUTE( h6280 )
233238{
234239   int in;
235240   h6280_ICount = cycles;
r3535r3536
280285   return cycles - h6280_ICount;
281286}
282287
283static void h6280_get_context (void *dst)
288static CPU_GET_CONTEXT( h6280 )
284289{
285290   if( dst )
286291      *(h6280_Regs*)dst = h6280;
287292}
288293
289static void h6280_set_context (void *src)
294static CPU_SET_CONTEXT( h6280 )
290295{
291296   if( src )
292297      h6280 = *(h6280_Regs*)src;
r3535r3536
380385   }
381386}
382387
383static int h6280_translate(int space, int intention, offs_t *addr)
388static CPU_TRANSLATE( h6280 )
384389{
385390   if (space == ADDRESS_SPACE_PROGRAM)
386      *addr = TRANSLATED(*addr);
391      *address = TRANSLATED(*address);
387392   return TRUE;
388393}
389394
r3535r3536
403408 * Generic set_info
404409 **************************************************************************/
405410
406static void h6280_set_info(UINT32 state, cpuinfo *info)
411static CPU_SET_INFO( h6280 )
407412{
408413   switch (state)
409414   {
r3535r3536
444449 * Generic get_info
445450 **************************************************************************/
446451
447void h6280_get_info(UINT32 state, cpuinfo *info)
452CPU_GET_INFO( h6280 )
448453{
449454   switch (state)
450455   {
r3535r3536
502507      case CPUINFO_INT_REGISTER + H6280_M8:         info->i = h6280.mmr[7];               break;
503508
504509      /* --- the following bits of info are returned as pointers to data or functions --- */
505      case CPUINFO_PTR_SET_INFO:                  info->setinfo = h6280_set_info;         break;
506      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = h6280_get_context;   break;
507      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = h6280_set_context;   break;
508      case CPUINFO_PTR_INIT:                     info->init = h6280_init;            break;
509      case CPUINFO_PTR_RESET:                     info->reset = h6280_reset;            break;
510      case CPUINFO_PTR_EXIT:                     info->exit = h6280_exit;            break;
511      case CPUINFO_PTR_EXECUTE:                  info->execute = h6280_execute;         break;
510      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(h6280);         break;
511      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(h6280);   break;
512      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(h6280);   break;
513      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(h6280);            break;
514      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(h6280);            break;
515      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(h6280);            break;
516      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(h6280);         break;
512517      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
513      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = h6280_dasm;         break;
518      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(h6280);         break;
514519      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &h6280_ICount;         break;
515      case CPUINFO_PTR_TRANSLATE:                  info->translate = h6280_translate;      break;
520      case CPUINFO_PTR_TRANSLATE:                  info->translate = CPU_TRANSLATE_NAME(h6280);      break;
516521
517522      /* --- the following bits of info are returned as NULL-terminated strings --- */
518523      case CPUINFO_STR_NAME:                     strcpy(info->s, "HuC6280");            break;
src/emu/cpu/h6280/h6280.h
r3535r3536
3434#define H6280_IRQ1_VEC   0xfff8
3535#define H6280_IRQ2_VEC   0xfff6         /* Aka BRK vector */
3636
37void h6280_get_info(UINT32 state, cpuinfo *info);
37CPU_GET_INFO( h6280 );
3838
3939
4040READ8_HANDLER( h6280_irq_status_r );
r3535r3536
4747UINT8 h6280io_get_buffer(void);
4848void h6280io_set_buffer(UINT8);
4949
50offs_t h6280_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
50CPU_DISASSEMBLE( h6280 );
5151
5252#endif /* __H6280_H__ */
src/emu/cpu/m6800/6800ops.c
r3535r3536
1616//INLINE void illegal( void )
1717static void illegal( void )
1818{
19   logerror("M6808: illegal opcode: address %04X, op %02X\n",PC,(int) M_RDOP_ARG(PC)&0xFF);
19   logerror("m6800: illegal opcode: address %04X, op %02X\n",PC,(int) M_RDOP_ARG(PC)&0xFF);
2020}
2121
2222/* HD63701 only */
r3535r3536
2424//INLINE void trap( void )
2525static void trap( void )
2626{
27   logerror("M6808: illegal opcode: address %04X, op %02X\n",PC,(int) M_RDOP_ARG(PC)&0xFF);
27   logerror("m6800: illegal opcode: address %04X, op %02X\n",PC,(int) M_RDOP_ARG(PC)&0xFF);
2828   TAKE_TRAP;
2929}
3030#endif
r3535r3536
204204INLINE void slp (void)
205205{
206206   /* wait for next IRQ (same as waiting of wai) */
207   m6808.wai_state |= HD63701_SLP;
207   m68xx.wai_state |= HD63701_SLP;
208208   EAT_CYCLES;
209209}
210210#endif
r3535r3536
355355/* $32 PULA inherent ----- */
356356INLINE void pula (void)
357357{
358   PULLBYTE(m6808.d.b.h);
358   PULLBYTE(m68xx.d.b.h);
359359}
360360
361361/* $33 PULB inherent ----- */
362362INLINE void pulb (void)
363363{
364   PULLBYTE(m6808.d.b.l);
364   PULLBYTE(m68xx.d.b.l);
365365}
366366
367367/* $34 DES inherent ----- */
r3535r3536
379379/* $36 PSHA inherent ----- */
380380INLINE void psha (void)
381381{
382   PUSHBYTE(m6808.d.b.h);
382   PUSHBYTE(m68xx.d.b.h);
383383}
384384
385385/* $37 PSHB inherent ----- */
386386INLINE void pshb (void)
387387{
388   PUSHBYTE(m6808.d.b.l);
388   PUSHBYTE(m68xx.d.b.l);
389389}
390390
391391/* $38 PULX inherent ----- */
r3535r3536
441441     * WAI stacks the entire machine state on the
442442     * hardware stack, then waits for an interrupt.
443443     */
444   m6808.wai_state |= M6800_WAI;
444   m68xx.wai_state |= M6800_WAI;
445445   PUSHWORD(pPC);
446446   PUSHWORD(pX);
447447   PUSHBYTE(A);
448448   PUSHBYTE(B);
449449   PUSHBYTE(CC);
450450   CHECK_IRQ_LINES();
451   if (m6808.wai_state & M6800_WAI) EAT_CYCLES;
451   if (m68xx.wai_state & M6800_WAI) EAT_CYCLES;
452452}
453453
454454/* $3f SWI absolute indirect ----- */
r3535r3536
10921092/* $8e LDS immediate -**0- */
10931093INLINE void lds_im( void )
10941094{
1095   IMMWORD(m6808.s);
1095   IMMWORD(m68xx.s);
10961096   CLR_NZV;
10971097   SET_NZ16(S);
10981098}
r3535r3536
11031103   CLR_NZV;
11041104   SET_NZ16(S);
11051105   IMM16;
1106   WM16(EAD,&m6808.s);
1106   WM16(EAD,&m68xx.s);
11071107}
11081108
11091109/* $90 SUBA direct ?**** */
r3535r3536
12441244/* $9e LDS direct -**0- */
12451245INLINE void lds_di( void )
12461246{
1247   DIRWORD(m6808.s);
1247   DIRWORD(m68xx.s);
12481248   CLR_NZV;
12491249   SET_NZ16(S);
12501250}
r3535r3536
12551255   CLR_NZV;
12561256   SET_NZ16(S);
12571257   DIRECT;
1258   WM16(EAD,&m6808.s);
1258   WM16(EAD,&m68xx.s);
12591259}
12601260
12611261/* $a0 SUBA indexed ?**** */
r3535r3536
13961396/* $ae LDS indexed -**0- */
13971397INLINE void lds_ix( void )
13981398{
1399   IDXWORD(m6808.s);
1399   IDXWORD(m68xx.s);
14001400   CLR_NZV;
14011401   SET_NZ16(S);
14021402}
r3535r3536
14071407   CLR_NZV;
14081408   SET_NZ16(S);
14091409   INDEXED;
1410   WM16(EAD,&m6808.s);
1410   WM16(EAD,&m68xx.s);
14111411}
14121412
14131413/* $b0 SUBA extended ?**** */
r3535r3536
15481548/* $be LDS extended -**0- */
15491549INLINE void lds_ex( void )
15501550{
1551   EXTWORD(m6808.s);
1551   EXTWORD(m68xx.s);
15521552   CLR_NZV;
15531553   SET_NZ16(S);
15541554}
r3535r3536
15591559   CLR_NZV;
15601560   SET_NZ16(S);
15611561   EXTENDED;
1562   WM16(EAD,&m6808.s);
1562   WM16(EAD,&m68xx.s);
15631563}
15641564
15651565/* $c0 SUBB immediate ?**** */
r3535r3536
16691669/* $CC LDD immediate -**0- */
16701670INLINE void ldd_im( void )
16711671{
1672   IMMWORD(m6808.d);
1672   IMMWORD(m68xx.d);
16731673   CLR_NZV;
16741674   SET_NZ16(D);
16751675}
r3535r3536
16811681   IMM16;
16821682   CLR_NZV;
16831683   SET_NZ16(D);
1684   WM16(EAD,&m6808.d);
1684   WM16(EAD,&m68xx.d);
16851685}
16861686
16871687/* $ce LDX immediate -**0- */
16881688INLINE void ldx_im( void )
16891689{
1690   IMMWORD(m6808.x);
1690   IMMWORD(m68xx.x);
16911691   CLR_NZV;
16921692   SET_NZ16(X);
16931693}
r3535r3536
16981698   CLR_NZV;
16991699   SET_NZ16(X);
17001700   IMM16;
1701   WM16(EAD,&m6808.x);
1701   WM16(EAD,&m68xx.x);
17021702}
17031703
17041704/* $d0 SUBB direct ?**** */
r3535r3536
18071807/* $dc LDD direct -**0- */
18081808INLINE void ldd_di( void )
18091809{
1810   DIRWORD(m6808.d);
1810   DIRWORD(m68xx.d);
18111811   CLR_NZV;
18121812   SET_NZ16(D);
18131813}
r3535r3536
18181818   DIRECT;
18191819   CLR_NZV;
18201820   SET_NZ16(D);
1821   WM16(EAD,&m6808.d);
1821   WM16(EAD,&m68xx.d);
18221822}
18231823
18241824/* $de LDX direct -**0- */
18251825INLINE void ldx_di( void )
18261826{
1827   DIRWORD(m6808.x);
1827   DIRWORD(m68xx.x);
18281828   CLR_NZV;
18291829   SET_NZ16(X);
18301830}
r3535r3536
18351835   CLR_NZV;
18361836   SET_NZ16(X);
18371837   DIRECT;
1838   WM16(EAD,&m6808.x);
1838   WM16(EAD,&m68xx.x);
18391839}
18401840
18411841/* $e0 SUBB indexed ?**** */
r3535r3536
19441944/* $ec LDD indexed -**0- */
19451945INLINE void ldd_ix( void )
19461946{
1947   IDXWORD(m6808.d);
1947   IDXWORD(m68xx.d);
19481948   CLR_NZV;
19491949   SET_NZ16(D);
19501950}
r3535r3536
19641964   INDEXED;
19651965   CLR_NZV;
19661966   SET_NZ16(D);
1967   WM16(EAD,&m6808.d);
1967   WM16(EAD,&m68xx.d);
19681968}
19691969
19701970/* $ee LDX indexed -**0- */
19711971INLINE void ldx_ix( void )
19721972{
1973   IDXWORD(m6808.x);
1973   IDXWORD(m68xx.x);
19741974   CLR_NZV;
19751975   SET_NZ16(X);
19761976}
r3535r3536
19811981   CLR_NZV;
19821982   SET_NZ16(X);
19831983   INDEXED;
1984   WM16(EAD,&m6808.x);
1984   WM16(EAD,&m68xx.x);
19851985}
19861986
19871987/* $f0 SUBB extended ?**** */
r3535r3536
20952095/* $fc LDD extended -**0- */
20962096INLINE void ldd_ex( void )
20972097{
2098   EXTWORD(m6808.d);
2098   EXTWORD(m68xx.d);
20992099   CLR_NZV;
21002100   SET_NZ16(D);
21012101}
r3535r3536
21192119   EXTENDED;
21202120   CLR_NZV;
21212121   SET_NZ16(D);
2122   WM16(EAD,&m6808.d);
2122   WM16(EAD,&m68xx.d);
21232123}
21242124
21252125/* $fe LDX extended -**0- */
21262126INLINE void ldx_ex( void )
21272127{
2128   EXTWORD(m6808.x);
2128   EXTWORD(m68xx.x);
21292129   CLR_NZV;
21302130   SET_NZ16(X);
21312131}
r3535r3536
21362136   CLR_NZV;
21372137   SET_NZ16(X);
21382138   EXTENDED;
2139   WM16(EAD,&m6808.x);
2139   WM16(EAD,&m68xx.x);
21402140}
src/emu/cpu/m6800/m6800.h
r3535r3536
2424                           /* fall  eddge : ASSERT_LINE -> CLEAR_LINE      */
2525                           /* it is usuali to use PULSE_LINE state         */
2626
27extern void m6800_get_info(UINT32 state, cpuinfo *info);
27extern CPU_GET_INFO( m6800 );
2828
2929/****************************************************************************
3030 * For now make the 6801 using the m6800 variables and functions
r3535r3536
4343#define M6801_WAI               M6800_WAI
4444#define M6801_IRQ_LINE            M6800_IRQ_LINE
4545
46extern void m6801_get_info(UINT32 state, cpuinfo *info);
46extern CPU_GET_INFO( m6801 );
4747#endif
4848
4949/****************************************************************************
r3535r3536
6363#define M6802_WAI               M6800_WAI
6464#define M6802_IRQ_LINE            M6800_IRQ_LINE
6565
66extern void m6802_get_info(UINT32 state, cpuinfo *info);
66extern CPU_GET_INFO( m6802 );
6767#endif
6868
6969/****************************************************************************
r3535r3536
8484#define M6803_IRQ_LINE            M6800_IRQ_LINE
8585#define M6803_TIN_LINE            M6800_TIN_LINE
8686
87extern void m6803_get_info(UINT32 state, cpuinfo *info);
87extern CPU_GET_INFO( m6803 );
8888#endif
8989
9090#if (HAS_M6801||HAS_M6803||HAS_HD63701)
r3535r3536
120120#define M6808_WAI                   M6800_WAI
121121#define M6808_IRQ_LINE              M6800_IRQ_LINE
122122
123extern void m6808_get_info(UINT32 state, cpuinfo *info);
123extern CPU_GET_INFO( m6808 );
124124#endif
125125
126126/****************************************************************************
r3535r3536
142142#define HD63701_IRQ_LINE          M6800_IRQ_LINE
143143#define HD63701_TIN_LINE          M6800_TIN_LINE
144144
145extern void hd63701_get_info(UINT32 state, cpuinfo *info);
145extern CPU_GET_INFO( hd63701 );
146146
147147void hd63701_trap_pc(void);
148148
r3535r3536
179179#define NSC8105_IRQ_LINE          M6800_IRQ_LINE
180180#define NSC8105_TIN_LINE          M6800_TIN_LINE
181181
182extern void nsc8105_get_info(UINT32 state, cpuinfo *info);
182extern CPU_GET_INFO( nsc8105 );
183183#endif
184184
185185/****************************************************************************/
r3535r3536
214214#    define TRUE (!FALSE)
215215#endif
216216
217offs_t m6800_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
218offs_t m6801_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
219offs_t m6802_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
220offs_t m6803_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
221offs_t m6808_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
222offs_t hd63701_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
223offs_t nsc8105_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
217CPU_DISASSEMBLE( m6800 );
218CPU_DISASSEMBLE( m6801 );
219CPU_DISASSEMBLE( m6802 );
220CPU_DISASSEMBLE( m6803 );
221CPU_DISASSEMBLE( m6808 );
222CPU_DISASSEMBLE( hd63701 );
223CPU_DISASSEMBLE( nsc8105 );
224224
225225#endif /* __M6800_H__ */
src/emu/cpu/m6800/6800dasm.c
r3535r3536
238238   }
239239}
240240
241offs_t m6800_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
241CPU_DISASSEMBLE( m6800 )
242242{
243243   return Dasm680x(6800,buffer,pc,oprom,opram);
244244}
245245
246offs_t m6801_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
246CPU_DISASSEMBLE( m6801 )
247247{
248248   return Dasm680x(6801,buffer,pc,oprom,opram);
249249}
250250
251offs_t m6802_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
251CPU_DISASSEMBLE( m6802 )
252252{
253253   return Dasm680x(6802,buffer,pc,oprom,opram);
254254}
255255
256offs_t m6803_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
256CPU_DISASSEMBLE( m6803 )
257257{
258258   return Dasm680x(6803,buffer,pc,oprom,opram);
259259}
260260
261offs_t m6808_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
261CPU_DISASSEMBLE( m6808 )
262262{
263263   return Dasm680x(6808,buffer,pc,oprom,opram);
264264}
265265
266offs_t hd63701_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
266CPU_DISASSEMBLE( hd63701 )
267267{
268268   return Dasm680x(63701,buffer,pc,oprom,opram);
269269}
270270
271offs_t nsc8105_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
271CPU_DISASSEMBLE( nsc8105 )
272272{
273273   return Dasm680x(8105,buffer,pc,oprom,opram);
274274}
src/emu/cpu/m6800/m6800.c
r3535r3536
11/*** m6800: Portable 6800 class  emulator *************************************
22
3    m6800.c
3    m68xx.c
44
55    References:
66
r3535r3536
2828
2929990316  HJB
3030    Renamed to 6800, since that's the basic CPU.
31    Added different cycle count tables for M6800/2/8, M6801/3 and HD63701.
31    Added different cycle count tables for M6800/2/8, M6801/3 and m68xx.
3232
3333990314  HJB
3434    Also added the M6800 subtype.
r3535r3536
110110   UINT8   irq_state[2];   /* IRQ line state [IRQ1,TIN] */
111111   UINT8   ic_eddge;      /* InputCapture eddge , b.0=fall,b.1=raise */
112112
113   int      (*irq_callback)(int irqline);
113   cpu_irq_callback irq_callback;
114   const device_config *device;
114115   int    extra_cycles;   /* cycles used for interrupts */
115116   void   (* const * insn)(void);   /* instruction table */
116117   const UINT8 *cycles;         /* clock cycle of instruction table */
r3535r3536
139140}   m6800_Regs;
140141
141142/* 680x registers */
142static m6800_Regs m6800;
143static m6800_Regs m68xx;
143144
144145static emu_timer *m6800_rx_timer;
145146static emu_timer *m6800_tx_timer;
146147
147#define m6801   m6800
148#define m6802   m6800
149#define m6803   m6800
150#define m6808   m6800
151#define hd63701 m6800
152#define nsc8105 m6800
148#define   pPPC   m68xx.ppc
149#define pPC    m68xx.pc
150#define pS      m68xx.s
151#define pX      m68xx.x
152#define pD      m68xx.d
153153
154#define   pPPC   m6800.ppc
155#define pPC    m6800.pc
156#define pS      m6800.s
157#define pX      m6800.x
158#define pD      m6800.d
154#define PC      m68xx.pc.w.l
155#define PCD      m68xx.pc.d
156#define S      m68xx.s.w.l
157#define SD      m68xx.s.d
158#define X      m68xx.x.w.l
159#define D      m68xx.d.w.l
160#define A      m68xx.d.b.h
161#define B      m68xx.d.b.l
162#define CC      m68xx.cc
159163
160#define PC      m6800.pc.w.l
161#define PCD      m6800.pc.d
162#define S      m6800.s.w.l
163#define SD      m6800.s.d
164#define X      m6800.x.w.l
165#define D      m6800.d.w.l
166#define A      m6800.d.b.h
167#define B      m6800.d.b.l
168#define CC      m6800.cc
164#define CT      m68xx.counter.w.l
165#define CTH      m68xx.counter.w.h
166#define CTD      m68xx.counter.d
167#define OC      m68xx.output_compare.w.l
168#define OCH      m68xx.output_compare.w.h
169#define OCD      m68xx.output_compare.d
170#define TOH      m68xx.timer_over.w.l
171#define TOD      m68xx.timer_over.d
169172
170#define CT      m6800.counter.w.l
171#define CTH      m6800.counter.w.h
172#define CTD      m6800.counter.d
173#define OC      m6800.output_compare.w.l
174#define OCH      m6800.output_compare.w.h
175#define OCD      m6800.output_compare.d
176#define TOH      m6800.timer_over.w.l
177#define TOD      m6800.timer_over.d
178
179173static PAIR ea;       /* effective address */
180174#define EAD ea.d
181175#define EA   ea.w.l
r3535r3536
186180/* point of next timer event */
187181static UINT32 timer_next;
188182
189/* DS -- THESE ARE RE-DEFINED IN m6800.h TO RAM, ROM or FUNCTIONS IN cpuintrf.c */
183/* DS -- THESE ARE RE-DEFINED IN m68xx.h TO RAM, ROM or FUNCTIONS IN cpuintrf.c */
190184#define RM            M6800_RDMEM
191185#define WM            M6800_WRMEM
192186#define M_RDOP         M6800_RDOP
r3535r3536
202196#define PULLWORD(w) S++; w.d = RM(SD)<<8; S++; w.d |= RM(SD)
203197
204198#define MODIFIED_tcsr {   \
205   m6800.irq2 = (m6800.tcsr&(m6800.tcsr<<3))&(TCSR_ICF|TCSR_OCF|TCSR_TOF); \
199   m68xx.irq2 = (m68xx.tcsr&(m68xx.tcsr<<3))&(TCSR_ICF|TCSR_OCF|TCSR_TOF); \
206200}
207201
208202#define SET_TIMER_EVENT {               \
r3535r3536
269263   debugger_instruction_hook(Machine, PCD);                  \
270264   ireg=M_RDOP(PCD);                  \
271265   PC++;                           \
272   (*m6800.insn[ireg])();               \
273   INCREMENT_COUNTER(m6800.cycles[ireg]);   \
266   (*m68xx.insn[ireg])();               \
267   INCREMENT_COUNTER(m68xx.cycles[ireg]);   \
274268}
275269
276270/* check the IRQ lines for pending interrupts */
277271#define CHECK_IRQ_LINES() {                              \
278272   if( !(CC & 0x10) )                                 \
279273   {                                             \
280      if( m6800.irq_state[M6800_IRQ_LINE] != CLEAR_LINE )      \
274      if( m68xx.irq_state[M6800_IRQ_LINE] != CLEAR_LINE )      \
281275      {   /* standard IRQ */                           \
282276         ENTER_INTERRUPT("M6800#%d take IRQ1\n",0xfff8);      \
283         if( m6800.irq_callback )                     \
284            (void)(*m6800.irq_callback)(M6800_IRQ_LINE);   \
277         if( m68xx.irq_callback )                     \
278            (void)(*m68xx.irq_callback)(m68xx.device, M6800_IRQ_LINE);   \
285279      }                                          \
286280      else                                       \
287281         m6800_check_irq2();                           \
r3535r3536
531525static void ENTER_INTERRUPT(const char *message,UINT16 irq_vector)
532526{
533527   LOG((message, cpu_getactivecpu()));
534   if( m6800.wai_state & (M6800_WAI|M6800_SLP) )
528   if( m68xx.wai_state & (M6800_WAI|M6800_SLP) )
535529   {
536      if( m6800.wai_state & M6800_WAI )
537         m6800.extra_cycles += 4;
538      m6800.wai_state &= ~(M6800_WAI|M6800_SLP);
530      if( m68xx.wai_state & M6800_WAI )
531         m68xx.extra_cycles += 4;
532      m68xx.wai_state &= ~(M6800_WAI|M6800_SLP);
539533   }
540534   else
541535   {
r3535r3536
544538      PUSHBYTE(A);
545539      PUSHBYTE(B);
546540      PUSHBYTE(CC);
547      m6800.extra_cycles += 12;
541      m68xx.extra_cycles += 12;
548542   }
549543   SEI;
550544   PCD = RM16( irq_vector );
r3535r3536
553547
554548static void m6800_check_irq2(void)
555549{
556   if ((m6800.tcsr & (TCSR_EICI|TCSR_ICF)) == (TCSR_EICI|TCSR_ICF))
550   if ((m68xx.tcsr & (TCSR_EICI|TCSR_ICF)) == (TCSR_EICI|TCSR_ICF))
557551   {
558552      TAKE_ICI;
559      if( m6800.irq_callback )
560         (void)(*m6800.irq_callback)(M6800_TIN_LINE);
553      if( m68xx.irq_callback )
554         (void)(*m68xx.irq_callback)(m68xx.device, M6800_TIN_LINE);
561555   }
562   else if ((m6800.tcsr & (TCSR_EOCI|TCSR_OCF)) == (TCSR_EOCI|TCSR_OCF))
556   else if ((m68xx.tcsr & (TCSR_EOCI|TCSR_OCF)) == (TCSR_EOCI|TCSR_OCF))
563557   {
564558      TAKE_OCI;
565559   }
566   else if ((m6800.tcsr & (TCSR_ETOI|TCSR_TOF)) == (TCSR_ETOI|TCSR_TOF))
560   else if ((m68xx.tcsr & (TCSR_ETOI|TCSR_TOF)) == (TCSR_ETOI|TCSR_TOF))
567561   {
568562      TAKE_TOI;
569563   }
570   else if (((m6800.trcsr & (M6800_TRCSR_RIE|M6800_TRCSR_RDRF)) == (M6800_TRCSR_RIE|M6800_TRCSR_RDRF)) ||
571          ((m6800.trcsr & (M6800_TRCSR_RIE|M6800_TRCSR_ORFE)) == (M6800_TRCSR_RIE|M6800_TRCSR_ORFE)) ||
572          ((m6800.trcsr & (M6800_TRCSR_TIE|M6800_TRCSR_TDRE)) == (M6800_TRCSR_TIE|M6800_TRCSR_TDRE)))
564   else if (((m68xx.trcsr & (M6800_TRCSR_RIE|M6800_TRCSR_RDRF)) == (M6800_TRCSR_RIE|M6800_TRCSR_RDRF)) ||
565          ((m68xx.trcsr & (M6800_TRCSR_RIE|M6800_TRCSR_ORFE)) == (M6800_TRCSR_RIE|M6800_TRCSR_ORFE)) ||
566          ((m68xx.trcsr & (M6800_TRCSR_TIE|M6800_TRCSR_TDRE)) == (M6800_TRCSR_TIE|M6800_TRCSR_TDRE)))
573567   {
574568      TAKE_SCI;
575569   }
r3535r3536
582576   if( CTD >= OCD)
583577   {
584578      OCH++;   // next IRQ point
585      m6800.tcsr |= TCSR_OCF;
586      m6800.pending_tcsr |= TCSR_OCF;
579      m68xx.tcsr |= TCSR_OCF;
580      m68xx.pending_tcsr |= TCSR_OCF;
587581      MODIFIED_tcsr;
588      if ( !(CC & 0x10) && (m6800.tcsr & TCSR_EOCI))
582      if ( !(CC & 0x10) && (m68xx.tcsr & TCSR_EOCI))
589583         TAKE_OCI;
590584   }
591585   /* TOI */
r3535r3536
595589#if 0
596590      CLEANUP_conters;
597591#endif
598      m6800.tcsr |= TCSR_TOF;
599      m6800.pending_tcsr |= TCSR_TOF;
592      m68xx.tcsr |= TCSR_TOF;
593      m68xx.pending_tcsr |= TCSR_TOF;
600594      MODIFIED_tcsr;
601      if ( !(CC & 0x10) && (m6800.tcsr & TCSR_ETOI))
595      if ( !(CC & 0x10) && (m68xx.tcsr & TCSR_ETOI))
602596         TAKE_TOI;
603597   }
604598   /* set next event */
r3535r3536
614608#if (HAS_M6801||HAS_M6803||HAS_HD63701)
615609static void m6800_tx(int value)
616610{
617   m6800.port2_data = (m6800.port2_data & 0xef) | (value << 4);
611   m68xx.port2_data = (m68xx.port2_data & 0xef) | (value << 4);
618612
619   if(m6800.port2_ddr == 0xff)
620      io_write_byte_8be(M6803_PORT2,m6800.port2_data);
613   if(m68xx.port2_ddr == 0xff)
614      io_write_byte_8be(M6803_PORT2,m68xx.port2_data);
621615   else
622      io_write_byte_8be(M6803_PORT2,(m6800.port2_data & m6800.port2_ddr)
623         | (io_read_byte_8be(M6803_PORT2) & (m6800.port2_ddr ^ 0xff)));
616      io_write_byte_8be(M6803_PORT2,(m68xx.port2_data & m68xx.port2_ddr)
617         | (io_read_byte_8be(M6803_PORT2) & (m68xx.port2_ddr ^ 0xff)));
624618}
625619
626620static int m6800_rx(void)
r3535r3536
632626{
633627    int cpunum = param;
634628
635   if (m6800.trcsr & M6800_TRCSR_TE)
629   if (m68xx.trcsr & M6800_TRCSR_TE)
636630   {
637631      // force Port 2 bit 4 as output
638      m6800.port2_ddr |= M6800_PORT2_IO4;
632      m68xx.port2_ddr |= M6800_PORT2_IO4;
639633
640      switch (m6800.txstate)
634      switch (m68xx.txstate)
641635      {
642636      case M6800_TX_STATE_INIT:
643         m6800.tx = 1;
644         m6800.txbits++;
637         m68xx.tx = 1;
638         m68xx.txbits++;
645639
646         if (m6800.txbits == 10)
640         if (m68xx.txbits == 10)
647641         {
648            m6800.txstate = M6800_TX_STATE_READY;
649            m6800.txbits = M6800_SERIAL_START;
642            m68xx.txstate = M6800_TX_STATE_READY;
643            m68xx.txbits = M6800_SERIAL_START;
650644         }
651645         break;
652646
653647      case M6800_TX_STATE_READY:
654         switch (m6800.txbits)
648         switch (m68xx.txbits)
655649         {
656650         case M6800_SERIAL_START:
657            if (m6800.trcsr & M6800_TRCSR_TDRE)
651            if (m68xx.trcsr & M6800_TRCSR_TDRE)
658652            {
659653               // transmit buffer is empty, send consecutive '1's
660               m6800.tx = 1;
654               m68xx.tx = 1;
661655            }
662656            else
663657            {
664658               // transmit buffer is full, send data
665659
666660               // load TDR to shift register
667               m6800.tsr = m6800.tdr;
661               m68xx.tsr = m68xx.tdr;
668662
669663               // transmit buffer is empty, set TDRE flag
670               m6800.trcsr |= M6800_TRCSR_TDRE;
664               m68xx.trcsr |= M6800_TRCSR_TDRE;
671665
672666               // send start bit '0'
673               m6800.tx = 0;
667               m68xx.tx = 0;
674668
675               m6800.txbits++;
669               m68xx.txbits++;
676670            }
677671            break;
678672
679673         case M6800_SERIAL_STOP:
680674            // send stop bit '1'
681            m6800.tx = 1;
675            m68xx.tx = 1;
682676
683677             cpuintrf_push_context(cpunum);
684678            CHECK_IRQ_LINES();
685679            cpuintrf_pop_context();
686680
687            m6800.txbits = M6800_SERIAL_START;
681            m68xx.txbits = M6800_SERIAL_START;
688682            break;
689683
690684         default:
691685            // send data bit '0' or '1'
692            m6800.tx = m6800.tsr & 0x01;
686            m68xx.tx = m68xx.tsr & 0x01;
693687
694688            // shift transmit register
695            m6800.tsr >>= 1;
689            m68xx.tsr >>= 1;
696690
697            m6800.txbits++;
691            m68xx.txbits++;
698692            break;
699693         }
700694         break;
701695      }
702696   }
703697
704   m6800_tx(m6800.tx);
698   m6800_tx(m68xx.tx);
705699}
706700
707701static TIMER_CALLBACK(m6800_rx_tick)
708702{
709703    int cpunum = param;
710704
711   if (m6800.trcsr & M6800_TRCSR_RE)
705   if (m68xx.trcsr & M6800_TRCSR_RE)
712706   {
713      if (m6800.trcsr & M6800_TRCSR_WU)
707      if (m68xx.trcsr & M6800_TRCSR_WU)
714708      {
715709         // wait for 10 bits of '1'
716710
717711         if (m6800_rx() == 1)
718712         {
719            m6800.rxbits++;
713            m68xx.rxbits++;
720714
721            if (m6800.rxbits == 10)
715            if (m68xx.rxbits == 10)
722716            {
723               m6800.trcsr &= ~M6800_TRCSR_WU;
724               m6800.rxbits = M6800_SERIAL_START;
717               m68xx.trcsr &= ~M6800_TRCSR_WU;
718               m68xx.rxbits = M6800_SERIAL_START;
725719            }
726720         }
727721         else
728722         {
729            m6800.rxbits = M6800_SERIAL_START;
723            m68xx.rxbits = M6800_SERIAL_START;
730724         }
731725      }
732726      else
733727      {
734728         // receive data
735729
736         switch (m6800.rxbits)
730         switch (m68xx.rxbits)
737731         {
738732         case M6800_SERIAL_START:
739733            if (m6800_rx() == 0)
740734            {
741735               // start bit found
742               m6800.rxbits++;
736               m68xx.rxbits++;
743737            }
744738            break;
745739
746740         case M6800_SERIAL_STOP:
747741            if (m6800_rx() == 1)
748742            {
749               if (m6800.trcsr & M6800_TRCSR_RDRF)
743               if (m68xx.trcsr & M6800_TRCSR_RDRF)
750744               {
751745                  // overrun error
752746
753                  m6800.trcsr |= M6800_TRCSR_ORFE;
747                  m68xx.trcsr |= M6800_TRCSR_ORFE;
754748
755749                   cpuintrf_push_context(cpunum);
756750                  CHECK_IRQ_LINES();
r3535r3536
758752               }
759753               else
760754               {
761                  if (!(m6800.trcsr & M6800_TRCSR_ORFE))
755                  if (!(m68xx.trcsr & M6800_TRCSR_ORFE))
762756                  {
763757                     // transfer data into receive register
764                     m6800.rdr = m6800.rsr;
758                     m68xx.rdr = m68xx.rsr;
765759
766760                     // set RDRF flag
767                     m6800.trcsr |= M6800_TRCSR_RDRF;
761                     m68xx.trcsr |= M6800_TRCSR_RDRF;
768762
769763                     cpuintrf_push_context(cpunum);
770764                     CHECK_IRQ_LINES();
r3535r3536
776770            {
777771               // framing error
778772
779               if (!(m6800.trcsr & M6800_TRCSR_ORFE))
773               if (!(m68xx.trcsr & M6800_TRCSR_ORFE))
780774               {
781775                  // transfer unframed data into receive register
782                  m6800.rdr = m6800.rsr;
776                  m68xx.rdr = m68xx.rsr;
783777               }
784778
785               m6800.trcsr |= M6800_TRCSR_ORFE;
786               m6800.trcsr &= ~M6800_TRCSR_RDRF;
779               m68xx.trcsr |= M6800_TRCSR_ORFE;
780               m68xx.trcsr &= ~M6800_TRCSR_RDRF;
787781
788782               cpuintrf_push_context(cpunum);
789783               CHECK_IRQ_LINES();
790784               cpuintrf_pop_context();
791785            }
792786
793            m6800.rxbits = M6800_SERIAL_START;
787            m68xx.rxbits = M6800_SERIAL_START;
794788            break;
795789
796790         default:
797791            // shift receive register
798            m6800.rsr >>= 1;
792            m68xx.rsr >>= 1;
799793
800794            // receive bit into register
801            m6800.rsr |= (m6800_rx() << 7);
795            m68xx.rsr |= (m6800_rx() << 7);
802796
803            m6800.rxbits++;
797            m68xx.rxbits++;
804798            break;
805799         }
806800      }
r3535r3536
813807 ****************************************************************************/
814808static void state_register(const char *type, int index)
815809{
816   state_save_register_item(type, index, m6800.ppc.w.l);
817   state_save_register_item(type, index, m6800.pc.w.l);
818   state_save_register_item(type, index, m6800.s.w.l);
819   state_save_register_item(type, index, m6800.x.w.l);
820   state_save_register_item(type, index, m6800.d.w.l);
821   state_save_register_item(type, index, m6800.cc);
822   state_save_register_item(type, index, m6800.wai_state);
823   state_save_register_item(type, index, m6800.nmi_state);
824   state_save_register_item_array(type, index, m6800.irq_state);
825   state_save_register_item(type, index, m6800.ic_eddge);
810   state_save_register_item(type, index, m68xx.ppc.w.l);
811   state_save_register_item(type, index, m68xx.pc.w.l);
812   state_save_register_item(type, index, m68xx.s.w.l);
813   state_save_register_item(type, index, m68xx.x.w.l);
814   state_save_register_item(type, index, m68xx.d.w.l);
815   state_save_register_item(type, index, m68xx.cc);
816   state_save_register_item(type, index, m68xx.wai_state);
817   state_save_register_item(type, index, m68xx.nmi_state);
818   state_save_register_item_array(type, index, m68xx.irq_state);
819   state_save_register_item(type, index, m68xx.ic_eddge);
826820
827   state_save_register_item(type, index, m6800.port1_ddr);
828   state_save_register_item(type, index, m6800.port2_ddr);
829   state_save_register_item(type, index, m6800.port3_ddr);
830   state_save_register_item(type, index, m6800.port4_ddr);
831   state_save_register_item(type, index, m6800.port1_data);
832   state_save_register_item(type, index, m6800.port2_data);
833   state_save_register_item(type, index, m6800.port3_data);
834   state_save_register_item(type, index, m6800.port4_data);
835   state_save_register_item(type, index, m6800.tcsr);
836   state_save_register_item(type, index, m6800.pending_tcsr);
837   state_save_register_item(type, index, m6800.irq2);
838   state_save_register_item(type, index, m6800.ram_ctrl);
821   state_save_register_item(type, index, m68xx.port1_ddr);
822   state_save_register_item(type, index, m68xx.port2_ddr);
823   state_save_register_item(type, index, m68xx.port3_ddr);
824   state_save_register_item(type, index, m68xx.port4_ddr);
825   state_save_register_item(type, index, m68xx.port1_data);
826   state_save_register_item(type, index, m68xx.port2_data);
827   state_save_register_item(type, index, m68xx.port3_data);
828   state_save_register_item(type, index, m68xx.port4_data);
829   state_save_register_item(type, index, m68xx.tcsr);
830   state_save_register_item(type, index, m68xx.pending_tcsr);
831   state_save_register_item(type, index, m68xx.irq2);
832   state_save_register_item(type, index, m68xx.ram_ctrl);
839833
840   state_save_register_item(type, index, m6800.counter.d);
841   state_save_register_item(type, index, m6800.output_compare.d);
842   state_save_register_item(type, index, m6800.input_capture);
843   state_save_register_item(type, index, m6800.timer_over.d);
834   state_save_register_item(type, index, m68xx.counter.d);
835   state_save_register_item(type, index, m68xx.output_compare.d);
836   state_save_register_item(type, index, m68xx.input_capture);
837   state_save_register_item(type, index, m68xx.timer_over.d);
844838
845   state_save_register_item(type, index, m6800.clock);
846   state_save_register_item(type, index, m6800.trcsr);
847   state_save_register_item(type, index, m6800.rmcr);
848   state_save_register_item(type, index, m6800.rdr);
849   state_save_register_item(type, index, m6800.tdr);
850   state_save_register_item(type, index, m6800.rsr);
851   state_save_register_item(type, index, m6800.tsr);
852   state_save_register_item(type, index, m6800.rxbits);
853   state_save_register_item(type, index, m6800.txbits);
854   state_save_register_item(type, index, m6800.txstate);
855   state_save_register_item(type, index, m6800.trcsr_read);
856   state_save_register_item(type, index, m6800.tx);
839   state_save_register_item(type, index, m68xx.clock);
840   state_save_register_item(type, index, m68xx.trcsr);
841   state_save_register_item(type, index, m68xx.rmcr);
842   state_save_register_item(type, index, m68xx.rdr);
843   state_save_register_item(type, index, m68xx.tdr);
844   state_save_register_item(type, index, m68xx.rsr);
845   state_save_register_item(type, index, m68xx.tsr);
846   state_save_register_item(type, index, m68xx.rxbits);
847   state_save_register_item(type, index, m68xx.txbits);
848   state_save_register_item(type, index, m68xx.txstate);
849   state_save_register_item(type, index, m68xx.trcsr_read);
850   state_save_register_item(type, index, m68xx.tx);
857851}
858852
859static void m6800_init(int index, int clock, const void *config, int (*irqcallback)(int))
853static CPU_INIT( m6800 )
860854{
861//  m6800.subtype   = SUBTYPE_M6800;
862   m6800.insn = m6800_insn;
863   m6800.cycles = cycles_6800;
864   m6800.irq_callback = irqcallback;
855//  m68xx.subtype   = SUBTYPE_M6800;
856   m68xx.insn = m6800_insn;
857   m68xx.cycles = cycles_6800;
858   m68xx.irq_callback = irqcallback;
859   m68xx.device = device;
865860   state_register("m6800", index);
866861}
867862
868static void m6800_reset(void)
863static CPU_RESET( m6800 )
869864{
870865   SEI;            /* IRQ disabled */
871866   PCD = RM16( 0xfffe );
872867   CHANGE_PC();
873868
874   m6800.wai_state = 0;
875   m6800.nmi_state = 0;
876   m6800.irq_state[M6800_IRQ_LINE] = 0;
877   m6800.irq_state[M6800_TIN_LINE] = 0;
878   m6800.ic_eddge = 0;
869   m68xx.wai_state = 0;
870   m68xx.nmi_state = 0;
871   m68xx.irq_state[M6800_IRQ_LINE] = 0;
872   m68xx.irq_state[M6800_TIN_LINE] = 0;
873   m68xx.ic_eddge = 0;
879874
880   m6800.port1_ddr = 0x00;
881   m6800.port2_ddr = 0x00;
875   m68xx.port1_ddr = 0x00;
876   m68xx.port2_ddr = 0x00;
882877   /* TODO: on reset port 2 should be read to determine the operating mode (bits 0-2) */
883   m6800.tcsr = 0x00;
884   m6800.pending_tcsr = 0x00;
885   m6800.irq2 = 0;
878   m68xx.tcsr = 0x00;
879   m68xx.pending_tcsr = 0x00;
880   m68xx.irq2 = 0;
886881   CTD = 0x0000;
887882   OCD = 0xffff;
888883   TOD = 0xffff;
889   m6800.ram_ctrl |= 0x40;
884   m68xx.ram_ctrl |= 0x40;
890885
891   m6800.trcsr = M6800_TRCSR_TDRE;
892   m6800.rmcr = 0;
886   m68xx.trcsr = M6800_TRCSR_TDRE;
887   m68xx.rmcr = 0;
893888   if (m6800_rx_timer) timer_enable(m6800_rx_timer, 0);
894889   if (m6800_tx_timer) timer_enable(m6800_tx_timer, 0);
895   m6800.txstate = M6800_TX_STATE_INIT;
896   m6800.txbits = m6800.rxbits = 0;
897   m6800.trcsr_read = 0;
890   m68xx.txstate = M6800_TX_STATE_INIT;
891   m68xx.txbits = m68xx.rxbits = 0;
892   m68xx.trcsr_read = 0;
898893}
899894
900895/****************************************************************************
901896 * Shut down CPU emulation
902897 ****************************************************************************/
903static void m6800_exit(void)
898static CPU_EXIT( m6800 )
904899{
905900   /* nothing to do */
906901}
r3535r3536
908903/****************************************************************************
909904 * Get all registers in given buffer
910905 ****************************************************************************/
911static void m6800_get_context(void *dst)
906static CPU_GET_CONTEXT( m6800 )
912907{
913908   if( dst )
914      *(m6800_Regs*)dst = m6800;
909      *(m6800_Regs*)dst = m68xx;
915910}
916911
917912
918913/****************************************************************************
919914 * Set all registers to given values
920915 ****************************************************************************/
921static void m6800_set_context(void *src)
916static CPU_SET_CONTEXT( m6800 )
922917{
923918   if( src )
924      m6800 = *(m6800_Regs*)src;
919      m68xx = *(m6800_Regs*)src;
925920   CHANGE_PC();
926921   CHECK_IRQ_LINES(); /* HJB 990417 */
927922}
r3535r3536
931926{
932927   if (irqline == INPUT_LINE_NMI)
933928   {
934      if (m6800.nmi_state == state) return;
929      if (m68xx.nmi_state == state) return;
935930      LOG(("M6800#%d set_nmi_line %d \n", cpu_getactivecpu(), state));
936      m6800.nmi_state = state;
931      m68xx.nmi_state = state;
937932      if (state == CLEAR_LINE) return;
938933
939934      /* NMI */
r3535r3536
943938   {
944939      int eddge;
945940
946      if (m6800.irq_state[irqline] == state) return;
941      if (m68xx.irq_state[irqline] == state) return;
947942      LOG(("M6800#%d set_irq_line %d,%d\n", cpu_getactivecpu(), irqline, state));
948      m6800.irq_state[irqline] = state;
943      m68xx.irq_state[irqline] = state;
949944
950945      switch(irqline)
951946      {
r3535r3536
954949         break;
955950      case M6800_TIN_LINE:
956951         eddge = (state == CLEAR_LINE ) ? 2 : 0;
957         if( ((m6800.tcsr&TCSR_IEDG) ^ (state==CLEAR_LINE ? TCSR_IEDG : 0))==0 )
952         if( ((m68xx.tcsr&TCSR_IEDG) ^ (state==CLEAR_LINE ? TCSR_IEDG : 0))==0 )
958953            return;
959954         /* active edge in */
960         m6800.tcsr |= TCSR_ICF;
961         m6800.pending_tcsr |= TCSR_ICF;
962         m6800.input_capture = CT;
955         m68xx.tcsr |= TCSR_ICF;
956         m68xx.pending_tcsr |= TCSR_ICF;
957         m68xx.input_capture = CT;
963958         MODIFIED_tcsr;
964959         if( !(CC & 0x10) )
965960            m6800_check_irq2();
r3535r3536
974969/****************************************************************************
975970 * Execute cycles CPU cycles. Return number of cycles really executed
976971 ****************************************************************************/
977static int m6800_execute(int cycles)
972static CPU_EXECUTE( m6800 )
978973{
979974   UINT8 ireg;
980975   m6800_ICount = cycles;
981976
982977   CLEANUP_conters;
983   INCREMENT_COUNTER(m6800.extra_cycles);
984   m6800.extra_cycles = 0;
978   INCREMENT_COUNTER(m68xx.extra_cycles);
979   m68xx.extra_cycles = 0;
985980
986981   do
987982   {
988      if( m6800.wai_state & M6800_WAI )
983      if( m68xx.wai_state & M6800_WAI )
989984      {
990985         EAT_CYCLES;
991986      }
r3535r3536
12591254      }
12601255   } while( m6800_ICount>0 );
12611256
1262   INCREMENT_COUNTER(m6800.extra_cycles);
1263   m6800.extra_cycles = 0;
1257   INCREMENT_COUNTER(m68xx.extra_cycles);
1258   m68xx.extra_cycles = 0;
12641259
12651260   return cycles - m6800_ICount;
12661261}
r3535r3536
12691264 * M6801 almost (fully?) equal to the M6803
12701265 ****************************************************************************/
12711266#if (HAS_M6801)
1272static void m6801_init(int index, int clock, const void *config, int (*irqcallback)(int))
1267static CPU_INIT( m6801 )
12731268{
1274//  m6800.subtype = SUBTYPE_M6801;
1275   m6800.insn = m6803_insn;
1276   m6800.cycles = cycles_6803;
1277   m6800.irq_callback = irqcallback;
1269//  m68xx.subtype = SUBTYPE_M6801;
1270   m68xx.insn = m6803_insn;
1271   m68xx.cycles = cycles_6803;
1272   m68xx.irq_callback = irqcallback;
1273   m68xx.device = device;
12781274
1279   m6800.clock = clock;
1275   m68xx.clock = clock;
12801276   m6800_rx_timer = timer_alloc(m6800_rx_tick, NULL);
12811277   m6800_tx_timer = timer_alloc(m6800_tx_tick, NULL);
12821278
r3535r3536
12881284 * M6802 almost (fully?) equal to the M6800
12891285 ****************************************************************************/
12901286#if (HAS_M6802)
1291static void m6802_init(int index, int clock, const void *config, int (*irqcallback)(int))
1287static CPU_INIT( m6802 )
12921288{
1293//  m6800.subtype   = SUBTYPE_M6802;
1294   m6800.insn = m6800_insn;
1295   m6800.cycles = cycles_6800;
1296   m6800.irq_callback = irqcallback;
1289//  m68xx.subtype   = SUBTYPE_M6802;
1290   m68xx.insn = m6800_insn;
1291   m68xx.cycles = cycles_6800;
1292   m68xx.irq_callback = irqcallback;
1293   m68xx.device = device;
12971294   state_register("m6802", index);
12981295}
12991296#endif
r3535r3536
13021299 * M6803 almost (fully?) equal to the M6801
13031300 ****************************************************************************/
13041301#if (HAS_M6803)
1305static void m6803_init(int index, int clock, const void *config, int (*irqcallback)(int))
1302static CPU_INIT( m6803 )
13061303{
1307//  m6800.subtype = SUBTYPE_M6803;
1308   m6800.insn = m6803_insn;
1309   m6800.cycles = cycles_6803;
1310   m6800.irq_callback = irqcallback;
1304//  m68xx.subtype = SUBTYPE_M6803;
1305   m68xx.insn = m6803_insn;
1306   m68xx.cycles = cycles_6803;
1307   m68xx.irq_callback = irqcallback;
1308   m68xx.device = device;
13111309
1312   m6800.clock = clock;
1310   m68xx.clock = clock;
13131311   m6800_rx_timer = timer_alloc(m6800_rx_tick, NULL);
13141312   m6800_tx_timer = timer_alloc(m6800_tx_tick, NULL);
13151313
r3535r3536
13211319 * Execute cycles CPU cycles. Return number of cycles really executed
13221320 ****************************************************************************/
13231321#if (HAS_M6803||HAS_M6801)
1324static int m6803_execute(int cycles)
1322static CPU_EXECUTE( m6803 )
13251323{
13261324   UINT8 ireg;
13271325   m6800_ICount = cycles;
13281326
13291327   CLEANUP_conters;
1330   INCREMENT_COUNTER(m6803.extra_cycles);
1331   m6803.extra_cycles = 0;
1328   INCREMENT_COUNTER(m68xx.extra_cycles);
1329   m68xx.extra_cycles = 0;
13321330
13331331   do
13341332   {
1335      if( m6803.wai_state & M6800_WAI )
1333      if( m68xx.wai_state & M6800_WAI )
13361334      {
13371335         EAT_CYCLES;
13381336      }
r3535r3536
16061604      }
16071605   } while( m6800_ICount>0 );
16081606
1609   INCREMENT_COUNTER(m6803.extra_cycles);
1610   m6803.extra_cycles = 0;
1607   INCREMENT_COUNTER(m68xx.extra_cycles);
1608   m68xx.extra_cycles = 0;
16111609
16121610   return cycles - m6800_ICount;
16131611}
r3535r3536
16301628 * M6808 almost (fully?) equal to the M6800
16311629 ****************************************************************************/
16321630#if (HAS_M6808)
1633static void m6808_init(int index, int clock, const void *config, int (*irqcallback)(int))
1631static CPU_INIT( m6808 )
16341632{
1635//  m6800.subtype = SUBTYPE_M6808;
1636   m6800.insn = m6800_insn;
1637   m6800.cycles = cycles_6800;
1638   m6800.irq_callback = irqcallback;
1633//  m68xx.subtype = SUBTYPE_M6808;
1634   m68xx.insn = m6800_insn;
1635   m68xx.cycles = cycles_6800;
1636   m68xx.irq_callback = irqcallback;
1637   m68xx.device = device;
16391638   state_register("m6808", index);
16401639}
16411640#endif
r3535r3536
16451644 ****************************************************************************/
16461645#if (HAS_HD63701)
16471646
1648static void hd63701_init(int index, int clock, const void *config, int (*irqcallback)(int))
1647static CPU_INIT( hd63701 )
16491648{
1650//  m6800.subtype = SUBTYPE_HD63701;
1651   m6800.insn = hd63701_insn;
1652   m6800.cycles = cycles_63701;
1653   m6800.irq_callback = irqcallback;
1649//  m68xx.subtype = SUBTYPE_HD63701;
1650   m68xx.insn = hd63701_insn;
1651   m68xx.cycles = cycles_63701;
1652   m68xx.irq_callback = irqcallback;
1653   m68xx.device = device;
16541654
1655   m6800.clock = clock;
1655   m68xx.clock = clock;
16561656   m6800_rx_timer = timer_alloc(m6800_rx_tick, NULL);
16571657   m6800_tx_timer = timer_alloc(m6800_tx_tick, NULL);
16581658
r3535r3536
16611661/****************************************************************************
16621662 * Execute cycles CPU cycles. Return number of cycles really executed
16631663 ****************************************************************************/
1664static int hd63701_execute(int cycles)
1664static CPU_EXECUTE( hd63701 )
16651665{
16661666   UINT8 ireg;
16671667   m6800_ICount = cycles;
16681668
16691669   CLEANUP_conters;
1670   INCREMENT_COUNTER(hd63701.extra_cycles);
1671   hd63701.extra_cycles = 0;
1670   INCREMENT_COUNTER(m68xx.extra_cycles);
1671   m68xx.extra_cycles = 0;
16721672
16731673   do
16741674   {
1675      if( hd63701.wai_state & (HD63701_WAI|HD63701_SLP) )
1675      if( m68xx.wai_state & (HD63701_WAI|HD63701_SLP) )
16761676      {
16771677         EAT_CYCLES;
16781678      }
r3535r3536
19461946      }
19471947   } while( m6800_ICount>0 );
19481948
1949   INCREMENT_COUNTER(hd63701.extra_cycles);
1950   hd63701.extra_cycles = 0;
1949   INCREMENT_COUNTER(m68xx.extra_cycles);
1950   m68xx.extra_cycles = 0;
19511951
19521952   return cycles - m6800_ICount;
19531953}
r3535r3536
19831983 * is at least one new opcode ($fc)
19841984 ****************************************************************************/
19851985#if (HAS_NSC8105)
1986static void nsc8105_init(int index, int clock, const void *config, int (*irqcallback)(int))
1986static CPU_INIT( nsc8105 )
19871987{
1988//  m6800.subtype = SUBTYPE_NSC8105;
1989   m6800.insn = nsc8105_insn;
1990   m6800.cycles = cycles_nsc8105;
1988//  m68xx.subtype = SUBTYPE_NSC8105;
1989   m68xx.insn = nsc8105_insn;
1990   m68xx.cycles = cycles_nsc8105;
19911991   state_register("nsc8105", index);
19921992}
19931993/****************************************************************************
19941994 * Execute cycles CPU cycles. Return number of cycles really executed
19951995 ****************************************************************************/
1996static int nsc8105_execute(int cycles)
1996static CPU_EXECUTE( nsc8105 )
19971997{
19981998   UINT8 ireg;
19991999   m6800_ICount = cycles;
20002000
20012001   CLEANUP_conters;
2002   INCREMENT_COUNTER(nsc8105.extra_cycles);
2003   nsc8105.extra_cycles = 0;
2002   INCREMENT_COUNTER(m68xx.extra_cycles);
2003   m68xx.extra_cycles = 0;
20042004
20052005   do
20062006   {
2007      if( nsc8105.wai_state & NSC8105_WAI )
2007      if( m68xx.wai_state & NSC8105_WAI )
20082008      {
20092009         EAT_CYCLES;
20102010      }
r3535r3536
22782278      }
22792279   } while( m6800_ICount>0 );
22802280
2281   INCREMENT_COUNTER(nsc8105.extra_cycles);
2282   nsc8105.extra_cycles = 0;
2281   INCREMENT_COUNTER(m68xx.extra_cycles);
2282   m68xx.extra_cycles = 0;
22832283
22842284   return cycles - m6800_ICount;
22852285}
r3535r3536
22932293   switch (offset)
22942294   {
22952295      case 0x00:
2296         return m6800.port1_ddr;
2296         return m68xx.port1_ddr;
22972297      case 0x01:
2298         return m6800.port2_ddr;
2298         return m68xx.port2_ddr;
22992299      case 0x02:
2300         return (io_read_byte_8be(M6803_PORT1) & (m6800.port1_ddr ^ 0xff))
2301               | (m6800.port1_data & m6800.port1_ddr);
2300         return (io_read_byte_8be(M6803_PORT1) & (m68xx.port1_ddr ^ 0xff))
2301               | (m68xx.port1_data & m68xx.port1_ddr);
23022302      case 0x03:
2303         return (io_read_byte_8be(M6803_PORT2) & (m6800.port2_ddr ^ 0xff))
2304               | (m6800.port2_data & m6800.port2_ddr);
2303         return (io_read_byte_8be(M6803_PORT2) & (m68xx.port2_ddr ^ 0xff))
2304               | (m68xx.port2_data & m68xx.port2_ddr);
23052305      case 0x04:
2306         return m6800.port3_ddr;
2306         return m68xx.port3_ddr;
23072307      case 0x05:
2308         return m6800.port4_ddr;
2308         return m68xx.port4_ddr;
23092309      case 0x06:
2310         return (io_read_byte_8be(M6803_PORT3) & (m6800.port3_ddr ^ 0xff))
2311               | (m6800.port3_data & m6800.port3_ddr);
2310         return (io_read_byte_8be(M6803_PORT3) & (m68xx.port3_ddr ^ 0xff))
2311               | (m68xx.port3_data & m68xx.port3_ddr);
23122312      case 0x07:
2313         return (io_read_byte_8be(M6803_PORT4) & (m6800.port4_ddr ^ 0xff))
2314               | (m6800.port4_data & m6800.port4_ddr);
2313         return (io_read_byte_8be(M6803_PORT4) & (m68xx.port4_ddr ^ 0xff))
2314               | (m68xx.port4_data & m68xx.port4_ddr);
23152315      case 0x08:
2316         m6800.pending_tcsr = 0;
2317         return m6800.tcsr;
2316         m68xx.pending_tcsr = 0;
2317         return m68xx.tcsr;
23182318      case 0x09:
2319         if(!(m6800.pending_tcsr&TCSR_TOF))
2319         if(!(m68xx.pending_tcsr&TCSR_TOF))
23202320         {
2321            m6800.tcsr &= ~TCSR_TOF;
2321            m68xx.tcsr &= ~TCSR_TOF;
23222322            MODIFIED_tcsr;
23232323         }
2324         return m6800.counter.b.h;
2324         return m68xx.counter.b.h;
23252325      case 0x0a:
2326         return m6800.counter.b.l;
2326         return m68xx.counter.b.l;
23272327      case 0x0b:
2328         if(!(m6800.pending_tcsr&TCSR_OCF))
2328         if(!(m68xx.pending_tcsr&TCSR_OCF))
23292329         {
2330            m6800.tcsr &= ~TCSR_OCF;
2330            m68xx.tcsr &= ~TCSR_OCF;
23312331            MODIFIED_tcsr;
23322332         }
2333         return m6800.output_compare.b.h;
2333         return m68xx.output_compare.b.h;
23342334      case 0x0c:
2335         if(!(m6800.pending_tcsr&TCSR_OCF))
2335         if(!(m68xx.pending_tcsr&TCSR_OCF))
23362336         {
2337            m6800.tcsr &= ~TCSR_OCF;
2337            m68xx.tcsr &= ~TCSR_OCF;
23382338            MODIFIED_tcsr;
23392339         }
2340         return m6800.output_compare.b.l;
2340         return m68xx.output_compare.b.l;
23412341      case 0x0d:
2342         if(!(m6800.pending_tcsr&TCSR_ICF))
2342         if(!(m68xx.pending_tcsr&TCSR_ICF))
23432343         {
2344            m6800.tcsr &= ~TCSR_ICF;
2344            m68xx.tcsr &= ~TCSR_ICF;
23452345            MODIFIED_tcsr;
23462346         }
2347         return (m6800.input_capture >> 0) & 0xff;
2347         return (m68xx.input_capture >> 0) & 0xff;
23482348      case 0x0e:
2349         return (m6800.input_capture >> 8) & 0xff;
2349         return (m68xx.input_capture >> 8) & 0xff;
23502350      case 0x0f:
23512351         logerror("CPU #%d PC %04x: warning - read from unsupported register %02x\n",cpu_getactivecpu(),activecpu_get_pc(),offset);
23522352         return 0;
23532353      case 0x10:
2354         return m6800.rmcr;
2354         return m68xx.rmcr;
23552355      case 0x11:
2356         m6800.trcsr_read = 1;
2357         return m6800.trcsr;
2356         m68xx.trcsr_read = 1;
2357         return m68xx.trcsr;
23582358      case 0x12:
2359         if (m6800.trcsr_read)
2359         if (m68xx.trcsr_read)
23602360         {
2361            m6800.trcsr_read = 0;
2362            m6800.trcsr = m6800.trcsr & 0x3f;
2361            m68xx.trcsr_read = 0;
2362            m68xx.trcsr = m68xx.trcsr & 0x3f;
23632363         }
2364         return m6800.rdr;
2364         return m68xx.rdr;
23652365      case 0x13:
2366         return m6800.tdr;
2366         return m68xx.tdr;
23672367      case 0x14:
23682368         logerror("CPU #%d PC %04x: read RAM control register\n",cpu_getactivecpu(),activecpu_get_pc());
2369         return m6800.ram_ctrl;
2369         return m68xx.ram_ctrl;
23702370      case 0x15:
23712371      case 0x16:
23722372      case 0x17:
r3535r3536
23912391   switch (offset)
23922392   {
23932393      case 0x00:
2394         if (m6800.port1_ddr != data)
2394         if (m68xx.port1_ddr != data)
23952395         {
2396            m6800.port1_ddr = data;
2397            if(m6800.port1_ddr == 0xff)
2398               io_write_byte_8be(M6803_PORT1,m6800.port1_data);
2396            m68xx.port1_ddr = data;
2397            if(m68xx.port1_ddr == 0xff)
2398               io_write_byte_8be(M6803_PORT1,m68xx.port1_data);
23992399            else
2400               io_write_byte_8be(M6803_PORT1,(m6800.port1_data & m6800.port1_ddr)
2401                  | (io_read_byte_8be(M6803_PORT1) & (m6800.port1_ddr ^ 0xff)));
2400               io_write_byte_8be(M6803_PORT1,(m68xx.port1_data & m68xx.port1_ddr)
2401                  | (io_read_byte_8be(M6803_PORT1) & (m68xx.port1_ddr ^ 0xff)));
24022402         }
24032403         break;
24042404      case 0x01:
2405         if (m6800.port2_ddr != data)
2405         if (m68xx.port2_ddr != data)
24062406         {
2407            m6800.port2_ddr = data;
2408            if(m6800.port2_ddr == 0xff)
2409               io_write_byte_8be(M6803_PORT2,m6800.port2_data);
2407            m68xx.port2_ddr = data;
2408            if(m68xx.port2_ddr == 0xff)
2409               io_write_byte_8be(M6803_PORT2,m68xx.port2_data);
24102410            else
2411               io_write_byte_8be(M6803_PORT2,(m6800.port2_data & m6800.port2_ddr)
2412                  | (io_read_byte_8be(M6803_PORT2) & (m6800.port2_ddr ^ 0xff)));
2411               io_write_byte_8be(M6803_PORT2,(m68xx.port2_data & m68xx.port2_ddr)
2412                  | (io_read_byte_8be(M6803_PORT2) & (m68xx.port2_ddr ^ 0xff)));
24132413
2414            if (m6800.port2_ddr & 2)
2414            if (m68xx.port2_ddr & 2)
24152415               logerror("CPU #%d PC %04x: warning - port 2 bit 1 set as output (OLVL) - not supported\n",cpu_getactivecpu(),activecpu_get_pc());
24162416         }
24172417         break;
24182418      case 0x02:
2419         m6800.port1_data = data;
2420         if(m6800.port1_ddr == 0xff)
2421            io_write_byte_8be(M6803_PORT1,m6800.port1_data);
2419         m68xx.port1_data = data;
2420         if(m68xx.port1_ddr == 0xff)
2421            io_write_byte_8be(M6803_PORT1,m68xx.port1_data);
24222422         else
2423            io_write_byte_8be(M6803_PORT1,(m6800.port1_data & m6800.port1_ddr)
2424               | (io_read_byte_8be(M6803_PORT1) & (m6800.port1_ddr ^ 0xff)));
2423            io_write_byte_8be(M6803_PORT1,(m68xx.port1_data & m68xx.port1_ddr)
2424               | (io_read_byte_8be(M6803_PORT1) & (m68xx.port1_ddr ^ 0xff)));
24252425         break;
24262426      case 0x03:
2427         if (m6800.trcsr & M6800_TRCSR_TE)
2427         if (m68xx.trcsr & M6800_TRCSR_TE)
24282428         {
2429            m6800.port2_data = (data & 0xef) | (m6800.tx << 4);
2429            m68xx.port2_data = (data & 0xef) | (m68xx.tx << 4);
24302430         }
24312431         else
24322432         {
2433            m6800.port2_data = data;
2433            m68xx.port2_data = data;
24342434         }
2435         if(m6800.port2_ddr == 0xff)
2436            io_write_byte_8be(M6803_PORT2,m6800.port2_data);
2435         if(m68xx.port2_ddr == 0xff)
2436            io_write_byte_8be(M6803_PORT2,m68xx.port2_data);
24372437         else
2438            io_write_byte_8be(M6803_PORT2,(m6800.port2_data & m6800.port2_ddr)
2439               | (io_read_byte_8be(M6803_PORT2) & (m6800.port2_ddr ^ 0xff)));
2438            io_write_byte_8be(M6803_PORT2,(m68xx.port2_data & m68xx.port2_ddr)
2439               | (io_read_byte_8be(M6803_PORT2) & (m68xx.port2_ddr ^ 0xff)));
24402440         break;
24412441      case 0x04:
2442         if (m6800.port3_ddr != data)
2442         if (m68xx.port3_ddr != data)
24432443         {
2444            m6800.port3_ddr = data;
2445            if(m6800.port3_ddr == 0xff)
2446               io_write_byte_8be(M6803_PORT3,m6800.port3_data);
2444            m68xx.port3_ddr = data;
2445            if(m68xx.port3_ddr == 0xff)
2446               io_write_byte_8be(M6803_PORT3,m68xx.port3_data);
24472447            else
2448               io_write_byte_8be(M6803_PORT3,(m6800.port3_data & m6800.port3_ddr)
2449                  | (io_read_byte_8be(M6803_PORT3) & (m6800.port3_ddr ^ 0xff)));
2448               io_write_byte_8be(M6803_PORT3,(m68xx.port3_data & m68xx.port3_ddr)
2449                  | (io_read_byte_8be(M6803_PORT3) & (m68xx.port3_ddr ^ 0xff)));
24502450         }
24512451         break;
24522452      case 0x05:
2453         if (m6800.port4_ddr != data)
2453         if (m68xx.port4_ddr != data)
24542454         {
2455            m6800.port4_ddr = data;
2456            if(m6800.port4_ddr == 0xff)
2457               io_write_byte_8be(M6803_PORT4,m6800.port4_data);
2455            m68xx.port4_ddr = data;
2456            if(m68xx.port4_ddr == 0xff)
2457               io_write_byte_8be(M6803_PORT4,m68xx.port4_data);
24582458            else
2459               io_write_byte_8be(M6803_PORT4,(m6800.port4_data & m6800.port4_ddr)
2460                  | (io_read_byte_8be(M6803_PORT4) & (m6800.port4_ddr ^ 0xff)));
2459               io_write_byte_8be(M6803_PORT4,(m68xx.port4_data & m68xx.port4_ddr)
2460                  | (io_read_byte_8be(M6803_PORT4) & (m68xx.port4_ddr ^ 0xff)));
24612461         }
24622462         break;
24632463      case 0x06:
2464         m6800.port3_data = data;
2465         if(m6800.port3_ddr == 0xff)
2466            io_write_byte_8be(M6803_PORT3,m6800.port3_data);
2464         m68xx.port3_data = data;
2465         if(m68xx.port3_ddr == 0xff)
2466            io_write_byte_8be(M6803_PORT3,m68xx.port3_data);
24672467         else
2468            io_write_byte_8be(M6803_PORT3,(m6800.port3_data & m6800.port3_ddr)
2469               | (io_read_byte_8be(M6803_PORT3) & (m6800.port3_ddr ^ 0xff)));
2468            io_write_byte_8be(M6803_PORT3,(m68xx.port3_data & m68xx.port3_ddr)
2469               | (io_read_byte_8be(M6803_PORT3) & (m68xx.port3_ddr ^ 0xff)));
24702470         break;
24712471      case 0x07:
2472         m6800.port4_data = data;
2473         if(m6800.port4_ddr == 0xff)
2474            io_write_byte_8be(M6803_PORT4,m6800.port4_data);
2472         m68xx.port4_data = data;
2473         if(m68xx.port4_ddr == 0xff)
2474            io_write_byte_8be(M6803_PORT4,m68xx.port4_data);
24752475         else
2476            io_write_byte_8be(M6803_PORT4,(m6800.port4_data & m6800.port4_ddr)
2477               | (io_read_byte_8be(M6803_PORT4) & (m6800.port4_ddr ^ 0xff)));
2476            io_write_byte_8be(M6803_PORT4,(m68xx.port4_data & m68xx.port4_ddr)
2477               | (io_read_byte_8be(M6803_PORT4) & (m68xx.port4_ddr ^ 0xff)));
24782478         break;
24792479      case 0x08:
2480         m6800.tcsr = data;
2481         m6800.pending_tcsr &= m6800.tcsr;
2480         m68xx.tcsr = data;
2481         m68xx.pending_tcsr &= m68xx.tcsr;
24822482         MODIFIED_tcsr;
24832483         if( !(CC & 0x10) )
24842484            m6800_check_irq2();
r3535r3536
24952495         MODIFIED_counters;
24962496         break;
24972497      case 0x0b:
2498         if( m6800.output_compare.b.h != data)
2498         if( m68xx.output_compare.b.h != data)
24992499         {
2500            m6800.output_compare.b.h = data;
2500            m68xx.output_compare.b.h = data;
25012501            MODIFIED_counters;
25022502         }
25032503         break;
25042504      case 0x0c:
2505         if( m6800.output_compare.b.l != data)
2505         if( m68xx.output_compare.b.l != data)
25062506         {
2507            m6800.output_compare.b.l = data;
2507            m68xx.output_compare.b.l = data;
25082508            MODIFIED_counters;
25092509         }
25102510         break;
r3535r3536
25172517         logerror("CPU #%d PC %04x: warning - write %02x to unsupported internal register %02x\n",cpu_getactivecpu(),activecpu_get_pc(),data,offset);
25182518         break;
25192519      case 0x10:
2520         m6800.rmcr = data & 0x0f;
2520         m68xx.rmcr = data & 0x0f;
25212521
2522         switch ((m6800.rmcr & M6800_RMCR_CC_MASK) >> 2)
2522         switch ((m68xx.rmcr & M6800_RMCR_CC_MASK) >> 2)
25232523         {
25242524         case 0:
25252525         case 3: // not implemented
r3535r3536
25302530         case 1:
25312531         case 2:
25322532            {
2533               int divisor = M6800_RMCR_SS[m6800.rmcr & M6800_RMCR_SS_MASK];
2533               int divisor = M6800_RMCR_SS[m68xx.rmcr & M6800_RMCR_SS_MASK];
25342534
2535               timer_adjust_periodic(m6800_rx_timer, attotime_zero, cpu_getactivecpu(), ATTOTIME_IN_HZ(m6800.clock / divisor));
2536               timer_adjust_periodic(m6800_tx_timer, attotime_zero, cpu_getactivecpu(), ATTOTIME_IN_HZ(m6800.clock / divisor));
2535               timer_adjust_periodic(m6800_rx_timer, attotime_zero, cpu_getactivecpu(), ATTOTIME_IN_HZ(m68xx.clock / divisor));
2536               timer_adjust_periodic(m6800_tx_timer, attotime_zero, cpu_getactivecpu(), ATTOTIME_IN_HZ(m68xx.clock / divisor));
25372537            }
25382538            break;
25392539         }
25402540         break;
25412541      case 0x11:
2542         if ((data & M6800_TRCSR_TE) && !(m6800.trcsr & M6800_TRCSR_TE))
2542         if ((data & M6800_TRCSR_TE) && !(m68xx.trcsr & M6800_TRCSR_TE))
25432543         {
2544            m6800.txstate = M6800_TX_STATE_INIT;
2544            m68xx.txstate = M6800_TX_STATE_INIT;
25452545         }
2546         m6800.trcsr = (m6800.trcsr & 0xe0) | (data & 0x1f);
2546         m68xx.trcsr = (m68xx.trcsr & 0xe0) | (data & 0x1f);
25472547         break;
25482548      case 0x13:
2549         if (m6800.trcsr_read)
2549         if (m68xx.trcsr_read)
25502550         {
2551            m6800.trcsr_read = 0;
2552            m6800.trcsr &= ~M6800_TRCSR_TDRE;
2551            m68xx.trcsr_read = 0;
2552            m68xx.trcsr &= ~M6800_TRCSR_TDRE;
25532553         }
2554         m6800.tdr = data;
2554         m68xx.tdr = data;
25552555         break;
25562556      case 0x14:
25572557         logerror("CPU #%d PC %04x: write %02x to RAM control register\n",cpu_getactivecpu(),activecpu_get_pc(),data);
2558         m6800.ram_ctrl = data;
2558         m68xx.ram_ctrl = data;
25592559         break;
25602560      case 0x15:
25612561      case 0x16:
r3535r3536
25802580 * Generic set_info
25812581 **************************************************************************/
25822582
2583static void m6800_set_info(UINT32 state, cpuinfo *info)
2583static CPU_SET_INFO( m6800 )
25842584{
25852585   switch (state)
25862586   {
r3535r3536
25902590      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   set_irq_line(INPUT_LINE_NMI, info->i);   break;
25912591
25922592      case CPUINFO_INT_PC:                     PC = info->i; CHANGE_PC();            break;
2593      case CPUINFO_INT_REGISTER + M6800_PC:         m6800.pc.w.l = info->i;               break;
2593      case CPUINFO_INT_REGISTER + M6800_PC:         m68xx.pc.w.l = info->i;               break;
25942594      case CPUINFO_INT_SP:                     S = info->i;                     break;
2595      case CPUINFO_INT_REGISTER + M6800_S:         m6800.s.w.l = info->i;               break;
2596      case CPUINFO_INT_REGISTER + M6800_CC:         m6800.cc = info->i;                  break;
2597      case CPUINFO_INT_REGISTER + M6800_A:         m6800.d.b.h = info->i;               break;
2598      case CPUINFO_INT_REGISTER + M6800_B:         m6800.d.b.l = info->i;               break;
2599      case CPUINFO_INT_REGISTER + M6800_X:         m6800.x.w.l = info->i;               break;
2595      case CPUINFO_INT_REGISTER + M6800_S:         m68xx.s.w.l = info->i;               break;
2596      case CPUINFO_INT_REGISTER + M6800_CC:         m68xx.cc = info->i;                  break;
2597      case CPUINFO_INT_REGISTER + M6800_A:         m68xx.d.b.h = info->i;               break;
2598      case CPUINFO_INT_REGISTER + M6800_B:         m68xx.d.b.l = info->i;               break;
2599      case CPUINFO_INT_REGISTER + M6800_X:         m68xx.x.w.l = info->i;               break;
26002600   }
26012601}
26022602
r3535r3536
26062606 * Generic get_info
26072607 **************************************************************************/
26082608
2609void m6800_get_info(UINT32 state, cpuinfo *info)
2609CPU_GET_INFO( m6800 )
26102610{
26112611   switch (state)
26122612   {
26132613      /* --- the following bits of info are returned as 64-bit signed integers --- */
2614      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(m6800);            break;
2614      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(m68xx);            break;
26152615      case CPUINFO_INT_INPUT_LINES:               info->i = 2;                     break;
26162616      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:         info->i = 0;                     break;
26172617      case CPUINFO_INT_ENDIANNESS:               info->i = CPU_IS_BE;               break;
r3535r3536
26322632      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 0;               break;
26332633      case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:       info->i = 0;               break;
26342634
2635      case CPUINFO_INT_INPUT_STATE + M6800_IRQ_LINE:   info->i = m6800.irq_state[M6800_IRQ_LINE]; break;
2636      case CPUINFO_INT_INPUT_STATE + M6800_TIN_LINE:   info->i = m6800.irq_state[M6800_TIN_LINE]; break;
2637      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   info->i = m6800.nmi_state;            break;
2635      case CPUINFO_INT_INPUT_STATE + M6800_IRQ_LINE:   info->i = m68xx.irq_state[M6800_IRQ_LINE]; break;
2636      case CPUINFO_INT_INPUT_STATE + M6800_TIN_LINE:   info->i = m68xx.irq_state[M6800_TIN_LINE]; break;
2637      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   info->i = m68xx.nmi_state;            break;
26382638
2639      case CPUINFO_INT_PREVIOUSPC:               info->i = m6800.ppc.w.l;            break;
2639      case CPUINFO_INT_PREVIOUSPC:               info->i = m68xx.ppc.w.l;            break;
26402640
26412641      case CPUINFO_INT_PC:                     info->i = PC;                     break;
2642      case CPUINFO_INT_REGISTER + M6800_PC:         info->i = m6800.pc.w.l;               break;
2642      case CPUINFO_INT_REGISTER + M6800_PC:         info->i = m68xx.pc.w.l;               break;
26432643      case CPUINFO_INT_SP:                     info->i = S;                     break;
2644      case CPUINFO_INT_REGISTER + M6800_S:         info->i = m6800.s.w.l;               break;
2645      case CPUINFO_INT_REGISTER + M6800_CC:         info->i = m6800.cc;                  break;
2646      case CPUINFO_INT_REGISTER + M6800_A:         info->i = m6800.d.b.h;               break;
2647      case CPUINFO_INT_REGISTER + M6800_B:         info->i = m6800.d.b.l;               break;
2648      case CPUINFO_INT_REGISTER + M6800_X:         info->i = m6800.x.w.l;               break;
2649      case CPUINFO_INT_REGISTER + M6800_WAI_STATE:   info->i = m6800.wai_state;            break;
2644      case CPUINFO_INT_REGISTER + M6800_S:         info->i = m68xx.s.w.l;               break;
2645      case CPUINFO_INT_REGISTER + M6800_CC:         info->i = m68xx.cc;                  break;
2646      case CPUINFO_INT_REGISTER + M6800_A:         info->i = m68xx.d.b.h;               break;
2647      case CPUINFO_INT_REGISTER + M6800_B:         info->i = m68xx.d.b.l;               break;
2648      case CPUINFO_INT_REGISTER + M6800_X:         info->i = m68xx.x.w.l;               break;
2649      case CPUINFO_INT_REGISTER + M6800_WAI_STATE:   info->i = m68xx.wai_state;            break;
26502650
26512651      /* --- the following bits of info are returned as pointers to data or functions --- */
2652      case CPUINFO_PTR_SET_INFO:                  info->setinfo = m6800_set_info;         break;
2653      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = m6800_get_context;   break;
2654      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = m6800_set_context;   break;
2655      case CPUINFO_PTR_INIT:                     info->init = m6800_init;            break;
2656      case CPUINFO_PTR_RESET:                     info->reset = m6800_reset;            break;
2657      case CPUINFO_PTR_EXIT:                     info->exit = m6800_exit;            break;
2658      case CPUINFO_PTR_EXECUTE:                  info->execute = m6800_execute;         break;
2652      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(m6800);         break;
2653      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(m6800);   break;
2654      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(m6800);   break;
2655      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m6800);            break;
2656      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(m6800);            break;
2657      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(m6800);            break;
2658      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m6800);         break;
26592659      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
2660      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m6800_dasm;         break;
2660      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m6800);         break;
26612661      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &m6800_ICount;         break;
26622662
26632663      /* --- the following bits of info are returned as NULL-terminated strings --- */
r3535r3536
26692669
26702670      case CPUINFO_STR_FLAGS:
26712671         sprintf(info->s, "%c%c%c%c%c%c%c%c",
2672            m6800.cc & 0x80 ? '?':'.',
2673            m6800.cc & 0x40 ? '?':'.',
2674            m6800.cc & 0x20 ? 'H':'.',
2675            m6800.cc & 0x10 ? 'I':'.',
2676            m6800.cc & 0x08 ? 'N':'.',
2677            m6800.cc & 0x04 ? 'Z':'.',
2678            m6800.cc & 0x02 ? 'V':'.',
2679            m6800.cc & 0x01 ? 'C':'.');
2672            m68xx.cc & 0x80 ? '?':'.',
2673            m68xx.cc & 0x40 ? '?':'.',
2674            m68xx.cc & 0x20 ? 'H':'.',
2675            m68xx.cc & 0x10 ? 'I':'.',
2676            m68xx.cc & 0x08 ? 'N':'.',
2677            m68xx.cc & 0x04 ? 'Z':'.',
2678            m68xx.cc & 0x02 ? 'V':'.',
2679            m68xx.cc & 0x01 ? 'C':'.');
26802680         break;
26812681
2682      case CPUINFO_STR_REGISTER + M6800_A:         sprintf(info->s, "A:%02X", m6800.d.b.h); break;
2683      case CPUINFO_STR_REGISTER + M6800_B:         sprintf(info->s, "B:%02X", m6800.d.b.l); break;
2684      case CPUINFO_STR_REGISTER + M6800_PC:         sprintf(info->s, "PC:%04X", m6800.pc.w.l); break;
2685      case CPUINFO_STR_REGISTER + M6800_S:         sprintf(info->s, "S:%04X", m6800.s.w.l); break;
2686      case CPUINFO_STR_REGISTER + M6800_X:         sprintf(info->s, "X:%04X", m6800.x.w.l); break;
2687      case CPUINFO_STR_REGISTER + M6800_CC:         sprintf(info->s, "CC:%02X", m6800.cc); break;
2688      case CPUINFO_STR_REGISTER + M6800_WAI_STATE:   sprintf(info->s, "WAI:%X", m6800.wai_state); break;
2682      case CPUINFO_STR_REGISTER + M6800_A:         sprintf(info->s, "A:%02X", m68xx.d.b.h); break;
2683      case CPUINFO_STR_REGISTER + M6800_B:         sprintf(info->s, "B:%02X", m68xx.d.b.l); break;
2684      case CPUINFO_STR_REGISTER + M6800_PC:         sprintf(info->s, "PC:%04X", m68xx.pc.w.l); break;
2685      case CPUINFO_STR_REGISTER + M6800_S:         sprintf(info->s, "S:%04X", m68xx.s.w.l); break;
2686      case CPUINFO_STR_REGISTER + M6800_X:         sprintf(info->s, "X:%04X", m68xx.x.w.l); break;
2687      case CPUINFO_STR_REGISTER + M6800_CC:         sprintf(info->s, "CC:%02X", m68xx.cc); break;
2688      case CPUINFO_STR_REGISTER + M6800_WAI_STATE:   sprintf(info->s, "WAI:%X", m68xx.wai_state); break;
26892689   }
26902690}
26912691
r3535r3536
26952695 * CPU-specific set_info
26962696 **************************************************************************/
26972697
2698void m6801_get_info(UINT32 state, cpuinfo *info)
2698CPU_GET_INFO( m6801 )
26992699{
27002700   switch (state)
27012701   {
r3535r3536
27052705      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 9;               break;
27062706
27072707      /* --- the following bits of info are returned as pointers to data or functions --- */
2708      case CPUINFO_PTR_INIT:                     info->init = m6801_init;            break;
2709      case CPUINFO_PTR_EXECUTE:                  info->execute = m6803_execute;         break;
2710      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m6801_dasm;         break;
2708      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m6801);            break;
2709      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m6803);         break;
2710      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m6801);         break;
27112711
27122712      /* --- the following bits of info are returned as NULL-terminated strings --- */
27132713      case CPUINFO_STR_NAME:                     strcpy(info->s, "M6801");            break;
27142714
2715      default:                              m6800_get_info(state, info);         break;
2715      default:                              CPU_GET_INFO_CALL(m6800);            break;
27162716   }
27172717}
27182718#endif
r3535r3536
27232723 * CPU-specific set_info
27242724 **************************************************************************/
27252725
2726void m6802_get_info(UINT32 state, cpuinfo *info)
2726CPU_GET_INFO( m6802 )
27272727{
27282728   switch (state)
27292729   {
r3535r3536
27312731      case CPUINFO_INT_CLOCK_DIVIDER:               info->i = 4;                     break;
27322732
27332733      /* --- the following bits of info are returned as pointers to data or functions --- */
2734      case CPUINFO_PTR_INIT:                     info->init = m6802_init;            break;
2735      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m6802_dasm;         break;
2734      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m6802);            break;
2735      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m6802);         break;
27362736
27372737      /* --- the following bits of info are returned as NULL-terminated strings --- */
27382738      case CPUINFO_STR_NAME:                     strcpy(info->s, "M6802");            break;
27392739
2740      default:                              m6800_get_info(state, info);         break;
2740      default:                              CPU_GET_INFO_CALL(m6800);            break;
27412741   }
27422742}
27432743#endif
r3535r3536
27482748 * CPU-specific set_info
27492749 **************************************************************************/
27502750
2751void m6803_get_info(UINT32 state, cpuinfo *info)
2751CPU_GET_INFO( m6803 )
27522752{
27532753   switch (state)
27542754   {
r3535r3536
27582758      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 9;               break;
27592759
27602760      /* --- the following bits of info are returned as pointers to data or functions --- */
2761      case CPUINFO_PTR_INIT:                     info->init = m6803_init;            break;
2762      case CPUINFO_PTR_EXECUTE:                  info->execute = m6803_execute;         break;
2763      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m6803_dasm;         break;
2761      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m6803);            break;
2762      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(m6803);         break;
2763      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m6803);         break;
27642764
2765      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = address_map_m6803_mem; break;
2765      case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(m6803_mem); break;
27662766
27672767      /* --- the following bits of info are returned as NULL-terminated strings --- */
27682768      case CPUINFO_STR_NAME:                     strcpy(info->s, "M6803");            break;
27692769
2770      default:                              m6800_get_info(state, info);         break;
2770      default:                              CPU_GET_INFO_CALL(m6800);            break;
27712771   }
27722772}
27732773#endif
r3535r3536
27782778 * CPU-specific set_info
27792779 **************************************************************************/
27802780
2781void m6808_get_info(UINT32 state, cpuinfo *info)
2781CPU_GET_INFO( m6808 )
27822782{
27832783   switch (state)
27842784   {
r3535r3536
27862786      case CPUINFO_INT_CLOCK_DIVIDER:               info->i = 4;                     break;
27872787
27882788      /* --- the following bits of info are returned as pointers to data or functions --- */
2789      case CPUINFO_PTR_INIT:                     info->init = m6808_init;            break;
2790      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = m6808_dasm;         break;
2789      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(m6808);            break;
2790      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(m6808);         break;
27912791
27922792      /* --- the following bits of info are returned as NULL-terminated strings --- */
27932793      case CPUINFO_STR_NAME:                     strcpy(info->s, "M6808");            break;
27942794
2795      default:                              m6800_get_info(state, info);         break;
2795      default:                              CPU_GET_INFO_CALL(m6800);            break;
27962796   }
27972797}
27982798#endif
r3535r3536
28032803 * CPU-specific set_info
28042804 **************************************************************************/
28052805
2806void hd63701_get_info(UINT32 state, cpuinfo *info)
2806CPU_GET_INFO( hd63701 )
28072807{
28082808   switch (state)
28092809   {
r3535r3536
28132813      case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:       info->i = 9;               break;
28142814
28152815      /* --- the following bits of info are returned as pointers to data or functions --- */
2816      case CPUINFO_PTR_INIT:                     info->init = hd63701_init;            break;
2817      case CPUINFO_PTR_EXECUTE:                  info->execute = hd63701_execute;      break;
2818      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = hd63701_dasm;      break;
2816      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(hd63701);            break;
2817      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(hd63701);      break;
2818      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(hd63701);      break;
28192819
28202820      /* --- the following bits of info are returned as NULL-terminated strings --- */
28212821      case CPUINFO_STR_NAME:                     strcpy(info->s, "HD63701");            break;
28222822
2823      default:                              m6800_get_info(state, info);         break;
2823      default:                              CPU_GET_INFO_CALL(m6800);            break;
28242824   }
28252825}
28262826#endif
r3535r3536
28312831 * CPU-specific set_info
28322832 **************************************************************************/
28332833
2834void nsc8105_get_info(UINT32 state, cpuinfo *info)
2834CPU_GET_INFO( nsc8105 )
28352835{
28362836   switch (state)
28372837   {
r3535r3536
28392839      case CPUINFO_INT_CLOCK_DIVIDER:               info->i = 4;                     break;
28402840
28412841      /* --- the following bits of info are returned as pointers to data or functions --- */
2842      case CPUINFO_PTR_INIT:                     info->init = nsc8105_init;            break;
2843      case CPUINFO_PTR_EXECUTE:                  info->execute = nsc8105_execute;      break;
2844      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = nsc8105_dasm;      break;
2842      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(nsc8105);            break;
2843      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(nsc8105);      break;
2844      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(nsc8105);      break;
28452845
28462846      /* --- the following bits of info are returned as NULL-terminated strings --- */
28472847      case CPUINFO_STR_NAME:                     strcpy(info->s, "NSC8105");            break;
28482848
2849      default:                              m6800_get_info(state, info);         break;
2849      default:                              CPU_GET_INFO_CALL(m6800);            break;
28502850   }
28512851}
28522852#endif
src/emu/cpu/cp1610/cp1610.h
r3535r3536
3636#define CP1610_INT_INTR      INPUT_LINE_NMI   /* Non-Maskable */
3737
3838
39void cp1610_get_info(UINT32 state, cpuinfo *info);
39CPU_GET_INFO( cp1610 );
4040
41unsigned cp1610_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
41CPU_DISASSEMBLE( cp1610 );
4242
4343// Temporary
4444#define cp1610_readop(A) program_read_word_16be((A)<<1)
src/emu/cpu/cp1610/cp1610.c
r3535r3536
3636   UINT8   flags;   /* flags */
3737   int    intr_enabled;
3838   //int       (*reset_callback)(void);
39   int    (*irq_callback)(int irqline);
39   cpu_irq_callback irq_callback;
40   const device_config *device;
4041   UINT16   intr_vector;
4142   int    reset_state;
4243   int      intr_state;
r3535r3536
15471548   cp1610_icount -= 8;
15481549}
15491550
1550static void cp1610_reset(void)
1551static CPU_RESET( cp1610 )
15511552{
15521553   /* This is how we set the reset vector */
15531554   cpunum_set_input_line(Machine, cpu_getactivecpu(), CP1610_RESET, PULSE_LINE);
r3535r3536
21592160}
21602161
21612162/* Execute cycles - returns number of cycles actually run */
2162static int cp1610_execute(int cycles)
2163static CPU_EXECUTE( cp1610 )
21632164{
21642165   UINT16 opcode;
21652166
r3535r3536
33493350            cp1610.r[6]++;
33503351            cp1610_icount -= 9;
33513352            cp1610.intr_pending = 0;
3352            cp1610.r[7] = cp1610.irq_callback(CP1610_INT_INTR);
3353            cp1610.r[7] = cp1610.irq_callback(cp1610.device, CP1610_INT_INTR);
33533354         }
33543355         if ((cp1610.intrm_pending == 1) && (cp1610.intr_enabled))
33553356         {
r3535r3536
33583359            cp1610.r[6]++;
33593360            cp1610_icount -= 9;
33603361            cp1610.intrm_pending = 0;
3361            cp1610.r[7] = cp1610.irq_callback(CP1610_INT_INTRM);
3362            cp1610.r[7] = cp1610.irq_callback(cp1610.device, CP1610_INT_INTRM);
33623363         }
33633364         if (cp1610.reset_pending == 1)
33643365         {
33653366            cp1610.reset_pending = 0;
3366            cp1610.r[7] = cp1610.irq_callback(CP1610_RESET);
3367            cp1610.r[7] = cp1610.irq_callback(cp1610.device, CP1610_RESET);
33673368         }
33683369      }
33693370
r3535r3536
33723373   return cycles - cp1610_icount;
33733374}
33743375
3375static void cp1610_get_context (void *dst)
3376static CPU_GET_CONTEXT( cp1610 )
33763377{
33773378   if (dst)
33783379      *(cp1610_Regs *) dst = cp1610;
33793380}
33803381
3381static void cp1610_set_context (void *src)
3382static CPU_SET_CONTEXT( cp1610 )
33823383{
33833384   if (src)
33843385      cp1610 = *(cp1610_Regs *) src;
33853386}
33863387
3387static void cp1610_init(int index, int clock, const void *config, int (*irqcallback)(int))
3388static CPU_INIT( cp1610 )
33883389{
33893390   cp1610.intr_enabled = 0;
33903391   cp1610.reset_pending = 0;
33913392   cp1610.intr_pending = 0;
33923393   cp1610.intrm_pending = 0;
33933394   cp1610.irq_callback = irqcallback;
3395   cp1610.device = device;
33943396}
33953397
33963398static void cp1610_set_irq_line(UINT32 irqline, int state)
r3535r3536
34153417   }
34163418}
34173419
3418static void cp1610_set_info(UINT32 state, cpuinfo *info)
3420static CPU_SET_INFO( cp1610 )
34193421{
34203422   switch (state)
34213423   {
r3535r3536
34403442   return;
34413443}
34423444
3443void cp1610_get_info(UINT32 state, cpuinfo *info)
3445CPU_GET_INFO( cp1610 )
34443446{
34453447   switch (state)
34463448   {
r3535r3536
34843486   case CPUINFO_INT_REGISTER + CP1610_R7: info->i = cp1610.r[7];         break;
34853487
34863488   /* --- the following bits of info are returned as pointers to data or functions --- */
3487   case CPUINFO_PTR_SET_INFO:                  info->setinfo = cp1610_set_info;      break;
3488   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = cp1610_get_context;   break;
3489   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = cp1610_set_context;   break;
3490   case CPUINFO_PTR_INIT:                     info->init = cp1610_init;            break;
3491   case CPUINFO_PTR_RESET:                     info->reset = cp1610_reset;            break;
3492   case CPUINFO_PTR_EXECUTE:                  info->execute = cp1610_execute;         break;
3489   case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(cp1610);      break;
3490   case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(cp1610);   break;
3491   case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(cp1610);   break;
3492   case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(cp1610);            break;
3493   case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(cp1610);            break;
3494   case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(cp1610);         break;
34933495   case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
34943496
3495   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = cp1610_dasm;      break;
3497   case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(cp1610);      break;
34963498   case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &cp1610_icount;         break;
34973499
34983500   /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/cp1610/1610dasm.c
r3535r3536
22#include "debugger.h"
33#include "cp1610.h"
44
5unsigned cp1610_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
5CPU_DISASSEMBLE( cp1610 )
66{
77   UINT16 op = oprom[0];
88   UINT16 subop;
src/emu/cpu/saturn/saturn.h
r3535r3536
8686#define SATURN_NMI_LINE 1
8787#define SATURN_WAKEUP_LINE 2
8888
89unsigned saturn_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
89CPU_DISASSEMBLE( saturn );
9090
91void saturn_get_info(UINT32 state, cpuinfo *info);
91CPU_GET_INFO( saturn );
9292
9393#endif /* __SATURN_H__ */
src/emu/cpu/saturn/saturnds.c
r3535r3536
12771277static const int field_adr_b[]=
12781278{ FieldP, FieldWP, FieldXS, FieldX, FieldS, FieldM, FieldB, FieldW };
12791279
1280unsigned saturn_dasm(char *dst, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
1280CPU_DISASSEMBLE( saturn )
12811281{
12821282   int adr=0;
12831283
r3535r3536
12991299         cont=0;
13001300         bin[binsize++]=number_2_hex[op];
13011301         bin[binsize]=0;
1302         sprintf(dst, "???%s",bin);
1302         sprintf(buffer, "???%s",bin);
13031303         break;
13041304      default:
13051305         bin[binsize++]=number_2_hex[op];
r3535r3536
13181318            cont = 0;
13191319            bin[binsize++]=number_2_hex[op];
13201320            bin[binsize]=0;
1321            sprintf(dst, "???%s",bin);
1321            sprintf(buffer, "???%s",bin);
13221322            break;
13231323         }
13241324         break;
r3535r3536
13261326         cont=0;
13271327         switch (level->adr==AdrNone?adr:level->adr) {
13281328         case AdrNone:
1329            strcpy(dst, mnemonics[level->mnemonic].name[set]);
1329            strcpy(buffer, mnemonics[level->mnemonic].name[set]);
13301330            break;
13311331         case Imm:
1332            sprintf(dst, mnemonics[level->mnemonic].name[set], oprom[pos++]);
1332            sprintf(buffer, mnemonics[level->mnemonic].name[set], oprom[pos++]);
13331333            break;
13341334         case ImmCount:
1335            sprintf(dst, mnemonics[level->mnemonic].name[set], oprom[pos++]+1);
1335            sprintf(buffer, mnemonics[level->mnemonic].name[set], oprom[pos++]+1);
13361336            break;
13371337         case AdrImmCount:
1338            sprintf(dst, mnemonics[level->mnemonic].name[set], field_2_string(adr), oprom[pos++]+1);
1338            sprintf(buffer, mnemonics[level->mnemonic].name[set], field_2_string(adr), oprom[pos++]+1);
13391339            break;
13401340         case AdrCount: // mnemonics have string %s for address field
13411341            snprintf(number,sizeof(number),"%x",oprom[pos++]+1);
1342            sprintf(dst, mnemonics[level->mnemonic].name[set], number);
1342            sprintf(buffer, mnemonics[level->mnemonic].name[set], number);
13431343            break;
13441344         case Imm2:
13451345            v=oprom[pos++];
13461346            v|=oprom[pos++]<<4;
1347            sprintf(dst, mnemonics[level->mnemonic].name[set], v);
1347            sprintf(buffer, mnemonics[level->mnemonic].name[set], v);
13481348            break;
13491349         case Imm4:
13501350            v=oprom[pos++];
13511351            v|=oprom[pos++]<<4;
13521352            v|=oprom[pos++]<<8;
13531353            v|=oprom[pos++]<<12;
1354            sprintf(dst, mnemonics[level->mnemonic].name[set], v);
1354            sprintf(buffer, mnemonics[level->mnemonic].name[set], v);
13551355            break;
13561356         case Imm5:
13571357            v=oprom[pos++];
r3535r3536
13591359            v|=oprom[pos++]<<8;
13601360            v|=oprom[pos++]<<12;
13611361            v|=oprom[pos++]<<16;
1362            sprintf(dst, mnemonics[level->mnemonic].name[set], v);
1362            sprintf(buffer, mnemonics[level->mnemonic].name[set], v);
13631363            break;
13641364         case ImmCload:
13651365            c=i=oprom[pos++] & 0xf;
13661366            number[i+1]=0;
13671367            for (;i>=0; i--) number[i]=number_2_hex[oprom[pos++] & 0xf];
1368            sprintf(dst, mnemonics[level->mnemonic].name[set], c+1, number);
1368            sprintf(buffer, mnemonics[level->mnemonic].name[set], c+1, number);
13691369            break;
13701370         case Dis3:
13711371            SATURN_PEEKOP_DIS12(v);
13721372            c=(pc+pos-3+v)&0xfffff;
1373            sprintf(dst, mnemonics[level->mnemonic].name[set], c );
1373            sprintf(buffer, mnemonics[level->mnemonic].name[set], c );
13741374            break;
13751375         case Dis3Call:
13761376            SATURN_PEEKOP_DIS12(v);
13771377            c=(pc+pos+v)&0xfffff;
1378            sprintf(dst, mnemonics[level->mnemonic].name[set], c );
1378            sprintf(buffer, mnemonics[level->mnemonic].name[set], c );
13791379            break;
13801380         case Dis4:
13811381            SATURN_PEEKOP_DIS16(v);
13821382            c=(pc+pos-4+v)&0xfffff;
1383            sprintf(dst, mnemonics[level->mnemonic].name[set], c );
1383            sprintf(buffer, mnemonics[level->mnemonic].name[set], c );
13841384            break;
13851385         case Dis4Call:
13861386            SATURN_PEEKOP_DIS16(v);
13871387            c=(pc+pos+v)&0xfffff;
1388            sprintf(dst, mnemonics[level->mnemonic].name[set], c );
1388            sprintf(buffer, mnemonics[level->mnemonic].name[set], c );
13891389            break;
13901390         case Abs:
13911391            SATURN_PEEKOP_ADR(v);
1392            sprintf(dst, mnemonics[level->mnemonic].name[set], v );
1392            sprintf(buffer, mnemonics[level->mnemonic].name[set], v );
13931393            break;
13941394         case BranchReturn:
13951395            SATURN_PEEKOP_DIS8(v);
13961396            if (v==0) {
1397               strcpy(dst, mnemonics[level->mnemonic+1].name[set]);
1397               strcpy(buffer, mnemonics[level->mnemonic+1].name[set]);
13981398            } else {
13991399               c=(pc+pos-2+v)&0xfffff;
1400               sprintf(dst, mnemonics[level->mnemonic].name[set], c);
1400               sprintf(buffer, mnemonics[level->mnemonic].name[set], c);
14011401            }
14021402            break;
14031403         case ABranchReturn:
14041404            SATURN_PEEKOP_DIS8(v);
14051405            if (v==0) {
1406               sprintf(dst, mnemonics[level->mnemonic+1].name[set], A);
1406               sprintf(buffer, mnemonics[level->mnemonic+1].name[set], A);
14071407            } else {
14081408               c=(pc+pos-2+v)&0xfffff;
1409               sprintf(dst, mnemonics[level->mnemonic].name[set], A, c);
1409               sprintf(buffer, mnemonics[level->mnemonic].name[set], A, c);
14101410            }
14111411            break;
14121412         case xBranchReturn:
14131413            SATURN_PEEKOP_DIS8(v);
14141414            if (v==0) {
1415               sprintf(dst, mnemonics[level->mnemonic+1].name[set], field_2_string(adr));
1415               sprintf(buffer, mnemonics[level->mnemonic+1].name[set], field_2_string(adr));
14161416            } else {
14171417               c=(pc+pos-2+v)&0xfffff;
1418               sprintf(dst, mnemonics[level->mnemonic].name[set], field_2_string(adr), c);
1418               sprintf(buffer, mnemonics[level->mnemonic].name[set], field_2_string(adr), c);
14191419            }
14201420            break;
14211421         case TestBranchRet:
14221422            i=oprom[pos++];
14231423            SATURN_PEEKOP_DIS8(v);
14241424            if (v==0) {
1425               sprintf(dst, mnemonics[level->mnemonic+1].name[set], i);
1425               sprintf(buffer, mnemonics[level->mnemonic+1].name[set], i);
14261426            } else {
14271427               c=(pc+pos-2+v)&0xfffff;
1428               sprintf(dst, mnemonics[level->mnemonic].name[set], i, c);
1428               sprintf(buffer, mnemonics[level->mnemonic].name[set], i, c);
14291429            }
14301430            break;
14311431         case ImmBranch:
14321432            i=oprom[pos++];
14331433            SATURN_PEEKOP_DIS8(v);
14341434            c=(pc+pos-2+v)&0xfffff;
1435            sprintf(dst, mnemonics[level->mnemonic].name[set], i, c);
1435            sprintf(buffer, mnemonics[level->mnemonic].name[set], i, c);
14361436            break;
14371437         case FieldP:
1438            sprintf(dst, mnemonics[level->mnemonic].name[set], P );
1438            sprintf(buffer, mnemonics[level->mnemonic].name[set], P );
14391439            break;
14401440         case FieldWP:
1441            sprintf(dst, mnemonics[level->mnemonic].name[set], WP );
1441            sprintf(buffer, mnemonics[level->mnemonic].name[set], WP );
14421442            break;
14431443         case FieldXS:
1444            sprintf(dst, mnemonics[level->mnemonic].name[set], XS );
1444            sprintf(buffer, mnemonics[level->mnemonic].name[set], XS );
14451445            break;
14461446         case FieldX:
1447            sprintf(dst, mnemonics[level->mnemonic].name[set], X );
1447            sprintf(buffer, mnemonics[level->mnemonic].name[set], X );
14481448            break;
14491449         case FieldS:
1450            sprintf(dst, mnemonics[level->mnemonic].name[set], S );
1450            sprintf(buffer, mnemonics[level->mnemonic].name[set], S );
14511451            break;
14521452         case FieldM:
1453            sprintf(dst, mnemonics[level->mnemonic].name[set], M );
1453            sprintf(buffer, mnemonics[level->mnemonic].name[set], M );
14541454            break;
14551455         case FieldB:
1456            sprintf(dst, mnemonics[level->mnemonic].name[set], B );
1456            sprintf(buffer, mnemonics[level->mnemonic].name[set], B );
14571457            break;
14581458         case FieldA:
1459            sprintf(dst, mnemonics[level->mnemonic].name[set], A );
1459            sprintf(buffer, mnemonics[level->mnemonic].name[set], A );
14601460            break;
14611461         case FieldW:
1462            sprintf(dst, mnemonics[level->mnemonic].name[set], W );
1462            sprintf(buffer, mnemonics[level->mnemonic].name[set], W );
14631463            break;
14641464         case AdrA:
1465            sprintf(dst, mnemonics[level->mnemonic].name[set], adr_a[oprom[pos++] & 0x7] );
1465            sprintf(buffer, mnemonics[level->mnemonic].name[set], adr_a[oprom[pos++] & 0x7] );
14661466            break;
14671467         case AdrAF:
1468            sprintf(dst, mnemonics[level->mnemonic].name[set], adr_af[oprom[pos++] & 0xf] );
1468            sprintf(buffer, mnemonics[level->mnemonic].name[set], adr_af[oprom[pos++] & 0xf] );
14691469            break;
14701470         case AdrB:
1471            sprintf(dst, mnemonics[level->mnemonic].name[set], adr_b[oprom[pos++] & 0x7] );
1471            sprintf(buffer, mnemonics[level->mnemonic].name[set], adr_b[oprom[pos++] & 0x7] );
14721472            break;
14731473         }
14741474         break;
src/emu/cpu/saturn/saturn.c
r3535r3536
7777   UINT8   in_irq;         /* already servicing IRQ */
7878   UINT8   pending_irq;   /* IRQ is pending */
7979   UINT8   sleeping;       /* low-consumption state */
80   int    (*irq_callback)(int irqline);   /* IRQ callback */
80   cpu_irq_callback irq_callback;
81   const device_config *device;
8182}   Saturn_Regs;
8283
8384static int saturn_ICount = 0;
r3535r3536
9798 *
9899 *****************************************************************************/
99100
100static void saturn_init(int index, int clock, const void *config, int (*irqcallback)(int))
101static CPU_INIT( saturn )
101102{
102103   saturn.config = (saturn_cpu_core *) config;
103104   saturn.irq_callback = irqcallback;
105   saturn.device = device;
104106
105107   state_save_register_item_array("saturn",index,saturn.reg[R0]);
106108   state_save_register_item_array("saturn",index,saturn.reg[R1]);
r3535r3536
127129   state_save_register_item("saturn",index,saturn.sleeping);
128130}
129131
130static void saturn_reset(void)
132static CPU_RESET( saturn )
131133{
132134   saturn.pc=0;
133135   saturn.sleeping = 0;
r3535r3536
136138   change_pc(saturn.pc);
137139}
138140
139static void saturn_get_context (void *dst)
141static CPU_GET_CONTEXT( saturn )
140142{
141143   if( dst )
142144      *(Saturn_Regs*)dst = saturn;
143145}
144146
145static void saturn_set_context (void *src)
147static CPU_SET_CONTEXT( saturn )
146148{
147149   if( src )
148150   {
r3535r3536
163165
164166   LOG(("Saturn#%d takes IRQ ($%04x)\n", cpu_getactivecpu(), saturn.pc));
165167
166   if (saturn.irq_callback) (*saturn.irq_callback)(SATURN_IRQ_LINE);
168   if (saturn.irq_callback) (*saturn.irq_callback)(saturn.device, SATURN_IRQ_LINE);
167169   change_pc(saturn.pc);
168170}
169171
170static int saturn_execute(int cycles)
172static CPU_EXECUTE( saturn )
171173{
172174   saturn_ICount = cycles;
173175
r3535r3536
227229   if (saturn.sleeping && state==1)
228230   {
229231      LOG(( "SATURN#%d set_wakeup_line(ASSERT)\n", cpu_getactivecpu()));
230      if (saturn.irq_callback) (*saturn.irq_callback)(SATURN_WAKEUP_LINE);
232      if (saturn.irq_callback) (*saturn.irq_callback)(saturn.device, SATURN_WAKEUP_LINE);
231233      saturn.sleeping = 0;
232234   }
233235}
r3535r3536
246248}
247249
248250
249static void saturn_set_info(UINT32 state, cpuinfo *info)
251static CPU_SET_INFO( saturn )
250252{
251253   switch (state)
252254   {
r3535r3536
301303   return x;
302304}
303305
304void saturn_get_info(UINT32 state, cpuinfo *info)
306CPU_GET_INFO( saturn )
305307{
306308   switch (state)
307309   {
r3535r3536
363365           case CPUINFO_INT_REGISTER + SATURN_SLEEPING:      info->i = saturn.sleeping;
364366
365367      /* --- the following bits of info are returned as pointers to data or functions --- */
366      case CPUINFO_PTR_SET_INFO:                  info->setinfo = saturn_set_info;         break;
367      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = saturn_get_context;      break;
368      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = saturn_set_context;      break;
369      case CPUINFO_PTR_INIT:                     info->init = saturn_init;               break;
370      case CPUINFO_PTR_RESET:                     info->reset = saturn_reset;               break;
371      case CPUINFO_PTR_EXECUTE:                  info->execute = saturn_execute;            break;
368      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(saturn);         break;
369      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(saturn);      break;
370      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(saturn);      break;
371      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(saturn);               break;
372      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(saturn);               break;
373      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(saturn);            break;
372374      case CPUINFO_PTR_BURN:                     info->burn = NULL;                     break;
373      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = saturn_dasm;      break;
375      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(saturn);      break;
374376      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &saturn_ICount;            break;
375377
376378      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/i8x41/i8x41.h
r3535r3536
9696 *  Public Functions
9797 */
9898
99extern void i8x41_get_info(UINT32 state, cpuinfo *info);
99extern CPU_GET_INFO( i8x41 );
100100
101extern offs_t i8x41_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
101extern CPU_DISASSEMBLE( i8x41 );
102102
103103#endif /* __I8X41_H__ */
src/emu/cpu/i8x41/8x41dasm.c
r3535r3536
11#include "debugger.h"
22#include "i8x41.h"
33
4offs_t i8x41_dasm(char *dst, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
4CPU_DISASSEMBLE( i8x41 )
55{
66   UINT32 flags = 0;
77   unsigned PC = pc;
r3535r3536
1212   switch( op )
1313   {
1414   case 0x00: /* 1: 0000 0000 */
15      sprintf(dst, "nop");
15      sprintf(buffer, "nop");
1616      break;
1717   case 0x01: /* 1: 0000 0001 */
18      sprintf(dst, "ill");
18      sprintf(buffer, "ill");
1919      break;
2020   case 0x02: /* 1: 0000 0010 */
21      sprintf(dst, "out   dbb,a");
21      sprintf(buffer, "out   dbb,a");
2222      break;
2323   case 0x03: /* 2: 0000 0011 */
24      sprintf(dst, "add   a,#$%02X", opram[PC++ - pc]);
24      sprintf(buffer, "add   a,#$%02X", opram[PC++ - pc]);
2525      break;
2626   case 0x04: /* 2: aaa0 0100 */
2727   case 0x24: /* 2: aaa0 0100 */
r3535r3536
3131   case 0xa4: /* 2: aaa0 0100 */
3232   case 0xc4: /* 2: aaa0 0100 */
3333   case 0xe4: /* 2: aaa0 0100 */
34      sprintf(dst, "jmp   $%04X", ((op<<3) & 0x700) | opram[PC++ - pc]);
34      sprintf(buffer, "jmp   $%04X", ((op<<3) & 0x700) | opram[PC++ - pc]);
3535      break;
3636   case 0x05: /* 1: 0000 0101 */
37      sprintf(dst, "en    i");
37      sprintf(buffer, "en    i");
3838      break;
3939   case 0x06: /* 1: 0000 0110 */
40      sprintf(dst, "ill");
40      sprintf(buffer, "ill");
4141      break;
4242   case 0x07: /* 1: 0000 0111 */
43      sprintf(dst, "dec   a");
43      sprintf(buffer, "dec   a");
4444      break;
4545   case 0x08: /* 2: 0000 10pp */
4646   case 0x09: /* 2: 0000 10pp */
4747   case 0x0a: /* 2: 0000 10pp */
4848   case 0x0b: /* 2: 0000 10pp */
49      sprintf(dst, "in    a,p%d", op&3);
49      sprintf(buffer, "in    a,p%d", op&3);
5050      break;
5151   case 0x0c: /* 2: 0000 11pp */
5252   case 0x0d: /* 2: 0000 11pp */
5353   case 0x0e: /* 2: 0000 11pp */
5454   case 0x0f: /* 2: 0000 11pp */
55      sprintf(dst, "movd  a,p%d", op&3);
55      sprintf(buffer, "movd  a,p%d", op&3);
5656      break;
5757   case 0x10: /* 1: 0001 000r */
5858   case 0x11: /* 1: 0001 000r */
59      sprintf(dst, "inc   @r%d", op&1);
59      sprintf(buffer, "inc   @r%d", op&1);
6060      break;
6161   case 0x12: /* 2: bbb1 0010 */
6262   case 0x32: /* 2: bbb1 0010 */
r3535r3536
6767   case 0xd2: /* 2: bbb1 0010 */
6868   case 0xf2: /* 2: bbb1 0010 */
6969      arg = opram[PC++ - pc];
70      sprintf(dst, "jb%d   $%04X", op >> 5, (PC & 0x700) | arg);
70      sprintf(buffer, "jb%d   $%04X", op >> 5, (PC & 0x700) | arg);
7171      break;
7272   case 0x13: /* 2: 0001 0011 */
73      sprintf(dst, "addc  $%02X", opram[PC++ - pc]);
73      sprintf(buffer, "addc  $%02X", opram[PC++ - pc]);
7474      break;
7575   case 0x14: /* 2: aaa1 0100 */
7676   case 0x34: /* 2: aaa1 0100 */
r3535r3536
8080   case 0xb4: /* 2: aaa1 0100 */
8181   case 0xd4: /* 2: aaa1 0100 */
8282   case 0xf4: /* 2: aaa1 0100 */
83      sprintf(dst, "call  $%04X", ((op<<3) & 0x700) | opram[PC++ - pc]);
83      sprintf(buffer, "call  $%04X", ((op<<3) & 0x700) | opram[PC++ - pc]);
8484      flags = DASMFLAG_STEP_OVER;
8585      break;
8686   case 0x15: /* 1: 0001 0101 */
87      sprintf(dst, "dis   i");
87      sprintf(buffer, "dis   i");
8888      break;
8989   case 0x16: /* 2: 0001 0110 */
9090      arg = opram[PC++ - pc];
91      sprintf(dst, "jtf   $%04X", (PC & 0x700) | arg);
91      sprintf(buffer, "jtf   $%04X", (PC & 0x700) | arg);
9292      break;
9393   case 0x17: /* 1: 0001 0111 */
94      sprintf(dst, "inc   a");
94      sprintf(buffer, "inc   a");
9595      break;
9696   case 0x18: /* 1: 0001 1rrr */
9797   case 0x19: /* 1: 0001 1rrr */
r3535r3536
101101   case 0x1d: /* 1: 0001 1rrr */
102102   case 0x1e: /* 1: 0001 1rrr */
103103   case 0x1f: /* 1: 0001 1rrr */
104      sprintf(dst, "inc   r%d", op&7);
104      sprintf(buffer, "inc   r%d", op&7);
105105      break;
106106   case 0x20: /* 1: 0010 000r */
107107   case 0x21: /* 1: 0010 000r */
108      sprintf(dst, "xch   a,@r%d", op&1);
108      sprintf(buffer, "xch   a,@r%d", op&1);
109109      break;
110110   case 0x22: /* 1: 0010 0010 */
111      sprintf(dst, "in    a,ddb");
111      sprintf(buffer, "in    a,ddb");
112112      break;
113113   case 0x23: /* 2: 0010 0011 */
114      sprintf(dst, "mov   a,#$%02X", opram[PC++ - pc]);
114      sprintf(buffer, "mov   a,#$%02X", opram[PC++ - pc]);
115115      break;
116116   case 0x25: /* 1: 0010 0101 */
117      sprintf(dst, "en    tcnti");
117      sprintf(buffer, "en    tcnti");
118118      break;
119119   case 0x26: /* 2: 0010 0110 */
120120      arg = opram[PC++ - pc];
121      sprintf(dst, "jnt0  $%04X", (PC & 0x700) | arg);
121      sprintf(buffer, "jnt0  $%04X", (PC & 0x700) | arg);
122122      break;
123123   case 0x27: /* 1: 0010 0111 */
124      sprintf(dst, "clr   a");
124      sprintf(buffer, "clr   a");
125125      break;
126126   case 0x28: /* 1: 0010 1rrr */
127127   case 0x29: /* 1: 0010 1rrr */
r3535r3536
131131   case 0x2d: /* 1: 0010 1rrr */
132132   case 0x2e: /* 1: 0010 1rrr */
133133   case 0x2f: /* 1: 0010 1rrr */
134      sprintf(dst, "xch   a,r%d", op&7);
134      sprintf(buffer, "xch   a,r%d", op&7);
135135      break;
136136   case 0x30: /* 1: 0011 000r */
137137   case 0x31: /* 1: 0011 000r */
138      sprintf(dst, "xchd  a,@r%d", op&1);
138      sprintf(buffer, "xchd  a,@r%d", op&1);
139139      break;
140140   case 0x33: /* 1: 0011 0101 */
141      sprintf(dst, "ill");
141      sprintf(buffer, "ill");
142142      break;
143143   case 0x35: /* 1: 0000 0101 */
144      sprintf(dst, "dis   tcnti");
144      sprintf(buffer, "dis   tcnti");
145145      break;
146146   case 0x36: /* 2: 0011 0110 */
147147      arg = opram[PC++ - pc];
148      sprintf(dst, "jt0   $%04X", (PC & 0x700) | arg);
148      sprintf(buffer, "jt0   $%04X", (PC & 0x700) | arg);
149149      break;
150150   case 0x37: /* 1: 0011 0111 */
151      sprintf(dst, "cpl   a");
151      sprintf(buffer, "cpl   a");
152152      break;
153153   case 0x38: /* 2: 0011 10pp */
154154   case 0x39: /* 2: 0011 10pp */
155155   case 0x3a: /* 2: 0011 10pp */
156156   case 0x3b: /* 2: 0011 10pp */
157      sprintf(dst, "out   p%d,a", op&3);
157      sprintf(buffer, "out   p%d,a", op&3);
158158      break;
159159   case 0x3c: /* 2: 0011 11pp */
160160   case 0x3d: /* 2: 0011 11pp */
161161   case 0x3e: /* 2: 0011 11pp */
162162   case 0x3f: /* 2: 0011 11pp */
163      sprintf(dst, "movd  p%d,a", op&7);
163      sprintf(buffer, "movd  p%d,a", op&7);
164164      break;
165165   case 0x40: /* 1: 0100 000r */
166166   case 0x41: /* 1: 0100 000r */
167      sprintf(dst, "orl   a,@r%d", op&1);
167      sprintf(buffer, "orl   a,@r%d", op&1);
168168      break;
169169   case 0x42: /* 1: 0100 0010 */
170      sprintf(dst, "mov   a,t");
170      sprintf(buffer, "mov   a,t");
171171      break;
172172   case 0x43: /* 2: 0100 0011 */
173      sprintf(dst, "orl   a,#$%02X", opram[PC++ - pc]);
173      sprintf(buffer, "orl   a,#$%02X", opram[PC++ - pc]);
174174      break;
175175   case 0x45: /* 1: 0100 0101 */
176      sprintf(dst, "strt  cnt");
176      sprintf(buffer, "strt  cnt");
177177      break;
178178   case 0x46: /* 2: 0100 0110 */
179179      arg = opram[PC++ - pc];
180      sprintf(dst, "jnt1  $%04X", (PC & 0x700) | arg);
180      sprintf(buffer, "jnt1  $%04X", (PC & 0x700) | arg);
181181      break;
182182   case 0x47: /* 1: 0100 0111 */
183      sprintf(dst, "swap  a");
183      sprintf(buffer, "swap  a");
184184      break;
185185   case 0x48: /* 1: 0100 1rrr */
186186   case 0x49: /* 1: 0100 1rrr */
r3535r3536
190190   case 0x4d: /* 1: 0100 1rrr */
191191   case 0x4e: /* 1: 0100 1rrr */
192192   case 0x4f: /* 1: 0100 1rrr */
193      sprintf(dst, "orl   a,r%d", op&7);
193      sprintf(buffer, "orl   a,r%d", op&7);
194194      break;
195195   case 0x50: /* 1: 0101 000r */
196196   case 0x51: /* 1: 0101 000r */
197      sprintf(dst, "anl   a,@r%d", op&1);
197      sprintf(buffer, "anl   a,@r%d", op&1);
198198      break;
199199   case 0x53: /* 2: 0101 0011 */
200      sprintf(dst, "anl   a,#$%02X", opram[PC++ - pc]);
200      sprintf(buffer, "anl   a,#$%02X", opram[PC++ - pc]);
201201      break;
202202   case 0x55: /* 1: 0101 0101 */
203      sprintf(dst, "strt  t");
203      sprintf(buffer, "strt  t");
204204      break;
205205   case 0x56: /* 2: 0101 0110 */
206206      arg = opram[PC++ - pc];
207      sprintf(dst, "jt1   $%04X", (PC & 0x700) | arg);
207      sprintf(buffer, "jt1   $%04X", (PC & 0x700) | arg);
208208      break;
209209   case 0x57: /* 1: 0101 0111 */
210      sprintf(dst, "da    a");
210      sprintf(buffer, "da    a");
211211      break;
212212   case 0x58: /* 1: 0101 1rrr */
213213   case 0x59: /* 1: 0101 1rrr */
r3535r3536
217217   case 0x5d: /* 1: 0101 1rrr */
218218   case 0x5e: /* 1: 0101 1rrr */
219219   case 0x5f: /* 1: 0101 1rrr */
220      sprintf(dst, "anl   a,r%d", op&7);
220      sprintf(buffer, "anl   a,r%d", op&7);
221221      break;
222222   case 0x60: /* 1: 0110 000r */
223223   case 0x61: /* 1: 0110 000r */
224      sprintf(dst, "add   a,@r%d", op&1);
224      sprintf(buffer, "add   a,@r%d", op&1);
225225      break;
226226   case 0x62: /* 1: 0110 0010 */
227      sprintf(dst, "mov   t,a");
227      sprintf(buffer, "mov   t,a");
228228      break;
229229   case 0x63: /* 1: 0110 0011 */
230      sprintf(dst, "ill");
230      sprintf(buffer, "ill");
231231      break;
232232   case 0x65: /* 1: 0110 0101 */
233      sprintf(dst, "stop  tcnt");
233      sprintf(buffer, "stop  tcnt");
234234      break;
235235   case 0x66: /* 1: 0110 0110 */
236      sprintf(dst, "ill");
236      sprintf(buffer, "ill");
237237      break;
238238   case 0x67: /* 1: 0110 0111 */
239      sprintf(dst, "rrc   a");
239      sprintf(buffer, "rrc   a");
240240      break;
241241   case 0x68: /* 1: 0110 1rrr */
242242   case 0x69: /* 1: 0110 1rrr */
r3535r3536
246246   case 0x6d: /* 1: 0110 1rrr */
247247   case 0x6e: /* 1: 0110 1rrr */
248248   case 0x6f: /* 1: 0110 1rrr */
249      sprintf(dst, "add   a,r%d", op&7);
249      sprintf(buffer, "add   a,r%d", op&7);
250250      break;
251251   case 0x70: /* 1: 0111 000r */
252252   case 0x71: /* 1: 0111 000r */
253      sprintf(dst, "addc  a,@r%d", op&1);
253      sprintf(buffer, "addc  a,@r%d", op&1);
254254      break;
255255   case 0x73: /* 1: 0111 0011 */
256      sprintf(dst, "ill");
256      sprintf(buffer, "ill");
257257      break;
258258   case 0x75: /* 1: 0111 0101 */
259      sprintf(dst, "ill");
259      sprintf(buffer, "ill");
260260      break;
261261   case 0x76: /* 2: 0111 0110 */
262262      arg = opram[PC++ - pc];
263      sprintf(dst, "jf1   $%04X", (PC & 0x700) | arg);
263      sprintf(buffer, "jf1   $%04X", (PC & 0x700) | arg);
264264      break;
265265   case 0x77: /* 1: 0111 0111 */
266      sprintf(dst, "rl    a");
266      sprintf(buffer, "rl    a");
267267      break;
268268   case 0x78: /* 1: 0111 1rrr */
269269   case 0x79: /* 1: 0111 1rrr */
r3535r3536
273273   case 0x7d: /* 1: 0111 1rrr */
274274   case 0x7e: /* 1: 0111 1rrr */
275275   case 0x7f: /* 1: 0111 1rrr */
276      sprintf(dst, "addc  a,r%d", op&7);
276      sprintf(buffer, "addc  a,r%d", op&7);
277277      break;
278278   case 0x80: /* 1: 1000 0000 */
279      sprintf(dst, "ill ");
279      sprintf(buffer, "ill ");
280280      break;
281281   case 0x81: /* 1: 1000 0001 */
282      sprintf(dst, "ill ");
282      sprintf(buffer, "ill ");
283283      break;
284284   case 0x82: /* 1: 1000 0010 */
285      sprintf(dst, "ill ");
285      sprintf(buffer, "ill ");
286286      break;
287287   case 0x83: /* 2: 1000 0011 */
288      sprintf(dst, "ret");
288      sprintf(buffer, "ret");
289289      flags = DASMFLAG_STEP_OUT;
290290      break;
291291   case 0x85: /* 1: 1000 0101 */
292      sprintf(dst, "clr   f0");
292      sprintf(buffer, "clr   f0");
293293      break;
294294   case 0x86: /* 2: 1000 0110 */
295295      arg = opram[PC++ - pc];
296      sprintf(dst, "jobf  $%04X", (PC & 0x700) | arg);
296      sprintf(buffer, "jobf  $%04X", (PC & 0x700) | arg);
297297      break;
298298   case 0x87: /* 1: 1000 0111 */
299      sprintf(dst, "ill");
299      sprintf(buffer, "ill");
300300      break;
301301   case 0x88: /* 2: 1000 10pp */
302302   case 0x89: /* 2: 1000 10pp */
303303   case 0x8a: /* 2: 1000 10pp */
304304   case 0x8b: /* 2: 1000 10pp */
305      sprintf(dst, "orl   p%d,#$%02X", op&3, opram[PC++ - pc]);
305      sprintf(buffer, "orl   p%d,#$%02X", op&3, opram[PC++ - pc]);
306306      break;
307307   case 0x8c: /* 2: 1000 11pp */
308308   case 0x8d: /* 2: 1000 11pp */
309309   case 0x8e: /* 2: 1000 11pp */
310310   case 0x8f: /* 2: 1000 11pp */
311      sprintf(dst, "orld  p%d,a", op&7);
311      sprintf(buffer, "orld  p%d,a", op&7);
312312      break;
313313   case 0x90: /* 1: 1001 0000 */
314      sprintf(dst, "mov   sts,a");
314      sprintf(buffer, "mov   sts,a");
315315      break;
316316   case 0x91: /* 1: 1001 0001 */
317      sprintf(dst, "ill");
317      sprintf(buffer, "ill");
318318      break;
319319   case 0x93: /* 2: 1001 0011 */
320      sprintf(dst, "retr");
320      sprintf(buffer, "retr");
321321      flags = DASMFLAG_STEP_OVER;
322322      break;
323323   case 0x95: /* 1: 1001 0101 */
324      sprintf(dst, "cpl   f0");
324      sprintf(buffer, "cpl   f0");
325325      break;
326326   case 0x96: /* 2: 1001 0110 */
327327      arg = opram[PC++ - pc];
328      sprintf(dst, "jnz   $%04X", (PC & 0x700) | arg);
328      sprintf(buffer, "jnz   $%04X", (PC & 0x700) | arg);
329329      break;
330330   case 0x97: /* 1: 1001 0111 */
331      sprintf(dst, "clr   c");
331      sprintf(buffer, "clr   c");
332332      break;
333333   case 0x98: /* 2: 1001 10pp */
334334   case 0x99: /* 2: 1001 10pp */
335335   case 0x9a: /* 2: 1001 10pp */
336336   case 0x9b: /* 2: 1001 10pp */
337      sprintf(dst, "anl   p%d,#$%02X", op&3, opram[PC++ - pc]);
337      sprintf(buffer, "anl   p%d,#$%02X", op&3, opram[PC++ - pc]);
338338      break;
339339   case 0x9c: /* 2: 1001 11pp */
340340   case 0x9d: /* 2: 1001 11pp */
341341   case 0x9e: /* 2: 1001 11pp */
342342   case 0x9f: /* 2: 1001 11pp */
343      sprintf(dst, "anld  p%d,a", op&7);
343      sprintf(buffer, "anld  p%d,a", op&7);
344344      break;
345345   case 0xa0: /* 1: 1010 000r */
346346   case 0xa1: /* 1: 1010 000r */
347      sprintf(dst, "mov   @r%d,a", op&1);
347      sprintf(buffer, "mov   @r%d,a", op&1);
348348      break;
349349   case 0xa2: /* 1: 1010 0010 */
350      sprintf(dst, "ill");
350      sprintf(buffer, "ill");
351351      break;
352352   case 0xa3: /* 2: 1010 0011 */
353      sprintf(dst, "movp  a,@a");
353      sprintf(buffer, "movp  a,@a");
354354      break;
355355   case 0xa5: /* 1: 1010 0101 */
356      sprintf(dst, "clr   f1");
356      sprintf(buffer, "clr   f1");
357357      break;
358358   case 0xa6: /* 1: 1010 0110 */
359      sprintf(dst, "ill");
359      sprintf(buffer, "ill");
360360      break;
361361   case 0xa7: /* 1: 1010 0111 */
362      sprintf(dst, "cpl   c");
362      sprintf(buffer, "cpl   c");
363363      break;
364364   case 0xa8: /* 1: 1010 1rrr */
365365   case 0xa9: /* 1: 1010 1rrr */
r3535r3536
369369   case 0xad: /* 1: 1010 1rrr */
370370   case 0xae: /* 1: 1010 1rrr */
371371   case 0xaf: /* 1: 1010 1rrr */
372      sprintf(dst, "mov   r%d,a", op&7);
372      sprintf(buffer, "mov   r%d,a", op&7);
373373      break;
374374   case 0xb0: /* 2: 1011 000r */
375375   case 0xb1: /* 2: 1011 000r */
376      sprintf(dst, "mov   @r%d,#$%02X", op&1, opram[PC++ - pc]);
376      sprintf(buffer, "mov   @r%d,#$%02X", op&1, opram[PC++ - pc]);
377377      break;
378378   case 0xb3: /* 2: 1011 0011 */
379      sprintf(dst, "jmpp  @a");
379      sprintf(buffer, "jmpp  @a");
380380      break;
381381   case 0xb5: /* 1: 1011 0101 */
382      sprintf(dst, "cpl   f1");
382      sprintf(buffer, "cpl   f1");
383383      break;
384384   case 0xb6: /* 2: 1011 0110 */
385385      arg = opram[PC++ - pc];
386      sprintf(dst, "jf0   $%04X", (PC & 0x700) | arg);
386      sprintf(buffer, "jf0   $%04X", (PC & 0x700) | arg);
387387      break;
388388   case 0xb7: /* 1: 1011 0111 */
389      sprintf(dst, "ill");
389      sprintf(buffer, "ill");
390390      break;
391391   case 0xb8: /* 1: 1011 1rrr */
392392   case 0xb9: /* 1: 1011 1rrr */
r3535r3536
396396   case 0xbd: /* 1: 1011 1rrr */
397397   case 0xbe: /* 1: 1011 1rrr */
398398   case 0xbf: /* 1: 1011 1rrr */
399      sprintf(dst, "mov   r%d,#$%02X", op&7, opram[PC++ - pc]);
399      sprintf(buffer, "mov   r%d,#$%02X", op&7, opram[PC++ - pc]);
400400      break;
401401   case 0xc0: /* 1: 1100 0000 */
402      sprintf(dst, "ill");
402      sprintf(buffer, "ill");
403403      break;
404404   case 0xc1: /* 1: 1100 0001 */
405      sprintf(dst, "ill");
405      sprintf(buffer, "ill");
406406      break;
407407   case 0xc2: /* 1: 1100 0010 */
408      sprintf(dst, "ill");
408      sprintf(buffer, "ill");
409409      break;
410410   case 0xc3: /* 1: 1100 0011 */
411      sprintf(dst, "ill");
411      sprintf(buffer, "ill");
412412      break;
413413   case 0xc5: /* 1: 1100 0101 */
414      sprintf(dst, "sel   rb0");
414      sprintf(buffer, "sel   rb0");
415415      break;
416416   case 0xc6: /* 2: 1100 0110 */
417417      arg = opram[PC++ - pc];
418      sprintf(dst, "jz    $%04X", (PC & 0x700) | arg);
418      sprintf(buffer, "jz    $%04X", (PC & 0x700) | arg);
419419      break;
420420   case 0xc7: /* 1: 1100 0111 */
421      sprintf(dst, "mov   a,psw");
421      sprintf(buffer, "mov   a,psw");
422422      break;
423423   case 0xc8: /* 1: 1100 1rrr */
424424   case 0xc9: /* 1: 1100 1rrr */
r3535r3536
428428   case 0xcd: /* 1: 1100 1rrr */
429429   case 0xce: /* 1: 1100 1rrr */
430430   case 0xcf: /* 1: 1100 1rrr */
431      sprintf(dst, "dec   r%d", op&7);
431      sprintf(buffer, "dec   r%d", op&7);
432432      break;
433433   case 0xd0: /* 1: 1101 000r */
434434   case 0xd1: /* 1: 1101 000r */
435      sprintf(dst, "xrl   a,@r%d", op&1);
435      sprintf(buffer, "xrl   a,@r%d", op&1);
436436      break;
437437   case 0xd3: /* 1: 1101 0011 */
438      sprintf(dst, "xrl   a,#$%02X", opram[PC++ - pc]);
438      sprintf(buffer, "xrl   a,#$%02X", opram[PC++ - pc]);
439439      break;
440440   case 0xd5: /* 1: 1101 0101 */
441      sprintf(dst, "sel   rb1");
441      sprintf(buffer, "sel   rb1");
442442      break;
443443   case 0xd6: /* 2: 1101 0110 */
444444      arg = opram[PC++ - pc];
445      sprintf(dst, "jnibf $%04X", (PC & 0x700) | arg);
445      sprintf(buffer, "jnibf $%04X", (PC & 0x700) | arg);
446446      break;
447447   case 0xd7: /* 1: 1101 0111 */
448      sprintf(dst, "mov   psw,a");
448      sprintf(buffer, "mov   psw,a");
449449      break;
450450   case 0xd8: /* 1: 1101 1rrr */
451451   case 0xd9: /* 1: 1101 1rrr */
r3535r3536
455455   case 0xdd: /* 1: 1101 1rrr */
456456   case 0xde: /* 1: 1101 1rrr */
457457   case 0xdf: /* 1: 1101 1rrr */
458      sprintf(dst, "xrl   a,r%d", op&7);
458      sprintf(buffer, "xrl   a,r%d", op&7);
459459      break;
460460   case 0xe0: /* 1: 1110 0000 */
461      sprintf(dst, "ill");
461      sprintf(buffer, "ill");
462462      break;
463463   case 0xe1: /* 1: 1110 0001 */
464      sprintf(dst, "ill");
464      sprintf(buffer, "ill");
465465      break;
466466   case 0xe2: /* 1: 1110 0010 */
467      sprintf(dst, "ill");
467      sprintf(buffer, "ill");
468468      break;
469469   case 0xe3: /* 2: 1110 0011 */
470      sprintf(dst, "movp3 a,@a");
470      sprintf(buffer, "movp3 a,@a");
471471      break;
472472   case 0xe5: /* 1: 1110 0101 */
473      sprintf(dst, "en    dma");
473      sprintf(buffer, "en    dma");
474474      break;
475475   case 0xe6: /* 2: 1110 0110 */
476476      arg = opram[PC++ - pc];
477      sprintf(dst, "jnc   $%04X", (PC & 0x700) | arg);
477      sprintf(buffer, "jnc   $%04X", (PC & 0x700) | arg);
478478      break;
479479   case 0xe7: /* 1: 1110 0111 */
480      sprintf(dst, "rl    a");
480      sprintf(buffer, "rl    a");
481481      break;
482482   case 0xe8: /* 2: 1110 1rrr */
483483   case 0xe9: /* 2: 1110 1rrr */
r3535r3536
488488   case 0xee: /* 2: 1110 1rrr */
489489   case 0xef: /* 2: 1110 1rrr */
490490      arg = opram[PC++ - pc];
491      sprintf(dst, "djnz  r%d,$%04X", op&7, (PC & 0x700) | arg);
491      sprintf(buffer, "djnz  r%d,$%04X", op&7, (PC & 0x700) | arg);
492492      flags = DASMFLAG_STEP_OVER;
493493      break;
494494   case 0xf0: /* 1: 1111 000r */
495495   case 0xf1: /* 1: 1111 000r */
496      sprintf(dst, "mov   a,@r%d", op&1);
496      sprintf(buffer, "mov   a,@r%d", op&1);
497497      break;
498498   case 0xf3: /* 1: 1111 0011 */
499      sprintf(dst, "ill");
499      sprintf(buffer, "ill");
500500      break;
501501   case 0xf5: /* 1: 1111 0101 */
502      sprintf(dst, "en    flags");
502      sprintf(buffer, "en    flags");
503503      break;
504504   case 0xf6: /* 2: 1111 0110 */
505505      arg = opram[PC++ - pc];
506      sprintf(dst, "jc    $%04X", (PC & 0x700) | arg);
506      sprintf(buffer, "jc    $%04X", (PC & 0x700) | arg);
507507      break;
508508   case 0xf7: /* 1: 1111 0111 */
509      sprintf(dst, "rlc   a");
509      sprintf(buffer, "rlc   a");
510510      break;
511511   case 0xf8: /* 1: 1111 1rrr */
512512   case 0xf9: /* 1: 1111 1rrr */
r3535r3536
516516   case 0xfd: /* 1: 1111 1rrr */
517517   case 0xfe: /* 1: 1111 1rrr */
518518   case 0xff: /* 1: 1111 1rrr */
519      sprintf(dst, "mov   a,r%d", op&7);
519      sprintf(buffer, "mov   a,r%d", op&7);
520520      break;
521521   }
522522   return (PC - pc) | flags | DASMFLAG_SUPPORTED;
src/emu/cpu/i8x41/i8x41.c
r3535r3536
123123   UINT8   p2;
124124   UINT8   p2_hs;
125125   UINT8   ram_mask;
126   int    (*irq_callback)(int irqline);
126   cpu_irq_callback irq_callback;
127   const device_config *device;
127128   i8x41_config   *config;
128129}   I8X41;
129130
r3535r3536
581582INLINE void in_a_dbb(void)
582583{
583584   if( i8x41.irq_callback )
584      (*i8x41.irq_callback)(I8X41_INT_IBF);
585      (*i8x41.irq_callback)(i8x41.device, I8X41_INT_IBF);
585586
586587   STATE &= ~IBF;               /* clear input buffer full flag */
587588   if( ENABLE & FLAGS )
r3535r3536
13231324 *  Inits CPU emulation
13241325 ****************************************************************************/
13251326
1326static void i8x41_init(int index, int clock, const void *config, int (*irqcallback)(int))
1327static CPU_INIT( i8x41 )
13271328{
13281329   i8x41.irq_callback = irqcallback;
1330   i8x41.device = device;
13291331   i8x41.config = (i8x41_config *)config;
13301332
13311333   state_save_register_item("i8x41", index, i8x41.ppc);
r3535r3536
13501352 *  Reset registers to their initial values
13511353 ****************************************************************************/
13521354
1353static void i8x41_reset(void)
1355static CPU_RESET( i8x41 )
13541356{
1355   int (*save_irqcallback)(int) = i8x41.irq_callback;
1357   cpu_irq_callback save_irqcallback = i8x41.irq_callback;
1358   const device_config *save_device = i8x41.device;
13561359   i8x41_config   *save_config = i8x41.config;
13571360   memset(&i8x41, 0, sizeof(I8X41));
13581361   i8x41.irq_callback = save_irqcallback;
1362   i8x41.device = save_device;
13591363   i8x41.config = save_config;
13601364
13611365   /* default to 8041 behaviour for DBBI/DBBO and extended commands */
r3535r3536
13811385 *  Shut down CPU emulation
13821386 ****************************************************************************/
13831387
1384static void i8x41_exit(void)
1388static CPU_EXIT( i8x41 )
13851389{
13861390   /* nothing to do */
13871391}
r3535r3536
13911395 *  Execute cycles - returns number of cycles actually run
13921396 ****************************************************************************/
13931397
1394static int i8x41_execute(int cycles)
1398static CPU_EXECUTE( i8x41 )
13951399{
13961400   int inst_cycles, T1_level;
13971401
r3535r3536
20412045 *  Get all registers in given buffer
20422046 ****************************************************************************/
20432047
2044static void i8x41_get_context(void *dst)
2048static CPU_GET_CONTEXT( i8x41 )
20452049{
20462050   if( dst )
20472051      memcpy(dst, &i8x41, sizeof(I8X41));
r3535r3536
20522056 *  Set all registers to given values
20532057 ****************************************************************************/
20542058
2055static void i8x41_set_context(void *src)
2059static CPU_SET_CONTEXT( i8x41 )
20562060{
20572061   if( src )
20582062      memcpy(&i8x41, src, sizeof(I8X41));
r3535r3536
21132117 * Generic set_info
21142118 **************************************************************************/
21152119
2116static void i8x41_set_info(UINT32 state, cpuinfo *info)
2120static CPU_SET_INFO( i8x41 )
21172121{
21182122   switch (state)
21192123   {
r3535r3536
22032207 * Generic get_info
22042208 **************************************************************************/
22052209
2206void i8x41_get_info(UINT32 state, cpuinfo *info)
2210CPU_GET_INFO( i8x41 )
22072211{
22082212   switch (state)
22092213   {
r3535r3536
22762280         break;
22772281
22782282      /* --- the following bits of info are returned as pointers to data or functions --- */
2279      case CPUINFO_PTR_SET_INFO:                  info->setinfo = i8x41_set_info;         break;
2280      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = i8x41_get_context;   break;
2281      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = i8x41_set_context;   break;
2282      case CPUINFO_PTR_INIT:                     info->init = i8x41_init;            break;
2283      case CPUINFO_PTR_RESET:                     info->reset = i8x41_reset;            break;
2284      case CPUINFO_PTR_EXIT:                     info->exit = i8x41_exit;            break;
2285      case CPUINFO_PTR_EXECUTE:                  info->execute = i8x41_execute;         break;
2283      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(i8x41);         break;
2284      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(i8x41);   break;
2285      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(i8x41);   break;
2286      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(i8x41);            break;
2287      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(i8x41);            break;
2288      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(i8x41);            break;
2289      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(i8x41);         break;
22862290      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
2287      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = i8x41_dasm;         break;
2291      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(i8x41);         break;
22882292      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &i8x41_ICount;         break;
22892293
22902294      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/cpu/konami/konami.c
r3535r3536
5555   UINT8   ireg;      /* first opcode */
5656    UINT8   irq_state[2];
5757    int     extra_cycles; /* cycles used up by interrupts */
58    int     (*irq_callback)(int irqline);
58   cpu_irq_callback irq_callback;
59   const device_config *device;
5960    UINT8   int_state;  /* SYNC and CWAI flags */
6061   UINT8   nmi_state;
6162   void    (*setlines_callback)( int lines ); /* callback called when A16-A23 are set */
r3535r3536
131132      CC |= CC_IF | CC_II;         /* inhibit FIRQ and IRQ */      \
132133      PCD = RM16(0xfff6);                                  \
133134      change_pc(PC);               /* TS 971002 */             \
134      (void)(*konami.irq_callback)(KONAMI_FIRQ_LINE);               \
135      (void)(*konami.irq_callback)(konami.device, KONAMI_FIRQ_LINE);   \
135136   }                                                   \
136137   else                                                \
137138   if( konami.irq_state[KONAMI_IRQ_LINE]!=CLEAR_LINE && !(CC & CC_II) )\
r3535r3536
159160      CC |= CC_II;               /* inhibit IRQ */            \
160161      PCD = RM16(0xfff8);                                  \
161162      change_pc(PC);               /* TS 971002 */             \
162      (void)(*konami.irq_callback)(KONAMI_IRQ_LINE);               \
163      (void)(*konami.irq_callback)(konami.device, KONAMI_IRQ_LINE);   \
163164   }
164165
165166/* public globals */
r3535r3536
367368/****************************************************************************
368369 * Get all registers in given buffer
369370 ****************************************************************************/
370static void konami_get_context(void *dst)
371static CPU_GET_CONTEXT( konami )
371372{
372373   if( dst )
373374      *(konami_Regs*)dst = konami;
r3535r3536
376377/****************************************************************************
377378 * Set all registers to given values
378379 ****************************************************************************/
379static void konami_set_context(void *src)
380static CPU_SET_CONTEXT( konami )
380381{
381382   if( src )
382383      konami = *(konami_Regs*)src;
r3535r3536
388389/****************************************************************************/
389390/* Reset registers to their initial values                                  */
390391/****************************************************************************/
391static void konami_init(int index, int clock, const void *config, int (*irqcallback)(int))
392static CPU_INIT( konami )
392393{
393394   konami.irq_callback = irqcallback;
395   konami.device = device;
394396
395397   state_save_register_item("KONAMI", index, PC);
396398   state_save_register_item("KONAMI", index, U);
r3535r3536
406408   state_save_register_item("KONAMI", index, konami.irq_state[1]);
407409}
408410
409static void konami_reset(void)
411static CPU_RESET( konami )
410412{
411413   konami.int_state = 0;
412414   konami.nmi_state = CLEAR_LINE;
r3535r3536
422424    change_pc(PC);    /* TS 971002 */
423425}
424426
425static void konami_exit(void)
427static CPU_EXIT( konami )
426428{
427429}
428430
r3535r3536
482484#include "konamops.c"
483485
484486/* execute instructions on this CPU until icount expires */
485static int konami_execute(int cycles)
487static CPU_EXECUTE( konami )
486488{
487489   konami_ICount = cycles - konami.extra_cycles;
488490   konami.extra_cycles = 0;
r3535r3536
520522 * Generic set_info
521523 **************************************************************************/
522524
523static void konami_set_info(UINT32 state, cpuinfo *info)
525static CPU_SET_INFO( konami )
524526{
525527   switch (state)
526528   {
r3535r3536
552554 * Generic get_info
553555 **************************************************************************/
554556
555void konami_get_info(UINT32 state, cpuinfo *info)
557CPU_GET_INFO( konami )
556558{
557559   switch (state)
558560   {
r3535r3536
597599      case CPUINFO_INT_REGISTER + KONAMI_DP:         info->i = DP;                     break;
598600
599601      /* --- the following bits of info are returned as pointers to data or functions --- */
600      case CPUINFO_PTR_SET_INFO:                  info->setinfo = konami_set_info;      break;
601      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = konami_get_context;   break;
602      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = konami_set_context;   break;
603      case CPUINFO_PTR_INIT:                     info->init = konami_init;            break;
604      case CPUINFO_PTR_RESET:                     info->reset = konami_reset;            break;
605      case CPUINFO_PTR_EXIT:                     info->exit = konami_exit;            break;
606      case CPUINFO_PTR_EXECUTE:                  info->execute = konami_execute;         break;
602      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(konami);      break;
603      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(konami);   break;
604      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(konami);   break;
605      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(konami);            break;
606      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(konami);            break;
607      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(konami);            break;
608      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(konami);         break;
607609      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
608      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = konami_dasm;      break;
610      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(konami);      break;
609611      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &konami_ICount;         break;
610612      case CPUINFO_PTR_KONAMI_SETLINES_CALLBACK:      info->f = (genf *)konami.setlines_callback;   break;
611613
src/emu/cpu/konami/knmidasm.c
r3535r3536
18591859   /* ff */   { illegal, 0 }
18601860};
18611861
1862offs_t konami_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
1862CPU_DISASSEMBLE( konami )
18631863{
18641864   buffer[0] = '\0';
18651865
src/emu/cpu/konami/konami.h
r3535r3536
2222#define KONAMI_FIRQ_LINE 1   /* FIRQ line number */
2323
2424/* PUBLIC FUNCTIONS */
25void konami_get_info(UINT32 state, cpuinfo *info);
25CPU_GET_INFO( konami );
2626
2727/****************************************************************************/
2828/* Read a byte from given memory location                                   */
r3535r3536
5555#    define TRUE (!FALSE)
5656#endif
5757
58offs_t konami_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
58CPU_DISASSEMBLE( konami );
5959
6060#endif /* __KONAMI_H__ */
src/emu/video/mc6845.c
r3535r3536
4444};
4545
4646
47/* mode control bits */
48
49#define MODE_INTERLACED            0x01 /* not supported */
50#define MODE_VIDEO               0x02 /* not supported */
51#define MODE_ROW_COLUMN_ADDRESSING   0x04 /* not supported */
52#define MODE_TRANSPARENT_ADDRESSING   0x08 /* not supported */
53#define MODE_DISPLAY_ENABLE_SKEW   0x10
54#define MODE_CURSOR_SKEW         0x20
55#define MODE_RA4_IS_UPDATE_STROBE   0x40 /* not supported */
56#define MODE_INTERLEAVED_UPDATES   0x80 /* not supported */
57
58
5947/* tags for state saving */
6048static const char * const device_tags[NUM_TYPES] = {     "mc6845", "mc6845-1", "c6545-1", "r6545-1", "h46505", "hd6845", "sy6545-1" };
6149
r3535r3536
6452static const int supports_vert_sync_width[NUM_TYPES]   = { FALSE,       TRUE,      TRUE,      TRUE,    FALSE,     TRUE,       TRUE };
6553static const int supports_status_reg_d5[NUM_TYPES]     = { FALSE,      FALSE,      TRUE,      TRUE,    FALSE,    FALSE,       TRUE };
6654static const int supports_status_reg_d6[NUM_TYPES]     = { FALSE,      FALSE,      TRUE,      TRUE,    FALSE,    FALSE,       TRUE };
67static const int supports_status_reg_d7[NUM_TYPES]     = { FALSE,      FALSE,     FALSE,     FALSE,    FALSE,    FALSE,       TRUE };
6855
6956
7057typedef struct _mc6845_t mc6845_t;
r3535r3536
9077   UINT16   disp_start_addr;   /* 0x0c/0x0d */
9178   UINT16   cursor_addr;      /* 0x0e/0x0f */
9279   UINT16   light_pen_addr;      /* 0x10/0x11 */
93   UINT16   update_addr;      /* 0x12/0x13 */
9480
9581   /* other internal state */
9682   UINT64   clock;
r3535r3536
118104   UINT16   vsync_off_pos;
119105   UINT16  current_disp_addr;   /* the display address currently drawn */
120106   UINT8   light_pen_latched;
121   int      update_ready;
122107   int      has_valid_parameters;
123108};
124109
r3535r3536
174159   if (supports_status_reg_d6[mc6845->device_type] && mc6845->light_pen_latched)
175160      ret = ret | 0x40;
176161
177   /* update ready */
178   if (supports_status_reg_d7[mc6845->device_type] && mc6845->update_ready)
179      ret = ret | 0x80;
180
181162   return ret;
182163}
183164
r3535r3536
195176      case 0x0f:  ret = (mc6845->cursor_addr    >> 0) & 0xff; break;
196177      case 0x10:  ret = (mc6845->light_pen_addr >> 8) & 0xff; mc6845->light_pen_latched = FALSE; break;
197178      case 0x11:  ret = (mc6845->light_pen_addr >> 0) & 0xff; mc6845->light_pen_latched = FALSE; break;
198      case 0x1f:  mc6845->update_ready = 0; mc6845->update_addr = (mc6845->update_addr + 1) & 0x3fff; break;
199179
200180      /* all other registers are write only and return 0 */
201181      default: break;
r3535r3536
231211      case 0x0f:  mc6845->cursor_addr      = ((data & 0xff) << 0) | (mc6845->cursor_addr & 0xff00); break;
232212      case 0x10: /* read-only */ break;
233213      case 0x11: /* read-only */ break;
234      case 0x12:  mc6845->update_addr      = ((data & 0x3f) << 8) | (mc6845->update_addr & 0x00ff); break;
235      case 0x13:  mc6845->update_addr      = ((data & 0xff) << 0) | (mc6845->update_addr & 0xff00); break;
236      case 0x1f:  mc6845->update_ready = 0; mc6845->update_addr = (mc6845->update_addr + 1) & 0x3fff; break;
237214      default: break;
238215   }
239216
240   /* display message if the Mode Control register has unsupported bits active */
241   if ((mc6845->register_address_latch == 0x08) && (mc6845->mode_control & ~(MODE_DISPLAY_ENABLE_SKEW | MODE_CURSOR_SKEW)))
217   /* display message if the Mode Control register is not zero */
218   if ((mc6845->register_address_latch == 0x08) && (mc6845->mode_control != 0))
242219      popmessage("Mode Control %02X is not supported!!!", mc6845->mode_control);
243220
244221   recompute_parameters(mc6845, FALSE);
r3535r3536
377354            next_y = 0;
378355      }
379356
380      /* delay display enable for 1 character time if skew is enabled */
381      if (mc6845->mode_control & MODE_DISPLAY_ENABLE_SKEW)
382         next_x += mc6845->hpixels_per_column;
383
384357      if (next_y != -1)
385358         duration = video_screen_get_time_until_pos(mc6845->screen, next_y, next_x);
386359      else
r3535r3536
405378      else
406379         next_y = (video_screen_get_vpos(mc6845->screen) + 1) % mc6845->vert_pix_total;
407380
381      /* if the next line is not in the visible region, go to the beginning of the screen */
382      if (next_y > mc6845->max_visible_y)
383         next_y = 0;
384
408385      timer_adjust_oneshot(mc6845->hsync_on_timer,  video_screen_get_time_until_pos(mc6845->screen, next_y, mc6845->hsync_on_pos) , 0);
409386      timer_adjust_oneshot(mc6845->hsync_off_timer, video_screen_get_time_until_pos(mc6845->screen, next_y, mc6845->hsync_off_pos), 0);
410387   }
r3535r3536
678655         /* compute the cursor X position, or -1 if not visible */
679656         INT8 cursor_x = cursor_visible ? (mc6845->cursor_addr - mc6845->current_disp_addr) : -1;
680657
681         /* delay cursor for 1 character time if skew is enabled */
682         if (mc6845->mode_control & MODE_CURSOR_SKEW)
683            cursor_x += mc6845->hpixels_per_column;
684
685658         /* call the external system to draw it */
686659         mc6845->intf->update_row(device, bitmap, cliprect, mc6845->current_disp_addr, ra, y, mc6845->horiz_disp, cursor_x, param);
687660
r3535r3536
773746   state_save_register_item(unique_tag, 0, mc6845->light_pen_latched);
774747   state_save_register_item(unique_tag, 0, mc6845->cursor_state);
775748   state_save_register_item(unique_tag, 0, mc6845->cursor_blink_count);
776   state_save_register_item(unique_tag, 0, mc6845->update_addr);
777   state_save_register_item(unique_tag, 0, mc6845->update_ready);
778749
779750   return DEVICE_START_OK;
780751}
src/emu/memory.h
r3535r3536
627627
628628
629629/* start/end tags for the address map */
630#define ADDRESS_MAP_NAME(_name) address_map_##_name
630631#define ADDRESS_MAP_START(_name, _space, _bits) \
631   const addrmap##_bits##_token address_map_##_name[] = { \
632   const addrmap##_bits##_token ADDRESS_MAP_NAME(_name)[] = { \
632633   TOKEN_UINT32_PACK3(ADDRMAP_TOKEN_START, 8, _space, 8, _bits, 8),
633634
634635#define ADDRESS_MAP_END \
r3535r3536
636637
637638/* use this to declare external references to an address map */
638639#define ADDRESS_MAP_EXTERN(_name, _bits) \
639   extern const addrmap##_bits##_token address_map_##_name[]
640   extern const addrmap##_bits##_token ADDRESS_MAP_NAME(_name)[]
640641
641642
642643/* global controls */
src/emu/mame.c
r3535r3536
349349               video_frame_update(machine, FALSE);
350350
351351            /* handle save/load */
352            if (mame->saveload_schedule_callback)
352            if (mame->saveload_schedule_callback != NULL)
353353               (*mame->saveload_schedule_callback)(machine);
354354
355355            profiler_mark(PROFILER_END);
src/emu/inptport.c
r3535r3536
31373137   for (scanfieldptr = &field->port->fieldlist; *scanfieldptr != NULL; scanfieldptr = scanfieldnextptr)
31383138   {
31393139      scanfieldnextptr = &(*scanfieldptr)->next;
3140      if (((*scanfieldptr)->mask & field->mask) != 0 && (field->condition.condition == PORTCOND_ALWAYS || condition_equal(&(*scanfieldptr)->condition, &field->condition)))
3140      if (((*scanfieldptr)->mask & field->mask) != 0 && (field->condition.condition == PORTCOND_ALWAYS ||
3141                                                         (*scanfieldptr)->condition.condition == PORTCOND_ALWAYS ||
3142                                                         condition_equal(&(*scanfieldptr)->condition, &field->condition)))
31413143      {
31423144         /* reduce the mask of the field we found */
31433145         config = (input_field_config *)*scanfieldptr;
src/emu/machine/74123.c
r3535r3536
1414#define   LOG      (0)
1515
1616
17typedef struct _TTL74123_state TTL74123_state;
17typedef struct _ttl74123_t ttl74123_t;
1818
19struct _TTL74123_state
19struct _ttl74123_t
2020{
21   const TTL74123_interface *intf;
22   int which;
21   const ttl74123_config *intf;
2322
24   UINT8 A;         /* pin 1/9 */
25   UINT8 B;         /* pin 2/10 */
23   UINT8 a;         /* pin 1/9 */
24   UINT8 b;         /* pin 2/10 */
2625   UINT8 clear;      /* pin 3/11 */
2726   emu_timer *timer;
2827};
2928
30static TTL74123_state chips[MAX_TTL74123];
29/* ----------------------------------------------------------------------- */
3130
31INLINE ttl74123_t *get_safe_token(const device_config *device) {
32   assert( device != NULL );
33   assert( device->token != NULL );
34   assert( device->type == TTL74123 );
35   return ( ttl74123_t * ) device->token;
36}
3237
33static attotime compute_duration(TTL74123_state *chip)
38
39static attotime compute_duration(ttl74123_t *chip)
3440{
3541   double duration;
3642
r3535r3536
5864}
5965
6066
61static int timer_running(TTL74123_state *chip)
67static int timer_running(ttl74123_t *chip)
6268{
6369   return (attotime_compare(timer_timeleft(chip->timer), attotime_zero) > 0) &&
6470         (attotime_compare(timer_timeleft(chip->timer), attotime_never) != 0);
6571}
6672
6773
68static void set_output(TTL74123_state *chip)
74static TIMER_CALLBACK( output_callback )
6975{
70   int output = timer_running(chip);
76   const device_config *device = ptr;
77   ttl74123_t *chip = get_safe_token(device);
7178
72   chip->intf->output_changed_cb(output);
73
74   if (LOG) logerror("74123 #%d:  Output: %d\n", chip->which, output);
79   chip->intf->output_changed_cb(device, 0, param);
7580}
7681
7782
78static TIMER_CALLBACK( clear_callback )
83static void set_output(const device_config *device)
7984{
80   TTL74123_state *chip = ptr;
85   ttl74123_t *chip = get_safe_token(device);
86   int output = timer_running(chip);
8187
82   set_output(chip);
88   timer_set( attotime_zero, (void *) device, output, output_callback );
89
90   if (LOG) logerror("74123 %s:  Output: %d\n", device->tag, output);
8391}
8492
8593
86void TTL74123_config(int which, const TTL74123_interface *intf)
94static TIMER_CALLBACK( clear_callback )
8795{
88   TTL74123_state *chip;
96   const device_config *device = ptr;
97   ttl74123_t *chip = get_safe_token(device);
98   int output = timer_running(chip);
8999
90   assert_always(which < MAX_TTL74123, "Exceeded maximum number of 74123 chips");
91   assert_always(intf, "No interface specified");
92   assert_always((intf->connection_type == TTL74123_GROUNDED) && (intf->cap >= CAP_U(0.01)), "Only capacitors >= 0.01uF supported for GROUNDED type");
93   assert_always(intf->cap >= CAP_P(1000), "Only capacitors >= 1000pF supported ");
100   chip->intf->output_changed_cb(device, 0, output);
101}
94102
95   chip = &chips[which];
96103
97   chip->intf = intf;
98   chip->which = which;
99   chip->timer = timer_alloc(clear_callback, chip);
100104
101   /* start with the defaults */
102   chip->A = intf->A;
103    chip->B = intf->B;
104   chip->clear = intf->clear;
105105
106   /* register for state saving */
107   state_save_register_item("TTL74123", which, chip->A);
108   state_save_register_item("TTL74123", which, chip->B);
109   state_save_register_item("TTL74123", which, chip->clear);
110}
111
112
113void TTL74123_reset(int which)
106static void start_pulse(const device_config *device)
114107{
115   TTL74123_state *chip = &chips[which];
108   ttl74123_t *chip = get_safe_token(device);
116109
117   set_output(chip);
118}
119
120
121static void start_pulse(TTL74123_state *chip)
122{
123110   attotime duration = compute_duration(chip);
124111
125112   if (timer_running(chip))
r3535r3536
131118      {
132119         timer_adjust_oneshot(chip->timer, duration, 0);
133120
134         if (LOG) logerror("74123 #%d:  Retriggering pulse.  Duration: %f\n", chip->which, attotime_to_double(duration));
121         if (LOG) logerror("74123 %s:  Retriggering pulse.  Duration: %f\n", device->tag, attotime_to_double(duration));
135122      }
136123      else
137124      {
138         if (LOG) logerror("74123 #%d:  Retriggering failed.\n", chip->which);
125         if (LOG) logerror("74123 %s:  Retriggering failed.\n", device->tag);
139126      }
140127   }
141128   else
r3535r3536
143130      /* starting */
144131      timer_adjust_oneshot(chip->timer, duration, 0);
145132
146      set_output(chip);
133      set_output(device);
147134
148      if (LOG) logerror("74123 #%d:  Starting pulse.  Duration: %f\n", chip->which, attotime_to_double(duration));
135      if (LOG) logerror("74123 %s:  Starting pulse.  Duration: %f\n", device->tag, attotime_to_double(duration));
149136   }
150137}
151138
152139
153void TTL74123_A_w(int which, int data)
140WRITE8_DEVICE_HANDLER( ttl74123_a_w )
154141{
155   TTL74123_state *chip = &chips[which];
142   ttl74123_t *chip = get_safe_token(device);
156143
157144   /* start/regtrigger pulse if B=HI and falling edge on A (while clear is HI) */
158   if (!data && chip->A && chip->B && chip->clear)
159      start_pulse(chip);
145   if (!data && chip->a && chip->b && chip->clear)
146      start_pulse(device);
160147
161   chip->A = data;
148   chip->a = data;
162149}
163150
164151
165void TTL74123_B_w(int which, int data)
152WRITE8_DEVICE_HANDLER( ttl74123_b_w )
166153{
167   TTL74123_state *chip = &chips[which];
154   ttl74123_t *chip = get_safe_token(device);
168155
169156   /* start/regtrigger pulse if A=LO and rising edge on B (while clear is HI) */
170   if (data && !chip->B && !chip->A && chip->clear)
171      start_pulse(chip);
157   if (data && !chip->b && !chip->a && chip->clear)
158      start_pulse(device);
172159
173   chip->B = data;
160   chip->b = data;
174161}
175162
176163
177void TTL74123_clear_w(int which, int data)
164WRITE8_DEVICE_HANDLER( ttl74123_clear_w )
178165{
179   TTL74123_state *chip = &chips[which];
166   ttl74123_t *chip = get_safe_token(device);
180167
181   /* clear the output if A=LO, B=HI and falling edge on clear */
182   if (!data && chip->clear && chip->B && !chip->A && !chip->clear)
168   /* start/regtrigger pulse if B=HI and A=LO and rising edge on clear */
169   if (data && !chip->a && chip->b && !chip->clear)
170      start_pulse(device);
171   else if (!data)    /* clear the output  */
183172   {
184173      timer_adjust_oneshot(chip->timer, attotime_zero, 0);
185174
186      if (LOG) logerror("74123 #%d:  Cleared\n", which);
175      if (LOG) logerror("74123 #%s:  Cleared\n", device->tag );
187176   }
188
189177   chip->clear = data;
190178}
179
180WRITE8_DEVICE_HANDLER( ttl74123_reset_w )
181{
182   set_output(device);
183}
184
185/* ----------------------------------------------------------------------- */
186
187/* device interface */
188
189static DEVICE_START( ttl74123 )
190{
191   ttl74123_t *chip = get_safe_token(device);
192   char unique_tag[30];
193
194   /* validate arguments */
195   assert(strlen(device->tag) < 20);
196
197   chip->intf = device->static_config;
198
199   assert_always(chip->intf, "No interface specified");
200   assert_always((chip->intf->connection_type != TTL74123_GROUNDED) || (chip->intf->cap >= CAP_U(0.01)), "Only capacitors >= 0.01uF supported for GROUNDED type");
201   assert_always(chip->intf->cap >= CAP_P(1000), "Only capacitors >= 1000pF supported ");
202
203   chip->timer = timer_alloc(clear_callback, (void *) device);
204
205   /* start with the defaults */
206   chip->a = chip->intf->a;
207    chip->b = chip->intf->b;
208   chip->clear = chip->intf->clear;
209
210   /* register for state saving */
211
212   state_save_combine_module_and_tag(unique_tag, "ttl74123", device->tag);
213
214   state_save_register_item(unique_tag, 0, chip->a);
215   state_save_register_item(unique_tag, 0, chip->b);
216   state_save_register_item(unique_tag, 0, chip->clear);
217
218   return DEVICE_START_OK;
219}
220
221
222static DEVICE_RESET( ttl74123 )
223{
224   set_output(device);
225}
226
227
228static DEVICE_SET_INFO( ttl74123 )
229{
230   switch (state)
231   {
232      /* no parameters to set */
233   }
234}
235
236
237DEVICE_GET_INFO( ttl74123 )
238{
239   switch (state)
240   {
241      /* --- the following bits of info are returned as 64-bit signed integers --- */
242      case DEVINFO_INT_TOKEN_BYTES:               info->i = sizeof(ttl74123_t);                  break;
243      case DEVINFO_INT_INLINE_CONFIG_BYTES:         info->i = 0;                              break;
244      case DEVINFO_INT_CLASS:                     info->i = DEVICE_CLASS_PERIPHERAL;               break;
245
246      /* --- the following bits of info are returned as pointers to data or functions --- */
247      case DEVINFO_FCT_SET_INFO:                  info->set_info = DEVICE_SET_INFO_NAME(ttl74123);    break;
248      case DEVINFO_FCT_START:                     info->start = DEVICE_START_NAME(ttl74123);         break;
249      case DEVINFO_FCT_STOP:                     /* Nothing */                              break;
250      case DEVINFO_FCT_RESET:                     info->reset = DEVICE_RESET_NAME(ttl74123);         break;
251
252      /* --- the following bits of info are returned as NULL-terminated strings --- */
253      case DEVINFO_STR_NAME:                     info->s = "74123";                           break;
254      case DEVINFO_STR_FAMILY:                  info->s = "TTL";                           break;
255      case DEVINFO_STR_VERSION:                  info->s = "1.0";                           break;
256      case DEVINFO_STR_SOURCE_FILE:               info->s = __FILE__;                           break;
257      case DEVINFO_STR_CREDITS:                  info->s = "Copyright Nicola Salmoria and the MAME Team"; break;
258   }
259}
src/emu/machine/74123.h
r3535r3536
4646#ifndef TTL74123_H
4747#define TTL74123_H
4848
49#define MAX_TTL74123 4
49#define TTL74123      DEVICE_GET_INFO_NAME(ttl74123)
5050
5151
5252/* constants for the different ways the cap/res can be connected.
r3535r3536
5656#define TTL74123_GROUNDED               (3)
5757
5858
59typedef struct _TTL74123_interface TTL74123_interface;
60struct _TTL74123_interface
59typedef struct _ttl74123_config ttl74123_config;
60struct _ttl74123_config
6161{
6262   int connection_type;   /* the hook up type - one of the constants above */
6363   double res;            /* resistor connected to RCext */
6464   double cap;            /* capacitor connected to Cext and RCext */
65   int A;               /* initial/constant value of the A pin */
66   int B;               /* initial/constant value of the B pin */
65   int a;               /* initial/constant value of the A pin */
66   int b;               /* initial/constant value of the B pin */
6767   int clear;            /* initial/constant value of the Clear pin */
68   void (*output_changed_cb)(int output);
68   write8_device_func   output_changed_cb;
6969};
7070
71/* device interface */
72DEVICE_GET_INFO( ttl74123 );
7173
72void TTL74123_config(int which, const TTL74123_interface *intf);
73void TTL74123_reset(int which);
74/* write inputs */
7475
75void TTL74123_A_w(int which, int data);
76void TTL74123_B_w(int which, int data);
77void TTL74123_clear_w(int which, int data);
76WRITE8_DEVICE_HANDLER( ttl74123_a_w );
77WRITE8_DEVICE_HANDLER( ttl74123_b_w );
78WRITE8_DEVICE_HANDLER( ttl74123_clear_w );
7879
80/* reset the latch */
7981
82WRITE8_DEVICE_HANDLER( ttl74123_reset_w );
83
8084#endif
src/emu/machine/ldvp931.c
r3535r3536
298298   }
299299
300300   /* also boost interleave for 4 scanlines to ensure proper communications */
301   cpu_boost_interleave(attotime_zero, attotime_mul(video_screen_get_scan_period(ld->screen), 4));
301   cpu_boost_interleave(ld->device->machine, attotime_zero, attotime_mul(video_screen_get_scan_period(ld->screen), 4));
302302   return player->tocontroller;
303303}
304304
r3535r3536
632632      (*player->data_ready_cb)(ld->device, TRUE);
633633
634634   /* also boost interleave for 4 scanlines to ensure proper communications */
635   cpu_boost_interleave(attotime_zero, attotime_mul(video_screen_get_scan_period(ld->screen), 4));
635   cpu_boost_interleave(ld->device->machine, attotime_zero, attotime_mul(video_screen_get_scan_period(ld->screen), 4));
636636}
637637
638638
src/emu/machine/z80sio.c
r3535r3536
1919    DEBUGGING
2020***************************************************************************/
2121
22#define VERBOSE     
22#define VERBOSE      1
2323
2424#define VPRINTF(x) do { if (VERBOSE) logerror x; } while (0)
2525
src/emu/machine/ldv1000.c
r3535r3536
277277   timer_set(video_screen_get_time_until_pos(ld->screen, 19*2, 0), ld, 0, vbi_data_fetch);
278278
279279   /* boost interleave for the first 1ms to improve communications */
280   cpu_boost_interleave(attotime_zero, ATTOTIME_IN_MSEC(1));
280   cpu_boost_interleave(ld->device->machine, attotime_zero, ATTOTIME_IN_MSEC(1));
281281}
282282
283283
src/emu/attotime.c
r3535r3536
2424
2525
2626/***************************************************************************
27    CONVERSION HELPERS
28***************************************************************************/
29
30/*-------------------------------------------------
31    attotime_to_attoseconds - convert a attotime
32    to attoseconds, clamping to maximum positive/
33    negative values
34-------------------------------------------------*/
35
36attoseconds_t attotime_to_attoseconds(attotime _time)
37{
38   /* positive values between 0 and 1 second */
39   if (_time.seconds == 0)
40      return _time.attoseconds;
41
42   /* negative values between -1 and 0 seconds */
43   else if (_time.seconds == -1)
44      return _time.attoseconds - ATTOSECONDS_PER_SECOND;
45
46   /* out-of-range positive values */
47   else if (_time.seconds > 0)
48      return ATTOSECONDS_PER_SECOND;
49
50   /* out-of-range negative values */
51   else
52      return -ATTOSECONDS_PER_SECOND;
53}
54
55
56/*-------------------------------------------------
57    attotime_to_ticks - convert an attotime to
58    clock ticks at the given frequency
59-------------------------------------------------*/
60
61INT64 attotime_to_ticks(attotime _time, INT32 frequency)
62{
63   INT32 fracticks = attotime_mul(attotime_make(0, _time.attoseconds), frequency).seconds;
64   return (INT64)_time.seconds * (INT64)frequency + fracticks;
65}
66
67
68/*-------------------------------------------------
69    ticks_to_attotime - convert clock ticks at
70    the given frequency to an attotime
71-------------------------------------------------*/
72
73attotime ticks_to_attotime(INT64 ticks, INT32 frequency)
74{
75   attotime result;
76   result.seconds = ticks / frequency;
77   result.attoseconds = HZ_TO_ATTOSECONDS(frequency) * (ticks - (INT64)result.seconds * (INT64)frequency);
78   return result;
79}
80
81
82
83/***************************************************************************
8427    CORE MATH FUNCTIONS
8528***************************************************************************/
8629
8730/*-------------------------------------------------
88    attotime_add - add two attotimes
89-------------------------------------------------*/
90
91attotime attotime_add(attotime _time1, attotime _time2)
92{
93   attotime result;
94
95   /* if one of the items is attotime_never, return attotime_never */
96   if (_time1.seconds >= ATTOTIME_MAX_SECONDS || _time2.seconds >= ATTOTIME_MAX_SECONDS)
97      return attotime_never;
98
99   /* add the seconds and attoseconds */
100   result.attoseconds = _time1.attoseconds + _time2.attoseconds;
101   result.seconds = _time1.seconds + _time2.seconds;
102
103   /* normalize and return */
104   if (result.attoseconds >= ATTOSECONDS_PER_SECOND)
105   {
106      result.attoseconds -= ATTOSECONDS_PER_SECOND;
107      result.seconds++;
108   }
109
110   /* overflow */
111   if (result.seconds >= ATTOTIME_MAX_SECONDS)
112      return attotime_never;
113   return result;
114}
115
116
117/*-------------------------------------------------
118    attotime_add_attoseconds - add attoseconds
119    to a attotime
120-------------------------------------------------*/
121
122attotime attotime_add_attoseconds(attotime _time1, attoseconds_t _attoseconds)
123{
124   attotime result;
125
126   /* if one of the items is attotime_never, return attotime_never */
127   if (_time1.seconds >= ATTOTIME_MAX_SECONDS)
128      return attotime_never;
129
130   /* add the seconds and attoseconds */
131   result.attoseconds = _time1.attoseconds + _attoseconds;
132   result.seconds = _time1.seconds;
133
134   /* normalize and return */
135   if (result.attoseconds >= ATTOSECONDS_PER_SECOND)
136   {
137      result.attoseconds -= ATTOSECONDS_PER_SECOND;
138      result.seconds++;
139   }
140
141   /* overflow */
142   if (result.seconds >= ATTOTIME_MAX_SECONDS)
143      return attotime_never;
144   return result;
145}
146
147
148/*-------------------------------------------------
149    attotime_sub - subtract two attotimes
150-------------------------------------------------*/
151
152attotime attotime_sub(attotime _time1, attotime _time2)
153{
154   attotime result;
155
156   /* if time1 is attotime_never, return attotime_never */
157   if (_time1.seconds >= ATTOTIME_MAX_SECONDS)
158      return attotime_never;
159
160   /* add the seconds and attoseconds */
161   result.attoseconds = _time1.attoseconds - _time2.attoseconds;
162   result.seconds = _time1.seconds - _time2.seconds;
163
164   /* normalize and return */
165   if (result.attoseconds < 0)
166   {
167      result.attoseconds += ATTOSECONDS_PER_SECOND;
168      result.seconds--;
169   }
170   return result;
171}
172
173
174/*-------------------------------------------------
175    attotime_sub_attoseconds - subtract
176    attoseconds from a attotime
177-------------------------------------------------*/
178
179attotime attotime_sub_attoseconds(attotime _time1, attoseconds_t _attoseconds)
180{
181   attotime result;
182
183   /* if time1 is attotime_never, return attotime_never */
184   if (_time1.seconds >= ATTOTIME_MAX_SECONDS)
185      return attotime_never;
186
187   /* add the seconds and attoseconds */
188   result.attoseconds = _time1.attoseconds - _attoseconds;
189   result.seconds = _time1.seconds;
190
191   /* normalize and return */
192   if (result.attoseconds < 0)
193   {
194      result.attoseconds += ATTOSECONDS_PER_SECOND;
195      result.seconds--;
196   }
197   return result;
198}
199
200
201/*-------------------------------------------------
20231    attotime_mul - multiply an attotime by
20332    a constant
20433-------------------------------------------------*/
r3535r3536
282111}
283112
284113
285/*-------------------------------------------------
286    attotime_compare - compare two attotimes
287-------------------------------------------------*/
288114
289int attotime_compare(attotime _time1, attotime _time2)
290{
291   if (_time1.seconds > _time2.seconds)
292      return 1;
293   if (_time1.seconds < _time2.seconds)
294      return -1;
295   if (_time1.attoseconds > _time2.attoseconds)
296      return 1;
297   if (_time1.attoseconds < _time2.attoseconds)
298      return -1;
299   return 0;
300}
301
302
303/*-------------------------------------------------
304    attotime_min - return the minimum of two
305    attotimes
306-------------------------------------------------*/
307
308attotime attotime_min(attotime _time1, attotime _time2)
309{
310   if (_time1.seconds > _time2.seconds)
311      return _time2;
312   if (_time1.seconds < _time2.seconds)
313      return _time1;
314   if (_time1.attoseconds > _time2.attoseconds)
315      return _time2;
316   return _time1;
317}
318
319
320/*-------------------------------------------------
321    attotime_max - return the maximum of two
322    attotimes
323-------------------------------------------------*/
324
325attotime attotime_max(attotime _time1, attotime _time2)
326{
327   if (_time1.seconds > _time2.seconds)
328      return _time1;
329   if (_time1.seconds < _time2.seconds)
330      return _time2;
331   if (_time1.attoseconds > _time2.attoseconds)
332      return _time1;
333   return _time2;
334}
335
336
337
338115/***************************************************************************
339116    MISC UTILITIES
340117***************************************************************************/
341118
342119/*-------------------------------------------------
343    attotime_compare - return a temporary
120    attotime_string - return a temporary
344121    printable string describing an attotime
345122-------------------------------------------------*/
346123
src/emu/rendersw.c
r3535r3536
16501650}
16511651
16521652
1653/*-------------------------------------------------
1654    draw_quad_rgb32_add - perform
1655    rasterization by using RGB add
1656-------------------------------------------------*/
16531657
1658static void FUNC_PREFIX(draw_quad_rgb32_add)(const render_primitive *prim, void *dstdata, UINT32 pitch, quad_setup_data *setup)
1659{
1660   const rgb_t *palbase = prim->texture.palette;
1661   INT32 dudx = setup->dudx;
1662   INT32 dvdx = setup->dvdx;
1663   INT32 endx = setup->endx;
1664   INT32 x, y;
1665
1666   /* simply can't do this without reading from the dest */
1667   if (NO_DEST_READ)
1668      return;
1669
1670   /* fast case: no coloring, no alpha */
1671   if (prim->color.r >= 1.0f && prim->color.g >= 1.0f && prim->color.b >= 1.0f && IS_OPAQUE(prim->color.a))
1672   {
1673      /* loop over rows */
1674      for (y = setup->starty; y < setup->endy; y++)
1675      {
1676         PIXEL_TYPE *dest = (PIXEL_TYPE *)dstdata + y * pitch + setup->startx;
1677         INT32 curu = setup->startu + (y - setup->starty) * setup->dudy;
1678         INT32 curv = setup->startv + (y - setup->starty) * setup->dvdy;
1679
1680         /* no lookup case */
1681         if (palbase == NULL)
1682         {
1683            /* loop over cols */
1684            for (x = setup->startx; x < endx; x++)
1685            {
1686               UINT32 pix = GET_TEXEL(argb32)(&prim->texture, curu, curv);
1687               UINT32 dpix = NO_DEST_READ ? 0 : *dest;
1688               UINT32 r = SOURCE32_R(pix) + DEST_R(dpix);
1689               UINT32 g = SOURCE32_G(pix) + DEST_G(dpix);
1690               UINT32 b = SOURCE32_B(pix) + DEST_B(dpix);
1691               r = (r | -(r >> (8 - SRCSHIFT_R))) & (0xff >> SRCSHIFT_R);
1692               g = (g | -(g >> (8 - SRCSHIFT_G))) & (0xff >> SRCSHIFT_G);
1693               b = (b | -(b >> (8 - SRCSHIFT_B))) & (0xff >> SRCSHIFT_B);
1694               *dest++ = DEST_ASSEMBLE_RGB(r, g, b);
1695               curu += dudx;
1696               curv += dvdx;
1697            }
1698         }
1699
1700         /* lookup case */
1701         else
1702         {
1703            /* loop over cols */
1704            for (x = setup->startx; x < endx; x++)
1705            {
1706               UINT32 pix = GET_TEXEL(argb32)(&prim->texture, curu, curv);
1707               UINT32 dpix = NO_DEST_READ ? 0 : *dest;
1708               UINT32 r = (palbase[(pix >> 16) & 0xff] >> SRCSHIFT_R) + DEST_R(dpix);
1709               UINT32 g = (palbase[(pix >> 8) & 0xff] >> SRCSHIFT_G) + DEST_G(dpix);
1710               UINT32 b = (palbase[(pix >> 0) & 0xff] >> SRCSHIFT_B) + DEST_B(dpix);
1711               r = (r | -(r >> (8 - SRCSHIFT_R))) & (0xff >> SRCSHIFT_R);
1712               g = (g | -(g >> (8 - SRCSHIFT_G))) & (0xff >> SRCSHIFT_G);
1713               b = (b | -(b >> (8 - SRCSHIFT_B))) & (0xff >> SRCSHIFT_B);
1714               *dest++ = DEST_ASSEMBLE_RGB(r, g, b);
1715               curu += dudx;
1716               curv += dvdx;
1717            }
1718         }
1719      }
1720   }
1721
1722   /* alpha and/or coloring case */
1723   else
1724   {
1725      UINT32 sr = (UINT32)(256.0f * prim->color.r);
1726      UINT32 sg = (UINT32)(256.0f * prim->color.g);
1727      UINT32 sb = (UINT32)(256.0f * prim->color.b);
1728      UINT32 sa = (UINT32)(256.0f * prim->color.a);
1729
1730      /* clamp R,G,B and inverse A to 0-256 range */
1731      if (sr > 0x100) { if ((INT32)sr < 0) sr = 0; else sr = 0x100; }
1732      if (sg > 0x100) { if ((INT32)sg < 0) sg = 0; else sg = 0x100; }
1733      if (sb > 0x100) { if ((INT32)sb < 0) sb = 0; else sb = 0x100; }
1734      if (sa > 0x100) { if ((INT32)sa < 0) sa = 0; else sa = 0x100; }
1735
1736      /* loop over rows */
1737      for (y = setup->starty; y < setup->endy; y++)
1738      {
1739         PIXEL_TYPE *dest = (PIXEL_TYPE *)dstdata + y * pitch + setup->startx;
1740         INT32 curu = setup->startu + (y - setup->starty) * setup->dudy;
1741         INT32 curv = setup->startv + (y - setup->starty) * setup->dvdy;
1742
1743         /* no lookup case */
1744         if (palbase == NULL)
1745         {
1746            /* loop over cols */
1747            for (x = setup->startx; x < endx; x++)
1748            {
1749               UINT32 pix = GET_TEXEL(argb32)(&prim->texture, curu, curv);
1750               UINT32 dpix = NO_DEST_READ ? 0 : *dest;
1751               UINT32 r = ((SOURCE32_R(pix) * sr * sa) >> 16) + DEST_R(dpix);
1752               UINT32 g = ((SOURCE32_G(pix) * sg * sa) >> 16) + DEST_G(dpix);
1753               UINT32 b = ((SOURCE32_B(pix) * sb * sa) >> 16) + DEST_B(dpix);
1754               r = (r | -(r >> (8 - SRCSHIFT_R))) & (0xff >> SRCSHIFT_R);
1755               g = (g | -(g >> (8 - SRCSHIFT_G))) & (0xff >> SRCSHIFT_G);
1756               b = (b | -(b >> (8 - SRCSHIFT_B))) & (0xff >> SRCSHIFT_B);
1757               *dest++ = DEST_ASSEMBLE_RGB(r, g, b);
1758               curu += dudx;
1759               curv += dvdx;
1760            }
1761         }
1762
1763         /* lookup case */
1764         else
1765         {
1766            /* loop over cols */
1767            for (x = setup->startx; x < endx; x++)
1768            {
1769               UINT32 pix = GET_TEXEL(argb32)(&prim->texture, curu, curv);
1770               UINT32 dpix = NO_DEST_READ ? 0 : *dest;
1771               UINT32 r = ((palbase[(pix >> 16) & 0xff] * sr * sa) >> (16 + SRCSHIFT_R)) + DEST_R(dpix);
1772               UINT32 g = ((palbase[(pix >> 8) & 0xff] * sr * sa) >> (16 + SRCSHIFT_R)) + DEST_G(dpix);
1773               UINT32 b = ((palbase[(pix >> 0) & 0xff] * sr * sa) >> (16 + SRCSHIFT_R)) + DEST_B(dpix);
1774               r = (r | -(r >> (8 - SRCSHIFT_R))) & (0xff >> SRCSHIFT_R);
1775               g = (g | -(g >> (8 - SRCSHIFT_G))) & (0xff >> SRCSHIFT_G);
1776               b = (b | -(b >> (8 - SRCSHIFT_B))) & (0xff >> SRCSHIFT_B);
1777               *dest++ = DEST_ASSEMBLE_RGB(r, g, b);
1778               curu += dudx;
1779               curv += dvdx;
1780            }
1781         }
1782      }
1783   }
1784}
1785
1786
1787
16541788/***************************************************************************
16551789    32-BIT ARGB QUAD RASTERIZERS
16561790***************************************************************************/
r3535r3536
21672301         FUNC_PREFIX(draw_quad_rgb32)(prim, dstdata, pitch, &setup);
21682302         break;
21692303
2304      case PRIMFLAG_TEXFORMAT(TEXFORMAT_RGB32) | PRIMFLAG_BLENDMODE(BLENDMODE_ADD):
2305         FUNC_PREFIX(draw_quad_rgb32_add)(prim, dstdata, pitch, &setup);
2306         break;
2307
21702308      case PRIMFLAG_TEXFORMAT(TEXFORMAT_ARGB32) | PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA):
21712309         FUNC_PREFIX(draw_quad_argb32_alpha)(prim, dstdata, pitch, &setup);
21722310         break;
src/emu/cpuintrf.c
r3535r3536
1212#include "driver.h"
1313#include "deprecat.h"
1414
15/* mingw-gcc defines this */
16#undef i386
1517
1618
1719/*************************************
r3535r3536
2022 *
2123 *************************************/
2224
23void dummy_get_info(UINT32 state, cpuinfo *info);
24void z80_get_info(UINT32 state, cpuinfo *info);
25void z180_get_info(UINT32 state, cpuinfo *info);
26void i8080_get_info(UINT32 state, cpuinfo *info);
27void i8085_get_info(UINT32 state, cpuinfo *info);
28void m6502_get_info(UINT32 state, cpuinfo *info);
29void m65c02_get_info(UINT32 state, cpuinfo *info);
30void m65sc02_get_info(UINT32 state, cpuinfo *info);
31void m65ce02_get_info(UINT32 state, cpuinfo *info);
32void m6509_get_info(UINT32 state, cpuinfo *info);
33void m6510_get_info(UINT32 state, cpuinfo *info);
34void m6510t_get_info(UINT32 state, cpuinfo *info);
35void m7501_get_info(UINT32 state, cpuinfo *info);
36void m8502_get_info(UINT32 state, cpuinfo *info);
37void n2a03_get_info(UINT32 state, cpuinfo *info);
38void deco16_get_info(UINT32 state, cpuinfo *info);
39void m4510_get_info(UINT32 state, cpuinfo *info);
40void h6280_get_info(UINT32 state, cpuinfo *info);
41void i8086_get_info(UINT32 state, cpuinfo *info);
42void i8088_get_info(UINT32 state, cpuinfo *info);
43void i80186_get_info(UINT32 state, cpuinfo *info);
44void i80188_get_info(UINT32 state, cpuinfo *info);
45void i80286_get_info(UINT32 state, cpuinfo *info);
46void v20_get_info(UINT32 state, cpuinfo *info);
47void v25_get_info(UINT32 state, cpuinfo *info);
48void v30_get_info(UINT32 state, cpuinfo *info);
49void v33_get_info(UINT32 state, cpuinfo *info);
50void v35_get_info(UINT32 state, cpuinfo *info);
51void v60_get_info(UINT32 state, cpuinfo *info);
52void v70_get_info(UINT32 state, cpuinfo *info);
53void i8035_get_info(UINT32 state, cpuinfo *info);
54void i8041_get_info(UINT32 state, cpuinfo *info);
55void i8048_get_info(UINT32 state, cpuinfo *info);
56void i8648_get_info(UINT32 state, cpuinfo *info);
57void i8748_get_info(UINT32 state, cpuinfo *info);
58void mb8884_get_info(UINT32 state, cpuinfo *info);
59void i8039_get_info(UINT32 state, cpuinfo *info);
60void i8049_get_info(UINT32 state, cpuinfo *info);
61void i8749_get_info(UINT32 state, cpuinfo *info);
62void n7751_get_info(UINT32 state, cpuinfo *info);
63void m58715_get_info(UINT32 state, cpuinfo *info);
64void i8x41_get_info(UINT32 state, cpuinfo *info);
65void i8031_get_info(UINT32 state, cpuinfo *info);
66void i8032_get_info(UINT32 state, cpuinfo *info);
67void i8051_get_info(UINT32 state, cpuinfo *info);
68void i8052_get_info(UINT32 state, cpuinfo *info);
69void i8751_get_info(UINT32 state, cpuinfo *info);
70void i8752_get_info(UINT32 state, cpuinfo *info);
71void i80c31_get_info(UINT32 state, cpuinfo *info);
72void i80c32_get_info(UINT32 state, cpuinfo *info);
73void i80c51_get_info(UINT32 state, cpuinfo *info);
74void i80c52_get_info(UINT32 state, cpuinfo *info);
75void i87c51_get_info(UINT32 state, cpuinfo *info);
76void i87c52_get_info(UINT32 state, cpuinfo *info);
77void at89c4051_get_info(UINT32 state, cpuinfo *info);
78void ds5002fp_get_info(UINT32 state, cpuinfo *info);
79void m6800_get_info(UINT32 state, cpuinfo *info);
80void m6801_get_info(UINT32 state, cpuinfo *info);
81void m6802_get_info(UINT32 state, cpuinfo *info);
82void m6803_get_info(UINT32 state, cpuinfo *info);
83void m6808_get_info(UINT32 state, cpuinfo *info);
84void hd63701_get_info(UINT32 state, cpuinfo *info);
85void nsc8105_get_info(UINT32 state, cpuinfo *info);
86void m6805_get_info(UINT32 state, cpuinfo *info);
87void m68705_get_info(UINT32 state, cpuinfo *info);
88void hd63705_get_info(UINT32 state, cpuinfo *info);
89void hd6309_get_info(UINT32 state, cpuinfo *info);
90void m6809_get_info(UINT32 state, cpuinfo *info);
91void m6809e_get_info(UINT32 state, cpuinfo *info);
92void konami_get_info(UINT32 state, cpuinfo *info);
93void m68000_get_info(UINT32 state, cpuinfo *info);
94void m68008_get_info(UINT32 state, cpuinfo *info);
95void m68010_get_info(UINT32 state, cpuinfo *info);
96void m68ec020_get_info(UINT32 state, cpuinfo *info);
97void m68020_get_info(UINT32 state, cpuinfo *info);
98void m68040_get_info(UINT32 state, cpuinfo *info);
99void t11_get_info(UINT32 state, cpuinfo *info);
100void s2650_get_info(UINT32 state, cpuinfo *info);
101void tms34010_get_info(UINT32 state, cpuinfo *info);
102void tms34020_get_info(UINT32 state, cpuinfo *info);
103void ti990_10_get_info(UINT32 state, cpuinfo *info);
104void tms9900_get_info(UINT32 state, cpuinfo *info);
105void tms9940_get_info(UINT32 state, cpuinfo *info);
106void tms9980a_get_info(UINT32 state, cpuinfo *info);
107void tms9985_get_info(UINT32 state, cpuinfo *info);
108void tms9989_get_info(UINT32 state, cpuinfo *info);
109void tms9995_get_info(UINT32 state, cpuinfo *info);
110void tms99105a_get_info(UINT32 state, cpuinfo *info);
111void tms99110a_get_info(UINT32 state, cpuinfo *info);
112void tms99000_get_info(UINT32 state, cpuinfo *info);
113void z8000_get_info(UINT32 state, cpuinfo *info);
114void tms32010_get_info(UINT32 state, cpuinfo *info);
115void tms32025_get_info(UINT32 state, cpuinfo *info);
116void tms32026_get_info(UINT32 state, cpuinfo *info);
117void tms32031_get_info(UINT32 state, cpuinfo *info);
118void tms32032_get_info(UINT32 state, cpuinfo *info);
119void tms32051_get_info(UINT32 state, cpuinfo *info);
120void ccpu_get_info(UINT32 state, cpuinfo *info);
121void adsp2100_get_info(UINT32 state, cpuinfo *info);
122void adsp2101_get_info(UINT32 state, cpuinfo *info);
123void adsp2104_get_info(UINT32 state, cpuinfo *info);
124void adsp2105_get_info(UINT32 state, cpuinfo *info);
125void adsp2115_get_info(UINT32 state, cpuinfo *info);
126void adsp2181_get_info(UINT32 state, cpuinfo *info);
127void psxcpu_get_info(UINT32 state, cpuinfo *info);
128void asap_get_info(UINT32 state, cpuinfo *info);
129void upd7810_get_info(UINT32 state, cpuinfo *info);
130void upd7807_get_info(UINT32 state, cpuinfo *info);
131void upd7801_get_info(UINT32 state, cpuinfo *info);
132void upd78c05_get_info(UINT32 state, cpuinfo *info);
133void upd78c06_get_info(UINT32 state, cpuinfo *info);
134void jaguargpu_get_info(UINT32 state, cpuinfo *info);
135void jaguardsp_get_info(UINT32 state, cpuinfo *info);
136void cquestsnd_get_info(UINT32 state, cpuinfo *info);
137void cquestrot_get_info(UINT32 state, cpuinfo *info);
138void cquestlin_get_info(UINT32 state, cpuinfo *info);
139void r3000be_get_info(UINT32 state, cpuinfo *info);
140void r3000le_get_info(UINT32 state, cpuinfo *info);
141void r3041be_get_info(UINT32 state, cpuinfo *info);
142void r3041le_get_info(UINT32 state, cpuinfo *info);
143void r4600be_get_info(UINT32 state, cpuinfo *info);
144void r4600le_get_info(UINT32 state, cpuinfo *info);
145void r4650be_get_info(UINT32 state, cpuinfo *info);
146void r4650le_get_info(UINT32 state, cpuinfo *info);
147void r4700be_get_info(UINT32 state, cpuinfo *info);
148void r4700le_get_info(UINT32 state, cpuinfo *info);
149void r5000be_get_info(UINT32 state, cpuinfo *info);
150void r5000le_get_info(UINT32 state, cpuinfo *info);
151void qed5271be_get_info(UINT32 state, cpuinfo *info);
152void qed5271le_get_info(UINT32 state, cpuinfo *info);
153void rm7000be_get_info(UINT32 state, cpuinfo *info);
154void rm7000le_get_info(UINT32 state, cpuinfo *info);
155void arm_get_info(UINT32 state, cpuinfo *info);
156void arm7_get_info(UINT32 state, cpuinfo *info);
157void sh1_get_info(UINT32 state, cpuinfo *info);
158void sh2_get_info(UINT32 state, cpuinfo *info);
159void sh4_get_info(UINT32 state, cpuinfo *info);
160void dsp32c_get_info(UINT32 state, cpuinfo *info);
161void pic16C54_get_info(UINT32 state, cpuinfo *info);
162void pic16C55_get_info(UINT32 state, cpuinfo *info);
163void pic16C56_get_info(UINT32 state, cpuinfo *info);
164void pic16C57_get_info(UINT32 state, cpuinfo *info);
165void pic16C58_get_info(UINT32 state, cpuinfo *info);
166void g65816_get_info(UINT32 state, cpuinfo *info);
167void spc700_get_info(UINT32 state, cpuinfo *info);
168void e116t_get_info(UINT32 state, cpuinfo *info);
169void e116xt_get_info(UINT32 state, cpuinfo *info);
170void e116xs_get_info(UINT32 state, cpuinfo *info);
171void e116xsr_get_info(UINT32 state, cpuinfo *info);
172void e132n_get_info(UINT32 state, cpuinfo *info);
173void e132t_get_info(UINT32 state, cpuinfo *info);
174void e132xn_get_info(UINT32 state, cpuinfo *info);
175void e132xt_get_info(UINT32 state, cpuinfo *info);
176void e132xs_get_info(UINT32 state, cpuinfo *info);
177void e132xsr_get_info(UINT32 state, cpuinfo *info);
178void gms30c2116_get_info(UINT32 state, cpuinfo *info);
179void gms30c2132_get_info(UINT32 state, cpuinfo *info);
180void gms30c2216_get_info(UINT32 state, cpuinfo *info);
181void gms30c2232_get_info(UINT32 state, cpuinfo *info);
182void i386_get_info(UINT32 state, cpuinfo *info);
183void i486_get_info(UINT32 state, cpuinfo *info);
184void pentium_get_info(UINT32 state, cpuinfo *info);
185void mediagx_get_info(UINT32 state, cpuinfo *info);
186void i960_get_info(UINT32 state, cpuinfo *info);
187void h8_3002_get_info(UINT32 state, cpuinfo *info);
188void h8_3007_get_info(UINT32 state, cpuinfo *info);
189void h8_3044_get_info(UINT32 state, cpuinfo *info);
190void v810_get_info(UINT32 state, cpuinfo *info);
191void m37702_get_info(UINT32 state, cpuinfo *info);
192void m37710_get_info(UINT32 state, cpuinfo *info);
193void ppc403ga_get_info(UINT32 state, cpuinfo *info);
194void ppc403gcx_get_info(UINT32 state, cpuinfo *info);
195void ppc601_get_info(UINT32 state, cpuinfo *info);
196void ppc602_get_info(UINT32 state, cpuinfo *info);
197void ppc603_get_info(UINT32 state, cpuinfo *info);
198void ppc603e_get_info(UINT32 state, cpuinfo *info);
199void ppc603r_get_info(UINT32 state, cpuinfo *info);
200void ppc604_get_info(UINT32 state, cpuinfo *info);
201void mpc8240_get_info(UINT32 state, cpuinfo *info);
202void SE3208_get_info(UINT32 state, cpuinfo *info);
203void mc68hc11_get_info(UINT32 state, cpuinfo *info);
204void adsp21062_get_info(UINT32 state, cpuinfo *info);
205void dsp56k_get_info(UINT32 state, cpuinfo *info);
206void rsp_get_info(UINT32 state, cpuinfo *info);
207void alpha8201_get_info(UINT32 state, cpuinfo *info);
208void alpha8301_get_info(UINT32 state, cpuinfo *info);
209void cdp1802_get_info(UINT32 state, cpuinfo *info);
210void cop420_get_info(UINT32 state, cpuinfo *info);
211void cop421_get_info(UINT32 state, cpuinfo *info);
212void cop410_get_info(UINT32 state, cpuinfo *info);
213void cop411_get_info(UINT32 state, cpuinfo *info);
214void tmp90840_get_info(UINT32 state, cpuinfo *info);
215void tmp90841_get_info(UINT32 state, cpuinfo *info);
216void tmp91640_get_info(UINT32 state, cpuinfo *info);
217void tmp91641_get_info(UINT32 state, cpuinfo *info);
218void apexc_get_info(UINT32 state, cpuinfo *info);
219void cp1610_get_info(UINT32 state, cpuinfo *info);
220void f8_get_info(UINT32 state, cpuinfo *info);
221void lh5801_get_info(UINT32 state, cpuinfo *info);
222void pdp1_get_info(UINT32 state, cpuinfo *info);
223void saturn_get_info(UINT32 state, cpuinfo *info);
224void sc61860_get_info(UINT32 state, cpuinfo *info);
225void tx0_64kw_get_info(UINT32 state, cpuinfo *info);
226void tx0_8kw_get_info(UINT32 state, cpuinfo *info);
227void lr35902_get_info(UINT32 state, cpuinfo *info);
228void tms7000_get_info(UINT32 state, cpuinfo *info);
229void tms7000_exl_get_info(UINT32 state, cpuinfo *info);
230void sm8500_get_info(UINT32 state, cpuinfo *info);
231void v30mz_get_info(UINT32 state, cpuinfo *info);
232void mb8841_get_info(UINT32 state, cpuinfo *info);
233void mb8842_get_info(UINT32 state, cpuinfo *info);
234void mb8843_get_info(UINT32 state, cpuinfo *info);
235void mb8844_get_info(UINT32 state, cpuinfo *info);
236void mb86233_get_info(UINT32 state, cpuinfo *info);
237void ssp1601_get_info(UINT32 state, cpuinfo *info);
238void minx_get_info(UINT32 state, cpuinfo *info);
239void cxd8661r_get_info(UINT32 state, cpuinfo *info);
25CPU_GET_INFO( dummy );
26CPU_GET_INFO( z80 );
27CPU_GET_INFO( z180 );
28CPU_GET_INFO( i8080 );
29CPU_GET_INFO( i8085 );
30CPU_GET_INFO( m6502 );
31CPU_GET_INFO( m65c02 );
32CPU_GET_INFO( m65sc02 );
33CPU_GET_INFO( m65ce02 );
34CPU_GET_INFO( m6509 );
35CPU_GET_INFO( m6510 );
36CPU_GET_INFO( m6510t );
37CPU_GET_INFO( m7501 );
38CPU_GET_INFO( m8502 );
39CPU_GET_INFO( n2a03 );
40CPU_GET_INFO( deco16 );
41CPU_GET_INFO( m4510 );
42CPU_GET_INFO( h6280 );
43CPU_GET_INFO( i8086 );
44CPU_GET_INFO( i8088 );
45CPU_GET_INFO( i80186 );
46CPU_GET_INFO( i80188 );
47CPU_GET_INFO( i80286 );
48CPU_GET_INFO( v20 );
49CPU_GET_INFO( v25 );
50CPU_GET_INFO( v30 );
51CPU_GET_INFO( v33 );
52CPU_GET_INFO( v35 );
53CPU_GET_INFO( v60 );
54CPU_GET_INFO( v70 );
55CPU_GET_INFO( i8035 );
56CPU_GET_INFO( i8041 );
57CPU_GET_INFO( i8048 );
58CPU_GET_INFO( i8648 );
59CPU_GET_INFO( i8748 );
60CPU_GET_INFO( mb8884 );
61CPU_GET_INFO( i8039 );
62CPU_GET_INFO( i8049 );
63CPU_GET_INFO( i8749 );
64CPU_GET_INFO( n7751 );
65CPU_GET_INFO( m58715 );
66CPU_GET_INFO( i8x41 );
67CPU_GET_INFO( i8031 );
68CPU_GET_INFO( i8032 );
69CPU_GET_INFO( i8051 );
70CPU_GET_INFO( i8052 );
71CPU_GET_INFO( i8751 );
72CPU_GET_INFO( i8752 );
73CPU_GET_INFO( i80c31 );
74CPU_GET_INFO( i80c32 );
75CPU_GET_INFO( i80c51 );
76CPU_GET_INFO( i80c52 );
77CPU_GET_INFO( i87c51 );
78CPU_GET_INFO( i87c52 );
79CPU_GET_INFO( at89c4051 );
80CPU_GET_INFO( ds5002fp );
81CPU_GET_INFO( m6800 );
82CPU_GET_INFO( m6801 );
83CPU_GET_INFO( m6802 );
84CPU_GET_INFO( m6803 );
85CPU_GET_INFO( m6808 );
86CPU_GET_INFO( hd63701 );
87CPU_GET_INFO( nsc8105 );
88CPU_GET_INFO( m6805 );
89CPU_GET_INFO( m68705 );
90CPU_GET_INFO( hd63705 );
91CPU_GET_INFO( hd6309 );
92CPU_GET_INFO( m6809 );
93CPU_GET_INFO( m6809e );
94CPU_GET_INFO( konami );
95CPU_GET_INFO( m68000 );
96CPU_GET_INFO( m68008 );
97CPU_GET_INFO( m68010 );
98CPU_GET_INFO( m68ec020 );
99CPU_GET_INFO( m68020 );
100CPU_GET_INFO( m68040 );
101CPU_GET_INFO( t11 );
102CPU_GET_INFO( s2650 );
103CPU_GET_INFO( tms34010 );
104CPU_GET_INFO( tms34020 );
105CPU_GET_INFO( ti990_10 );
106CPU_GET_INFO( tms9900 );
107CPU_GET_INFO( tms9940 );
108CPU_GET_INFO( tms9980a );
109CPU_GET_INFO( tms9985 );
110CPU_GET_INFO( tms9989 );
111CPU_GET_INFO( tms9995 );
112CPU_GET_INFO( tms99105a );
113CPU_GET_INFO( tms99110a );
114CPU_GET_INFO( tms99000 );
115CPU_GET_INFO( z8000 );
116CPU_GET_INFO( tms32010 );
117CPU_GET_INFO( tms32025 );
118CPU_GET_INFO( tms32026 );
119CPU_GET_INFO( tms32031 );
120CPU_GET_INFO( tms32032 );
121CPU_GET_INFO( tms32051 );
122CPU_GET_INFO( ccpu );
123CPU_GET_INFO( adsp2100 );
124CPU_GET_INFO( adsp2101 );
125CPU_GET_INFO( adsp2104 );
126CPU_GET_INFO( adsp2105 );
127CPU_GET_INFO( adsp2115 );
128CPU_GET_INFO( adsp2181 );
129CPU_GET_INFO( psxcpu );
130CPU_GET_INFO( asap );
131CPU_GET_INFO( upd7810 );
132CPU_GET_INFO( upd7807 );
133CPU_GET_INFO( upd7801 );
134CPU_GET_INFO( upd78c05 );
135CPU_GET_INFO( upd78c06 );
136CPU_GET_INFO( jaguargpu );
137CPU_GET_INFO( jaguardsp );
138CPU_GET_INFO( cquestsnd );
139CPU_GET_INFO( cquestrot );
140CPU_GET_INFO( cquestlin );
141CPU_GET_INFO( r3000be );
142CPU_GET_INFO( r3000le );
143CPU_GET_INFO( r3041be );
144CPU_GET_INFO( r3041le );
145CPU_GET_INFO( r4600be );
146CPU_GET_INFO( r4600le );
147CPU_GET_INFO( r4650be );
148CPU_GET_INFO( r4650le );
149CPU_GET_INFO( r4700be );
150CPU_GET_INFO( r4700le );
151CPU_GET_INFO( r5000be );
152CPU_GET_INFO( r5000le );
153CPU_GET_INFO( qed5271be );
154CPU_GET_INFO( qed5271le );
155CPU_GET_INFO( rm7000be );
156CPU_GET_INFO( rm7000le );
157CPU_GET_INFO( arm );
158CPU_GET_INFO( arm7 );
159CPU_GET_INFO( sh1 );
160CPU_GET_INFO( sh2 );
161CPU_GET_INFO( sh4 );
162CPU_GET_INFO( dsp32c );
163CPU_GET_INFO( pic16C54 );
164CPU_GET_INFO( pic16C55 );
165CPU_GET_INFO( pic16C56 );
166CPU_GET_INFO( pic16C57 );
167CPU_GET_INFO( pic16C58 );
168CPU_GET_INFO( g65816 );
169CPU_GET_INFO( spc700 );
170CPU_GET_INFO( e116t );
171CPU_GET_INFO( e116xt );
172CPU_GET_INFO( e116xs );
173CPU_GET_INFO( e116xsr );
174CPU_GET_INFO( e132n );
175CPU_GET_INFO( e132t );
176CPU_GET_INFO( e132xn );
177CPU_GET_INFO( e132xt );
178CPU_GET_INFO( e132xs );
179CPU_GET_INFO( e132xsr );
180CPU_GET_INFO( gms30c2116 );
181CPU_GET_INFO( gms30c2132 );
182CPU_GET_INFO( gms30c2216 );
183CPU_GET_INFO( gms30c2232 );
184CPU_GET_INFO( i386 );
185CPU_GET_INFO( i486 );
186CPU_GET_INFO( pentium );
187CPU_GET_INFO( mediagx );
188CPU_GET_INFO( i960 );
189CPU_GET_INFO( h8_3002 );
190CPU_GET_INFO( h8_3007 );
191CPU_GET_INFO( h8_3044 );
192CPU_GET_INFO( v810 );
193CPU_GET_INFO( m37702 );
194CPU_GET_INFO( m37710 );
195CPU_GET_INFO( ppc403ga );
196CPU_GET_INFO( ppc403gcx );
197CPU_GET_INFO( ppc601 );
198CPU_GET_INFO( ppc602 );
199CPU_GET_INFO( ppc603 );
200CPU_GET_INFO( ppc603e );
201CPU_GET_INFO( ppc603r );
202CPU_GET_INFO( ppc604 );
203CPU_GET_INFO( mpc8240 );
204CPU_GET_INFO( SE3208 );
205CPU_GET_INFO( mc68hc11 );
206CPU_GET_INFO( adsp21062 );
207CPU_GET_INFO( dsp56k );
208CPU_GET_INFO( rsp );
209CPU_GET_INFO( alpha8201 );
210CPU_GET_INFO( alpha8301 );
211CPU_GET_INFO( cdp1802 );
212CPU_GET_INFO( cop420 );
213CPU_GET_INFO( cop421 );
214CPU_GET_INFO( cop410 );
215CPU_GET_INFO( cop411 );
216CPU_GET_INFO( tmp90840 );
217CPU_GET_INFO( tmp90841 );
218CPU_GET_INFO( tmp91640 );
219CPU_GET_INFO( tmp91641 );
220CPU_GET_INFO( apexc );
221CPU_GET_INFO( cp1610 );
222CPU_GET_INFO( f8 );
223CPU_GET_INFO( lh5801 );
224CPU_GET_INFO( pdp1 );
225CPU_GET_INFO( saturn );
226CPU_GET_INFO( sc61860 );
227CPU_GET_INFO( tx0_64kw );
228CPU_GET_INFO( tx0_8kw );
229CPU_GET_INFO( lr35902 );
230CPU_GET_INFO( tms7000 );
231CPU_GET_INFO( tms7000_exl );
232CPU_GET_INFO( sm8500 );
233CPU_GET_INFO( v30mz );
234CPU_GET_INFO( mb8841 );
235CPU_GET_INFO( mb8842 );
236CPU_GET_INFO( mb8843 );
237CPU_GET_INFO( mb8844 );
238CPU_GET_INFO( mb86233 );
239CPU_GET_INFO( ssp1601 );
240CPU_GET_INFO( minx );
241CPU_GET_INFO( cxd8661r );
240242
241243
242244
r3535r3536
281283   cpu_interface intf;             /* copy of the interface data */
282284   cpu_type cputype;                /* type index of this CPU */
283285   int family;                /* family index of this CPU */
284   void *context;               /* dynamically allocated context buffer */
286   device_config device;         /* dummy device for now */
287   int *icount;
285288};
286289
287290
r3535r3536
300303   void   (*get_info)(UINT32 state, cpuinfo *info);
301304} cpuintrf_map[] =
302305{
303   { CPU_DUMMY, dummy_get_info },
306   { CPU_DUMMY, CPU_GET_INFO_NAME(dummy) },
304307#if (HAS_Z80)
305   { CPU_Z80, z80_get_info },
308   { CPU_Z80, CPU_GET_INFO_NAME(z80) },
306309#endif
307310#if (HAS_Z180)
308   { CPU_Z180, z180_get_info },
311   { CPU_Z180, CPU_GET_INFO_NAME(z180) },
309312#endif
310313#if (HAS_8080)
311   { CPU_8080, i8080_get_info },
314   { CPU_8080, CPU_GET_INFO_NAME(i8080) },
312315#endif
313316#if (HAS_8085A)
314   { CPU_8085A, i8085_get_info },
317   { CPU_8085A, CPU_GET_INFO_NAME(i8085) },
315318#endif
316319#if (HAS_M6502)
317   { CPU_M6502, m6502_get_info },
320   { CPU_M6502, CPU_GET_INFO_NAME(m6502) },
318321#endif
319322#if (HAS_M65C02)
320   { CPU_M65C02, m65c02_get_info },
323   { CPU_M65C02, CPU_GET_INFO_NAME(m65c02) },
321324#endif
322325#if (HAS_M65SC02)
323   { CPU_M65SC02, m65sc02_get_info },
326   { CPU_M65SC02, CPU_GET_INFO_NAME(m65sc02) },
324327#endif
325328#if (HAS_M65CE02)
326   { CPU_M65CE02, m65ce02_get_info },
329   { CPU_M65CE02, CPU_GET_INFO_NAME(m65ce02) },
327330#endif
328331#if (HAS_M6509)
329   { CPU_M6509, m6509_get_info },
332   { CPU_M6509, CPU_GET_INFO_NAME(m6509) },
330333#endif
331334#if (HAS_M6510)
332   { CPU_M6510, m6510_get_info },
335   { CPU_M6510, CPU_GET_INFO_NAME(m6510) },
333336#endif
334337#if (HAS_M6510T)
335   { CPU_M6510T, m6510t_get_info },
338   { CPU_M6510T, CPU_GET_INFO_NAME(m6510t) },
336339#endif
337340#if (HAS_M7501)
338   { CPU_M7501, m7501_get_info },
341   { CPU_M7501, CPU_GET_INFO_NAME(m7501) },
339342#endif
340343#if (HAS_M8502)
341   { CPU_M8502, m8502_get_info },
344   { CPU_M8502, CPU_GET_INFO_NAME(m8502) },
342345#endif
343346#if (HAS_N2A03)
344   { CPU_N2A03, n2a03_get_info },
347   { CPU_N2A03, CPU_GET_INFO_NAME(n2a03) },
345348#endif
346349#if (HAS_DECO16)
347   { CPU_DECO16, deco16_get_info },
350   { CPU_DECO16, CPU_GET_INFO_NAME(deco16) },
348351#endif
349352#if (HAS_M4510)
350   { CPU_M4510, m4510_get_info },
353   { CPU_M4510, CPU_GET_INFO_NAME(m4510) },
351354#endif
352355#if (HAS_H6280)
353   { CPU_H6280, h6280_get_info },
356   { CPU_H6280, CPU_GET_INFO_NAME(h6280) },
354357#endif
355358#if (HAS_I8086)
356   { CPU_I8086, i8086_get_info },
359   { CPU_I8086, CPU_GET_INFO_NAME(i8086) },
357360#endif
358361#if (HAS_I8088)
359   { CPU_I8088, i8088_get_info },
362   { CPU_I8088, CPU_GET_INFO_NAME(i8088) },
360363#endif
361364#if (HAS_I80186)
362   { CPU_I80186, i80186_get_info },
365   { CPU_I80186, CPU_GET_INFO_NAME(i80186) },
363366#endif
364367#if (HAS_I80188)
365   { CPU_I80188, i80188_get_info },
368   { CPU_I80188, CPU_GET_INFO_NAME(i80188) },
366369#endif
367370#if (HAS_I80286)
368   { CPU_I80286, i80286_get_info },
371   { CPU_I80286, CPU_GET_INFO_NAME(i80286) },
369372#endif
370373#if (HAS_V20)
371   { CPU_V20, v20_get_info },
374   { CPU_V20, CPU_GET_INFO_NAME(v20) },
372375#endif
373376#if (HAS_V25)
374   { CPU_V25, v25_get_info },
377   { CPU_V25, CPU_GET_INFO_NAME(v25) },
375378#endif
376379#if (HAS_V30)
377   { CPU_V30, v30_get_info },
380   { CPU_V30, CPU_GET_INFO_NAME(v30) },
378381#endif
379382#if (HAS_V33)
380   { CPU_V33, v33_get_info },
383   { CPU_V33, CPU_GET_INFO_NAME(v33) },
381384#endif
382385#if (HAS_V35)
383   { CPU_V35, v35_get_info },
386   { CPU_V35, CPU_GET_INFO_NAME(v35) },
384387#endif
385388#if (HAS_V60)
386   { CPU_V60, v60_get_info },
389   { CPU_V60, CPU_GET_INFO_NAME(v60) },
387390#endif
388391#if (HAS_V70)
389   { CPU_V70, v70_get_info },
392   { CPU_V70, CPU_GET_INFO_NAME(v70) },
390393#endif
391394#if (HAS_I8035)
392   { CPU_I8035, i8035_get_info },
395   { CPU_I8035, CPU_GET_INFO_NAME(i8035) },
393396#endif
394397#if (HAS_I8041)
395   { CPU_I8041, i8041_get_info },
398   { CPU_I8041, CPU_GET_INFO_NAME(i8041) },
396399#endif
397400#if (HAS_I8048)
398   { CPU_I8048, i8048_get_info },
401   { CPU_I8048, CPU_GET_INFO_NAME(i8048) },
399402#endif
400403#if (HAS_I8648)
401   { CPU_I8648, i8648_get_info },
404   { CPU_I8648, CPU_GET_INFO_NAME(i8648) },
402405#endif
403406#if (HAS_I8748)
404   { CPU_I8748, i8748_get_info },
407   { CPU_I8748, CPU_GET_INFO_NAME(i8748) },
405408#endif
406409#if (HAS_MB8884)
407   { CPU_MB8884, mb8884_get_info },
410   { CPU_MB8884, CPU_GET_INFO_NAME(mb8884) },
408411#endif
409412#if (HAS_N7751)
410   { CPU_N7751, n7751_get_info },
413   { CPU_N7751, CPU_GET_INFO_NAME(n7751) },
411414#endif
412415#if (HAS_I8039)
413   { CPU_I8039, i8039_get_info },
416   { CPU_I8039, CPU_GET_INFO_NAME(i8039) },
414417#endif
415418#if (HAS_I8049)
416   { CPU_I8049, i8049_get_info },
419   { CPU_I8049, CPU_GET_INFO_NAME(i8049) },
417420#endif
418421#if (HAS_I8749)
419   { CPU_I8749, i8749_get_info },
422   { CPU_I8749, CPU_GET_INFO_NAME(i8749) },
420423#endif
421424#if (HAS_M58715)
422   { CPU_M58715, m58715_get_info },
425   { CPU_M58715, CPU_GET_INFO_NAME(m58715) },
423426#endif
424427#if (HAS_I8X41)
425   { CPU_I8X41, i8x41_get_info },
428   { CPU_I8X41, CPU_GET_INFO_NAME(i8x41) },
426429#endif
427430#if (HAS_I8031)
428   { CPU_I8031, i8031_get_info },
431   { CPU_I8031, CPU_GET_INFO_NAME(i8031) },
429432#endif
430433#if (HAS_I8032)
431   { CPU_I8032, i8032_get_info },
434   { CPU_I8032, CPU_GET_INFO_NAME(i8032) },
432435#endif
433436#if (HAS_I8051)
434   { CPU_I8051, i8051_get_info },
437   { CPU_I8051, CPU_GET_INFO_NAME(i8051) },
435438#endif
436439#if (HAS_I8052)
437   { CPU_I8052, i8052_get_info },
440   { CPU_I8052, CPU_GET_INFO_NAME(i8052) },
438441#endif
439442#if (HAS_I8751)
440   { CPU_I8751, i8751_get_info },
443   { CPU_I8751, CPU_GET_INFO_NAME(i8751) },
441444#endif
442445#if (HAS_I8752)
443   { CPU_I8752, i8752_get_info },
446   { CPU_I8752, CPU_GET_INFO_NAME(i8752) },
444447#endif
445448#if (HAS_I80C31)
446   { CPU_I80C31, i80c31_get_info },
449   { CPU_I80C31, CPU_GET_INFO_NAME(i80c31) },
447450#endif
448451#if (HAS_I80C32)
449   { CPU_I80C32, i80c32_get_info },
452   { CPU_I80C32, CPU_GET_INFO_NAME(i80c32) },
450453#endif
451454#if (HAS_I80C51)
452   { CPU_I80C51, i80c51_get_info },
455   { CPU_I80C51, CPU_GET_INFO_NAME(i80c51) },
453456#endif
454457#if (HAS_I80C52)
455   { CPU_I80C52, i80c52_get_info },
458   { CPU_I80C52, CPU_GET_INFO_NAME(i80c52) },
456459#endif
457460#if (HAS_I87C51)
458   { CPU_I87C51, i87c51_get_info },
461   { CPU_I87C51, CPU_GET_INFO_NAME(i87c51) },
459462#endif
460463#if (HAS_I87C52)
461   { CPU_I87C52, i87c52_get_info },
464   { CPU_I87C52, CPU_GET_INFO_NAME(i87c52) },
462465#endif
463466#if (HAS_AT89C4051)
464   { CPU_AT89C4051, at89c4051_get_info },
467   { CPU_AT89C4051, CPU_GET_INFO_NAME(at89c4051) },
465468#endif
466469#if (HAS_DS5002FP)
467   { CPU_DS5002FP, ds5002fp_get_info },
470   { CPU_DS5002FP, CPU_GET_INFO_NAME(ds5002fp) },
468471#endif
469472#if (HAS_M6800)
470   { CPU_M6800, m6800_get_info },
473   { CPU_M6800, CPU_GET_INFO_NAME(m6800) },
471474#endif
472475#if (HAS_M6801)
473   { CPU_M6801, m6801_get_info },
476   { CPU_M6801, CPU_GET_INFO_NAME(m6801) },
474477#endif
475478#if (HAS_M6802)
476   { CPU_M6802, m6802_get_info },
479   { CPU_M6802, CPU_GET_INFO_NAME(m6802) },
477480#endif
478481#if (HAS_M6803)
479   { CPU_M6803, m6803_get_info },
482   { CPU_M6803, CPU_GET_INFO_NAME(m6803) },
480483#endif
481484#if (HAS_M6808)
482   { CPU_M6808, m6808_get_info },
485   { CPU_M6808, CPU_GET_INFO_NAME(m6808) },
483486#endif
484487#if (HAS_HD63701)
485   { CPU_HD63701, hd63701_get_info },
488   { CPU_HD63701, CPU_GET_INFO_NAME(hd63701) },
486489#endif
487490#if (HAS_NSC8105)
488   { CPU_NSC8105, nsc8105_get_info },
491   { CPU_NSC8105, CPU_GET_INFO_NAME(nsc8105) },
489492#endif
490493#if (HAS_M6805)
491   { CPU_M6805, m6805_get_info },
494   { CPU_M6805, CPU_GET_INFO_NAME(m6805) },
492495#endif
493496#if (HAS_M68705)
494   { CPU_M68705, m68705_get_info },
497   { CPU_M68705, CPU_GET_INFO_NAME(m68705) },
495498#endif
496499#if (HAS_HD63705)
497   { CPU_HD63705, hd63705_get_info },
500   { CPU_HD63705, CPU_GET_INFO_NAME(hd63705) },
498501#endif
499502#if (HAS_HD6309)
500   { CPU_HD6309, hd6309_get_info },
503   { CPU_HD6309, CPU_GET_INFO_NAME(hd6309) },
501504#endif
502505#if (HAS_M6809)
503   { CPU_M6809, m6809_get_info },
506   { CPU_M6809, CPU_GET_INFO_NAME(m6809) },
504507#endif
505508#if (HAS_M6809E)
506   { CPU_M6809E, m6809e_get_info },
509   { CPU_M6809E, CPU_GET_INFO_NAME(m6809e) },
507510#endif
508511#if (HAS_KONAMI)
509   { CPU_KONAMI, konami_get_info },
512   { CPU_KONAMI, CPU_GET_INFO_NAME(konami) },
510513#endif
511514#if (HAS_M68000)
512   { CPU_M68000, m68000_get_info },
515   { CPU_M68000, CPU_GET_INFO_NAME(m68000) },
513516#endif
514517#if (HAS_M68008)
515   { CPU_M68008, m68008_get_info },
518   { CPU_M68008, CPU_GET_INFO_NAME(m68008) },
516519#endif
517520#if (HAS_M68010)
518   { CPU_M68010, m68010_get_info },
521   { CPU_M68010, CPU_GET_INFO_NAME(m68010) },
519522#endif
520523#if (HAS_M68EC020)
521   { CPU_M68EC020, m68ec020_get_info },
524   { CPU_M68EC020, CPU_GET_INFO_NAME(m68ec020) },
522525#endif
523526#if (HAS_M68020)
524   { CPU_M68020, m68020_get_info },
527   { CPU_M68020, CPU_GET_INFO_NAME(m68020) },
525528#endif
526529#if (HAS_M68040)
527   { CPU_M68040, m68040_get_info },
530   { CPU_M68040, CPU_GET_INFO_NAME(m68040) },
528531#endif
529532#if (HAS_T11)
530   { CPU_T11, t11_get_info },
533   { CPU_T11, CPU_GET_INFO_NAME(t11) },
531534#endif
532535#if (HAS_S2650)
533   { CPU_S2650, s2650_get_info },
536   { CPU_S2650, CPU_GET_INFO_NAME(s2650) },
534537#endif
535538#if (HAS_TMS34010)
536   { CPU_TMS34010, tms34010_get_info },
539   { CPU_TMS34010, CPU_GET_INFO_NAME(tms34010) },
537540#endif
538541#if (HAS_TMS34020)
539   { CPU_TMS34020, tms34020_get_info },
542   { CPU_TMS34020, CPU_GET_INFO_NAME(tms34020) },
540543#endif
541544#if (HAS_TI990_10)
542   { CPU_TI990_10, ti990_10_get_info },
545   { CPU_TI990_10, CPU_GET_INFO_NAME(ti990_10) },
543546#endif
544547#if (HAS_TMS9900)
545   { CPU_TMS9900, tms9900_get_info },
548   { CPU_TMS9900, CPU_GET_INFO_NAME(tms9900) },
546549#endif
547550#if (HAS_TMS9940)
548   { CPU_TMS9940, tms9940_get_info },
551   { CPU_TMS9940, CPU_GET_INFO_NAME(tms9940) },
549552#endif
550553#if (HAS_TMS9980)
551   { CPU_TMS9980, tms9980a_get_info },
554   { CPU_TMS9980, CPU_GET_INFO_NAME(tms9980a) },
552555#endif
553556#if (HAS_TMS9985)
554   { CPU_TMS9985, tms9985_get_info },
557   { CPU_TMS9985, CPU_GET_INFO_NAME(tms9985) },
555558#endif
556559#if (HAS_TMS9989)
557   { CPU_TMS9989, tms9989_get_info },
560   { CPU_TMS9989, CPU_GET_INFO_NAME(tms9989) },
558561#endif
559562#if (HAS_TMS9995)
560   { CPU_TMS9995, tms9995_get_info },
563   { CPU_TMS9995, CPU_GET_INFO_NAME(tms9995) },
561564#endif
562565#if (HAS_TMS99105A)
563   { CPU_TMS99105A, tms99105a_get_info },
566   { CPU_TMS99105A, CPU_GET_INFO_NAME(tms99105a) },
564567#endif
565568#if (HAS_TMS99110A)
566   { CPU_TMS99110A, tms99110a_get_info },
569   { CPU_TMS99110A, CPU_GET_INFO_NAME(tms99110a) },
567570#endif
568571#if (HAS_TMS99000)
569   { CPU_TMS99000, tms99000_get_info },
572   { CPU_TMS99000, CPU_GET_INFO_NAME(tms99000) },
570573#endif
571574#if (HAS_Z8000)
572   { CPU_Z8000, z8000_get_info },
575   { CPU_Z8000, CPU_GET_INFO_NAME(z8000) },
573576#endif
574577#if (HAS_TMS32010)
575   { CPU_TMS32010, tms32010_get_info },
578   { CPU_TMS32010, CPU_GET_INFO_NAME(tms32010) },
576579#endif
577580#if (HAS_TMS32025)
578   { CPU_TMS32025, tms32025_get_info },
581   { CPU_TMS32025, CPU_GET_INFO_NAME(tms32025) },
579582#endif
580583#if (HAS_TMS32026)
581   { CPU_TMS32026, tms32026_get_info },
584   { CPU_TMS32026, CPU_GET_INFO_NAME(tms32026) },
582585#endif
583586#if (HAS_TMS32031)
584   { CPU_TMS32031, tms32031_get_info },
587   { CPU_TMS32031, CPU_GET_INFO_NAME(tms32031) },
585588#endif
586589#if (HAS_TMS32032)
587   { CPU_TMS32032, tms32032_get_info },
590   { CPU_TMS32032, CPU_GET_INFO_NAME(tms32032) },
588591#endif
589592#if (HAS_TMS32051)
590   { CPU_TMS32051, tms32051_get_info },
593   { CPU_TMS32051, CPU_GET_INFO_NAME(tms32051) },
591594#endif
592595#if (HAS_CCPU)
593   { CPU_CCPU, ccpu_get_info },
596   { CPU_CCPU, CPU_GET_INFO_NAME(ccpu) },
594597#endif
595598#if (HAS_ADSP2100)
596   { CPU_ADSP2100, adsp2100_get_info },
599   { CPU_ADSP2100, CPU_GET_INFO_NAME(adsp2100) },
597600#endif
598601#if (HAS_ADSP2101)
599   { CPU_ADSP2101, adsp2101_get_info },
602   { CPU_ADSP2101, CPU_GET_INFO_NAME(adsp2101) },
600603#endif
601604#if (HAS_ADSP2104)
602   { CPU_ADSP2104, adsp2104_get_info },
605   { CPU_ADSP2104, CPU_GET_INFO_NAME(adsp2104) },
603606#endif
604607#if (HAS_ADSP2105)
605   { CPU_ADSP2105, adsp2105_get_info },
608   { CPU_ADSP2105, CPU_GET_INFO_NAME(adsp2105) },
606609#endif
607610#if (HAS_ADSP2115)
608   { CPU_ADSP2115, adsp2115_get_info },
611   { CPU_ADSP2115, CPU_GET_INFO_NAME(adsp2115) },
609612#endif
610613#if (HAS_ADSP2181)
611   { CPU_ADSP2181, adsp2181_get_info },
614   { CPU_ADSP2181, CPU_GET_INFO_NAME(adsp2181) },
612615#endif
613616#if (HAS_PSXCPU)
614   { CPU_PSXCPU, psxcpu_get_info },
617   { CPU_PSXCPU, CPU_GET_INFO_NAME(psxcpu) },
615618#endif
616619#if (HAS_ASAP)
617   { CPU_ASAP, asap_get_info },
620   { CPU_ASAP, CPU_GET_INFO_NAME(asap) },
618621#endif
619622#if (HAS_UPD7810)
620   { CPU_UPD7810, upd7810_get_info },
623   { CPU_UPD7810, CPU_GET_INFO_NAME(upd7810) },
621624#endif
622625#if (HAS_UPD7807)
623   { CPU_UPD7807, upd7807_get_info },
626   { CPU_UPD7807, CPU_GET_INFO_NAME(upd7807) },
624627#endif
625628#if (HAS_UPD7801)
626   { CPU_UPD7801, upd7801_get_info },
627   { CPU_UPD78C05, upd78c05_get_info },
628   { CPU_UPD78C06, upd78c06_get_info },
629   { CPU_UPD7801, CPU_GET_INFO_NAME(upd7801) },
630   { CPU_UPD78C05, CPU_GET_INFO_NAME(upd78c05) },
631   { CPU_UPD78C06, CPU_GET_INFO_NAME(upd78c06) },
629632#endif
630633#if (HAS_JAGUAR)
631   { CPU_JAGUARGPU, jaguargpu_get_info },
632   { CPU_JAGUARDSP, jaguardsp_get_info },
634   { CPU_JAGUARGPU, CPU_GET_INFO_NAME(jaguargpu) },
635   { CPU_JAGUARDSP, CPU_GET_INFO_NAME(jaguardsp) },
633636#endif
634637#if (HAS_CUBEQCPU)
635   { CPU_CQUESTSND, cquestsnd_get_info },
636   { CPU_CQUESTROT, cquestrot_get_info },
637   { CPU_CQUESTLIN, cquestlin_get_info },
638   { CPU_CQUESTSND, CPU_GET_INFO_NAME(cquestsnd) },
639   { CPU_CQUESTROT, CPU_GET_INFO_NAME(cquestrot) },
640   { CPU_CQUESTLIN, CPU_GET_INFO_NAME(cquestlin) },
638641#endif
639642#if (HAS_R3000)
640   { CPU_R3000BE, r3000be_get_info },
641   { CPU_R3000LE, r3000le_get_info },
643   { CPU_R3000BE, CPU_GET_INFO_NAME(r3000be) },
644   { CPU_R3000LE, CPU_GET_INFO_NAME(r3000le) },
642645#endif
643646#if (HAS_R3041)
644   { CPU_R3041BE, r3041be_get_info },
645   { CPU_R3041LE, r3041le_get_info },
647   { CPU_R3041BE, CPU_GET_INFO_NAME(r3041be) },
648   { CPU_R3041LE, CPU_GET_INFO_NAME(r3041le) },
646649#endif
647650#if (HAS_R4600)
648   { CPU_R4600BE, r4600be_get_info },
649   { CPU_R4600LE, r4600le_get_info },
651   { CPU_R4600BE, CPU_GET_INFO_NAME(r4600be) },
652   { CPU_R4600LE, CPU_GET_INFO_NAME(r4600le) },
650653#endif
651654#if (HAS_R4650)
652   { CPU_R4650BE, r4650be_get_info },
653   { CPU_R4650LE, r4650le_get_info },
655   { CPU_R4650BE, CPU_GET_INFO_NAME(r4650be) },
656   { CPU_R4650LE, CPU_GET_INFO_NAME(r4650le) },
654657#endif
655658#if (HAS_R4700)
656   { CPU_R4700BE, r4700be_get_info },
657   { CPU_R4700LE, r4700le_get_info },
659   { CPU_R4700BE, CPU_GET_INFO_NAME(r4700be) },
660   { CPU_R4700LE, CPU_GET_INFO_NAME(r4700le) },
658661#endif
659662#if (HAS_R5000)
660   { CPU_R5000BE, r5000be_get_info },
661   { CPU_R5000LE, r5000le_get_info },
663   { CPU_R5000BE, CPU_GET_INFO_NAME(r5000be) },
664   { CPU_R5000LE, CPU_GET_INFO_NAME(r5000le) },
662665#endif
663666#if (HAS_QED5271)
664   { CPU_QED5271BE, qed5271be_get_info },
665   { CPU_QED5271LE, qed5271le_get_info },
667   { CPU_QED5271BE, CPU_GET_INFO_NAME(qed5271be) },
668   { CPU_QED5271LE, CPU_GET_INFO_NAME(qed5271le) },
666669#endif
667670#if (HAS_RM7000)
668   { CPU_RM7000BE, rm7000be_get_info },
669   { CPU_RM7000LE, rm7000le_get_info },
671   { CPU_RM7000BE, CPU_GET_INFO_NAME(rm7000be) },
672   { CPU_RM7000LE, CPU_GET_INFO_NAME(rm7000le) },
670673#endif
671674#if (HAS_ARM)
672   { CPU_ARM, arm_get_info },
675   { CPU_ARM, CPU_GET_INFO_NAME(arm) },
673676#endif
674677#if (HAS_ARM7)
675   { CPU_ARM7, arm7_get_info },
678   { CPU_ARM7, CPU_GET_INFO_NAME(arm7) },
676679#endif
677680#if (HAS_SH1)
678   { CPU_SH1, sh1_get_info },
681   { CPU_SH1, CPU_GET_INFO_NAME(sh1) },
679682#endif
680683#if (HAS_SH2)
681   { CPU_SH2, sh2_get_info },
684   { CPU_SH2, CPU_GET_INFO_NAME(sh2) },
682685#endif
683686#if (HAS_SH4)
684   { CPU_SH4, sh4_get_info },
687   { CPU_SH4, CPU_GET_INFO_NAME(sh4) },
685688#endif
686689#if (HAS_DSP32C)
687   { CPU_DSP32C, dsp32c_get_info },
690   { CPU_DSP32C, CPU_GET_INFO_NAME(dsp32c) },
688691#endif
689692#if (HAS_PIC16C54)
690   { CPU_PIC16C54, pic16C54_get_info },
693   { CPU_PIC16C54, CPU_GET_INFO_NAME(pic16C54) },
691694#endif
692695#if (HAS_PIC16C55)
693   { CPU_PIC16C55, pic16C55_get_info },
696   { CPU_PIC16C55, CPU_GET_INFO_NAME(pic16C55) },
694697#endif
695698#if (HAS_PIC16C56)
696   { CPU_PIC16C56, pic16C56_get_info },
699   { CPU_PIC16C56, CPU_GET_INFO_NAME(pic16C56) },
697700#endif
698701#if (HAS_PIC16C57)
699   { CPU_PIC16C57, pic16C57_get_info },
702   { CPU_PIC16C57, CPU_GET_INFO_NAME(pic16C57) },
700703#endif
701704#if (HAS_PIC16C58)
702   { CPU_PIC16C58, pic16C58_get_info },
705   { CPU_PIC16C58, CPU_GET_INFO_NAME(pic16C58) },
703706#endif
704707#if (HAS_G65816)
705   { CPU_G65816, g65816_get_info },
708   { CPU_G65816, CPU_GET_INFO_NAME(g65816) },
706709#endif
707710#if (HAS_SPC700)
708   { CPU_SPC700, spc700_get_info },
711   { CPU_SPC700, CPU_GET_INFO_NAME(spc700) },
709712#endif
710713#if (HAS_E116T)
711   { CPU_E116T, e116t_get_info },
714   { CPU_E116T, CPU_GET_INFO_NAME(e116t) },
712715#endif
713716#if (HAS_E116XT)
714   { CPU_E116XT, e116xt_get_info },
717   { CPU_E116XT, CPU_GET_INFO_NAME(e116xt) },
715718#endif
716719#if (HAS_E116XS)
717   { CPU_E116XS, e116xs_get_info },
720   { CPU_E116XS, CPU_GET_INFO_NAME(e116xs) },
718721#endif
719722#if (HAS_E116XSR)
720   { CPU_E116XSR, e116xsr_get_info },
723   { CPU_E116XSR, CPU_GET_INFO_NAME(e116xsr) },
721724#endif
722725#if (HAS_E132N)
723   { CPU_E132N, e132n_get_info },
726   { CPU_E132N, CPU_GET_INFO_NAME(e132n) },
724727#endif
725728#if (HAS_E132T)
726   { CPU_E132T, e132t_get_info },
729   { CPU_E132T, CPU_GET_INFO_NAME(e132t) },
727730#endif
728731#if (HAS_E132XN)
729   { CPU_E132XN, e132xn_get_info },
732   { CPU_E132XN, CPU_GET_INFO_NAME(e132xn) },
730733#endif
731734#if (HAS_E132XT)
732   { CPU_E132XT, e132xt_get_info },
735   { CPU_E132XT, CPU_GET_INFO_NAME(e132xt) },
733736#endif
734737#if (HAS_E132XS)
735   { CPU_E132XS, e132xs_get_info },
738   { CPU_E132XS, CPU_GET_INFO_NAME(e132xs) },
736739#endif
737740#if (HAS_E132XSR)
738   { CPU_E132XSR, e132xsr_get_info },
741   { CPU_E132XSR, CPU_GET_INFO_NAME(e132xsr) },
739742#endif
740743#if (HAS_GMS30C2116)
741   { CPU_GMS30C2116, gms30c2116_get_info },
744   { CPU_GMS30C2116, CPU_GET_INFO_NAME(gms30c2116) },
742745#endif
743746#if (HAS_GMS30C2132)
744   { CPU_GMS30C2132, gms30c2132_get_info },
747   { CPU_GMS30C2132, CPU_GET_INFO_NAME(gms30c2132) },
745748#endif
746749#if (HAS_GMS30C2216)
747   { CPU_GMS30C2216, gms30c2216_get_info },
750   { CPU_GMS30C2216, CPU_GET_INFO_NAME(gms30c2216) },
748751#endif
749752#if (HAS_GMS30C2232)
750   { CPU_GMS30C2232, gms30c2232_get_info },
753   { CPU_GMS30C2232, CPU_GET_INFO_NAME(gms30c2232) },
751754#endif
752755#if (HAS_I386)
753   { CPU_I386, i386_get_info },
756   { CPU_I386, CPU_GET_INFO_NAME(i386) },
754757#endif
755758#if (HAS_I486)
756   { CPU_I486, i486_get_info },
759   { CPU_I486, CPU_GET_INFO_NAME(i486) },
757760#endif
758761#if (HAS_PENTIUM)
759   { CPU_PENTIUM, pentium_get_info },
762   { CPU_PENTIUM, CPU_GET_INFO_NAME(pentium) },
760763#endif
761764#if (HAS_MEDIAGX)
762   { CPU_MEDIAGX, mediagx_get_info },
765   { CPU_MEDIAGX, CPU_GET_INFO_NAME(mediagx) },
763766#endif
764767#if (HAS_I960)
765   { CPU_I960, i960_get_info },
768   { CPU_I960, CPU_GET_INFO_NAME(i960) },
766769#endif
767770#if (HAS_H83002)
768   { CPU_H83002, h8_3002_get_info },
769   { CPU_H83007, h8_3007_get_info },
770   { CPU_H83044, h8_3044_get_info },
771   { CPU_H83002, CPU_GET_INFO_NAME(h8_3002) },
772   { CPU_H83007, CPU_GET_INFO_NAME(h8_3007) },
773   { CPU_H83044, CPU_GET_INFO_NAME(h8_3044) },
771774#endif
772775#if (HAS_V810)
773   { CPU_V810, v810_get_info },
776   { CPU_V810, CPU_GET_INFO_NAME(v810) },
774777#endif
775778#if (HAS_M37702)
776   { CPU_M37702, m37702_get_info },
779   { CPU_M37702, CPU_GET_INFO_NAME(m37702) },
777780#endif
778781#if (HAS_M37710)
779   { CPU_M37710, m37710_get_info },
782   { CPU_M37710, CPU_GET_INFO_NAME(m37710) },
780783#endif
781784#if (HAS_PPC403GA)
782   { CPU_PPC403GA, ppc403ga_get_info },
785   { CPU_PPC403GA, CPU_GET_INFO_NAME(ppc403ga) },
783786#endif
784787#if (HAS_PPC403GCX)
785   { CPU_PPC403GCX, ppc403gcx_get_info },
788   { CPU_PPC403GCX, CPU_GET_INFO_NAME(ppc403gcx) },
786789#endif
787790#if (HAS_PPC601)
788   { CPU_PPC601, ppc601_get_info },
791   { CPU_PPC601, CPU_GET_INFO_NAME(ppc601) },
789792#endif
790793#if (HAS_PPC602)
791   { CPU_PPC602, ppc602_get_info },
794   { CPU_PPC602, CPU_GET_INFO_NAME(ppc602) },
792795#endif
793796#if (HAS_PPC603)
794   { CPU_PPC603, ppc603_get_info },
797   { CPU_PPC603, CPU_GET_INFO_NAME(ppc603) },
795798#endif
796799#if (HAS_PPC603E)
797   { CPU_PPC603E, ppc603e_get_info },
800   { CPU_PPC603E, CPU_GET_INFO_NAME(ppc603e) },
798801#endif
799802#if (HAS_PPC603R)
800   { CPU_PPC603R, ppc603r_get_info },
803   { CPU_PPC603R, CPU_GET_INFO_NAME(ppc603r) },
801804#endif
802805#if (HAS_PPC604)
803   { CPU_PPC604, ppc604_get_info },
806   { CPU_PPC604, CPU_GET_INFO_NAME(ppc604) },
804807#endif
805808#if (HAS_MPC8240)
806   { CPU_MPC8240, mpc8240_get_info },
809   { CPU_MPC8240, CPU_GET_INFO_NAME(mpc8240) },
807810#endif
808811#if (HAS_SE3208)
809   { CPU_SE3208, SE3208_get_info },
812   { CPU_SE3208, CPU_GET_INFO_NAME(SE3208) },
810813#endif
811814#if (HAS_MC68HC11)
812   { CPU_MC68HC11, mc68hc11_get_info },
815   { CPU_MC68HC11, CPU_GET_INFO_NAME(mc68hc11) },
813816#endif
814817#if (HAS_ADSP21062)
815   { CPU_ADSP21062, adsp21062_get_info },
818   { CPU_ADSP21062, CPU_GET_INFO_NAME(adsp21062) },
816819#endif
817820#if (HAS_DSP56156)
818   { CPU_DSP56156, dsp56k_get_info },
821   { CPU_DSP56156, CPU_GET_INFO_NAME(dsp56k) },
819822#endif
820823#if (HAS_RSP)
821   { CPU_RSP, rsp_get_info },
824   { CPU_RSP, CPU_GET_INFO_NAME(rsp) },
822825#endif
823826#if (HAS_ALPHA8201)
824   { CPU_ALPHA8201, alpha8201_get_info },
827   { CPU_ALPHA8201, CPU_GET_INFO_NAME(alpha8201) },
825828#endif
826829#if (HAS_ALPHA8301)
827   { CPU_ALPHA8301, alpha8301_get_info },
830   { CPU_ALPHA8301, CPU_GET_INFO_NAME(alpha8301) },
828831#endif
829832#if (HAS_CDP1802)
830   { CPU_CDP1802, cdp1802_get_info },
833   { CPU_CDP1802, CPU_GET_INFO_NAME(cdp1802) },
831834#endif
832835#if (HAS_COP420)
833   { CPU_COP420, cop420_get_info },
836   { CPU_COP420, CPU_GET_INFO_NAME(cop420) },
834837#endif
835838#if (HAS_COP421)
836   { CPU_COP421, cop421_get_info },
839   { CPU_COP421, CPU_GET_INFO_NAME(cop421) },
837840#endif
838841#if (HAS_COP410)
839   { CPU_COP410, cop410_get_info },
842   { CPU_COP410, CPU_GET_INFO_NAME(cop410) },
840843#endif
841844#if (HAS_COP411)
842   { CPU_COP411, cop411_get_info },
845   { CPU_COP411, CPU_GET_INFO_NAME(cop411) },
843846#endif
844847#if (HAS_TLCS90)
845   { CPU_TMP90840, tmp90840_get_info },
846   { CPU_TMP90841, tmp90841_get_info },
847   { CPU_TMP91640, tmp91640_get_info },
848   { CPU_TMP91641, tmp91641_get_info },
848   { CPU_TMP90840, CPU_GET_INFO_NAME(tmp90840) },
849   { CPU_TMP90841, CPU_GET_INFO_NAME(tmp90841) },
850   { CPU_TMP91640, CPU_GET_INFO_NAME(tmp91640) },
851   { CPU_TMP91641, CPU_GET_INFO_NAME(tmp91641) },
849852#endif
850853#if (HAS_APEXC)
851   { CPU_APEXC, apexc_get_info },
854   { CPU_APEXC, CPU_GET_INFO_NAME(apexc) },
852855#endif
853856#if (HAS_CP1610)
854   { CPU_CP1610, cp1610_get_info },
857   { CPU_CP1610, CPU_GET_INFO_NAME(cp1610) },
855858#endif
856859#if (HAS_F8)
857   { CPU_F8, f8_get_info },
860   { CPU_F8, CPU_GET_INFO_NAME(f8) },
858861#endif
859862#if (HAS_LH5801)
860   { CPU_LH5801, lh5801_get_info },
863   { CPU_LH5801, CPU_GET_INFO_NAME(lh5801) },
861864#endif
862865#if (HAS_PDP1)
863   { CPU_PDP1, pdp1_get_info },
866   { CPU_PDP1, CPU_GET_INFO_NAME(pdp1) },
864867#endif
865868#if (HAS_SATURN)
866   { CPU_SATURN, saturn_get_info },
869   { CPU_SATURN, CPU_GET_INFO_NAME(saturn) },
867870#endif
868871#if (HAS_SC61860)
869   { CPU_SC61860, sc61860_get_info },
872   { CPU_SC61860, CPU_GET_INFO_NAME(sc61860) },
870873#endif
871874#if (HAS_TX0_64KW)
872   { CPU_TX0_64KW, tx0_64kw_get_info },
875   { CPU_TX0_64KW, CPU_GET_INFO_NAME(tx0_64kw) },
873876#endif
874877#if (HAS_TX0_8KW)
875   { CPU_TX0_8KW, tx0_8kw_get_info },
878   { CPU_TX0_8KW, CPU_GET_INFO_NAME(tx0_8kw) },
876879#endif
877880#if (HAS_LR35902)
878   { CPU_LR35902, lr35902_get_info },
881   { CPU_LR35902, CPU_GET_INFO_NAME(lr35902) },
879882#endif
880883#if (HAS_TMS7000)
881   { CPU_TMS7000, tms7000_get_info },
884   { CPU_TMS7000, CPU_GET_INFO_NAME(tms7000) },
882885#endif
883886#if (HAS_TMS7000_EXL)
884   { CPU_TMS7000_EXL, tms7000_exl_get_info },
887   { CPU_TMS7000_EXL, CPU_GET_INFO_NAME(tms7000_exl) },
885888#endif
886889#if (HAS_SM8500)
887   { CPU_SM8500, sm8500_get_info },
890   { CPU_SM8500, CPU_GET_INFO_NAME(sm8500) },
888891#endif
889892#if (HAS_V30MZ)
890   { CPU_V30MZ, v30mz_get_info },
893   { CPU_V30MZ, CPU_GET_INFO_NAME(v30mz) },
891894#endif
892895#if (HAS_MB8841)
893   { CPU_MB8841, mb8841_get_info },
896   { CPU_MB8841, CPU_GET_INFO_NAME(mb8841) },
894897#endif
895898#if (HAS_MB8842)
896   { CPU_MB8842, mb8842_get_info },
899   { CPU_MB8842, CPU_GET_INFO_NAME(mb8842) },
897900#endif
898901#if (HAS_MB8843)
899   { CPU_MB8843, mb8843_get_info },
902   { CPU_MB8843, CPU_GET_INFO_NAME(mb8843) },
900903#endif
901904#if (HAS_MB8844)
902   { CPU_MB8844, mb8844_get_info },
905   { CPU_MB8844, CPU_GET_INFO_NAME(mb8844) },
903906#endif
904907#if (HAS_MB86233)
905   { CPU_MB86233, mb86233_get_info },
908   { CPU_MB86233, CPU_GET_INFO_NAME(mb86233) },
906909#endif
907910#if (HAS_SSP1601)
908   { CPU_SSP1601, ssp1601_get_info },
911   { CPU_SSP1601, CPU_GET_INFO_NAME(ssp1601) },
909912#endif
910913#if (HAS_MINX)
911   { CPU_MINX, minx_get_info },
914   { CPU_MINX, CPU_GET_INFO_NAME(minx) },
912915#endif
913916#if (HAS_CXD8661R)
914   { CPU_CXD8661R, cxd8661r_get_info },
917   { CPU_CXD8661R, CPU_GET_INFO_NAME(cxd8661r) },
915918#endif
916919};
917920
r3535r3536
954957
955958   /* if we need to change contexts, save the one that was there */
956959   if (oldcontext != cpunum && oldcontext != -1)
957      (*cpu[oldcontext].intf.get_context)(cpu[oldcontext].context);
960      (*cpu[oldcontext].intf.get_context)(cpu[oldcontext].device.token);
958961
959962   /* swap memory spaces */
960963   activecpu = cpunum;
r3535r3536
963966   /* if the new CPU's context is not swapped in, do it now */
964967   if (oldcontext != cpunum)
965968   {
966      (*cpu[cpunum].intf.set_context)(cpu[cpunum].context);
969      (*cpu[cpunum].intf.set_context)(cpu[cpunum].device.token);
967970      cpu_active_context[newfamily] = cpunum;
968971   }
969972}
r3535r3536
11621165 *
11631166 *************************************/
11641167
1165int cpuintrf_init_cpu(int cpunum, cpu_type cputype, int clock, const void *config, int (*irqcallback)(int))
1168int cpuintrf_init_cpu(int cpunum, cpu_type cputype, int clock, const void *config, cpu_irq_callback irqcallback)
11661169{
11671170   cpuinfo info;
11681171
1169   /* allocate a context buffer for the CPU */
1170   cpu[cpunum].context = auto_malloc(cpu[cpunum].intf.context_size);
1171   memset(cpu[cpunum].context, 0, cpu[cpunum].intf.context_size);
1172   /* create a fake device for the CPU */
1173   memset(&cpu[cpunum].device, 0, sizeof(cpu[cpunum].device));
1174   cpu[cpunum].device.machine = Machine;
1175   cpu[cpunum].device.token = auto_malloc(cpu[cpunum].intf.context_size);
1176   memset(cpu[cpunum].device.token, 0, cpu[cpunum].intf.context_size);
11721177
11731178   /* initialize the CPU and stash the context */
11741179   activecpu = cpunum;
1175   (*cpu[cpunum].intf.init)(cpunum, clock, config, irqcallback);
1176   (*cpu[cpunum].intf.get_context)(cpu[cpunum].context);
1180   (*cpu[cpunum].intf.init)(&cpu[cpunum].device, cpunum, clock, config, irqcallback);
1181   (*cpu[cpunum].intf.get_context)(cpu[cpunum].device.token);
11771182   activecpu = -1;
11781183
11791184   /* get the instruction count pointer */
11801185   info.icount = NULL;
11811186   (*cpu[cpunum].intf.get_info)(CPUINFO_PTR_INSTRUCTION_COUNTER, &info);
1182   cpu[cpunum].intf.icount = info.icount;
1187   cpu[cpunum].icount = info.icount;
11831188
11841189   /* clear out the registered CPU for this family */
11851190   cpu_active_context[cpu[cpunum].family] = -1;
r3535r3536
12011206   {
12021207      /* switch contexts to the CPU during the exit */
12031208      cpuintrf_push_context(cpunum);
1204      (*cpu[cpunum].intf.exit)();
1209      (*cpu[cpunum].intf.exit)(&cpu[cpunum].device);
12051210      cpuintrf_pop_context();
12061211   }
12071212}
r3535r3536
12951300void activecpu_adjust_icount(int delta)
12961301{
12971302   VERIFY_ACTIVECPU(activecpu_adjust_icount);
1298   *cpu[activecpu].intf.icount += delta;
1303   *cpu[activecpu].icount += delta;
12991304}
13001305
13011306
13021307int activecpu_get_icount(void)
13031308{
13041309   VERIFY_ACTIVECPU(activecpu_get_icount);
1305   return *cpu[activecpu].intf.icount;
1310   return *cpu[activecpu].icount;
13061311}
13071312
13081313
r3535r3536
15291534   cpuintrf_push_context(cpunum);
15301535   executingcpu = cpunum;
15311536   memory_set_opbase(activecpu_get_physical_pc_byte());
1532   ran = (*cpu[cpunum].intf.execute)(cycles);
1537   ran = (*cpu[cpunum].intf.execute)(&cpu[cpunum].device, cycles);
15331538   executingcpu = -1;
15341539   cpuintrf_pop_context();
15351540   return ran;
r3535r3536
15451550   VERIFY_CPUNUM(cpunum_reset);
15461551   cpuintrf_push_context(cpunum);
15471552   memory_set_opbase(0);
1548   (*cpu[cpunum].intf.reset)();
1553   (*cpu[cpunum].intf.reset)(&cpu[cpunum].device);
15491554   cpuintrf_pop_context();
15501555}
15511556
r3535r3536
15851590void *cpunum_get_context_ptr(int cpunum)
15861591{
15871592   VERIFY_CPUNUM(cpunum_get_context_ptr);
1588   return (cpu_active_context[cpu[cpunum].family] == cpunum) ? NULL : cpu[cpunum].context;
1593   return (cpu_active_context[cpu[cpunum].family] == cpunum) ? NULL : cpu[cpunum].device.token;
15891594}
15901595
15911596
r3535r3536
17041709static struct dummy_context dummy_state;
17051710static int dummy_icount;
17061711
1707static void dummy_init(int index, int clock, const void *config, int (*irqcallback)(int)) { }
1708static void dummy_reset(void) { }
1709static void dummy_exit(void) { }
1710static int dummy_execute(int cycles) { return cycles; }
1711static void dummy_get_context(void *regs) { }
1712static void dummy_set_context(void *regs) { }
1712static CPU_INIT( dummy ) { }
1713static CPU_RESET( dummy ) { }
1714static CPU_EXIT( dummy ) { }
1715static CPU_EXECUTE( dummy ) { return cycles; }
1716static CPU_GET_CONTEXT( dummy ) { }
1717static CPU_SET_CONTEXT( dummy ) { }
17131718
1714static offs_t dummy_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
1719static CPU_DISASSEMBLE( dummy )
17151720{
17161721   strcpy(buffer, "???");
17171722   return 1;
17181723}
17191724
1720static void dummy_set_info(UINT32 state, cpuinfo *info)
1725static CPU_SET_INFO( dummy )
17211726{
17221727}
17231728
1724void dummy_get_info(UINT32 state, cpuinfo *info)
1729CPU_GET_INFO( dummy )
17251730{
17261731   switch (state)
17271732   {
r3535r3536
17541759      case CPUINFO_INT_SP:                     info->i = 0;                     break;
17551760
17561761      /* --- the following bits of info are returned as pointers to data or functions --- */
1757      case CPUINFO_PTR_SET_INFO:                  info->setinfo = dummy_set_info;         break;
1758      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = dummy_get_context;   break;
1759      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = dummy_set_context;   break;
1760      case CPUINFO_PTR_INIT:                     info->init = dummy_init;            break;
1761      case CPUINFO_PTR_RESET:                     info->reset = dummy_reset;            break;
1762      case CPUINFO_PTR_EXIT:                     info->exit = dummy_exit;            break;
1763      case CPUINFO_PTR_EXECUTE:                  info->execute = dummy_execute;         break;
1762      case CPUINFO_PTR_SET_INFO:                  info->setinfo = CPU_SET_INFO_NAME(dummy); break;
1763      case CPUINFO_PTR_GET_CONTEXT:               info->getcontext = CPU_GET_CONTEXT_NAME(dummy);   break;
1764      case CPUINFO_PTR_SET_CONTEXT:               info->setcontext = CPU_SET_CONTEXT_NAME(dummy);   break;
1765      case CPUINFO_PTR_INIT:                     info->init = CPU_INIT_NAME(dummy);      break;
1766      case CPUINFO_PTR_RESET:                     info->reset = CPU_RESET_NAME(dummy);   break;
1767      case CPUINFO_PTR_EXIT:                     info->exit = CPU_EXIT_NAME(dummy);      break;
1768      case CPUINFO_PTR_EXECUTE:                  info->execute = CPU_EXECUTE_NAME(dummy);break;
17641769      case CPUINFO_PTR_BURN:                     info->burn = NULL;                  break;
1765      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = dummy_dasm;         break;
1770      case CPUINFO_PTR_DISASSEMBLE:               info->disassemble = CPU_DISASSEMBLE_NAME(dummy); break;
17661771      case CPUINFO_PTR_INSTRUCTION_COUNTER:         info->icount = &dummy_icount;         break;
17671772
17681773      /* --- the following bits of info are returned as NULL-terminated strings --- */
src/emu/attotime.h
r3535r3536
132132    FUNCTION PROTOTYPES
133133***************************************************************************/
134134
135/* ----- conversion helpers ----- */
136
137/* convert an attotime to attoseconds, clamping to maximum positive/negative values */
138attoseconds_t attotime_to_attoseconds(attotime _time);
139
140/* convert an attotime to clock ticks at the given frequency */
141INT64 attotime_to_ticks(attotime _time, INT32 frequency);
142
143/* convert clock ticks at the given frequency to an attotime */
144attotime ticks_to_attotime(INT64 ticks, INT32 frequency);
145
146
147135/* ----- core math functions ----- */
148136
149/* add two attotimes */
150attotime attotime_add(attotime _time1, attotime _time2);
151
152/* add attoseconds to an attotime */
153attotime attotime_add_attoseconds(attotime _time1, attoseconds_t _attoseconds);
154
155/* subtract two attotimes */
156attotime attotime_sub(attotime _time1, attotime _time2);
157
158/* subtract attoseconds from an attotime */
159attotime attotime_sub_attoseconds(attotime _time1, attoseconds_t _attoseconds);
160
161137/* multiply an attotime by a constant */
162138attotime attotime_mul(attotime _time1, UINT32 factor);
163139
164140/* divide an attotime by a constant */
165141attotime attotime_div(attotime _time1, UINT32 factor);
166142
167/* compare two attotimes */
168int attotime_compare(attotime _time1, attotime _time2);
169143
170/* return the minimum of two attotimes */
171attotime attotime_min(attotime _time1, attotime _time2);
172
173/* return the maximum of two attotimes */
174attotime attotime_max(attotime _time1, attotime _time2);
175
176
177144/* ----- misc utilities ----- */
178145
179146/* return a temporary printable string describing an attotime */
r3535r3536
229196}
230197
231198
199/*-------------------------------------------------
200    attotime_to_attoseconds - convert a attotime
201    to attoseconds, clamping to maximum positive/
202    negative values
203-------------------------------------------------*/
204
205INLINE attoseconds_t attotime_to_attoseconds(attotime _time)
206{
207   /* positive values between 0 and 1 second */
208   if (_time.seconds == 0)
209      return _time.attoseconds;
210
211   /* negative values between -1 and 0 seconds */
212   else if (_time.seconds == -1)
213      return _time.attoseconds - ATTOSECONDS_PER_SECOND;
214
215   /* out-of-range positive values */
216   else if (_time.seconds > 0)
217      return ATTOSECONDS_PER_SECOND;
218
219   /* out-of-range negative values */
220   else
221      return -ATTOSECONDS_PER_SECOND;
222}
223
224
225/*-------------------------------------------------
226    attotime_to_ticks - convert an attotime to
227    clock ticks at the given frequency
228-------------------------------------------------*/
229
230INLINE INT64 attotime_to_ticks(attotime _time, INT32 frequency)
231{
232   INT32 fracticks = attotime_mul(attotime_make(0, _time.attoseconds), frequency).seconds;
233   return (INT64)_time.seconds * (INT64)frequency + fracticks;
234}
235
236
237/*-------------------------------------------------
238    ticks_to_attotime - convert clock ticks at
239    the given frequency to an attotime
240-------------------------------------------------*/
241
242INLINE attotime ticks_to_attotime(INT64 ticks, INT32 frequency)
243{
244   attotime result;
245   result.seconds = ticks / frequency;
246   result.attoseconds = HZ_TO_ATTOSECONDS(frequency) * (ticks - (INT64)result.seconds * (INT64)frequency);
247   return result;
248}
249
250
251/*-------------------------------------------------
252    attotime_add - add two attotimes
253-------------------------------------------------*/
254
255INLINE attotime attotime_add(attotime _time1, attotime _time2)
256{
257   attotime result;
258
259   /* if one of the items is attotime_never, return attotime_never */
260   if (_time1.seconds >= ATTOTIME_MAX_SECONDS || _time2.seconds >= ATTOTIME_MAX_SECONDS)
261      return attotime_never;
262
263   /* add the seconds and attoseconds */
264   result.attoseconds = _time1.attoseconds + _time2.attoseconds;
265   result.seconds = _time1.seconds + _time2.seconds;
266
267   /* normalize and return */
268   if (result.attoseconds >= ATTOSECONDS_PER_SECOND)
269   {
270      result.attoseconds -= ATTOSECONDS_PER_SECOND;
271      result.seconds++;
272   }
273
274   /* overflow */
275   if (result.seconds >= ATTOTIME_MAX_SECONDS)
276      return attotime_never;
277   return result;
278}
279
280
281/*-------------------------------------------------
282    attotime_add_attoseconds - add attoseconds
283    to a attotime
284-------------------------------------------------*/
285
286INLINE attotime attotime_add_attoseconds(attotime _time1, attoseconds_t _attoseconds)
287{
288   attotime result;
289
290   /* if one of the items is attotime_never, return attotime_never */
291   if (_time1.seconds >= ATTOTIME_MAX_SECONDS)
292      return attotime_never;
293
294   /* add the seconds and attoseconds */
295   result.attoseconds = _time1.attoseconds + _attoseconds;
296   result.seconds = _time1.seconds;
297
298   /* normalize and return */
299   if (result.attoseconds >= ATTOSECONDS_PER_SECOND)
300   {
301      result.attoseconds -= ATTOSECONDS_PER_SECOND;
302      result.seconds++;
303   }
304
305   /* overflow */
306   if (result.seconds >= ATTOTIME_MAX_SECONDS)
307      return attotime_never;
308   return result;
309}
310
311
312/*-------------------------------------------------
313    attotime_sub - subtract two attotimes
314-------------------------------------------------*/
315
316INLINE attotime attotime_sub(attotime _time1, attotime _time2)
317{
318   attotime result;
319
320   /* if time1 is attotime_never, return attotime_never */
321   if (_time1.seconds >= ATTOTIME_MAX_SECONDS)
322      return attotime_never;
323
324   /* add the seconds and attoseconds */
325   result.attoseconds = _time1.attoseconds - _time2.attoseconds;
326   result.seconds = _time1.seconds - _time2.seconds;
327
328   /* normalize and return */
329   if (result.attoseconds < 0)
330   {
331      result.attoseconds += ATTOSECONDS_PER_SECOND;
332      result.seconds--;
333   }
334   return result;
335}
336
337
338/*-------------------------------------------------
339    attotime_sub_attoseconds - subtract
340    attoseconds from a attotime
341-------------------------------------------------*/
342
343INLINE attotime attotime_sub_attoseconds(attotime _time1, attoseconds_t _attoseconds)
344{
345   attotime result;
346
347   /* if time1 is attotime_never, return attotime_never */
348   if (_time1.seconds >= ATTOTIME_MAX_SECONDS)
349      return attotime_never;
350
351   /* add the seconds and attoseconds */
352   result.attoseconds = _time1.attoseconds - _attoseconds;
353   result.seconds = _time1.seconds;
354
355   /* normalize and return */
356   if (result.attoseconds < 0)
357   {
358      result.attoseconds += ATTOSECONDS_PER_SECOND;
359      result.seconds--;
360   }
361   return result;
362}
363
364
365/*-------------------------------------------------
366    attotime_compare - compare two attotimes
367-------------------------------------------------*/
368
369INLINE int attotime_compare(attotime _time1, attotime _time2)
370{
371   if (_time1.seconds > _time2.seconds)
372      return 1;
373   if (_time1.seconds < _time2.seconds)
374      return -1;
375   if (_time1.attoseconds > _time2.attoseconds)
376      return 1;
377   if (_time1.attoseconds < _time2.attoseconds)
378      return -1;
379   return 0;
380}
381
382
383/*-------------------------------------------------
384    attotime_min - return the minimum of two
385    attotimes
386-------------------------------------------------*/
387
388INLINE attotime attotime_min(attotime _time1, attotime _time2)
389{
390   if (_time1.seconds > _time2.seconds)
391      return _time2;
392   if (_time1.seconds < _time2.seconds)
393      return _time1;
394   if (_time1.attoseconds > _time2.attoseconds)
395      return _time2;
396   return _time1;
397}
398
399
400/*-------------------------------------------------
401    attotime_max - return the maximum of two
402    attotimes
403-------------------------------------------------*/
404
405INLINE attotime attotime_max(attotime _time1, attotime _time2)
406{
407   if (_time1.seconds > _time2.seconds)
408      return _time1;
409   if (_time1.seconds < _time2.seconds)
410      return _time2;
411   if (_time1.attoseconds > _time2.attoseconds)
412      return _time1;
413   return _time2;
414}
415
416
232417#endif   /* __ATTOTIME_H__ */
src/emu/cpuexec.c
r3535r3536
1111
1212#include "driver.h"
1313#include "profiler.h"
14#include "eminline.h"
1415#include "debugger.h"
1516
17extern const cpu_irq_callback cpu_irq_callbacks[];
1618
1719
1820
21
1922/***************************************************************************
2023    DEBUGGING
2124***************************************************************************/
r3535r3536
5053/* internal trigger IDs */
5154enum
5255{
53   TRIGGER_TIMESLICE    = -1000,
5456   TRIGGER_INT       = -2000,
5557   TRIGGER_YIELDTIME    = -3000,
5658   TRIGGER_SUSPENDTIME = -4000
r3535r3536
7678   attotime    localtime;            /* local time, relative to the timer system's global time */
7779   INT32      clock;               /* current active clock */
7880   double      clockscale;            /* current active clock scale factor */
81   INT32      divisor;            /* 32-bit attoseconds_per_cycle divisor */
82   UINT8      divshift;            /* right shift amount to fit the divisor into 32 bits */
7983
8084   emu_timer *   timedint_timer;         /* reference to this CPU's periodic interrupt timer */
8185
r3535r3536
98102static int cycles_stolen;
99103
100104
101/* timer variables */
102static emu_timer *timeslice_timer;
103static attotime timeslice_period;
104105
105static emu_timer *interleave_boost_timer;
106static emu_timer *interleave_boost_timer_end;
107static attotime perfect_interleave;
108
109
110
111106/***************************************************************************
112107    FUNCTION PROTOTYPES
113108***************************************************************************/
r3535r3536
115110static void cpuexec_exit(running_machine *machine);
116111static void cpuexec_reset(running_machine *machine);
117112static void cpu_inittimers(running_machine *machine);
118static TIMER_CALLBACK( end_interleave_boost );
113static void update_clock_information(running_machine *machine, int cpunum);
119114static TIMER_CALLBACK( trigger_partial_frame_interrupt );
120115static void compute_perfect_interleave(running_machine *machine);
121116
r3535r3536
135130   int cpunum;
136131
137132   /* loop over all our CPUs */
133   memset(cpu, 0, sizeof(cpu));
138134   for (cpunum = 0; cpunum < MAX_CPU; cpunum++)
139135   {
140136      cpu_type cputype = machine->config->cpu[cpunum].type;
r3535r3536
145141         break;
146142
147143      /* initialize the cpuinfo struct */
148      memset(&cpu[cpunum], 0, sizeof(cpu[cpunum]));
149144      cpu[cpunum].suspend = SUSPEND_REASON_RESET;
150145      cpu[cpunum].clock = (UINT64)machine->config->cpu[cpunum].clock * cputype_clock_multiplier(cputype) / cputype_clock_divider(cputype);
151146      cpu[cpunum].clockscale = 1.0;
152147      cpu[cpunum].localtime = attotime_zero;
153148
154149      /* compute the cycle times */
155      cycles_per_second[cpunum] = cpu[cpunum].clockscale * cpu[cpunum].clock;
156      attoseconds_per_cycle[cpunum] = ATTOSECONDS_PER_SECOND / (cpu[cpunum].clockscale * cpu[cpunum].clock);
150      update_clock_information(machine, cpunum);
157151
158152      /* register some of our variables for later */
159153      state_save_register_item("cpu", cpunum, cpu[cpunum].suspend);
r3535r3536
188182   }
189183   add_reset_callback(machine, cpuexec_reset);
190184   add_exit_callback(machine, cpuexec_exit);
191
192   /* compute the perfect interleave factor */
193   compute_perfect_interleave(machine);
194185}
195186
196187
r3535r3536
245236
246237void cpuexec_timeslice(running_machine *machine)
247238{
239   int call_debugger = ((machine->debug_flags & DEBUG_FLAG_ENABLED) != 0);
248240   attotime target = timer_next_fire_time();
249241   attotime base = timer_get_time();
250242   int cpunum, ran;
r3535r3536
252244   LOG(("------------------\n"));
253245   LOG(("cpu_timeslice: target = %s\n", attotime_string(target, 9)));
254246
255   /* process any pending suspends */
247   /* apply pending suspension changes */
256248   for (cpunum = 0; machine->config->cpu[cpunum].type != CPU_DUMMY; cpunum++)
257249   {
258      if (cpu[cpunum].suspend != cpu[cpunum].nextsuspend)
259         LOG(("--> updated CPU%d suspend from %X to %X\n", cpunum, cpu[cpunum].suspend, cpu[cpunum].nextsuspend));
260      cpu[cpunum].suspend = cpu[cpunum].nextsuspend;
261      cpu[cpunum].eatcycles = cpu[cpunum].nexteatcycles;
250      cpuexec_data *cpudata = &cpu[cpunum];
251      cpudata->suspend = cpudata->nextsuspend;
252      cpudata->nextsuspend &= ~SUSPEND_REASON_TIMESLICE;
253      cpudata->eatcycles = cpudata->nexteatcycles;
262254   }
263255
264   /* loop over CPUs */
256   /* loop over non-suspended CPUs */
265257   for (cpunum = 0; machine->config->cpu[cpunum].type != CPU_DUMMY; cpunum++)
266258   {
267      /* only process if we're not suspended */
268      if (!cpu[cpunum].suspend)
259      cpuexec_data *cpudata = &cpu[cpunum];
260      if (cpudata->suspend == 0)
269261      {
270         /* compute how long to run */
271         cycles_running = ATTOTIME_TO_CYCLES(cpunum, attotime_sub(target, cpu[cpunum].localtime));
272         LOG(("  cpu %d: %d cycles\n", cpunum, cycles_running));
273
274         /* run for the requested number of cycles */
275         if (cycles_running > 0)
262         attotime delta = attotime_sub(target, cpudata->localtime);
263         if (delta.seconds >= 0 && delta.attoseconds >= attoseconds_per_cycle[cpunum])
276264         {
265            /* compute how long to run */
266            cycles_running = div_64x32(delta.attoseconds >> cpudata->divshift, cpudata->divisor);
267            LOG(("  cpu %d: %d cycles\n", cpunum, cycles_running));
268
277269            profiler_mark(PROFILER_CPU1 + cpunum);
278270
279271            /* note that this global variable cycles_stolen can be modified */
280272            /* via the call to the cpunum_execute */
281273            cycles_stolen = 0;
282            debugger_start_cpu_hook(machine, cpunum, target);
283            ran = cpunum_execute(cpunum, cycles_running);
284            debugger_stop_cpu_hook(machine, cpunum);
274            if (!call_debugger)
275               ran = cpunum_execute(cpunum, cycles_running);
276            else
277            {
278               debugger_start_cpu_hook(machine, cpunum, target);
279               ran = cpunum_execute(cpunum, cycles_running);
280               debugger_stop_cpu_hook(machine, cpunum);
281            }
285282
286283#ifdef MAME_DEBUG
287284            if (ran < cycles_stolen)
r3535r3536
292289            profiler_mark(PROFILER_END);
293290
294291            /* account for these cycles */
295            cpu[cpunum].totalcycles += ran;
296            cpu[cpunum].localtime = attotime_add(cpu[cpunum].localtime, ATTOTIME_IN_CYCLES(ran, cpunum));
297            LOG(("         %d ran, %d total, time = %s\n", ran, (INT32)cpu[cpunum].totalcycles, attotime_string(cpu[cpunum].localtime, 9)));
292            cpudata->totalcycles += ran;
293            cpudata->localtime = attotime_add_attoseconds(cpudata->localtime, ran * attoseconds_per_cycle[cpunum]);
294            LOG(("         %d ran, %d total, time = %s\n", ran, (INT32)cpudata->totalcycles, attotime_string(cpudata->localtime, 9)));
298295
299296            /* if the new local CPU time is less than our target, move the target up */
300            if (attotime_compare(cpu[cpunum].localtime, target) < 0)
297            if (attotime_compare(cpudata->localtime, target) < 0)
301298            {
302               if (attotime_compare(cpu[cpunum].localtime, base) > 0)
303                  target = cpu[cpunum].localtime;
304               else
305                  target = base;
299               target = attotime_max(cpudata->localtime, base);
306300               LOG(("         (new target)\n"));
307301            }
308302         }
r3535r3536
312306   /* update the local times of all CPUs */
313307   for (cpunum = 0; machine->config->cpu[cpunum].type != CPU_DUMMY; cpunum++)
314308   {
309      cpuexec_data *cpudata = &cpu[cpunum];
310
315311      /* if we're suspended and counting, process */
316      if (cpu[cpunum].suspend && cpu[cpunum].eatcycles && attotime_compare(cpu[cpunum].localtime, target) < 0)
312      if (cpudata->suspend != 0 && cpudata->eatcycles && attotime_compare(cpudata->localtime, target) < 0)
317313      {
314         attotime delta = attotime_sub(target, cpudata->localtime);
315
318316         /* compute how long to run */
319         cycles_running = ATTOTIME_TO_CYCLES(cpunum, attotime_sub(target, cpu[cpunum].localtime));
317         cycles_running = div_64x32(delta.attoseconds >> cpudata->divshift, cpudata->divisor);
320318         LOG(("  cpu %d: %d cycles (suspended)\n", cpunum, cycles_running));
321319
322         cpu[cpunum].totalcycles += cycles_running;
323         cpu[cpunum].localtime = attotime_add(cpu[cpunum].localtime, ATTOTIME_IN_CYCLES(cycles_running, cpunum));
324         LOG(("         %d skipped, %d total, time = %s\n", cycles_running, (INT32)cpu[cpunum].totalcycles, attotime_string(cpu[cpunum].localtime, 9)));
320         cpudata->totalcycles += cycles_running;
321         cpudata->localtime = attotime_add_attoseconds(cpudata->localtime, cycles_running * attoseconds_per_cycle[cpunum]);
322         LOG(("         %d skipped, %d total, time = %s\n", cycles_running, (INT32)cpudata->totalcycles, attotime_string(cpudata->localtime, 9)));
325323      }
326324
327      /* update the suspend state */
328      if (cpu[cpunum].suspend != cpu[cpunum].nextsuspend)
329         LOG(("--> updated CPU%d suspend from %X to %X\n", cpunum, cpu[cpunum].suspend, cpu[cpunum].nextsuspend));
330      cpu[cpunum].suspend = cpu[cpunum].nextsuspend;
331      cpu[cpunum].eatcycles = cpu[cpunum].nexteatcycles;
325      /* update the suspend state (breaks steeltal if we don't) */
326      cpudata->suspend = cpudata->nextsuspend;
327      cpudata->eatcycles = cpudata->nexteatcycles;
332328   }
333329
334330   /* update the global time */
r3535r3536
346342    interleave factor
347343-------------------------------------------------*/
348344
349void cpu_boost_interleave(attotime timeslice_time, attotime boost_duration)
345void cpu_boost_interleave(running_machine *machine, attotime timeslice_time, attotime boost_duration)
350346{
351   /* if you pass 0 for the timeslice_time, it means pick something reasonable */
352   if (attotime_compare(timeslice_time, perfect_interleave) < 0)
353      timeslice_time = perfect_interleave;
354
355   LOG(("cpu_boost_interleave(%s, %s)\n", attotime_string(timeslice_time, 9), attotime_string(boost_duration, 9)));
356
357   /* adjust the interleave timer */
358   timer_adjust_periodic(interleave_boost_timer, timeslice_time, 0, timeslice_time);
359
360   /* adjust the end timer, but only if we are going to extend it */
361   if (!timer_enabled(interleave_boost_timer_end) || attotime_compare(timer_timeleft(interleave_boost_timer_end), boost_duration) < 0)
362      timer_adjust_oneshot(interleave_boost_timer_end, boost_duration, 0);
347   /* ignore timeslices > 1 second */
348   if (timeslice_time.seconds > 0)
349      return;
350   timer_add_scheduling_quantum(machine, timeslice_time.attoseconds, boost_duration);
363351}
364352
365353
r3535r3536
393381{
394382   VERIFY_CPUNUM(cpunum_suspend);
395383   LOG(("cpunum_suspend (CPU=%d, r=%X, eat=%d)\n", cpunum, reason, eatcycles));
396
397   /* set the pending suspend bits, and force a resync */
398384   cpu[cpunum].nextsuspend |= reason;
399385   cpu[cpunum].nexteatcycles = eatcycles;
400386   if (cpu_getexecutingcpu() >= 0)
r3535r3536
411397{
412398   VERIFY_CPUNUM(cpunum_resume);
413399   LOG(("cpunum_resume (CPU=%d, r=%X)\n", cpunum, reason));
414
415   /* clear the pending suspend bits, and force a resync */
416400   cpu[cpunum].nextsuspend &= ~reason;
417401   if (cpu_getexecutingcpu() >= 0)
418402      activecpu_abort_timeslice();
r3535r3536
444428
445429static void update_clock_information(running_machine *machine, int cpunum)
446430{
431   INT64 attos;
432
447433   /* recompute cps and spc */
448434   cycles_per_second[cpunum] = (double)cpu[cpunum].clock * cpu[cpunum].clockscale;
449435   attoseconds_per_cycle[cpunum] = ATTOSECONDS_PER_SECOND / ((double)cpu[cpunum].clock * cpu[cpunum].clockscale);
450436
437   /* update the CPU's divisor */
438   attos = attoseconds_per_cycle[cpunum];
439   cpu[cpunum].divshift = 0;
440   while (attos >= (1UL << 31))
441   {
442      cpu[cpunum].divshift++;
443      attos >>= 1;
444   }
445   cpu[cpunum].divisor = attos;
446
451447   /* re-compute the perfect interleave factor */
452448   compute_perfect_interleave(machine);
453449}
r3535r3536
605601void cpu_yield(void)
606602{
607603   int cpunum = cpu_getexecutingcpu();
608   VERIFY_EXECUTINGCPU(cpu_yielduntil_trigger);
609   cpunum_suspend_until_trigger(cpunum, TRIGGER_TIMESLICE, FALSE);
604   VERIFY_EXECUTINGCPU(cpu_yield);
605   cpunum_suspend(cpunum, SUSPEND_REASON_TIMESLICE, FALSE);
610606}
611607
612608
r3535r3536
618614void cpu_spin(void)
619615{
620616   int cpunum = cpu_getexecutingcpu();
621   VERIFY_EXECUTINGCPU(cpu_yielduntil_trigger);
622   cpunum_suspend_until_trigger(cpunum, TRIGGER_TIMESLICE, TRUE);
617   VERIFY_EXECUTINGCPU(cpu_spin);
618   cpunum_suspend(cpunum, SUSPEND_REASON_TIMESLICE, TRUE);
623619}
624620
625621
r3535r3536
866862
867863
868864/*-------------------------------------------------
869    cpu_timeslicecallback - timer callback for
870    timeslicing
871-------------------------------------------------*/
872
873static TIMER_CALLBACK( cpu_timeslicecallback )
874{
875   cpu_trigger(machine, TRIGGER_TIMESLICE);
876}
877
878
879/*-------------------------------------------------
880    end_interleave_boost - timer callback to end
881    temporary interleave boost
882-------------------------------------------------*/
883
884static TIMER_CALLBACK( end_interleave_boost )
885{
886   timer_adjust_oneshot(interleave_boost_timer, attotime_never, 0);
887   LOG(("end_interleave_boost\n"));
888}
889
890
891/*-------------------------------------------------
892865    compute_perfect_interleave - compute the
893866    "perfect" interleave interval
894867-------------------------------------------------*/
895868
896869static void compute_perfect_interleave(running_machine *machine)
897870{
898   attoseconds_t smallest = attoseconds_per_cycle[0];
899   int cpunum;
900
901   /* start with a huge time factor and find the 2nd smallest cycle time */
902   perfect_interleave = attotime_zero;
903   perfect_interleave.attoseconds = ATTOSECONDS_PER_SECOND - 1;
904   for (cpunum = 1; machine->config->cpu[cpunum].type != CPU_DUMMY; cpunum++)
871   if (attoseconds_per_cycle[0] != 0)
905872   {
906      /* find the 2nd smallest cycle interval */
907      if (attoseconds_per_cycle[cpunum] < smallest)
908      {
909         perfect_interleave.attoseconds = smallest;
910         smallest = attoseconds_per_cycle[cpunum];
911      }
912      else if (attoseconds_per_cycle[cpunum] < perfect_interleave.attoseconds)
913         perfect_interleave.attoseconds = attoseconds_per_cycle[cpunum];
914   }
873      attoseconds_t smallest = attoseconds_per_cycle[0] * cputype_min_cycles(machine->config->cpu[0].type);
874      attoseconds_t perfect = ATTOSECONDS_PER_SECOND - 1;
875      int cpunum;
915876
916   /* adjust the final value */
917   if (perfect_interleave.attoseconds == ATTOSECONDS_PER_SECOND - 1)
918      perfect_interleave.attoseconds = attoseconds_per_cycle[0];
877      /* start with a huge time factor and find the 2nd smallest cycle time */
878      for (cpunum = 1; machine->config->cpu[cpunum].type != CPU_DUMMY; cpunum++)
879         if (attoseconds_per_cycle[cpunum] != 0)
880         {
881            attoseconds_t curtime = attoseconds_per_cycle[cpunum] * cputype_min_cycles(machine->config->cpu[cpunum].type);
919882
920   LOG(("Perfect interleave = %s, smallest = %.9f\n", attotime_string(perfect_interleave, 9), ATTOSECONDS_TO_DOUBLE(smallest)));
883            /* find the 2nd smallest cycle interval */
884            if (curtime < smallest)
885            {
886               perfect = smallest;
887               smallest = curtime;
888            }
889            else if (curtime < perfect)
890               perfect = attoseconds_per_cycle[cpunum];
891         }
892
893      /* adjust the final value */
894      timer_set_minimum_quantum(machine, perfect);
895
896      LOG(("Perfect interleave = %.9f, smallest = %.9f\n", ATTOSECONDS_TO_DOUBLE(perfect), ATTOSECONDS_TO_DOUBLE(smallest)));
897   }
921898}
922899
923900
r3535r3536
936913   if (ipf <= 0)
937914      ipf = 1;
938915   refresh_attosecs = (numscreens == 0) ? HZ_TO_ATTOSECONDS(60) : video_screen_get_frame_period(machine->primary_screen).attoseconds;
939   timeslice_period = attotime_make(0, refresh_attosecs / ipf);
940   timeslice_timer = timer_alloc(cpu_timeslicecallback, NULL);
941   timer_adjust_periodic(timeslice_timer, timeslice_period, 0, timeslice_period);
916   timer_add_scheduling_quantum(machine, refresh_attosecs / ipf, attotime_never);
942917
943   /* allocate timers to handle interleave boosts */
944   interleave_boost_timer = timer_alloc(NULL, NULL);
945   interleave_boost_timer_end = timer_alloc(end_interleave_boost, NULL);
946
947918   /* register the interrupt handler callbacks */
948919   for (cpunum = 0; cpunum < cpu_gettotalcpu(); cpunum++)
949920   {
src/emu/cpuintrf.h
r3535r3536
1414#ifndef __CPUINTRF_H__
1515#define __CPUINTRF_H__
1616
17#include "devintrf.h"
1718#include "cpuint.h"
1819#include "cpuexec.h"
1920#include "watchdog.h"
r3535r3536
128129   CPUINFO_PTR_READ,                           /* R/O: int (*read)(int space, UINT32 offset, int size, UINT64 *value) */
129130   CPUINFO_PTR_WRITE,                           /* R/O: int (*write)(int space, UINT32 offset, int size, UINT64 value) */
130131   CPUINFO_PTR_READOP,                           /* R/O: int (*readop)(UINT32 offset, int size, UINT64 *value) */
131   CPUINFO_PTR_DEBUG_SETUP_COMMANDS,               /* R/O: void (*setup_commands)(void) */
132   CPUINFO_PTR_DEBUG_INIT,                        /* R/O: void (*debug_init)(void) */
132133   CPUINFO_PTR_INSTRUCTION_COUNTER,               /* R/O: int *icount */
133134   CPUINFO_PTR_INTERNAL_MEMORY_MAP,               /* R/O: const addrmap_token *map */
134135   CPUINFO_PTR_INTERNAL_MEMORY_MAP_LAST = CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACES - 1,
r3535r3536
207208
208209
209210/***************************************************************************
211    MACROS
212***************************************************************************/
213
214#define CPU_GET_INFO_NAME(name)      cpu_get_info_##name
215#define CPU_GET_INFO(name)         void CPU_GET_INFO_NAME(name)(UINT32 state, cpuinfo *info)
216#define CPU_GET_INFO_CALL(name)      CPU_GET_INFO_NAME(name)(state, info)
217
218#define CPU_SET_INFO_NAME(name)      cpu_set_info_##name
219#define CPU_SET_INFO(name)         void CPU_SET_INFO_NAME(name)(UINT32 state, cpuinfo *info)
220#define CPU_SET_INFO_CALL(name)      CPU_SET_INFO_NAME(name)(state, info)
221
222#define CPU_GET_CONTEXT_NAME(name)   cpu_get_context_##name
223#define CPU_GET_CONTEXT(name)      void CPU_GET_CONTEXT_NAME(name)(void *dst)
224#define CPU_GET_CONTEXT_CALL(name)   CPU_GET_CONTEXT_NAME(name)(buffer)
225
226#define CPU_SET_CONTEXT_NAME(name)   cpu_set_context_##name
227#define CPU_SET_CONTEXT(name)      void CPU_SET_CONTEXT_NAME(name)(void *src)
228#define CPU_SET_CONTEXT_CALL(name)   CPU_SET_CONTEXT_NAME(name)(buffer)
229
230#define CPU_INIT_NAME(name)         cpu_init_##name
231#define CPU_INIT(name)            void CPU_INIT_NAME(name)(const device_config *device, int index, int clock, const void *config, cpu_irq_callback irqcallback)
232#define CPU_INIT_CALL(name)         CPU_INIT_NAME(name)(device, index, clock, config, irqcallback)
233
234#define CPU_RESET_NAME(name)      cpu_reset_##name
235#define CPU_RESET(name)            void CPU_RESET_NAME(name)(const device_config *device)
236#define CPU_RESET_CALL(name)      CPU_RESET_NAME(name)(device)
237
238#define CPU_EXIT_NAME(name)         cpu_exit_##name
239#define CPU_EXIT(name)            void CPU_EXIT_NAME(name)(const device_config *device)
240#define CPU_EXIT_CALL(name)         CPU_EXIT_NAME(name)(device)
241
242#define CPU_EXECUTE_NAME(name)      cpu_execute_##name
243#define CPU_EXECUTE(name)         int CPU_EXECUTE_NAME(name)(const device_config *device, int cycles)
244#define CPU_EXECUTE_CALL(name)      CPU_EXECUTE_NAME(name)(device, cycles)
245
246#define CPU_BURN_NAME(name)         cpu_burn_##name
247#define CPU_BURN(name)            void CPU_BURN_NAME(name)(const device_config *device, int cycles)
248#define CPU_BURN_CALL(name)         CPU_BURN_NAME(name)(device, cycles)
249
250#define CPU_DISASSEMBLE_NAME(name)   cpu_disassemble_##name
251#define CPU_DISASSEMBLE(name)      offs_t CPU_DISASSEMBLE_NAME(name)(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
252#define CPU_DISASSEMBLE_CALL(name)   CPU_DISASSEMBLE_NAME(name)(buffer, pc, oprom, opram)
253
254#define CPU_TRANSLATE_NAME(name)   cpu_translate_##name
255#define CPU_TRANSLATE(name)         int CPU_TRANSLATE_NAME(name)(int space, int intention, offs_t *address)
256#define CPU_TRANSLATE_CALL(name)   CPU_TRANSLATE_NAME(name)(space, intention, address)
257
258#define CPU_READ_NAME(name)         cpu_read_##name
259#define CPU_READ(name)            int CPU_READ_NAME(name)(int space, UINT32 offset, int size, UINT64 *value)
260#define CPU_READ_CALL(name)         CPU_READ_NAME(name)(space, offset, size, value)
261
262#define CPU_WRITE_NAME(name)      cpu_write_##name
263#define CPU_WRITE(name)            int CPU_WRITE_NAME(name)(int space, UINT32 offset, int size, UINT64 value)
264#define CPU_WRITE_CALL(name)      CPU_WRITE_NAME(name)(space, offset, size, value)
265
266#define CPU_READOP_NAME(name)      cpu_readop_##name
267#define CPU_READOP(name)         int CPU_READOP_NAME(name)(UINT32 offset, int size, UINT64 *value)
268#define CPU_READOP_CALL(name)      CPU_READOP_NAME(name)(offset, size, value)
269
270#define CPU_DEBUG_INIT_NAME(name)    cpu_debug_init_##name
271#define CPU_DEBUG_INIT(name)      void CPU_DEBUG_INIT_NAME(name)(void)
272#define CPU_DEBUG_INIT_CALL(name)   CPU_DEBUG_INIT_NAME(name)()
273
274#define CPU_VALIDITY_CHECK_NAME(name)   cpu_validity_check_##name
275#define CPU_VALIDITY_CHECK(name)      int CPU_VALIDITY_CHECK_NAME(name)(const game_driver *driver, const void *config)
276#define CPU_VALIDITY_CHECK_CALL(name)   CPU_VALIDITY_CHECK_NAME(name)(driver, config)
277
278
279
280/***************************************************************************
210281    TYPE DEFINITIONS
211282***************************************************************************/
212283
r3535r3536
215286
216287
217288/* define the various callback functions */
289typedef int (*cpu_irq_callback)(const device_config *device, int irqnum);
290
218291typedef void (*cpu_get_info_func)(UINT32 state, cpuinfo *info);
219292typedef void (*cpu_set_info_func)(UINT32 state, cpuinfo *info);
220293typedef void (*cpu_get_context_func)(void *buffer);
221294typedef void (*cpu_set_context_func)(void *buffer);
222typedef void (*cpu_init_func)(int index, int clock, const void *config, int (*irqcallback)(int));
223typedef void (*cpu_reset_func)(void);
224typedef void (*cpu_exit_func)(void);
225typedef int   (*cpu_execute_func)(int cycles);
226typedef void (*cpu_burn_func)(int cycles);
295typedef void (*cpu_init_func)(const device_config *device, int index, int clock, const void *config, cpu_irq_callback irqcallback);
296typedef void (*cpu_reset_func)(const device_config *device);
297typedef void (*cpu_exit_func)(const device_config *device);
298typedef int   (*cpu_execute_func)(const device_config *device, int cycles);
299typedef void (*cpu_burn_func)(const device_config *device, int cycles);
227300typedef offs_t (*cpu_disassemble_func)(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
228301typedef int   (*cpu_translate_func)(int space, int intention, offs_t *address);
229302typedef int   (*cpu_read_func)(int space, UINT32 offset, int size, UINT64 *value);
230303typedef int   (*cpu_write_func)(int space, UINT32 offset, int size, UINT64 value);
231304typedef int   (*cpu_readop_func)(UINT32 offset, int size, UINT64 *value);
232typedef void (*cpu_setup_commands_func)(void);
305typedef void (*cpu_debug_init_func)(void);
233306typedef int (*cpu_validity_check_func)(const game_driver *driver, const void *config);
234307
235308
r3535r3536
254327   cpu_read_func         read;                  /* CPUINFO_PTR_READ */
255328   cpu_write_func         write;                  /* CPUINFO_PTR_WRITE */
256329   cpu_readop_func         readop;                  /* CPUINFO_PTR_READOP */
257   cpu_setup_commands_func   setup_commands;            /* CPUINFO_PTR_DEBUG_SETUP_COMMANDS */
330   cpu_debug_init_func      debug_init;               /* CPUINFO_PTR_DEBUG_INIT */
331   cpu_validity_check_func   validity_check;            /* CPUINFO_PTR_VALIDITY_CHECK */
258332   int *               icount;                  /* CPUINFO_PTR_INSTRUCTION_COUNTER */
259333   const addrmap8_token *   internal_map8;            /* CPUINFO_PTR_INTERNAL_MEMORY_MAP */
260334   const addrmap16_token *   internal_map16;            /* CPUINFO_PTR_INTERNAL_MEMORY_MAP */
261335   const addrmap32_token *   internal_map32;            /* CPUINFO_PTR_INTERNAL_MEMORY_MAP */
262336   const addrmap64_token *   internal_map64;            /* CPUINFO_PTR_INTERNAL_MEMORY_MAP */
263   cpu_validity_check_func   validity_check;            /* CPUINFO_PTR_VALIDITY_CHECK */
264337};
265338
266339
r3535r3536
283356   /* other info */
284357   size_t               context_size;
285358   INT8               address_shift;
286   int *               icount;
287359};
288360
289361
r3535r3536
296368void cpuintrf_init(running_machine *machine);
297369
298370/* set up the interface for one CPU of a given type */
299int   cpuintrf_init_cpu(int cpunum, cpu_type cputype, int clock, const void *config, int (*irqcallback)(int));
371int   cpuintrf_init_cpu(int cpunum, cpu_type cputype, int clock, const void *config, cpu_irq_callback irqcallback);
300372
301373/* clean up the interface for one CPU */
302374void cpuintrf_exit_cpu(int cpunum);
src/emu/cpuexec.h
r3535r3536
3939   SUSPEND_REASON_SPIN    = 0x0004,
4040   SUSPEND_REASON_TRIGGER    = 0x0008,
4141   SUSPEND_REASON_DISABLE    = 0x0010,
42   SUSPEND_REASON_TIMESLICE= 0x0020,
4243   SUSPEND_ANY_REASON       = ~0
4344};
4445
r3535r3536
311312/* ----- CPU scheduling----- */
312313
313314/* temporarily boosts the interleave factor */
314void cpu_boost_interleave(attotime timeslice_time, attotime boost_duration);
315void cpu_boost_interleave(running_machine *machine, attotime timeslice_time, attotime boost_duration);
315316
316317/* aborts the timeslice for the active CPU */
317318void activecpu_abort_timeslice(void);
src/emu/sound/aica.c
r3535r3536
11891189      AICA->udata.data[0x14/2] = addr1;
11901190      if (!(AFSEL(AICA)))
11911191      {
1192         UINT16 res;
1193
11921194         AICA->udata.data[0x10/2] |= slot->EG.state<<13;
1193         AICA->udata.data[0x10/2] |= 0x3FF - (slot->EG.volume>>EG_SHIFT);
1195
1196         res = 0x3FF - (slot->EG.volume>>EG_SHIFT);
1197
1198         res *= 959;
1199         res /= 1024;
1200
1201         if (res > 959) res = 959;
1202
1203         AICA->udata.data[0x10/2] = res;
11941204      }
11951205   }
11961206
src/emu/cpuint.c
r3535r3536
5454 *
5555 *************************************/
5656
57static int cpu_0_irq_callback(int line);
58static int cpu_1_irq_callback(int line);
59static int cpu_2_irq_callback(int line);
60static int cpu_3_irq_callback(int line);
61static int cpu_4_irq_callback(int line);
62static int cpu_5_irq_callback(int line);
63static int cpu_6_irq_callback(int line);
64static int cpu_7_irq_callback(int line);
57static int cpu_0_irq_callback(const device_config *device, int line);
58static int cpu_1_irq_callback(const device_config *device, int line);
59static int cpu_2_irq_callback(const device_config *device, int line);
60static int cpu_3_irq_callback(const device_config *device, int line);
61static int cpu_4_irq_callback(const device_config *device, int line);
62static int cpu_5_irq_callback(const device_config *device, int line);
63static int cpu_6_irq_callback(const device_config *device, int line);
64static int cpu_7_irq_callback(const device_config *device, int line);
6565
66int (*const cpu_irq_callbacks[MAX_CPU])(int) =
66cpu_irq_callback cpu_irq_callbacks[MAX_CPU] =
6767{
6868   cpu_0_irq_callback,
6969   cpu_1_irq_callback,
r3535r3536
399399 *
400400 *************************************/
401401
402INLINE int cpu_irq_callback(running_machine *machine, int cpunum, int line)
402INLINE int generic_irq_callback(running_machine *machine, int cpunum, int line)
403403{
404404   int vector = input_line_vector[cpunum][line];
405405
r3535r3536
424424   return vector;
425425}
426426
427static int cpu_0_irq_callback(int line) { return cpu_irq_callback(Machine, 0, line); }
428static int cpu_1_irq_callback(int line) { return cpu_irq_callback(Machine, 1, line); }
429static int cpu_2_irq_callback(int line) { return cpu_irq_callback(Machine, 2, line); }
430static int cpu_3_irq_callback(int line) { return cpu_irq_callback(Machine, 3, line); }
431static int cpu_4_irq_callback(int line) { return cpu_irq_callback(Machine, 4, line); }
432static int cpu_5_irq_callback(int line) { return cpu_irq_callback(Machine, 5, line); }
433static int cpu_6_irq_callback(int line) { return cpu_irq_callback(Machine, 6, line); }
434static int cpu_7_irq_callback(int line) { return cpu_irq_callback(Machine, 7, line); }
435
436
437
427static int cpu_0_irq_callback(const device_config *device, int line) { return generic_irq_callback(device->machine, 0, line); }
428static int cpu_1_irq_callback(const device_config *device, int line) { return generic_irq_callback(device->machine, 1, line); }
429static int cpu_2_irq_callback(const device_config *device, int line) { return generic_irq_callback(device->machine, 2, line); }
430static int cpu_3_irq_callback(const device_config *device, int line) { return generic_irq_callback(device->machine, 3, line); }
431static int cpu_4_irq_callback(const device_config *device, int line) { return generic_irq_callback(device->machine, 4, line); }
432static int cpu_5_irq_callback(const device_config *device, int line) { return generic_irq_callback(device->machine, 5, line); }
433static int cpu_6_irq_callback(const device_config *device, int line) { return generic_irq_callback(device->machine, 6, line); }
434static int cpu_7_irq_callback(const device_config *device, int line) { return generic_irq_callback(device->machine, 7, line); }
src/emu/cpuint.h
r3535r3536
3131
3232void cpuint_reset(void);
3333
34extern int (*const cpu_irq_callbacks[])(int);
3534
3635
37
3836/*************************************
3937 *
4038 *  CPU lines
src/emu/timer.c
r3535r3536
3030***************************************************************************/
3131
3232#define MAX_TIMERS      256
33#define MAX_QUANTA      16
3334
3435
3536
r3535r3536
7778};
7879
7980
81/*-------------------------------------------------
82    quantum_slot - a single minimum quantum
83    request
84-------------------------------------------------*/
85
86typedef struct _quantum_slot quantum_slot;
87struct _quantum_slot
88{
89   attoseconds_t         actual;         /* actual duration of the quantum */
90   attoseconds_t         requested;      /* duration of the requested quantum */
91   attotime            expire;         /* absolute expiration time of this quantum */
92};
93
94
95
8096/***************************************************************************
8197    GLOBAL VARIABLES
8298***************************************************************************/
r3535r3536
97113static int callback_timer_modified;
98114static attotime callback_timer_expire_time;
99115
116/* scheduling quanta */
117static quantum_slot quantum_list[MAX_QUANTA];
118static quantum_slot *quantum_current;
119static attoseconds_t quantum_minimum;
100120
101121
122
102123/***************************************************************************
103124    FUNCTION PROTOTYPES
104125***************************************************************************/
r3535r3536
292313      timers[i].next = &timers[i+1];
293314   timers[MAX_TIMERS-1].next = NULL;
294315   timer_free_tail = &timers[MAX_TIMERS-1];
316
317   /* reset the quanta */
318   memset(quantum_list, 0, sizeof(quantum_list));
319   quantum_list[0].requested = ATTOSECONDS_IN_MSEC(100);
320   quantum_list[0].actual = ATTOSECONDS_IN_MSEC(100);
321   quantum_list[0].expire = attotime_never;
322   quantum_current = &quantum_list[0];
323   quantum_minimum = ATTOSECONDS_IN_NSEC(1) / 1000;
295324}
296325
297326
r3535r3536
318347
319348attotime timer_next_fire_time(void)
320349{
321   return timer_head->expire;
350   attotime quantum_time;
351
352   /* if the current quantum has expired, find a new one */
353   if (attotime_compare(global_basetime, quantum_current->expire) >= 0)
354   {
355      int curr;
356
357      quantum_current->requested = 0;
358      quantum_current = &quantum_list[0];
359      for (curr = 1; curr < ARRAY_LENGTH(quantum_list); curr++)
360         if (quantum_list[curr].requested != 0 && quantum_list[curr].requested < quantum_current->requested)
361            quantum_current = &quantum_list[curr];
362   }
363   quantum_time = attotime_add_attoseconds(global_basetime, quantum_current->actual);
364   return attotime_min(quantum_time, timer_head->expire);
322365}
323366
324367
r3535r3536
384427}
385428
386429
430/*-------------------------------------------------
431    timer_add_scheduling_quantum - add a
432    scheduling quantum; the smallest active one
433    is the one that is in use
434-------------------------------------------------*/
387435
436void timer_add_scheduling_quantum(running_machine *machine, attoseconds_t quantum, attotime duration)
437{
438   attotime curtime = timer_get_time();
439   attotime expire = attotime_add(curtime, duration);
440   int curr, blank = -1;
441
442   /* a 0 request (minimum) needs to be non-zero to occupy a slot */
443   if (quantum == 0)
444      quantum = 1;
445
446   /* find an equal-duration slot or an empty slot */
447   for (curr = 1; curr < ARRAY_LENGTH(quantum_list); curr++)
448   {
449      quantum_slot *slot = &quantum_list[curr];
450
451      /* look for a matching quantum and extend it */
452      if (slot->requested == quantum)
453      {
454         slot->expire = attotime_max(slot->expire, expire);
455         return;
456      }
457
458      /* remember any empty slots in case of no match */
459      if (slot->requested == 0)
460      {
461         if (blank == -1)
462            blank = curr;
463      }
464
465      /* otherwise, expire any expired slots */
466      else if (attotime_compare(curtime, slot->expire) >= 0)
467         slot->requested = 0;
468   }
469
470   /* fatal error if no slots left */
471   assert_always(blank != -1, "Out of scheduling quantum slots!");
472
473   /* fill in the item */
474   quantum_list[blank].requested = quantum;
475   quantum_list[blank].actual = MAX(quantum_list[blank].requested, quantum_minimum);
476   quantum_list[blank].expire = expire;
477
478   /* update the minimum */
479   if (quantum < quantum_current->requested)
480      quantum_current = &quantum_list[blank];
481}
482
483
484/*-------------------------------------------------
485    timer_set_minimum_quantum - control the
486    minimum useful quantum (used by cpuexec only)
487-------------------------------------------------*/
488
489void timer_set_minimum_quantum(running_machine *machine, attoseconds_t quantum)
490{
491   int curr;
492
493   /* do nothing if nothing changed */
494   if (quantum_minimum == quantum)
495      return;
496   quantum_minimum = quantum;
497
498   /* adjust all the actuals; this doesn't affect the current */
499   for (curr = 0; curr < ARRAY_LENGTH(quantum_list); curr++)
500      if (quantum_list[curr].requested != 0)
501         quantum_list[curr].actual = MAX(quantum_list[curr].requested, quantum_minimum);
502}
503
504
505
388506/***************************************************************************
389507    SAVE/RESTORE HELPERS
390508***************************************************************************/
src/emu/mconfig.c
r3535r3536
1313#include "devintrf.h"
1414#include <ctype.h>
1515
16#if defined(_MSC_VER)
17#pragma optimize ("", off)
18#endif
1619
20
21
1722/***************************************************************************
1823    FUNCTION PROTOTYPES
1924***************************************************************************/
src/emu/timer.h
r3535r3536
3333};
3434
3535
36
3637/***************************************************************************
3738    MACROS
3839***************************************************************************/
r3535r3536
178179/* adjust the global time; this is also where we fire the timers */
179180void timer_set_global_time(running_machine *machine, attotime newbase);
180181
182/* add a scheduling quantum; the smallest active one is the one that is in use */
183void timer_add_scheduling_quantum(running_machine *machine, attoseconds_t quantum, attotime duration);
181184
185/* control the minimum useful quantum (used by cpuexec only) */
186void timer_set_minimum_quantum(running_machine *machine, attoseconds_t quantum);
182187
188
189
183190/* ----- save/restore helpers ----- */
184191
185192/* count the number of anonymous (non-saveable) timers */
src/emu/validity.c
r3535r3536
720720   /* loop over all the CPUs */
721721   for (cpunum = 0; cpunum < MAX_CPU; cpunum++)
722722   {
723      extern void dummy_get_info(UINT32 state, cpuinfo *info);
723      extern CPU_GET_INFO( dummy );
724724      const cpu_config *cpu = &config->cpu[cpunum];
725725      int spacenum, checknum;
726726
r3535r3536
750750      error |= validate_tag(driver, "CPU", cpu->tag);
751751
752752      /* checks to see if this driver is using a dummy CPU */
753      if (cputype_get_interface(cpu->type)->get_info == dummy_get_info)
753      if (cputype_get_interface(cpu->type)->get_info == CPU_GET_INFO_NAME(dummy))
754754      {
755755         mame_printf_error("%s: %s uses non-present CPU\n", driver->source_file, driver->name);
756756         error = TRUE;
src/emu/mconfig.h
r3535r3536
302302
303303#define MDRV_CPU_PROGRAM_MAP(_map1, _map2) \
304304   TOKEN_UINT32_PACK1(MCONFIG_TOKEN_CPU_PROGRAM_MAP, 8), \
305   TOKEN_PTR(voidptr, address_map_##_map1), \
306   TOKEN_PTR(voidptr, address_map_##_map2), \
305   TOKEN_PTR(voidptr, ADDRESS_MAP_NAME(_map1)), \
306   TOKEN_PTR(voidptr, ADDRESS_MAP_NAME(_map2)), \
307307
308308#define MDRV_CPU_DATA_MAP(_map1, _map2)   \
309309   TOKEN_UINT32_PACK1(MCONFIG_TOKEN_CPU_DATA_MAP, 8), \
310   TOKEN_PTR(voidptr, address_map_##_map1), \
311   TOKEN_PTR(voidptr, address_map_##_map2), \
310   TOKEN_PTR(voidptr, ADDRESS_MAP_NAME(_map1)), \
311   TOKEN_PTR(voidptr, ADDRESS_MAP_NAME(_map2)), \
312312
313313#define MDRV_CPU_IO_MAP(_map1, _map2) \
314314   TOKEN_UINT32_PACK1(MCONFIG_TOKEN_CPU_IO_MAP, 8), \
315   TOKEN_PTR(voidptr, address_map_##_map1), \
316   TOKEN_PTR(voidptr, address_map_##_map2), \
315   TOKEN_PTR(voidptr, ADDRESS_MAP_NAME(_map1)), \
316   TOKEN_PTR(voidptr, ADDRESS_MAP_NAME(_map2)), \
317317
318318#define MDRV_CPU_VBLANK_INT(_tag, _func) \
319319   TOKEN_UINT32_PACK1(MCONFIG_TOKEN_CPU_VBLANK_INT, 8), \
src/mess/video/atarist.c
r3535r3536
1010*/
1111
1212#include "driver.h"
13#include "cpu/m68000/m68k.h"
1413#include "cpu/m68000/m68000.h"
1514#include "machine/68901mfp.h"
1615#include "video/atarist.h"
src/mess/machine/amigacrt.c
r3535r3536
1313#include "driver.h"
1414#include "deprecat.h"
1515#include "amiga.h"
16#include "cpu/m68000/m68k.h"
16#include "cpu/m68000/m68000.h"
1717#include "machine/6526cia.h"
1818#include "machine/amigacrt.h"
1919
20
2120enum
2221{
2322   /* supported cartridges */
src/mess/machine/concept.c
r3535r3536
1010#include "machine/mm58274c.h"   /* mm58274 seems to be compatible with mm58174 */
1111//#include "machine/6551.h"
1212#include "machine/wd17xx.h"
13#include "cpu/m68000/m68k.h"
13#include "cpu/m68000/m68000.h"
1414#include "devices/basicdsk.h"
1515#include "includes/corvushd.h"
1616
src/mess/machine/lisa.c
r3535r3536
4141#include "machine/6522via.h"
4242#include "machine/applefdc.h"
4343#include "devices/sonydriv.h"
44#include "cpu/m68000/m68k.h"
44#include "cpu/m68000/m68000.h"
4545#include "sound/speaker.h"
4646
4747
src/mess/drivers/mk1.c
r3535r3536
144144INPUT_PORTS_END
145145
146146static MACHINE_RESET( mk1 ) {
147    f3853_reset();
148147}
149148
150149static TIMER_CALLBACK( mk1_update_leds ) {
src/mess/drivers/glasgow.c
r3535r3536
2323***************************************************************************/
2424
2525#include "driver.h"
26#include "cpu/m68000/m68k.h"
2726#include "cpu/m68000/m68000.h"
2827#include "glasgow.lh"
2928#include "sound/beep.h"
src/mess/drivers/atarist.c
r3535r3536
11#include "driver.h"
22#include "video/atarist.h"
3#include "cpu/m68000/m68k.h"
43#include "cpu/m68000/m68000.h"
54#include "cpu/m6800/m6800.h"
65#include "devices/basicdsk.h"
src/mess/drivers/saturn.c
r3535r3536
18931893static WRITE32_HANDLER( minit_w )
18941894{
18951895   logerror("cpu #%d (PC=%08X) MINIT write = %08x\n",cpu_getactivecpu(), activecpu_get_pc(),data);
1896   cpu_boost_interleave(minit_boost_timeslice, ATTOTIME_IN_USEC(minit_boost));
1896   cpu_boost_interleave(machine, minit_boost_timeslice, ATTOTIME_IN_USEC(minit_boost));
18971897   cpu_trigger(machine, 1000);
18981898   cpunum_set_info_int(1, CPUINFO_INT_SH2_FRT_INPUT, PULSE_LINE);
18991899}
r3535r3536
19011901static WRITE32_HANDLER( sinit_w )
19021902{
19031903   logerror("cpu #%d (PC=%08X) SINIT write = %08x\n",cpu_getactivecpu(), activecpu_get_pc(),data);
1904   cpu_boost_interleave(sinit_boost_timeslice, ATTOTIME_IN_USEC(sinit_boost));
1904   cpu_boost_interleave(machine, sinit_boost_timeslice, ATTOTIME_IN_USEC(sinit_boost));
19051905   cpunum_set_info_int(0, CPUINFO_INT_SH2_FRT_INPUT, PULSE_LINE);
19061906}
19071907
docs/messnew.txt
r3535r3536
5151
5252Source Changes:
5353----------------
54- The core is based on MAME 0.128u2.  This incorporates all features of the
54- The core is based on MAME 0.128u3.  This incorporates all features of the
5555  update to this core.  [MAME team]
5656
5757

Previous 15994 Revisions Next


© 1998-2018 The MESS Team