From c5a978bca7601f4dd2c4a0ebe397275021eb6cb1 Mon Sep 17 00:00:00 2001 From: MooglyGuy Date: Tue, 23 May 2023 07:41:27 +0200 Subject: Cleaned up logging across the codebase (GitHub #10183). (#11250) [Ryan Holtz] * Converted various logging patterns to use logmacro.h consistently. * Removed redefinitions of LOG_GENERAL. * Use LOGMASKED in more places. --- src/devices/bus/a2bus/a2echoii.cpp | 6 +- src/devices/bus/a2bus/a2sd.cpp | 3 +- src/devices/bus/amiga/keyboard/a2000.cpp | 1 - src/devices/bus/amiga/zorro/a2232.cpp | 1 - src/devices/bus/apricot/expansion/winchester.cpp | 5 +- src/devices/bus/coco/coco_fdc.cpp | 1 - src/devices/bus/coco/coco_multi.cpp | 1 - src/devices/bus/coco/coco_ssc.cpp | 4 +- src/devices/bus/coco/coco_t4426.cpp | 7 +- src/devices/bus/coco/cococart.cpp | 1 - src/devices/bus/coco/dragon_fdc.cpp | 51 +- src/devices/bus/gio64/newport.cpp | 16 +- src/devices/bus/hexbus/hexbus.cpp | 6 +- src/devices/bus/hexbus/hx5102.cpp | 24 +- src/devices/bus/hexbus/tp0370.cpp | 14 +- src/devices/bus/ieee488/c8050fdc.cpp | 45 +- src/devices/bus/interpro/keyboard/lle.cpp | 1 - src/devices/bus/interpro/sr/edge.cpp | 1 - src/devices/bus/interpro/sr/gt.cpp | 1 - src/devices/bus/isa/3c505.cpp | 1 - src/devices/bus/isa/myb3k_fdc.cpp | 1 - src/devices/bus/isa/opus100pm.cpp | 1 - src/devices/bus/isa/p1_hdc.cpp | 3 +- src/devices/bus/isa/pgc.cpp | 1 - src/devices/bus/lpci/cirrus.cpp | 9 +- src/devices/bus/lpci/i82371ab.cpp | 8 +- src/devices/bus/lpci/mpc105.cpp | 9 +- src/devices/bus/lpci/pci.cpp | 15 +- src/devices/bus/mackbd/keyboard.cpp | 1 - src/devices/bus/nes/2a03pur.cpp | 11 +- src/devices/bus/nes/act53.cpp | 11 +- src/devices/bus/nes/aladdin.cpp | 11 +- src/devices/bus/nes/ave.cpp | 13 +- src/devices/bus/nes/bandai.cpp | 33 +- src/devices/bus/nes/batlab.cpp | 21 +- src/devices/bus/nes/benshieng.cpp | 9 +- src/devices/bus/nes/bootleg.cpp | 139 +++-- src/devices/bus/nes/camerica.cpp | 13 +- src/devices/bus/nes/cne.cpp | 15 +- src/devices/bus/nes/cony.cpp | 19 +- src/devices/bus/nes/datach.cpp | 18 +- src/devices/bus/nes/discrete.cpp | 15 +- src/devices/bus/nes/disksys.cpp | 19 +- src/devices/bus/nes/event.cpp | 16 +- src/devices/bus/nes/ggenie.cpp | 22 +- src/devices/bus/nes/henggedianzi.cpp | 17 +- src/devices/bus/nes/hes.cpp | 9 +- src/devices/bus/nes/irem.cpp | 17 +- src/devices/bus/nes/jaleco.cpp | 24 +- src/devices/bus/nes/jncota.cpp | 9 +- src/devices/bus/nes/jy.cpp | 15 +- src/devices/bus/nes/kaiser.cpp | 74 +-- src/devices/bus/nes/karastudio.cpp | 2 +- src/devices/bus/nes/konami.cpp | 33 +- src/devices/bus/nes/legacy.cpp | 21 +- src/devices/bus/nes/mmc1.cpp | 21 +- src/devices/bus/nes/mmc1_clones.cpp | 27 +- src/devices/bus/nes/mmc2.cpp | 25 +- src/devices/bus/nes/mmc3.cpp | 30 +- src/devices/bus/nes/mmc3_clones.cpp | 170 +++--- src/devices/bus/nes/mmc5.cpp | 42 +- src/devices/bus/nes/multigame.cpp | 207 +++---- src/devices/bus/nes/namcot.cpp | 33 +- src/devices/bus/nes/nanjing.cpp | 13 +- src/devices/bus/nes/ntdec.cpp | 13 +- src/devices/bus/nes/nxrom.cpp | 47 +- src/devices/bus/nes/pirate.cpp | 57 +- src/devices/bus/nes/pt554.cpp | 9 +- src/devices/bus/nes/racermate.cpp | 11 +- src/devices/bus/nes/rcm.cpp | 18 +- src/devices/bus/nes/rexsoft.cpp | 13 +- src/devices/bus/nes/sachen.cpp | 50 +- src/devices/bus/nes/sealie.cpp | 15 +- src/devices/bus/nes/somari.cpp | 11 +- src/devices/bus/nes/subor.cpp | 15 +- src/devices/bus/nes/sunsoft.cpp | 30 +- src/devices/bus/nes/sunsoft_dcs.cpp | 15 +- src/devices/bus/nes/taito.cpp | 23 +- src/devices/bus/nes/tengen.cpp | 13 +- src/devices/bus/nes/txc.cpp | 33 +- src/devices/bus/nes/vrc_clones.cpp | 49 +- src/devices/bus/nes/waixing.cpp | 70 +-- src/devices/bus/nes/zemina.cpp | 9 +- src/devices/bus/nscsi/hd.cpp | 5 +- src/devices/bus/nscsi/s1410.cpp | 1 - src/devices/bus/pc_kbd/ec1841.cpp | 5 +- src/devices/bus/pc_kbd/hle_mouse.cpp | 1 - src/devices/bus/pc_kbd/iskr1030.cpp | 5 +- src/devices/bus/pc_kbd/pcat101.cpp | 1 - src/devices/bus/qbus/pc11.cpp | 3 +- src/devices/bus/rs232/xvd701.cpp | 2 +- src/devices/bus/rtpc/kbd.cpp | 1 - src/devices/bus/rtpc/kbd_con.cpp | 2 - src/devices/bus/sunmouse/hlemouse.cpp | 1 - src/devices/bus/ti8x/ti8x.cpp | 5 +- src/devices/bus/ti99/colorbus/busmouse.cpp | 8 +- src/devices/bus/ti99/gromport/cartridges.cpp | 22 +- src/devices/bus/ti99/gromport/gkracker.cpp | 8 +- src/devices/bus/ti99/gromport/gromport.cpp | 8 +- src/devices/bus/ti99/gromport/multiconn.cpp | 6 +- src/devices/bus/ti99/internal/992board.cpp | 14 +- src/devices/bus/ti99/internal/998board.cpp | 36 +- src/devices/bus/ti99/internal/datamux.cpp | 12 +- src/devices/bus/ti99/internal/genboard.cpp | 34 +- src/devices/bus/ti99/internal/genkbd.cpp | 8 +- src/devices/bus/ti99/joyport/handset.cpp | 10 +- src/devices/bus/ti99/peb/bwg.cpp | 22 +- src/devices/bus/ti99/peb/cc_fdc.cpp | 24 +- src/devices/bus/ti99/peb/evpc.cpp | 10 +- src/devices/bus/ti99/peb/forti.cpp | 4 +- src/devices/bus/ti99/peb/hfdc.cpp | 26 +- src/devices/bus/ti99/peb/horizon.cpp | 20 +- src/devices/bus/ti99/peb/hsgpl.cpp | 24 +- src/devices/bus/ti99/peb/memex.cpp | 12 +- src/devices/bus/ti99/peb/myarcfdc.cpp | 22 +- src/devices/bus/ti99/peb/pcode.cpp | 16 +- src/devices/bus/ti99/peb/peribox.cpp | 10 +- src/devices/bus/ti99/peb/pgram.cpp | 20 +- src/devices/bus/ti99/peb/scsicard.cpp | 20 +- src/devices/bus/ti99/peb/sidmaster.cpp | 6 +- src/devices/bus/ti99/peb/spchsyn.cpp | 12 +- src/devices/bus/ti99/peb/ti_fdc.cpp | 26 +- src/devices/bus/ti99/peb/ti_rs232.cpp | 22 +- src/devices/bus/ti99/peb/tipi.cpp | 20 +- src/devices/bus/ti99/peb/tn_ide.cpp | 18 +- src/devices/bus/ti99/peb/tn_usbsm.cpp | 4 +- src/devices/bus/vme/vme.cpp | 4 +- src/devices/bus/vme/vme_cp31.cpp | 8 +- src/devices/bus/vme/vme_fccpu20.cpp | 8 +- src/devices/bus/vme/vme_fcisio.cpp | 8 +- src/devices/bus/vme/vme_fcscsi.cpp | 17 +- src/devices/bus/vme/vme_hcpu30.cpp | 8 +- src/devices/bus/vme/vme_mvme120.cpp | 11 +- src/devices/bus/vme/vme_mvme350.cpp | 18 +- src/devices/bus/vme/vme_mzr8105.cpp | 18 +- src/devices/bus/vme/vme_mzr8300.cpp | 18 +- src/devices/bus/vtech/memexp/sdloader.cpp | 1 - src/devices/cpu/alpha/alpha.cpp | 1 - src/devices/cpu/arm7/arm7.cpp | 18 +- src/devices/cpu/arm7/arm7ops.cpp | 2 +- src/devices/cpu/avr8/avr8.cpp | 54 +- src/devices/cpu/axc51/axc51.cpp | 8 +- src/devices/cpu/clipper/clipper.cpp | 1 - src/devices/cpu/cop400/cop400.cpp | 8 +- src/devices/cpu/diablo/diablo1300.cpp | 4 +- src/devices/cpu/dsp16/dsp16.cpp | 1 - src/devices/cpu/dsp56000/dsp56000.cpp | 2 - src/devices/cpu/dsp56156/dsp56mem.cpp | 6 +- src/devices/cpu/es5510/es5510.cpp | 146 ++--- src/devices/cpu/i386/i386.cpp | 22 +- src/devices/cpu/jaguar/jaguar.cpp | 4 - src/devices/cpu/m37710/m37710.cpp | 33 +- src/devices/cpu/m6800/m6801.cpp | 1 - src/devices/cpu/m6805/m68705.cpp | 9 +- src/devices/cpu/m6805/m68hc05.cpp | 9 +- src/devices/cpu/m6809/m6809.cpp | 7 +- src/devices/cpu/m88000/m88000.cpp | 1 - src/devices/cpu/mips/mips1.cpp | 1 - src/devices/cpu/mips/r4000.cpp | 4 +- src/devices/cpu/pdp1/pdp1.cpp | 80 +-- src/devices/cpu/psx/dma.cpp | 3 +- src/devices/cpu/psx/sio.cpp | 1 - src/devices/cpu/romp/romp.cpp | 1 - src/devices/cpu/st62xx/st62xx.cpp | 6 +- src/devices/cpu/tms34010/tms34010.cpp | 1 - src/devices/cpu/tms9900/tms9900.cpp | 42 +- src/devices/cpu/tms9900/tms9980a.cpp | 10 +- src/devices/cpu/tms9900/tms9995.cpp | 44 +- src/devices/imagedev/cassette.cpp | 6 +- src/devices/imagedev/mfmhd.cpp | 24 +- src/devices/machine/6522via.cpp | 8 +- src/devices/machine/68153bim.cpp | 10 +- src/devices/machine/68340ser.cpp | 10 +- src/devices/machine/68340sim.cpp | 20 +- src/devices/machine/68340tmu.cpp | 12 +- src/devices/machine/6840ptm.cpp | 12 +- src/devices/machine/68561mpcc.cpp | 24 +- src/devices/machine/8042kbdc.cpp | 15 +- src/devices/machine/8530scc.cpp | 19 +- src/devices/machine/acorn_bmu.cpp | 4 +- src/devices/machine/aic6250.cpp | 1 - src/devices/machine/am2910.cpp | 6 +- src/devices/machine/am79c90.cpp | 1 - src/devices/machine/am9513.cpp | 23 +- src/devices/machine/am9516.cpp | 1 - src/devices/machine/am9519.cpp | 2 - src/devices/machine/at.cpp | 9 +- src/devices/machine/at29x.cpp | 18 +- src/devices/machine/at45dbxx.cpp | 29 +- src/devices/machine/at_keybc.cpp | 1 - src/devices/machine/bq4847.cpp | 12 +- src/devices/machine/bq48x2.cpp | 12 +- src/devices/machine/busmouse.cpp | 2 - src/devices/machine/cammu.cpp | 1 - src/devices/machine/com8116.cpp | 4 +- src/devices/machine/cs4031.cpp | 1 - src/devices/machine/cs8221.cpp | 1 - src/devices/machine/cxd1185.cpp | 3 +- src/devices/machine/dc7085.cpp | 1 - src/devices/machine/dimm_spd.cpp | 11 +- src/devices/machine/dp83932c.cpp | 1 - src/devices/machine/dp8573.cpp | 7 +- src/devices/machine/edlc.cpp | 1 - src/devices/machine/fga002.cpp | 13 +- src/devices/machine/gayle.cpp | 3 +- src/devices/machine/gen_latch.cpp | 2 +- src/devices/machine/generic_spi_flash.cpp | 2 +- src/devices/machine/gt64xxx.cpp | 1 - src/devices/machine/hdc92x4.cpp | 64 +- src/devices/machine/i7220.cpp | 5 +- src/devices/machine/i8155.cpp | 4 +- src/devices/machine/i82357.cpp | 2 - src/devices/machine/i8257.cpp | 1 - src/devices/machine/i82586.cpp | 1 - src/devices/machine/ibm21s850.cpp | 6 +- src/devices/machine/ie15.cpp | 1 - src/devices/machine/ins8154.cpp | 2 +- src/devices/machine/laserdsc.cpp | 10 +- src/devices/machine/ldpr8210.cpp | 91 ++- src/devices/machine/ldv1000.cpp | 41 +- src/devices/machine/ldvp931.cpp | 21 +- src/devices/machine/locomo.cpp | 6 +- src/devices/machine/mc14411.cpp | 4 +- src/devices/machine/mc6854.cpp | 6 +- src/devices/machine/mc68901.cpp | 1 - src/devices/machine/mc88200.cpp | 2 - src/devices/machine/mcf5206e.cpp | 8 +- src/devices/machine/mos6530n.cpp | 1 - src/devices/machine/mpc106.cpp | 1 - src/devices/machine/msm6242.cpp | 1 - src/devices/machine/mv6436x.cpp | 1 - src/devices/machine/ncr5380.cpp | 1 - src/devices/machine/ncr53c90.cpp | 1 - src/devices/machine/netlist.cpp | 1 - src/devices/machine/ns32081.cpp | 1 - src/devices/machine/ns32082.cpp | 1 - src/devices/machine/ns32202.cpp | 1 - src/devices/machine/ns32382.cpp | 1 - src/devices/machine/nscsi_bus.cpp | 1 - src/devices/machine/opti82c861.cpp | 3 +- src/devices/machine/pc_fdc.cpp | 2 - src/devices/machine/pccard_sram.cpp | 1 - src/devices/machine/pcf8573.cpp | 4 +- src/devices/machine/pcf8583.cpp | 4 +- src/devices/machine/pcf8593.cpp | 27 +- src/devices/machine/pckeybrd.cpp | 15 +- src/devices/machine/pic8259.cpp | 1 - src/devices/machine/pxa255.cpp | 22 +- src/devices/machine/sa1110.cpp | 38 +- src/devices/machine/sa1111.cpp | 26 +- src/devices/machine/saa7191.cpp | 10 +- src/devices/machine/scc2698b.cpp | 1 - src/devices/machine/scc68070.cpp | 18 +- src/devices/machine/scnxx562.cpp | 1 - src/devices/machine/scoop.cpp | 6 +- src/devices/machine/sdlc.cpp | 1 - src/devices/machine/smc91c9x.cpp | 1 - src/devices/machine/smpc.cpp | 10 +- src/devices/machine/spg2xx_audio.cpp | 18 +- src/devices/machine/spg2xx_sysdma.cpp | 2 +- src/devices/machine/spg2xx_video.cpp | 12 +- src/devices/machine/spi_sdcard.cpp | 5 +- src/devices/machine/spifi3.cpp | 11 +- src/devices/machine/stvcd.cpp | 8 +- src/devices/machine/sun4c_mmu.cpp | 38 +- src/devices/machine/timekpr.cpp | 5 +- src/devices/machine/tmc0430.cpp | 12 +- src/devices/machine/tms9901.cpp | 1 - src/devices/machine/tms9902.cpp | 2 - src/devices/machine/tsb12lv01a.cpp | 8 +- src/devices/machine/ucb1200.cpp | 6 +- src/devices/machine/upc82c710.cpp | 10 +- src/devices/machine/upc82c711.cpp | 10 +- src/devices/machine/vrc4373.cpp | 1 - src/devices/machine/vrc5074.cpp | 147 +++-- src/devices/machine/vt8231_isa.cpp | 1 - src/devices/machine/wd1010.cpp | 11 +- src/devices/machine/wd33c9x.cpp | 16 +- src/devices/machine/wd_fdc.cpp | 1 - src/devices/machine/wtl3132.cpp | 1 - src/devices/machine/z8038.cpp | 1 - src/devices/machine/z80dma.cpp | 1 - src/devices/machine/z80scc.cpp | 19 +- src/devices/machine/z80sio.cpp | 25 +- src/devices/sound/ay8910.cpp | 34 +- src/devices/sound/cem3394.cpp | 28 +- src/devices/sound/es1373.cpp | 96 +-- src/devices/sound/es1373.h | 4 - src/devices/sound/gaelco.cpp | 18 +- src/devices/sound/mas3507d.cpp | 11 +- src/devices/sound/qsound.cpp | 1 - src/devices/sound/sn76477.cpp | 69 ++- src/devices/sound/sp0256.cpp | 1 - src/devices/sound/tms5220.cpp | 54 +- src/devices/sound/uda1344.cpp | 10 +- src/devices/sound/x1_010.cpp | 24 +- src/devices/video/315_5124.cpp | 7 +- src/devices/video/atirage.cpp | 2 +- src/devices/video/bt431.cpp | 2 - src/devices/video/bt45x.cpp | 4 +- src/devices/video/bt47x.cpp | 1 - src/devices/video/clgd542x.cpp | 18 +- src/devices/video/decsfb.cpp | 1 - src/devices/video/epic12.cpp | 2 +- src/devices/video/fixfreq.cpp | 4 +- src/devices/video/hd66421.cpp | 18 +- src/devices/video/ims_cvc.cpp | 1 - src/devices/video/mc6847.cpp | 27 +- src/devices/video/pc_vga.cpp | 280 ++++----- src/devices/video/saa5240.cpp | 4 +- src/devices/video/scn2674.cpp | 8 +- src/devices/video/sda5708.cpp | 10 +- src/devices/video/sed1356.cpp | 28 +- src/devices/video/sed1375.cpp | 14 +- src/devices/video/v9938.cpp | 18 +- src/frontend/mame/ui/icorender.cpp | 4 +- src/lib/formats/ti99_dsk.cpp | 14 +- src/mame/acorn/aa310.cpp | 2 +- src/mame/alba/albazg.cpp | 2 +- src/mame/amiga/amiga_m.cpp | 67 +-- src/mame/amiga/amiga_v.cpp | 22 +- src/mame/amiga/amigaaga.cpp | 24 +- src/mame/amiga/upscope.cpp | 23 +- src/mame/amstrad/nc.cpp | 1 - src/mame/amstrad/pcw.cpp | 18 +- src/mame/amstrad/pcw_v.cpp | 4 +- src/mame/apple/apple3_m.cpp | 12 +- src/mame/apple/awacs_macrisc.cpp | 7 +- src/mame/apple/bandit.cpp | 2 - src/mame/apple/burgundy.cpp | 7 +- src/mame/apple/dbdma.cpp | 14 +- src/mame/apple/heathrow.cpp | 1 - src/mame/apple/lwriter.cpp | 1 - src/mame/apple/macrtc.cpp | 5 +- src/mame/apple/v8.cpp | 2 +- src/mame/atari/atarigt.cpp | 69 ++- src/mame/atari/cops.cpp | 57 +- src/mame/atari/jagblit.ipp | 57 +- src/mame/atari/jagobj.ipp | 56 +- src/mame/atari/jaguar.h | 6 +- src/mame/atari/jaguar_v.cpp | 26 +- src/mame/atari/mhavoc.cpp | 4 +- src/mame/atari/offtwall.cpp | 4 +- src/mame/atari/rampart.cpp | 2 +- src/mame/atari/skullxbo.cpp | 2 +- src/mame/barcrest/mpu3.cpp | 31 +- src/mame/barcrest/mpu4.cpp | 64 +- src/mame/barcrest/mpu4.h | 15 - src/mame/barcrest/mpu4vid.cpp | 6 +- src/mame/be/bebox_m.cpp | 62 +- src/mame/bfm/bfm_adr2.cpp | 6 +- src/mame/bfm/bfm_sc2.cpp | 70 +-- src/mame/capcom/blktiger.cpp | 2 +- src/mame/capcom/supduck.cpp | 2 +- src/mame/cybiko/cybiko_m.cpp | 32 +- src/mame/dai/dai_m.cpp | 31 +- src/mame/dai/dai_v.cpp | 8 +- src/mame/dataeast/chanbara.cpp | 2 +- src/mame/dataeast/sshangha.cpp | 2 +- src/mame/dataeast/tryout.cpp | 2 +- src/mame/dec/decioga.cpp | 4 +- src/mame/dec/pdp1.cpp | 97 ++-- src/mame/dg/aviion88k.cpp | 2 - src/mame/dooyong/gundealr.cpp | 2 +- src/mame/dynax/hnayayoi.cpp | 4 +- src/mame/efo/cedar_magnet.cpp | 69 +-- src/mame/ensoniq/enmirage.cpp | 4 +- src/mame/ericsson/eispc_kb.cpp | 10 +- src/mame/excellent/witch.cpp | 2 +- src/mame/exidy/victory_v.cpp | 70 +-- src/mame/force/fccpu20.cpp | 3 +- src/mame/force/fccpu30.cpp | 9 +- src/mame/force/force68k.cpp | 4 +- src/mame/force/miniforce.cpp | 17 +- src/mame/fujitsu/fmtowns.cpp | 102 ++-- src/mame/fujitsu/fmtowns_v.cpp | 68 ++- src/mame/funtech/supracan.cpp | 42 +- src/mame/funworld/supercrd.cpp | 2 +- src/mame/gamepark/gp32.cpp | 5 +- src/mame/gameplan/enigma2.cpp | 11 +- src/mame/gridcomp/gridcomp.cpp | 5 +- src/mame/hp/hp48_m.cpp | 91 ++- src/mame/hp/hp95lx.cpp | 5 +- src/mame/hp/jornada.cpp | 2 +- src/mame/ibm/ibm6580.cpp | 5 +- src/mame/ibm/ibm6580_fdc.cpp | 3 +- src/mame/ibm/ibm6580_kbd.cpp | 3 +- src/mame/ibm/rosetta.cpp | 1 - src/mame/ibm/rtpc.cpp | 1 - src/mame/ibm/rtpc_iocc.cpp | 1 - src/mame/igs/igs011.cpp | 13 +- src/mame/igs/pgm.cpp | 2 +- src/mame/igs/pgmprot_igs027a_type1.cpp | 2 +- src/mame/igs/pgmprot_igs027a_type2.cpp | 2 +- src/mame/igs/pgmprot_igs027a_type3.cpp | 2 +- src/mame/intergraph/interpro_ioga.cpp | 1 - src/mame/itech/capbowl.cpp | 2 +- src/mame/itech/iteagle_fpga.cpp | 153 ++--- src/mame/jaleco/bigstrkb.cpp | 2 +- src/mame/kaypro/kay_kbd.cpp | 1 - src/mame/konami/ajax.cpp | 2 +- src/mame/konami/cobra.cpp | 65 +-- src/mame/konami/divebomb.cpp | 2 +- src/mame/konami/gyruss.cpp | 2 +- src/mame/konami/hexion.cpp | 6 +- src/mame/konami/ironhors.cpp | 2 +- src/mame/konami/jackal.cpp | 2 +- src/mame/konami/k001005.cpp | 3 - src/mame/konami/k057714.cpp | 9 +- src/mame/konami/k573dio.cpp | 7 +- src/mame/konami/k573fpga.cpp | 1 - src/mame/konami/ksys573.cpp | 11 +- src/mame/konami/mainevt.cpp | 2 +- src/mame/konami/plygonet.cpp | 8 +- src/mame/konami/rollerg.cpp | 2 +- src/mame/konami/ultraman.cpp | 2 +- src/mame/konami/xmen.cpp | 6 +- src/mame/luxor/abc1600mac.cpp | 53 +- src/mame/makerbot/replicator.cpp | 26 +- src/mame/mc/mc68000.cpp | 1 - src/mame/midway/atlantis.cpp | 67 +-- src/mame/midway/midvunit_v.cpp | 20 +- src/mame/midway/midwunit_m.cpp | 8 +- src/mame/midway/midxunit_m.cpp | 8 +- src/mame/midway/midzeus.cpp | 8 +- src/mame/midway/seattle.cpp | 19 +- src/mame/midway/sente6vb.cpp | 17 +- src/mame/midway/vegas.cpp | 159 +++-- src/mame/mips/mips.cpp | 1 - src/mame/mips/mips_rambo.cpp | 1 - src/mame/misc/amaticmg.cpp | 2 +- src/mame/misc/blitz68k.cpp | 4 +- src/mame/misc/discoboy.cpp | 2 +- src/mame/misc/fireball.cpp | 301 +++++----- src/mame/misc/gameace.cpp | 6 +- src/mame/misc/hapyfish.cpp | 8 +- src/mame/misc/istellar.cpp | 2 +- src/mame/misc/mgavegas.cpp | 710 +++++++++++------------ src/mame/misc/monon_color.cpp | 2 +- src/mame/misc/mosaic.cpp | 2 +- src/mame/misc/quizpun2.cpp | 4 +- src/mame/misc/ssingles.cpp | 2 +- src/mame/misc/truco.cpp | 2 +- src/mame/misc/xyonix.cpp | 2 +- src/mame/motorola/mvme147.cpp | 17 +- src/mame/motorola/mvme162.cpp | 8 +- src/mame/mr/dribling.cpp | 6 +- src/mame/namco/galaga_v.cpp | 2 +- src/mame/namco/namcond1.cpp | 2 +- src/mame/ncd/ncd68k.cpp | 1 - src/mame/nec/ews4800.cpp | 2 - src/mame/nec/pc88va_sgp.cpp | 2 +- src/mame/nec/pc88va_v.cpp | 12 +- src/mame/nec/pce_cd.cpp | 12 +- src/mame/neogeo/neogeo.cpp | 22 +- src/mame/nintendo/mmagic.cpp | 14 +- src/mame/nintendo/nes_sh6578.cpp | 4 +- src/mame/nintendo/vt1682.cpp | 2 +- src/mame/nintendo/vt1682_alu.cpp | 4 +- src/mame/nintendo/vt1682_io.cpp | 6 +- src/mame/nintendo/vt1682_timer.cpp | 6 +- src/mame/nintendo/vt1682_uio.cpp | 4 +- src/mame/nokia/dbox.cpp | 8 +- src/mame/nokia/nokia_3310.cpp | 48 +- src/mame/pc/ec184x.cpp | 5 +- src/mame/pc/mc1502.cpp | 5 +- src/mame/pc/poisk1.cpp | 5 +- src/mame/pc/tosh1000.cpp | 5 +- src/mame/philips/cdi.cpp | 10 +- src/mame/philips/cdicdic.cpp | 18 +- src/mame/philips/cdislavehle.cpp | 10 +- src/mame/pinball/wpc.cpp | 14 +- src/mame/pinball/wpc_an.cpp | 9 +- src/mame/playmark/sderby.cpp | 4 +- src/mame/psion/etna.cpp | 8 +- src/mame/psion/psion5.cpp | 56 +- src/mame/quantel/dpb7000.cpp | 56 +- src/mame/rm/rmnimbus_m.cpp | 78 +-- src/mame/robotron/rt1715.cpp | 2 +- src/mame/sega/chihiro.cpp | 50 +- src/mame/sega/kopunch.cpp | 2 +- src/mame/sega/model1_v.cpp | 111 ++-- src/mame/sega/saturn_m.cpp | 6 - src/mame/sega/saturn_v.cpp | 83 +-- src/mame/sega/segac2.cpp | 16 +- src/mame/sega/segahang.cpp | 2 +- src/mame/sega/segaic16_m.cpp | 17 +- src/mame/sega/sms.h | 4 - src/mame/sega/suprloco.cpp | 2 +- src/mame/seibu/seibucop.cpp | 31 +- src/mame/seibu/seibucop_cmd.ipp | 28 +- src/mame/sgi/4dpi.cpp | 2 - src/mame/sgi/crime.cpp | 6 +- src/mame/sgi/crimson.cpp | 2 +- src/mame/sgi/hal2.cpp | 6 +- src/mame/sgi/hpc1.cpp | 24 +- src/mame/sgi/hpc3.cpp | 16 +- src/mame/sgi/indigo.cpp | 6 +- src/mame/sgi/ioc2.cpp | 24 +- src/mame/sgi/iris3130.cpp | 6 +- src/mame/sgi/iris_power.cpp | 2 +- src/mame/sgi/light.cpp | 2 +- src/mame/sgi/mace.cpp | 50 +- src/mame/sgi/octane.cpp | 2 +- src/mame/sgi/sgi.cpp | 18 +- src/mame/sgi/sgi_ge5.cpp | 1 - src/mame/sgi/sgi_gr1.cpp | 1 - src/mame/sgi/sgi_re2.cpp | 1 - src/mame/sgi/sgi_xmap2.cpp | 2 - src/mame/sgi/vino.cpp | 24 +- src/mame/shared/cage.cpp | 37 +- src/mame/shared/dcs.cpp | 168 +++--- src/mame/shared/megacdcd.cpp | 2 +- src/mame/shared/ms7004.cpp | 3 +- src/mame/shared/xbox_nv2a.cpp | 109 ++-- src/mame/shared/xbox_pci.cpp | 22 +- src/mame/shared/xbox_usb.cpp | 31 +- src/mame/sharp/pc1251.cpp | 2 +- src/mame/sharp/pc1350.cpp | 2 +- src/mame/sharp/pc1403_m.cpp | 2 +- src/mame/sharp/x68k.cpp | 6 +- src/mame/sigma/r2dtank.cpp | 17 +- src/mame/skeleton/alfaskop_s41_kb.cpp | 16 +- src/mame/skeleton/bitgraph.cpp | 5 +- src/mame/skeleton/blit.cpp | 5 +- src/mame/skeleton/candela.cpp | 17 +- src/mame/skeleton/didact.cpp | 8 +- src/mame/skeleton/e100.cpp | 13 +- src/mame/skeleton/eurocom2.cpp | 5 +- src/mame/skeleton/hprot1.cpp | 14 +- src/mame/skeleton/miuchiz.cpp | 3 - src/mame/skeleton/terco.cpp | 6 +- src/mame/skeleton/ti630.cpp | 17 +- src/mame/skeleton/tsispch.cpp | 16 +- src/mame/snk/hng64.cpp | 1 - src/mame/sony/cxd8452aq.cpp | 2 +- src/mame/sony/dmac3.cpp | 7 +- src/mame/sony/dmac_0266.cpp | 1 - src/mame/sony/news_r4k.cpp | 8 +- src/mame/sony/pockstat.cpp | 18 +- src/mame/sony/psxcd.cpp | 6 +- src/mame/sony/pve500.cpp | 26 +- src/mame/suna/goindol.cpp | 2 +- src/mame/svision/svis_snd.cpp | 4 +- src/mame/svision/svision.cpp | 2 +- src/mame/taito/arkanoid_m.cpp | 43 +- src/mame/taito/chaknpop.cpp | 4 +- src/mame/taito/crbaloon.cpp | 17 +- src/mame/taito/galastrm.cpp | 2 +- src/mame/taito/gunbustr.cpp | 2 +- src/mame/taito/rollrace.cpp | 2 +- src/mame/taito/taitopjc.cpp | 44 +- src/mame/taito/taitotz.cpp | 28 +- src/mame/taito/warriorb.cpp | 2 +- src/mame/tecfri/speedbal.cpp | 2 +- src/mame/technos/dogfgt.cpp | 4 +- src/mame/technos/vball.cpp | 2 +- src/mame/tecmo/spbactn.cpp | 2 +- src/mame/thomson/thomson_m.cpp | 284 ++++----- src/mame/ti/geneve.cpp | 18 +- src/mame/ti/ti99_2.cpp | 6 +- src/mame/ti/ti99_4p.cpp | 14 +- src/mame/ti/ti99_4x.cpp | 14 +- src/mame/ti/ti99_8.cpp | 14 +- src/mame/toaplan/twincobr_m.cpp | 27 +- src/mame/trs/6883sam.cpp | 12 +- src/mame/trs/coco.cpp | 8 - src/mame/trs/dgn_beta_m.cpp | 85 +-- src/mame/ultratec/minicom.cpp | 44 +- src/mame/unisys/univac.cpp | 1 - src/mame/ussr/dvk_kcgd.cpp | 5 +- src/mame/ussr/dvk_ksm.cpp | 5 +- src/mame/ussr/km035.cpp | 3 +- src/mame/ussr/mk98.cpp | 4 +- src/mame/ussr/ms0515.cpp | 5 +- src/mame/valadon/tankbust.cpp | 6 +- src/mame/votrax/votrhv.cpp | 8 +- src/mame/vtech/iqunlim.cpp | 8 +- src/mame/vtech/vtech1.cpp | 10 +- src/mame/wing/pinkiri8.cpp | 17 +- src/mame/wing/superwng.cpp | 2 +- src/mame/yamaha/ymdx7.cpp | 9 +- src/mame/yunsung/paradise.cpp | 4 +- 583 files changed, 4922 insertions(+), 5786 deletions(-) diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp index 604dc7ae1c6..5b28c77a511 100644 --- a/src/devices/bus/a2bus/a2echoii.cpp +++ b/src/devices/bus/a2bus/a2echoii.cpp @@ -27,9 +27,9 @@ #include "sound/tms5220.h" #include "speaker.h" -#define LOG_READYQ (1 << 0) -#define LOG_READ (1 << 1) -#define LOG_WRITE (1 << 2) +#define LOG_READYQ (1U << 1) +#define LOG_READ (1U << 2) +#define LOG_WRITE (1U << 3) //#define VERBOSE (LOG_READYQ | LOG_READ | LOG_WRITE) #include "logmacro.h" diff --git a/src/devices/bus/a2bus/a2sd.cpp b/src/devices/bus/a2bus/a2sd.cpp index c5f1e743d0f..e415ece84bc 100644 --- a/src/devices/bus/a2bus/a2sd.cpp +++ b/src/devices/bus/a2bus/a2sd.cpp @@ -22,7 +22,6 @@ #include "emu.h" #include "a2sd.h" -#define LOG_GENERAL (1U << 0) #define LOG_SPI (1U << 1) //#define VERBOSE (LOG_COMMAND) @@ -238,7 +237,7 @@ void a2bus_a2sd_device::write_c0nx(u8 offset, u8 data) m_c0n3 |= (data & 0x91); m_sdcard->spi_ss_w(BIT(data, C0N3_BIT_SS)); - LOGMASKED(LOG_GENERAL, "/SS is %x\n", BIT(data, C0N3_BIT_SS)); + LOG("/SS is %x\n", BIT(data, C0N3_BIT_SS)); break; default: diff --git a/src/devices/bus/amiga/keyboard/a2000.cpp b/src/devices/bus/amiga/keyboard/a2000.cpp index 5d1b0712c11..0b5c5031f83 100644 --- a/src/devices/bus/amiga/keyboard/a2000.cpp +++ b/src/devices/bus/amiga/keyboard/a2000.cpp @@ -59,7 +59,6 @@ #include "cpu/mcs48/mcs48.h" -#define LOG_GENERAL (1U << 0) #define LOG_COMM (1U << 1) #define LOG_SCAN (1U << 2) diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp index b9d6726bc7e..fbb9f2c9dfc 100644 --- a/src/devices/bus/amiga/zorro/a2232.cpp +++ b/src/devices/bus/amiga/zorro/a2232.cpp @@ -11,7 +11,6 @@ #include "emu.h" #include "a2232.h" -#define LOG_GENERAL (1U << 0) #define LOG_DATA (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_DATA) #include "logmacro.h" diff --git a/src/devices/bus/apricot/expansion/winchester.cpp b/src/devices/bus/apricot/expansion/winchester.cpp index e48751851fb..e400295f3b7 100644 --- a/src/devices/bus/apricot/expansion/winchester.cpp +++ b/src/devices/bus/apricot/expansion/winchester.cpp @@ -13,9 +13,8 @@ #include "imagedev/harddriv.h" #include "machine/74259.h" -//#define LOG_GENERAL (1U << 0) -#define LOG_REGS (1U << 1) -#define LOG_DATA (1U << 2) +#define LOG_REGS (1U << 1) +#define LOG_DATA (1U << 2) //#define VERBOSE (LOG_REGS) //#define LOG_OUTPUT_STREAM std::cout diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp index c466c311d9e..9cf131a589a 100644 --- a/src/devices/bus/coco/coco_fdc.cpp +++ b/src/devices/bus/coco/coco_fdc.cpp @@ -89,7 +89,6 @@ #include "formats/sdf_dsk.h" #include "formats/vdk_dsk.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already #define LOG_WDFDC (1U << 1) // Shows register setup #define LOG_WDIO (1U << 2) // Shows data read and write #define LOG_WDSCII (1U << 3) // Shows SCII register setup diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp index f972eb90c8f..1e385dab107 100644 --- a/src/devices/bus/coco/coco_multi.cpp +++ b/src/devices/bus/coco/coco_multi.cpp @@ -65,7 +65,6 @@ #define SWITCH_CONFIG_TAG "switch" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already #define LOG_CART (1U << 1) // shows cart line changes #define LOG_SWITCH (1U << 2) // shows switch changes //#define VERBOSE (LOG_CART|LOG_SWITCH) diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp index 7c8d497a224..b99d8e2af40 100644 --- a/src/devices/bus/coco/coco_ssc.cpp +++ b/src/devices/bus/coco/coco_ssc.cpp @@ -40,8 +40,8 @@ #include "speaker.h" -#define LOG_INTERFACE (1U << 1) -#define LOG_INTERNAL (1U << 2) +#define LOG_INTERFACE (1U << 1) +#define LOG_INTERNAL (1U << 2) #define VERBOSE (0) // #define VERBOSE (LOG_INTERFACE) // #define VERBOSE (LOG_INTERFACE|LOG_INTERNAL) diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp index bf236f5b7b8..fe68e5a94f6 100644 --- a/src/devices/bus/coco/coco_t4426.cpp +++ b/src/devices/bus/coco/coco_t4426.cpp @@ -50,10 +50,9 @@ #include "machine/mc14411.h" #include "machine/6821pia.h" -//#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) -#define LOG_PIA (1U << 2) -#define LOG_ACIA (1U << 3) +#define LOG_SETUP (1U << 1) +#define LOG_PIA (1U << 2) +#define LOG_ACIA (1U << 3) //#define VERBOSE (LOG_PIA) // (LOG_PIA | LOG_GENERAL | LOG_SETUP) //#define LOG_OUTPUT_STREAM std::cout diff --git a/src/devices/bus/coco/cococart.cpp b/src/devices/bus/coco/cococart.cpp index 2aae3647e83..5bb45dba7a9 100644 --- a/src/devices/bus/coco/cococart.cpp +++ b/src/devices/bus/coco/cococart.cpp @@ -73,7 +73,6 @@ PARAMETERS ***************************************************************************/ -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already #define LOG_CART (1U << 1) // shows cart line changes #define LOG_NMI (1U << 2) // shows switch changes #define LOG_HALT (1U << 3) // shows switch changes diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp index 5a70433e559..671126191e2 100644 --- a/src/devices/bus/coco/dragon_fdc.cpp +++ b/src/devices/bus/coco/dragon_fdc.cpp @@ -82,8 +82,9 @@ PARAMETERS ***************************************************************************/ -#define LOG_FDC 0 - +#define LOG_FDC (1U << 1) +#define VERBOSE (0) +#include "logmacro.h" /*************************************************************************** @@ -221,19 +222,16 @@ void premier_fdc_device_base::update_lines() void dragon_fdc_device_base::dskreg_w(u8 data) { - if (LOG_FDC) - { - logerror("fdc_dragon_dskreg_w(): %c%c%c%c%c%c%c%c ($%02x)\n", - BIT(data, 7) ? 'X' : 'x', - BIT(data, 6) ? 'X' : 'x', - BIT(data, 5) ? 'N' : 'n', - BIT(data, 4) ? 'P' : 'p', - BIT(data, 3) ? 'S' : 'D', - BIT(data, 2) ? 'M' : 'm', - BIT(data, 1) ? '1' : '0', - BIT(data, 0) ? '1' : '0', - data); - } + LOGMASKED(LOG_FDC, "fdc_dragon_dskreg_w(): %c%c%c%c%c%c%c%c ($%02x)\n", + BIT(data, 7) ? 'X' : 'x', + BIT(data, 6) ? 'X' : 'x', + BIT(data, 5) ? 'N' : 'n', + BIT(data, 4) ? 'P' : 'p', + BIT(data, 3) ? 'S' : 'D', + BIT(data, 2) ? 'M' : 'm', + BIT(data, 1) ? '1' : '0', + BIT(data, 0) ? '1' : '0', + data); // update the motor on each floppy for (int i = 0; i < 4; i++) @@ -253,19 +251,16 @@ void dragon_fdc_device_base::dskreg_w(u8 data) void premier_fdc_device_base::dskreg_w(u8 data) { - if (LOG_FDC) - { - logerror("fdc_premier_dskreg_w(): %c%c%c%c%c%c%c%c ($%02x)\n", - BIT(data, 7) ? 'X' : 'x', - BIT(data, 6) ? 'X' : 'x', - BIT(data, 5) ? 'X' : 'x', - BIT(data, 4) ? 'D' : 'S', - BIT(data, 3) ? '8' : '5', - BIT(data, 2) ? '1' : '0', - BIT(data, 1) ? '1' : '0', - BIT(data, 0) ? '1' : '0', - data); - } + LOGMASKED(LOG_FDC, "fdc_premier_dskreg_w(): %c%c%c%c%c%c%c%c ($%02x)\n", + BIT(data, 7) ? 'X' : 'x', + BIT(data, 6) ? 'X' : 'x', + BIT(data, 5) ? 'X' : 'x', + BIT(data, 4) ? 'D' : 'S', + BIT(data, 3) ? '8' : '5', + BIT(data, 2) ? '1' : '0', + BIT(data, 1) ? '1' : '0', + BIT(data, 0) ? '1' : '0', + data); floppy_image_device *floppy = nullptr; // update the motor on each floppy diff --git a/src/devices/bus/gio64/newport.cpp b/src/devices/bus/gio64/newport.cpp index 2f66e72f5e4..97a5f2be5b3 100644 --- a/src/devices/bus/gio64/newport.cpp +++ b/src/devices/bus/gio64/newport.cpp @@ -37,14 +37,14 @@ #include "emu.h" #include "newport.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_VC2 (1 << 1) -#define LOG_CMAP (1 << 2) -#define LOG_XMAP (1 << 4) -#define LOG_REX3 (1 << 6) -#define LOG_RAMDAC (1 << 7) -#define LOG_COMMANDS (1 << 8) -#define LOG_REJECTS (1 << 9) +#define LOG_UNKNOWN (1U << 1) +#define LOG_VC2 (1U << 2) +#define LOG_CMAP (1U << 3) +#define LOG_XMAP (1U << 4) +#define LOG_REX3 (1U << 5) +#define LOG_RAMDAC (1U << 6) +#define LOG_COMMANDS (1U << 7) +#define LOG_REJECTS (1U << 8) #define LOG_ALL (LOG_UNKNOWN | LOG_VC2 | LOG_CMAP | LOG_XMAP | LOG_REX3 | LOG_RAMDAC | LOG_COMMANDS | LOG_REJECTS) #define VERBOSE (0) diff --git a/src/devices/bus/hexbus/hexbus.cpp b/src/devices/bus/hexbus/hexbus.cpp index 40189262457..110739b5fcf 100644 --- a/src/devices/bus/hexbus/hexbus.cpp +++ b/src/devices/bus/hexbus/hexbus.cpp @@ -150,10 +150,10 @@ // Devices #include "hx5102.h" -#define LOG_LINES (1U<<1) // Line changes -#define LOG_ENABLED (1U<<2) // Enabled +#define LOG_LINES (1U << 1) // Line changes +#define LOG_ENABLED (1U << 2) // Enabled -#define VERBOSE ( LOG_GENERAL ) +#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/bus/hexbus/hx5102.cpp b/src/devices/bus/hexbus/hx5102.cpp index 740b5f93f4c..b18f5e9550e 100644 --- a/src/devices/bus/hexbus/hx5102.cpp +++ b/src/devices/bus/hexbus/hx5102.cpp @@ -75,20 +75,20 @@ #include "hx5102.h" #include "formats/ti99_dsk.h" -#define LOG_HEXBUS (1U<<1) // Hexbus operation -#define LOG_RESET (1U<<2) // Reset -#define LOG_WARN (1U<<3) // Warnings -#define LOG_READY (1U<<4) // READY -#define LOG_SIGNALS (1U<<5) // IRQ/DRQ -#define LOG_CRU (1U<<6) // CRU -#define LOG_RAM (1U<<7) // RAM -#define LOG_DMA (1U<<8) // DMA -#define LOG_MOTOR (1U<<9) // Motor activity -#define LOG_STATUS (1U<<10) // Main status register -#define LOG_FIFO (1U<<11) // Data register +#define LOG_HEXBUS (1U << 1) // Hexbus operation +#define LOG_RESET (1U << 2) // Reset +#define LOG_WARN (1U << 3) // Warnings +#define LOG_READY (1U << 4) // READY +#define LOG_SIGNALS (1U << 5) // IRQ/DRQ +#define LOG_CRU (1U << 6) // CRU +#define LOG_RAM (1U << 7) // RAM +#define LOG_DMA (1U << 8) // DMA +#define LOG_MOTOR (1U << 9) // Motor activity +#define LOG_STATUS (1U << 10) // Main status register +#define LOG_FIFO (1U << 11) // Data register // Minimum log should be config and warnings -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/hexbus/tp0370.cpp b/src/devices/bus/hexbus/tp0370.cpp index e4d1ac50863..1bd26788cfb 100644 --- a/src/devices/bus/hexbus/tp0370.cpp +++ b/src/devices/bus/hexbus/tp0370.cpp @@ -106,15 +106,15 @@ // Devices #include "tp0370.h" -#define LOG_DATA (1U<<1) // Data transfer -#define LOG_DETAIL (1U<<2) -#define LOG_WRITE (1U<<3) -#define LOG_LINES (1U<<4) -#define LOG_STATUS (1U<<5) -#define LOG_MODE (1U<<6) +#define LOG_DATA (1U << 1) // Data transfer +#define LOG_DETAIL (1U << 2) +#define LOG_WRITE (1U << 3) +#define LOG_LINES (1U << 4) +#define LOG_STATUS (1U << 5) +#define LOG_MODE (1U << 6) // Minimum log should be config and warnings -#define VERBOSE ( LOG_GENERAL ) +#define VERBOSE (LOG_GENERAL) enum { diff --git a/src/devices/bus/ieee488/c8050fdc.cpp b/src/devices/bus/ieee488/c8050fdc.cpp index eea107417c9..780646460c1 100644 --- a/src/devices/bus/ieee488/c8050fdc.cpp +++ b/src/devices/bus/ieee488/c8050fdc.cpp @@ -24,9 +24,10 @@ // MACROS / CONSTANTS //************************************************************************** -#define LOG 0 -#define LOG_MORE 0 -#define LOG_BITS 0 +#define LOG_MORE (1U << 1) +#define LOG_BITS (1U << 2) +#define VERBOSE (0) +#include "logmacro.h" #define GCR_DECODE(_e, _i) \ ((BIT(_e, 6) << 7) | (BIT(_i, 7) << 6) | (_e & 0x33) | (BIT(_e, 2) << 3) | (_i & 0x04)) @@ -214,7 +215,7 @@ void c8050_fdc_device::ds_w(int ds) live_sync(); m_ds = cur_live.ds = ds; pll_reset(cur_live.tm); - if (LOG) logerror("%s %s DS %u\n", machine().time().as_string(), machine().describe_context(), ds); + LOG("%s %s DS %u\n", machine().time().as_string(), machine().describe_context(), ds); checkpoint(); live_run(); } @@ -432,19 +433,17 @@ void c8050_fdc_device::live_run(const attotime &limit) // GCR error int error = !(ready || BIT(cur_live.e, 3)); - if (LOG_BITS) { - if (cur_live.rw_sel) { - logerror("%s cyl %u bit %u sync %u bc %u sr %03x i %03x e %02x\n",cur_live.tm.as_string(),get_floppy()->get_cyl(),bit,sync,cur_live.bit_counter,cur_live.shift_reg,cur_live.i,cur_live.e); - } else { - logerror("%s cyl %u writing bit %u bc %u sr %03x i %03x e %02x\n",cur_live.tm.as_string(),get_floppy()->get_cyl(),write_bit,cur_live.bit_counter,cur_live.shift_reg_write,cur_live.i,cur_live.e); - } + if (cur_live.rw_sel) { + LOGMASKED(LOG_BITS, "%s cyl %u bit %u sync %u bc %u sr %03x i %03x e %02x\n",cur_live.tm.as_string(),get_floppy()->get_cyl(),bit,sync,cur_live.bit_counter,cur_live.shift_reg,cur_live.i,cur_live.e); + } else { + LOGMASKED(LOG_BITS, "%s cyl %u writing bit %u bc %u sr %03x i %03x e %02x\n",cur_live.tm.as_string(),get_floppy()->get_cyl(),write_bit,cur_live.bit_counter,cur_live.shift_reg_write,cur_live.i,cur_live.e); } if (!ready) { // load write shift register cur_live.shift_reg_write = GCR_ENCODE(cur_live.e, cur_live.i); - if (LOG_BITS) logerror("%s load write shift register %03x\n",cur_live.tm.as_string(),cur_live.shift_reg_write); + LOGMASKED(LOG_BITS, "%s load write shift register %03x\n",cur_live.tm.as_string(),cur_live.shift_reg_write); } else { // clock write shift register cur_live.shift_reg_write <<= 1; @@ -453,25 +452,25 @@ void c8050_fdc_device::live_run(const attotime &limit) if (ready != cur_live.ready) { if (cur_live.rw_sel && !ready) - if (LOG) logerror("%s READY %u : %02x\n", cur_live.tm.as_string(),ready,GCR_DECODE(cur_live.e, cur_live.i)); + LOG("%s READY %u : %02x\n", cur_live.tm.as_string(),ready,GCR_DECODE(cur_live.e, cur_live.i)); cur_live.ready = ready; syncpoint = true; } if (brdy != cur_live.brdy) { - if (LOG_MORE) logerror("%s BRDY %u\n", cur_live.tm.as_string(), brdy); + LOGMASKED(LOG_MORE, "%s BRDY %u\n", cur_live.tm.as_string(), brdy); cur_live.brdy = brdy; syncpoint = true; } if (sync != cur_live.sync) { - if (LOG) logerror("%s SYNC %u\n", cur_live.tm.as_string(), sync); + LOG("%s SYNC %u\n", cur_live.tm.as_string(), sync); cur_live.sync = sync; syncpoint = true; } if (error != cur_live.error) { - if (LOG_MORE) logerror("%s ERROR %u\n", cur_live.tm.as_string(), error); + LOGMASKED(LOG_MORE, "%s ERROR %u\n", cur_live.tm.as_string(), error); cur_live.error = error; syncpoint = true; } @@ -507,7 +506,7 @@ uint8_t c8050_fdc_device::read() void c8050_fdc_device::write(uint8_t data) { - if (LOG) logerror("%s %s PI %02x\n", machine().time().as_string(), machine().describe_context(), data); + LOG("%s %s PI %02x\n", machine().time().as_string(), machine().describe_context(), data); if (m_pi != data) { @@ -537,7 +536,7 @@ WRITE_LINE_MEMBER( c8050_fdc_device::drv_sel_w ) live_sync(); m_drv_sel = cur_live.drv_sel = state; checkpoint(); - if (LOG) logerror("%s %s DRV SEL %u\n", machine().time().as_string(), machine().describe_context(), state); + LOG("%s %s DRV SEL %u\n", machine().time().as_string(), machine().describe_context(), state); live_run(); } } @@ -549,7 +548,7 @@ WRITE_LINE_MEMBER( c8050_fdc_device::mode_sel_w ) live_sync(); m_mode_sel = cur_live.mode_sel = state; checkpoint(); - if (LOG) logerror("%s %s MODE SEL %u\n", machine().time().as_string(), machine().describe_context(), state); + LOG("%s %s MODE SEL %u\n", machine().time().as_string(), machine().describe_context(), state); live_run(); } } @@ -561,7 +560,7 @@ WRITE_LINE_MEMBER( c8050_fdc_device::rw_sel_w ) live_sync(); m_rw_sel = cur_live.rw_sel = state; checkpoint(); - if (LOG) logerror("%s %s RW SEL %u\n", machine().time().as_string(), machine().describe_context(), state); + LOG("%s %s RW SEL %u\n", machine().time().as_string(), machine().describe_context(), state); if (m_rw_sel) { pll_stop_writing(get_floppy(), cur_live.tm); } else { @@ -577,7 +576,7 @@ WRITE_LINE_MEMBER( c8050_fdc_device::mtr0_w ) { live_sync(); m_mtr0 = state; - if (LOG) logerror("%s %s MTR0 %u\n", machine().time().as_string(), machine().describe_context(), state); + LOG("%s %s MTR0 %u\n", machine().time().as_string(), machine().describe_context(), state); m_floppy0->mon_w(state); checkpoint(); @@ -599,7 +598,7 @@ WRITE_LINE_MEMBER( c8050_fdc_device::mtr1_w ) { live_sync(); m_mtr1 = state; - if (LOG) logerror("%s %s MTR1 %u\n", machine().time().as_string(), machine().describe_context(), state); + LOG("%s %s MTR1 %u\n", machine().time().as_string(), machine().describe_context(), state); if (m_floppy1) m_floppy1->mon_w(state); checkpoint(); @@ -621,7 +620,7 @@ WRITE_LINE_MEMBER( c8050_fdc_device::odd_hd_w ) { live_sync(); m_odd_hd = cur_live.odd_hd = state; - if (LOG) logerror("%s %s ODD HD %u\n", machine().time().as_string(), machine().describe_context(), state); + LOG("%s %s ODD HD %u\n", machine().time().as_string(), machine().describe_context(), state); m_floppy0->ss_w(!state); if (m_floppy1) m_floppy1->ss_w(!state); checkpoint(); @@ -631,5 +630,5 @@ WRITE_LINE_MEMBER( c8050_fdc_device::odd_hd_w ) WRITE_LINE_MEMBER( c8050_fdc_device::pull_sync_w ) { - if (LOG_MORE) logerror("%s %s PULL SYNC %u\n", machine().time().as_string(), machine().describe_context(), state); + LOGMASKED(LOG_MORE, "%s %s PULL SYNC %u\n", machine().time().as_string(), machine().describe_context(), state); } diff --git a/src/devices/bus/interpro/keyboard/lle.cpp b/src/devices/bus/interpro/keyboard/lle.cpp index 1556a3f4779..49084977d15 100644 --- a/src/devices/bus/interpro/keyboard/lle.cpp +++ b/src/devices/bus/interpro/keyboard/lle.cpp @@ -148,7 +148,6 @@ #include "speaker.h" #include "machine/keyboard.ipp" -#define LOG_GENERAL (1U << 0) #define LOG_RXTX (1U << 1) #define LOG_PORT (1U << 2) diff --git a/src/devices/bus/interpro/sr/edge.cpp b/src/devices/bus/interpro/sr/edge.cpp index 7b5dc82d95f..467f8f09444 100644 --- a/src/devices/bus/interpro/sr/edge.cpp +++ b/src/devices/bus/interpro/sr/edge.cpp @@ -207,7 +207,6 @@ #include "emu.h" #include "edge.h" -#define LOG_GENERAL (1U << 0) #define LOG_INTERRUPT (1U << 1) #define VERBOSE (LOG_GENERAL) diff --git a/src/devices/bus/interpro/sr/gt.cpp b/src/devices/bus/interpro/sr/gt.cpp index 15158ede040..b8e8772c3d4 100644 --- a/src/devices/bus/interpro/sr/gt.cpp +++ b/src/devices/bus/interpro/sr/gt.cpp @@ -113,7 +113,6 @@ #include "bus/interpro/keyboard/keyboard.h" #include "bus/interpro/mouse/mouse.h" -#define LOG_GENERAL (1U << 0) #define LOG_LINE (1U << 1) #define LOG_BLIT (1U << 2) diff --git a/src/devices/bus/isa/3c505.cpp b/src/devices/bus/isa/3c505.cpp index 2863135885a..e56cfcd8d31 100644 --- a/src/devices/bus/isa/3c505.cpp +++ b/src/devices/bus/isa/3c505.cpp @@ -25,7 +25,6 @@ #include "emu.h" #include "3c505.h" -#define LOG_GENERAL (1U << 0) #define LOG_REG (1U << 1) #define LOG_DATA (1U << 2) diff --git a/src/devices/bus/isa/myb3k_fdc.cpp b/src/devices/bus/isa/myb3k_fdc.cpp index 1ca69a19be5..df803283459 100644 --- a/src/devices/bus/isa/myb3k_fdc.cpp +++ b/src/devices/bus/isa/myb3k_fdc.cpp @@ -27,7 +27,6 @@ #include "formats/pc_dsk.h" #include "formats/imd_dsk.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already #define LOG_READ (1U << 1) #define LOG_CMD (1U << 2) diff --git a/src/devices/bus/isa/opus100pm.cpp b/src/devices/bus/isa/opus100pm.cpp index 86803a390a3..cfa070eacf3 100644 --- a/src/devices/bus/isa/opus100pm.cpp +++ b/src/devices/bus/isa/opus100pm.cpp @@ -31,7 +31,6 @@ #include "emu.h" #include "opus100pm.h" -#define LOG_GENERAL (1U << 0) #define LOG_STAT (1U << 1) #define LOG_REG (1U << 2) diff --git a/src/devices/bus/isa/p1_hdc.cpp b/src/devices/bus/isa/p1_hdc.cpp index 9ee84ece875..0b4b54b49ec 100644 --- a/src/devices/bus/isa/p1_hdc.cpp +++ b/src/devices/bus/isa/p1_hdc.cpp @@ -14,8 +14,7 @@ // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_DEBUG (1U << 1) +#define LOG_DEBUG (1U << 1) //#define VERBOSE (LOG_DEBUG) //#define LOG_OUTPUT_FUNC printf diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp index b8329e0ee53..21e4504bbe4 100644 --- a/src/devices/bus/isa/pgc.cpp +++ b/src/devices/bus/isa/pgc.cpp @@ -32,7 +32,6 @@ #include "screen.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already #define LOG_VRAM (1U << 1) #define LOG_CMD (1U << 2) diff --git a/src/devices/bus/lpci/cirrus.cpp b/src/devices/bus/lpci/cirrus.cpp index 659d39677a9..b14c79f81bb 100644 --- a/src/devices/bus/lpci/cirrus.cpp +++ b/src/devices/bus/lpci/cirrus.cpp @@ -67,7 +67,8 @@ #include "video/pc_vga.h" #include "cirrus.h" -#define LOG_PCIACCESS 0 +#define VERBOSE (0) +#include "logmacro.h" //************************************************************************** // DEVICE DEFINITIONS @@ -136,8 +137,7 @@ uint32_t pci_cirrus_svga_device::pci_read(pci_bus_device *pcibus, int function, } } - if (LOG_PCIACCESS) - logerror("cirrus5430_pci_read(): function=%d offset=0x%02X result=0x%04X\n", function, offset, result); + LOG("cirrus5430_pci_read(): function=%d offset=0x%02X result=0x%04X\n", function, offset, result); return result; } @@ -148,8 +148,7 @@ uint32_t pci_cirrus_svga_device::pci_read(pci_bus_device *pcibus, int function, void pci_cirrus_svga_device::pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask) { - if (LOG_PCIACCESS) - logerror("cirrus5430_pci_write(): function=%d offset=0x%02X data=0x%04X\n", function, offset, data); + LOG("cirrus5430_pci_write(): function=%d offset=0x%02X data=0x%04X\n", function, offset, data); } /************************************* diff --git a/src/devices/bus/lpci/i82371ab.cpp b/src/devices/bus/lpci/i82371ab.cpp index 6d9a1c72bc3..102cd6b8b56 100644 --- a/src/devices/bus/lpci/i82371ab.cpp +++ b/src/devices/bus/lpci/i82371ab.cpp @@ -19,10 +19,10 @@ #include "emu.h" #include "i82371ab.h" -#define LOG_ISA (1U << 1) -#define LOG_IDE (1U << 2) -#define LOG_USB (1U << 3) -#define LOG_ACPI (1U << 4) +#define LOG_ISA (1U << 1) +#define LOG_IDE (1U << 2) +#define LOG_USB (1U << 3) +#define LOG_ACPI (1U << 4) #define VERBOSE (LOG_GENERAL | LOG_ISA | LOG_IDE | LOG_USB | LOG_ACPI) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/devices/bus/lpci/mpc105.cpp b/src/devices/bus/lpci/mpc105.cpp index de6eee2dcce..8853f3eb047 100644 --- a/src/devices/bus/lpci/mpc105.cpp +++ b/src/devices/bus/lpci/mpc105.cpp @@ -11,7 +11,8 @@ #include "emu.h" #include "mpc105.h" -#define LOG_MPC105 0 +#define VERBOSE (0) +#include "logmacro.h" //************************************************************************** // DEVICE DEFINITIONS @@ -69,8 +70,7 @@ void mpc105_device::update_memory() char bank_str[10]; u32 ram_size = m_ram->size(); - if (LOG_MPC105) - logerror("mpc105_update_memory(machine): Updating memory (bank enable=0x%02X)\n", m_bank_enable); + LOG("mpc105_update_memory(machine): Updating memory (bank enable=0x%02X)\n", m_bank_enable); if (m_bank_base > 0) { @@ -96,8 +96,7 @@ void mpc105_device::update_memory() if ((begin + 0x100000) <= end) { - if (LOG_MPC105) - logerror("\tbank #%d [%02d]: 0x%08X - 0x%08X [%p-%p]\n", bank, bank + m_bank_base, begin, end, m_ram->pointer(), m_ram->pointer() + (end - begin)); + LOG("\tbank #%d [%02d]: 0x%08X - 0x%08X [%p-%p]\n", bank, bank + m_bank_base, begin, end, m_ram->pointer(), m_ram->pointer() + (end - begin)); if (m_bank_base > 0) { diff --git a/src/devices/bus/lpci/pci.cpp b/src/devices/bus/lpci/pci.cpp index 34470bfa4f9..05b88948aa4 100644 --- a/src/devices/bus/lpci/pci.cpp +++ b/src/devices/bus/lpci/pci.cpp @@ -74,7 +74,8 @@ #include "emu.h" #include "pci.h" -#define LOG_PCI 0 +#define VERBOSE (0) +#include "logmacro.h" //************************************************************************** // GLOBAL VARIABLES @@ -130,8 +131,7 @@ uint32_t pci_bus_device::read(offs_t offset, uint32_t mem_mask) break; } - if (LOG_PCI) - logerror("read('%s'): offset=%d result=0x%08X\n", tag(), offset, result); + LOG("read('%s'): offset=%d result=0x%08X\n", tag(), offset, result); return result; } @@ -162,8 +162,7 @@ void pci_bus_device::write(offs_t offset, uint32_t data, uint32_t mem_mask) { offset %= 2; - if (LOG_PCI) - logerror("write('%s'): offset=%d data=0x%08X\n", tag(), offset, data); + LOG("write('%s'): offset=%d data=0x%08X\n", tag(), offset, data); switch (offset) { @@ -183,8 +182,7 @@ void pci_bus_device::write(offs_t offset, uint32_t data, uint32_t mem_mask) } else m_devicenum = -1; - if (LOG_PCI) - logerror(" bus:%d device:%d\n", busnum, devicenum); + LOG(" bus:%d device:%d\n", busnum, devicenum); } break; @@ -197,8 +195,7 @@ void pci_bus_device::write(offs_t offset, uint32_t data, uint32_t mem_mask) int reg = (m_address >> 0) & 0xfc; m_busnumaddr->m_device[m_devicenum]->pci_write(m_busnumaddr, function, reg, data, mem_mask); } - if (LOG_PCI) - logerror(" function:%d register:%d\n", (m_address >> 8) & 0x07, (m_address >> 0) & 0xfc); + LOG(" function:%d register:%d\n", (m_address >> 8) & 0x07, (m_address >> 0) & 0xfc); } break; } diff --git a/src/devices/bus/mackbd/keyboard.cpp b/src/devices/bus/mackbd/keyboard.cpp index 617730f3e6a..46bc667429f 100644 --- a/src/devices/bus/mackbd/keyboard.cpp +++ b/src/devices/bus/mackbd/keyboard.cpp @@ -212,7 +212,6 @@ #include "cpu/mcs48/mcs48.h" -#define LOG_GENERAL (1U << 0) #define LOG_WATCHDOG (1U << 1) #define LOG_MATRIX (1U << 2) #define LOG_COMM (1U << 3) diff --git a/src/devices/bus/nes/2a03pur.cpp b/src/devices/bus/nes/2a03pur.cpp index 9105c518844..9425cfdadcf 100644 --- a/src/devices/bus/nes/2a03pur.cpp +++ b/src/devices/bus/nes/2a03pur.cpp @@ -19,12 +19,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -93,7 +92,7 @@ void nes_2a03pur_device::pcb_reset() void nes_2a03pur_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("2a03 puritans write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("2a03 puritans write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1000) m_reg[offset & 7] = data; @@ -101,7 +100,7 @@ void nes_2a03pur_device::write_l(offs_t offset, u8 data) u8 nes_2a03pur_device::read_h(offs_t offset) { - LOG_MMC(("2a03 puritans read_h, offset: %04x\n", offset)); + LOG("2a03 puritans read_h, offset: %04x\n", offset); return m_prg[((m_reg[BIT(offset, 12, 3)] * 0x1000) + (offset & 0x0fff)) & (m_prg_size - 1)]; } diff --git a/src/devices/bus/nes/act53.cpp b/src/devices/bus/nes/act53.cpp index 9fd4ced2a6b..59955eb74fc 100644 --- a/src/devices/bus/nes/act53.cpp +++ b/src/devices/bus/nes/act53.cpp @@ -17,12 +17,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -151,7 +150,7 @@ void nes_action53_device::update_mirr() void nes_action53_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("action 53 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("action 53 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1000) m_sel = bitswap<2>(data, 7, 0); @@ -160,7 +159,7 @@ void nes_action53_device::write_l(offs_t offset, u8 data) void nes_action53_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("action 53 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("action 53 write_h, offset: %04x, data: %02x\n", offset, data); if (m_reg[m_sel] != data) { diff --git a/src/devices/bus/nes/aladdin.cpp b/src/devices/bus/nes/aladdin.cpp index 7965fb0bd54..b24543e720b 100644 --- a/src/devices/bus/nes/aladdin.cpp +++ b/src/devices/bus/nes/aladdin.cpp @@ -19,12 +19,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" @@ -299,7 +298,7 @@ void nes_aladdin_device::pcb_reset() uint8_t nes_aladdin_device::read_h(offs_t offset) { - LOG_MMC(("aladdin read_h, offset: %04x\n", offset)); + LOG("aladdin read_h, offset: %04x\n", offset); // this shall be the proper code, but it's a bit slower, so we access directly the subcart below //return m_subslot->read(offset); @@ -311,7 +310,7 @@ uint8_t nes_aladdin_device::read_h(offs_t offset) void nes_aladdin_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("aladdin write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("aladdin write_h, offset: %04x, data: %02x\n", offset, data); m_subslot->write_prg(offset, data); } diff --git a/src/devices/bus/nes/ave.cpp b/src/devices/bus/nes/ave.cpp index f0f1196191c..8f2b6cace2d 100644 --- a/src/devices/bus/nes/ave.cpp +++ b/src/devices/bus/nes/ave.cpp @@ -21,12 +21,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -94,7 +93,7 @@ void nes_maxi15_device::pcb_reset() void nes_nina001_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("nina-001 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("nina-001 write_m, offset: %04x, data: %02x\n", offset, data); device_nes_cart_interface::write_m(offset, data); // write WRAM @@ -127,7 +126,7 @@ void nes_nina001_device::write_m(offs_t offset, u8 data) void nes_nina006_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("nina-006 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("nina-006 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (BIT(offset, 8)) // $41xx, $43xx, ... $5fxx @@ -151,7 +150,7 @@ void nes_nina006_device::write_l(offs_t offset, u8 data) u8 nes_maxi15_device::read_h(offs_t offset) { - LOG_MMC(("Maxi 15 read_h, offset: %04x\n", offset)); + LOG("Maxi 15 read_h, offset: %04x\n", offset); u8 temp = hi_access_rom(offset); diff --git a/src/devices/bus/nes/bandai.cpp b/src/devices/bus/nes/bandai.cpp index 5954aacff62..66bd016c45a 100644 --- a/src/devices/bus/nes/bandai.cpp +++ b/src/devices/bus/nes/bandai.cpp @@ -34,13 +34,14 @@ #include "emu.h" #include "bandai.h" +#define LOG_UNHANDLED (1U << 1) + #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_UNHANDLED | LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (LOG_UNHANDLED) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" @@ -197,7 +198,7 @@ void nes_fjump2_device::pcb_reset() iNES: mapper 96 - In MESS: Preliminary Support. + In MAME: Preliminary Support. -------------------------------------------------*/ @@ -248,7 +249,7 @@ void nes_oekakids_device::ppu_latch(offs_t offset) void nes_oekakids_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("oeka kids write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("oeka kids write_h, offset: %04x, data: %02x\n", offset, data); prg32(data & 0x03); m_reg = data & 0x04; @@ -274,7 +275,7 @@ void nes_oekakids_device::write_h(offs_t offset, uint8_t data) iNES: mappers 16, 153 (see below), 157 & 159 - In MESS: Supported + In MAME: Supported -------------------------------------------------*/ @@ -300,7 +301,7 @@ TIMER_CALLBACK_MEMBER(nes_fcg_device::irq_timer_tick) void nes_fcg_device::fcg_write(offs_t offset, uint8_t data) { - LOG_MMC(("lz93d50_write, offset: %04x, data: %02x\n", offset, data)); + LOG("lz93d50_write, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x0f) { @@ -331,14 +332,14 @@ void nes_fcg_device::fcg_write(offs_t offset, uint8_t data) m_irq_count = (m_irq_count & 0x00ff) | (data << 8); break; default: - logerror("lz93d50_write uncaught write, offset: %04x, data: %02x\n", offset, data); + LOGMASKED(LOG_UNHANDLED, "lz93d50_write uncaught write, offset: %04x, data: %02x\n", offset, data); break; } } void nes_fcg_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("lz93d50 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("lz93d50 write_m, offset: %04x, data: %02x\n", offset, data); if (m_battery.empty() && m_prgram.empty()) fcg_write(offset & 0x0f, data); @@ -353,7 +354,7 @@ void nes_fcg_device::write_m(offs_t offset, uint8_t data) void nes_lz93d50_24c01_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("lz93d50_24c01 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("lz93d50_24c01 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x0f) { @@ -370,7 +371,7 @@ void nes_lz93d50_24c01_device::write_h(offs_t offset, uint8_t data) uint8_t nes_lz93d50_24c01_device::read_m(offs_t offset) { - LOG_MMC(("lz93d50 EEPROM read, offset: %04x\n", offset)); + LOG("lz93d50 EEPROM read, offset: %04x\n", offset); if (m_i2c_dir) return (m_i2cmem->read_sda() & 1) << 4; else @@ -405,7 +406,7 @@ void nes_lz93d50_24c02_device::device_add_mconfig(machine_config &config) iNES: mappers 153 - In MESS: Supported + In MAME: Supported -------------------------------------------------*/ @@ -422,19 +423,19 @@ void nes_fjump2_device::set_prg() uint8_t nes_fjump2_device::read_m(offs_t offset) { - LOG_MMC(("fjump2 read_m, offset: %04x\n", offset)); + LOG("fjump2 read_m, offset: %04x\n", offset); return m_battery[offset & (m_battery.size() - 1)]; } void nes_fjump2_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("fjump2 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("fjump2 write_m, offset: %04x, data: %02x\n", offset, data); m_battery[offset & (m_battery.size() - 1)] = data; } void nes_fjump2_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("fjump2 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("fjump2 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x0f) { diff --git a/src/devices/bus/nes/batlab.cpp b/src/devices/bus/nes/batlab.cpp index e117e6fbf5e..3a9df33a3cf 100644 --- a/src/devices/bus/nes/batlab.cpp +++ b/src/devices/bus/nes/batlab.cpp @@ -20,13 +20,14 @@ #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access ppu2c0x_device::BOTTOM_VISIBLE_SCANLINE +#define LOG_HIFREQ (1U << 1) + #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -111,7 +112,7 @@ void nes_batmap_srrx_device::pcb_reset() void nes_batmap_000_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("batmap_000 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("batmap_000 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -173,7 +174,7 @@ void nes_batmap_srrx_device::hblank_irq(int scanline, bool vblank, bool blanked) if (m_irq_enable && !blanked && !m_irq_count) { - LOG_MMC(("irq fired, scanline: %d\n", scanline)); + LOG("irq fired, scanline: %d\n", scanline); set_irq_line(ASSERT_LINE); } } @@ -187,7 +188,7 @@ u8 nes_batmap_srrx_device::read_dpcm() u8 nes_batmap_srrx_device::read_l(offs_t offset) { -// LOG_MMC(("batmap_srrx read_l, offset: %04x", offset)); + LOGMASKED(LOG_HIFREQ, "batmap_srrx read_l, offset: %04x", offset); offset += 0x100; switch (offset & 0x1800) @@ -203,13 +204,13 @@ u8 nes_batmap_srrx_device::read_l(offs_t offset) u8 nes_batmap_srrx_device::read_m(offs_t offset) { -// LOG_MMC(("batmap_srrx read_m, offset: %04x", offset)); + LOGMASKED(LOG_HIFREQ, "batmap_srrx read_m, offset: %04x", offset); return m_prg[(m_reg * 0x2000 + offset) & (m_prg_size - 1)]; } u8 nes_batmap_srrx_device::read_h(offs_t offset) { - LOG_MMC(("batmap_srrx read_h, offset: %04x", offset)); + LOG("batmap_srrx read_h, offset: %04x", offset); if ((offset & 0x7000) == 0x4000) return read_dpcm(); @@ -219,7 +220,7 @@ u8 nes_batmap_srrx_device::read_h(offs_t offset) void nes_batmap_srrx_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("batmap_srrx write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("batmap_srrx write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7000) { diff --git a/src/devices/bus/nes/benshieng.cpp b/src/devices/bus/nes/benshieng.cpp index 9fadad83386..a8dcedd9780 100644 --- a/src/devices/bus/nes/benshieng.cpp +++ b/src/devices/bus/nes/benshieng.cpp @@ -16,12 +16,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -74,7 +73,7 @@ void nes_benshieng_device::pcb_reset() void nes_benshieng_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("benshieng write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("benshieng write_h, offset: %04x, data: %02x\n", offset, data); // m_mmc_dipsetting = ioport("CARTDIPS")->read(); u8 bank = BIT(offset, 10, 2); diff --git a/src/devices/bus/nes/bootleg.cpp b/src/devices/bus/nes/bootleg.cpp index ade02369c9b..4ce050033d5 100644 --- a/src/devices/bus/nes/bootleg.cpp +++ b/src/devices/bus/nes/bootleg.cpp @@ -25,14 +25,14 @@ #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access ppu2c0x_device::BOTTOM_VISIBLE_SCANLINE +#define LOG_HIFREQ (1U << 1) #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -689,7 +689,7 @@ void nes_sc127_device::hblank_irq(int scanline, bool vblank, bool blanked) if (!blanked && (m_irq_count == 0)) { - LOG_MMC(("irq fired, scanline: %d\n", scanline)); + LOG("irq fired, scanline: %d\n", scanline); set_irq_line(ASSERT_LINE); m_irq_enable = 0; } @@ -698,7 +698,7 @@ void nes_sc127_device::hblank_irq(int scanline, bool vblank, bool blanked) void nes_sc127_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("sc127 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("sc127 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset) { @@ -764,7 +764,7 @@ TIMER_CALLBACK_MEMBER(nes_mbaby_device::irq_timer_tick) void nes_mbaby_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("Mario Baby write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("Mario Baby write_h, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x7000) { @@ -790,7 +790,7 @@ void nes_mbaby_device::write_h(offs_t offset, u8 data) u8 nes_mbaby_device::read_m(offs_t offset) { - LOG_MMC(("Mario Baby read_m, offset: %04x\n", offset)); + LOG("Mario Baby read_m, offset: %04x\n", offset); return m_prg[(m_latch * 0x2000) + (offset & 0x1fff)]; } @@ -808,7 +808,7 @@ u8 nes_mbaby_device::read_m(offs_t offset) void nes_asn_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("Ai Senshi Nicol write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("Ai Senshi Nicol write_h, offset: %04x, data: %02x\n", offset, data); if (offset == 0x0000) chr8(data, CHRROM); @@ -819,7 +819,7 @@ void nes_asn_device::write_h(offs_t offset, uint8_t data) uint8_t nes_asn_device::read_m(offs_t offset) { - LOG_MMC(("Ai Senshi Nicol read_m, offset: %04x\n", offset)); + LOG("Ai Senshi Nicol read_m, offset: %04x\n", offset); return m_prg[((m_latch * 0x2000) + (offset & 0x1fff)) & (m_prg_size - 1)]; } @@ -846,7 +846,7 @@ TIMER_CALLBACK_MEMBER(nes_smb3p_device::irq_timer_tick) void nes_smb3p_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("btl_smb3_w, offset: %04x, data: %02x\n", offset, data)); + LOG("btl_smb3_w, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x0f) { @@ -907,7 +907,7 @@ void nes_smb3p_device::write_h(offs_t offset, u8 data) void nes_btl_cj_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("btl_cj write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("btl_cj write_h, offset: %04x, data: %02x\n", offset, data); if (BIT(offset, 4)) { @@ -949,7 +949,7 @@ void nes_btl_dn_device::hblank_irq(int scanline, bool vblank, bool blanked) void nes_btl_dn_device::write_h(offs_t offset, uint8_t data) { uint8_t bank; - LOG_MMC(("btl_dn write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("btl_dn write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7003) { @@ -1005,32 +1005,32 @@ void nes_btl_dn_device::write_h(offs_t offset, uint8_t data) u8 nes_whirlwind_device::read_m(offs_t offset) { - LOG_MMC(("whirlwind read_m, offset: %04x\n", offset)); + LOG("whirlwind read_m, offset: %04x\n", offset); return m_prg[((m_reg & m_prg_mask) * 0x2000) + offset]; } void nes_dh08_device::write_h(offs_t offset, u8 data) // submapper 1 { - LOG_MMC(("dh08 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("dh08 write_h, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x7000) m_reg = data; } void nes_le05_device::write_h(offs_t offset, u8 data) // submapper 4 { - LOG_MMC(("le05 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("le05 write_h, offset: %04x, data: %02x\n", offset, data); chr8(data & 1, m_chr_source); } void nes_lh28_lh54_device::write_h(offs_t offset, u8 data) // submapper 3 { - LOG_MMC(("lh28_lh54 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("lh28_lh54 write_h, offset: %04x, data: %02x\n", offset, data); m_reg = data; } void nes_lh31_device::write_h(offs_t offset, u8 data) // submapper 2 { - LOG_MMC(("lh31 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("lh31 write_h, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x6000) { m_reg = data; @@ -1087,19 +1087,19 @@ void nes_smb2j_device::write_45(offs_t offset, u8 data) void nes_smb2j_device::write_ex(offs_t offset, u8 data) { - LOG_MMC(("smb2j write_ex, offset: %04x, data: %02x\n", offset, data)); + LOG("smb2j write_ex, offset: %04x, data: %02x\n", offset, data); nes_smb2j_device::write_45(offset + 0x4020, data); } void nes_smb2j_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("smb2j write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("smb2j write_l, offset: %04x, data: %02x\n", offset, data); nes_smb2j_device::write_45(offset + 0x4100, data); } void nes_smb2j_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("smb2j write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("smb2j write_h, offset: %04x, data: %02x\n", offset, data); if (offset == 0x122) // $8122 is also IRQ for YS-612, mask unknown nes_smb2j_device::update_irq(data); @@ -1107,7 +1107,7 @@ void nes_smb2j_device::write_h(offs_t offset, u8 data) u8 nes_smb2j_device::read_l(offs_t offset) { - LOG_MMC(("smb2j read_l, offset: %04x\n", offset)); + LOG("smb2j read_l, offset: %04x\n", offset); offset += 0x100; if (offset >= 0x1000) @@ -1118,7 +1118,7 @@ u8 nes_smb2j_device::read_l(offs_t offset) u8 nes_smb2j_device::read_m(offs_t offset) { - LOG_MMC(("smb2j read_m, offset: %04x\n", offset)); + LOG("smb2j read_m, offset: %04x\n", offset); return m_prg[0x4000 + offset]; } @@ -1148,7 +1148,7 @@ TIMER_CALLBACK_MEMBER(nes_smb2ja_device::irq_timer_tick) void nes_smb2ja_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("smb2ja write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("smb2ja write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6000) { @@ -1168,7 +1168,7 @@ void nes_smb2ja_device::write_h(offs_t offset, u8 data) u8 nes_smb2ja_device::read_m(offs_t offset) { - LOG_MMC(("smb2ja read_m, offset: %04x\n", offset)); + LOG("smb2ja read_m, offset: %04x\n", offset); return m_prg[0x06 * 0x2000 + offset]; // fixed 8K bank } @@ -1216,19 +1216,19 @@ void nes_smb2jb_device::write_45(offs_t offset, u8 data) void nes_smb2jb_device::write_ex(offs_t offset, u8 data) { - LOG_MMC(("smb2jb write_ex, offset: %04x, data: %02x\n", offset, data)); + LOG("smb2jb write_ex, offset: %04x, data: %02x\n", offset, data); write_45(offset + 0x4020, data); } void nes_smb2jb_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("smb2jb write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("smb2jb write_l, offset: %04x, data: %02x\n", offset, data); write_45(offset + 0x4100, data); } u8 nes_smb2jb_device::read_m(offs_t offset) { - LOG_MMC(("smb2jb read_m, offset: %04x\n", offset)); + LOG("smb2jb read_m, offset: %04x\n", offset); return m_prg[(m_bank67 * 0x2000 + offset) & (m_prg_size - 1)]; } @@ -1252,7 +1252,7 @@ u8 nes_smb2jb_device::read_m(offs_t offset) void nes_n32_4in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("n32_4in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("n32_4in1 write_h, offset: %04x, data: %02x\n", offset, data); if (offset < 0x2000) { @@ -1296,13 +1296,13 @@ void nes_n32_4in1_device::write_h(offs_t offset, u8 data) u8 nes_0353_device::read_m(offs_t offset) { -// LOG_MMC(("0353 read_m, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "0353 read_m, offset: %04x\n", offset); return m_prg[m_reg * 0x2000 + offset]; } void nes_0353_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("0353 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("0353 write_h, offset: %04x, data: %02x\n", offset, data); set_nt_mirroring(BIT(data, 4) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); m_reg = data & 0x0f; @@ -1344,7 +1344,7 @@ TIMER_CALLBACK_MEMBER(nes_09034a_device::irq_timer_tick) void nes_09034a_device::write_ex(offs_t offset, u8 data) { - LOG_MMC(("09-034a write_ex, offset: %04x, data: %02x\n", offset, data)); + LOG("09-034a write_ex, offset: %04x, data: %02x\n", offset, data); offset += 0x20; switch (offset) @@ -1365,7 +1365,7 @@ void nes_09034a_device::write_ex(offs_t offset, u8 data) u8 nes_09034a_device::read_ex(offs_t offset) { - LOG_MMC(("09-034a read_ex, offset: %04x, data: %02x\n", offset)); + LOG("09-034a read_ex, offset: %04x, data: %02x\n", offset); offset += 0x20; // SMB2 does not boot with the default open bus reads in this range @@ -1377,7 +1377,7 @@ u8 nes_09034a_device::read_ex(offs_t offset) u8 nes_09034a_device::read_m(offs_t offset) { - LOG_MMC(("09-034a read_m, offset: %04x\n", offset)); + LOG("09-034a read_m, offset: %04x\n", offset); // in 0x6000-0x7fff is mapped the 2nd PRG chip which starts after 32K (hence the +4) return m_prg[(((m_reg + 4) * 0x2000) + offset) & (m_prg_size - 1)]; } @@ -1412,7 +1412,7 @@ TIMER_CALLBACK_MEMBER(nes_l001_device::irq_timer_tick) void nes_l001_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("l-001 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("l-001 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6400) { @@ -1459,7 +1459,7 @@ TIMER_CALLBACK_MEMBER(nes_batmanfs_device::irq_timer_tick) void nes_batmanfs_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("batmanfs write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("batmanfs write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x70) { case 0x00: @@ -1516,7 +1516,7 @@ void nes_batmanfs_device::write_h(offs_t offset, u8 data) u8 nes_palthena_device::read_m(offs_t offset) { -// LOG_MMC(("palthena read_m, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "palthena read_m, offset: %04x\n", offset); switch (offset & 0x1f00) { case 0x0000: @@ -1531,7 +1531,7 @@ u8 nes_palthena_device::read_m(offs_t offset) void nes_palthena_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("palthena write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("palthena write_m, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x1f00) { case 0x0000: @@ -1545,7 +1545,7 @@ void nes_palthena_device::write_m(offs_t offset, u8 data) u8 nes_palthena_device::read_h(offs_t offset) { -// LOG_MMC(("palthena read_h, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "palthena read_h, offset: %04x\n", offset); u8 page = offset >> 8; if ((page >= 0x40 && page < 0x52) || page == 0x5f) return m_prgram[offset & 0x1fff]; @@ -1557,7 +1557,7 @@ u8 nes_palthena_device::read_h(offs_t offset) void nes_palthena_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("palthena write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("palthena write_h, offset: %04x, data: %02x\n", offset, data); u8 page = offset >> 8; if ((page >= 0x40 && page < 0x52) || page == 0x5f) m_prgram[offset & 0x1fff] = data; @@ -1585,7 +1585,7 @@ void nes_palthena_device::write_h(offs_t offset, u8 data) void nes_tobidase_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("tobidase write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("tobidase write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x4100; if ((offset & 0x63c0) == 0x41c0) @@ -1594,7 +1594,7 @@ void nes_tobidase_device::write_l(offs_t offset, uint8_t data) uint8_t nes_tobidase_device::read_m(offs_t offset) { - LOG_MMC(("tobidase read_m, offset: %04x\n", offset)); + LOG("tobidase read_m, offset: %04x\n", offset); if (m_latch >= 0x0c) m_latch -= 4; return m_prg[(m_latch * 0x2000) + (offset & 0x1fff)]; @@ -1616,13 +1616,13 @@ uint8_t nes_tobidase_device::read_m(offs_t offset) uint8_t nes_lh32_device::read_m(offs_t offset) { - LOG_MMC(("lh32 read_m, offset: %04x\n", offset)); + LOG("lh32 read_m, offset: %04x\n", offset); return m_prg[(m_latch * 0x2000) + (offset & 0x1fff)]; } uint8_t nes_lh32_device::read_h(offs_t offset) { -// LOG_MMC(("lh32 read_h, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "lh32 read_h, offset: %04x\n", offset); if (offset >= 0x4000 && offset < 0x6000) return m_prgram[offset & 0x1fff]; @@ -1632,18 +1632,17 @@ uint8_t nes_lh32_device::read_h(offs_t offset) void nes_lh32_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("lh32 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("lh32 write_m, offset: %04x, data: %02x\n", offset, data); if (offset == 0) // 0x6000 only? { -// printf("write %x\n", data); m_latch = data & 0xf; } } void nes_lh32_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("lh32 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("lh32 write_h, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x4000 && offset < 0x6000) m_prgram[offset & 0x1fff] = data; @@ -1663,7 +1662,7 @@ void nes_lh32_device::write_h(offs_t offset, uint8_t data) void nes_lh42_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("lh42 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("lh42 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -1702,7 +1701,7 @@ void nes_lh42_device::write_h(offs_t offset, u8 data) void nes_lg25_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("lg25 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("lg25 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -1741,13 +1740,13 @@ void nes_lg25_device::write_h(offs_t offset, u8 data) u8 nes_lh10_device::read_m(offs_t offset) { - LOG_MMC(("lh10 read_m, offset: %04x\n", offset)); + LOG("lh10 read_m, offset: %04x\n", offset); return m_prg[(0x0e * 0x2000 + offset) & (m_prg_size - 1)]; } u8 nes_lh10_device::read_h(offs_t offset) { -// LOG_MMC(("lh10 read_h, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "lh10 read_h, offset: %04x\n", offset); if (offset >= 0x4000 && offset < 0x6000) return m_prgram[offset & 0x1fff]; @@ -1757,7 +1756,7 @@ u8 nes_lh10_device::read_h(offs_t offset) void nes_lh10_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("lh10 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("lh10 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -1799,7 +1798,7 @@ void nes_lh10_device::write_h(offs_t offset, u8 data) void nes_lh51_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("lh51 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("lh51 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6000) { @@ -1841,13 +1840,13 @@ TIMER_CALLBACK_MEMBER(nes_lh53_device::irq_timer_tick) uint8_t nes_lh53_device::read_m(offs_t offset) { - LOG_MMC(("lh53 read_m, offset: %04x\n", offset)); + LOG("lh53 read_m, offset: %04x\n", offset); return m_prg[m_reg * 0x2000 + offset]; } uint8_t nes_lh53_device::read_h(offs_t offset) { -// LOG_MMC(("lh53 read_h, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "lh53 read_h, offset: %04x\n", offset); if (offset >= 0x3800 && offset < 0x5800) return m_prgram[offset - 0x3800]; @@ -1857,7 +1856,7 @@ uint8_t nes_lh53_device::read_h(offs_t offset) void nes_lh53_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("lh53 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("lh53 write_h, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x3800 && offset < 0x5800) m_prgram[offset - 0x3800] = data; @@ -1898,7 +1897,7 @@ void nes_lh53_device::write_h(offs_t offset, uint8_t data) uint8_t nes_2708_device::read_m(offs_t offset) { - LOG_MMC(("btl-2708 read_m, offset: %04x\n", offset)); + LOG("btl-2708 read_m, offset: %04x\n", offset); if (!m_reg[1]) return m_prgram[offset]; // lower 8K of WRAM else @@ -1907,14 +1906,14 @@ uint8_t nes_2708_device::read_m(offs_t offset) void nes_2708_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("btl-2708 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("btl-2708 write_m, offset: %04x, data: %02x\n", offset, data); // if (!m_reg[1]) m_prgram[offset] = data; // lower 8K of WRAM } uint8_t nes_2708_device::read_h(offs_t offset) { -// LOG_MMC(("btl-2708 read_h, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "btl-2708 read_h, offset: %04x\n", offset); if (offset >= 0x3800 && offset < 0x5800 && !m_reg[1]) return m_prgram[0x2000 + ((offset - 0x3800) & 0x1fff)]; // higher 8K of WRAM @@ -1924,7 +1923,7 @@ uint8_t nes_2708_device::read_h(offs_t offset) void nes_2708_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("btl-2708 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("btl-2708 write_h, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x3800 && offset < 0x5800/* && !m_reg[1]*/) m_prgram[0x2000 + ((offset - 0x3800) & 0x1fff)] = data; // higher 8K of WRAM @@ -1961,20 +1960,20 @@ void nes_2708_device::write_h(offs_t offset, uint8_t data) void nes_ac08_device::write_ex(offs_t offset, uint8_t data) { - LOG_MMC(("AC-08 write_ex, offset: %04x, data: %02x\n", offset, data)); + LOG("AC-08 write_ex, offset: %04x, data: %02x\n", offset, data); if (offset == 5) // $4025 set_nt_mirroring(!BIT(data, 3) ? PPU_MIRROR_VERT : PPU_MIRROR_HORZ); } uint8_t nes_ac08_device::read_m(offs_t offset) { - LOG_MMC(("AC-08 read_m, offset: %04x\n", offset)); + LOG("AC-08 read_m, offset: %04x\n", offset); return m_prg[(m_latch * 0x2000) + (offset & 0x1fff)]; } void nes_ac08_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("AC-08 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("AC-08 write_h, offset: %04x, data: %02x\n", offset, data); if (offset == 1) m_latch = BIT(data, 1, 4); @@ -2001,7 +2000,7 @@ void nes_ac08_device::write_h(offs_t offset, uint8_t data) uint8_t nes_mmalee_device::read_m(offs_t offset) { - LOG_MMC(("mmalee read_m, offset: %04x\n", offset)); + LOG("mmalee read_m, offset: %04x\n", offset); if (offset < 0x0800) return m_prg[0x8000 + offset]; @@ -2013,7 +2012,7 @@ uint8_t nes_mmalee_device::read_m(offs_t offset) void nes_mmalee_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("mmalee write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("mmalee write_m, offset: %04x, data: %02x\n", offset, data); if (!m_prgram.empty() && offset >= 0x1000 && offset < 0x1800) // WRAM only in these 2K m_prgram[offset & 0x7ff] = data; @@ -2037,7 +2036,7 @@ void nes_mmalee_device::write_m(offs_t offset, uint8_t data) uint8_t nes_rt01_device::read_h(offs_t offset) { -// LOG_MMC(("rt01 read_h, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "rt01 read_h, offset: %04x\n", offset); if ((offset >= 0x4e80) && (offset < 0x4f00)) return 0xf2 | (machine().rand() & 0x0d); @@ -2089,19 +2088,19 @@ void nes_yung08_device::write_45(offs_t offset, u8 data) void nes_yung08_device::write_ex(offs_t offset, u8 data) { - LOG_MMC(("yung08 write_ex, offset: %04x, data: %02x\n", offset, data)); + LOG("yung08 write_ex, offset: %04x, data: %02x\n", offset, data); write_45(offset + 0x4020, data); } void nes_yung08_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("yung08 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("yung08 write_l, offset: %04x, data: %02x\n", offset, data); write_45(offset + 0x4100, data); } u8 nes_yung08_device::read_l(offs_t offset) { - LOG_MMC(("yung08 read_l, offset: %04x\n", offset)); + LOG("yung08 read_l, offset: %04x\n", offset); offset += 0x100; if ((offset & 0x11ff) == 0x0122) // 0x4122 return m_irq_latch | 0x8a; @@ -2110,6 +2109,6 @@ u8 nes_yung08_device::read_l(offs_t offset) u8 nes_yung08_device::read_m(offs_t offset) { - LOG_MMC(("yung08 read_m, offset: %04x\n", offset)); + LOG("yung08 read_m, offset: %04x\n", offset); return m_prg[0x02 * 0x2000 + offset]; // fixed to bank #2 } diff --git a/src/devices/bus/nes/camerica.cpp b/src/devices/bus/nes/camerica.cpp index fd80dca08b0..658add539b8 100644 --- a/src/devices/bus/nes/camerica.cpp +++ b/src/devices/bus/nes/camerica.cpp @@ -28,12 +28,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -139,7 +138,7 @@ void nes_golden5_device::pcb_reset() void nes_bf9093_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bf9093 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bf9093 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6000) { @@ -174,7 +173,7 @@ void nes_bf9093_device::write_h(offs_t offset, u8 data) void nes_bf9096_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bf9096 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bf9096 write_h, offset: %04x, data: %02x\n", offset, data); if (offset < 0x4000) { @@ -205,7 +204,7 @@ void nes_bf9096_device::write_h(offs_t offset, u8 data) void nes_golden5_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("golden5 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("golden5 write_h, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x4000) { diff --git a/src/devices/bus/nes/cne.cpp b/src/devices/bus/nes/cne.cpp index 8300c56928c..0f0bfabb271 100644 --- a/src/devices/bus/nes/cne.cpp +++ b/src/devices/bus/nes/cne.cpp @@ -20,12 +20,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -84,7 +83,7 @@ void nes_cne_fsb_device::pcb_reset() void nes_cne_decathl_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("cne_decathl_w, offset: %04x, data: %02x\n", offset, data)); + LOG("cne_decathl_w, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x0065) { @@ -114,7 +113,7 @@ void nes_cne_decathl_device::write_h(offs_t offset, u8 data) void nes_cne_fsb_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("cne_fsb write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("cne_fsb write_m, offset: %04x, data: %02x\n", offset, data); if (offset < 0x0800) { @@ -140,7 +139,7 @@ void nes_cne_fsb_device::write_m(offs_t offset, u8 data) u8 nes_cne_fsb_device::read_m(offs_t offset) { - LOG_MMC(("cne_fsb read_m, offset: %04x\n", offset)); + LOG("cne_fsb read_m, offset: %04x\n", offset); if (offset >= 0x0800) return device_nes_cart_interface::read_m(offset); @@ -167,7 +166,7 @@ u8 nes_cne_fsb_device::read_m(offs_t offset) void nes_cne_shlz_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("cne_shlz write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("cne_shlz write_l, offset: %04x, data: %02x\n", offset, data); prg32(data >> 4); chr8(data & 0x0f, CHRROM); diff --git a/src/devices/bus/nes/cony.cpp b/src/devices/bus/nes/cony.cpp index 3e73f35a4bf..1b56fa36ce2 100644 --- a/src/devices/bus/nes/cony.cpp +++ b/src/devices/bus/nes/cony.cpp @@ -19,12 +19,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -127,7 +126,7 @@ TIMER_CALLBACK_MEMBER(nes_cony_device::irq_timer_tick) void nes_cony_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("cony write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("cony write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= m_extra_addr) // scratch ram from 0x5100 or 0x5400 @@ -136,7 +135,7 @@ void nes_cony_device::write_l(offs_t offset, u8 data) u8 nes_cony_device::read_l(offs_t offset) { - LOG_MMC(("cony read_l, offset: %04x\n", offset)); + LOG("cony read_l, offset: %04x\n", offset); offset += 0x100; if (offset >= m_extra_addr) // scratch ram from 0x5100 or 0x5400 @@ -149,7 +148,7 @@ u8 nes_cony_device::read_l(offs_t offset) void nes_cony_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("cony write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("cony write_m, offset: %04x, data: %02x\n", offset, data); if (!m_battery.empty()) m_battery[((m_outer_reg >> 6) * 0x2000 + offset) & (m_battery.size() - 1)] = data; @@ -157,7 +156,7 @@ void nes_cony_device::write_m(offs_t offset, u8 data) u8 nes_cony_device::read_m(offs_t offset) { - LOG_MMC(("cony read_m, offset: %04x\n", offset)); + LOG("cony read_m, offset: %04x\n", offset); if (!m_battery.empty()) return m_battery[((m_outer_reg >> 6) * 0x2000 + offset) & (m_battery.size() - 1)]; @@ -201,7 +200,7 @@ void nes_cony_device::set_chr() void nes_cony_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("cony write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("cony write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x0300) { @@ -280,7 +279,7 @@ void nes_cony1k_device::set_chr() void nes_yoko_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("yoko write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("yoko write_h, offset: %04x, data: %02x\n", offset, data); offset = (offset & 0xf0ff) | (offset & 0x0c00) >> 2; nes_cony_device::write_h(offset, data); diff --git a/src/devices/bus/nes/datach.cpp b/src/devices/bus/nes/datach.cpp index 5fe8ba5f2f9..32e7400c726 100644 --- a/src/devices/bus/nes/datach.cpp +++ b/src/devices/bus/nes/datach.cpp @@ -18,17 +18,15 @@ #include "datach.h" #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" #define EEPROM_INTERNAL 0 #define EEPROM_EXTERNAL 1 - #define TEST_EEPROM 0 //-------------------------------- @@ -267,7 +265,7 @@ void nes_datach_device::pcb_reset() iNES: mappers 157 - In MESS: Supported + In MAME: Supported TODO: Datach carts should actually be handled separately! Original carts were minicarts to be @@ -286,7 +284,7 @@ void nes_datach_device::pcb_reset() uint8_t nes_datach_device::read_m(offs_t offset) { - LOG_MMC(("Datach read_m, offset: %04x\n", offset)); + LOG("Datach read_m, offset: %04x\n", offset); uint8_t i2c_val = 0; #if TEST_EEPROM if (m_i2c_dir) @@ -303,8 +301,8 @@ uint8_t nes_datach_device::read_m(offs_t offset) uint8_t nes_datach_device::read_h(offs_t offset) { - LOG_MMC(("Datach read_h, offset: %04x\n", offset)); - // this shall be the proper code, but it's a bit slower, so we access directly the subcart below + LOG("Datach read_h, offset: %04x\n", offset); + // this should be the proper code, but it's a bit slower, so we access directly the subcart below //return m_subslot->read(offset); if (m_subslot->m_cart) @@ -315,7 +313,7 @@ uint8_t nes_datach_device::read_h(offs_t offset) void nes_datach_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("Datach write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("Datach write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x0f) { diff --git a/src/devices/bus/nes/discrete.cpp b/src/devices/bus/nes/discrete.cpp index 5b047a2daad..7705c4ba1bc 100644 --- a/src/devices/bus/nes/discrete.cpp +++ b/src/devices/bus/nes/discrete.cpp @@ -20,12 +20,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -92,7 +91,7 @@ void nes_74x161x161x32_device::pcb_reset() // there are two 'variants' depending on hardwired or mapper ctrl mirroring void nes_74x161x161x32_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("74x161x161x32 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("74x161x161x32 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -113,7 +112,7 @@ void nes_74x161x161x32_device::write_h(offs_t offset, u8 data) void nes_74x139x74_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("74x139x74 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("74x139x74 write_m, offset: %04x, data: %02x\n", offset, data); chr8(bitswap<2>(data, 0, 1), CHRROM); } @@ -137,7 +136,7 @@ void nes_74x139x74_device::write_m(offs_t offset, u8 data) void nes_74x377_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("74x377 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("74x377 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict, but not the prototype of Secret Scout, which actually breaks in case of conflict... data = account_bus_conflict(offset, data); @@ -158,7 +157,7 @@ void nes_74x377_device::write_h(offs_t offset, u8 data) void nes_74x161x138_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("74x161x138 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("74x161x138 write_m, offset: %04x, data: %02x\n", offset, data); chr8(data >> 2, CHRROM); prg32(data); diff --git a/src/devices/bus/nes/disksys.cpp b/src/devices/bus/nes/disksys.cpp index d53a2be2aab..9d783f6405a 100644 --- a/src/devices/bus/nes/disksys.cpp +++ b/src/devices/bus/nes/disksys.cpp @@ -24,12 +24,11 @@ #include "speaker.h" #ifdef NES_PCB_DEBUG - #define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else - #define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //----------------------------------------------- @@ -184,7 +183,7 @@ void nes_disksys_device::pcb_reset() void nes_disksys_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("Famicom Disk System write_h, offset %04x, data: %02x\n", offset, data)); + LOG("Famicom Disk System write_h, offset %04x, data: %02x\n", offset, data); if (offset < 0x6000) m_prgram[offset + 0x2000] = data; @@ -192,7 +191,7 @@ void nes_disksys_device::write_h(offs_t offset, uint8_t data) uint8_t nes_disksys_device::read_h(offs_t offset) { - LOG_MMC(("Famicom Disk System read_h, offset: %04x\n", offset)); + LOG("Famicom Disk System read_h, offset: %04x\n", offset); if (offset < 0x6000) return m_prgram[offset + 0x2000]; @@ -202,13 +201,13 @@ uint8_t nes_disksys_device::read_h(offs_t offset) void nes_disksys_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("Famicom Disk System write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("Famicom Disk System write_m, offset: %04x, data: %02x\n", offset, data); m_prgram[offset] = data; } uint8_t nes_disksys_device::read_m(offs_t offset) { - LOG_MMC(("Famicom Disk System read_m, offset: %04x\n", offset)); + LOG("Famicom Disk System read_m, offset: %04x\n", offset); return m_prgram[offset]; } @@ -224,7 +223,7 @@ void nes_disksys_device::hblank_irq(int scanline, bool vblank, bool blanked) void nes_disksys_device::write_ex(offs_t offset, uint8_t data) { - LOG_MMC(("Famicom Disk System write_ex, offset: %04x, data: %02x\n", offset, data)); + LOG("Famicom Disk System write_ex, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x20 && offset < 0x60) { @@ -317,7 +316,7 @@ void nes_disksys_device::write_ex(offs_t offset, uint8_t data) uint8_t nes_disksys_device::read_ex(offs_t offset) { - LOG_MMC(("Famicom Disk System read_ex, offset: %04x\n", offset)); + LOG("Famicom Disk System read_ex, offset: %04x\n", offset); uint8_t ret = 0x00; if (offset >= 0x20 && offset < 0x60) diff --git a/src/devices/bus/nes/event.cpp b/src/devices/bus/nes/event.cpp index 70aee4b90e0..46be863f5ac 100644 --- a/src/devices/bus/nes/event.cpp +++ b/src/devices/bus/nes/event.cpp @@ -17,14 +17,14 @@ #include "emu.h" #include "event.h" +#define LOG_HIFREQ (1U << 1) #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -194,7 +194,7 @@ void nes_event_device::set_prg() u8 nes_event2_device::read_l(offs_t offset) { -// LOG_MMC(("event2 read_l, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "event2 read_l, offset: %04x\n", offset); offset += 0x100; if (offset >= 0x1800) return (m_timer_count >= (0x10 | m_dsw->read()) << 25) ? 0x80 : 0; @@ -206,7 +206,7 @@ u8 nes_event2_device::read_l(offs_t offset) u8 nes_event2_device::read_m(offs_t offset) { -// LOG_MMC(("event2 read_m, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "event2 read_m, offset: %04x\n", offset); if (m_prgram.empty()) return get_open_bus(); else @@ -215,7 +215,7 @@ u8 nes_event2_device::read_m(offs_t offset) void nes_event2_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("event2 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("event2 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; switch (offset & 0x1c00) @@ -243,7 +243,7 @@ void nes_event2_device::write_l(offs_t offset, u8 data) void nes_event2_device::write_m(offs_t offset, u8 data) { -// LOG_MMC(("event2 write_m, offset: %04x, data: %02x\n", offset, data)); + LOGMASKED(LOG_HIFREQ, "event2 write_m, offset: %04x, data: %02x\n", offset, data); if (!m_prgram.empty()) m_prgram[offset % m_prgram.size()] = data; } diff --git a/src/devices/bus/nes/ggenie.cpp b/src/devices/bus/nes/ggenie.cpp index bddebcad512..58cb2655e89 100644 --- a/src/devices/bus/nes/ggenie.cpp +++ b/src/devices/bus/nes/ggenie.cpp @@ -19,13 +19,15 @@ #include "ggenie.h" #include "bus/nes/nes_carts.h" +#define LOG_HIFREQ (1U << 1) +#define LOG_INFO (1U << 2) + #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_INFO | LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (LOG_INFO) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -93,7 +95,7 @@ void nes_ggenie_device::pcb_reset() void nes_ggenie_device::write_h(offs_t offset, u8 data) { -// LOG_MMC(("ggenie write_h, offset: %04x, data: %02x\n", offset, data)); + LOGMASKED(LOG_HIFREQ, "ggenie write_h, offset: %04x, data: %02x\n", offset, data); if (m_gg_bypass) { @@ -142,16 +144,16 @@ void nes_ggenie_device::write_h(offs_t offset, u8 data) } // bit 7 is unused and always zero - logerror("Game Genie Summary:\n"); + LOGMASKED(LOG_INFO, "Game Genie Summary:\n"); for (int i = 0; i < 3; i++) { - logerror("Code %d: %s\n", i, m_gg_enable[i] ? "Yes" : "No"); + LOGMASKED(LOG_INFO, "Code %d: %s\n", i, m_gg_enable[i] ? "Yes" : "No"); if (m_gg_enable[i]) { - logerror("\tAddr: 0x%X\n", m_gg_addr[i]); - logerror("\tValue: 0x%X\n", m_gg_repl[i]); + LOGMASKED(LOG_INFO, "\tAddr: 0x%X\n", m_gg_addr[i]); + LOGMASKED(LOG_INFO, "\tValue: 0x%X\n", m_gg_repl[i]); if (m_gg_is_comp[i]) - logerror("\t if equals: 0x%X\n", m_gg_comp[i]); + LOGMASKED(LOG_INFO, "\t if equals: 0x%X\n", m_gg_comp[i]); } } } diff --git a/src/devices/bus/nes/henggedianzi.cpp b/src/devices/bus/nes/henggedianzi.cpp index a8de6e93783..46af837c524 100644 --- a/src/devices/bus/nes/henggedianzi.cpp +++ b/src/devices/bus/nes/henggedianzi.cpp @@ -23,12 +23,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -68,13 +67,13 @@ nes_hengg_xhzs_device::nes_hengg_xhzs_device(const machine_config &mconfig, cons iNES: mapper 177 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_hengg_srich_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("hengg_srich write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("hengg_srich write_h, offset: %04x, data: %02x\n", offset, data); prg32(data); set_nt_mirroring(BIT(data, 5) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); @@ -95,13 +94,13 @@ void nes_hengg_srich_device::write_h(offs_t offset, uint8_t data) iNES: mapper 179 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_hengg_xhzs_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("hengg_xhzs write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("hengg_xhzs write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x4100; if (offset & 0x5000) @@ -110,7 +109,7 @@ void nes_hengg_xhzs_device::write_l(offs_t offset, uint8_t data) void nes_hengg_xhzs_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("hengg_xhzs write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("hengg_xhzs write_h, offset: %04x, data: %02x\n", offset, data); set_nt_mirroring(BIT(data, 0) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); } diff --git a/src/devices/bus/nes/hes.cpp b/src/devices/bus/nes/hes.cpp index b23ad6c9f74..fcc5087c97d 100644 --- a/src/devices/bus/nes/hes.cpp +++ b/src/devices/bus/nes/hes.cpp @@ -18,12 +18,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -61,7 +60,7 @@ nes_hes_device::nes_hes_device(const machine_config &mconfig, const char *tag, d void nes_hes_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("hes write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("hes write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (BIT(offset, 8)) // $41xx, $43xx, ... $5fxx diff --git a/src/devices/bus/nes/irem.cpp b/src/devices/bus/nes/irem.cpp index f90959825a9..d7454402b05 100644 --- a/src/devices/bus/nes/irem.cpp +++ b/src/devices/bus/nes/irem.cpp @@ -21,12 +21,11 @@ #include "irem.h" #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -152,7 +151,7 @@ void nes_h3001_device::pcb_reset() void nes_lrog017_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("lrog017 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("lrog017 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -171,7 +170,7 @@ void nes_lrog017_device::write_h(offs_t offset, u8 data) void nes_holydivr_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("holy diver write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("holy diver write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -195,7 +194,7 @@ void nes_holydivr_device::write_h(offs_t offset, u8 data) void nes_tam_s1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("tam s1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("tam s1 write_h, offset: %04x, data: %02x\n", offset, data); if (offset < 0x4000) { @@ -222,7 +221,7 @@ void nes_g101_device::set_prg() void nes_g101_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("g101 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("g101 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7000) { @@ -279,7 +278,7 @@ TIMER_CALLBACK_MEMBER(nes_h3001_device::irq_timer_tick) void nes_h3001_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("h3001 write_h, offset %04x, data: %02x\n", offset, data)); + LOG("h3001 write_h, offset %04x, data: %02x\n", offset, data); switch (offset & 0x7007) { diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp index a83ebfb5a04..2ce809a4eea 100644 --- a/src/devices/bus/nes/jaleco.cpp +++ b/src/devices/bus/nes/jaleco.cpp @@ -23,14 +23,14 @@ #include "speaker.h" +#define LOG_UNHANDLED (1U << 1) #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_UNHANDLED | LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (LOG_UNHANDLED) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -206,7 +206,7 @@ void nes_ss88006_device::pcb_reset() void nes_jf11_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("jf11 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("jf11 write_m, offset: %04x, data: %02x\n", offset, data); chr8(data, CHRROM); prg32(data >> 4); } @@ -227,7 +227,7 @@ void nes_jf11_device::write_m(offs_t offset, u8 data) void nes_jf13_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("jf13 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("jf13 write_m, offset: %04x, data: %02x\n", offset, data); if (offset < 0x1000) { @@ -250,7 +250,7 @@ void nes_jf13_device::write_m(offs_t offset, u8 data) void nes_jf16_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("jf16 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("jf16 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -279,7 +279,7 @@ void nes_jf16_device::write_h(offs_t offset, u8 data) void nes_jf17_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("jf17 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("jf17 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -337,7 +337,7 @@ TIMER_CALLBACK_MEMBER(nes_ss88006_device::irq_timer_tick) u8 nes_ss88006_device::read_m(offs_t offset) { - LOG_MMC(("ss88006 read_m, offset: %04x\n", offset)); + LOG("ss88006 read_m, offset: %04x\n", offset); if (m_wram_protect & 1) // RAM enabled return device_nes_cart_interface::read_m(offset); @@ -347,7 +347,7 @@ u8 nes_ss88006_device::read_m(offs_t offset) void nes_ss88006_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("ss88006 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("ss88006 write_m, offset: %04x, data: %02x\n", offset, data); if (m_wram_protect == 0x03) // RAM enabled and writable device_nes_cart_interface::write_m(offset, data); @@ -355,7 +355,7 @@ void nes_ss88006_device::write_m(offs_t offset, u8 data) void nes_ss88006_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ss88006 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ss88006 write_h, offset: %04x, data: %02x\n", offset, data); int bank, shift; @@ -425,7 +425,7 @@ void nes_ss88006_device::write_h(offs_t offset, u8 data) break; default: - logerror("Jaleco SS88006 uncaught write, addr: %04x, value: %02x\n", offset + 0x8000, data); + LOGMASKED(LOG_UNHANDLED, "Jaleco SS88006 uncaught write, addr: %04x, value: %02x\n", offset + 0x8000, data); break; } } diff --git a/src/devices/bus/nes/jncota.cpp b/src/devices/bus/nes/jncota.cpp index 1206a0dd79b..613acd8e3f3 100644 --- a/src/devices/bus/nes/jncota.cpp +++ b/src/devices/bus/nes/jncota.cpp @@ -18,12 +18,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -79,7 +78,7 @@ void nes_jncota_kt1001_device::pcb_reset() void nes_jncota_kt1001_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("jncota_kt1001 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("jncota_kt1001 write_h, offset: %04x, data: %02x\n", offset, data); offset += 0x100; switch (offset & 0x1803) diff --git a/src/devices/bus/nes/jy.cpp b/src/devices/bus/nes/jy.cpp index 655634f22ef..54dd078499e 100644 --- a/src/devices/bus/nes/jy.cpp +++ b/src/devices/bus/nes/jy.cpp @@ -24,12 +24,11 @@ #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access ppu2c0x_device::BOTTOM_VISIBLE_SCANLINE #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -239,7 +238,7 @@ void nes_jy_typea_device::scanline_irq(int scanline, bool vblank, bool blanked) // 0x5000-0x5fff : sort of protection? uint8_t nes_jy_typea_device::read_l(offs_t offset) { - LOG_MMC(("JY Company write_m, offset: %04x\n", offset)); + LOG("JY Company write_m, offset: %04x\n", offset); offset += 0x100; if (offset >= 0x1000 && offset < 0x1800) @@ -263,7 +262,7 @@ uint8_t nes_jy_typea_device::read_l(offs_t offset) void nes_jy_typea_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("JY Company write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("JY Company write_m, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1800) @@ -280,7 +279,7 @@ void nes_jy_typea_device::write_l(offs_t offset, uint8_t data) // 0x6000-0x7fff : WRAM or open bus uint8_t nes_jy_typea_device::read_m(offs_t offset) { - LOG_MMC(("JY Company write_m, offset: %04x\n", offset)); + LOG("JY Company write_m, offset: %04x\n", offset); if (m_reg[0] & 0x80) return m_prg[(m_bank_6000 & m_prg_mask) * 0x2000 + (offset & 0x1fff)]; @@ -423,7 +422,7 @@ void nes_jy_typea_device::update_banks(int reg) void nes_jy_typea_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("JY Company write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("JY Company write_m, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7000) { diff --git a/src/devices/bus/nes/kaiser.cpp b/src/devices/bus/nes/kaiser.cpp index 4635c699895..aaa5a247341 100644 --- a/src/devices/bus/nes/kaiser.cpp +++ b/src/devices/bus/nes/kaiser.cpp @@ -31,14 +31,14 @@ #include "emu.h" #include "kaiser.h" +#define LOG_HIFREQ (1U << 1) #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -378,7 +378,7 @@ void nes_ks7057_device::pcb_reset() void nes_ks7058_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ks7058 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7058 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7080) { @@ -405,7 +405,7 @@ void nes_ks7058_device::write_h(offs_t offset, u8 data) void nes_ks7022_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ks7022 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7022 write_h, offset: %04x, data: %02x\n", offset, data); if (offset == 0) set_nt_mirroring(BIT(data, 2) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); @@ -415,7 +415,7 @@ void nes_ks7022_device::write_h(offs_t offset, u8 data) u8 nes_ks7022_device::read_h(offs_t offset) { - LOG_MMC(("ks7022 read_h, offset: %04x\n", offset)); + LOG("ks7022 read_h, offset: %04x\n", offset); if (offset == 0x7ffc) { @@ -465,7 +465,7 @@ void nes_ks7032_device::prg_update() void nes_ks7032_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ks7032_write, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7032_write, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7000) { @@ -500,7 +500,7 @@ void nes_ks7032_device::write_h(offs_t offset, u8 data) u8 nes_ks7032_device::read_m(offs_t offset) { - LOG_MMC(("ks7032 read_m, offset: %04x\n", offset)); + LOG("ks7032 read_m, offset: %04x\n", offset); return m_prg[(m_reg[4] * 0x2000 + offset) & (m_prg_size - 1)]; } @@ -526,7 +526,7 @@ u8 nes_ks7032_device::read_m(offs_t offset) void nes_ks202_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ks202 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ks202 write_h, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x7000) { @@ -583,13 +583,13 @@ u8 nes_ks202_device::read_m(offs_t offset) u8 nes_ks7016_device::read_m(offs_t offset) { -// LOG_MMC(("ks7016 read_m, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "ks7016 read_m, offset: %04x\n", offset); return m_prg[(m_latch * 0x2000 + offset) & (m_prg_size - 1)]; } void nes_ks7016_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ks7016 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7016 write_h, offset: %04x, data: %02x\n", offset, data); m_latch = BIT(offset, 2, 4); if (m_latch & 0x08) @@ -623,7 +623,7 @@ TIMER_CALLBACK_MEMBER(nes_ks7017_device::irq_timer_tick) void nes_ks7017_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("ks7017 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7017 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; switch (offset & 0x1f00) @@ -639,7 +639,7 @@ void nes_ks7017_device::write_l(offs_t offset, u8 data) void nes_ks7017_device::write_ex(offs_t offset, u8 data) { - LOG_MMC(("ks7017 write_ex, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7017 write_ex, offset: %04x, data: %02x\n", offset, data); offset += 0x4020; switch (offset) @@ -659,7 +659,7 @@ void nes_ks7017_device::write_ex(offs_t offset, u8 data) u8 nes_ks7017_device::read_ex(offs_t offset) { - LOG_MMC(("ks7017 read_ex, offset: %04x\n", offset)); + LOG("ks7017 read_ex, offset: %04x\n", offset); offset += 0x4020; if (offset == 0x4030) @@ -691,7 +691,7 @@ u8 nes_ks7017_device::read_ex(offs_t offset) void nes_ks7021a_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ks7021a write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7021a write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7000) { @@ -727,20 +727,22 @@ void nes_ks7021a_device::write_h(offs_t offset, u8 data) u8 nes_ks7010_device::read_m(offs_t offset) { -// LOG_MMC(("ks7010 read_m, offset: %04x, data: %02x\n", offset, data)); - return m_prg[(m_latch * 0x2000 + offset) & (m_prg_size - 1)]; + u8 data = m_prg[(m_latch * 0x2000 + offset) & (m_prg_size - 1)]; + LOGMASKED(LOG_HIFREQ, "ks7010 read_m, offset: %04x, data: %02x\n", offset, data); + return data; } u8 nes_ks7010_device::read_h(offs_t offset) { -// LOG_MMC(("ks7010 read_h, offset: %04x, data: %02x\n", offset, data)); if ((offset >= 0x4ab6 && offset <= 0x4ad6) || offset == 0x6be2 || offset == 0x6be3 || offset == 0x6e32 || offset == 0x7ffc) // HACK! FIXME { m_latch = BIT(offset, 2, 4); chr8(m_latch, CHRROM); } - return hi_access_rom(offset); + u8 data = hi_access_rom(offset); + LOGMASKED(LOG_HIFREQ, "ks7010 read_h, offset: %04x, data: %02x\n", offset, data); + return data; } /*------------------------------------------------- @@ -757,7 +759,7 @@ u8 nes_ks7010_device::read_h(offs_t offset) void nes_ks7012_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ks7012 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7012 write_h, offset: %04x, data: %02x\n", offset, data); if (offset == 0x60a0) prg32(0); @@ -779,13 +781,13 @@ void nes_ks7012_device::write_h(offs_t offset, u8 data) void nes_ks7013b_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("ks7013b write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7013b write_l, offset: %04x, data: %02x\n", offset, data); prg16_89ab(data); } void nes_ks7013b_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ks7013b write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7013b write_h, offset: %04x, data: %02x\n", offset, data); set_nt_mirroring((data & 1) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); } @@ -816,7 +818,7 @@ void nes_ks7013b_device::write_h(offs_t offset, u8 data) u8 nes_ks7030_device::read_m(offs_t offset) { -// LOG_MMC(("ks7030 read_m, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "ks7030 read_m, offset: %04x\n", offset); if (offset < 0x0c00) // first of 3k WRAM return m_prgram[offset]; else if (offset < 0x1000) // last 1k of 4k PRG bank @@ -827,14 +829,14 @@ u8 nes_ks7030_device::read_m(offs_t offset) void nes_ks7030_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("ks7030 write_m, offset: %04x\n", offset)); + LOG("ks7030 write_m, offset: %04x\n", offset); if (offset < 0x0c00) // first 3k of WRAM m_prgram[offset] = data; } u8 nes_ks7030_device::read_h(offs_t offset) { -// LOG_MMC(("ks7030 read_h, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "ks7030 read_h, offset: %04x\n", offset); if (offset < 0x3800 || offset >= 0x5800) // fixed 32k PRG, split 14k and 10k windows return m_prg[0x18000 + (offset & 0x7fff)]; else if (offset < 0x4000) // middle 2k of WRAM @@ -847,7 +849,7 @@ u8 nes_ks7030_device::read_h(offs_t offset) void nes_ks7030_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ks7030 write_h, offset: %04x\n", offset)); + LOG("ks7030 write_h, offset: %04x\n", offset); if (offset < 0x1000) { set_nt_mirroring(BIT(offset, 3) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); @@ -881,7 +883,7 @@ void nes_ks7030_device::write_h(offs_t offset, u8 data) u8 nes_ks7031_device::read_m(offs_t offset) { -// LOG_MMC(("ks7031 read_m, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "ks7031 read_m, offset: %04x\n", offset); return m_prg[(m_reg[BIT(offset, 11, 2)] * 0x0800) + (offset & 0x7ff)]; } @@ -894,7 +896,7 @@ u8 nes_ks7031_device::read_h(offs_t offset) void nes_ks7031_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ks7031 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7031 write_h, offset: %04x, data: %02x\n", offset, data); m_reg[BIT(offset, 11, 2)] = data & 0x3f; } @@ -917,7 +919,7 @@ void nes_ks7031_device::write_h(offs_t offset, u8 data) u8 nes_ks7037_device::read_m(offs_t offset) { -// LOG_MMC(("ks7037 read_m, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "ks7037 read_m, offset: %04x\n", offset); if (offset < 0x1000) return m_prgram[offset]; else @@ -926,14 +928,14 @@ u8 nes_ks7037_device::read_m(offs_t offset) void nes_ks7037_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("ks7037 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7037 write_m, offset: %04x, data: %02x\n", offset, data); if (offset < 0x1000) m_prgram[offset] = data; } u8 nes_ks7037_device::read_h(offs_t offset) { -// LOG_MMC(("ks7037 read_h, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "ks7037 read_h, offset: %04x\n", offset); if (offset >= 0x3000 && offset < 0x4000) return m_prgram[0x1000 + (offset & 0x0fff)]; @@ -943,7 +945,7 @@ u8 nes_ks7037_device::read_h(offs_t offset) void nes_ks7037_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ks7037 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7037 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7000) { @@ -984,13 +986,13 @@ void nes_ks7037_device::write_h(offs_t offset, u8 data) u8 nes_ks7057_device::read_m(offs_t offset) { -// LOG_MMC(("ks7057 read_m, offset: %04x\n", offset)); + LOG("ks7057 read_m, offset: %04x\n", offset); return m_prg[0x800 * m_reg[BIT(offset, 11, 2) + 4] + (offset & 0x7ff)]; } u8 nes_ks7057_device::read_h(offs_t offset) { -// LOG_MMC(("ks7057 read_h, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "ks7057 read_h, offset: %04x\n", offset); if (offset < 0x2000) return m_prg[0x800 * m_reg[BIT(offset, 11, 2)] + (offset & 0x7ff)]; @@ -999,7 +1001,7 @@ u8 nes_ks7057_device::read_h(offs_t offset) void nes_ks7057_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ks7057 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ks7057 write_h, offset: %04x, data: %02x\n", offset, data); if (offset < 0x2000) set_nt_mirroring(BIT(data, 0) ? PPU_MIRROR_VERT : PPU_MIRROR_HORZ); diff --git a/src/devices/bus/nes/karastudio.cpp b/src/devices/bus/nes/karastudio.cpp index 402f803cf48..0cca5acbe11 100644 --- a/src/devices/bus/nes/karastudio.cpp +++ b/src/devices/bus/nes/karastudio.cpp @@ -32,7 +32,7 @@ #include "karastudio.h" #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else #define VERBOSE 0 #endif diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp index 64835930218..27362d28c8c 100644 --- a/src/devices/bus/nes/konami.cpp +++ b/src/devices/bus/nes/konami.cpp @@ -24,14 +24,15 @@ #include "speaker.h" +#define LOG_UNHANDLED (1U << 1) #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_UNHANDLED | LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (LOG_UNHANDLED) #endif +#include "logmacro.h" -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) //------------------------------------------------- // constructor @@ -209,7 +210,7 @@ void nes_konami_vrc7_device::pcb_reset() void nes_konami_vrc1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("VRC-1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("VRC-1 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7000) { @@ -246,7 +247,7 @@ void nes_konami_vrc1_device::write_h(offs_t offset, u8 data) u8 nes_konami_vrc2_device::read_m(offs_t offset) { - LOG_MMC(("VRC-2 read_m, offset: %04x\n", offset)); + LOG("VRC-2 read_m, offset: %04x\n", offset); if (!m_battery.empty() || !m_prgram.empty()) return device_nes_cart_interface::read_m(offset); @@ -256,7 +257,7 @@ u8 nes_konami_vrc2_device::read_m(offs_t offset) void nes_konami_vrc2_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("VRC-2 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("VRC-2 write_m, offset: %04x, data: %02x\n", offset, data); if (!m_battery.empty() || !m_prgram.empty()) device_nes_cart_interface::write_m(offset, data); @@ -266,7 +267,7 @@ void nes_konami_vrc2_device::write_m(offs_t offset, u8 data) void nes_konami_vrc2_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("VRC-2 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("VRC-2 write_h, offset: %04x, data: %02x\n", offset, data); u8 addr_lines = bitswap<2>(offset, m_vrc_ls_prg_a, m_vrc_ls_prg_b); @@ -292,7 +293,7 @@ void nes_konami_vrc2_device::write_h(offs_t offset, u8 data) break; } default: - logerror("VRC-2 write_h uncaught write, addr: %04x value: %02x\n", offset + 0x8000, data); + LOGMASKED(LOG_UNHANDLED, "VRC-2 write_h uncaught write, addr: %04x value: %02x\n", offset + 0x8000, data); break; } } @@ -327,7 +328,7 @@ TIMER_CALLBACK_MEMBER(nes_konami_vrc3_device::irq_timer_tick) void nes_konami_vrc3_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("VRC-3 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("VRC-3 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7000) { @@ -357,7 +358,7 @@ void nes_konami_vrc3_device::write_h(offs_t offset, u8 data) prg16_89ab(data & 0x07); break; default: - logerror("VRC-3 write_h uncaught write, offset %04x, data: %02x\n", offset, data); + LOGMASKED(LOG_UNHANDLED, "VRC-3 write_h uncaught write, offset %04x, data: %02x\n", offset, data); break; } } @@ -449,7 +450,7 @@ void nes_konami_vrc4_device::set_chr(int chr_base, int chr_mask) u8 nes_konami_vrc4_device::read_m(offs_t offset) { - LOG_MMC(("VRC-4 read_m, offset: %04x\n", offset)); + LOG("VRC-4 read_m, offset: %04x\n", offset); if (m_wram_enable) return device_nes_cart_interface::read_m(offset); @@ -459,7 +460,7 @@ u8 nes_konami_vrc4_device::read_m(offs_t offset) void nes_konami_vrc4_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("VRC-4 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("VRC-4 write_m, offset: %04x, data: %02x\n", offset, data); if (m_wram_enable) device_nes_cart_interface::write_m(offset, data); @@ -467,7 +468,7 @@ void nes_konami_vrc4_device::write_m(offs_t offset, u8 data) void nes_konami_vrc4_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("VRC-4 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("VRC-4 write_h, offset: %04x, data: %02x\n", offset, data); u8 addr_lines = bitswap<2>(offset, m_vrc_ls_prg_a, m_vrc_ls_prg_b); @@ -534,7 +535,7 @@ void nes_konami_vrc4_device::write_h(offs_t offset, u8 data) void nes_konami_vrc6_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("VRC-6 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("VRC-6 write_h, offset: %04x, data: %02x\n", offset, data); u8 addr_lines = bitswap<2>(offset, m_vrc_ls_prg_a, m_vrc_ls_prg_b); @@ -578,7 +579,7 @@ void nes_konami_vrc6_device::write_h(offs_t offset, u8 data) irq_ack_w(); break; default: - logerror("VRC-6 write_h uncaught write, addr: %04x value: %02x\n", ((offset & 0x7000) | addr_lines) + 0x8000, data); + LOGMASKED(LOG_UNHANDLED, "VRC-6 write_h uncaught write, addr: %04x value: %02x\n", ((offset & 0x7000) | addr_lines) + 0x8000, data); break; } break; @@ -614,7 +615,7 @@ void nes_konami_vrc6_device::device_add_mconfig(machine_config &config) void nes_konami_vrc7_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("VRC-7 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("VRC-7 write_h, offset: %04x, data: %02x\n", offset, data); u8 reg = bitswap<4>(offset, 14, 13, 12, m_vrc_ls_prg_a); diff --git a/src/devices/bus/nes/legacy.cpp b/src/devices/bus/nes/legacy.cpp index 8625c4fab97..9d7fd648645 100644 --- a/src/devices/bus/nes/legacy.cpp +++ b/src/devices/bus/nes/legacy.cpp @@ -20,12 +20,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -117,13 +116,13 @@ void nes_ffe8_device::pcb_reset() Known Boards: FFE3 Copier Board Games: Hacked versions of games - In MESS: Supported? (I have no games to test this) + In MAME: Supported? (I have no games to test this) -------------------------------------------------*/ void nes_ffe3_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("mapper8 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("mapper8 write_h, offset: %04x, data: %02x\n", offset, data); chr8(data & 0x07, CHRROM); prg16_89ab(data >> 3); @@ -136,7 +135,7 @@ void nes_ffe3_device::write_h(offs_t offset, uint8_t data) Known Boards: FFE4 Copier Board Games: Hacked versions of games - In MESS: Supported? Not sure if we could also have ExRAM or not... + In MAME: Supported? Not sure if we could also have ExRAM or not... However, priority is pretty low for this mapper. -------------------------------------------------*/ @@ -158,7 +157,7 @@ TIMER_CALLBACK_MEMBER(nes_ffe4_device::irq_timer_tick) void nes_ffe4_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("mapper6 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("mapper6 write_l, offset: %04x, data: %02x\n", offset, data); switch (offset) { @@ -206,7 +205,7 @@ uint8_t nes_ffe4_device::chr_r(offs_t offset) void nes_ffe4_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("mapper6 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("mapper6 write_h, offset: %04x, data: %02x\n", offset, data); if (!m_latch) // when in "FFE mode" we are forced to use CHRRAM/EXRAM bank? { @@ -235,13 +234,13 @@ void nes_ffe4_device::write_h(offs_t offset, uint8_t data) Known Boards: FFE8 Copier Board Games: Hacked versions of games - In MESS: Partially Supported. + In MAME: Partially Supported. -------------------------------------------------*/ void nes_ffe8_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("mapper17 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("mapper17 write_l, offset: %04x, data: %02x\n", offset, data); switch (offset) { diff --git a/src/devices/bus/nes/mmc1.cpp b/src/devices/bus/nes/mmc1.cpp index 221b81e294e..c2cbccf77e9 100644 --- a/src/devices/bus/nes/mmc1.cpp +++ b/src/devices/bus/nes/mmc1.cpp @@ -27,12 +27,11 @@ #include "mmc1.h" #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -215,7 +214,7 @@ void nes_sxrom_device::update_regs(int reg) void nes_sxrom_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("sxrom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("sxrom write_h, offset: %04x, data: %02x\n", offset, data); // There is only one latch and shift counter, shared amongst the 4 regs (testcase: Space Shuttle) @@ -257,7 +256,7 @@ void nes_sxrom_device::write_h(offs_t offset, u8 data) void nes_sxrom_device::write_m(offs_t offset, u8 data) { u8 bank = BIT(m_reg[1], 2, 2); - LOG_MMC(("sxrom write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("sxrom write_m, offset: %04x, data: %02x\n", offset, data); if (!BIT(m_reg[3], 4) || m_mmc1_type == mmc1_type::MMC1A) // WRAM enabled { @@ -271,7 +270,7 @@ void nes_sxrom_device::write_m(offs_t offset, u8 data) u8 nes_sxrom_device::read_m(offs_t offset) { u8 bank = BIT(m_reg[1], 2, 2); - LOG_MMC(("sxrom read_m, offset: %04x\n", offset)); + LOG("sxrom read_m, offset: %04x\n", offset); if (!BIT(m_reg[3], 4) || m_mmc1_type == mmc1_type::MMC1A) // WRAM enabled { @@ -288,7 +287,7 @@ u8 nes_sxrom_device::read_m(offs_t offset) void nes_sorom_device::write_m(offs_t offset, u8 data) { u8 type = BIT(m_reg[0], 4) ? BIT(m_reg[1], 4) : BIT(m_reg[1], 3); - LOG_MMC(("sorom write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("sorom write_m, offset: %04x, data: %02x\n", offset, data); if (!BIT(m_reg[3], 4) || m_mmc1_type == mmc1_type::MMC1A) // WRAM enabled { @@ -302,7 +301,7 @@ void nes_sorom_device::write_m(offs_t offset, u8 data) u8 nes_sorom_device::read_m(offs_t offset) { u8 type = BIT(m_reg[0], 4) ? BIT(m_reg[1], 4) : BIT(m_reg[1], 3); - LOG_MMC(("sorom read_m, offset: %04x\n", offset)); + LOG("sorom read_m, offset: %04x\n", offset); if (!BIT(m_reg[3], 4) || m_mmc1_type == mmc1_type::MMC1A) // WRAM enabled { @@ -318,7 +317,7 @@ u8 nes_sorom_device::read_m(offs_t offset) // SZROM has two RAM banks, the first is not battery backed up, the second is. void nes_szrom_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("szrom write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("szrom write_m, offset: %04x, data: %02x\n", offset, data); if (!BIT(m_reg[3], 4) || m_mmc1_type == mmc1_type::MMC1A) // WRAM enabled { @@ -331,7 +330,7 @@ void nes_szrom_device::write_m(offs_t offset, u8 data) u8 nes_szrom_device::read_m(offs_t offset) { - LOG_MMC(("szrom read_m, offset: %04x\n", offset)); + LOG("szrom read_m, offset: %04x\n", offset); if (!BIT(m_reg[3], 4) || m_mmc1_type == mmc1_type::MMC1A) // WRAM enabled { diff --git a/src/devices/bus/nes/mmc1_clones.cpp b/src/devices/bus/nes/mmc1_clones.cpp index 58ee73330cd..8c318c4b96c 100644 --- a/src/devices/bus/nes/mmc1_clones.cpp +++ b/src/devices/bus/nes/mmc1_clones.cpp @@ -16,12 +16,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -181,7 +180,7 @@ void nes_txc_22110_device::pcb_reset() void nes_ninjaryu_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("unl_ninjaryu write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("unl_ninjaryu write_h, offset: %04x, data: %02x\n", offset, data); u8 reg = BIT(offset, 13, 2); m_reg[reg] = data; update_regs(reg); @@ -221,7 +220,7 @@ void nes_bmc_jy012005_device::set_chr() void nes_bmc_jy012005_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_jy012005 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_jy012005 write_m, offset: %04x, data: %02x\n", offset, data); if (!BIT(m_latch0, 7)) // outer bank lock { @@ -253,7 +252,7 @@ void nes_bmc_jy820845c_device::update_banks() // used by menu and MHROM games void nes_bmc_jy820845c_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_jy820845c write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_jy820845c write_m, offset: %04x, data: %02x\n", offset, data); nes_sxrom_device::write_m(offset, data); // register overlaid on WRAM @@ -272,7 +271,7 @@ void nes_bmc_jy820845c_device::write_m(offs_t offset, u8 data) void nes_bmc_jy820845c_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_jy820845c write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_jy820845c write_h, offset: %04x, data: %02x\n", offset, data); m_latch0 = data; @@ -298,7 +297,7 @@ void nes_bmc_jy820845c_device::write_h(offs_t offset, u8 data) void nes_farid_slrom_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("farid_slrom write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("farid_slrom write_m, offset: %04x, data: %02x\n", offset, data); if (!BIT(m_reg[3], 4) && !BIT(m_outer, 3)) // MMC1 WRAM enabled and outer bank not locked m_outer = data; } @@ -342,7 +341,7 @@ void nes_farid_slrom_device::write_m(offs_t offset, u8 data) void nes_srpg5in1_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("srpg5in1 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("srpg5in1 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1000) @@ -359,7 +358,7 @@ void nes_srpg5in1_device::write_l(offs_t offset, u8 data) void nes_srpg5in1_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("srpg5in1 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("srpg5in1 write_m, offset: %04x, data: %02x\n", offset, data); u8 bank = BIT(m_outer, 1) ? bitswap<3>(m_outer, 1, 2, 0) : (m_outer & 1) << 1 | BIT(m_reg[1], 3); @@ -369,7 +368,7 @@ void nes_srpg5in1_device::write_m(offs_t offset, u8 data) u8 nes_srpg5in1_device::read_m(offs_t offset) { - LOG_MMC(("srpg5in1 read_m, offset: %04x\n", offset)); + LOG("srpg5in1 read_m, offset: %04x\n", offset); u8 bank = BIT(m_outer, 1) ? bitswap<3>(m_outer, 1, 2, 0) : (m_outer & 1) << 1 | BIT(m_reg[1], 3); @@ -405,7 +404,7 @@ void nes_txc_22110_device::update_banks() // used by menu and Space Shadow void nes_txc_22110_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("TXC 22110 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("TXC 22110 write_l, offset: %04x, data: %02x\n", offset, data); if (offset < 0x100) // $4100 - $41ff { m_mode = data; @@ -421,7 +420,7 @@ void nes_txc_22110_device::write_l(offs_t offset, u8 data) void nes_txc_22110_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("TXC 22110 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("TXC 22110 write_h, offset: %04x, data: %02x\n", offset, data); if (m_mode & 1) nes_sxrom_device::write_h(offset, data); diff --git a/src/devices/bus/nes/mmc2.cpp b/src/devices/bus/nes/mmc2.cpp index 02da59b7aad..70c5ac71b5c 100644 --- a/src/devices/bus/nes/mmc2.cpp +++ b/src/devices/bus/nes/mmc2.cpp @@ -16,12 +16,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -96,7 +95,7 @@ void nes_fxrom_device::pcb_reset() iNES: mapper 9 - In MESS: Supported + In MAME: Supported -------------------------------------------------*/ @@ -104,25 +103,25 @@ void nes_pxrom_device::ppu_latch(offs_t offset) { if ((offset & 0x3ff0) == 0x0fd0) { - LOG_MMC(("mmc2 vrom latch switch (bank 0 low): %02x\n", m_reg[0])); + LOG("mmc2 vrom latch switch (bank 0 low): %02x\n", m_reg[0]); m_latch1 = 0xfd; chr4_0(m_reg[0], CHRROM); } else if ((offset & 0x3ff0) == 0x0fe0) { - LOG_MMC(("mmc2 vrom latch switch (bank 0 high): %02x\n", m_reg[1])); + LOG("mmc2 vrom latch switch (bank 0 high): %02x\n", m_reg[1]); m_latch1 = 0xfe; chr4_0(m_reg[1], CHRROM); } else if ((offset & 0x3ff0) == 0x1fd0) { - LOG_MMC(("mmc2 vrom latch switch (bank 1 low): %02x\n", m_reg[2])); + LOG("mmc2 vrom latch switch (bank 1 low): %02x\n", m_reg[2]); m_latch2 = 0xfd; chr4_4(m_reg[2], CHRROM); } else if ((offset & 0x3ff0) == 0x1fe0) { - LOG_MMC(("mmc2 vrom latch switch (bank 0 high): %02x\n", m_reg[3])); + LOG("mmc2 vrom latch switch (bank 0 high): %02x\n", m_reg[3]); m_latch2 = 0xfe; chr4_4(m_reg[3], CHRROM); } @@ -130,7 +129,7 @@ void nes_pxrom_device::ppu_latch(offs_t offset) void nes_pxrom_device::pxrom_write(offs_t offset, uint8_t data) { - LOG_MMC(("pxrom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("pxrom write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7000) { case 0x2000: @@ -160,7 +159,7 @@ void nes_pxrom_device::pxrom_write(offs_t offset, uint8_t data) set_nt_mirroring(BIT(data, 0) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); break; default: - LOG_MMC(("MMC2 uncaught w: %04x:%02x\n", offset, data)); + LOG("MMC2 uncaught w: %04x:%02x\n", offset, data); break; } } @@ -176,13 +175,13 @@ void nes_pxrom_device::pxrom_write(offs_t offset, uint8_t data) iNES: mapper 10 - In MESS: Supported + In MAME: Supported -------------------------------------------------*/ void nes_fxrom_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("fxrom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("fxrom write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7000) { case 0x2000: diff --git a/src/devices/bus/nes/mmc3.cpp b/src/devices/bus/nes/mmc3.cpp index ff9774882fd..79b6c7deefa 100644 --- a/src/devices/bus/nes/mmc3.cpp +++ b/src/devices/bus/nes/mmc3.cpp @@ -29,14 +29,14 @@ #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access ppu2c0x_device::BOTTOM_VISIBLE_SCANLINE +#define LOG_UNHANDLED (1U << 1) #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_UNHANDLED | LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (LOG_UNHANDLED) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -216,7 +216,7 @@ void nes_txrom_device::hblank_irq(int scanline, bool vblank, bool blanked) if (m_irq_enable && !blanked && (m_irq_count == 0) && (prior_count || m_irq_clear /*|| !m_mmc3_alt_irq*/)) // according to blargg the latter should be present as well, but it breaks Rampart and Joe & Mac US: they probably use the alt irq! { - LOG_MMC(("irq fired, scanline: %d\n", scanline)); + LOG("irq fired, scanline: %d\n", scanline); set_irq_line(ASSERT_LINE); } } @@ -264,7 +264,7 @@ void nes_txrom_device::txrom_write(offs_t offset, uint8_t data) { uint8_t mmc_helper, cmd; - LOG_MMC(("txrom_write, offset: %04x, data: %02x\n", offset, data)); + LOG("txrom_write, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -326,14 +326,14 @@ void nes_txrom_device::txrom_write(offs_t offset, uint8_t data) break; default: - logerror("txrom_write uncaught: %04x value: %02x\n", offset + 0x8000, data); + LOGMASKED(LOG_UNHANDLED, "txrom_write uncaught: %04x value: %02x\n", offset + 0x8000, data); break; } } void nes_txrom_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("txrom write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("txrom write_m, offset: %04x, data: %02x\n", offset, data); if (BIT(m_wram_protect, 7) && !BIT(m_wram_protect, 6)) { @@ -346,7 +346,7 @@ void nes_txrom_device::write_m(offs_t offset, uint8_t data) uint8_t nes_txrom_device::read_m(offs_t offset) { - LOG_MMC(("txrom read_m, offset: %04x\n", offset)); + LOG("txrom read_m, offset: %04x\n", offset); if (BIT(m_wram_protect, 7)) { @@ -371,7 +371,7 @@ uint8_t nes_txrom_device::read_m(offs_t offset) void nes_hkrom_device::write_m(offs_t offset, uint8_t data) { uint8_t write_hi, write_lo; - LOG_MMC(("hkrom write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("hkrom write_m, offset: %04x, data: %02x\n", offset, data); if (offset < 0x1000) return; @@ -389,7 +389,7 @@ void nes_hkrom_device::write_m(offs_t offset, uint8_t data) uint8_t nes_hkrom_device::read_m(offs_t offset) { - LOG_MMC(("hkrom read_m, offset: %04x\n", offset)); + LOG("hkrom read_m, offset: %04x\n", offset); if (offset < 0x1000) return get_open_bus(); @@ -410,7 +410,7 @@ uint8_t nes_hkrom_device::read_m(offs_t offset) void nes_hkrom_device::write_h(offs_t offset, uint8_t data) { uint8_t mmc6_helper; - LOG_MMC(("hkrom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("hkrom write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -473,7 +473,7 @@ void nes_txsrom_device::set_chr(u8 chr, int chr_base, int chr_mask) void nes_txsrom_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("txsrom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("txsrom write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -516,7 +516,7 @@ void nes_tqrom_device::chr_cb(int start, int bank, int source) void nes_qj_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("qj write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("qj write_m, offset: %04x, data: %02x\n", offset, data); if (BIT(m_wram_protect, 7) && !BIT(m_wram_protect, 6)) { @@ -542,7 +542,7 @@ void nes_qj_device::write_m(offs_t offset, u8 data) void nes_zz_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("zz write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("zz write_m, offset: %04x, data: %02x\n", offset, data); if (BIT(m_wram_protect, 7) && !BIT(m_wram_protect, 6)) { diff --git a/src/devices/bus/nes/mmc3_clones.cpp b/src/devices/bus/nes/mmc3_clones.cpp index b74ec375e55..28fc05e8ad8 100644 --- a/src/devices/bus/nes/mmc3_clones.cpp +++ b/src/devices/bus/nes/mmc3_clones.cpp @@ -14,14 +14,14 @@ #include "emu.h" #include "mmc3_clones.h" +#define LOG_HIFREQ (1U << 1) #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -1055,7 +1055,7 @@ void nes_smd133_device::pcb_reset() void nes_nitra_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("nitra write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("nitra write_h, offset: %04x, data: %02x\n", offset, data); txrom_write((offset & 0x6000) | BIT(offset, 10), offset); } @@ -1082,7 +1082,7 @@ void nes_bmw8544_device::set_prg(int prg_base, int prg_mask) u8 nes_bmw8544_device::read_m(offs_t offset) { -// LOG_MMC(("bmw8544 read_m, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "bmw8544 read_m, offset: %04x\n", offset); // CHR banking may be done by reads in this address range @@ -1091,7 +1091,7 @@ u8 nes_bmw8544_device::read_m(offs_t offset) void nes_bmw8544_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmw8544 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmw8544 write_m, offset: %04x, data: %02x\n", offset, data); m_reg = data; prg8_89(data); } @@ -1112,7 +1112,7 @@ void nes_bmw8544_device::write_m(offs_t offset, u8 data) void nes_fs6_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("fs6 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("fs6 write_h, offset: %04x, data: %02x\n", offset, data); txrom_write(bitswap<2>(offset, 0, 1) | (offset & ~0x03), data); } @@ -1134,7 +1134,7 @@ void nes_fs6_device::write_h(offs_t offset, u8 data) void nes_sbros11_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("smb11 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("smb11 write_h, offset: %04x, data: %02x\n", offset, data); txrom_write((offset & 0x6000) | BIT(offset, 2), data); } @@ -1168,7 +1168,7 @@ void nes_malisb_device::chr_cb(int start, int bank, int source) void nes_malisb_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("malisb write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("malisb write_h, offset: %04x, data: %02x\n", offset, data); offset = (offset & 0x6000) | BIT(offset, 3) | (BIT(offset, 14) & BIT(offset, 2)); txrom_write(offset, data); @@ -1213,7 +1213,7 @@ void nes_family4646_device::prg_cb(int start, int bank) void nes_family4646_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("family4646 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("family4646 write_m, offset: %04x, data: %02x\n", offset, data); int reg = offset & 0x03; if (!BIT(m_reg[0], 7)) // lock bit @@ -1243,13 +1243,13 @@ void nes_family4646_device::write_m(offs_t offset, u8 data) iNES: mapper 254 - In MESS: + In MAME: -------------------------------------------------*/ void nes_pikay2k_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("pikay2k write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("pikay2k write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -1269,14 +1269,14 @@ void nes_pikay2k_device::write_h(offs_t offset, uint8_t data) // strange WRAM usage: it is protected at start, and gets unprotected after the first write to 0xa000 void nes_pikay2k_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("pikay2k write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("pikay2k write_m, offset: %04x, data: %02x\n", offset, data); m_prgram[offset & 0x1fff] = data; } uint8_t nes_pikay2k_device::read_m(offs_t offset) { - LOG_MMC(("pikay2k read_m, offset: %04x\n", offset)); + LOG("pikay2k read_m, offset: %04x\n", offset); return m_prgram[offset & 0x1fff] ^ (m_reg[0] & m_reg[1]); } @@ -1330,7 +1330,7 @@ void nes_8237_device::prg_cb(int start, int bank) void nes_8237_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("unl_8237 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("unl_8237 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; switch (offset & 0x1007) @@ -1348,7 +1348,7 @@ void nes_8237_device::write_l(offs_t offset, u8 data) void nes_8237_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("unl_8237 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("unl_8237 write_h, offset: %04x, data: %02x\n", offset, data); static constexpr u8 reg_table[8][8] = { @@ -1403,7 +1403,7 @@ void nes_8237_device::write_h(offs_t offset, u8 data) u8 nes_158b_device::read_l(offs_t offset) { - LOG_MMC(("unl_158b read_l, offset: %04x\n", offset)); + LOG("unl_158b read_l, offset: %04x\n", offset); static constexpr u8 prot_table[8][8] = { @@ -1428,7 +1428,7 @@ u8 nes_158b_device::read_l(offs_t offset) void nes_158b_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("unl_158b write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("unl_158b write_l, offset: %04x, data: %02x\n", offset, data); switch ((offset + 0x100) & 0x1003) { @@ -1464,7 +1464,7 @@ void nes_kasing_device::prg_cb(int start, int bank) void nes_kasing_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("kasing write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("kasing write_m, offset: %04x, data: %02x\n", offset, data); if (BIT(offset, 0)) { @@ -1505,7 +1505,7 @@ void nes_kasing_device::write_m(offs_t offset, u8 data) void nes_sglionk_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("sglionk write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("sglionk write_h, offset: %04x, data: %02x\n", offset, data); static constexpr u8 reg_table[2][8] = { @@ -1547,7 +1547,7 @@ void nes_sglionk_device::write_h(offs_t offset, u8 data) void nes_kay_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("kay write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("kay write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1000) @@ -1564,7 +1564,7 @@ void nes_kay_device::write_l(offs_t offset, u8 data) u8 nes_kay_device::read_l(offs_t offset) { - LOG_MMC(("kay read_l, offset: %04x\n", offset)); + LOG("kay read_l, offset: %04x\n", offset); static constexpr u8 prot_table[4] = {0x83, 0x83, 0x42, 0x00}; @@ -1595,7 +1595,7 @@ void nes_kay_device::set_prg(int prg_base, int prg_mask) void nes_kay_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("kay write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("kay write_h, offset: %04x, data: %02x\n", offset, data); txrom_write(offset, data); @@ -1642,7 +1642,7 @@ void nes_h2288_device::prg_cb(int start, int bank) void nes_h2288_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("h2288 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("h2288 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1800) @@ -1662,7 +1662,7 @@ void nes_h2288_device::write_l(offs_t offset, u8 data) void nes_h2288_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("h2288 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("h2288 write_h, offset: %04x, data: %02x\n", offset, data); static constexpr u8 reg_table[8] = {0, 3, 1, 5, 6, 7, 2, 4}; @@ -1677,13 +1677,13 @@ void nes_h2288_device::write_h(offs_t offset, u8 data) MMC3 + protection access in 0x4020 - 0x7fff - in MESS: Partial support + in MAME: Partial support -------------------------------------------------*/ void nes_6035052_device::write_ex(offs_t offset, uint8_t data) { - LOG_MMC(("6035052 write_ex, offset: %04x, data: %02x\n", offset, data)); + LOG("6035052 write_ex, offset: %04x, data: %02x\n", offset, data); m_prot = data & 0x03; if (m_prot == 1) m_prot = 2; @@ -1691,7 +1691,7 @@ void nes_6035052_device::write_ex(offs_t offset, uint8_t data) uint8_t nes_6035052_device::read_ex(offs_t offset) { - LOG_MMC(("6035052 read_ex, offset: %04x\n", offset)); + LOG("6035052 read_ex, offset: %04x\n", offset); return m_prot; } @@ -1705,13 +1705,13 @@ uint8_t nes_6035052_device::read_ex(offs_t offset) iNES: mapper 189 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_txc_tw_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("txc_tw write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("txc_tw write_l, offset: %04x, data: %02x\n", offset, data); prg32((data >> 4) | data); } @@ -1735,7 +1735,7 @@ void nes_txc_tw_device::prg_cb(int start, int bank) void nes_kof97_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("kof97 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("kof97 write_h, offset: %04x, data: %02x\n", offset, data); // unscramble address and data offset = (offset & 0x6000) | BIT(offset, 12); @@ -1772,7 +1772,7 @@ void nes_kof96_device::chr_cb(int start, int bank, int source) void nes_kof96_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("kof96 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("kof96 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if ((offset & 0x1001) == 0x1000) @@ -1792,7 +1792,7 @@ void nes_kof96_device::write_l(offs_t offset, u8 data) u8 nes_kof96_device::read_l(offs_t offset) { - LOG_MMC(("kof96 read_l, offset: %04x\n", offset)); + LOG("kof96 read_l, offset: %04x\n", offset); offset += 0x100; if (offset >= 0x1000) @@ -1809,7 +1809,7 @@ u8 nes_kof96_device::read_l(offs_t offset) iNES: mapper 197 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ @@ -1823,7 +1823,7 @@ void nes_sf3_device::set_chr(uint8_t chr_source, int chr_base, int chr_mask) void nes_sf3_device::write_h(offs_t offset, uint8_t data) { uint8_t cmd; - LOG_MMC(("sf3 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("sf3 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -1865,7 +1865,7 @@ void nes_sf3_device::write_h(offs_t offset, uint8_t data) void nes_cocoma_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("cocoma write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("cocoma write_h, offset: %04x, data: %02x\n", offset, data); if (BIT(offset, 4)) { @@ -1914,7 +1914,7 @@ void nes_gouder_device::write_l(offs_t offset, u8 data) 0x09,0x19,0x49,0x59,0x09,0x19,0x49,0x59,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; - LOG_MMC(("gouder write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("gouder write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; switch (offset & 0x1800) @@ -1934,7 +1934,7 @@ void nes_gouder_device::write_l(offs_t offset, u8 data) u8 nes_gouder_device::read_l(offs_t offset) { - LOG_MMC(("gouder read_l, offset: %04x\n", offset)); + LOG("gouder read_l, offset: %04x\n", offset); offset += 0x100; if (offset >= 0x1800) @@ -1955,7 +1955,7 @@ void nes_gouder_device::prg_cb(int start, int bank) Sachen boards used for a chinese port of Princess Maker (?) - in MESS: Very Preliminary support, based on Cah4e3 + in MAME: Very Preliminary support, based on Cah4e3 code in FCEUMM -------------------------------------------------*/ @@ -1981,7 +1981,7 @@ void nes_sa9602b_device::prg_cb(int start, int bank) void nes_sa9602b_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("sa9602b write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("sa9602b write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -2020,7 +2020,7 @@ void nes_sachen_shero_device::chr_cb(int start, int bank, int source) void nes_sachen_shero_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("shero write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("shero write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x4100; if (offset == 0x4100) @@ -2035,7 +2035,7 @@ void nes_sachen_shero_device::write_l(offs_t offset, u8 data) u8 nes_sachen_shero_device::read_l(offs_t offset) { - LOG_MMC(("shero read_l, offset: %04x\n", offset)); + LOG("shero read_l, offset: %04x\n", offset); offset += 0x4100; if (offset == 0x4100) @@ -2089,7 +2089,7 @@ void nes_sachen_zgdh_device::set_chr(u8 chr, int chr_base, int chr_mask) void nes_sachen_zgdh_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("zgdh write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("zgdh write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if ((offset & 0x1100) == 0x0100) @@ -2145,7 +2145,7 @@ void nes_a9746_device::update_banks(uint8_t value) void nes_a9746_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("unl_a9746 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("unl_a9746 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6003) { @@ -2273,7 +2273,7 @@ void nes_fk23c_device::fk23c_set_chr() void nes_fk23c_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("fk23c write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("fk23c write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1000) @@ -2290,7 +2290,7 @@ void nes_fk23c_device::write_l(offs_t offset, uint8_t data) void nes_fk23c_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("fk23c write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("fk23c write_h, offset: %04x, data: %02x\n", offset, data); if (m_reg[0] & 0x40) { @@ -2343,7 +2343,7 @@ void nes_fk23c_device::write_h(offs_t offset, uint8_t data) void nes_nt639_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("nt639 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("nt639 write_m, offset: %04x, data: %02x\n", offset, data); if (BIT(data, 5)) prg32(bitswap<3>(data, 6, 2, 1)); @@ -2363,7 +2363,7 @@ void nes_nt639_device::write_m(offs_t offset, u8 data) Games: Super 24-in-1 - In MESS: Partially Supported + In MAME: Partially Supported -------------------------------------------------*/ @@ -2387,7 +2387,7 @@ void nes_s24in1sc03_device::chr_cb(int start, int bank, int source) void nes_s24in1sc03_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("s24in1sc03 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("s24in1sc03 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset == 0x1ff0) @@ -2446,7 +2446,7 @@ void nes_tech9in1_device::update_banks() void nes_tech9in1_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("tech9in1 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("tech9in1 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; switch (offset & 0x1003) // writes $5000-$5002, mask is a best guess @@ -2473,7 +2473,7 @@ void nes_tech9in1_device::write_l(offs_t offset, u8 data) u8 nes_bmc_5in1_device::read_m(offs_t offset) { - LOG_MMC(("bmc_5in1 read_m, offset: %04x\n", offset)); + LOG("bmc_5in1 read_m, offset: %04x\n", offset); if ((offset & 0x03) == 0x02) return (get_open_bus() & 0xfe) | m_jumper->read(); @@ -2483,7 +2483,7 @@ u8 nes_bmc_5in1_device::read_m(offs_t offset) void nes_bmc_5in1_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_5in1 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_5in1 write_m, offset: %04x, data: %02x\n", offset, data); if ((m_wram_protect & 0xc0) == 0x80) { @@ -2507,7 +2507,7 @@ void nes_bmc_5in1_device::write_m(offs_t offset, u8 data) void nes_bmc_8in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_8in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_8in1 write_h, offset: %04x, data: %02x\n", offset, data); if (BIT(offset, 12)) { @@ -2541,7 +2541,7 @@ void nes_bmc_8in1_device::write_h(offs_t offset, u8 data) void nes_bmc_15in1_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_15in1 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_15in1 write_m, offset: %04x, data: %02x\n", offset, data); if (data & 1) data |= m_jumper; // TODO: add jumper settings, m_jumper is 0 for now @@ -2564,14 +2564,14 @@ void nes_bmc_15in1_device::write_m(offs_t offset, u8 data) iNES: mapper 44 - In MESS: Supported. It also uses mmc3_irq. + In MAME: Supported. It also uses mmc3_irq. -------------------------------------------------*/ void nes_bmc_sbig7_device::write_h(offs_t offset, uint8_t data) { uint8_t page; - LOG_MMC(("bmc_sbig7 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_sbig7 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -2609,7 +2609,7 @@ void nes_bmc_sbig7_device::write_h(offs_t offset, uint8_t data) void nes_bmc_hik8_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_hik8 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_hik8 write_m, offset: %04x, data: %02x\n", offset, data); nes_txrom_device::write_m(offset, data); // registers overlay WRAM @@ -2707,7 +2707,7 @@ void nes_bmc_jy302_device::set_chr(u8 chr, int chr_base, int chr_mask) u8 nes_bmc_kc885_device::read_h(offs_t offset) { -// LOG_MMC(("bmc_kc885 read_h, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "bmc_kc885 read_h, offset: %04x\n", offset); if (BIT(m_reg[1], 7) & BIT(m_jumper->read(), 2)) return get_open_bus(); @@ -2717,7 +2717,7 @@ u8 nes_bmc_kc885_device::read_h(offs_t offset) void nes_bmc_kc885_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_kc885 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_kc885 write_m, offset: %04x, data: %02x\n", offset, data); if (!BIT(m_reg[3], 6)) // outer register lock bit { @@ -2781,7 +2781,7 @@ void nes_bmc_hik4_device::prg_cb(int start, int bank) void nes_bmc_hik4_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_hik4 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_hik4 write_m, offset: %04x, data: %02x\n", offset, data); // mid writes only work when WRAM is enabled and writable if ((m_wram_protect & 0xc0) == 0x80) @@ -2854,7 +2854,7 @@ void nes_a88s1_device::prg_cb(int start, int bank) void nes_a88s1_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("a88s1 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("a88s1 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1000) @@ -2881,7 +2881,7 @@ void nes_a88s1_device::write_l(offs_t offset, u8 data) void nes_bmc_f15_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_f15 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_f15 write_m, offset: %04x, data: %02x\n", offset, data); if (BIT(m_wram_protect, 7)) { @@ -2915,7 +2915,7 @@ void nes_bmc_f15_device::prg_cb(int start, int bank) u8 nes_bmc_f600_device::read_l(offs_t offset) { - LOG_MMC(("bmc_f600 read_l, offset: %04x\n", offset)); + LOG("bmc_f600 read_l, offset: %04x\n", offset); offset += 0x100; if (offset >= 0x1000) @@ -2926,7 +2926,7 @@ u8 nes_bmc_f600_device::read_l(offs_t offset) void nes_bmc_f600_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("bmc_f600 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_f600 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1000) @@ -2945,7 +2945,7 @@ void nes_bmc_f600_device::write_l(offs_t offset, u8 data) void nes_bmc_f600_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_f600 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_f600 write_h, offset: %04x, data: %02x\n", offset, data); if ((m_reg & 0x07) == 1) nes_txsrom_device::write_h(offset, data); else @@ -2976,7 +2976,7 @@ void nes_bmc_f600_device::set_chr(u8 chr, int chr_base, int chr_mask) void nes_bmc_el86xc_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_el86xc write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_el86xc write_m, offset: %04x, data: %02x\n", offset, data); if (!(offset & 0x1000)) // game only banks via 0x6000, this mask is a guess { int outer = bitswap<3>(data, 5, 2, 1); @@ -3003,7 +3003,7 @@ void nes_bmc_el86xc_device::write_m(offs_t offset, u8 data) void nes_bmc_gn45_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_gn45 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_gn45 write_m, offset: %04x, data: %02x\n", offset, data); nes_txrom_device::write_m(offset, data); // registers overlay WRAM @@ -3035,7 +3035,7 @@ void nes_bmc_gn45_device::write_m(offs_t offset, u8 data) void nes_bmc_gold7in1_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_gold7in1 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_gold7in1 write_m, offset: %04x, data: %02x\n", offset, data); if ((m_wram_protect & 0xc0) == 0x80 && !m_lock) { @@ -3071,7 +3071,7 @@ void nes_bmc_gold7in1_device::write_m(offs_t offset, u8 data) void nes_bmc_k3006_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_k3006 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_k3006 write_m, offset: %04x, data: %02x\n", offset, data); if ((m_wram_protect & 0xc0) == 0x80) { if (BIT(offset, 5)) // MMC3 mode @@ -3113,7 +3113,7 @@ void nes_bmc_k3033_device::prg_cb(int start, int bank) void nes_bmc_k3033_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_k3033 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_k3033 write_m, offset: %04x, data: %02x\n", offset, data); if ((m_wram_protect & 0xc0) == 0x80) { @@ -3174,7 +3174,7 @@ void nes_bmc_l6in1_device::set_mirror() void nes_bmc_l6in1_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_l6in1 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_l6in1 write_m, offset: %04x, data: %02x\n", offset, data); if ((m_wram_protect & 0xc0) == 0x80) { @@ -3187,7 +3187,7 @@ void nes_bmc_l6in1_device::write_m(offs_t offset, u8 data) void nes_bmc_l6in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_l6in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_l6in1 write_h, offset: %04x, data: %02x\n", offset, data); txrom_write(offset, data); if ((offset & 0x6001) == 0x2000) @@ -3226,7 +3226,7 @@ void nes_bmc_00202650_device::set_chr(u8 chr, int chr_base, int chr_mask) void nes_bmc_00202650_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_00202650 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_00202650 write_m, offset: %04x, data: %02x\n", offset, data); if (!m_mmc3_mode) { @@ -3262,7 +3262,7 @@ void nes_bmc_411120c_device::prg_cb(int start, int bank) void nes_bmc_411120c_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_411120c write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_411120c write_m, offset: %04x, data: %02x\n", offset, data); if (BIT(m_wram_protect, 7)) { @@ -3325,7 +3325,7 @@ void nes_bmc_810305c_device::set_chr(u8 chr, int chr_base, int chr_mask) void nes_bmc_810305c_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_810305c write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_810305c write_h, offset: %04x, data: %02x\n", offset, data); if (BIT(offset, 7)) // outer register { @@ -3386,7 +3386,7 @@ void nes_bmc_820720c_device::set_chr(u8 chr, int chr_base, int chr_mask) void nes_bmc_820720c_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_820720c write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_820720c write_m, offset: %04x, data: %02x\n", offset, data); if ((m_wram_protect & 0xc0) == 0x80) { @@ -3402,7 +3402,7 @@ void nes_bmc_820720c_device::write_m(offs_t offset, u8 data) void nes_bmc_820720c_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_820720c write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_820720c write_h, offset: %04x, data: %02x\n", offset, data); txrom_write(offset, data); // MMC3 regs always written (for mirroring in non-MMC3 modes) @@ -3448,7 +3448,7 @@ void nes_bmc_830118c_device::prg_cb(int start, int bank) void nes_bmc_830118c_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_830118c write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_830118c write_m, offset: %04x, data: %02x\n", offset, data); if ((m_wram_protect & 0xc0) == 0x80) { @@ -3475,7 +3475,7 @@ void nes_bmc_830118c_device::write_m(offs_t offset, u8 data) void nes_bmc_830832c_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_830832c write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_830832c write_m, offset: %04x, data: %02x\n", offset, data); if (offset & 0x1000) // game only writes 0x7000, this mask is a guess { m_prg_base = (data & 0x40) >> 1; @@ -3504,7 +3504,7 @@ void nes_bmc_830832c_device::write_m(offs_t offset, u8 data) void nes_bmc_yy841101c_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_yy841101c write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_yy841101c write_m, offset: %04x, data: %02x\n", offset, data); if (offset & 0x1000) // games only write 0x7000, this mask is a guess { m_prg_base = data & 0xf0; @@ -3530,7 +3530,7 @@ void nes_bmc_yy841101c_device::write_m(offs_t offset, u8 data) void nes_bmc_yy841155c_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_yy841155c write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_yy841155c write_m, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x1000) { @@ -3598,7 +3598,7 @@ inline void nes_pjoy84_device::set_base_mask() void nes_pjoy84_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("pjoy84 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("pjoy84 write_m, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x03) { @@ -3681,7 +3681,7 @@ void nes_smd133_device::smd133_write(offs_t offset, u8 data) void nes_smd133_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("smd133 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("smd133 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1000 && m_smd133_addr == 0x5000) @@ -3690,7 +3690,7 @@ void nes_smd133_device::write_l(offs_t offset, u8 data) void nes_smd133_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("smd133 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("smd133 write_m, offset: %04x, data: %02x\n", offset, data); nes_txrom_device::write_m(offset, data); // registers overlay WRAM diff --git a/src/devices/bus/nes/mmc5.cpp b/src/devices/bus/nes/mmc5.cpp index f15b1a7658b..7d534e5e77a 100644 --- a/src/devices/bus/nes/mmc5.cpp +++ b/src/devices/bus/nes/mmc5.cpp @@ -20,13 +20,15 @@ #include "speaker.h" +#define LOG_UNHANDLED (1U << 1) +#define LOG_BANK_INFO (1U << 2) + #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_UNHANDLED | LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (LOG_UNHANDLED) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" #define LAST_CHR_REG_A 0 @@ -432,7 +434,7 @@ uint8_t nes_exrom_device::chr_r(offs_t offset) uint8_t nes_exrom_device::read_l(offs_t offset) { int value; - LOG_MMC(("exrom read_l, offset: %04x\n", offset)); + LOG("exrom read_l, offset: %04x\n", offset); offset += 0x100; if ((offset >= 0x1c00) && (offset <= 0x1fff)) @@ -463,7 +465,7 @@ uint8_t nes_exrom_device::read_l(offs_t offset) default: if (!machine().side_effects_disabled()) - logerror("MMC5 uncaught read, offset: %04x\n", offset + 0x4100); + LOGMASKED(LOG_UNHANDLED, "MMC5 uncaught read, offset: %04x\n", offset + 0x4100); return get_open_bus(); } } @@ -471,7 +473,7 @@ uint8_t nes_exrom_device::read_l(offs_t offset) void nes_exrom_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("exrom write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("exrom write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if ((offset >= 0x1000) && (offset <= 0x1015)) @@ -501,29 +503,29 @@ void nes_exrom_device::write_l(offs_t offset, uint8_t data) case 0x1100: m_prg_mode = data & 0x03; update_prg(); - //LOG_MMC(("MMC5 rom bank mode: %02x\n", data)); + LOGMASKED(LOG_BANK_INFO, "MMC5 rom bank mode: %02x\n", data); break; case 0x1101: m_chr_mode = data & 0x03; m_ex1_chr = 0; m_split_chr = 0; - //LOG_MMC(("MMC5 vrom bank mode: %02x\n", data)); + LOGMASKED(LOG_BANK_INFO, "MMC5 vrom bank mode: %02x\n", data); break; case 0x1102: m_wram_protect_1 = data & 0x03; - LOG_MMC(("MMC5 vram protect 1: %02x\n", data)); + LOG("MMC5 vram protect 1: %02x\n", data); break; case 0x1103: m_wram_protect_2 = data & 0x03; - LOG_MMC(("MMC5 vram protect 2: %02x\n", data)); + LOG("MMC5 vram protect 2: %02x\n", data); break; case 0x1104: // Extra VRAM (EXRAM) m_exram_control = data & 0x03; - LOG_MMC(("MMC5 exram control: %02x\n", data)); + LOG("MMC5 exram control: %02x\n", data); break; case 0x1105: @@ -542,7 +544,7 @@ void nes_exrom_device::write_l(offs_t offset, uint8_t data) break; case 0x1113: - LOG_MMC(("MMC5 mid RAM bank select: %02x\n", data & 0x07)); + LOG("MMC5 mid RAM bank select: %02x\n", data & 0x07); m_wram_base = data & 0x07; break; @@ -603,12 +605,12 @@ void nes_exrom_device::write_l(offs_t offset, uint8_t data) case 0x1203: m_irq_count = data; - LOG_MMC(("MMC5 irq scanline: %d\n", m_irq_count)); + LOG("MMC5 irq scanline: %d\n", m_irq_count); break; case 0x1204: m_irq_enable = data & 0x80; - LOG_MMC(("MMC5 irq enable: %02x\n", data)); + LOG("MMC5 irq enable: %02x\n", data); break; case 0x1205: @@ -620,7 +622,7 @@ void nes_exrom_device::write_l(offs_t offset, uint8_t data) break; default: - logerror("MMC5 uncaught write, offset: %04x, data: %02x\n", offset + 0x4100, data); + LOG("MMC5 uncaught write, offset: %04x, data: %02x\n", offset + 0x4100, data); break; } } @@ -631,7 +633,7 @@ void nes_exrom_device::write_l(offs_t offset, uint8_t data) // same mechanism is used also when "WRAM" is mapped in higher banks uint8_t nes_exrom_device::read_m(offs_t offset) { - LOG_MMC(("exrom read_m, offset: %04x\n", offset)); + LOG("exrom read_m, offset: %04x\n", offset); if (!m_battery.empty() && !m_prgram.empty()) // 2 chips present: first is BWRAM, second is WRAM { if (m_wram_base & 0x04) @@ -649,7 +651,7 @@ uint8_t nes_exrom_device::read_m(offs_t offset) void nes_exrom_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("exrom write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("exrom write_m, offset: %04x, data: %02x\n", offset, data); if (m_wram_protect_1 != 0x02 || m_wram_protect_2 != 0x01) return; @@ -662,7 +664,7 @@ void nes_exrom_device::write_m(offs_t offset, uint8_t data) // some games (e.g. Bandit Kings of Ancient China) write to PRG-RAM through 0x8000-0xdfff uint8_t nes_exrom_device::read_h(offs_t offset) { - LOG_MMC(("exrom read_h, offset: %04x\n", offset)); + LOG("exrom read_h, offset: %04x\n", offset); int bank = offset / 0x2000; if (bank < 3 && offset >= bank * 0x2000 && offset < (bank + 1) * 0x2000 && m_prg_ram_mapped[bank]) @@ -678,7 +680,7 @@ uint8_t nes_exrom_device::read_h(offs_t offset) void nes_exrom_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("exrom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("exrom write_h, offset: %04x, data: %02x\n", offset, data); int bank = offset / 0x2000; if (m_wram_protect_1 != 0x02 || m_wram_protect_2 != 0x01 || bank == 3 || !m_prg_ram_mapped[bank]) return; diff --git a/src/devices/bus/nes/multigame.cpp b/src/devices/bus/nes/multigame.cpp index 2e13e22a73e..33e377fc6eb 100644 --- a/src/devices/bus/nes/multigame.cpp +++ b/src/devices/bus/nes/multigame.cpp @@ -19,13 +19,14 @@ #include "multigame.h" +#define LOG_HIFREQ (1U << 1) + #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -1196,7 +1197,7 @@ void nes_bmc_th22913_device::pcb_reset() void nes_action52_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ae_act52_w, offset: %04x, data: %02x\n", offset, data)); + LOG("ae_act52_w, offset: %04x, data: %02x\n", offset, data); u8 bank = BIT(offset, 6, 7); u8 mode = !BIT(offset, 5); @@ -1226,7 +1227,7 @@ void nes_caltron6in1_device::update_chr() void nes_caltron6in1_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("caltron6in1 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("caltron6in1 write_m, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x1800) { @@ -1241,7 +1242,7 @@ void nes_caltron6in1_device::write_m(offs_t offset, u8 data) void nes_caltron6in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("caltron6in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("caltron6in1 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -1267,7 +1268,7 @@ void nes_caltron6in1_device::write_h(offs_t offset, u8 data) void nes_caltron9in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("caltron9in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("caltron9in1 write_h, offset: %04x, data: %02x\n", offset, data); int nibble = BIT(offset, 12, 3); m_latch[std::min(nibble, 2)] = offset & 0x7f; @@ -1296,13 +1297,13 @@ void nes_caltron9in1_device::write_h(offs_t offset, u8 data) iNES: mapper 46 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_rumblestat_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("rumblestation write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("rumblestation write_m, offset: %04x, data: %02x\n", offset, data); m_prg = (m_prg & 0x01) | ((data & 0x0f) << 1); m_chr = (m_chr & 0x07) | ((data & 0xf0) >> 1); @@ -1312,7 +1313,7 @@ void nes_rumblestat_device::write_m(offs_t offset, uint8_t data) void nes_rumblestat_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("rumblestation write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("rumblestation write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -1355,7 +1356,7 @@ void nes_svision16_device::update_prg() void nes_svision16_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("svision16 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("svision16 write_m, offset: %04x, data: %02x\n", offset, data); if (!BIT(m_latch1, 4)) { @@ -1367,14 +1368,14 @@ void nes_svision16_device::write_m(offs_t offset, u8 data) void nes_svision16_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("svision16 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("svision16 write_h, offset: %04x, data: %02x\n", offset, data); m_latch2 = data; update_prg(); } u8 nes_svision16_device::read_m(offs_t offset) { - LOG_MMC(("svision16 read_m, offset: %04x\n", offset)); + LOG("svision16 read_m, offset: %04x\n", offset); u8 bank = m_latch1 << 4 | 0x0f; return m_prg[((bank + 4) * 0x2000 + offset) % m_prg_size]; // +4 due to the 32KB menu @@ -1394,7 +1395,7 @@ u8 nes_svision16_device::read_m(offs_t offset) void nes_farid_unrom_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("farid_unrom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("farid_unrom write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -1427,7 +1428,7 @@ void nes_farid_unrom_device::write_h(offs_t offset, u8 data) void nes_kn42_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("kn42 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("kn42 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -1441,14 +1442,14 @@ void nes_kn42_device::write_h(offs_t offset, u8 data) Games: 3-in-1 (N068) - In MESS: Supported + In MAME: Supported -------------------------------------------------*/ void nes_a65as_device::write_h(offs_t offset, uint8_t data) { uint8_t helper = (data & 0x30) >> 1; - LOG_MMC(("a65as write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("a65as write_h, offset: %04x, data: %02x\n", offset, data); if (data & 0x80) set_nt_mirroring(BIT(data, 5) ? PPU_MIRROR_HIGH : PPU_MIRROR_LOW); @@ -1478,7 +1479,7 @@ void nes_a65as_device::write_h(offs_t offset, uint8_t data) void nes_t262_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("t262 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("t262 write_h, offset: %04x, data: %02x\n", offset, data); if (!BIT(m_latch, 13)) { @@ -1508,14 +1509,14 @@ void nes_t262_device::write_h(offs_t offset, u8 data) iNES: mapper 39 - In MESS: Partially Supported (problems with PRG bankswitch, + In MAME: Partially Supported (problems with PRG bankswitch, only keyboard exercise work). -------------------------------------------------*/ void nes_studyngame_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("studyngame write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("studyngame write_h, offset: %04x, data: %02x\n", offset, data); prg32(data); } @@ -1535,7 +1536,7 @@ void nes_studyngame_device::write_h(offs_t offset, uint8_t data) void nes_sgun20in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("supergun20in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("supergun20in1 write_h, offset: %04x, data: %02x\n", offset, data); // Hogan's Alley in 20-in-1 will occasionally sweep through 0x66xx-0x68xx which // causes an abrupt goto Bomberman title screen. This mask is a best guess. @@ -1571,7 +1572,7 @@ void nes_bmc_190in1_device::write_h(offs_t offset, u8 data) void nes_vt5201_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("vt5201 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("vt5201 write_h, offset: %04x, data: %02x\n", offset, data); if (!BIT(m_latch, 1)) // lock bit { @@ -1589,7 +1590,7 @@ void nes_vt5201_device::write_h(offs_t offset, u8 data) u8 nes_vt5201_device::read_h(offs_t offset) { - LOG_MMC(("bmc_vt5201 read_h, offset: %04x\n", offset)); + LOG("bmc_vt5201 read_h, offset: %04x\n", offset); if (BIT(m_latch, 0)) return (get_open_bus() & ~0x03) | m_jumper; // TODO: add jumper settings, m_jumper is 0 for now @@ -1617,7 +1618,7 @@ void nes_bmc_80013b_device::update_prg() void nes_bmc_80013b_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_80013b write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_80013b write_h, offset: %04x, data: %02x\n", offset, data); if (offset & 0x6000) { m_reg[1] = data & 0x7f; @@ -1645,7 +1646,7 @@ void nes_bmc_80013b_device::write_h(offs_t offset, u8 data) void nes_bmc_810544c_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_810544c write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_810544c write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = bitswap<4>(offset, 9, 8, 7, 5); u8 mode = BIT(offset, 6); @@ -1670,7 +1671,7 @@ void nes_bmc_810544c_device::write_h(offs_t offset, u8 data) void nes_bmc_830425c_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_830425c write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_830425c write_h, offset: %04x, data: %02x\n", offset, data); if ((offset & 0x7fe0) == 0x70e0) m_latch = offset & 0x1f; @@ -1695,7 +1696,7 @@ void nes_bmc_830425c_device::write_h(offs_t offset, u8 data) void nes_bmc_830928c_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_830928c write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_830928c write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -1730,7 +1731,7 @@ void nes_bmc_830928c_device::write_h(offs_t offset, u8 data) void nes_bmc_850437c_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_850437c write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_850437c write_h, offset: %04x, data: %02x\n", offset, data); m_reg[(offset & 0x6000) == 0x2000] = data; // outer banking is always at 0xa000, mask is a guess @@ -1759,7 +1760,7 @@ void nes_bmc_850437c_device::write_h(offs_t offset, u8 data) void nes_bmc_970630c_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_970630c write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_970630c write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = BIT(offset, 2, 5); if (BIT(offset, 9)) // NROM mode @@ -1780,7 +1781,7 @@ void nes_bmc_970630c_device::write_h(offs_t offset, u8 data) u8 nes_bmc_970630c_device::read_h(offs_t offset) { -// LOG_MMC(("bmc_970630c read_h, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "bmc_970630c read_h, offset: %04x\n", offset); if (m_latch) return 0; // TODO: menu supposedly varies by solder pad value returned here, but it doesn't seem to work... @@ -1802,7 +1803,7 @@ u8 nes_bmc_970630c_device::read_h(offs_t offset) void nes_ntd03_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ntd03 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ntd03 write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = bitswap<5>(offset, 14, 13, 12, 11, 6); u8 mode = !BIT(offset, 7); @@ -1827,7 +1828,7 @@ void nes_ntd03_device::write_h(offs_t offset, u8 data) void nes_bmc_ctc09_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_ctc09 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_ctc09 write_h, offset: %04x, data: %02x\n", offset, data); if (BIT(offset, 14)) { @@ -1863,7 +1864,7 @@ void nes_bmc_ctc09_device::write_h(offs_t offset, u8 data) u8 nes_bmc_ds927_device::read_h(offs_t offset) { -// LOG_MMC(("bmc_ds927 read_h, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "bmc_ds927 read_h, offset: %04x\n", offset); int bits = m_mode == 1 ? 1 : 2; @@ -1875,7 +1876,7 @@ u8 nes_bmc_ds927_device::read_h(offs_t offset) void nes_bmc_ds927_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_ds927 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_ds927 write_h, offset: %04x, data: %02x\n", offset, data); if (offset < 0x6000) { @@ -1927,13 +1928,13 @@ void nes_bmc_ds927_device::write_h(offs_t offset, u8 data) u8 nes_bmc_gka_device::read_m(offs_t offset) { - LOG_MMC(("bmc_gka read_m, offset: %04x\n", offset)); + LOG("bmc_gka read_m, offset: %04x\n", offset); return 0; // TODO: menus differ by jumper/DIP settings readable at 0x6000. } void nes_bmc_gka_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_gka write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_gka write_h, offset: %04x, data: %02x\n", offset, data); m_reg[BIT(offset, 11)] = data; @@ -1968,7 +1969,7 @@ void nes_bmc_gka_device::write_h(offs_t offset, u8 data) void nes_bmc_gkb_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_gkb write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_gkb write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = offset & 0x07; u8 mode = !BIT(offset, 6); @@ -1996,7 +1997,7 @@ void nes_bmc_gkb_device::write_h(offs_t offset, u8 data) void nes_bmc_gkcxin1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_gkcxin1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_gkcxin1 write_h, offset: %04x, data: %02x\n", offset, data); prg32(BIT(offset, 3, 2)); chr8(offset & 0x07, CHRROM); @@ -2017,7 +2018,7 @@ void nes_bmc_gkcxin1_device::write_h(offs_t offset, u8 data) void nes_bmc_gn91b_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_gn91b write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_gn91b write_h, offset: %04x, data: %02x\n", offset, data); if (offset < 0x4000) { @@ -2046,7 +2047,7 @@ void nes_bmc_gn91b_device::write_h(offs_t offset, u8 data) u8 nes_bmc_hp898f_device::read_l(offs_t offset) { - LOG_MMC(("bmc_hp898f read_l, offset: %04x\n", offset)); + LOG("bmc_hp898f read_l, offset: %04x\n", offset); offset += 0x100; if (offset & 0x1000) @@ -2057,7 +2058,7 @@ u8 nes_bmc_hp898f_device::read_l(offs_t offset) void nes_bmc_hp898f_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_hp898f write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_hp898f write_m, offset: %04x, data: %02x\n", offset, data); if (offset & 0x04) { @@ -2085,7 +2086,7 @@ void nes_bmc_hp898f_device::write_m(offs_t offset, u8 data) void nes_bmc_k3036_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_k3036 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_k3036 write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = offset & 0x1f; prg16_89ab(bank); prg16_cdef(bank | (BIT(offset, 5) ? 0 : 7)); @@ -2106,7 +2107,7 @@ void nes_bmc_k3036_device::write_h(offs_t offset, u8 data) void nes_bmc_k3046_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_k3046 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_k3046 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -2130,7 +2131,7 @@ void nes_bmc_k3046_device::write_h(offs_t offset, u8 data) void nes_bmc_k3071_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_k3071 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_k3071 write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = BIT(offset, 1, 5); u8 mode = BIT(offset, 0); @@ -2155,7 +2156,7 @@ void nes_bmc_k3071_device::write_h(offs_t offset, u8 data) void nes_bmc_s009_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_s009 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_s009 write_m, offset: %04x, data: %02x\n", offset, data); m_reg = (data & 0x07) << 3; prg16_89ab(m_reg); @@ -2166,7 +2167,7 @@ void nes_bmc_s009_device::write_m(offs_t offset, u8 data) void nes_bmc_s009_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_s009 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_s009 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -2188,7 +2189,7 @@ void nes_bmc_s009_device::write_h(offs_t offset, u8 data) void nes_bmc_sa005a_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_sa005a write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_sa005a write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = offset & 0x0f; prg16_89ab(bank); prg16_cdef(bank); @@ -2216,7 +2217,7 @@ void nes_bmc_tf2740_device::update_chr() void nes_bmc_tf2740_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_tf2740 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_tf2740 write_m, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x03) { @@ -2239,14 +2240,14 @@ void nes_bmc_tf2740_device::write_m(offs_t offset, u8 data) void nes_bmc_tf2740_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_tf2740 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_tf2740 write_h, offset: %04x, data: %02x\n", offset, data); m_reg[0] = data; update_chr(); } u8 nes_bmc_tf2740_device::read_m(offs_t offset) { - LOG_MMC(("bmc_tf2740 read_m, offset: %04x\n", offset)); + LOG("bmc_tf2740 read_m, offset: %04x\n", offset); return (get_open_bus() & ~0x03) | m_jumper; // TODO: add jumper settings, m_jumper is 0 for now } @@ -2264,7 +2265,7 @@ u8 nes_bmc_tf2740_device::read_m(offs_t offset) void nes_bmc_th2348_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("bmc_th2348 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_th2348 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1000) @@ -2279,7 +2280,7 @@ void nes_bmc_th2348_device::write_l(offs_t offset, u8 data) void nes_bmc_th2348_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_th2348 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_th2348 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -2301,7 +2302,7 @@ void nes_bmc_th2348_device::write_h(offs_t offset, u8 data) void nes_bmc_tj03_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_tj03 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_tj03 write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = BIT(offset, 8, 2); prg32(bank); chr8(bank, CHRROM); @@ -2321,7 +2322,7 @@ void nes_bmc_tj03_device::write_h(offs_t offset, u8 data) void nes_bmc_ws_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("bmc_ws write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_ws write_m, offset: %04x, data: %02x\n", offset, data); if (offset < 0x1000) { @@ -2359,7 +2360,7 @@ void nes_bmc_ws_device::write_m(offs_t offset, uint8_t data) void nes_bmc_11160_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_11160 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_11160 write_h, offset: %04x, data: %02x\n", offset, data); prg32(BIT(data, 4, 2)); chr8(bitswap<4>(data, 5, 4, 1, 0), CHRROM); @@ -2380,7 +2381,7 @@ void nes_bmc_11160_device::write_h(offs_t offset, u8 data) void nes_bmc_g146_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_g146 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_g146 write_h, offset: %04x, data: %02x\n", offset, data); u8 prg_lo = offset & 0x1f; u8 prg_hi = prg_lo; // default: NROM-128 mode @@ -2411,7 +2412,7 @@ void nes_bmc_g146_device::write_h(offs_t offset, u8 data) void nes_bmc_2751_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_2751 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_2751 write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = BIT(offset, 4, 3); u8 mode = BIT(offset, 7); prg16_89ab(bank & ~mode); @@ -2440,7 +2441,7 @@ void nes_bmc_2751_device::write_h(offs_t offset, u8 data) void nes_bmc_8157_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_8157 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_8157 write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = BIT(offset, 2, 5); prg16_89ab(bank); @@ -2456,7 +2457,7 @@ void nes_bmc_8157_device::write_h(offs_t offset, u8 data) u8 nes_bmc_8157_device::read_h(offs_t offset) { - LOG_MMC(("bmc_8157 read_h, offset: %04x\n", offset)); + LOG("bmc_8157 read_h, offset: %04x\n", offset); if (m_latch) offset = (offset & ~0x01) | m_jumper->read(); return hi_access_rom(offset); @@ -2477,13 +2478,13 @@ u8 nes_bmc_8157_device::read_h(offs_t offset) u8 nes_bmc_hik300_device::read_m(offs_t offset) { - LOG_MMC(("bmc_hik300 read_m, offset: %04x, data: %02x\n", offset)); + LOG("bmc_hik300 read_m, offset: %04x, data: %02x\n", offset); return get_open_bus() | (!BIT(offset, 4) << 7); // some games have a protection MSB } void nes_bmc_hik300_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_hik300 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_hik300 write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = offset & 0x07; u8 mode = BIT(offset, 14); @@ -2517,7 +2518,7 @@ void nes_bmc_hik300_device::write_h(offs_t offset, u8 data) void nes_bmc_s700_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_s700 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_s700 write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = (offset & 0x40) | BIT(offset, 8, 6); u8 mode = !BIT(offset, 5); @@ -2543,7 +2544,7 @@ void nes_bmc_s700_device::write_h(offs_t offset, u8 data) u8 nes_bmc_ball11_device::read_m(offs_t offset) { - LOG_MMC(("bmc_ball11 read_m, offset: %04x, data: %02x\n", offset)); + LOG("bmc_ball11 read_m, offset: %04x, data: %02x\n", offset); u8 bank = m_reg[1] << 2 | (m_reg[0] ? 0x23 : 0x2f); return m_prg[(bank * 0x2000 + offset) & (m_prg_size - 1)]; @@ -2562,7 +2563,7 @@ void nes_bmc_ball11_device::update_prg() void nes_bmc_ball11_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_ball11 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_ball11 write_m, offset: %04x, data: %02x\n", offset, data); set_nt_mirroring(BIT(data, 4) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); m_reg[0] = data & 0x02; update_prg(); @@ -2570,7 +2571,7 @@ void nes_bmc_ball11_device::write_m(offs_t offset, u8 data) void nes_bmc_ball11_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_ball11 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_ball11 write_h, offset: %04x, data: %02x\n", offset, data); m_reg[1] = data & 0x1f; update_prg(); } @@ -2595,7 +2596,7 @@ void nes_bmc_ball11_device::write_h(offs_t offset, u8 data) void nes_bmc_22games_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_22games write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_22games write_h, offset: %04x, data: %02x\n", offset, data); if (m_latch) { @@ -2638,7 +2639,7 @@ void nes_bmc_64y2k_device::update_banks() void nes_bmc_64y2k_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("bmc_64y2k write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_64y2k write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1000) @@ -2650,7 +2651,7 @@ void nes_bmc_64y2k_device::write_l(offs_t offset, u8 data) void nes_bmc_64y2k_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_64y2k write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_64y2k write_h, offset: %04x, data: %02x\n", offset, data); if (!BIT(m_reg[0], 7)) prg16_89ab(((m_reg[1] << 1) & ~0x07) | (data & 0x07)); @@ -2672,7 +2673,7 @@ void nes_bmc_64y2k_device::write_h(offs_t offset, u8 data) void nes_bmc_420y2k_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_420y2k write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_420y2k write_h, offset: %04x, data: %02x\n", offset, data); if (BIT(m_latch, 1)) // lock bit m_reg = (m_reg & ~0x07) | (data & 0x07); @@ -2692,7 +2693,7 @@ void nes_bmc_420y2k_device::write_h(offs_t offset, u8 data) u8 nes_bmc_420y2k_device::read_h(offs_t offset) { - LOG_MMC(("bmc_420y2k read_h, offset: %04x\n", offset)); + LOG("bmc_420y2k read_h, offset: %04x\n", offset); // latch bit 0 is only used to determine the menu, and the behavior of // this cart seems hardwired to OR $02 (ORing $00-$03 allows four menus) return hi_access_rom(offset | (m_latch & 1) << 1); @@ -2731,7 +2732,7 @@ void nes_bmc_12in1_device::update_banks() void nes_bmc_12in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_12in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_12in1 write_h, offset: %04x, data: %02x\n", offset, data); m_reg[BIT(offset, 13, 2)] = data; update_banks(); @@ -2752,7 +2753,7 @@ void nes_bmc_12in1_device::write_h(offs_t offset, u8 data) void nes_bmc_20in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_20in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_20in1 write_h, offset: %04x, data: %02x\n", offset, data); prg16_89ab(offset & 0x1e); prg16_cdef((offset & 0x1e) | BIT(offset, 5)); @@ -2774,7 +2775,7 @@ void nes_bmc_20in1_device::write_h(offs_t offset, u8 data) void nes_bmc_21in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_21in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_21in1 write_h, offset: %04x, data: %02x\n", offset, data); prg32(offset & 0x03); chr8(offset & 0x07, CHRROM); @@ -2795,7 +2796,7 @@ void nes_bmc_21in1_device::write_h(offs_t offset, u8 data) void nes_bmc_31in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_31in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_31in1 write_h, offset: %04x, data: %02x\n", offset, data); set_nt_mirroring(BIT(offset, 5) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); offset &= 0x1f; @@ -2825,7 +2826,7 @@ void nes_bmc_31in1_device::write_h(offs_t offset, u8 data) void nes_bmc_35in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_35in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_35in1 write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = BIT(data, 2, 2); prg16_89ab(bank); @@ -2842,13 +2843,13 @@ void nes_bmc_35in1_device::write_h(offs_t offset, u8 data) iNES: mapper 200 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_bmc_36in1_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("bmc_36in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_36in1 write_h, offset: %04x, data: %02x\n", offset, data); prg16_89ab(offset & 0x07); prg16_cdef(offset & 0x07); @@ -2866,7 +2867,7 @@ void nes_bmc_36in1_device::write_h(offs_t offset, uint8_t data) iNES: mapper 204 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ @@ -2874,7 +2875,7 @@ void nes_bmc_64in1_device::write_h(offs_t offset, uint8_t data) { int bank = (offset >> 1) & (offset >> 2) & 0x01; - LOG_MMC(("bmc_64in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_64in1 write_h, offset: %04x, data: %02x\n", offset, data); prg16_89ab(offset & ~bank); prg16_cdef(offset | bank); @@ -2927,7 +2928,7 @@ void nes_bmc_70in1_device::update_prg(u8 bank) void nes_bmc_70in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc70in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc70in1 write_h, offset: %04x, data: %02x\n", offset, data); m_latch[BIT(offset, 14)] = offset; update_banks(); set_nt_mirroring(BIT(m_latch[0], 5) ? PPU_MIRROR_HORZ: PPU_MIRROR_VERT); @@ -2935,7 +2936,7 @@ void nes_bmc_70in1_device::write_h(offs_t offset, u8 data) uint8_t nes_bmc_70in1_device::read_h(offs_t offset) { - LOG_MMC(("bmc70in1 read_h, offset: %04x\n", offset)); + LOG("bmc70in1 read_h, offset: %04x\n", offset); if ((m_latch[1] & 0x30) == 0x10) offset = (offset & ~0x0f) | m_jumper; // TODO: make jumper selectable @@ -2978,7 +2979,7 @@ void nes_bmc_800in1_device::update_banks() u8 nes_bmc_72in1_device::read_l(offs_t offset) { - LOG_MMC(("bmc_72in1 read_l, offset: %04x\n", offset)); + LOG("bmc_72in1 read_l, offset: %04x\n", offset); offset += 0x100; if (offset >= 0x1800) // 4 nibbles of RAM mirrored above 0x5800 @@ -2989,7 +2990,7 @@ u8 nes_bmc_72in1_device::read_l(offs_t offset) void nes_bmc_72in1_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("bmc_72in1 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_72in1 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1800) // 4 nibbles of RAM mirrored above 0x5800 @@ -2998,7 +2999,7 @@ void nes_bmc_72in1_device::write_l(offs_t offset, u8 data) void nes_bmc_72in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_72in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_72in1 write_h, offset: %04x, data: %02x\n", offset, data); u8 high = (offset >> 8) & 0x40; u8 bank = high | BIT(offset, 6, 6); @@ -3033,7 +3034,7 @@ void nes_bmc_72in1_device::write_h(offs_t offset, u8 data) void nes_bmc_76in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_76in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_76in1 write_h, offset: %04x, data: %02x\n", offset, data); m_reg[offset & 0x01] = data; u8 bank = m_reg[1] << 6 | (m_reg[0] & 0x80) >> 2 | (m_reg[0] & 0x1f); @@ -3059,7 +3060,7 @@ void nes_bmc_76in1_device::write_h(offs_t offset, u8 data) void nes_bmc_150in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_150in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_150in1 write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = BIT(offset, 1, 3); u8 mode = (bank & 0x06) == 0x06; @@ -3085,7 +3086,7 @@ void nes_bmc_150in1_device::write_h(offs_t offset, u8 data) void nes_bmc_500in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc500in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc500in1 write_h, offset: %04x, data: %02x\n", offset, data); prg32(BIT(offset, 2, 3)); chr8(offset & 0x07, CHRROM); } @@ -3099,7 +3100,7 @@ void nes_bmc_500in1_device::write_h(offs_t offset, u8 data) iNES: mapper 227 - In MESS: Preliminary Supported. + In MAME: Preliminary Supported. -------------------------------------------------*/ @@ -3116,7 +3117,7 @@ void nes_bmc_1200in1_device::write_h(offs_t offset, uint8_t data) { int bank = ((offset >> 2) & 0x1f) | ((offset & 0x0100) >> 3); - LOG_MMC(("bmc_1200in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_1200in1 write_h, offset: %04x, data: %02x\n", offset, data); if (offset & 0x80) { @@ -3162,7 +3163,7 @@ void nes_bmc_1200in1_device::write_h(offs_t offset, uint8_t data) void nes_bmc_gold260_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_gold260 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_gold260 write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = bitswap<8>(offset, 9, 8, 4, 3, 2, 1, 0, 12); u8 mode = !BIT(offset, 11); @@ -3214,7 +3215,7 @@ void nes_bmc_gold260_device::write_h(offs_t offset, u8 data) void nes_bmc_42in1reset_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_42in1reset write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_42in1reset write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = m_latch | (data & 0x1f); u8 mode = !BIT(data, 5); @@ -3241,7 +3242,7 @@ void nes_bmc_42in1reset_device::write_h(offs_t offset, u8 data) void nes_bmc_lc160_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_lc160 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_lc160 write_h, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x4000) { u8 bank = BIT(offset, 2, 6); @@ -3287,14 +3288,14 @@ void nes_bmc_60311c_device::update_banks() void nes_bmc_60311c_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_60311c write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_60311c write_m, offset: %04x, data: %02x\n", offset, data); m_reg[offset & 1] = data & 0x7f; update_banks(); } void nes_bmc_60311c_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_60311c write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_60311c write_h, offset: %04x, data: %02x\n", offset, data); m_reg[2] = data & 0x07; update_banks(); } @@ -3313,13 +3314,13 @@ void nes_bmc_60311c_device::write_h(offs_t offset, u8 data) u8 nes_bmc_ctc12in1_device::read_m(offs_t offset) { - LOG_MMC(("bmc_ctc12in1 read_m, offset: %04x, data: %02x\n", offset)); + LOG("bmc_ctc12in1 read_m, offset: %04x, data: %02x\n", offset); return m_prg[0x01 * 0x2000 + offset]; // fixed to bank 1 } void nes_bmc_ctc12in1_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_ctc12in1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_ctc12in1 write_h, offset: %04x, data: %02x\n", offset, data); m_reg[BIT(offset, 14)] = data; u8 bank = (m_reg[0] & 0x18) | (m_reg[1] & 0x07); @@ -3364,7 +3365,7 @@ void nes_bmc_ctc12in1_device::write_h(offs_t offset, u8 data) void nes_bmc_891227_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_891227 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_891227 write_h, offset: %04x, data: %02x\n", offset, data); if (offset < 0x4000) data = bitswap<8>(data, 6, 5, 7, 4, 3, 2, 1, 0); @@ -3399,7 +3400,7 @@ void nes_bmc_891227_device::write_h(offs_t offset, u8 data) u8 nes_bmc_fam250_device::read_m(offs_t offset) { -// LOG_MMC(("fam250 read_m, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "fam250 read_m, offset: %04x\n", offset); if (m_latch == 5) // only the Bubble Bobble FDS bootleg uses this return m_prg[(((m_reg & 0x1f) << 1 | BIT(m_reg, 7)) * 0x2000 + offset) & (m_prg_size - 1)]; @@ -3409,7 +3410,7 @@ u8 nes_bmc_fam250_device::read_m(offs_t offset) void nes_bmc_fam250_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("fam250 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("fam250 write_h, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x7000) { @@ -3442,7 +3443,7 @@ void nes_bmc_fam250_device::write_h(offs_t offset, u8 data) void nes_bmc_k1029_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_k1029 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_k1029 write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = data & 0x3f; switch (offset & 3) @@ -3492,7 +3493,7 @@ void nes_bmc_k1029_device::write_h(offs_t offset, u8 data) void nes_n625092_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("n625092 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("n625092 write_h, offset: %04x, data: %02x\n", offset, data); m_latch[BIT(offset, 14)] = offset; @@ -3527,7 +3528,7 @@ void nes_n625092_device::write_h(offs_t offset, u8 data) void nes_bmc_th22913_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_th22913 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_th22913 write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = offset >> 2; u8 mode = BIT(offset, 1); diff --git a/src/devices/bus/nes/namcot.cpp b/src/devices/bus/nes/namcot.cpp index 31f72761751..67d321fc137 100644 --- a/src/devices/bus/nes/namcot.cpp +++ b/src/devices/bus/nes/namcot.cpp @@ -28,12 +28,11 @@ #include "speaker.h" #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -261,7 +260,7 @@ void nes_namcot163_device::pcb_reset() void nes_namcot3433_device::dxrom_write(offs_t offset, uint8_t data) { - LOG_MMC(("dxrom_write, offset: %04x, data: %02x\n", offset, data)); + LOG("dxrom_write, offset: %04x, data: %02x\n", offset, data); if (!(offset & 1) && m_pcb_ctrl_mirror) set_nt_mirroring(BIT(data, 6) ? PPU_MIRROR_HIGH : PPU_MIRROR_LOW); @@ -304,7 +303,7 @@ void nes_namcot3433_device::dxrom_write(offs_t offset, uint8_t data) void nes_namcot3446_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("namcot3446 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("namcot3446 write_h, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x2000) return; @@ -341,7 +340,7 @@ void nes_namcot3446_device::write_h(offs_t offset, uint8_t data) void nes_namcot3425_device::write_h(offs_t offset, uint8_t data) { uint8_t mode; - LOG_MMC(("namcot3425 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("namcot3425 write_h, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x2000) return; @@ -393,7 +392,7 @@ void nes_namcot3425_device::write_h(offs_t offset, uint8_t data) iNES: mapper 210 - In MESS: Supported + In MAME: Supported -------------------------------------------------*/ @@ -410,7 +409,7 @@ TIMER_CALLBACK_MEMBER(nes_namcot340_device::irq_timer_tick) void nes_namcot340_device::n340_lowrite(offs_t offset, uint8_t data) { - LOG_MMC(("n340_lowrite, offset: %04x, data: %02x\n", offset, data)); + LOG("n340_lowrite, offset: %04x, data: %02x\n", offset, data); offset += 0x100; switch (offset & 0x1800) @@ -429,7 +428,7 @@ void nes_namcot340_device::n340_lowrite(offs_t offset, uint8_t data) uint8_t nes_namcot340_device::n340_loread(offs_t offset) { - LOG_MMC(("n340_loread, offset: %04x\n", offset)); + LOG("n340_loread, offset: %04x\n", offset); offset += 0x100; switch (offset & 0x1800) @@ -449,7 +448,7 @@ uint8_t nes_namcot340_device::n340_loread(offs_t offset) void nes_namcot340_device::n340_hiwrite(offs_t offset, uint8_t data) { - LOG_MMC(("n340_hiwrite, offset: %04x, data: %02x\n", offset, data)); + LOG("n340_hiwrite, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7800) { @@ -504,7 +503,7 @@ void nes_namcot340_device::n340_hiwrite(offs_t offset, uint8_t data) iNES: mapper 210 - In MESS: Supported + In MAME: Supported -------------------------------------------------*/ @@ -528,7 +527,7 @@ void nes_namcot175_device::write_m(offs_t offset, uint8_t data) void nes_namcot175_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("namcot175 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("namcot175 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7800) { @@ -557,7 +556,7 @@ void nes_namcot175_device::write_h(offs_t offset, uint8_t data) iNES: mapper 19 - In MESS: Supported + In MAME: Supported -------------------------------------------------*/ @@ -609,7 +608,7 @@ void nes_namcot163_device::write_m(offs_t offset, uint8_t data) void nes_namcot163_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("namcot163 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("namcot163 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; switch (offset & 0x1800) @@ -625,7 +624,7 @@ void nes_namcot163_device::write_l(offs_t offset, uint8_t data) uint8_t nes_namcot163_device::read_l(offs_t offset) { - LOG_MMC(("namcot163 read_l, offset: %04x\n", offset)); + LOG("namcot163 read_l, offset: %04x\n", offset); offset += 0x100; switch (offset & 0x1800) @@ -647,7 +646,7 @@ void nes_namcot163_device::set_mirror(uint8_t page, uint8_t data) void nes_namcot163_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("namcot163 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("namcot163 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7800) { diff --git a/src/devices/bus/nes/nanjing.cpp b/src/devices/bus/nes/nanjing.cpp index 6a451b3c59d..d23eed28b53 100644 --- a/src/devices/bus/nes/nanjing.cpp +++ b/src/devices/bus/nes/nanjing.cpp @@ -18,12 +18,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -87,7 +86,7 @@ void nes_nanjing_device::pcb_reset() iNES: mapper 163 - In MESS: Unsupported. + In MAME: Unsupported. -------------------------------------------------*/ @@ -112,7 +111,7 @@ void nes_nanjing_device::hblank_irq(int scanline, bool vblank, bool blanked) void nes_nanjing_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("nanjing write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("nanjing write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; @@ -156,7 +155,7 @@ void nes_nanjing_device::write_l(offs_t offset, uint8_t data) uint8_t nes_nanjing_device::read_l(offs_t offset) { uint8_t value = 0; - LOG_MMC(("nanjing read_l, offset: %04x\n", offset)); + LOG("nanjing read_l, offset: %04x\n", offset); offset += 0x100; diff --git a/src/devices/bus/nes/ntdec.cpp b/src/devices/bus/nes/ntdec.cpp index fd207f20a00..5e95c380ffb 100644 --- a/src/devices/bus/nes/ntdec.cpp +++ b/src/devices/bus/nes/ntdec.cpp @@ -23,12 +23,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -117,7 +116,7 @@ void nes_ntdec_n715021_device::pcb_reset() void nes_ntdec_asder_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ntdec_asder write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ntdec_asder write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) // writes only at even addresses? { @@ -166,7 +165,7 @@ void nes_ntdec_asder_device::write_h(offs_t offset, u8 data) void nes_ntdec_fh_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("ntdec_fh write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("ntdec_fh write_m, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x07) { @@ -205,7 +204,7 @@ void nes_ntdec_fh_device::write_m(offs_t offset, u8 data) void nes_ntdec_n715021_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ntdec_n715021 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ntdec_n715021 write_h, offset: %04x, data: %02x\n", offset, data); prg16_89ab(BIT(offset, 2, 2)); chr8(offset & 0x03, CHRROM); } diff --git a/src/devices/bus/nes/nxrom.cpp b/src/devices/bus/nes/nxrom.cpp index 9f2e35aa0ed..ae377894131 100644 --- a/src/devices/bus/nes/nxrom.cpp +++ b/src/devices/bus/nes/nxrom.cpp @@ -31,12 +31,11 @@ #include "nxrom.h" #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -221,7 +220,7 @@ void nes_nochr_device::pcb_reset() iNES: mapper 0 - In MESS: Supported, no need of specific handlers or IRQ + In MAME: Supported, no need of specific handlers or IRQ -------------------------------------------------*/ @@ -233,13 +232,13 @@ void nes_nochr_device::pcb_reset() This is an homebrew extension to map linearly 46KB or PRG in boards with no PRG bankswitch logic - In MESS: Supported + In MAME: Supported -------------------------------------------------*/ uint8_t nes_nrom368_device::read_l(offs_t offset) { - LOG_MMC(("nrom368 read_l, offset: %04x\n", offset)); + LOG("nrom368 read_l, offset: %04x\n", offset); offset += 0x100; if (offset >= 0x800) return m_prg[offset - 0x800]; @@ -249,13 +248,13 @@ uint8_t nes_nrom368_device::read_l(offs_t offset) uint8_t nes_nrom368_device::read_m(offs_t offset) { - LOG_MMC(("nrom368 read_m, offset: %04x\n", offset)); + LOG("nrom368 read_m, offset: %04x\n", offset); return m_prg[0x1800 + (offset & 0x1fff)]; } uint8_t nes_nrom368_device::read_h(offs_t offset) { - LOG_MMC(("nrom368 read_h, offset: %04x\n", offset)); + LOG("nrom368 read_h, offset: %04x\n", offset); return m_prg[0x3800 + (offset & 0x7fff)]; } @@ -276,13 +275,13 @@ uint8_t nes_nrom368_device::read_h(offs_t offset) iNES: mapper 7 - In MESS: Supported + In MAME: Supported -------------------------------------------------*/ void nes_axrom_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("axrom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("axrom write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -305,7 +304,7 @@ void nes_bxrom_device::write_h(offs_t offset, uint8_t data) { /* This portion of the mapper is nearly identical to Mapper 7, except no one-screen mirroring */ /* Deadly Towers is really a BxROM game - the demo screens look wrong using mapper 7. */ - LOG_MMC(("bxrom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bxrom write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict, but the same is not true for some pirate variants data = account_bus_conflict(offset, data); @@ -331,15 +330,15 @@ void nes_bxrom_device::write_h(offs_t offset, uint8_t data) Notice that BANDAI_PT554 board (Aerobics Studio) uses very similar hardware but with an additional sound chip which - gets writes to 0x6000 (currently unemulated in MESS) + gets writes to 0x6000 (currently unemulated in MAME) - In MESS: Supported + In MAME: Supported -------------------------------------------------*/ void nes_cnrom_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("cxrom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("cxrom write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict, but the same is not true for some pirate variants data = account_bus_conflict(offset, data); @@ -381,13 +380,13 @@ uint8_t nes_cnrom_device::chr_r(offs_t offset) iNES: mapper 13 - In MESS: Supported + In MAME: Supported -------------------------------------------------*/ void nes_cprom_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("cprom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("cprom write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -408,7 +407,7 @@ void nes_cprom_device::write_h(offs_t offset, uint8_t data) void nes_gxrom_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("gxrom write_h, offset %04x, data: %02x\n", offset, data)); + LOG("gxrom write_h, offset %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -428,13 +427,13 @@ void nes_gxrom_device::write_h(offs_t offset, uint8_t data) iNES: mapper 2 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_uxrom_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("uxrom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("uxrom write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -454,13 +453,13 @@ void nes_uxrom_device::write_h(offs_t offset, uint8_t data) iNES: mapper 180 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_uxrom_cc_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("uxrom_cc write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("uxrom_cc write_h, offset: %04x, data: %02x\n", offset, data); prg16_cdef(data); } @@ -475,13 +474,13 @@ void nes_uxrom_cc_device::write_h(offs_t offset, uint8_t data) iNES: mapper 94 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_un1rom_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("un1rom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("un1rom write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); diff --git a/src/devices/bus/nes/pirate.cpp b/src/devices/bus/nes/pirate.cpp index 81a06c7d655..44b7c8acf8d 100644 --- a/src/devices/bus/nes/pirate.cpp +++ b/src/devices/bus/nes/pirate.cpp @@ -21,12 +21,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -269,7 +268,7 @@ void nes_eh8813a_device::pcb_reset() void nes_agci_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("agci write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("agci write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict // bit 0 is always determined by the ROM value at the offset due to a resistor on the board @@ -293,7 +292,7 @@ void nes_agci_device::write_h(offs_t offset, u8 data) void nes_dreamtech_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("dreamtech write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("dreamtech write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1000) @@ -314,7 +313,7 @@ void nes_dreamtech_device::write_l(offs_t offset, u8 data) void nes_fukutake_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("fukutake write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("fukutake write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x200 && offset < 0x400) @@ -330,7 +329,7 @@ void nes_fukutake_device::write_l(offs_t offset, uint8_t data) uint8_t nes_fukutake_device::read_l(offs_t offset) { - LOG_MMC(("fukutake read_l, offset: %04x\n", offset)); + LOG("fukutake read_l, offset: %04x\n", offset); offset += 0x100; if (offset >= 0x200 && offset < 0x400) @@ -350,13 +349,13 @@ uint8_t nes_fukutake_device::read_l(offs_t offset) void nes_fukutake_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("fukutake write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("fukutake write_m, offset: %04x, data: %02x\n", offset, data); m_prgram[((m_latch * 0x2000) + offset) & (m_prgram.size() - 1)] = data; } uint8_t nes_fukutake_device::read_m(offs_t offset) { - LOG_MMC(("fukutake read_m, offset: %04x\n", offset)); + LOG("fukutake read_m, offset: %04x\n", offset); return m_prgram[((m_latch * 0x2000) + offset) & (m_prgram.size() - 1)]; } @@ -387,7 +386,7 @@ void nes_futuremedia_device::hblank_irq(int scanline, bool vblank, bool blanked) void nes_futuremedia_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("futuremedia write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("futuremedia write_h, offset: %04x, data: %02x\n", offset, data); switch (offset) { @@ -443,7 +442,7 @@ void nes_futuremedia_device::write_h(offs_t offset, u8 data) void nes_magseries_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("magseries write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("magseries write_h, offset: %04x, data: %02x\n", offset, data); prg32(data >> 1); chr8(data, CHRROM); @@ -466,7 +465,7 @@ void nes_magseries_device::write_h(offs_t offset, u8 data) void nes_daou306_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("daou306 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("daou306 write_h, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x4000 && offset < 0x4010) { @@ -495,7 +494,7 @@ void nes_daou306_device::write_h(offs_t offset, u8 data) void nes_cc21_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("cc21 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("cc21 write_h, offset: %04x, data: %02x\n", offset, data); set_nt_mirroring(BIT(offset, 0) ? PPU_MIRROR_HIGH : PPU_MIRROR_LOW); chr4_0(BIT(offset, 0), CHRROM); @@ -513,13 +512,13 @@ void nes_cc21_device::write_h(offs_t offset, u8 data) iNES: mapper 176 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_xiaozy_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("xiaozy write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("xiaozy write_l, offset: %04x, data: %02x\n", offset, data); switch (offset) { @@ -540,7 +539,7 @@ void nes_xiaozy_device::write_l(offs_t offset, uint8_t data) void nes_edu2k_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("edu2k write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("edu2k write_h, offset: %04x, data: %02x\n", offset, data); prg32(data & 0x1f); m_latch = BIT(data, 6, 2); @@ -548,13 +547,13 @@ void nes_edu2k_device::write_h(offs_t offset, uint8_t data) void nes_edu2k_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("edu2k write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("edu2k write_m, offset: %04x, data: %02x\n", offset, data); m_prgram[((m_latch * 0x2000) + offset) & (m_prgram.size() - 1)] = data; } uint8_t nes_edu2k_device::read_m(offs_t offset) { - LOG_MMC(("edu2k read_m, offset: %04x\n", offset)); + LOG("edu2k read_m, offset: %04x\n", offset); return m_prgram[((m_latch * 0x2000) + offset) & (m_prgram.size() - 1)]; } @@ -589,7 +588,7 @@ void nes_jy830623c_device::hblank_irq(int scanline, bool vblank, bool blanked) if (m_irq_enable && !blanked && !m_irq_count && prior_count) { - LOG_MMC(("irq fired, scanline: %d\n", scanline)); + LOG("irq fired, scanline: %d\n", scanline); set_irq_line(ASSERT_LINE); } } @@ -607,7 +606,7 @@ void nes_jy830623c_device::update_banks() void nes_jy830623c_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("jy830623c write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("jy830623c write_m, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x1003) { @@ -634,7 +633,7 @@ void nes_jy830623c_device::write_m(offs_t offset, u8 data) void nes_jy830623c_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("jy830623c write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("jy830623c write_h, offset: %04x, data: %02x\n", offset, data); if (offset < 0x2000) { @@ -649,13 +648,13 @@ void nes_jy830623c_device::write_h(offs_t offset, u8 data) Games: Gaau Hok Gwong Cheung - In MESS: Preliminary Supported + In MAME: Preliminary Supported -------------------------------------------------*/ void nes_43272_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("unl_43272 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("unl_43272 write_h, offset: %04x, data: %02x\n", offset, data); if ((m_latch & 0x81) == 0x81) prg32(BIT(m_latch, 3, 3)); @@ -667,7 +666,7 @@ void nes_43272_device::write_h(offs_t offset, uint8_t data) uint8_t nes_43272_device::read_h(offs_t offset) { uint8_t mask = (m_latch & 0x400) ? 0xfe : 0xff; - LOG_MMC(("unl_43272 read_h, offset: %04x\n", offset)); + LOG("unl_43272 read_h, offset: %04x\n", offset); return hi_access_rom(offset & mask); } @@ -687,7 +686,7 @@ uint8_t nes_43272_device::read_h(offs_t offset) void nes_eh8813a_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("unl_eh8813a write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("unl_eh8813a write_h, offset: %04x, data: %02x\n", offset, data); if (!BIT(m_latch, 8)) { @@ -707,7 +706,7 @@ void nes_eh8813a_device::write_h(offs_t offset, u8 data) u8 nes_eh8813a_device::read_h(offs_t offset) { - LOG_MMC(("unl_eh8813a read_h, offset: %04x\n", offset)); + LOG("unl_eh8813a read_h, offset: %04x\n", offset); if (BIT(m_latch, 6)) offset = (offset & ~0x0f) | m_jumper; // TODO: jumper setting that controls which menu appears is 0 for now @@ -742,7 +741,7 @@ void nes_fujiya_device::pcb_reset() void nes_fujiya_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("fujiya write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("fujiya write_m, offset: %04x, data: %02x\n", offset, data); offset += 0x6000; if (offset == 0x6502 || offset == 0x7000) @@ -751,7 +750,7 @@ void nes_fujiya_device::write_m(offs_t offset, uint8_t data) uint8_t nes_fujiya_device::read_m(offs_t offset) { - LOG_MMC(("fujiya read_m, offset: %04x\n", offset)); + LOG("fujiya read_m, offset: %04x\n", offset); offset += 0x6000; if (offset == 0x7001 || offset == 0x7777) diff --git a/src/devices/bus/nes/pt554.cpp b/src/devices/bus/nes/pt554.cpp index 024da1655a5..fee133f6add 100644 --- a/src/devices/bus/nes/pt554.cpp +++ b/src/devices/bus/nes/pt554.cpp @@ -17,12 +17,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -58,7 +57,7 @@ nes_bandai_pt554_device::nes_bandai_pt554_device(const machine_config &mconfig, void nes_bandai_pt554_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("Bandai PT-554 Sound write, data: %02x\n", data)); + LOG("Bandai PT-554 Sound write, data: %02x\n", data); // the actual chip starts speech synthesis when SYNC is held low >18µs if (!BIT(data, 6)) diff --git a/src/devices/bus/nes/racermate.cpp b/src/devices/bus/nes/racermate.cpp index 6ebc898721f..00524bd47da 100644 --- a/src/devices/bus/nes/racermate.cpp +++ b/src/devices/bus/nes/racermate.cpp @@ -20,12 +20,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -69,7 +68,7 @@ void nes_racermate_device::pcb_reset() Board UNL-RACERMATE - In MESS: *VERY* preliminary support. Also, it seems that this + In MAME: *VERY* preliminary support. Also, it seems that this board saves to battery the CHRRAM!!! -------------------------------------------------*/ @@ -82,7 +81,7 @@ void nes_racermate_device::update_banks() void nes_racermate_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("racermate write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("racermate write_h, offset: %04x, data: %02x\n", offset, data); if (offset == 0x3000) { diff --git a/src/devices/bus/nes/rcm.cpp b/src/devices/bus/nes/rcm.cpp index 4378d65c4df..73b78644170 100644 --- a/src/devices/bus/nes/rcm.cpp +++ b/src/devices/bus/nes/rcm.cpp @@ -21,14 +21,12 @@ #include "rcm.h" - #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -97,7 +95,7 @@ nes_3dblock_device::nes_3dblock_device(const machine_config &mconfig, const char void nes_gs2015_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("gs2015 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("gs2015 write_h, offset: %04x, data: %02x\n", offset, data); prg32(offset); chr8(offset >> 1, m_chr_source); @@ -105,7 +103,7 @@ void nes_gs2015_device::write_h(offs_t offset, uint8_t data) uint8_t nes_gs2015_device::read_m(offs_t offset) { - LOG_MMC(("gs2015 read_m, offset: %04x\n", offset)); + LOG("gs2015 read_m, offset: %04x\n", offset); return 0; // Videopoker Bonza needs this (sort of protection? or related to inputs?) } @@ -123,13 +121,13 @@ uint8_t nes_gs2015_device::read_m(offs_t offset) u8 nes_gs2004_device::read_m(offs_t offset) { - LOG_MMC(("gs2004 read_m, offset: %04x\n", offset)); + LOG("gs2004 read_m, offset: %04x\n", offset); return m_prg[m_base + offset]; // fixed base differs per device } void nes_gs2004_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("gs2004 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("gs2004 write_h, offset: %04x, data: %02x\n", offset, data); prg32(data); } @@ -147,7 +145,7 @@ void nes_gs2004_device::write_h(offs_t offset, u8 data) void nes_tf9_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("tetrisfam write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("tetrisfam write_h, offset: %04x, data: %02x\n", offset, data); u8 bank = (offset & 0x0f) << 1 | BIT(offset, 5); u8 mode = !BIT(offset, 4); diff --git a/src/devices/bus/nes/rexsoft.cpp b/src/devices/bus/nes/rexsoft.cpp index fdab817e515..76eeb7c8036 100644 --- a/src/devices/bus/nes/rexsoft.cpp +++ b/src/devices/bus/nes/rexsoft.cpp @@ -22,12 +22,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -109,7 +108,7 @@ void nes_rex_sl1632_device::pcb_reset() void nes_rex_dbz5_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("rex_dbz write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("rex_dbz write_l, offset: %04x, data: %02x\n", offset, data); m_extra = data; set_chr(m_chr_source, m_chr_base, m_chr_mask); @@ -118,7 +117,7 @@ void nes_rex_dbz5_device::write_l(offs_t offset, uint8_t data) /* we would need to use this read handler in 0x6000-0x7fff as well */ uint8_t nes_rex_dbz5_device::read_l(offs_t offset) { - LOG_MMC(("rex_dbz read_l, offset: %04x\n", offset)); + LOG("rex_dbz read_l, offset: %04x\n", offset); return 0x01; } @@ -170,7 +169,7 @@ void nes_rex_sl1632_device::chr_cb(int start, int bank, int source) void nes_rex_sl1632_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("rex_sl1632 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("rex_sl1632 write_h, offset: %04x, data: %02x\n", offset, data); if (offset == 0x2131) // Mode control register at $A131 { diff --git a/src/devices/bus/nes/sachen.cpp b/src/devices/bus/nes/sachen.cpp index 8e21943f97f..69934c2b0cd 100644 --- a/src/devices/bus/nes/sachen.cpp +++ b/src/devices/bus/nes/sachen.cpp @@ -28,14 +28,14 @@ #include "emu.h" #include "sachen.h" +#define LOG_HIFREQ (1U << 1) #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -246,13 +246,13 @@ void nes_sachen_8259d_device::pcb_reset() iNES: mapper 160 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_sachen_sa009_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("SA009 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("SA009 write_l, offset: %04x, data: %02x\n", offset, data); chr8(data, m_chr_source); } @@ -271,7 +271,7 @@ void nes_sachen_sa009_device::write_l(offs_t offset, uint8_t data) void nes_sachen_sa0036_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("sa0036 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("sa0036 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -294,7 +294,7 @@ void nes_sachen_sa0036_device::write_h(offs_t offset, u8 data) void nes_sachen_sa0037_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("sa0037 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("sa0037 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -311,13 +311,13 @@ void nes_sachen_sa0037_device::write_h(offs_t offset, u8 data) iNES: mapper 145 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_sachen_sa72007_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("SA72007 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("SA72007 write_l, offset: %04x, data: %02x\n", offset, data); /* only if we are at 0x4100 + k * 0x200, but 0x4100 is offset = 0 */ if (!(offset & 0x100)) @@ -332,13 +332,13 @@ void nes_sachen_sa72007_device::write_l(offs_t offset, uint8_t data) iNES: mapper 133 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_sachen_sa72008_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("SA72008 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("SA72008 write_l, offset: %04x, data: %02x\n", offset, data); prg32(data >> 2); chr8(data, CHRROM); @@ -358,7 +358,7 @@ void nes_sachen_sa72008_device::write_l(offs_t offset, uint8_t data) uint8_t nes_sachen_tca01_device::read_l(offs_t offset) { - LOG_MMC(("TCA-01 read_l, offset: %04x\n", offset)); + LOG("TCA-01 read_l, offset: %04x\n", offset); /* the address is read only if we are at 0x4100 + k * 0x200, but 0x4100 is offset = 0 */ if (!(offset & 0x100)) @@ -375,13 +375,13 @@ uint8_t nes_sachen_tca01_device::read_l(offs_t offset) iNES: mapper 147 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_sachen_tcu01_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("TCU-01 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("TCU-01 write_l, offset: %04x, data: %02x\n", offset, data); if ((offset & 0x103) == 0x002) { @@ -398,13 +398,13 @@ void nes_sachen_tcu01_device::write_l(offs_t offset, uint8_t data) iNES: mapper 136 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_sachen_tcu02_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("TCU-02 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("TCU-02 write_l, offset: %04x, data: %02x\n", offset, data); if ((offset & 0x103) == 0x002) { @@ -415,7 +415,7 @@ void nes_sachen_tcu02_device::write_l(offs_t offset, uint8_t data) uint8_t nes_sachen_tcu02_device::read_l(offs_t offset) { - LOG_MMC(("TCU-02 read_l, offset: %04x\n", offset)); + LOG("TCU-02 read_l, offset: %04x\n", offset); if ((offset & 0x103) == 0x000) return m_latch | 0x40; @@ -463,7 +463,7 @@ u8 nes_sachen_3013_device::read_h(offs_t offset) void nes_sachen_3014_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("Sachen 3014 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("Sachen 3014 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -474,7 +474,7 @@ void nes_sachen_3014_device::write_h(offs_t offset, u8 data) u8 nes_sachen_3014_device::read_h(offs_t offset) { -// LOG_MMC(("Sachen 3014 read_h, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "Sachen 3014 read_h, offset: %04x\n", offset); u8 temp = hi_access_rom(offset); if ((offset & 0x7000) == 0x6000) @@ -511,14 +511,14 @@ void nes_sachen_74x374_device::set_mirror(uint8_t nt) // also used by mappers 13 set_nt_mirroring(PPU_MIRROR_LOW); break; default: - LOG_MMC(("Mapper set NT to invalid value %02x", nt)); + LOG("Mapper set NT to invalid value %02x", nt); break; } } void nes_sachen_74x374_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("Sachen 74*374 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("Sachen 74*374 write_l, offset: %04x, data: %02x\n", offset, data); /* write happens only if we are at 0x4100 + k * 0x200, but 0x4100 is offset = 0 */ if (!(offset & 0x100)) @@ -557,7 +557,7 @@ void nes_sachen_74x374_device::write_l(offs_t offset, uint8_t data) uint8_t nes_sachen_74x374_device::read_l(offs_t offset) { - LOG_MMC(("Sachen 74*374 read_l, offset: %04x", offset)); + LOG("Sachen 74*374 read_l, offset: %04x", offset); /* read happens only if we are at 0x4100 + k * 0x200, but 0x4100 is offset = 0 */ if (!(offset & 0x100)) @@ -568,7 +568,7 @@ uint8_t nes_sachen_74x374_device::read_l(offs_t offset) void nes_sachen_74x374_alt_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("Sachen 74*374 Alt write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("Sachen 74*374 Alt write_l, offset: %04x, data: %02x\n", offset, data); /* write happens only if we are at 0x4100 + k * 0x200, but 0x4100 is offset = 0 */ if (!(offset & 0x100)) @@ -632,7 +632,7 @@ void nes_sachen_8259a_device::chr_update() void nes_sachen_8259a_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("Sachen 8259 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("Sachen 8259 write_l, offset: %04x, data: %02x\n", offset, data); /* write happens only if we are at 0x4100 + k * 0x200, but 0x4100 is offset = 0 */ if (!(offset & 0x100)) diff --git a/src/devices/bus/nes/sealie.cpp b/src/devices/bus/nes/sealie.cpp index 32adda5680c..5c7b42cfe4e 100644 --- a/src/devices/bus/nes/sealie.cpp +++ b/src/devices/bus/nes/sealie.cpp @@ -21,12 +21,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -129,7 +128,7 @@ void nes_8bitxmas_device::pcb_reset() void nes_cufrom_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("cufrom write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("cufrom write_h, offset: %04x, data: %02x\n", offset, data); prg16_89ab(BIT(data, 2, 3)); chr8(data & 0x03, CHRRAM); @@ -154,7 +153,7 @@ void nes_cufrom_device::write_h(offs_t offset, u8 data) void nes_dpcmcart_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("dpcmcart write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("dpcmcart write_h, offset: %04x, data: %02x\n", offset, data); prg16_89ab(offset & 0x0fff); } @@ -177,7 +176,7 @@ void nes_dpcmcart_device::write_h(offs_t offset, u8 data) void nes_unrom512_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("unrom512 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("unrom512 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict in its nonflashable configuration data = account_bus_conflict(offset, data); @@ -230,7 +229,7 @@ void nes_8bitxmas_device::update_led() void nes_8bitxmas_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("8bitxmas write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("8bitxmas write_h, offset: %04x, data: %02x\n", offset, data); if (BIT(offset, 14)) nes_unrom512_device::write_h(offset, data); diff --git a/src/devices/bus/nes/somari.cpp b/src/devices/bus/nes/somari.cpp index bdf5b21b885..15382d01111 100644 --- a/src/devices/bus/nes/somari.cpp +++ b/src/devices/bus/nes/somari.cpp @@ -17,12 +17,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" #define SOMARI_VRC2_MODE 0 #define SOMARI_MMC3_MODE 1 @@ -260,7 +259,7 @@ void nes_somari_device::update_mirror() void nes_somari_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("somari write_h, mode %d, offset: %04x, data: %02x\n", m_board_mode, offset, data)); + LOG("somari write_h, mode %d, offset: %04x, data: %02x\n", m_board_mode, offset, data); switch (m_board_mode) { @@ -279,7 +278,7 @@ void nes_somari_device::update_all_banks() void nes_somari_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("somari write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("somari write_m, offset: %04x, data: %02x\n", offset, data); if (offset & 0x100) { diff --git a/src/devices/bus/nes/subor.cpp b/src/devices/bus/nes/subor.cpp index 2c9daf203ee..109e1625fdd 100644 --- a/src/devices/bus/nes/subor.cpp +++ b/src/devices/bus/nes/subor.cpp @@ -17,12 +17,11 @@ #include "subor.h" #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(...) do { if (VERBOSE) logerror(__VA_ARGS__); } while (0) +#include "logmacro.h" //************************************************************************** // DEVICE DEFINITIONS @@ -232,7 +231,7 @@ void nes_subor2_device::update_banks() uint8_t nes_subor2_device::read_l(offs_t offset) { - LOG_MMC("subor2 read_l, offset: %04x\n", offset); + LOG("subor2 read_l, offset: %04x\n", offset); if (offset == 0x1200) { @@ -248,7 +247,7 @@ uint8_t nes_subor2_device::read_l(offs_t offset) void nes_subor0_device::write_h(offs_t offset, uint8_t data) { uint8_t subor_helper1, subor_helper2; - LOG_MMC("subor0 write_h, offset: %04x, data: %02x\n", offset, data); + LOG("subor0 write_h, offset: %04x, data: %02x\n", offset, data); m_reg[BIT(offset, 13, 2)] = data; subor_helper1 = ((m_reg[0] ^ m_reg[1]) << 1) & 0x20; @@ -278,7 +277,7 @@ void nes_subor0_device::write_h(offs_t offset, uint8_t data) void nes_subor1_device::write_h(offs_t offset, uint8_t data) { uint8_t subor_helper1, subor_helper2; - LOG_MMC("subor1 write_h, offset: %04x, data: %02x\n", offset, data); + LOG("subor1 write_h, offset: %04x, data: %02x\n", offset, data); m_reg[BIT(offset, 13, 2)] = data; subor_helper1 = ((m_reg[0] ^ m_reg[1]) << 1) & 0x20; @@ -307,7 +306,7 @@ void nes_subor1_device::write_h(offs_t offset, uint8_t data) void nes_subor2_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC("subor2 write_l, offset: %04x, data: %02x\n", offset, data); + LOG("subor2 write_l, offset: %04x, data: %02x\n", offset, data); switch (offset) { diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp index ffe5aec9005..14ea2ea83c2 100644 --- a/src/devices/bus/nes/sunsoft.cpp +++ b/src/devices/bus/nes/sunsoft.cpp @@ -27,14 +27,14 @@ #include "sound/ay8910.h" #include "speaker.h" +#define LOG_UNHANDLED (1U << 1) #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_UNHANDLED | LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (LOG_UNHANDLED) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -191,7 +191,7 @@ void nes_sunsoft_fme7_device::pcb_reset() void nes_sunsoft_1_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("Sunsoft 1 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("Sunsoft 1 write_m, offset: %04x, data: %02x\n", offset, data); if (m_vrom_chunks) { @@ -218,7 +218,7 @@ void nes_sunsoft_1_device::write_m(offs_t offset, uint8_t data) void nes_sunsoft_2_device::write_h(offs_t offset, uint8_t data) { uint8_t helper = (data & 0x07) | ((data & 0x80) ? 0x08 : 0x00); - LOG_MMC(("Sunsoft 2 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("Sunsoft 2 write_h, offset: %04x, data: %02x\n", offset, data); // this pcb is subject to bus conflict data = account_bus_conflict(offset, data); @@ -253,7 +253,7 @@ TIMER_CALLBACK_MEMBER(nes_sunsoft_3_device::irq_timer_tick) void nes_sunsoft_3_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("Sunsoft 3 write_h, offset %04x, data: %02x\n", offset, data)); + LOG("Sunsoft 3 write_h, offset %04x, data: %02x\n", offset, data); switch (offset & 0x7800) { @@ -328,7 +328,7 @@ void nes_sunsoft_4_device::sun4_mirror() void nes_sunsoft_4_device::sun4_write(offs_t offset, u8 data) { - LOG_MMC(("Sunsoft 4 write_h, offset %04x, data: %02x\n", offset, data)); + LOG("Sunsoft 4 write_h, offset %04x, data: %02x\n", offset, data); switch (offset & 0x7000) { @@ -353,7 +353,7 @@ void nes_sunsoft_4_device::sun4_write(offs_t offset, u8 data) void nes_sunsoft_4_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("Sunsoft 4 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("Sunsoft 4 write_m, offset: %04x, data: %02x\n", offset, data); if (m_wram_enable) device_nes_cart_interface::write_m(offset, data); @@ -361,7 +361,7 @@ void nes_sunsoft_4_device::write_m(offs_t offset, u8 data) u8 nes_sunsoft_4_device::read_m(offs_t offset) { - LOG_MMC(("Sunsoft 4 read_m, offset: %04x\n", offset)); + LOG("Sunsoft 4 read_m, offset: %04x\n", offset); if (m_wram_enable) return device_nes_cart_interface::read_m(offset); @@ -393,7 +393,7 @@ TIMER_CALLBACK_MEMBER(nes_sunsoft_fme7_device::irq_timer_tick) void nes_sunsoft_fme7_device::fme7_write(offs_t offset, uint8_t data) { - LOG_MMC(("fme7_write, offset %04x, data: %02x\n", offset, data)); + LOG("fme7_write, offset %04x, data: %02x\n", offset, data); switch (offset & 0x6000) { @@ -443,7 +443,7 @@ void nes_sunsoft_fme7_device::fme7_write(offs_t offset, uint8_t data) break; default: - logerror("Sunsoft FME7 write_h uncaught %04x value: %02x\n", offset + 0x8000, data); + LOGMASKED(LOG_UNHANDLED, "Sunsoft FME7 write_h uncaught %04x value: %02x\n", offset + 0x8000, data); break; } } @@ -451,7 +451,7 @@ void nes_sunsoft_fme7_device::fme7_write(offs_t offset, uint8_t data) void nes_sunsoft_fme7_device::write_m(offs_t offset, uint8_t data) { uint8_t bank = m_wram_bank & 0x3f; - LOG_MMC(("Sunsoft FME7 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("Sunsoft FME7 write_m, offset: %04x, data: %02x\n", offset, data); if (!(m_wram_bank & 0x40)) // is PRG ROM, no write return; @@ -467,7 +467,7 @@ void nes_sunsoft_fme7_device::write_m(offs_t offset, uint8_t data) uint8_t nes_sunsoft_fme7_device::read_m(offs_t offset) { uint8_t bank = m_wram_bank & 0x3f; - LOG_MMC(("Sunsoft FME7 read_m, offset: %04x\n", offset)); + LOG("Sunsoft FME7 read_m, offset: %04x\n", offset); if (!(m_wram_bank & 0x40)) // is PRG ROM return m_prg[((bank * 0x2000) + offset) & (m_prg_size - 1)]; @@ -495,7 +495,7 @@ uint8_t nes_sunsoft_fme7_device::read_m(offs_t offset) void nes_sunsoft_5_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("sunsoft 5 write_h, offset %04x, data: %02x\n", offset, data)); + LOG("sunsoft 5 write_h, offset %04x, data: %02x\n", offset, data); switch (offset & 0x6000) { diff --git a/src/devices/bus/nes/sunsoft_dcs.cpp b/src/devices/bus/nes/sunsoft_dcs.cpp index 89bbcdbb915..188f0a83b32 100644 --- a/src/devices/bus/nes/sunsoft_dcs.cpp +++ b/src/devices/bus/nes/sunsoft_dcs.cpp @@ -16,12 +16,11 @@ #include "sunsoft_dcs.h" #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //----------------------------------------------- @@ -202,7 +201,7 @@ void nes_sunsoft_dcs_device::pcb_reset() void nes_sunsoft_dcs_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("Sunsoft DCS write_h, offset %04x, data: %02x\n", offset, data)); + LOG("Sunsoft DCS write_h, offset %04x, data: %02x\n", offset, data); switch (offset & 0x7000) { @@ -219,7 +218,7 @@ void nes_sunsoft_dcs_device::write_h(offs_t offset, uint8_t data) uint8_t nes_sunsoft_dcs_device::read_h(offs_t offset) { - LOG_MMC(("Sunsoft DCS read_h, offset: %04x\n", offset)); + LOG("Sunsoft DCS read_h, offset: %04x\n", offset); if (m_exrom_enable && m_subslot->m_cart && offset < 0x4000) { @@ -234,7 +233,7 @@ uint8_t nes_sunsoft_dcs_device::read_h(offs_t offset) void nes_sunsoft_dcs_device::write_m(offs_t offset, uint8_t data) { - LOG_MMC(("Sunsoft DCS write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("Sunsoft DCS write_m, offset: %04x, data: %02x\n", offset, data); if (!m_battery.empty() && m_wram_enable) m_battery[offset & (m_battery.size() - 1)] = data; @@ -250,7 +249,7 @@ void nes_sunsoft_dcs_device::write_m(offs_t offset, uint8_t data) uint8_t nes_sunsoft_dcs_device::read_m(offs_t offset) { - LOG_MMC(("Sunsoft DCS read_m, offset: %04x\n", offset)); + LOG("Sunsoft DCS read_m, offset: %04x\n", offset); if (!m_battery.empty() && m_wram_enable) return m_battery[offset & (m_battery.size() - 1)]; diff --git a/src/devices/bus/nes/taito.cpp b/src/devices/bus/nes/taito.cpp index a3689c8f4a7..d27b8fb2695 100644 --- a/src/devices/bus/nes/taito.cpp +++ b/src/devices/bus/nes/taito.cpp @@ -20,20 +20,19 @@ ***********************************************************************************************************/ - #include "emu.h" #include "taito.h" #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access ppu2c0x_device::BOTTOM_VISIBLE_SCANLINE +#define LOG_UNHANDLED (1U << 1) #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_UNHANDLED | LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (LOG_UNHANDLED) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -174,7 +173,7 @@ void nes_x1_017_device::pcb_reset() void nes_tc0190fmc_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("tc0190fmc write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("tc0190fmc write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6003) { @@ -234,7 +233,7 @@ void nes_tc0190fmc_pal16r4_device::hblank_irq(int scanline, bool vblank, bool bl void nes_tc0190fmc_pal16r4_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("tc0190fmc pal16r4 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("tc0190fmc pal16r4 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6003) { @@ -282,7 +281,7 @@ void nes_tc0190fmc_pal16r4_device::write_h(offs_t offset, u8 data) void nes_x1_005_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("x1_005 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("x1_005 write_m, offset: %04x, data: %02x\n", offset, data); if ((offset & 0x1f70) == 0x1e70) // A7 is not connected { @@ -328,12 +327,12 @@ void nes_x1_005_device::write_m(offs_t offset, u8 data) else if (offset >= 0x1f00 && m_latch == 0xa3) m_x1_005_ram[offset & 0x7f] = data; else - logerror("Taito X1-005 uncaught addr: %04x, value: %02x\n", offset + 0x6000, data); + LOGMASKED(LOG_UNHANDLED, "Taito X1-005 uncaught addr: %04x, value: %02x\n", offset + 0x6000, data); } u8 nes_x1_005_device::read_m(offs_t offset) { - LOG_MMC(("x1_005 read_m, offset: %04x\n", offset)); + LOG("x1_005 read_m, offset: %04x\n", offset); if (offset >= 0x1f00 && m_latch == 0xa3) return m_x1_005_ram[offset & 0x7f]; @@ -379,7 +378,7 @@ void nes_x1_017_device::set_chr() void nes_x1_017_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("x1017 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("x1017 write_m, offset: %04x, data: %02x\n", offset, data); switch (offset) { @@ -437,7 +436,7 @@ void nes_x1_017_device::write_m(offs_t offset, u8 data) u8 nes_x1_017_device::read_m(offs_t offset) { - LOG_MMC(("x1017 read_m, offset: %04x\n", offset)); + LOG("x1017 read_m, offset: %04x\n", offset); // 2+2+1 KB of Internal RAM can be independently enabled/disabled! if ((offset < 0x0800 && m_reg[0] == 0xca) || diff --git a/src/devices/bus/nes/tengen.cpp b/src/devices/bus/nes/tengen.cpp index 3b74a13f2cd..2304ee9a201 100644 --- a/src/devices/bus/nes/tengen.cpp +++ b/src/devices/bus/nes/tengen.cpp @@ -23,12 +23,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -205,7 +204,7 @@ void nes_tengen032_device::set_chr() void nes_tengen032_device::write_h(offs_t offset, u8 data) { u8 helper, cmd; - LOG_MMC(("tengen032 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("tengen032 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -273,7 +272,7 @@ void nes_tengen032_device::write_h(offs_t offset, u8 data) break; default: - LOG_MMC(("Tengen 800032 write. addr: %04x value: %02x\n", offset + 0x8000, data)); + LOG("Tengen 800032 write. addr: %04x value: %02x\n", offset + 0x8000, data); break; } } @@ -309,7 +308,7 @@ void nes_tengen037_device::set_chr() void nes_tengen037_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("tengen037 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("tengen037 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { diff --git a/src/devices/bus/nes/txc.cpp b/src/devices/bus/nes/txc.cpp index 398adbd17f3..0fbab1a8f12 100644 --- a/src/devices/bus/nes/txc.cpp +++ b/src/devices/bus/nes/txc.cpp @@ -25,12 +25,11 @@ #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -122,13 +121,13 @@ void nes_txc_strikew_device::pcb_reset() iNES: mapper 132 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_txc_22211_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("TXC 22111 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("TXC 22111 write_l, offset: %04x, data: %02x\n", offset, data); if (offset < 4) m_reg[offset & 0x03] = data; @@ -136,7 +135,7 @@ void nes_txc_22211_device::write_l(offs_t offset, uint8_t data) uint8_t nes_txc_22211_device::read_l(offs_t offset) { - LOG_MMC(("TXC 22111 read_l, offset: %04x\n", offset)); + LOG("TXC 22111 read_l, offset: %04x\n", offset); if (offset == 0x0000) return (m_reg[1] ^ m_reg[2]) | 0x40; @@ -146,7 +145,7 @@ uint8_t nes_txc_22211_device::read_l(offs_t offset) void nes_txc_22211_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("TXC 22111 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("TXC 22111 write_h, offset: %04x, data: %02x\n", offset, data); prg32(m_reg[2] >> 2); chr8(m_reg[2], CHRROM); @@ -163,13 +162,13 @@ void nes_txc_22211_device::write_h(offs_t offset, uint8_t data) iNES: mapper 172 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_txc_dumarc_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("TXC Du Ma Racing write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("TXC Du Ma Racing write_h, offset: %04x, data: %02x\n", offset, data); prg32(m_reg[2] >> 2); chr8(bitswap<2>(data ^ m_reg[2], 4, 5), CHRROM); @@ -186,13 +185,13 @@ void nes_txc_dumarc_device::write_h(offs_t offset, uint8_t data) iNES: mapper 172 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ uint8_t nes_txc_mjblock_device::read_l(offs_t offset) { - LOG_MMC(("TXC mjblock read_l, offset: %04x\n", offset)); + LOG("TXC mjblock read_l, offset: %04x\n", offset); if (offset == 0x0000) return (m_reg[1] ^ m_reg[2]) | 0x41; @@ -215,7 +214,7 @@ uint8_t nes_txc_mjblock_device::read_l(offs_t offset) u8 nes_txc_strikew_device::read_l(offs_t offset) { - LOG_MMC(("TXC 01-22000-400 read_l, offset: %04x\n", offset)); + LOG("TXC 01-22000-400 read_l, offset: %04x\n", offset); offset += 0x100; if (offset & 0x100) @@ -226,7 +225,7 @@ u8 nes_txc_strikew_device::read_l(offs_t offset) void nes_txc_strikew_device::write_l(offs_t offset, u8 data) { - LOG_MMC(("TXC 01-22000-400 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("TXC 01-22000-400 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; switch (offset & 0x103) @@ -252,7 +251,7 @@ void nes_txc_strikew_device::write_l(offs_t offset, u8 data) void nes_txc_strikew_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("TXC 01-22000-400 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("TXC 01-22000-400 write_h, offset: %04x, data: %02x\n", offset, data); prg32(m_reg[0]); } @@ -269,7 +268,7 @@ void nes_txc_strikew_device::write_h(offs_t offset, u8 data) iNES: mapper 241 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ @@ -280,7 +279,7 @@ uint8_t nes_txc_commandos_device::read_l(offs_t offset) void nes_txc_commandos_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("TXC Commandos write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("TXC Commandos write_h, offset: %04x, data: %02x\n", offset, data); prg32(data); } diff --git a/src/devices/bus/nes/vrc_clones.cpp b/src/devices/bus/nes/vrc_clones.cpp index 506857df85f..ba358cb164f 100644 --- a/src/devices/bus/nes/vrc_clones.cpp +++ b/src/devices/bus/nes/vrc_clones.cpp @@ -14,14 +14,14 @@ #include "emu.h" #include "vrc_clones.h" +#define LOG_HIFREQ (1U << 1) #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -333,7 +333,7 @@ TIMER_CALLBACK_MEMBER(nes_900218_device::irq_timer_tick) void nes_900218_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("900218 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("900218 write_h, offset: %04x, data: %02x\n", offset, data); if ((offset & 0x7000) == 0x7000) { @@ -370,7 +370,7 @@ void nes_900218_device::write_h(offs_t offset, u8 data) void nes_ax40g_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ax40g write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ax40g write_h, offset: %04x, data: %02x\n", offset, data); nes_konami_vrc2_device::write_h(offset, data); @@ -397,7 +397,7 @@ void nes_ax40g_device::write_h(offs_t offset, u8 data) void nes_ax5705_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("ax5705 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("ax5705 write_h, offset: %04x, data: %02x\n", offset, data); offset = (offset & ~0x1000) | BIT(offset, 3) << 12; switch (offset & 0x7001) @@ -430,7 +430,7 @@ void nes_ax5705_device::write_h(offs_t offset, u8 data) void nes_cityfight_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("unl_cityfight write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("unl_cityfight write_h, offset: %04x, data: %02x\n", offset, data); offset = (offset & ~0x6000) | bitswap<2>(offset, 13, 14) << 13; switch (offset & 0x7800) @@ -444,7 +444,7 @@ void nes_cityfight_device::write_h(offs_t offset, u8 data) nes_konami_vrc4_device::write_h(offset, data); break; case 0x1800: - LOG_MMC(("Extended Audio write, data %x!", data & 0x0f)); // pcmwrite(0x4011, (V & 0xf) << 3); (etabeta's original comment, FCEUX code) + LOG("Extended Audio write, data %x!", data & 0x0f); // pcmwrite(0x4011, (V & 0xf) << 3); (etabeta's original comment, FCEUX code) break; default: nes_konami_vrc4_device::write_h(offset, data); @@ -468,20 +468,20 @@ void nes_cityfight_device::write_h(offs_t offset, u8 data) u8 nes_shuiguan_device::read_m(offs_t offset) { -// LOG_MMC(("shuiguan read_m, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "shuiguan read_m, offset: %04x\n", offset); return m_prg[(m_reg * 0x2000 + offset) & (m_prg_size - 1)]; } void nes_shuiguan_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("shuiguan write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("shuiguan write_m, offset: %04x, data: %02x\n", offset, data); if ((offset & 0x1800) == 0x800) m_reg = offset & 0x1f; } void nes_shuiguan_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("shuiguan write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("shuiguan write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7800) { @@ -525,7 +525,7 @@ void nes_shuiguan_device::write_h(offs_t offset, u8 data) void nes_t230_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("t230 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("t230 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x7000) { @@ -591,7 +591,7 @@ TIMER_CALLBACK_MEMBER(nes_th21311_device::irq_timer_tick) void nes_th21311_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("th21311 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("th21311 write_h, offset: %04x, data: %02x\n", offset, data); if ((offset & 0x7000) == 0x7000) { @@ -636,7 +636,7 @@ void nes_th21311_device::write_h(offs_t offset, u8 data) void nes_waixing_sgz_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("waixing_sgz write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("waixing_sgz write_h, offset: %04x, data: %02x\n", offset, data); nes_konami_vrc4_device::write_h(offset, data); @@ -689,7 +689,7 @@ void nes_waixing_sgz_device::chr_w(offs_t offset, u8 data) void nes_2yudb_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("2yudb write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("2yudb write_h, offset: %04x, data: %02x\n", offset, data); nes_konami_vrc4_device::write_h(offset, data); @@ -722,7 +722,7 @@ void nes_bmc_830506c_device::irq_ack_w() void nes_bmc_830506c_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_830506c write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_830506c write_h, offset: %04x, data: %02x\n", offset, data); nes_konami_vrc4_device::write_h(offset, data); @@ -752,17 +752,18 @@ void nes_bmc_830506c_device::write_h(offs_t offset, u8 data) u8 nes_bmc_831128c_device::read_m(offs_t offset) { -// LOG_MMC(("bmc_831128c read_m, offset: %04x, data: %02x\n", offset, data)); - + u8 data = 0; if (m_reg == 1) - return device_nes_cart_interface::read_m(offset); + data = device_nes_cart_interface::read_m(offset); else - return m_prg[(m_reg * 0x2000 + offset) & (m_prg_size - 1)]; + data = m_prg[(m_reg * 0x2000 + offset) & (m_prg_size - 1)]; + LOGMASKED(LOG_HIFREQ, "bmc_831128c read_m, offset: %04x, data: %02x\n", offset, data); + return data; } void nes_bmc_831128c_device::write_m(offs_t offset, u8 data) { -// LOG_MMC(("bmc_831128c write_m, offset: %04x, data: %02x\n", offset, data)); + LOGMASKED(LOG_HIFREQ, "bmc_831128c write_m, offset: %04x, data: %02x\n", offset, data); if (m_reg == 1) device_nes_cart_interface::write_m(offset, data); @@ -770,7 +771,7 @@ void nes_bmc_831128c_device::write_m(offs_t offset, u8 data) void nes_bmc_831128c_device::write_h(offs_t offset, u8 data) { - LOG_MMC(("bmc_831128c write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_831128c write_h, offset: %04x, data: %02x\n", offset, data); u8 page = offset >> 12; if (page != 2 && page != 4) // ignore writes except $Axxx and $Cxxx @@ -846,7 +847,7 @@ void nes_bmc_kl06_device::set_prg() void nes_bmc_kl06_device::write_m(offs_t offset, u8 data) { - LOG_MMC(("bmc_kl06 write_m, offset: %04x, data: %02x\n", offset, data)); + LOG("bmc_kl06 write_m, offset: %04x, data: %02x\n", offset, data); // 2K RAM for Crisis Force overlays control register nes_konami_vrc4_device::write_m(offset, data); diff --git a/src/devices/bus/nes/waixing.cpp b/src/devices/bus/nes/waixing.cpp index 1f286c00485..b10df1b3f59 100644 --- a/src/devices/bus/nes/waixing.cpp +++ b/src/devices/bus/nes/waixing.cpp @@ -17,14 +17,14 @@ #include "emu.h" #include "waixing.h" +#define LOG_HIFREQ (1U << 1) #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" //------------------------------------------------- @@ -314,7 +314,7 @@ void nes_waixing_fs304_device::pcb_reset() iNES: mapper 74 - In MESS: Supported + In MAME: Supported -------------------------------------------------*/ @@ -334,7 +334,7 @@ void nes_waixing_a_device::set_mirror(uint8_t nt) set_nt_mirroring(PPU_MIRROR_HIGH); break; default: - LOG_MMC(("Mapper set NT to invalid value %02x", nt)); + LOG("Mapper set NT to invalid value %02x", nt); break; } } @@ -355,7 +355,7 @@ void nes_waixing_a1_device::chr_cb(int start, int bank, int source) void nes_waixing_a_device::waixing_write(offs_t offset, uint8_t data) { - LOG_MMC(("waixing_write, offset: %04x, data: %02x\n", offset, data)); + LOG("waixing_write, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -374,7 +374,7 @@ void nes_waixing_a_device::waixing_write(offs_t offset, uint8_t data) uint8_t nes_waixing_a_device::read_l(offs_t offset) { - LOG_MMC(("waixing read_l, offset: %04x\n", offset)); + LOG("waixing read_l, offset: %04x\n", offset); offset += 0x100; if (offset >= 0x1000 && offset < 0x1400) return mapper_ram[offset & 0x3ff]; @@ -384,7 +384,7 @@ uint8_t nes_waixing_a_device::read_l(offs_t offset) void nes_waixing_a_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("waixing write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("waixing write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1000 && offset < 0x1400) mapper_ram[offset & 0x3ff] = data; @@ -403,7 +403,7 @@ void nes_waixing_a_device::write_l(offs_t offset, uint8_t data) iNES: mapper 191 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ @@ -425,7 +425,7 @@ void nes_waixing_b_device::chr_cb(int start, int bank, int source) iNES: mapper 192 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ @@ -447,7 +447,7 @@ void nes_waixing_c_device::chr_cb(int start, int bank, int source) iNES: mapper 194 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ @@ -470,7 +470,7 @@ void nes_waixing_d_device::chr_cb(int start, int bank, int source) iNES: mapper 195 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ @@ -502,7 +502,7 @@ void nes_waixing_e_device::chr_cb(int start, int bank, int source) u8 nes_waixing_f_device::read_l(offs_t offset) { -// LOG_MMC(("waixing_f read_l, offset: %04x\n", offset)); + LOGMASKED(LOG_HIFREQ, "waixing_f read_l, offset: %04x\n", offset); offset += 0x100; if (!m_prgram.empty() && offset >= 0x1000) @@ -513,7 +513,7 @@ u8 nes_waixing_f_device::read_l(offs_t offset) void nes_waixing_f_device::write_l(offs_t offset, u8 data) { -// LOG_MMC(("waixing_f write_l, offset: %04x, data: %02x\n", offset, data)); + LOGMASKED(LOG_HIFREQ, "waixing_f write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (!m_prgram.empty() && offset >= 0x1000) @@ -536,7 +536,7 @@ void nes_waixing_f1_device::set_chr(u8 chr, int chr_base, int chr_mask) iNES: mapper 199 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ @@ -563,7 +563,7 @@ void nes_waixing_g_device::set_chr(uint8_t chr, int chr_base, int chr_mask) void nes_waixing_g_device::write_h(offs_t offset, uint8_t data) { uint8_t cmd; - LOG_MMC(("waixing_g write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("waixing_g write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -613,7 +613,7 @@ void nes_waixing_g_device::write_h(offs_t offset, uint8_t data) iNES: mapper 245 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ @@ -626,7 +626,7 @@ void nes_waixing_h_device::chr_cb(int start, int bank, int source) void nes_waixing_h_device::write_h(offs_t offset, uint8_t data) { uint8_t cmd; - LOG_MMC(("waixing_h write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("waixing_h write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -668,7 +668,7 @@ void nes_waixing_h_device::write_h(offs_t offset, uint8_t data) void nes_waixing_h1_device::write_h(offs_t offset, uint8_t data) { uint8_t cmd; - LOG_MMC(("waixing_h1 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("waixing_h1 write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -712,7 +712,7 @@ void nes_waixing_h1_device::write_h(offs_t offset, uint8_t data) MMC3 clone. - In MESS: Preliminary support. + In MAME: Preliminary support. -------------------------------------------------*/ @@ -729,7 +729,7 @@ void nes_waixing_j_device::set_prg( int prg_base, int prg_mask ) void nes_waixing_j_device::write_h(offs_t offset, uint8_t data) { uint8_t cmd; - LOG_MMC(("waixing_f write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("waixing_f write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6001) { @@ -812,7 +812,7 @@ u8 nes_waixing_sh2_device::chr_r(offs_t offset) iNES: mapper 249 - In MESS: Partially Supported. + In MAME: Partially Supported. -------------------------------------------------*/ @@ -834,7 +834,7 @@ void nes_waixing_sec_device::chr_cb(int start, int bank, int source) void nes_waixing_sec_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("waixing_sec write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("waixing_sec write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset == 0x1000) @@ -854,7 +854,7 @@ void nes_waixing_sec_device::write_l(offs_t offset, uint8_t data) iNES: mapper 178 - In MESS: Supported. + In MAME: Supported. Implementations wildly vary between emulators, but Cah4e3's implementation boots up both the games and @@ -866,7 +866,7 @@ void nes_waixing_sec_device::write_l(offs_t offset, uint8_t data) void nes_waixing_sgzlz_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("waixing_sgzlz write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("waixing_sgzlz write_l, offset: %04x, data: %02x\n", offset, data); if (offset >= 0x700 && offset <= 0xEFF) { m_reg[offset & 0x03] = data; @@ -925,14 +925,14 @@ void nes_waixing_sgzlz_device::write_l(offs_t offset, uint8_t data) iNES: mapper 164 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_waixing_ffv_device::write_l(offs_t offset, uint8_t data) { uint8_t helper; - LOG_MMC(("waixing_ffv write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("waixing_ffv write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; /* the checks work better on addresses */ if ((offset & 0x1200) == 0x1000) @@ -974,13 +974,13 @@ void nes_waixing_ffv_device::write_l(offs_t offset, uint8_t data) iNES: mapper 242 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_waixing_wxzs_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("waixing_zs write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("waixing_zs write_h, offset: %04x, data: %02x\n", offset, data); prg32(offset >> 3); @@ -1004,13 +1004,13 @@ void nes_waixing_wxzs_device::write_h(offs_t offset, uint8_t data) iNES: mapper 242 - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_waixing_dq8_device::write_h(offs_t offset, uint8_t data) { - LOG_MMC(("waixing_dq8 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("waixing_dq8 write_h, offset: %04x, data: %02x\n", offset, data); prg32(offset >> 3); } @@ -1037,7 +1037,7 @@ void nes_waixing_wxzs2_device::write_h(offs_t offset, uint8_t data) uint8_t flip = BIT(data, 7); uint8_t helper = data << 1; - LOG_MMC(("waixing_wxzs2 write_h, offset: %04x, data: %02x\n", offset, data)); + LOG("waixing_wxzs2 write_h, offset: %04x, data: %02x\n", offset, data); set_nt_mirroring(BIT(data, 6) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); @@ -1081,13 +1081,13 @@ void nes_waixing_wxzs2_device::write_h(offs_t offset, uint8_t data) iNES: mapper 162? (only found in UNIF format) - In MESS: Supported. + In MAME: Supported. -------------------------------------------------*/ void nes_waixing_fs304_device::write_l(offs_t offset, uint8_t data) { - LOG_MMC(("fs304 write_l, offset: %04x, data: %02x\n", offset, data)); + LOG("fs304 write_l, offset: %04x, data: %02x\n", offset, data); offset += 0x100; if (offset >= 0x1000) diff --git a/src/devices/bus/nes/zemina.cpp b/src/devices/bus/nes/zemina.cpp index b46da0e7561..5268a31cb30 100644 --- a/src/devices/bus/nes/zemina.cpp +++ b/src/devices/bus/nes/zemina.cpp @@ -10,12 +10,11 @@ #include "zemina.h" #ifdef NES_PCB_DEBUG -#define VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define VERBOSE 0 +#define VERBOSE (0) #endif - -#define LOG_MMC(...) do { if (VERBOSE) logerror(__VA_ARGS__); } while (0) +#include "logmacro.h" //************************************************************************** // DEVICE DEFINITIONS @@ -68,7 +67,7 @@ void nes_zemina_device::pcb_reset() void nes_zemina_device::write_h(offs_t offset, u8 data) { - LOG_MMC("zemina write_h, offset: %04x, data: %02x\n", offset, data); + LOG("zemina write_h, offset: %04x, data: %02x\n", offset, data); switch (offset & 0x6000) { diff --git a/src/devices/bus/nscsi/hd.cpp b/src/devices/bus/nscsi/hd.cpp index 03c386391ac..cd8678d8013 100644 --- a/src/devices/bus/nscsi/hd.cpp +++ b/src/devices/bus/nscsi/hd.cpp @@ -4,9 +4,8 @@ #include "bus/nscsi/hd.h" #include "imagedev/harddriv.h" -#define LOG_GENERAL (1U << 0) -#define LOG_COMMAND (1U << 1) -#define LOG_DATA (1U << 2) +#define LOG_COMMAND (1U << 1) +#define LOG_DATA (1U << 2) #define LOG_UNSUPPORTED (1U << 3) #define VERBOSE 0 diff --git a/src/devices/bus/nscsi/s1410.cpp b/src/devices/bus/nscsi/s1410.cpp index 7151fcab041..b312019a89f 100644 --- a/src/devices/bus/nscsi/s1410.cpp +++ b/src/devices/bus/nscsi/s1410.cpp @@ -3,7 +3,6 @@ #include "emu.h" #include "bus/nscsi/s1410.h" -#define LOG_GENERAL (1U << 0) #define LOG_COMMAND (1U << 1) #define LOG_DATA (1U << 2) diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp index c9f5aa57f98..cdd0b7c83d9 100644 --- a/src/devices/bus/pc_kbd/ec1841.cpp +++ b/src/devices/bus/pc_kbd/ec1841.cpp @@ -37,9 +37,8 @@ #include "utf8.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_KEYBOARD (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_KEYBOARD (1U << 1) +#define LOG_DEBUG (1U << 2) //#define VERBOSE (LOG_DEBUG) //#define LOG_OUTPUT_FUNC printf diff --git a/src/devices/bus/pc_kbd/hle_mouse.cpp b/src/devices/bus/pc_kbd/hle_mouse.cpp index 15ac7854d09..507a3be8d94 100644 --- a/src/devices/bus/pc_kbd/hle_mouse.cpp +++ b/src/devices/bus/pc_kbd/hle_mouse.cpp @@ -37,7 +37,6 @@ #include "emu.h" #include "hle_mouse.h" -#define LOG_GENERAL (1U << 0) #define LOG_RXTX (1U << 1) #define LOG_COMMAND (1U << 2) #define LOG_REPORT (1U << 3) diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp index 5a39c103b50..e9f986f21e0 100644 --- a/src/devices/bus/pc_kbd/iskr1030.cpp +++ b/src/devices/bus/pc_kbd/iskr1030.cpp @@ -10,9 +10,8 @@ #include "iskr1030.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_KEYBOARD (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_KEYBOARD (1U << 1) +#define LOG_DEBUG (1U << 2) //#define VERBOSE (LOG_DEBUG) //#define LOG_OUTPUT_FUNC printf diff --git a/src/devices/bus/pc_kbd/pcat101.cpp b/src/devices/bus/pc_kbd/pcat101.cpp index 955e9d17f48..20f9f1b057a 100644 --- a/src/devices/bus/pc_kbd/pcat101.cpp +++ b/src/devices/bus/pc_kbd/pcat101.cpp @@ -18,7 +18,6 @@ #include "emu.h" #include "pcat101.h" -#define LOG_GENERAL (1U << 0) #define LOG_RXTX (1U << 1) //#define VERBOSE (LOG_GENERAL|LOG_RXTX) diff --git a/src/devices/bus/qbus/pc11.cpp b/src/devices/bus/qbus/pc11.cpp index a12a5b564c3..c27e240cc08 100644 --- a/src/devices/bus/qbus/pc11.cpp +++ b/src/devices/bus/qbus/pc11.cpp @@ -12,8 +12,7 @@ #include "pc11.h" -//#define LOG_GENERAL (1U << 0) -#define LOG_DBG (1U << 2) +#define LOG_DBG (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_DBG) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/devices/bus/rs232/xvd701.cpp b/src/devices/bus/rs232/xvd701.cpp index a04365f2239..3b1c3843f96 100644 --- a/src/devices/bus/rs232/xvd701.cpp +++ b/src/devices/bus/rs232/xvd701.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "xvd701.h" -#define LOG_COMMAND (1 << 1) +#define LOG_COMMAND (1U << 1) // #define VERBOSE (LOG_COMMAND) // #define LOG_OUTPUT_STREAM std::cout diff --git a/src/devices/bus/rtpc/kbd.cpp b/src/devices/bus/rtpc/kbd.cpp index 921cfc03271..f403114b8f7 100644 --- a/src/devices/bus/rtpc/kbd.cpp +++ b/src/devices/bus/rtpc/kbd.cpp @@ -49,7 +49,6 @@ #include "sound/spkrdev.h" #include "speaker.h" -#define LOG_GENERAL (1U << 0) #define LOG_PORTS (1U << 1) //#define VERBOSE (LOG_GENERAL) diff --git a/src/devices/bus/rtpc/kbd_con.cpp b/src/devices/bus/rtpc/kbd_con.cpp index f8617fe3ef5..e19ba8b7b51 100644 --- a/src/devices/bus/rtpc/kbd_con.cpp +++ b/src/devices/bus/rtpc/kbd_con.cpp @@ -10,8 +10,6 @@ #include "emu.h" #include "kbd_con.h" -#define LOG_GENERAL (1U << 0) - //#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/bus/sunmouse/hlemouse.cpp b/src/devices/bus/sunmouse/hlemouse.cpp index 3256f171aee..07f9648d6c1 100644 --- a/src/devices/bus/sunmouse/hlemouse.cpp +++ b/src/devices/bus/sunmouse/hlemouse.cpp @@ -3,7 +3,6 @@ #include "emu.h" #include "hlemouse.h" -#define LOG_GENERAL (1U << 0) #define LOG_BIT (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_BIT) diff --git a/src/devices/bus/ti8x/ti8x.cpp b/src/devices/bus/ti8x/ti8x.cpp index c9274a6f340..87399276d41 100644 --- a/src/devices/bus/ti8x/ti8x.cpp +++ b/src/devices/bus/ti8x/ti8x.cpp @@ -4,9 +4,8 @@ #include "emu.h" #include "ti8x.h" -#define LOG_GENERAL (1U << 0) -#define LOG_BITPROTO (1U << 1) -#define LOG_BYTEPROTO (1U << 2) +#define LOG_BITPROTO (1U << 1) +#define LOG_BYTEPROTO (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_BITPROTO | LOG_BYTEPROTO) #define LOG_OUTPUT_FUNC device().logerror diff --git a/src/devices/bus/ti99/colorbus/busmouse.cpp b/src/devices/bus/ti99/colorbus/busmouse.cpp index ccaf9c66f25..a84e7e22ef0 100644 --- a/src/devices/bus/ti99/colorbus/busmouse.cpp +++ b/src/devices/bus/ti99/colorbus/busmouse.cpp @@ -16,11 +16,11 @@ #include "emu.h" #include "busmouse.h" -#define LOG_BUTTON (1U<<1) // Buttons -#define LOG_MOVEX (1U<<2) // x movement -#define LOG_MOVEY (1U<<3) // y movement +#define LOG_BUTTON (1U << 1) // Buttons +#define LOG_MOVEX (1U << 2) // x movement +#define LOG_MOVEY (1U << 3) // y movement -#define VERBOSE ( LOG_GENERAL ) +#define VERBOSE (LOG_GENERAL) #include "logmacro.h" DEFINE_DEVICE_TYPE(V9938_BUSMOUSE, bus::ti99::colorbus::v9938_busmouse_device, "v9938_busmouse", "V9938 Bus Mouse") diff --git a/src/devices/bus/ti99/gromport/cartridges.cpp b/src/devices/bus/ti99/gromport/cartridges.cpp index 31afbda2e6c..b3d4fc4fb15 100644 --- a/src/devices/bus/ti99/gromport/cartridges.cpp +++ b/src/devices/bus/ti99/gromport/cartridges.cpp @@ -20,17 +20,17 @@ #include "corestr.h" #include "formats/rpk.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) // Configuration -#define LOG_CHANGE (1U<<3) // Cart change -#define LOG_BANKSWITCH (1U<<4) // Bank switch operation -#define LOG_CRU (1U<<5) // CRU access -#define LOG_READ (1U<<6) // Read operation -#define LOG_WRITE (1U<<7) // Write operation -#define LOG_RPK (1U<<8) // RPK handler -#define LOG_WARNW (1U<<9) // Warn when writing to cartridge space - -#define VERBOSE ( LOG_GENERAL | LOG_WARN | LOG_CONFIG ) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) // Configuration +#define LOG_CHANGE (1U << 3) // Cart change +#define LOG_BANKSWITCH (1U << 4) // Bank switch operation +#define LOG_CRU (1U << 5) // CRU access +#define LOG_READ (1U << 6) // Read operation +#define LOG_WRITE (1U << 7) // Write operation +#define LOG_RPK (1U << 8) // RPK handler +#define LOG_WARNW (1U << 9) // Warn when writing to cartridge space + +#define VERBOSE (LOG_GENERAL | LOG_WARN | LOG_CONFIG) #include "logmacro.h" DEFINE_DEVICE_TYPE(TI99_CART, bus::ti99::gromport::ti99_cartridge_device, "ti99cart", "TI-99 cartridge") diff --git a/src/devices/bus/ti99/gromport/gkracker.cpp b/src/devices/bus/ti99/gromport/gkracker.cpp index 212207665e2..6db175774da 100644 --- a/src/devices/bus/ti99/gromport/gkracker.cpp +++ b/src/devices/bus/ti99/gromport/gkracker.cpp @@ -97,11 +97,11 @@ #include "emu.h" #include "gkracker.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CHANGE (1U<<2) // Cartridge change -#define LOG_GKRACKER (1U<<3) // Gram Kracker operation +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CHANGE (1U << 2) // Cartridge change +#define LOG_GKRACKER (1U << 3) // Gram Kracker operation -#define VERBOSE ( LOG_WARN ) +#define VERBOSE (LOG_WARN) #include "logmacro.h" DEFINE_DEVICE_TYPE(TI99_GROMPORT_GK, bus::ti99::gromport::ti99_gkracker_device, "ti99_gkracker", "Miller's Graphics GRAM Kracker") diff --git a/src/devices/bus/ti99/gromport/gromport.cpp b/src/devices/bus/ti99/gromport/gromport.cpp index 1a53362416c..6db2931b017 100644 --- a/src/devices/bus/ti99/gromport/gromport.cpp +++ b/src/devices/bus/ti99/gromport/gromport.cpp @@ -114,11 +114,11 @@ #include "multiconn.h" #include "gkracker.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_READ (1U<<2) // Reading -#define LOG_WRITE (1U<<3) // Writing +#define LOG_WARN (1U << 1) // Warnings +#define LOG_READ (1U << 2) // Reading +#define LOG_WRITE (1U << 3) // Writing -#define VERBOSE ( LOG_WARN ) +#define VERBOSE (LOG_WARN) #include "logmacro.h" DEFINE_DEVICE_TYPE(TI99_GROMPORT, bus::ti99::gromport::gromport_device, "gromport", "TI-99 Cartridge port") diff --git a/src/devices/bus/ti99/gromport/multiconn.cpp b/src/devices/bus/ti99/gromport/multiconn.cpp index 595a6ab1a29..4e51f876ab6 100644 --- a/src/devices/bus/ti99/gromport/multiconn.cpp +++ b/src/devices/bus/ti99/gromport/multiconn.cpp @@ -43,9 +43,9 @@ #include "emu.h" #include "multiconn.h" -#define LOG_WARN (1U<<1) -#define LOG_CHANGE (1U<<2) -#define VERBOSE ( LOG_WARN ) +#define LOG_WARN (1U << 1) +#define LOG_CHANGE (1U << 2) +#define VERBOSE (LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/ti99/internal/992board.cpp b/src/devices/bus/ti99/internal/992board.cpp index 6d72ed15147..2132bab43d5 100644 --- a/src/devices/bus/ti99/internal/992board.cpp +++ b/src/devices/bus/ti99/internal/992board.cpp @@ -19,13 +19,13 @@ #include "emu.h" #include "992board.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CRU (1U<<2) // CRU logging -#define LOG_CASSETTE (1U<<3) // Cassette logging -#define LOG_HEXBUS (1U<<4) // Hexbus logging -#define LOG_BANK (1U<<5) // Change ROM banks -#define LOG_KEYBOARD (1U<<6) // Keyboard operation -#define LOG_EXPRAM (1U<<7) // Expansion RAM +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CRU (1U << 2) // CRU logging +#define LOG_CASSETTE (1U << 3) // Cassette logging +#define LOG_HEXBUS (1U << 4) // Hexbus logging +#define LOG_BANK (1U << 5) // Change ROM banks +#define LOG_KEYBOARD (1U << 6) // Keyboard operation +#define LOG_EXPRAM (1U << 7) // Expansion RAM #define VERBOSE (LOG_GENERAL | LOG_WARN) diff --git a/src/devices/bus/ti99/internal/998board.cpp b/src/devices/bus/ti99/internal/998board.cpp index bebd7762ec4..fafd71c1bcd 100644 --- a/src/devices/bus/ti99/internal/998board.cpp +++ b/src/devices/bus/ti99/internal/998board.cpp @@ -107,24 +107,24 @@ #include "998board.h" #include "cpu/tms9900/tms99com.h" -#define LOG_DETAIL (1U<<1) // More detail -#define LOG_CRU (1U<<2) // CRU logging -#define LOG_ADDRESS (1U<<3) // Address bus -#define LOG_MEM (1U<<4) // Memory access -#define LOG_MAP (1U<<5) // Mapper -#define LOG_READY (1U<<6) // READY line -#define LOG_CLOCK (1U<<7) // CLKOUT -#define LOG_MOFETTA (1U<<8) // Mofetta operation -#define LOG_AMIGO (1U<<9) // Amigo operation -#define LOG_OSO (1U<<10) // Oso operation -#define LOG_HEXBUS (1U<<11) // Hexbus operation -#define LOG_WS (1U<<12) // Wait states -#define LOG_CPURY (1U<<13) // Combined ready line -#define LOG_GROM (1U<<14) // GROM operation -#define LOG_PUNMAP (1U<<15) // Unmapped physical addresss -#define LOG_WARN (1U<<31) // Warnings - -#define VERBOSE ( LOG_WARN ) +#define LOG_DETAIL (1U << 1) // More detail +#define LOG_CRU (1U << 2) // CRU logging +#define LOG_ADDRESS (1U << 3) // Address bus +#define LOG_MEM (1U << 4) // Memory access +#define LOG_MAP (1U << 5) // Mapper +#define LOG_READY (1U << 6) // READY line +#define LOG_CLOCK (1U << 7) // CLKOUT +#define LOG_MOFETTA (1U << 8) // Mofetta operation +#define LOG_AMIGO (1U << 9) // Amigo operation +#define LOG_OSO (1U << 10) // Oso operation +#define LOG_HEXBUS (1U << 11) // Hexbus operation +#define LOG_WS (1U << 12) // Wait states +#define LOG_CPURY (1U << 13) // Combined ready line +#define LOG_GROM (1U << 14) // GROM operation +#define LOG_PUNMAP (1U << 15) // Unmapped physical addresss +#define LOG_WARN (1U << 31) // Warnings + +#define VERBOSE (LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/ti99/internal/datamux.cpp b/src/devices/bus/ti99/internal/datamux.cpp index 95412e296e9..c9cf3d25fbf 100644 --- a/src/devices/bus/ti99/internal/datamux.cpp +++ b/src/devices/bus/ti99/internal/datamux.cpp @@ -72,13 +72,13 @@ #include "datamux.h" #include "cpu/tms9900/tms99com.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_READY (1U<<2) // READY line -#define LOG_ACCESS (1U<<3) // Access to this GROM -#define LOG_ADDRESS (1U<<4) // Address register -#define LOG_WAITCOUNT (1U<<5) // Wait state counter +#define LOG_WARN (1U << 1) // Warnings +#define LOG_READY (1U << 2) // READY line +#define LOG_ACCESS (1U << 3) // Access to this GROM +#define LOG_ADDRESS (1U << 4) // Address register +#define LOG_WAITCOUNT (1U << 5) // Wait state counter -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/ti99/internal/genboard.cpp b/src/devices/bus/ti99/internal/genboard.cpp index e22bb72caa8..7905f150f8a 100644 --- a/src/devices/bus/ti99/internal/genboard.cpp +++ b/src/devices/bus/ti99/internal/genboard.cpp @@ -411,25 +411,25 @@ ***************************************************************************/ #include "emu.h" -#define LOG_WARN (1U<<1) -#define LOG_DETAIL (1U<<2) -#define LOG_READ (1U<<3) -#define LOG_WRITE (1U<<4) -#define LOG_KEYBOARD (1U<<5) -#define LOG_CLOCK (1U<<6) -#define LOG_READY (1U<<7) -#define LOG_SETTING (1U<<8) -#define LOG_CRU (1U<<9) -#define LOG_CRUKEY (1U<<10) -#define LOG_DECODE (1U<<11) -#define LOG_ADDRESS (1U<<12) -#define LOG_LINES (1U<<13) -#define LOG_WAIT (1U<<14) -#define LOG_GROM (1U<<15) -#define LOG_MAPPER (1U<<16) +#define LOG_WARN (1U << 1) +#define LOG_DETAIL (1U << 2) +#define LOG_READ (1U << 3) +#define LOG_WRITE (1U << 4) +#define LOG_KEYBOARD (1U << 5) +#define LOG_CLOCK (1U << 6) +#define LOG_READY (1U << 7) +#define LOG_SETTING (1U << 8) +#define LOG_CRU (1U << 9) +#define LOG_CRUKEY (1U << 10) +#define LOG_DECODE (1U << 11) +#define LOG_ADDRESS (1U << 12) +#define LOG_LINES (1U << 13) +#define LOG_WAIT (1U << 14) +#define LOG_GROM (1U << 15) +#define LOG_MAPPER (1U << 16) // Minimum log should be warnings -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "genboard.h" #include "logmacro.h" diff --git a/src/devices/bus/ti99/internal/genkbd.cpp b/src/devices/bus/ti99/internal/genkbd.cpp index 5e22f27ee33..6c0baf84947 100644 --- a/src/devices/bus/ti99/internal/genkbd.cpp +++ b/src/devices/bus/ti99/internal/genkbd.cpp @@ -30,10 +30,10 @@ #include "emu.h" #include "genkbd.h" -#define LOG_WARN (1U<<1) -#define LOG_QUEUE (1U<<2) -#define LOG_TRANSFER (1U<<3) -#define LOG_LINES (1U<<4) +#define LOG_WARN (1U << 1) +#define LOG_QUEUE (1U << 2) +#define LOG_TRANSFER (1U << 3) +#define LOG_LINES (1U << 4) #define VERBOSE (LOG_GENERAL | LOG_WARN) diff --git a/src/devices/bus/ti99/joyport/handset.cpp b/src/devices/bus/ti99/joyport/handset.cpp index 046873f5fe6..d03480378ab 100644 --- a/src/devices/bus/ti99/joyport/handset.cpp +++ b/src/devices/bus/ti99/joyport/handset.cpp @@ -39,11 +39,11 @@ #include "emu.h" #include "handset.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) // Configuration -#define LOG_JOYSTICK (1U<<3) -#define LOG_HANDSET (1U<<4) -#define LOG_CLOCK (1U<<5) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) // Configuration +#define LOG_JOYSTICK (1U << 3) +#define LOG_HANDSET (1U << 4) +#define LOG_CLOCK (1U << 5) #define VERBOSE (LOG_CONFIG | LOG_WARN) diff --git a/src/devices/bus/ti99/peb/bwg.cpp b/src/devices/bus/ti99/peb/bwg.cpp index 4950943a8a8..3bca57541c9 100644 --- a/src/devices/bus/ti99/peb/bwg.cpp +++ b/src/devices/bus/ti99/peb/bwg.cpp @@ -50,17 +50,17 @@ // ---------------------------------- // Flags for debugging -#define LOG_WARN (1U<<1) // Warnings -#define LOG_RW (1U<<2) // Read and write accesses -#define LOG_CRU (1U<<3) // Show CRU bit accesses -#define LOG_CRUD (1U<<4) // Show CRU bit accesses (details) -#define LOG_READY (1U<<5) // Show ready line activity -#define LOG_SIGNALS (1U<<6) // Show detailed signal activity -#define LOG_ADDRESS (1U<<7) // Show address bus operations -#define LOG_MOTOR (1U<<8) // Show motor operations -#define LOG_CONFIG (1U<<9) // Configuration - -#define VERBOSE ( LOG_CONFIG | LOG_WARN ) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_RW (1U << 2) // Read and write accesses +#define LOG_CRU (1U << 3) // Show CRU bit accesses +#define LOG_CRUD (1U << 4) // Show CRU bit accesses (details) +#define LOG_READY (1U << 5) // Show ready line activity +#define LOG_SIGNALS (1U << 6) // Show detailed signal activity +#define LOG_ADDRESS (1U << 7) // Show address bus operations +#define LOG_MOTOR (1U << 8) // Show motor operations +#define LOG_CONFIG (1U << 9) // Configuration + +#define VERBOSE (LOG_CONFIG | LOG_WARN) #include "logmacro.h" DEFINE_DEVICE_TYPE(TI99_BWG, bus::ti99::peb::snug_bwg_device, "ti99_bwg", "SNUG BwG Floppy Controller") diff --git a/src/devices/bus/ti99/peb/cc_fdc.cpp b/src/devices/bus/ti99/peb/cc_fdc.cpp index 6762dea8a05..09067c4f7cd 100644 --- a/src/devices/bus/ti99/peb/cc_fdc.cpp +++ b/src/devices/bus/ti99/peb/cc_fdc.cpp @@ -32,18 +32,18 @@ // ---------------------------------- // Flags for debugging -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) // Configuration -#define LOG_EPROM (1U<<3) // Access to EPROM -#define LOG_CONTR (1U<<4) // Access to controller -#define LOG_RAM (1U<<5) // Access to SRAM -#define LOG_READY (1U<<6) // READY line -#define LOG_SIGNALS (1U<<7) // IRQ and HLD lines -#define LOG_DRQ (1U<<8) // DRQ line (too noisy in SIGNALS) -#define LOG_DRIVE (1U<<9) // Drive operations -#define LOG_CRU (1U<<10) // CRU operations - -#define VERBOSE ( LOG_GENERAL | LOG_WARN | LOG_CONFIG ) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) // Configuration +#define LOG_EPROM (1U << 3) // Access to EPROM +#define LOG_CONTR (1U << 4) // Access to controller +#define LOG_RAM (1U << 5) // Access to SRAM +#define LOG_READY (1U << 6) // READY line +#define LOG_SIGNALS (1U << 7) // IRQ and HLD lines +#define LOG_DRQ (1U << 8) // DRQ line (too noisy in SIGNALS) +#define LOG_DRIVE (1U << 9) // Drive operations +#define LOG_CRU (1U << 10) // CRU operations + +#define VERBOSE (LOG_GENERAL | LOG_WARN | LOG_CONFIG) #include "logmacro.h" #define CCDCC_TAG "ti99_ccdcc" diff --git a/src/devices/bus/ti99/peb/evpc.cpp b/src/devices/bus/ti99/peb/evpc.cpp index 974d786d8ee..f8acf7beafa 100644 --- a/src/devices/bus/ti99/peb/evpc.cpp +++ b/src/devices/bus/ti99/peb/evpc.cpp @@ -43,12 +43,12 @@ #include "speaker.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CRU (1U<<2) // CRU access -#define LOG_MEM (1U<<3) // Memory access -#define LOG_ADDRESS (1U<<4) // Addresses +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CRU (1U << 2) // CRU access +#define LOG_MEM (1U << 3) // Memory access +#define LOG_ADDRESS (1U << 4) // Addresses -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "logmacro.h" #define EVPC_SCREEN_TAG "screen" diff --git a/src/devices/bus/ti99/peb/forti.cpp b/src/devices/bus/ti99/peb/forti.cpp index 0ee053a740c..169cf94c437 100644 --- a/src/devices/bus/ti99/peb/forti.cpp +++ b/src/devices/bus/ti99/peb/forti.cpp @@ -30,9 +30,9 @@ #include "emu.h" #include "forti.h" -#define LOG_READY (1U<<1) +#define LOG_READY (1U << 1) -#define VERBOSE ( LOG_GENERAL ) +#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/bus/ti99/peb/hfdc.cpp b/src/devices/bus/ti99/peb/hfdc.cpp index d760f09da20..31f91caa102 100644 --- a/src/devices/bus/ti99/peb/hfdc.cpp +++ b/src/devices/bus/ti99/peb/hfdc.cpp @@ -59,19 +59,19 @@ #include "formats/mfm_hd.h" #include "formats/ti99_dsk.h" // Format -#define LOG_WARN (1U<<1) // Warnings -#define LOG_EMU (1U<<2) -#define LOG_COMP (1U<<3) -#define LOG_RAM (1U<<4) -#define LOG_ROM (1U<<5) -#define LOG_LINES (1U<<6) -#define LOG_DMA (1U<<7) -#define LOG_MOTOR (1U<<8) -#define LOG_INT (1U<<9) -#define LOG_CRU (1U<<10) -#define LOG_CONFIG (1U<<15) // Configuration - -#define VERBOSE ( LOG_GENERAL | LOG_CONFIG | LOG_WARN ) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_EMU (1U << 2) +#define LOG_COMP (1U << 3) +#define LOG_RAM (1U << 4) +#define LOG_ROM (1U << 5) +#define LOG_LINES (1U << 6) +#define LOG_DMA (1U << 7) +#define LOG_MOTOR (1U << 8) +#define LOG_INT (1U << 9) +#define LOG_CRU (1U << 10) +#define LOG_CONFIG (1U << 15) // Configuration + +#define VERBOSE (LOG_GENERAL | LOG_CONFIG | LOG_WARN) #include "logmacro.h" DEFINE_DEVICE_TYPE(TI99_HFDC, bus::ti99::peb::myarc_hfdc_device, "ti99_hfdc", "Myarc Hard and Floppy Disk Controller") diff --git a/src/devices/bus/ti99/peb/horizon.cpp b/src/devices/bus/ti99/peb/horizon.cpp index 4f45d0021e9..19720a09015 100644 --- a/src/devices/bus/ti99/peb/horizon.cpp +++ b/src/devices/bus/ti99/peb/horizon.cpp @@ -126,16 +126,16 @@ #include "emu.h" #include "horizon.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) // Configuration -#define LOG_32K (1U<<3) // 32K optional RAM r/w -#define LOG_DSR (1U<<4) // DSR -#define LOG_RAM (1U<<5) // RAM chips -#define LOG_ORAM (1U<<6) // outside of RAM chips -#define LOG_CRU (1U<<7) // CRU -#define LOG_PAGE (1U<<8) // Page access - -#define VERBOSE ( LOG_GENERAL | LOG_CONFIG | LOG_WARN ) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) // Configuration +#define LOG_32K (1U << 3) // 32K optional RAM r/w +#define LOG_DSR (1U << 4) // DSR +#define LOG_RAM (1U << 5) // RAM chips +#define LOG_ORAM (1U << 6) // outside of RAM chips +#define LOG_CRU (1U << 7) // CRU +#define LOG_PAGE (1U << 8) // Page access + +#define VERBOSE (LOG_GENERAL | LOG_CONFIG | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/ti99/peb/hsgpl.cpp b/src/devices/bus/ti99/peb/hsgpl.cpp index fc687b25785..11c593cd656 100644 --- a/src/devices/bus/ti99/peb/hsgpl.cpp +++ b/src/devices/bus/ti99/peb/hsgpl.cpp @@ -121,18 +121,18 @@ #include "emu.h" #include "hsgpl.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) // Configuration -#define LOG_PORT (1U<<3) -#define LOG_DSR (1U<<4) -#define LOG_BANKING (1U<<5) -#define LOG_CRU (1U<<6) -#define LOG_ADDRESS (1U<<7) -#define LOG_READ (1U<<8) -#define LOG_WRITE (1U<<9) -#define LOG_IGNORE (1U<<10) - -#define VERBOSE ( LOG_CONFIG | LOG_WARN ) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) // Configuration +#define LOG_PORT (1U << 3) +#define LOG_DSR (1U << 4) +#define LOG_BANKING (1U << 5) +#define LOG_CRU (1U << 6) +#define LOG_ADDRESS (1U << 7) +#define LOG_READ (1U << 8) +#define LOG_WRITE (1U << 9) +#define LOG_IGNORE (1U << 10) + +#define VERBOSE (LOG_CONFIG | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/ti99/peb/memex.cpp b/src/devices/bus/ti99/peb/memex.cpp index 1ee9bf423e1..67011503bf6 100644 --- a/src/devices/bus/ti99/peb/memex.cpp +++ b/src/devices/bus/ti99/peb/memex.cpp @@ -15,13 +15,13 @@ #include "emu.h" #include "memex.h" -#define LOG_WARN (1U<<1) -#define LOG_CONFIG (1U<<2) -#define LOG_READ (1U<<3) -#define LOG_WRITE (1U<<4) -#define LOG_BLOCK (1U<<5) +#define LOG_WARN (1U << 1) +#define LOG_CONFIG (1U << 2) +#define LOG_READ (1U << 3) +#define LOG_WRITE (1U << 4) +#define LOG_BLOCK (1U << 5) -#define VERBOSE ( LOG_CONFIG | LOG_WARN ) +#define VERBOSE (LOG_CONFIG | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/ti99/peb/myarcfdc.cpp b/src/devices/bus/ti99/peb/myarcfdc.cpp index 7df7cf0d261..46536208503 100644 --- a/src/devices/bus/ti99/peb/myarcfdc.cpp +++ b/src/devices/bus/ti99/peb/myarcfdc.cpp @@ -28,17 +28,17 @@ // ---------------------------------- // Flags for debugging -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) // Configuration -#define LOG_EPROM (1U<<3) // Access to EPROM -#define LOG_CONTR (1U<<4) // Access to controller -#define LOG_RAM (1U<<5) // Access to SRAM -#define LOG_IRQ (1U<<7) // IRQ line -#define LOG_DRQ (1U<<8) // DRQ line -#define LOG_DRIVE (1U<<9) // Drive operations -#define LOG_CRU (1U<<10) // CRU operations - -#define VERBOSE ( LOG_GENERAL | LOG_WARN | LOG_CONFIG ) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) // Configuration +#define LOG_EPROM (1U << 3) // Access to EPROM +#define LOG_CONTR (1U << 4) // Access to controller +#define LOG_RAM (1U << 5) // Access to SRAM +#define LOG_IRQ (1U << 6) // IRQ line +#define LOG_DRQ (1U << 7) // DRQ line +#define LOG_DRIVE (1U << 8) // Drive operations +#define LOG_CRU (1U << 9) // CRU operations + +#define VERBOSE (LOG_GENERAL | LOG_WARN | LOG_CONFIG) #include "logmacro.h" #define BUFFER_TAG "ram" diff --git a/src/devices/bus/ti99/peb/pcode.cpp b/src/devices/bus/ti99/peb/pcode.cpp index 0c5e4e4fb57..90a6fc43315 100644 --- a/src/devices/bus/ti99/peb/pcode.cpp +++ b/src/devices/bus/ti99/peb/pcode.cpp @@ -75,14 +75,14 @@ #include "emu.h" #include "pcode.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) // Configuration -#define LOG_ROM (1U<<3) -#define LOG_GROM (1U<<4) -#define LOG_SWITCH (1U<<5) -#define LOG_CRU (1U<<6) - -#define VERBOSE ( LOG_CONFIG | LOG_WARN ) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) // Configuration +#define LOG_ROM (1U << 3) +#define LOG_GROM (1U << 4) +#define LOG_SWITCH (1U << 5) +#define LOG_CRU (1U << 6) + +#define VERBOSE (LOG_CONFIG | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/ti99/peb/peribox.cpp b/src/devices/bus/ti99/peb/peribox.cpp index cc8b07500f0..fd79a004c48 100644 --- a/src/devices/bus/ti99/peb/peribox.cpp +++ b/src/devices/bus/ti99/peb/peribox.cpp @@ -201,12 +201,12 @@ CRUCLK* 51||52 DBIN #include "scsicard.h" #include "tipi.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) // Configuration -#define LOG_INT (1U<<3) -#define LOG_READY (1U<<4) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) // Configuration +#define LOG_INT (1U << 3) +#define LOG_READY (1U << 4) -#define VERBOSE ( LOG_CONFIG | LOG_WARN ) +#define VERBOSE (LOG_CONFIG | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/ti99/peb/pgram.cpp b/src/devices/bus/ti99/peb/pgram.cpp index c6ece9407a0..007f168ab63 100644 --- a/src/devices/bus/ti99/peb/pgram.cpp +++ b/src/devices/bus/ti99/peb/pgram.cpp @@ -116,16 +116,16 @@ #include "emu.h" #include "pgram.h" -#define LOG_WARN (1U<<1) -#define LOG_WP (1U<<2) -#define LOG_DSR (1U<<3) -#define LOG_RAM (1U<<4) -#define LOG_GRAM (1U<<5) -#define LOG_GRAMADDR (1U<<6) -#define LOG_CRU (1U<<7) -#define LOG_BANK (1U<<8) - -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define LOG_WARN (1U << 1) +#define LOG_WP (1U << 2) +#define LOG_DSR (1U << 3) +#define LOG_RAM (1U << 4) +#define LOG_GRAM (1U << 5) +#define LOG_GRAMADDR (1U << 6) +#define LOG_CRU (1U << 7) +#define LOG_BANK (1U << 8) + +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/ti99/peb/scsicard.cpp b/src/devices/bus/ti99/peb/scsicard.cpp index 5f9dfbf19e6..24f5500106f 100644 --- a/src/devices/bus/ti99/peb/scsicard.cpp +++ b/src/devices/bus/ti99/peb/scsicard.cpp @@ -118,16 +118,16 @@ #include "scsicard.h" #include "bus/nscsi/devices.h" -#define LOG_WARN (1U<<1) -#define LOG_CRU (1U<<2) -#define LOG_EPROM (1U<<3) -#define LOG_RAM (1U<<4) -#define LOG_CONTR (1U<<5) -#define LOG_CB (1U<<6) -#define LOG_READY (1U<<7) -#define LOG_DMA (1U<<8) - -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define LOG_WARN (1U << 1) +#define LOG_CRU (1U << 2) +#define LOG_EPROM (1U << 3) +#define LOG_RAM (1U << 4) +#define LOG_CONTR (1U << 5) +#define LOG_CB (1U << 6) +#define LOG_READY (1U << 7) +#define LOG_DMA (1U << 8) + +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/ti99/peb/sidmaster.cpp b/src/devices/bus/ti99/peb/sidmaster.cpp index 9b6eb0af129..2fac13f654b 100644 --- a/src/devices/bus/ti99/peb/sidmaster.cpp +++ b/src/devices/bus/ti99/peb/sidmaster.cpp @@ -24,10 +24,10 @@ #include "emu.h" #include "sidmaster.h" -#define LOG_WARN (1U<<1) -#define LOG_WRITE (1U<<2) +#define LOG_WARN (1U << 1) +#define LOG_WRITE (1U << 2) -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/ti99/peb/spchsyn.cpp b/src/devices/bus/ti99/peb/spchsyn.cpp index 302758f3f4e..559294bc8b0 100644 --- a/src/devices/bus/ti99/peb/spchsyn.cpp +++ b/src/devices/bus/ti99/peb/spchsyn.cpp @@ -27,13 +27,13 @@ #include "machine/spchrom.h" #include "speaker.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) -#define LOG_MEM (1U<<3) -#define LOG_ADDR (1U<<4) -#define LOG_READY (1U<<5) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) +#define LOG_MEM (1U << 3) +#define LOG_ADDR (1U << 4) +#define LOG_READY (1U << 5) -#define VERBOSE ( LOG_CONFIG | LOG_WARN ) +#define VERBOSE (LOG_CONFIG | LOG_WARN) #include "logmacro.h" DEFINE_DEVICE_TYPE(TI99_SPEECH, bus::ti99::peb::ti_speech_synthesizer_device, "ti99_speech", "TI-99 Speech synthesizer (on adapter card)") diff --git a/src/devices/bus/ti99/peb/ti_fdc.cpp b/src/devices/bus/ti99/peb/ti_fdc.cpp index b68147a8193..1c7bffb7f97 100644 --- a/src/devices/bus/ti99/peb/ti_fdc.cpp +++ b/src/devices/bus/ti99/peb/ti_fdc.cpp @@ -17,19 +17,19 @@ #include "formats/ti99_dsk.h" #include "machine/rescap.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) -#define LOG_RW (1U<<3) -#define LOG_PORTS (1U<<4) // too noisy in RW -#define LOG_CRU (1U<<5) -#define LOG_READY (1U<<6) -#define LOG_SIGNALS (1U<<7) -#define LOG_DRQ (1U<<8) // too noisy in SIGNALS -#define LOG_DATA (1U<<9) -#define LOG_MOTOR (1U<<10) -#define LOG_ADDRESS (1U<<11) - -#define VERBOSE ( LOG_CONFIG | LOG_WARN ) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) +#define LOG_RW (1U << 3) +#define LOG_PORTS (1U << 4) // too noisy in RW +#define LOG_CRU (1U << 5) +#define LOG_READY (1U << 6) +#define LOG_SIGNALS (1U << 7) +#define LOG_DRQ (1U << 8) // too noisy in SIGNALS +#define LOG_DATA (1U << 9) +#define LOG_MOTOR (1U << 10) +#define LOG_ADDRESS (1U << 11) + +#define VERBOSE (LOG_CONFIG | LOG_WARN) #include "logmacro.h" DEFINE_DEVICE_TYPE(TI99_FDC, bus::ti99::peb::ti_fdc_device, "ti99_fdc", "TI-99 Standard DSSD Floppy Controller") diff --git a/src/devices/bus/ti99/peb/ti_rs232.cpp b/src/devices/bus/ti99/peb/ti_rs232.cpp index 5f854c4fab2..817c038bd88 100644 --- a/src/devices/bus/ti99/peb/ti_rs232.cpp +++ b/src/devices/bus/ti99/peb/ti_rs232.cpp @@ -105,17 +105,17 @@ #include "emu.h" #include "ti_rs232.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) -#define LOG_LINES (1U<<3) -#define LOG_SETTING (1U<<4) -#define LOG_STATE (1U<<5) -#define LOG_MAP (1U<<6) -#define LOG_IN (1U<<7) -#define LOG_OUT (1U<<8) -#define LOG_ILA (1U<<9) - -#define VERBOSE ( LOG_CONFIG | LOG_WARN ) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) +#define LOG_LINES (1U << 3) +#define LOG_SETTING (1U << 4) +#define LOG_STATE (1U << 5) +#define LOG_MAP (1U << 6) +#define LOG_IN (1U << 7) +#define LOG_OUT (1U << 8) +#define LOG_ILA (1U << 9) + +#define VERBOSE (LOG_CONFIG | LOG_WARN) #include "logmacro.h" DEFINE_DEVICE_TYPE(TI99_RS232, bus::ti99::peb::ti_rs232_pio_device, "ti99_rs232", "TI-99 RS232/PIO interface") diff --git a/src/devices/bus/ti99/peb/tipi.cpp b/src/devices/bus/ti99/peb/tipi.cpp index 65b3b44ca7e..ddaa082ae68 100644 --- a/src/devices/bus/ti99/peb/tipi.cpp +++ b/src/devices/bus/ti99/peb/tipi.cpp @@ -76,16 +76,16 @@ #include "emu.h" #include "tipi.h" -#define LOG_WARN (1U<<1) -#define LOG_EPROM (1U<<2) -#define LOG_CRU (1U<<3) -#define LOG_PORTS (1U<<4) -#define LOG_RPI (1U<<5) -#define LOG_QUEUE (1U<<6) -#define LOG_PROT (1U<<7) -#define LOG_DETAIL (1U<<8) - -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define LOG_WARN (1U << 1) +#define LOG_EPROM (1U << 2) +#define LOG_CRU (1U << 3) +#define LOG_PORTS (1U << 4) +#define LOG_RPI (1U << 5) +#define LOG_QUEUE (1U << 6) +#define LOG_PROT (1U << 7) +#define LOG_DETAIL (1U << 8) + +#define VERBOSE (LOG_GENERAL | LOG_WARN) #define RASPI "rpi" #include "logmacro.h" diff --git a/src/devices/bus/ti99/peb/tn_ide.cpp b/src/devices/bus/ti99/peb/tn_ide.cpp index f4ae600ce67..f886633141a 100644 --- a/src/devices/bus/ti99/peb/tn_ide.cpp +++ b/src/devices/bus/ti99/peb/tn_ide.cpp @@ -122,15 +122,15 @@ #include "emu.h" #include "tn_ide.h" -#define LOG_WARN (1U<<1) -#define LOG_CRU (1U<<2) -#define LOG_RTC (1U<<3) -#define LOG_XRAM (1U<<4) -#define LOG_SRAM (1U<<5) -#define LOG_ATA (1U<<6) -#define LOG_SRAMH (1U<<7) - -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define LOG_WARN (1U << 1) +#define LOG_CRU (1U << 2) +#define LOG_RTC (1U << 3) +#define LOG_XRAM (1U << 4) +#define LOG_SRAM (1U << 5) +#define LOG_ATA (1U << 6) +#define LOG_SRAMH (1U << 7) + +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/ti99/peb/tn_usbsm.cpp b/src/devices/bus/ti99/peb/tn_usbsm.cpp index 5a2a266661b..a031613ca5a 100644 --- a/src/devices/bus/ti99/peb/tn_usbsm.cpp +++ b/src/devices/bus/ti99/peb/tn_usbsm.cpp @@ -42,9 +42,9 @@ #include "emu.h" #include "tn_usbsm.h" -#define LOG_WARN (1U<<1) // Warnings +#define LOG_WARN (1U << 1) // Warnings -#define VERBOSE ( LOG_WARN ) +#define VERBOSE (LOG_WARN) #include "logmacro.h" diff --git a/src/devices/bus/vme/vme.cpp b/src/devices/bus/vme/vme.cpp index b377403d09c..55ad46fec97 100644 --- a/src/devices/bus/vme/vme.cpp +++ b/src/devices/bus/vme/vme.cpp @@ -74,8 +74,7 @@ #include "bus/vme/vme_fcisio.h" #include "bus/vme/vme_fcscsi.h" -#define LOG_GENERAL 0x01 -#define LOG_SETUP 0x02 +#define LOG_SETUP (1U << 1) //#define VERBOSE (LOG_SETUP | LOG_GENERAL) @@ -83,7 +82,6 @@ #include "logmacro.h" -#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #ifdef _MSC_VER diff --git a/src/devices/bus/vme/vme_cp31.cpp b/src/devices/bus/vme/vme_cp31.cpp index 2a59f92b7ed..9480e9d1221 100644 --- a/src/devices/bus/vme/vme_cp31.cpp +++ b/src/devices/bus/vme/vme_cp31.cpp @@ -28,16 +28,12 @@ #include "vme_cp31.h" -//#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) -#define LOG_INT (1U << 2) +#define LOG_INT (1U << 1) -//#define VERBOSE (LOG_GENERAL | LOG_SETUP | LOG_INT) +#define VERBOSE (0) // (LOG_GENERAL | LOG_INT) //#define LOG_OUTPUT_FUNC printf - #include "logmacro.h" -#define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGINT(...) LOGMASKED(LOG_INT, __VA_ARGS__) diff --git a/src/devices/bus/vme/vme_fccpu20.cpp b/src/devices/bus/vme/vme_fccpu20.cpp index 6bf01e23b06..e9b00ff70f2 100644 --- a/src/devices/bus/vme/vme_fccpu20.cpp +++ b/src/devices/bus/vme/vme_fccpu20.cpp @@ -192,16 +192,12 @@ #include "machine/68561mpcc.h" #include "machine/clock.h" -//#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) -#define LOG_INT (1U << 2) +#define LOG_INT (1U << 1) -//#define VERBOSE (LOG_GENERAL | LOG_SETUP | LOG_INT) +#define VERBOSE (0) // (LOG_GENERAL | LOG_INT) //#define LOG_OUTPUT_FUNC printf - #include "logmacro.h" -#define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGINT(...) LOGMASKED(LOG_INT, __VA_ARGS__) diff --git a/src/devices/bus/vme/vme_fcisio.cpp b/src/devices/bus/vme/vme_fcisio.cpp index 8d50a671cc0..3c9c4ad1c44 100644 --- a/src/devices/bus/vme/vme_fcisio.cpp +++ b/src/devices/bus/vme/vme_fcisio.cpp @@ -134,16 +134,10 @@ #include "bus/rs232/rs232.h" #include "machine/clock.h" -//#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) - -//#define VERBOSE (LOG_GENERAL | LOG_SETUP) +#define VERBOSE (0) // (LOG_GENERAL) //#define LOG_OUTPUT_FUNC printf - #include "logmacro.h" -#define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) - #ifdef _MSC_VER #define FUNCNAME __func__ #else diff --git a/src/devices/bus/vme/vme_fcscsi.cpp b/src/devices/bus/vme/vme_fcscsi.cpp index 92f6cac9791..013f16a644f 100644 --- a/src/devices/bus/vme/vme_fcscsi.cpp +++ b/src/devices/bus/vme/vme_fcscsi.cpp @@ -152,21 +152,10 @@ #include "machine/clock.h" #include "formats/pc_dsk.h" -#define LOG_GENERAL 0x01 -#define LOG_SETUP 0x02 -#define LOG_PRINTF 0x04 +#define VERBOSE (0) // (LOG_GENERAL) +//#define LOG_OUTPUT_FUNC osd_printf_info +#include "logmacro.h" -#define VERBOSE 0 //(LOG_PRINTF | LOG_SETUP | LOG_GENERAL) - -#define LOGMASK(mask, ...) do { if (VERBOSE & mask) logerror(__VA_ARGS__); } while (0) -#define LOGLEVEL(mask, level, ...) do { if ((VERBOSE & mask) >= level) logerror(__VA_ARGS__); } while (0) - -#define LOG(...) LOGMASK(LOG_GENERAL, __VA_ARGS__) -#define LOGSETUP(...) LOGMASK(LOG_SETUP, __VA_ARGS__) - -#if VERBOSE & LOG_PRINTF -#define logerror printf -#endif #ifdef _MSC_VER #define FUNCNAME __func__ diff --git a/src/devices/bus/vme/vme_hcpu30.cpp b/src/devices/bus/vme/vme_hcpu30.cpp index 35bdddf7b02..7f795e5f0a1 100644 --- a/src/devices/bus/vme/vme_hcpu30.cpp +++ b/src/devices/bus/vme/vme_hcpu30.cpp @@ -32,16 +32,12 @@ #include "emu.h" #include "vme_hcpu30.h" -//#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) -#define LOG_INT (1U << 2) +#define LOG_INT (1U << 1) -//#define VERBOSE (LOG_GENERAL | LOG_SETUP | LOG_INT) +#define VERBOSE (0) // (LOG_GENERAL | LOG_INT) //#define LOG_OUTPUT_FUNC printf - #include "logmacro.h" -#define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGINT(...) LOGMASKED(LOG_INT, __VA_ARGS__) diff --git a/src/devices/bus/vme/vme_mvme120.cpp b/src/devices/bus/vme/vme_mvme120.cpp index 19ddaf9b391..7933c782cd2 100644 --- a/src/devices/bus/vme/vme_mvme120.cpp +++ b/src/devices/bus/vme/vme_mvme120.cpp @@ -28,18 +28,9 @@ #define FUNCNAME __PRETTY_FUNCTION__ #endif -#define LOG_PRINTF (1U << 1) -#define LOG_SETUP (1U << 2) -#define LOG_GENERAL (1U << 3) - -#define VERBOSE (LOG_PRINTF | LOG_SETUP | LOG_GENERAL) - +#define VERBOSE (LOG_GENERAL) #include "logmacro.h" -#define LOGPRINTF(...) LOGMASKED(LOG_PRINTF, __VA_ARGS__) -#define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) -#define LOGGENERAL(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) - // Clocks #define MVME120_MASTER_CLOCK 20_MHz_XTAL #define MVME120_CPU_CLOCK ( MVME120_MASTER_CLOCK / 2 ) diff --git a/src/devices/bus/vme/vme_mvme350.cpp b/src/devices/bus/vme/vme_mvme350.cpp index 2ca5c966b7b..e7ec3e67073 100644 --- a/src/devices/bus/vme/vme_mvme350.cpp +++ b/src/devices/bus/vme/vme_mvme350.cpp @@ -133,21 +133,10 @@ #include "cpu/m68000/m68010.h" #include "machine/68230pit.h" -#define LOG_GENERAL 0x01 -#define LOG_SETUP 0x02 -#define LOG_PRINTF 0x04 +#define VERBOSE (0) // (LOG_GENERAL) +//#define LOG_OUTPUT_FUNC osd_printf_info +#include "logmacro.h" -#define VERBOSE 0 //(LOG_PRINTF | LOG_SETUP | LOG_GENERAL) - -#define LOGMASK(mask, ...) do { if (VERBOSE & mask) logerror(__VA_ARGS__); } while (0) -#define LOGLEVEL(mask, level, ...) do { if ((VERBOSE & mask) >= level) logerror(__VA_ARGS__); } while (0) - -#define LOG(...) LOGMASK(LOG_GENERAL, __VA_ARGS__) -#define LOGSETUP(...) LOGMASK(LOG_SETUP, __VA_ARGS__) - -#if VERBOSE & LOG_PRINTF -#define logerror printf -#endif #ifdef _MSC_VER #define FUNCNAME __func__ @@ -155,6 +144,7 @@ #define FUNCNAME __PRETTY_FUNCTION__ #endif + //************************************************************************** // GLOBAL VARIABLES //************************************************************************** diff --git a/src/devices/bus/vme/vme_mzr8105.cpp b/src/devices/bus/vme/vme_mzr8105.cpp index fe63e92ee28..1d57ed905c1 100644 --- a/src/devices/bus/vme/vme_mzr8105.cpp +++ b/src/devices/bus/vme/vme_mzr8105.cpp @@ -4,21 +4,10 @@ #include "emu.h" #include "vme_mzr8105.h" -#define LOG_GENERAL 0x01 -#define LOG_SETUP 0x02 -#define LOG_PRINTF 0x04 +#define VERBOSE (0) // (LOG_GENERAL) +//#define LOG_OUTPUT_FUNC osd_printf_info +#include "logmacro.h" -#define VERBOSE 0 // (LOG_PRINTF | LOG_SETUP | LOG_GENERAL) - -#define LOGMASK(mask, ...) do { if (VERBOSE & mask) logerror(__VA_ARGS__); } while (0) -#define LOGLEVEL(mask, level, ...) do { if ((VERBOSE & mask) >= level) logerror(__VA_ARGS__); } while (0) - -#define LOG(...) LOGMASK(LOG_GENERAL, __VA_ARGS__) -#define LOGSETUP(...) LOGMASK(LOG_SETUP, __VA_ARGS__) - -#if VERBOSE & LOG_PRINTF -#define logerror printf -#endif #ifdef _MSC_VER #define FUNCNAME __func__ @@ -26,6 +15,7 @@ #define FUNCNAME __PRETTY_FUNCTION__ #endif + //************************************************************************** // GLOBAL VARIABLES //************************************************************************** diff --git a/src/devices/bus/vme/vme_mzr8300.cpp b/src/devices/bus/vme/vme_mzr8300.cpp index 99e2e8c0889..75386103924 100644 --- a/src/devices/bus/vme/vme_mzr8300.cpp +++ b/src/devices/bus/vme/vme_mzr8300.cpp @@ -88,21 +88,10 @@ #include "machine/z80sio.h" #include "bus/rs232/rs232.h" -#define LOG_GENERAL 0x01 -#define LOG_SETUP 0x02 -#define LOG_PRINTF 0x04 +#define VERBOSE (0) // (LOG_GENERAL) +//#define LOG_OUTPUT_FUNC osd_printf_info +#include "logmacro.h" -#define VERBOSE 0 // (LOG_PRINTF | LOG_SETUP | LOG_GENERAL) - -#define LOGMASK(mask, ...) do { if (VERBOSE & mask) logerror(__VA_ARGS__); } while (0) -#define LOGLEVEL(mask, level, ...) do { if ((VERBOSE & mask) >= level) logerror(__VA_ARGS__); } while (0) - -#define LOG(...) LOGMASK(LOG_GENERAL, __VA_ARGS__) -#define LOGSETUP(...) LOGMASK(LOG_SETUP, __VA_ARGS__) - -#if VERBOSE & LOG_PRINTF -#define logerror printf -#endif #ifdef _MSC_VER #define FUNCNAME __func__ @@ -110,6 +99,7 @@ #define FUNCNAME __PRETTY_FUNCTION__ #endif + //************************************************************************** // GLOBAL VARIABLES //************************************************************************** diff --git a/src/devices/bus/vtech/memexp/sdloader.cpp b/src/devices/bus/vtech/memexp/sdloader.cpp index 84df085c86a..5992c66cb49 100644 --- a/src/devices/bus/vtech/memexp/sdloader.cpp +++ b/src/devices/bus/vtech/memexp/sdloader.cpp @@ -21,7 +21,6 @@ #include "emu.h" #include "sdloader.h" -#define LOG_GENERAL (1U << 0) #define LOG_SPI (1U << 1) #define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/cpu/alpha/alpha.cpp b/src/devices/cpu/alpha/alpha.cpp index 3990796cfd3..bbc32f087f8 100644 --- a/src/devices/cpu/alpha/alpha.cpp +++ b/src/devices/cpu/alpha/alpha.cpp @@ -28,7 +28,6 @@ #include "softfloat3/source/include/softfloat.h" -#define LOG_GENERAL (1U << 0) #define LOG_EXCEPTION (1U << 1) #define LOG_SYSCALLS (1U << 2) diff --git a/src/devices/cpu/arm7/arm7.cpp b/src/devices/cpu/arm7/arm7.cpp index 7ebe6e1d2bf..7f479a668d4 100644 --- a/src/devices/cpu/arm7/arm7.cpp +++ b/src/devices/cpu/arm7/arm7.cpp @@ -37,15 +37,15 @@ TODO: #include "arm7core.h" //include arm7 core #include "arm7help.h" -#define LOG_MMU (1 << 0) -#define LOG_DSP (1 << 1) -#define LOG_COPRO_READS (1 << 2) -#define LOG_COPRO_WRITES (1 << 3) -#define LOG_COPRO_UNKNOWN (1 << 4) -#define LOG_COPRO_RESERVED (1 << 5) -#define LOG_TLB (1 << 6) -#define LOG_TLB_MISS (1 << 7) -#define LOG_PREFETCH (1 << 8) +#define LOG_MMU (1U << 1) +#define LOG_DSP (1U << 2) +#define LOG_COPRO_READS (1U << 3) +#define LOG_COPRO_WRITES (1U << 4) +#define LOG_COPRO_UNKNOWN (1U << 5) +#define LOG_COPRO_RESERVED (1U << 6) +#define LOG_TLB (1U << 7) +#define LOG_TLB_MISS (1U << 8) +#define LOG_PREFETCH (1U << 9) #define VERBOSE (0) // (LOG_COPRO_READS | LOG_COPRO_WRITES | LOG_COPRO_UNKNOWN | LOG_COPRO_RESERVED) #include "logmacro.h" diff --git a/src/devices/cpu/arm7/arm7ops.cpp b/src/devices/cpu/arm7/arm7ops.cpp index b56c6bdce4b..7d852207b3c 100644 --- a/src/devices/cpu/arm7/arm7ops.cpp +++ b/src/devices/cpu/arm7/arm7ops.cpp @@ -5,7 +5,7 @@ #include "arm7core.h" #include "arm7help.h" -#define LOG_OPS (1 << 0) +#define LOG_OPS (1U << 1) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp index dfe696252ad..b07eb8719a4 100644 --- a/src/devices/cpu/avr8/avr8.cpp +++ b/src/devices/cpu/avr8/avr8.cpp @@ -61,33 +61,33 @@ #include "avr8.h" #include "avr8dasm.h" -#define LOG_UNKNOWN (1 << 1) -#define LOG_BOOT (1 << 2) -#define LOG_TIMER0 (1 << 3) -#define LOG_TIMER1 (1 << 4) -#define LOG_TIMER2 (1 << 5) -#define LOG_TIMER3 (1 << 6) -#define LOG_TIMER4 (1 << 7) -#define LOG_TIMER5 (1 << 8) -#define LOG_TIMER0_TICK (1 << 9) -#define LOG_TIMER1_TICK (1 << 10) -#define LOG_TIMER2_TICK (1 << 11) -#define LOG_TIMER3_TICK (1 << 12) -#define LOG_TIMER4_TICK (1 << 13) -#define LOG_TIMER5_TICK (1 << 14) -#define LOG_EEPROM (1 << 15) -#define LOG_GPIO (1 << 16) -#define LOG_WDOG (1 << 17) -#define LOG_CLOCK (1 << 18) -#define LOG_POWER (1 << 19) -#define LOG_OSC (1 << 20) -#define LOG_PINCHG (1 << 21) -#define LOG_EXTMEM (1 << 22) -#define LOG_ADC (1 << 23) -#define LOG_DIGINPUT (1 << 24) -#define LOG_ASYNC (1 << 25) -#define LOG_TWI (1 << 26) -#define LOG_UART (1 << 27) +#define LOG_UNKNOWN (1U << 1) +#define LOG_BOOT (1U << 2) +#define LOG_TIMER0 (1U << 3) +#define LOG_TIMER1 (1U << 4) +#define LOG_TIMER2 (1U << 5) +#define LOG_TIMER3 (1U << 6) +#define LOG_TIMER4 (1U << 7) +#define LOG_TIMER5 (1U << 8) +#define LOG_TIMER0_TICK (1U << 9) +#define LOG_TIMER1_TICK (1U << 10) +#define LOG_TIMER2_TICK (1U << 11) +#define LOG_TIMER3_TICK (1U << 12) +#define LOG_TIMER4_TICK (1U << 13) +#define LOG_TIMER5_TICK (1U << 14) +#define LOG_EEPROM (1U << 15) +#define LOG_GPIO (1U << 16) +#define LOG_WDOG (1U << 17) +#define LOG_CLOCK (1U << 18) +#define LOG_POWER (1U << 19) +#define LOG_OSC (1U << 20) +#define LOG_PINCHG (1U << 21) +#define LOG_EXTMEM (1U << 22) +#define LOG_ADC (1U << 23) +#define LOG_DIGINPUT (1U << 24) +#define LOG_ASYNC (1U << 25) +#define LOG_TWI (1U << 26) +#define LOG_UART (1U << 27) #define LOG_TIMERS (LOG_TIMER0 | LOG_TIMER1 | LOG_TIMER2 | LOG_TIMER3 | LOG_TIMER4 | LOG_TIMER5) #define LOG_TIMER_TICKS (LOG_TIMER0_TICK | LOG_TIMER1_TICK | LOG_TIMER2_TICK | LOG_TIMER3_TICK | LOG_TIMER4_TICK | LOG_TIMER5_TICK) #define LOG_ALL (LOG_UNKNOWN | LOG_BOOT | LOG_TIMERS | LOG_TIMER_TICKS | LOG_EEPROM | LOG_GPIO | LOG_WDOG | LOG_CLOCK | LOG_POWER \ diff --git a/src/devices/cpu/axc51/axc51.cpp b/src/devices/cpu/axc51/axc51.cpp index 602e14b75b0..739abdf5e5b 100644 --- a/src/devices/cpu/axc51/axc51.cpp +++ b/src/devices/cpu/axc51/axc51.cpp @@ -20,10 +20,10 @@ #include "axc51.h" #include "axc51dasm.h" -#define LOG_UNSORTED (1U << 1) -#define LOG_PORTS (1U << 2) -#define LOG_UNHANDLED (1U << 3) -#define LOG_UNHANDLED_XSFR (1U << 4) +#define LOG_UNSORTED (1U << 1) +#define LOG_PORTS (1U << 2) +#define LOG_UNHANDLED (1U << 3) +#define LOG_UNHANDLED_XSFR (1U << 4) diff --git a/src/devices/cpu/clipper/clipper.cpp b/src/devices/cpu/clipper/clipper.cpp index 5087bfc7ab2..aff0b589a45 100644 --- a/src/devices/cpu/clipper/clipper.cpp +++ b/src/devices/cpu/clipper/clipper.cpp @@ -17,7 +17,6 @@ #include "clipper.h" #include "clipperd.h" -#define LOG_GENERAL (1U << 0) #define LOG_EXCEPTION (1U << 1) #define LOG_SYSCALLS (1U << 2) diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp index dcd9a6edc0f..de401789db0 100644 --- a/src/devices/cpu/cop400/cop400.cpp +++ b/src/devices/cpu/cop400/cop400.cpp @@ -88,7 +88,9 @@ DEFINE_DEVICE_TYPE(COP446C, cop446c_cpu_device, "cop446c", "National Semiconduct CONSTANTS ***************************************************************************/ -#define LOG_MICROBUS 0 +#define LOG_MICROBUS (1U << 1) +#define VERBOSE (0) +#include "logmacro.h" // step through skipped instructions in debugger #define COP_DEBUG_SKIP 0 @@ -1382,14 +1384,14 @@ std::unique_ptr cop400_cpu_device::create_disassembler() uint8_t cop400_cpu_device::microbus_r() { - if (LOG_MICROBUS) logerror("%s %s MICROBUS R %02x\n", machine().time().as_string(), machine().describe_context(), Q); + LOGMASKED(LOG_MICROBUS, "%s %s MICROBUS R %02x\n", machine().time().as_string(), machine().describe_context(), Q); return Q; } void cop400_cpu_device::microbus_w(uint8_t data) { - if (LOG_MICROBUS) logerror("%s %s MICROBUS W %02x\n", machine().time().as_string(), machine().describe_context(), data); + LOGMASKED(LOG_MICROBUS, "%s %s MICROBUS W %02x\n", machine().time().as_string(), machine().describe_context(), data); WRITE_G(G & 0xe); diff --git a/src/devices/cpu/diablo/diablo1300.cpp b/src/devices/cpu/diablo/diablo1300.cpp index baaf6f8bc47..441f553e7ff 100644 --- a/src/devices/cpu/diablo/diablo1300.cpp +++ b/src/devices/cpu/diablo/diablo1300.cpp @@ -13,8 +13,8 @@ //************************************************************************** // CONFIGURABLE LOGGING //************************************************************************** -#define LOG_OP (1U << 1) -#define LOG_TABLE (1U << 2) +#define LOG_OP (1U << 1) +#define LOG_TABLE (1U << 2) #define VERBOSE (LOG_GENERAL | LOG_OP | LOG_TABLE) //#define LOG_OUTPUT_FUNC printf diff --git a/src/devices/cpu/dsp16/dsp16.cpp b/src/devices/cpu/dsp16/dsp16.cpp index c068fcf6d28..e0271683ceb 100644 --- a/src/devices/cpu/dsp16/dsp16.cpp +++ b/src/devices/cpu/dsp16/dsp16.cpp @@ -83,7 +83,6 @@ #include #include -#define LOG_GENERAL (1U << 0) #define LOG_INT (1U << 1) #define LOG_SIO (1U << 2) #define LOG_PIO (1U << 3) diff --git a/src/devices/cpu/dsp56000/dsp56000.cpp b/src/devices/cpu/dsp56000/dsp56000.cpp index eed944bdc0a..8c1f5e57dfe 100644 --- a/src/devices/cpu/dsp56000/dsp56000.cpp +++ b/src/devices/cpu/dsp56000/dsp56000.cpp @@ -15,8 +15,6 @@ #include "dsp56000.h" #include "dsp56000d.h" -#define LOG_GENERAL (1U << 0) - //#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/cpu/dsp56156/dsp56mem.cpp b/src/devices/cpu/dsp56156/dsp56mem.cpp index 7ae5f46314b..6cafaf17dc7 100644 --- a/src/devices/cpu/dsp56156/dsp56mem.cpp +++ b/src/devices/cpu/dsp56156/dsp56mem.cpp @@ -56,7 +56,7 @@ void mem_reset(dsp56156_core* cpustate) /************************************/ void HCR_set(dsp56156_core* cpustate, uint16_t value) { - LOGMASKED(LOG_GENERAL, "%s: HCR_set: %02x\n", cpustate->device->machine().describe_context(), value); + LOG("%s: HCR_set: %02x\n", cpustate->device->machine().describe_context(), value); HF3_bit_set (cpustate, (value & 0x0010) >> 4); HF2_bit_set (cpustate, (value & 0x0008) >> 3); HCIE_bit_set(cpustate, (value & 0x0004) >> 2); @@ -75,7 +75,7 @@ void HF3_bit_set(dsp56156_core* cpustate, uint16_t value) HCR &= ~(0x0010); HCR |= (value << 4); - LOGMASKED(LOG_GENERAL, "%s: HF3_bit_set: %d\n", cpustate->device->machine().describe_context(), value); + LOG("%s: HF3_bit_set: %d\n", cpustate->device->machine().describe_context(), value); HF3_bit_host_set(cpustate, value); } void HF2_bit_set(dsp56156_core* cpustate, uint16_t value) @@ -84,7 +84,7 @@ void HF2_bit_set(dsp56156_core* cpustate, uint16_t value) HCR &= ~(0x0008); HCR |= (value << 3); - LOGMASKED(LOG_GENERAL, "%s: HF2_bit_set: %d\n", cpustate->device->machine().describe_context(), value); + LOG("%s: HF2_bit_set: %d\n", cpustate->device->machine().describe_context(), value); HF2_bit_host_set(cpustate, value); } void HCIE_bit_set(dsp56156_core* cpustate, uint16_t value) diff --git a/src/devices/cpu/es5510/es5510.cpp b/src/devices/cpu/es5510/es5510.cpp index 914a839c7ef..ac5ba9f7885 100644 --- a/src/devices/cpu/es5510/es5510.cpp +++ b/src/devices/cpu/es5510/es5510.cpp @@ -23,25 +23,19 @@ #include #include -#define VERBOSE 0 #define VERBOSE_EXEC 0 -static inline void ATTR_PRINTF(1,2) log_to_stderr(const char *format, ...) { - va_list ap; - va_start(ap, format); - vfprintf(stderr, format, ap); - va_end(ap); -} - -#define LOG(...) do { if (VERBOSE) log_to_stderr(__VA_ARGS__); } while(0) - +#define LOG_EXECUTION (1U << 1) #if VERBOSE_EXEC static int exec_cc = 0; -#define LOG_EXEC(x) do { if (!exec_cc) LOG x; } while(0) +#define VERBOSE (LOG_EXECUTION) #else -#define LOG_EXEC(x) +#define VERBOSE (0) #endif +#include "logmacro.h" + +#define LOG_EXEC(...) LOGMASKED(LOG_EXECUTION, __VA_ARGS__) DEFINE_DEVICE_TYPE(ES5510, es5510_device, "es5510", "ES5510") @@ -785,16 +779,14 @@ void es5510_device::execute_run() { } else { // currently running, execute one instruction. -#if VERBOSE_EXEC char buf[1024]; DESCRIBE_INSTR(buf, instr[pc], gpr[pc], nullptr, nullptr, nullptr, nullptr); - LOG_EXEC(("%s",string_format("EXECUTING %02x: %012x %06x %s\n", pc, instr[pc], gpr[pc]&0xffffff, buf).c_str())); -#endif + LOG_EXEC("EXECUTING %02x: %012x %06x %s\n", pc, instr[pc], gpr[pc]&0xffffff, buf); ram_pp = ram_p; ram_p = ram; - LOG_EXEC(("- T0\n")); + LOG_EXEC("- T0\n"); // *** T0, clock high // --- nothing to do! @@ -809,7 +801,7 @@ void es5510_device::execute_run() { dil = 0; // read_io(ram_pp.address); } else { // read from DRAM and store into DIL dil = dram_r(ram_pp.address) << 8; - LOG_EXEC((" . RAM: read %x (%d) from address %x\n", dil, dil, ram_pp.address)); + LOG_EXEC(" . RAM: read %x (%d) from address %x\n", dil, dil, ram_pp.address); } } @@ -823,19 +815,19 @@ void es5510_device::execute_run() { switch(ramControl.access) { case RAM_CONTROL_DELAY: ram.address = (((dbase + offset) % (dlength + memincrement)) & memmask) >> memshift; - LOG_EXEC((". Ram Control: Delay, base=%x, offset=%x, length=%x => address=%x\n", dbase >> memshift, offset >> memshift, (dlength + memincrement) >> memshift, ram.address)); + LOG_EXEC(". Ram Control: Delay, base=%x, offset=%x, length=%x => address=%x\n", dbase >> memshift, offset >> memshift, (dlength + memincrement) >> memshift, ram.address); break; case RAM_CONTROL_TABLE_A: ram.address = ((abase + offset) & memmask) >> memshift; - LOG_EXEC((". Ram Control: table A = %x, offset=%x => address=%x\n", abase >> memshift, offset >> memshift, ram.address)); + LOG_EXEC(". Ram Control: table A = %x, offset=%x => address=%x\n", abase >> memshift, offset >> memshift, ram.address); break; case RAM_CONTROL_TABLE_B: ram.address = ((bbase + offset) & memmask) >> memshift; - LOG_EXEC((". Ram Control: table B = %x, offset=%x => address=%x\n", bbase >> memshift, offset >> memshift, ram.address)); + LOG_EXEC(". Ram Control: table B = %x, offset=%x => address=%x\n", bbase >> memshift, offset >> memshift, ram.address); break; case RAM_CONTROL_IO: ram.address = offset & 0x00fffff0; // mask off the low 4 bits - LOG_EXEC((". Ram Control: I/O at address=%x\n", ram.address)); + LOG_EXEC(". Ram Control: I/O at address=%x\n", ram.address); break; } @@ -843,7 +835,7 @@ void es5510_device::execute_run() { // --- Decode instruction N; // we will do this both here and in stages as the different parts of the instruction complete & recommence. - LOG_EXEC(("- T1.1\n")); + LOG_EXEC("- T1.1\n"); uint8_t operandSelect = (uint8_t)((instr >> 8) & 0x0f); const op_select_t &opSelect = OPERAND_SELECT[operandSelect]; @@ -855,13 +847,13 @@ void es5510_device::execute_run() { skipConditionSatisfied = !skipConditionSatisfied; } skip = skipConditionSatisfied; - LOG_EXEC((". skippable: %x vs %x => skippable = %d\n", ccr, cmr, skip)); + LOG_EXEC(". skippable: %x vs %x => skippable = %d\n", ccr, cmr, skip); } else { skip = false; } // --- Write Multiplier result N-1 - LOG_EXEC((". write mulacc:\n")); + LOG_EXEC(". write mulacc:\n"); if (mulacc.write_result) { mulacc.product = mul_32x32(util::sext(mulacc.cValue, 24), util::sext(mulacc.dValue, 24)) << mulshift; if (mulacc.accumulate) { @@ -875,18 +867,16 @@ void es5510_device::execute_run() { } else { mac_overflow = false; } -#if VERBOSE_EXEC if (mulacc.cValue || mulacc.dValue || (mulacc.accumulate && machl)) { - LOG_EXEC((". mulacc: %x (%d) * %x (%d) << %d", (mulacc.cValue & 0x00ffffff), util::sext(mulacc.cValue, 24), (mulacc.dValue & 0x00ffffff), util::sext(mulacc.dValue, 24), mulshift)); - if (mulacc.accumulate) LOG_EXEC((" + %llx (%lld) ", machl, machl)); - LOG_EXEC((" = %llx (%lld)", mulacc.result, mulacc.result)); + LOG_EXEC(". mulacc: %x (%d) * %x (%d) << %d", (mulacc.cValue & 0x00ffffff), util::sext(mulacc.cValue, 24), (mulacc.dValue & 0x00ffffff), util::sext(mulacc.dValue, 24), mulshift); + if (mulacc.accumulate) LOG_EXEC(" + %llx (%lld) ", machl, machl); + LOG_EXEC(" = %llx (%lld)", mulacc.result, mulacc.result); if (mac_overflow) { - LOG_EXEC((" overflow!\n")); + LOG_EXEC(" overflow!\n"); } else { - LOG_EXEC(("\n")); + LOG_EXEC("\n"); } } -#endif machl = mulacc.result; int32_t tmp = mac_overflow ? (machl < 0 ? 0x00800000 : 0x007fffff) : (mulacc.result & 0x0000ffffff000000ULL) >> 24; if (mulacc.dst & SRC_DST_REG) { @@ -899,10 +889,10 @@ void es5510_device::execute_run() { // *** T1, clock low - LOG_EXEC(("- T1.0\n")); + LOG_EXEC("- T1.0\n"); // --- Start of multiplier cycle N - LOG_EXEC((". start mulacc:\n")); + LOG_EXEC(". start mulacc:\n"); mulacc.cReg = (uint8_t)((instr >> 32) & 0xff); mulacc.dReg = (uint8_t)((instr >> 40) & 0xff); mulacc.src = opSelect.mac_src; @@ -914,17 +904,17 @@ void es5510_device::execute_run() { if (mulacc.src == SRC_DST_REG) { mulacc.cValue = read_reg(mulacc.cReg); } else { // must be SRC_DST_DELAY - LOG_EXEC((" . reading %x (%d) from dil\n", dil, SX(dil))); + LOG_EXEC(" . reading %x (%d) from dil\n", dil, util::sext(dil, 24)); mulacc.cValue = dil; } mulacc.dValue = read_reg(mulacc.dReg); // *** T2, clock high - LOG_EXEC(("- T2.1\n")); + LOG_EXEC("- T2.1\n"); // --- Write ALU Result N-1 - LOG_EXEC((". write ALU:\n")); + LOG_EXEC(". write ALU:\n"); if (alu.write_result) { uint8_t flags = ccr; alu.result = alu_operation(alu.op, alu.aValue, alu.bValue, flags); @@ -941,10 +931,10 @@ void es5510_device::execute_run() { // *** T2, clock low - LOG_EXEC(("- T2.0\n")); + LOG_EXEC("- T2.0\n"); // --- Start of ALU cycle N - LOG_EXEC((". start ALU:\n")); + LOG_EXEC(". start ALU:\n"); alu.aReg = (instr >> 16) & 0xff; alu.bReg = (instr >> 24) & 0xff; alu.op = (instr >> 12) & 0x0f; @@ -982,25 +972,23 @@ void es5510_device::execute_run() { // write_io(ram_p.io, dol[0]); } else { dram_w(ram_p.address, dol[0] >> 8); - LOG_EXEC((" . RAM: writing %x (%d) [of %x (%d)] to address %x\n", dol[0]&0xffff00, SX(dol[0]&0xffff00), dol[0], SX(dol[0]), ram_p.address)); + LOG_EXEC(" . RAM: writing %x (%d) [of %x (%d)] to address %x\n", dol[0]&0xffff00, util::sext(dol[0] & 0xffff00, 24), dol[0], util::sext(dol[0], 24), ram_p.address); } } // If this is a Write or Dump cycle, eject the frontmost DL value. -#if VERBOSE_EXEC - LOG_EXEC((" . ejecting from DOL: [ ")); - if (dol_count >= 1) LOG_EXEC(("{ %x (%d) }", dol[0], SX(dol[0]))); - if (dol_count == 2) LOG_EXEC((", { %x (%d) }", dol[1], SX(dol[1]))); - LOG_EXEC((" ] -> [ ")); -#endif + LOG_EXEC(" . ejecting from DOL: [ "); + if (dol_count >= 1) LOG_EXEC("{ %x (%d) }", dol[0], util::sext(dol[0], 24)); + if (dol_count == 2) LOG_EXEC(", { %x (%d) }", dol[1], util::sext(dol[1], 24)); + LOG_EXEC(" ] -> [ "); + dol[0] = dol[1]; if (dol_count > 0) { --dol_count; } -#if VERBOSE_EXEC - if (dol_count >= 1) LOG_EXEC(("{ %x (%d) }", dol[0], SX(dol[0]))); - if (dol_count == 2) LOG_EXEC((", { %x (%d) }", dol[1], SX(dol[1]))); - LOG_EXEC((" ]\n")); -#endif + + if (dol_count >= 1) LOG_EXEC("{ %x (%d) }", dol[0], util::sext(dol[0], 24)); + if (dol_count == 2) LOG_EXEC(", { %x (%d) }", dol[1], util::sext(dol[1], 24)); + LOG_EXEC(" ]\n"); } ++pc; @@ -1015,9 +1003,9 @@ std::unique_ptr es5510_device::create_disassembler() } #if VERBOSE_EXEC -#define RETURN_GPR(r, x) do { int32_t v = (x); LOG_EXEC((" . reading %x (%d) from gpr_%02x\n", v, SX(v), r)); return v; } while(0) -#define RETURN(r, x) do { int32_t v = (x); LOG_EXEC((" . reading %x (%d) from " #r "\n", v, SX(v))); return v; } while(0) -#define RETURN16(r, x) do { int16_t vv = (x); int32_t v = vv << 8; LOG_EXEC((" . reading %x (%d) as %x (%d) from " #r "\n", vv, vv, v, SX(v))); return v; } while(0) +#define RETURN_GPR(r, x) do { int32_t v = (x); LOG_EXEC(" . reading %x (%d) from gpr_%02x\n", v, util::sext(v, 24), r); return v; } while(0) +#define RETURN(r, x) do { int32_t v = (x); LOG_EXEC(" . reading %x (%d) from " #r "\n", v, util::sext(v, 24)); return v; } while(0) +#define RETURN16(r, x) do { int16_t vv = (x); int32_t v = vv << 8; LOG_EXEC(" . reading %x (%d) as %x (%d) from " #r "\n", vv, vv, v, util::sext(v, 24)); return v; } while(0) #else #define RETURN_GPR(r, x) return x #define RETURN(r, x) return x @@ -1089,8 +1077,8 @@ int8_t countLowOnes(int32_t x) { } #if VERBOSE_EXEC -#define WRITE_REG(r, x) do { r = value; LOG_EXEC((" . writing %x (%d) to " #r "\n", r, SX(r))); } while(0) -#define WRITE_REG16(r, x) do { r = ((value >> 8) & 0xffff); LOG_EXEC((" . writing %x (%d) as %x (%d) to " #r "\n", value, SX(value), r, r)); } while(0) +#define WRITE_REG(r, x) do { r = value; LOG_EXEC(" . writing %x (%d) to " #r "\n", r, util::sext(r, 24)); } while(0) +#define WRITE_REG16(r, x) do { r = ((value >> 8) & 0xffff); LOG_EXEC(" . writing %x (%d) as %x (%d) to " #r "\n", value, util::sext(value, 24), r, r); } while(0) #else #define WRITE_REG(r, x) do { r = value; } while(0) #define WRITE_REG16(r, x) do { r = ((value >> 8) & 0xffff); } while(0) @@ -1098,12 +1086,10 @@ int8_t countLowOnes(int32_t x) { void es5510_device::write_reg(uint8_t reg, int32_t value) { - #if VERBOSE_EXEC int64_t old; - #endif value &= 0x00ffffff; if (reg < 0xc0) { - LOG_EXEC((" . writing %x (%d) to gpr_%02x\n", value, SX(value), reg)); + LOG_EXEC(" . writing %x (%d) to gpr_%02x\n", value, util::sext(value, 24), reg); gpr[reg] = value; } else { switch(reg) @@ -1125,28 +1111,20 @@ void es5510_device::write_reg(uint8_t reg, int32_t value) case 241: WRITE_REG16(ser3l, value); break; case 242: /* macl */ { - #if VERBOSE_EXEC old = machl; - #endif int64_t masked = machl & (s64(0x00ffffffU) << 24); int64_t shifted = (int64_t)(value & 0x00ffffff) << 0; machl = util::sext(masked | shifted, 48); - #if VERBOSE_EXEC - LOG_EXEC((" . writing machl: l -> %06x => %llx -> %llx\n", value, old, machl)); - #endif + LOG_EXEC(" . writing machl: l -> %06x => %llx -> %llx\n", value, old, machl); break; } case 243: /* mach */ { - #if VERBOSE_EXEC old = machl; - #endif int64_t masked = machl & (s64(0x00ffffffU) << 0); int64_t shifted = (int64_t)(value & 0x00ffffff) << 24; machl = util::sext(masked | shifted, 48); mac_overflow = false; - #if VERBOSE_EXEC - LOG_EXEC((" . writing machl: h -> %06x => %llx -> %llx\n", value, old, machl)); - #endif + LOG_EXEC(" . writing machl: h -> %06x => %llx -> %llx\n", value, old, machl); break; } case 244: /* MEMSIZ when writing */ @@ -1154,7 +1132,7 @@ void es5510_device::write_reg(uint8_t reg, int32_t value) memsiz = 0x00ffffff >> (24 - memshift); memmask = 0x00ffffff & ~memsiz; memincrement = 1 << memshift; - LOG_EXEC((" . writing %x (%d) to memsiz => memsiz=%x, shift=%d, mask=%x, increment=%x\n", value, SX(value), memsiz, memshift, memmask, memincrement)); + LOG_EXEC(" . writing %x (%d) to memsiz => memsiz=%x, shift=%d, mask=%x, increment=%x\n", value, util::sext(value, 24), memsiz, memshift, memmask, memincrement); break; case 245: WRITE_REG(dlength, value); break; @@ -1170,13 +1148,13 @@ void es5510_device::write_reg(uint8_t reg, int32_t value) break; case 251: WRITE_REG(cmr, (value >> 16) & (FLAG_MASK | FLAG_NOT)); break; - case 252: LOG_EXEC((". not writing %x (%d) to minus_one\n", value, SX(value))); // no-op + case 252: LOG_EXEC(". not writing %x (%d) to minus_one\n", value, util::sext(value, 24)); // no-op break; - case 253: LOG_EXEC((". not writing %x (%d) to min\n", value, SX(value))); // no-op + case 253: LOG_EXEC(". not writing %x (%d) to min\n", value, util::sext(value, 24)); // no-op break; - case 254: LOG_EXEC((". not writing %x (%d) to max\n", value, SX(value))); // no-op + case 254: LOG_EXEC(". not writing %x (%d) to max\n", value, util::sext(value, 24)); // no-op break; - case 255: LOG_EXEC((". not writing %x (%d) to zero\n", value, SX(value))); // no-op + case 255: LOG_EXEC(". not writing %x (%d) to zero\n", value, util::sext(value, 24)); // no-op break; default: // unknown register break; @@ -1185,28 +1163,26 @@ void es5510_device::write_reg(uint8_t reg, int32_t value) } void es5510_device::write_to_dol(int32_t value) { -#if VERBOSE_EXEC - LOG_EXEC((". writing %x (%d) to DOL: [ ", value, value)); - if (dol_count >= 1) LOG_EXEC(("{ %x (%d) }", dol[0], SX(dol[0]))); - if (dol_count == 2) LOG_EXEC((", { %x (%d) }", dol[1], SX(dol[1]))); - LOG_EXEC((" ] -> [ ")); -#endif + LOG_EXEC(". writing %x (%d) to DOL: [ ", value, value); + if (dol_count >= 1) LOG_EXEC("{ %x (%d) }", dol[0], util::sext(dol[0], 24)); + if (dol_count == 2) LOG_EXEC(", { %x (%d) }", dol[1], util::sext(dol[1], 24)); + LOG_EXEC(" ] -> [ "); + if (dol_count >= 2) { dol[0] = dol[1]; dol[1] = value; } else { dol[dol_count++] = value; } -#if VERBOSE_EXEC - LOG_EXEC(("{%x (%d)}", dol[0], SX(dol[0]))); - if (dol_count == 2) LOG_EXEC((", {%x (%d)}", dol[1], SX(dol[1]))); - LOG_EXEC((" ]\n")); -#endif + + LOG_EXEC("{%x (%d)}", dol[0], util::sext(dol[0], 24)); + if (dol_count == 2) LOG_EXEC(", {%x (%d)}", dol[1], util::sext(dol[1], 24)); + LOG_EXEC(" ]\n"); } void es5510_device::alu_operation_end() { // Handle the END instruction separately - LOG_EXEC(("ES5510: END\n")); + LOG_EXEC("ES5510: END\n"); // sample the HALT line if (halt_asserted) { // halt diff --git a/src/devices/cpu/i386/i386.cpp b/src/devices/cpu/i386/i386.cpp index aad4aed16df..e69aae44994 100644 --- a/src/devices/cpu/i386/i386.cpp +++ b/src/devices/cpu/i386/i386.cpp @@ -28,17 +28,17 @@ #include "debug/debugcpu.h" #include "debug/express.h" -#define LOG_MSR (1U << 1) -#define LOG_INVALID_OPCODE (1U << 2) -#define LOG_LIMIT_CHECK (1U << 3) -#define LOG_UNEMULATED (1U << 4) -#define LOG_PM_EVENTS (1U << 5) -#define LOG_PM_FAULT_GP (1U << 6) -#define LOG_PM_FAULT_SS (1U << 7) -#define LOG_PM_FAULT_NP (1U << 8) -#define LOG_PM_FAULT_TS (1U << 9) -#define LOG_PM_FAULT_DF (1U << 10) -#define LOG_PM_FAULT_UD (1U << 11) +#define LOG_MSR (1U << 1) +#define LOG_INVALID_OPCODE (1U << 2) +#define LOG_LIMIT_CHECK (1U << 3) +#define LOG_UNEMULATED (1U << 4) +#define LOG_PM_EVENTS (1U << 5) +#define LOG_PM_FAULT_GP (1U << 6) +#define LOG_PM_FAULT_SS (1U << 7) +#define LOG_PM_FAULT_NP (1U << 8) +#define LOG_PM_FAULT_TS (1U << 9) +#define LOG_PM_FAULT_DF (1U << 10) +#define LOG_PM_FAULT_UD (1U << 11) //#define VERBOSE (LOG_PM_FAULT_GP) #include "logmacro.h" diff --git a/src/devices/cpu/jaguar/jaguar.cpp b/src/devices/cpu/jaguar/jaguar.cpp index 84d5a999dbb..91319a64f1a 100644 --- a/src/devices/cpu/jaguar/jaguar.cpp +++ b/src/devices/cpu/jaguar/jaguar.cpp @@ -22,10 +22,6 @@ #include -#define LOG_GPU_IO 0 -#define LOG_DSP_IO 0 - - /*************************************************************************** CONSTANTS ***************************************************************************/ diff --git a/src/devices/cpu/m37710/m37710.cpp b/src/devices/cpu/m37710/m37710.cpp index 43106bfc1a3..f953cb143c0 100644 --- a/src/devices/cpu/m37710/m37710.cpp +++ b/src/devices/cpu/m37710/m37710.cpp @@ -67,12 +67,11 @@ #include "m37710il.h" // verbose logging for peripherals, etc. -#define LOG_GENERAL (1U << 0) #define LOG_PORTS (1U << 1) -#define LOG_AD (1U << 2) -#define LOG_UART (1U << 3) +#define LOG_AD (1U << 2) +#define LOG_UART (1U << 3) #define LOG_TIMER (1U << 4) -#define LOG_INT (1U << 5) +#define LOG_INT (1U << 5) //#define VERBOSE (LOG_GENERAL | LOG_PORTS | LOG_AD | LOG_UART | LOG_TIMER | LOG_INT) #include "logmacro.h" @@ -607,12 +606,12 @@ void m37710_cpu_device::set_port_dir(int p, uint8_t data) void m37710_cpu_device::da_reg_w(offs_t offset, uint8_t data) { - LOGMASKED(LOG_GENERAL, "da_reg_w %x to %02X: D/A %d\n", data, (int)(offset * 2) + 0x1a, offset); + LOG("da_reg_w %x to %02X: D/A %d\n", data, (int)(offset * 2) + 0x1a, offset); } void m37710_cpu_device::pulse_output_w(offs_t offset, uint8_t data) { - LOGMASKED(LOG_GENERAL, "pulse_output_w %x: Pulse output data register %d\n", data, offset); + LOG("pulse_output_w %x: Pulse output data register %d\n", data, offset); } uint8_t m37710_cpu_device::ad_control_r() @@ -875,14 +874,14 @@ void m37710_cpu_device::timer_mode_w(offs_t offset, uint8_t data) uint8_t m37710_cpu_device::proc_mode_r(offs_t offset) { - LOGMASKED(LOG_GENERAL, "proc_mode_r: Processor mode = %x (PC=%x)\n", m_proc_mode, REG_PG | REG_PC); + LOG("proc_mode_r: Processor mode = %x (PC=%x)\n", m_proc_mode, REG_PG | REG_PC); return m_proc_mode & 0xf7; } void m37710_cpu_device::proc_mode_w(uint8_t data) { - LOGMASKED(LOG_GENERAL, "proc_mode_w %x: Processor mode = %x\n", data, m_proc_mode); + LOG("proc_mode_w %x: Processor mode = %x\n", data, m_proc_mode); m_proc_mode = data; } @@ -899,54 +898,54 @@ uint8_t m37710_cpu_device::watchdog_freq_r() void m37710_cpu_device::watchdog_freq_w(uint8_t data) { - LOGMASKED(LOG_GENERAL, "watchdog_freq_w %x: Watchdog timer frequency = %x\n", data, m_watchdog_freq); + LOG("watchdog_freq_w %x: Watchdog timer frequency = %x\n", data, m_watchdog_freq); m_watchdog_freq = data; } uint8_t m37710_cpu_device::waveform_mode_r() { - LOGMASKED(LOG_GENERAL, "waveform_mode_r: Waveform output mode (PC=%x)\n", REG_PG | REG_PC); + LOG("waveform_mode_r: Waveform output mode (PC=%x)\n", REG_PG | REG_PC); return 0; } void m37710_cpu_device::waveform_mode_w(uint8_t data) { - LOGMASKED(LOG_GENERAL, "waveform_mode_w %x: Waveform output mode\n", data); + LOG("waveform_mode_w %x: Waveform output mode\n", data); } uint8_t m37710_cpu_device::rto_control_r() { - LOGMASKED(LOG_GENERAL, "rto_control_r: Real-time output control = %x (PC=%x)\n", m_rto_control, REG_PG | REG_PC); + LOG("rto_control_r: Real-time output control = %x (PC=%x)\n", m_rto_control, REG_PG | REG_PC); return m_rto_control; } void m37710_cpu_device::rto_control_w(uint8_t data) { - LOGMASKED(LOG_GENERAL, "rto_control_w %x: Real-time output control = %x\n", data, m_rto_control); + LOG("rto_control_w %x: Real-time output control = %x\n", data, m_rto_control); m_rto_control = data; } uint8_t m37710_cpu_device::dram_control_r() { - LOGMASKED(LOG_GENERAL, "dram_control_r: DRAM control = %x (PC=%x)\n", m_dram_control, REG_PG | REG_PC); + LOG("dram_control_r: DRAM control = %x (PC=%x)\n", m_dram_control, REG_PG | REG_PC); return m_dram_control; } void m37710_cpu_device::dram_control_w(uint8_t data) { - LOGMASKED(LOG_GENERAL, "dram_control_w %x: DRAM control = %x\n", data, m_dram_control); + LOG("dram_control_w %x: DRAM control = %x\n", data, m_dram_control); m_dram_control = data; } void m37710_cpu_device::refresh_timer_w(uint8_t data) { - LOGMASKED(LOG_GENERAL, "refresh_timer_w %x: Set refresh timer\n", data); + LOG("refresh_timer_w %x: Set refresh timer\n", data); } uint16_t m37710_cpu_device::dmac_control_r(offs_t offset, uint16_t mem_mask) @@ -956,7 +955,7 @@ uint16_t m37710_cpu_device::dmac_control_r(offs_t offset, uint16_t mem_mask) void m37710_cpu_device::dmac_control_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - LOGMASKED(LOG_GENERAL, "dmac_control_w %04x & %04x: DMAC control = %04x\n", data, mem_mask, m_dmac_control); + LOG("dmac_control_w %04x & %04x: DMAC control = %04x\n", data, mem_mask, m_dmac_control); m_dmac_control = (data & mem_mask) | (m_timer_reg[offset] & ~mem_mask); } diff --git a/src/devices/cpu/m6800/m6801.cpp b/src/devices/cpu/m6800/m6801.cpp index 6e0424d7507..4eeed000c92 100644 --- a/src/devices/cpu/m6800/m6801.cpp +++ b/src/devices/cpu/m6800/m6801.cpp @@ -5,7 +5,6 @@ #include "m6801.h" #include "6800dasm.h" -#define LOG_GENERAL (1U << 0) #define LOG_TX (1U << 1) #define LOG_TXTICK (1U << 2) #define LOG_RX (1U << 3) diff --git a/src/devices/cpu/m6805/m68705.cpp b/src/devices/cpu/m6805/m68705.cpp index bf177329863..7d8e155661d 100644 --- a/src/devices/cpu/m6805/m68705.cpp +++ b/src/devices/cpu/m6805/m68705.cpp @@ -20,11 +20,10 @@ * Configurable logging ****************************************************************************/ -#define LOG_GENERAL (1U << 0) -#define LOG_INT (1U << 1) -#define LOG_IOPORT (1U << 2) -#define LOG_TIMER (1U << 3) -#define LOG_EPROM (1U << 4) +#define LOG_INT (1U << 1) +#define LOG_IOPORT (1U << 2) +#define LOG_TIMER (1U << 3) +#define LOG_EPROM (1U << 4) //#define VERBOSE (LOG_GENERAL | LOG_IOPORT | LOG_TIMER | LOG_EPROM) //#define LOG_OUTPUT_FUNC printf diff --git a/src/devices/cpu/m6805/m68hc05.cpp b/src/devices/cpu/m6805/m68hc05.cpp index 53cecc7116e..45a22c002af 100644 --- a/src/devices/cpu/m6805/m68hc05.cpp +++ b/src/devices/cpu/m6805/m68hc05.cpp @@ -28,11 +28,10 @@ determines both the COP watchdog timeout and the real-time interrupt rate * Configurable logging ****************************************************************************/ -#define LOG_GENERAL (1U << 0) -#define LOG_INT (1U << 1) -#define LOG_IOPORT (1U << 2) -#define LOG_TIMER (1U << 3) -#define LOG_COP (1U << 4) +#define LOG_INT (1U << 1) +#define LOG_IOPORT (1U << 2) +#define LOG_TIMER (1U << 3) +#define LOG_COP (1U << 4) //#define VERBOSE (LOG_GENERAL | LOG_INT | LOG_IOPORT | LOG_TIMER | LOG_COP) //#define LOG_OUTPUT_FUNC printf diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp index 8bf50525cb6..cebeeb81708 100644 --- a/src/devices/cpu/m6809/m6809.cpp +++ b/src/devices/cpu/m6809/m6809.cpp @@ -117,7 +117,9 @@ March 2013 NPW: // PARAMETERS //************************************************************************** -#define LOG_INTERRUPTS 0 +#define LOG_INTERRUPTS (1U << 1) +#define VERBOSE (0) +#include "logmacro.h" // turn off 'unreferenced label' errors #if defined(__GNUC__) @@ -454,8 +456,7 @@ uint32_t m6809_base_device::execute_input_lines() const noexcept void m6809_base_device::execute_set_input(int inputnum, int state) { - if (LOG_INTERRUPTS) - logerror("%s: inputnum=%s state=%d totalcycles=%d\n", machine().describe_context(), inputnum_string(inputnum), state, (int) attotime_to_clocks(machine().time())); + LOGMASKED(LOG_INTERRUPTS, "%s: inputnum=%s state=%d totalcycles=%d\n", machine().describe_context(), inputnum_string(inputnum), state, attotime_to_clocks(machine().time())); switch(inputnum) { diff --git a/src/devices/cpu/m88000/m88000.cpp b/src/devices/cpu/m88000/m88000.cpp index 9f2f2c65aae..ef088f49a80 100644 --- a/src/devices/cpu/m88000/m88000.cpp +++ b/src/devices/cpu/m88000/m88000.cpp @@ -14,7 +14,6 @@ #include "m88000.h" #include "m88000d.h" -#define LOG_GENERAL (1U << 0) #define LOG_EXCEPTION (1U << 1) //#define VERBOSE (LOG_GENERAL|LOG_EXCEPTION) diff --git a/src/devices/cpu/mips/mips1.cpp b/src/devices/cpu/mips/mips1.cpp index c8c31e6c05f..9f22e5665c7 100644 --- a/src/devices/cpu/mips/mips1.cpp +++ b/src/devices/cpu/mips/mips1.cpp @@ -16,7 +16,6 @@ #include "mips1dsm.h" #include "softfloat3/source/include/softfloat.h" -#define LOG_GENERAL (1U << 0) #define LOG_TLB (1U << 1) #define LOG_IOP (1U << 2) #define LOG_RISCOS (1U << 3) diff --git a/src/devices/cpu/mips/r4000.cpp b/src/devices/cpu/mips/r4000.cpp index 3592b722e5a..1970ba43cf3 100644 --- a/src/devices/cpu/mips/r4000.cpp +++ b/src/devices/cpu/mips/r4000.cpp @@ -35,7 +35,6 @@ #include "softfloat3/source/include/softfloat.h" -#define LOG_GENERAL (1U << 0) #define LOG_TLB (1U << 1) #define LOG_CACHE (1U << 2) #define LOG_EXCEPTION (1U << 3) @@ -43,6 +42,7 @@ #define LOG_STATS (1U << 5) #define VERBOSE (LOG_GENERAL) +#include "logmacro.h" // operating system specific system call logging #define SYSCALL_IRIX53 (1U << 0) @@ -58,8 +58,6 @@ #define SCACHE !(m_cp0[CP0_Config] & CONFIG_SC) -#include "logmacro.h" - #define USE_ABI_REG_NAMES 1 // cpu instruction fields diff --git a/src/devices/cpu/pdp1/pdp1.cpp b/src/devices/cpu/pdp1/pdp1.cpp index 77c97ebcddc..5fda5e79699 100644 --- a/src/devices/cpu/pdp1/pdp1.cpp +++ b/src/devices/cpu/pdp1/pdp1.cpp @@ -343,9 +343,10 @@ #include "pdp1.h" #include "pdp1dasm.h" -#define LOG 0 -#define LOG_EXTRA 0 -#define LOG_IOT_EXTRA 0 +#define LOG_EXTRA (1U << 1) +#define LOG_IOT_EXTRA (1U << 2) +#define VERBOSE (0) +#include "logmacro.h" #define READ_PDP_18BIT(A) ((signed)m_program->read_dword(A)) #define WRITE_PDP_18BIT(A,V) (m_program->write_dword((A),(V))) @@ -818,8 +819,7 @@ void pdp1_device::execute_run() else { /* what the heck? */ - if (LOG) - logerror("It seems this tape should not be operated in read-in mode\n"); + LOG("It seems this tape should not be operated in read-in mode\n"); m_rim = 0; /* exit read-in mode (right???) */ m_rim_step = 0; @@ -1474,8 +1474,7 @@ void pdp1_device::execute_instruction() } break; default: - if (LOG) - logerror("Undefined shift: 0%06o at 0%06o\n", MB, PREVIOUS_PC); + LOG("Undefined shift: 0%06o at 0%06o\n", MB, PREVIOUS_PC); break; } break; @@ -1584,16 +1583,14 @@ void pdp1_device::execute_instruction() AC ^= 0777777; if (MB & 00400) /* Halt */ { - if (LOG_EXTRA) - logerror("PDP1 Program executed HALT: at 0%06o\n", PREVIOUS_PC); + LOGMASKED(LOG_EXTRA, "PDP1 Program executed HALT: at 0%06o\n", PREVIOUS_PC); m_run = 0; } break; } default: - if (LOG) - logerror("Illegal instruction: 0%06o at 0%06o\n", MB, PREVIOUS_PC); + LOG("Illegal instruction: 0%06o at 0%06o\n", MB, PREVIOUS_PC); /* let us stop the CPU, like a real pdp-1 */ m_run = 0; @@ -1613,16 +1610,10 @@ void pdp1_device::null_iot(int op2, int nac, int mb, int &io, int ac) { /* Note that the dummy IOT 0 is used to wait for the completion pulse generated by the a pending IOT (IOT with completion pulse but no IO wait) */ - if (LOG_IOT_EXTRA) - { - if (op2 == 000) - logerror("IOT sync instruction: mb=0%06o, pc=0%06o\n", (unsigned) mb, (unsigned) m_pc); - } - if (LOG) - { - if (op2 != 000) - logerror("Not supported IOT command (no external IOT function given) 0%06o at 0%06o\n", mb, m_pc); - } + if (op2 == 000) + LOGMASKED(LOG_IOT_EXTRA, "IOT sync instruction: mb=0%06o, pc=0%06o\n", (unsigned) mb, (unsigned) m_pc); + if (op2 != 000) + LOG("Not supported IOT command (no external IOT function given) 0%06o at 0%06o\n", mb, m_pc); } @@ -1635,14 +1626,10 @@ void pdp1_device::lem_eem_iot(int op2, int nac, int mb, int &io, int ac) { if (! m_extend_support) /* extend mode supported? */ { - if (LOG) - logerror("Ignoring internal error in file " __FILE__ " line %d.\n", __LINE__); + LOG("Ignoring internal error in file " __FILE__ " line %d.\n", __LINE__); return; } - if (LOG_EXTRA) - { - logerror("EEM/LEM instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); - } + LOGMASKED(LOG_EXTRA, "EEM/LEM instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); EXD = (mb & 0004000) ? 1 : 0; } @@ -1659,31 +1646,23 @@ void pdp1_device::sbs_iot(int op2, int nac, int mb, int &io, int ac) switch (op2) { case 054: /* LSM */ - if (LOG_EXTRA) - logerror("LSM instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); - + LOGMASKED(LOG_EXTRA, "LSM instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); m_sbm = 0; field_interrupt(); break; case 055: /* ESM */ - if (LOG_EXTRA) - logerror("ESM instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); - + LOGMASKED(LOG_EXTRA, "ESM instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); m_sbm = 1; field_interrupt(); break; case 056: /* CBS */ - if (LOG_EXTRA) - logerror("CBS instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); - + LOGMASKED(LOG_EXTRA, "CBS instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); /*m_b3 = 0;*/ m_b4 = 0; field_interrupt(); break; default: - if (LOG) - logerror("Ignoring internal error in file " __FILE__ " line %d.\n", __LINE__); - + LOG("Ignoring internal error in file " __FILE__ " line %d.\n", __LINE__); break; } } @@ -1702,8 +1681,7 @@ void pdp1_device::type_20_sbs_iot(int op2, int nac, int mb, int &io, int ac) int channel, mask; if (! m_type_20_sbs) /* type 20 sequence break system supported? */ { - if (LOG) - logerror("Ignoring internal error in file " __FILE__ " line %d.\n", __LINE__); + LOG("Ignoring internal error in file " __FILE__ " line %d.\n", __LINE__); return; } channel = (mb >> 6) & 017; @@ -1711,37 +1689,27 @@ void pdp1_device::type_20_sbs_iot(int op2, int nac, int mb, int &io, int ac) switch (op2) { case 050: /* DSC */ - if (LOG_EXTRA) - logerror("DSC instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); - + LOGMASKED(LOG_EXTRA, "DSC instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); m_b1 &= ~mask; field_interrupt(); break; case 051: /* ASC */ - if (LOG_EXTRA) - logerror("ASC instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); - + LOGMASKED(LOG_EXTRA, "ASC instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); m_b1 |= mask; field_interrupt(); break; case 052: /* ISB */ - if (LOG_EXTRA) - logerror("ISB instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); - + LOGMASKED(LOG_EXTRA, "ISB instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); m_b2 |= mask; field_interrupt(); break; case 053: /* CAC */ - if (LOG_EXTRA) - logerror("CAC instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); - + LOGMASKED(LOG_EXTRA, "CAC instruction: mb=0%06o, pc=0%06o\n", mb, m_pc); m_b1 = 0; field_interrupt(); break; default: - if (LOG) - logerror("Ignoring internal error in file " __FILE__ " line %d.\n", __LINE__); - + LOG("Ignoring internal error in file " __FILE__ " line %d.\n", __LINE__); break; } diff --git a/src/devices/cpu/psx/dma.cpp b/src/devices/cpu/psx/dma.cpp index 8db8a295e6d..957810ff840 100644 --- a/src/devices/cpu/psx/dma.cpp +++ b/src/devices/cpu/psx/dma.cpp @@ -10,8 +10,7 @@ #include "emu.h" #include "dma.h" -//#define LOG_GENERAL (1U << 0) -#define LOG_CONTROL (1U << 1) +#define LOG_CONTROL (1U << 1) #define LOG_INTERRUPT (1U << 2) #define VERBOSE (0) diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp index ee5af25b6a7..b5f8644f705 100644 --- a/src/devices/cpu/psx/sio.cpp +++ b/src/devices/cpu/psx/sio.cpp @@ -10,7 +10,6 @@ #include "emu.h" #include "sio.h" -//#define LOG_GENERAL (1U << 0) #define LOG_TIMER (1U << 1) #define VERBOSE ( 0 ) diff --git a/src/devices/cpu/romp/romp.cpp b/src/devices/cpu/romp/romp.cpp index 5e193442033..0f65659ae60 100644 --- a/src/devices/cpu/romp/romp.cpp +++ b/src/devices/cpu/romp/romp.cpp @@ -18,7 +18,6 @@ #include "romp.h" #include "rompdasm.h" -#define LOG_GENERAL (1U << 0) #define LOG_INTERRUPT (1U << 1) //#define VERBOSE (LOG_INTERRUPT) diff --git a/src/devices/cpu/st62xx/st62xx.cpp b/src/devices/cpu/st62xx/st62xx.cpp index 81e25d72d01..c66bd58307f 100644 --- a/src/devices/cpu/st62xx/st62xx.cpp +++ b/src/devices/cpu/st62xx/st62xx.cpp @@ -16,9 +16,9 @@ #include "st62xx.h" #include "st62xx_dasm.h" -#define LOG_UNIMPL (1 << 1) -#define LOG_GPIO (1 << 2) -#define LOG_TIMER (1 << 3) +#define LOG_UNIMPL (1U << 1) +#define LOG_GPIO (1U << 2) +#define LOG_TIMER (1U << 3) #define LOG_ALL (LOG_UNIMPL | LOG_GPIO | LOG_TIMER) #define VERBOSE (LOG_ALL) diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp index 8602cdbb5db..6a79f2c22c4 100644 --- a/src/devices/cpu/tms34010/tms34010.cpp +++ b/src/devices/cpu/tms34010/tms34010.cpp @@ -18,7 +18,6 @@ #include "screen.h" -#define LOG_GENERAL (1U << 0) #define LOG_CONTROL_REGS (1U << 1) #define LOG_GRAPHICS_OPS (1U << 2) diff --git a/src/devices/cpu/tms9900/tms9900.cpp b/src/devices/cpu/tms9900/tms9900.cpp index 6f9ef5f7926..52380c629c1 100644 --- a/src/devices/cpu/tms9900/tms9900.cpp +++ b/src/devices/cpu/tms9900/tms9900.cpp @@ -124,29 +124,29 @@ enum The following defines can be set to 0 or 1 to disable or enable certain output in the log. */ -#define LOG_OP (1U<<1) // Current instruction -#define LOG_EXEC (1U<<2) // Address of current instruction -#define LOG_CYCLES (1U<<4) // Cycles -#define LOG_WARN (1U<<5) // Illegal operation or other condition -#define LOG_MEM (1U<<6) // Memory access -#define LOG_CONTEXT (1U<<7) // Context switch -#define LOG_INT (1U<<8) // Interrupts -#define LOG_READY (1U<<9) // READY line input -#define LOG_CLOCK (1U<<10) // Clock pulses -#define LOG_ADDRESSBUS (1U<<11) // Address bus operation -#define LOG_STATUS (1U<<12) // Status register -#define LOG_CRU (1U<<13) // CRU operations -#define LOG_WAIT (1U<<15) // Wait states -#define LOG_HOLD (1U<<16) // Hold states -#define LOG_IDLE (1U<<17) // Idle states -#define LOG_EMU (1U<<18) // Emulation details -#define LOG_MICRO (1U<<19) // Microinstruction processing -#define LOG_INTD (1U<<20) // Interrupts (detailed phases) -#define LOG_LOAD (1U<<21) // LOAD interrupt -#define LOG_DETAIL (1U<<31) // Increased detail +#define LOG_OP (1U << 1) // Current instruction +#define LOG_EXEC (1U << 2) // Address of current instruction +#define LOG_CYCLES (1U << 4) // Cycles +#define LOG_WARN (1U << 5) // Illegal operation or other condition +#define LOG_MEM (1U << 6) // Memory access +#define LOG_CONTEXT (1U << 7) // Context switch +#define LOG_INT (1U << 8) // Interrupts +#define LOG_READY (1U << 9) // READY line input +#define LOG_CLOCK (1U << 10) // Clock pulses +#define LOG_ADDRESSBUS (1U << 11) // Address bus operation +#define LOG_STATUS (1U << 12) // Status register +#define LOG_CRU (1U << 13) // CRU operations +#define LOG_WAIT (1U << 15) // Wait states +#define LOG_HOLD (1U << 16) // Hold states +#define LOG_IDLE (1U << 17) // Idle states +#define LOG_EMU (1U << 18) // Emulation details +#define LOG_MICRO (1U << 19) // Microinstruction processing +#define LOG_INTD (1U << 20) // Interrupts (detailed phases) +#define LOG_LOAD (1U << 21) // LOAD interrupt +#define LOG_DETAIL (1U << 31) // Increased detail // Minimum log should be warnings -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/cpu/tms9900/tms9980a.cpp b/src/devices/cpu/tms9900/tms9980a.cpp index d30dda66ae2..41341d6586e 100644 --- a/src/devices/cpu/tms9900/tms9980a.cpp +++ b/src/devices/cpu/tms9900/tms9980a.cpp @@ -67,13 +67,13 @@ Logging (also see tms9900.cpp) */ -#define LOG_OP (1U<<1) // Current instruction -#define LOG_MEM (1U<<6) // Memory access -#define LOG_INT (1U<<8) // Interrupts -#define LOG_ADDRESSBUS (1U<<11) // Address bus operation +#define LOG_OP (1U << 1) // Current instruction +#define LOG_MEM (1U << 2) // Memory access +#define LOG_INT (1U << 3) // Interrupts +#define LOG_ADDRESSBUS (1U << 4) // Address bus operation // Minimum log should be warnings -#define VERBOSE ( LOG_GENERAL ) +#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/cpu/tms9900/tms9995.cpp b/src/devices/cpu/tms9900/tms9995.cpp index c1b07bcbc70..f31f84de927 100644 --- a/src/devices/cpu/tms9900/tms9995.cpp +++ b/src/devices/cpu/tms9900/tms9995.cpp @@ -124,30 +124,30 @@ enum Add the desired LOG aspect to the VERBOSE line ******************************************************************/ -#define LOG_OP (1U<<1) // Current instruction -#define LOG_EXEC (1U<<2) // Address of current instruction -#define LOG_CONFIG (1U<<3) // Configuration -#define LOG_CYCLES (1U<<4) // Cycles -#define LOG_WARN (1U<<5) // Illegal operation or other condition -#define LOG_MEM (1U<<6) // Memory access -#define LOG_CONTEXT (1U<<7) // Context switch -#define LOG_INT (1U<<8) // Interrupts -#define LOG_READY (1U<<9) // READY line input -#define LOG_CLOCK (1U<<10) // Clock pulses -#define LOG_ADDRESSBUS (1U<<11) // Address bus operation -#define LOG_STATUS (1U<<12) // Status register -#define LOG_CRU (1U<<13) // CRU operations -#define LOG_DEC (1U<<14) // Decrementer -#define LOG_WAIT (1U<<15) // Wait states -#define LOG_HOLD (1U<<16) // Hold states -#define LOG_IDLE (1U<<17) // Idle states -#define LOG_EMU (1U<<18) // Emulation details -#define LOG_MICRO (1U<<19) // Microinstruction processing -#define LOG_INTD (1U<<20) // Interrupts (detailed phases) -#define LOG_DETAIL (1U<<31) // Increased detail +#define LOG_OP (1U << 1) // Current instruction +#define LOG_EXEC (1U << 2) // Address of current instruction +#define LOG_CONFIG (1U << 3) // Configuration +#define LOG_CYCLES (1U << 4) // Cycles +#define LOG_WARN (1U << 5) // Illegal operation or other condition +#define LOG_MEM (1U << 6) // Memory access +#define LOG_CONTEXT (1U << 7) // Context switch +#define LOG_INT (1U << 8) // Interrupts +#define LOG_READY (1U << 9) // READY line input +#define LOG_CLOCK (1U << 10) // Clock pulses +#define LOG_ADDRESSBUS (1U << 11) // Address bus operation +#define LOG_STATUS (1U << 12) // Status register +#define LOG_CRU (1U << 13) // CRU operations +#define LOG_DEC (1U << 14) // Decrementer +#define LOG_WAIT (1U << 15) // Wait states +#define LOG_HOLD (1U << 16) // Hold states +#define LOG_IDLE (1U << 17) // Idle states +#define LOG_EMU (1U << 18) // Emulation details +#define LOG_MICRO (1U << 19) // Microinstruction processing +#define LOG_INTD (1U << 20) // Interrupts (detailed phases) +#define LOG_DETAIL (1U << 31) // Increased detail // Minimum log should be config and warnings -#define VERBOSE ( LOG_CONFIG | LOG_WARN ) +#define VERBOSE (LOG_CONFIG | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/imagedev/cassette.cpp b/src/devices/imagedev/cassette.cpp index 2aeec195312..d07743f5b59 100644 --- a/src/devices/imagedev/cassette.cpp +++ b/src/devices/imagedev/cassette.cpp @@ -17,10 +17,10 @@ #include "util/ioprocs.h" #include "util/ioprocsfilter.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_DETAIL (1U<<2) // Details +#define LOG_WARN (1U << 1) // Warnings +#define LOG_DETAIL (1U << 2) // Details -#define VERBOSE ( LOG_WARN ) +#define VERBOSE (LOG_WARN) #include "logmacro.h" diff --git a/src/devices/imagedev/mfmhd.cpp b/src/devices/imagedev/mfmhd.cpp index 70f34e09d9f..7c5c3ea8257 100644 --- a/src/devices/imagedev/mfmhd.cpp +++ b/src/devices/imagedev/mfmhd.cpp @@ -275,18 +275,18 @@ #include "util/ioprocs.h" #include "util/ioprocsfilter.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) // Configuration -#define LOG_STEPS (1U<<3) // Steps -#define LOG_STEPSDETAIL (1U<<4) // Steps, more detail -#define LOG_SIGNALS (1U<<5) // Signals -#define LOG_READ (1U<<6) // Read operations -#define LOG_WRITE (1U<<7) // Write operations -#define LOG_BITS (1U<<8) // Bit transfer -#define LOG_TIMING (1U<<9) // Timing - - -#define VERBOSE ( LOG_GENERAL | LOG_CONFIG | LOG_WARN ) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) // Configuration +#define LOG_STEPS (1U << 3) // Steps +#define LOG_STEPSDETAIL (1U << 4) // Steps, more detail +#define LOG_SIGNALS (1U << 5) // Signals +#define LOG_READ (1U << 6) // Read operations +#define LOG_WRITE (1U << 7) // Write operations +#define LOG_BITS (1U << 8) // Bit transfer +#define LOG_TIMING (1U << 9) // Timing + + +#define VERBOSE (LOG_GENERAL | LOG_CONFIG | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/machine/6522via.cpp b/src/devices/machine/6522via.cpp index c8a7afb1769..a7ef3be4077 100644 --- a/src/devices/machine/6522via.cpp +++ b/src/devices/machine/6522via.cpp @@ -18,10 +18,10 @@ PARAMETERS ***************************************************************************/ -#define LOG_SETUP (1U << 1) -#define LOG_SHIFT (1U << 2) -#define LOG_READ (1U << 3) -#define LOG_INT (1U << 4) +#define LOG_SETUP (1U << 1) +#define LOG_SHIFT (1U << 2) +#define LOG_READ (1U << 3) +#define LOG_INT (1U << 4) //#define VERBOSE (LOG_SHIFT|LOG_INT|LOG_SETUP) //#define LOG_OUTPUT_FUNC printf diff --git a/src/devices/machine/68153bim.cpp b/src/devices/machine/68153bim.cpp index 20d63ef959e..978960aa275 100644 --- a/src/devices/machine/68153bim.cpp +++ b/src/devices/machine/68153bim.cpp @@ -27,18 +27,16 @@ #include "68153bim.h" #include "cpu/m68000/m68000.h" -//#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) -#define LOG_INT (1U << 2) -#define LOG_READ (1U << 3) -#define LOG_IACK (1U << 4) +#define LOG_SETUP (1U << 1) +#define LOG_INT (1U << 2) +#define LOG_READ (1U << 3) +#define LOG_IACK (1U << 4) //#define VERBOSE ( LOG_SETUP | LOG_INT | LOG_IACK | LOG_GENERAL | LOG_READ) //#define LOG_OUTPUT_FUNC printf #include "logmacro.h" -//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGINT(...) LOGMASKED(LOG_INT, __VA_ARGS__) #define LOGR(...) LOGMASKED(LOG_READ, __VA_ARGS__) diff --git a/src/devices/machine/68340ser.cpp b/src/devices/machine/68340ser.cpp index e0fc3b29fde..1bda87d6e24 100644 --- a/src/devices/machine/68340ser.cpp +++ b/src/devices/machine/68340ser.cpp @@ -9,18 +9,16 @@ // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h -#define LOG_SETUP (1U << 1) -#define LOG_READ (1U << 2) -#define LOG_SERIAL (1U << 3) -#define LOG_INT (1U << 4) +#define LOG_SETUP (1U << 1) +#define LOG_READ (1U << 2) +#define LOG_SERIAL (1U << 3) +#define LOG_INT (1U << 4) //#define VERBOSE (LOG_SETUP|LOG_READ|LOG_SERIAL|LOG_INT) #define LOG_OUTPUT_FUNC printf // Needs always to be enabled as the default value 'logerror' is not available here #include "logmacro.h" -//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGR(...) LOGMASKED(LOG_READ, __VA_ARGS__) #define LOGSERIAL(...) LOGMASKED(LOG_SERIAL, __VA_ARGS__) diff --git a/src/devices/machine/68340sim.cpp b/src/devices/machine/68340sim.cpp index 373de8c9bb8..82b4f0d8ceb 100644 --- a/src/devices/machine/68340sim.cpp +++ b/src/devices/machine/68340sim.cpp @@ -9,23 +9,21 @@ // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h -#define LOG_SETUP (1U << 1) -#define LOG_READ (1U << 2) -#define LOG_PORTS (1U << 3) -#define LOG_SIM (1U << 4) -#define LOG_CLOCK (1U << 5) -#define LOG_DATA (1U << 6) -#define LOG_INT (1U << 7) -#define LOG_PIT (1U << 8) -#define LOG_CS (1U << 9) +#define LOG_SETUP (1U << 1) +#define LOG_READ (1U << 2) +#define LOG_PORTS (1U << 3) +#define LOG_SIM (1U << 4) +#define LOG_CLOCK (1U << 5) +#define LOG_DATA (1U << 6) +#define LOG_INT (1U << 7) +#define LOG_PIT (1U << 8) +#define LOG_CS (1U << 9) #define VERBOSE (LOG_PIT) #define LOG_OUTPUT_FUNC printf // Needs always to be enabled as the default value 'logerror' is not available here #include "logmacro.h" -//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGR(...) LOGMASKED(LOG_READ, __VA_ARGS__) #define LOGPORTS(...) LOGMASKED(LOG_PORTS, __VA_ARGS__) diff --git a/src/devices/machine/68340tmu.cpp b/src/devices/machine/68340tmu.cpp index 1b358e14f6c..9d4253ed595 100644 --- a/src/devices/machine/68340tmu.cpp +++ b/src/devices/machine/68340tmu.cpp @@ -14,18 +14,16 @@ // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h -#define LOG_SETUP (1U << 1) -#define LOG_READ (1U << 2) -#define LOG_TIMER (1U << 3) -#define LOG_INT (1U << 4) -#define LOG_COUNT (1U << 5) +#define LOG_SETUP (1U << 1) +#define LOG_READ (1U << 2) +#define LOG_TIMER (1U << 3) +#define LOG_INT (1U << 4) +#define LOG_COUNT (1U << 5) //#define VERBOSE (LOG_SETUP|LOG_INT|LOG_TIMER) #include "logmacro.h" -//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGR(...) LOGMASKED(LOG_READ, __VA_ARGS__) #define LOGTIMER(...) LOGMASKED(LOG_TIMER, __VA_ARGS__) diff --git a/src/devices/machine/6840ptm.cpp b/src/devices/machine/6840ptm.cpp index 4d2a146f0e9..df7c10c6445 100644 --- a/src/devices/machine/6840ptm.cpp +++ b/src/devices/machine/6840ptm.cpp @@ -38,12 +38,12 @@ #include "emu.h" #include "6840ptm.h" -#define LOG_COUNTERS (1 << 1) -#define LOG_STATUS (1 << 2) -#define LOG_CONTROL (1 << 3) -#define LOG_RESETS (1 << 4) -#define LOG_TIMEOUTS (1 << 5) -#define LOG_IRQS (1 << 6) +#define LOG_COUNTERS (1U << 1) +#define LOG_STATUS (1U << 2) +#define LOG_CONTROL (1U << 3) +#define LOG_RESETS (1U << 4) +#define LOG_TIMEOUTS (1U << 5) +#define LOG_IRQS (1U << 6) #define LOG_ALL (LOG_COUNTERS | LOG_STATUS | LOG_CONTROL | LOG_RESETS | LOG_TIMEOUTS | LOG_IRQS) #define VERBOSE (0) diff --git a/src/devices/machine/68561mpcc.cpp b/src/devices/machine/68561mpcc.cpp index 1a3280d7975..8ec174c0711 100644 --- a/src/devices/machine/68561mpcc.cpp +++ b/src/devices/machine/68561mpcc.cpp @@ -44,25 +44,23 @@ FEATURES //************************************************************************** // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) -#define LOG_INT (1U << 2) -#define LOG_READ (1U << 4) -#define LOG_CMD (1U << 5) -#define LOG_TX (1U << 6) -#define LOG_RCV (1U << 7) -#define LOG_CTS (1U << 8) -#define LOG_DCD (1U << 9) -#define LOG_SYNC (1U << 10) -#define LOG_CHAR (1U << 11) -#define LOG_RX (1U << 12) +#define LOG_SETUP (1U << 1) +#define LOG_INT (1U << 2) +#define LOG_READ (1U << 3) +#define LOG_CMD (1U << 4) +#define LOG_TX (1U << 5) +#define LOG_RCV (1U << 6) +#define LOG_CTS (1U << 7) +#define LOG_DCD (1U << 8) +#define LOG_SYNC (1U << 9) +#define LOG_CHAR (1U << 10) +#define LOG_RX (1U << 11) //#define VERBOSE ( LOG_SETUP | LOG_GENERAL | LOG_INT) //#define LOG_OUTPUT_FUNC printf #include "logmacro.h" -//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGR(...) LOGMASKED(LOG_READ, __VA_ARGS__) #define LOGINT(...) LOGMASKED(LOG_INT, __VA_ARGS__) diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp index e054990a651..ec111724d8a 100644 --- a/src/devices/machine/8042kbdc.cpp +++ b/src/devices/machine/8042kbdc.cpp @@ -22,8 +22,10 @@ #define PS2_MOUSE_ON 1 #define KEYBOARD_ON 1 -#define LOG_KEYBOARD 0 -#define LOG_ACCESSES 0 +#define LOG_KEYBOARD (1U << 1) +#define LOG_ACCESSES (1U << 2) +#define VERBOSE (0) +#include "logmacro.h" DEFINE_DEVICE_TYPE(KBDC8042, kbdc8042_device, "kbdc8042", "8042 Keyboard/Mouse Controller") @@ -122,8 +124,7 @@ WRITE_LINE_MEMBER( kbdc8042_device::keyboard_w ) void kbdc8042_device::at_8042_receive(uint8_t data, bool mouse) { - if (LOG_KEYBOARD) - logerror("at_8042_receive Received 0x%02x\n", data); + LOGMASKED(LOG_KEYBOARD, "at_8042_receive Received 0x%02x\n", data); m_data = data; if(!(m_speaker & 0x80) || mouse) @@ -213,8 +214,7 @@ void kbdc8042_device::at_8042_clear_keyboard_received() { if (m_keyboard.received) { - if (LOG_KEYBOARD) - logerror("kbdc8042_8_r(): Clearing m_keyboard.received\n"); + LOGMASKED(LOG_KEYBOARD, "kbdc8042_8_r(): Clearing m_keyboard.received\n"); } m_input_buffer_full_cb(0); @@ -335,8 +335,7 @@ uint8_t kbdc8042_device::data_r(offs_t offset) break; } - if (LOG_ACCESSES) - logerror("kbdc8042_8_r(): offset=%d data=0x%02x\n", offset, (unsigned) data); + LOGMASKED(LOG_ACCESSES, "kbdc8042_8_r(): offset=%d data=0x%02x\n", offset, (unsigned) data); return data; } diff --git a/src/devices/machine/8530scc.cpp b/src/devices/machine/8530scc.cpp index 7438ccce738..a84bb842e5d 100644 --- a/src/devices/machine/8530scc.cpp +++ b/src/devices/machine/8530scc.cpp @@ -19,7 +19,8 @@ DEFINE_DEVICE_TYPE(SCC8530, scc8530_legacy_device, "scc8530l", "Zilog 8530 SCC ( PARAMETERS ***************************************************************************/ -#define LOG_SCC (0) +#define VERBOSE (0) +#include "logmacro.h" /*************************************************************************** IMPLEMENTATION @@ -79,9 +80,7 @@ void scc8530_legacy_device::updateirqs() lastIRQStat = irqstat; // tell the driver the new IRQ line status if possible -#if LOG_SCC - printf("SCC8530 IRQ status => %d\n", irqstat); -#endif + LOG("SCC8530 IRQ status => %d\n", irqstat); if(!intrq_cb.isnull()) intrq_cb(irqstat); } @@ -225,9 +224,7 @@ void scc8530_legacy_device::acknowledge() uint8_t scc8530_legacy_device::getareg() { - #if LOG_SCC - printf("SCC: port A reg %d read 0x%02x\n", reg, channel[0].reg_val[reg]); - #endif + LOG("SCC: port A reg %d read 0x%02x\n", reg, channel[0].reg_val[reg]); if (reg == 0) { @@ -256,9 +253,7 @@ uint8_t scc8530_legacy_device::getareg() uint8_t scc8530_legacy_device::getbreg() { - #if LOG_SCC - printf("SCC: port B reg %i read 0x%02x\n", reg, channel[1].reg_val[reg]); - #endif + LOG("SCC: port B reg %i read 0x%02x\n", reg, channel[1].reg_val[reg]); if (reg == 0) { @@ -298,9 +293,7 @@ void scc8530_legacy_device::putreg(int ch, uint8_t data) Chan *pChan = &channel[ch]; channel[ch].reg_val[reg] = data; - #if LOG_SCC - printf("SCC: port %c reg %d write 0x%02x\n", 'A'+ch, reg, data); - #endif + LOG("SCC: port %c reg %d write 0x%02x\n", 'A'+ch, reg, data); switch (reg) { diff --git a/src/devices/machine/acorn_bmu.cpp b/src/devices/machine/acorn_bmu.cpp index ce3aacf8d2f..77cb3ad313b 100644 --- a/src/devices/machine/acorn_bmu.cpp +++ b/src/devices/machine/acorn_bmu.cpp @@ -16,8 +16,8 @@ #include "emu.h" #include "acorn_bmu.h" -#define LOG_DATA (1 << 1) -#define LOG_LINE (1 << 2) +#define LOG_DATA (1U << 1) +#define LOG_LINE (1U << 2) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/devices/machine/aic6250.cpp b/src/devices/machine/aic6250.cpp index fb885c3b5e3..a39c067ea3c 100644 --- a/src/devices/machine/aic6250.cpp +++ b/src/devices/machine/aic6250.cpp @@ -29,7 +29,6 @@ #include "emu.h" #include "aic6250.h" -#define LOG_GENERAL (1U << 0) #define LOG_REG (1U << 1) #define LOG_STATE (1U << 2) #define LOG_CONFIG (1U << 3) diff --git a/src/devices/machine/am2910.cpp b/src/devices/machine/am2910.cpp index 158b4b83bb7..5ea3541938b 100644 --- a/src/devices/machine/am2910.cpp +++ b/src/devices/machine/am2910.cpp @@ -14,9 +14,9 @@ #include "emu.h" #include "am2910.h" -#define LOG_INSN (1 << 0) -#define LOG_STACK (1 << 1) -#define LOG_ERROR (1 << 2) +#define LOG_INSN (1U << 1) +#define LOG_STACK (1U << 2) +#define LOG_ERROR (1U << 3) #define LOG_ALL (LOG_INSN | LOG_STACK | LOG_ERROR) #define VERBOSE (0) diff --git a/src/devices/machine/am79c90.cpp b/src/devices/machine/am79c90.cpp index f47457680ec..dfe5573c98f 100644 --- a/src/devices/machine/am79c90.cpp +++ b/src/devices/machine/am79c90.cpp @@ -44,7 +44,6 @@ #include "emu.h" #include "am79c90.h" -#define LOG_GENERAL (1U << 0) #define LOG_REG (1U << 1) #define LOG_INIT (1U << 2) #define LOG_RXTX (1U << 3) diff --git a/src/devices/machine/am9513.cpp b/src/devices/machine/am9513.cpp index 1c8c3692369..de3a9fd8ff3 100644 --- a/src/devices/machine/am9513.cpp +++ b/src/devices/machine/am9513.cpp @@ -29,10 +29,9 @@ #include "emu.h" #include "machine/am9513.h" -#define LOG_GENERAL (1U << 0) -#define LOG_MODE (1U << 1) +#define LOG_MODE (1U << 1) #define LOG_INPUT (1U << 2) -#define LOG_TC (1U << 3) +#define LOG_TC (1U << 3) //#define VERBOSE (LOG_GENERAL | LOG_MODE) #include "logmacro.h" @@ -210,7 +209,7 @@ void am9513_device::init_freq_timer(int f) m_freq_timer[f]->adjust(freq / 2, f, freq / 2); m_freq_timer[f]->enable(m_freq_timer_selected[f] != 0); - LOGMASKED(LOG_GENERAL, "F%d = %f Hz (%s cycle emulation)\n", f + 1, double(clock()) / scale, + LOG("F%d = %f Hz (%s cycle emulation)\n", f + 1, double(clock()) / scale, m_freq_timer_selected[f] == 0 ? "no" : m_freq_timer_cycle[f] == 0 ? "partial" : "full"); } @@ -518,7 +517,7 @@ void am9513_device::arm_counter(int c) { if (!m_counter_armed[c]) { - LOGMASKED(LOG_GENERAL, "Counter %d: Arming counter\n", c + 1); + LOG("Counter %d: Arming counter\n", c + 1); m_counter_armed[c] = true; // Count starts upon first active gate edge after arming in Modes C, F, I, L, O, R, X @@ -536,7 +535,7 @@ void am9513_device::disarm_counter(int c) { if (m_counter_armed[c]) { - LOGMASKED(LOG_GENERAL, "Counter %d: Disarming counter\n", c + 1); + LOG("Counter %d: Disarming counter\n", c + 1); m_counter_armed[c] = false; m_counter_running[c] = false; } @@ -550,7 +549,7 @@ void am9513_device::disarm_counter(int c) void am9513_device::save_counter(int c) { m_counter_hold[c] = m_count[c]; - LOGMASKED(LOG_GENERAL, "Counter %d: Count %u saved\n", c + 1, m_count[c]); + LOG("Counter %d: Count %u saved\n", c + 1, m_count[c]); } @@ -869,7 +868,7 @@ void am9513_device::step_counter(int c, bool force_load) if (force_load) { m_count[c] = reload_from_hold(c) ? m_counter_hold[c] : m_counter_load[c]; - LOGMASKED(LOG_GENERAL, "Counter %d: %u loaded\n", c + 1, m_count[c]); + LOG("Counter %d: %u loaded\n", c + 1, m_count[c]); } } @@ -1112,7 +1111,7 @@ void am9513_device::internal_write(u16 data) case 0x07: // Alarm 1 register case 0x0f: // Alarm 2 register if (m_alarm[BIT(m_dpr, 3)] != data) - LOGMASKED(LOG_GENERAL, "Counter %d: Alarm = %u\n", BIT(m_dpr, 3) ? 2 : 1, data); + LOG("Counter %d: Alarm = %u\n", BIT(m_dpr, 3) ? 2 : 1, data); m_alarm[BIT(m_dpr, 3)] = data; break; case 0x01: // Counter 1 mode register @@ -1121,7 +1120,7 @@ void am9513_device::internal_write(u16 data) case 0x04: // Counter 4 mode register case 0x05: // Counter 5 mode register if (m_counter_mode[(m_dpr & 7) - 1] != data) - LOGMASKED(LOG_GENERAL, "Counter %d: Mode = %04X\n", m_dpr & 7, data); + LOG("Counter %d: Mode = %04X\n", m_dpr & 7, data); set_counter_mode((m_dpr & 7) - 1, data); break; case 0x09: // Counter 1 load register @@ -1130,7 +1129,7 @@ void am9513_device::internal_write(u16 data) case 0x0c: // Counter 4 load register case 0x0d: // Counter 5 load register if (m_counter_load[(m_dpr & 7) - 1] != data) - LOGMASKED(LOG_GENERAL, "Counter %d: Load = %u\n", m_dpr & 7, data); + LOG("Counter %d: Load = %u\n", m_dpr & 7, data); m_counter_load[(m_dpr & 7) - 1] = data; break; case 0x11: case 0x19: // Counter 1 hold register @@ -1139,7 +1138,7 @@ void am9513_device::internal_write(u16 data) case 0x14: case 0x1c: // Counter 4 hold register case 0x15: case 0x1d: // Counter 5 hold register if (m_counter_hold[(m_dpr & 7) - 1] != data) - LOGMASKED(LOG_GENERAL, "Counter %d: Hold = %u\n", m_dpr & 7, data); + LOG("Counter %d: Hold = %u\n", m_dpr & 7, data); m_counter_hold[(m_dpr & 7) - 1] = data; break; default: // Invalid register diff --git a/src/devices/machine/am9516.cpp b/src/devices/machine/am9516.cpp index f436e770f8b..c5b24a5f636 100644 --- a/src/devices/machine/am9516.cpp +++ b/src/devices/machine/am9516.cpp @@ -24,7 +24,6 @@ #include "emu.h" #include "am9516.h" -#define LOG_GENERAL (1U << 0) #define LOG_REGR (1U << 1) #define LOG_REGW (1U << 2) #define LOG_COMMAND (1U << 3) diff --git a/src/devices/machine/am9519.cpp b/src/devices/machine/am9519.cpp index f09dd4e71cc..6556616421b 100644 --- a/src/devices/machine/am9519.cpp +++ b/src/devices/machine/am9519.cpp @@ -6,8 +6,6 @@ #include "emu.h" #include "machine/am9519.h" -#define LOG_GENERAL (1U << 0) - //#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/machine/at.cpp b/src/devices/machine/at.cpp index 75b57c8777d..043403c934a 100644 --- a/src/devices/machine/at.cpp +++ b/src/devices/machine/at.cpp @@ -13,7 +13,9 @@ #include "softlist_dev.h" #include "speaker.h" -#define LOG_PORT80 0 +#define LOG_PORT80 (1U << 1) +#define VERBOSE (0) +#include "logmacro.h" DEFINE_DEVICE_TYPE(AT_MB, at_mb_device, "at_mb", "PC/AT Motherboard") @@ -232,10 +234,9 @@ void at_mb_device::page8_w(offs_t offset, uint8_t data) { m_at_pages[offset % 0x10] = data; - if (LOG_PORT80 && (offset == 0)) + if (offset == 0) { - logerror(" at_page8_w(): Port 80h <== 0x%02x (PC=0x%08x)\n", data, - (unsigned) m_maincpu->pc()); + LOGMASKED(LOG_PORT80, " at_page8_w(): Port 80h <== 0x%02x (PC=0x%08x)\n", data, m_maincpu->pc()); } switch(offset % 8) diff --git a/src/devices/machine/at29x.cpp b/src/devices/machine/at29x.cpp index bf0544ede0f..a4c04cc7229 100644 --- a/src/devices/machine/at29x.cpp +++ b/src/devices/machine/at29x.cpp @@ -40,15 +40,15 @@ #include "emu.h" #include "at29x.h" -#define LOG_DETAIL (1U<<1) // More detail -#define LOG_WARN (1U<<2) // Warning -#define LOG_PRG (1U<<3) // Programming -#define LOG_READ (1U<<4) // Reading -#define LOG_WRITE (1U<<5) // Writing -#define LOG_CONFIG (1U<<6) // Configuration -#define LOG_STATE (1U<<7) // State machine - -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define LOG_DETAIL (1U << 1) // More detail +#define LOG_WARN (1U << 2) // Warning +#define LOG_PRG (1U << 3) // Programming +#define LOG_READ (1U << 4) // Reading +#define LOG_WRITE (1U << 5) // Writing +#define LOG_CONFIG (1U << 6) // Configuration +#define LOG_STATE (1U << 7) // State machine + +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/machine/at45dbxx.cpp b/src/devices/machine/at45dbxx.cpp index 890cd78ac59..c69ce077e4e 100644 --- a/src/devices/machine/at45dbxx.cpp +++ b/src/devices/machine/at45dbxx.cpp @@ -15,8 +15,11 @@ #include "emu.h" #include "at45dbxx.h" -#define LOG_LEVEL 1 -#define _logerror(level,x) do { if (LOG_LEVEL > level) logerror x; } while (0) +#define LOG_LEVEL0 (1U << 1) +#define LOG_LEVEL1 (1U << 2) +#define LOG_LEVEL2 (1U << 3) +#define VERBOSE (LOG_LEVEL0) +#include "logmacro.h" #define FLASH_CMD_52 0x52 #define FLASH_CMD_57 0x57 @@ -112,7 +115,7 @@ void at45db041_device::device_start() void at45db041_device::device_reset() { - _logerror( 1, ("at45dbxx_reset\n")); + LOGMASKED(LOG_LEVEL1, "at45dbxx_reset\n"); // mode m_mode = FLASH_MODE_SI; m_status = 0; @@ -183,7 +186,7 @@ uint8_t at45db041_device::read_byte() if ((m_mode != FLASH_MODE_SO) || (!m_io.data)) return 0; // read byte data = m_io.data[m_io.pos++]; - _logerror( 2, ("at45dbxx_read_byte (%02X) (%03d/%03d)\n", data, m_io.pos, m_io.size)); + LOGMASKED(LOG_LEVEL2, "at45dbxx_read_byte (%02X) (%03d/%03d)\n", data, m_io.pos, m_io.size); if (m_io.pos == m_io.size) m_io.pos = 0; return data; } @@ -228,7 +231,7 @@ void at45db041_device::write_byte(uint8_t data) if (m_cmd.size < 8) { uint8_t opcode; - _logerror( 2, ("at45dbxx_write_byte (%02X)\n", data)); + LOGMASKED(LOG_LEVEL2, "at45dbxx_write_byte (%02X)\n", data); // add to command buffer m_cmd.data[m_cmd.size++] = data; // check opcode @@ -241,7 +244,7 @@ void at45db041_device::write_byte(uint8_t data) // 8 bits command if (m_cmd.size == 1) { - _logerror( 1, ("at45dbxx opcode %02X - status register read\n", opcode)); + LOGMASKED(LOG_LEVEL1, "at45dbxx opcode %02X - status register read\n", opcode); m_status = (m_status & 0xC7) | device_id(); // 80 = busy / 40 = compare fail flash_set_io(&m_status, 1, 0); m_mode = FLASH_MODE_SO; @@ -258,10 +261,10 @@ void at45db041_device::write_byte(uint8_t data) uint32_t page; uint8_t comp; page = flash_get_page_addr(); - _logerror( 1, ("at45dbxx opcode %02X - main memory page to buffer 1 compare [%04X]\n", opcode, page)); + LOGMASKED(LOG_LEVEL1, "at45dbxx opcode %02X - main memory page to buffer 1 compare [%04X]\n", opcode, page); comp = memcmp( &m_data[page * page_size()], &m_buffer1[0], page_size()) == 0 ? 0 : 1; if (comp) m_status |= 0x40; else m_status &= ~0x40; - _logerror( 1, ("at45dbxx page compare %s\n", comp ? "failure" : "success")); + LOGMASKED(LOG_LEVEL1, "at45dbxx page compare %s\n", comp ? "failure" : "success"); m_mode = FLASH_MODE_SI; m_cmd.size = 8; } @@ -276,7 +279,7 @@ void at45db041_device::write_byte(uint8_t data) uint32_t page, byte; page = flash_get_page_addr(); byte = flash_get_byte_addr(); - _logerror( 1, ("at45dbxx opcode %02X - main memory page read [%04X/%04X]\n", opcode, page, byte)); + LOGMASKED(LOG_LEVEL1, "at45dbxx opcode %02X - main memory page read [%04X/%04X]\n", opcode, page, byte); flash_set_io(&m_data[page * page_size()], page_size(), byte); m_mode = FLASH_MODE_SO; m_cmd.size = 8; @@ -292,7 +295,7 @@ void at45db041_device::write_byte(uint8_t data) uint32_t page, byte; page = flash_get_page_addr(); byte = flash_get_byte_addr(); - _logerror( 1, ("at45dbxx opcode %02X - main memory page program through buffer 1 [%04X/%04X]\n",opcode, page, byte)); + LOGMASKED(LOG_LEVEL1, "at45dbxx opcode %02X - main memory page program through buffer 1 [%04X/%04X]\n",opcode, page, byte); flash_set_io(&m_buffer1[0], page_size(), byte); memset(&m_buffer1[0], 0xff, m_buffer1.size()); m_mode = FLASH_MODE_SI; @@ -303,7 +306,7 @@ void at45db041_device::write_byte(uint8_t data) // other default : { - _logerror( 1, ("at45dbxx opcode %02X - unknown\n", opcode)); + LOGMASKED(LOG_LEVEL1, "at45dbxx opcode %02X - unknown\n", opcode); m_cmd.data[0] = 0; m_cmd.size = 0; } @@ -312,7 +315,7 @@ void at45db041_device::write_byte(uint8_t data) } else { - _logerror( 2, ("at45dbxx_write_byte (%02X) (%03d/%03d)\n", data, m_io.pos + 1, m_io.size)); + LOGMASKED(LOG_LEVEL2, "at45dbxx_write_byte (%02X) (%03d/%03d)\n", data, m_io.pos + 1, m_io.size); // store byte m_io.data[m_io.pos] = data; m_io.pos++; @@ -345,7 +348,7 @@ WRITE_LINE_MEMBER(at45db041_device::cs_w) uint32_t page, byte; page = flash_get_page_addr(); byte = flash_get_byte_addr(); - _logerror( 1, ("at45dbxx - program data stored in buffer 1 into selected page in main memory [%04X/%04X]\n", page, byte)); + LOGMASKED(LOG_LEVEL1, "at45dbxx - program data stored in buffer 1 into selected page in main memory [%04X/%04X]\n", page, byte); memcpy( &m_data[page * page_size()], &m_buffer1[0], page_size()); } // reset diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp index a166ff234cb..45bfd86059c 100644 --- a/src/devices/machine/at_keybc.cpp +++ b/src/devices/machine/at_keybc.cpp @@ -90,7 +90,6 @@ #include "emu.h" #include "at_keybc.h" -#define LOG_GENERAL (1U << 0) #define LOG_COMMAND (1U << 1) #define LOG_STATUS (1U << 2) diff --git a/src/devices/machine/bq4847.cpp b/src/devices/machine/bq4847.cpp index 91fca4b8edd..6b24519d5d7 100644 --- a/src/devices/machine/bq4847.cpp +++ b/src/devices/machine/bq4847.cpp @@ -21,13 +21,13 @@ #include "emu.h" #include "bq4847.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CLOCK (1U<<2) // Clock operation -#define LOG_REG (1U<<3) // Register write -#define LOG_WATCHDOG (1U<<4) // Watchdog -#define LOG_TRANSFER (1U<<5) // Transfer +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CLOCK (1U << 2) // Clock operation +#define LOG_REG (1U << 3) // Register write +#define LOG_WATCHDOG (1U << 4) // Watchdog +#define LOG_TRANSFER (1U << 5) // Transfer -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "logmacro.h" // device type definition diff --git a/src/devices/machine/bq48x2.cpp b/src/devices/machine/bq48x2.cpp index 849f019ce6c..fa98d8314ab 100644 --- a/src/devices/machine/bq48x2.cpp +++ b/src/devices/machine/bq48x2.cpp @@ -8,13 +8,13 @@ #include "emu.h" #include "bq48x2.h" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CLOCK (1U<<2) // Clock operation -#define LOG_REGW (1U<<3) // Register write -#define LOG_WATCHDOG (1U<<4) // Watchdog -#define LOG_SRAM (1U<<5) // SRAM +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CLOCK (1U << 2) // Clock operation +#define LOG_REGW (1U << 3) // Register write +#define LOG_WATCHDOG (1U << 4) // Watchdog +#define LOG_SRAM (1U << 5) // SRAM -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "logmacro.h" // device type definition diff --git a/src/devices/machine/busmouse.cpp b/src/devices/machine/busmouse.cpp index 2def623649b..95bf3c3e4dd 100644 --- a/src/devices/machine/busmouse.cpp +++ b/src/devices/machine/busmouse.cpp @@ -24,8 +24,6 @@ #include "machine/i8255.h" -#define LOG_GENERAL (1U << 0) - //#define VERBOSE (LOG_GENERAL) //#define LOG_OUTPUT_FUNC printf #include "logmacro.h" diff --git a/src/devices/machine/cammu.cpp b/src/devices/machine/cammu.cpp index bce48faae33..89c8e929180 100644 --- a/src/devices/machine/cammu.cpp +++ b/src/devices/machine/cammu.cpp @@ -33,7 +33,6 @@ #include -#define LOG_GENERAL (1U << 0) #define LOG_ACCESS (1U << 1) #define LOG_DTU (1U << 2) #define LOG_TLB (1U << 3) diff --git a/src/devices/machine/com8116.cpp b/src/devices/machine/com8116.cpp index 38364b4b101..2205ec46a73 100644 --- a/src/devices/machine/com8116.cpp +++ b/src/devices/machine/com8116.cpp @@ -9,8 +9,8 @@ #include "emu.h" #include "com8116.h" -#define LOG_SELECTED (1 << 0) -#define LOG_TABLE (1 << 1) +#define LOG_SELECTED (1U << 1) +#define LOG_TABLE (1U << 2) //#define VERBOSE (LOG_TABLE) #include "logmacro.h" diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp index 55cb0377cad..6805a7602b1 100644 --- a/src/devices/machine/cs4031.cpp +++ b/src/devices/machine/cs4031.cpp @@ -28,7 +28,6 @@ #include "emu.h" #include "machine/cs4031.h" -#define LOG_GENERAL (1U << 0) #define LOG_REGISTER (1U << 1) #define LOG_MEMORY (1U << 2) #define LOG_IO (1U << 3) diff --git a/src/devices/machine/cs8221.cpp b/src/devices/machine/cs8221.cpp index e57f181e383..96b3ea6928d 100644 --- a/src/devices/machine/cs8221.cpp +++ b/src/devices/machine/cs8221.cpp @@ -19,7 +19,6 @@ #include "machine/cs8221.h" #include "machine/ram.h" -#define LOG_GENERAL (1U << 0) #define LOG_REGISTER (1U << 1) #define LOG_MEMORY (1U << 2) diff --git a/src/devices/machine/cxd1185.cpp b/src/devices/machine/cxd1185.cpp index 9417def1ff8..293914fcfee 100644 --- a/src/devices/machine/cxd1185.cpp +++ b/src/devices/machine/cxd1185.cpp @@ -16,7 +16,6 @@ #include "emu.h" #include "cxd1185.h" -#define LOG_GENERAL (1U << 0) #define LOG_CMD (1U << 1) #define LOG_REG (1U << 2) #define LOG_STATE (1U << 3) @@ -902,7 +901,7 @@ void cxd1185_device::port_w(u8 data) { u8 const mask = ~(PCN | ((m_ioport & PCN) >> 4)); - LOGMASKED(LOG_GENERAL, "port_w 0x%02x mask 0x%02x\n", data, mask); + LOG("port_w 0x%02x mask 0x%02x\n", data, mask); m_ioport &= ~mask; m_ioport |= data & mask; diff --git a/src/devices/machine/dc7085.cpp b/src/devices/machine/dc7085.cpp index 264cef004c6..ee7d840390a 100644 --- a/src/devices/machine/dc7085.cpp +++ b/src/devices/machine/dc7085.cpp @@ -18,7 +18,6 @@ #include "emu.h" #include "dc7085.h" -#define LOG_GENERAL (1U << 0) #define LOG_REG (1U << 1) #define LOG_RX (1U << 2) #define LOG_TX (1U << 3) diff --git a/src/devices/machine/dimm_spd.cpp b/src/devices/machine/dimm_spd.cpp index 8bdc83092ba..510346ac042 100644 --- a/src/devices/machine/dimm_spd.cpp +++ b/src/devices/machine/dimm_spd.cpp @@ -14,7 +14,6 @@ #include "emu.h" #include "dimm_spd.h" -#define LOG_GENERAL (1U << 0) #define LOG_DATAOUT (1U << 1) #define VERBOSE (0) @@ -163,7 +162,7 @@ void dimm_spd_device::sda_write(int state) { if (m_sda) { - LOGMASKED(LOG_GENERAL, "%s: stop\n", tag()); + LOG("%s: stop\n", tag()); m_state = STATE_IDLE; m_last_address = 0; m_just_acked = false; @@ -171,7 +170,7 @@ void dimm_spd_device::sda_write(int state) } else { - LOGMASKED(LOG_GENERAL, "%s: start\n", tag()); + LOG("%s: start\n", tag()); m_state = STATE_GET_ADDRESS; m_bit = 0; m_latch = 0; @@ -221,13 +220,13 @@ void dimm_spd_device::scl_write(int state) { if (m_state == STATE_GET_ADDRESS) { - LOGMASKED(LOG_GENERAL, "%s: Got address %02x (ours is %02x r/w %d)\n", tag(), m_latch >> 1, m_address, m_latch & 1); + LOG("%s: Got address %02x (ours is %02x r/w %d)\n", tag(), m_latch >> 1, m_address, m_latch & 1); // check if reading if (m_latch & 1) { if ((m_latch >> 1) == m_address) { - LOGMASKED(LOG_GENERAL, "%s: address matches, ACKing\n", tag()); + LOG("%s: address matches, ACKing\n", tag()); write_sda(0); m_bit = 0; m_latch = 0; @@ -236,7 +235,7 @@ void dimm_spd_device::scl_write(int state) } else { - LOGMASKED(LOG_GENERAL, "%s: address doesn't match, ignoring\n", tag()); + LOG("%s: address doesn't match, ignoring\n", tag()); m_state = STATE_IDLE; write_sda(1); } diff --git a/src/devices/machine/dp83932c.cpp b/src/devices/machine/dp83932c.cpp index f956d8da8ea..cb9e4b5eed4 100644 --- a/src/devices/machine/dp83932c.cpp +++ b/src/devices/machine/dp83932c.cpp @@ -24,7 +24,6 @@ #include "dp83932c.h" #include "hashing.h" -#define LOG_GENERAL (1U << 0) #define LOG_COMMAND (1U << 1) #define LOG_FILTER (1U << 2) #define LOG_PACKETS (1U << 3) diff --git a/src/devices/machine/dp8573.cpp b/src/devices/machine/dp8573.cpp index 032be31038b..d74dc7c77c5 100644 --- a/src/devices/machine/dp8573.cpp +++ b/src/devices/machine/dp8573.cpp @@ -10,8 +10,7 @@ #include "machine/dp8573.h" #include "machine/timehelp.h" -#define LOG_GENERAL (1 << 0) -#define LOG_TICKS (1 << 1) +#define LOG_TICKS (1U << 1) #define LOG_ALL (LOG_GENERAL | LOG_TICKS) #define VERBOSE (0) @@ -217,7 +216,7 @@ void dp8573_device::clear_interrupt(uint8_t mask) void dp8573_device::write(offs_t offset, u8 data) { - LOGMASKED(LOG_GENERAL, "%s: DP8573 - Register Write: %02x = %02x\n", machine().describe_context(), offset, data); + LOG("%s: DP8573 - Register Write: %02x = %02x\n", machine().describe_context(), offset, data); switch (offset) { @@ -333,7 +332,7 @@ u8 dp8573_device::read(offs_t offset) } } - LOGMASKED(LOG_GENERAL, "%s: DP8573 - Register Read: %02x = %02x\n", machine().describe_context(), offset, ret); + LOG("%s: DP8573 - Register Read: %02x = %02x\n", machine().describe_context(), offset, ret); return ret; } diff --git a/src/devices/machine/edlc.cpp b/src/devices/machine/edlc.cpp index 956528aa8b7..e97b1d9f91a 100644 --- a/src/devices/machine/edlc.cpp +++ b/src/devices/machine/edlc.cpp @@ -25,7 +25,6 @@ #include "edlc.h" #include "hashing.h" -#define LOG_GENERAL (1U << 0) #define LOG_FRAMES (1U << 1) #define LOG_FILTER (1U << 2) diff --git a/src/devices/machine/fga002.cpp b/src/devices/machine/fga002.cpp index 14ed175fb9e..da8795ca5da 100644 --- a/src/devices/machine/fga002.cpp +++ b/src/devices/machine/fga002.cpp @@ -34,13 +34,12 @@ #include "emu.h" #include "fga002.h" -//#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) -#define LOG_READ (1U << 2) -#define LOG_INT (1U << 3) -#define LOG_VEC (1U << 4) -#define LOG_LVL (1U << 5) -#define LOG_IACK (1U << 6) +#define LOG_SETUP (1U << 1) +#define LOG_READ (1U << 2) +#define LOG_INT (1U << 3) +#define LOG_VEC (1U << 4) +#define LOG_LVL (1U << 5) +#define LOG_IACK (1U << 6) //#define VERBOSE (LOG_GENERAL | LOG_SETUP) //#define LOG_OUTPUT_FUNC printf diff --git a/src/devices/machine/gayle.cpp b/src/devices/machine/gayle.cpp index 64c76628fbc..f6409d7f3ec 100644 --- a/src/devices/machine/gayle.cpp +++ b/src/devices/machine/gayle.cpp @@ -25,7 +25,6 @@ #include "emu.h" #include "gayle.h" -//#define LOG_GENERAL (1U << 0) #define LOG_REG (1U << 1) #define LOG_IDE (1U << 2) #define LOG_CC (1U << 3) @@ -144,7 +143,7 @@ void gayle_device::line_change(int line, int state, int level) // special handling for line 6 (credit card detect) if (line == LINE_CC_DET && BIT(m_gayle_reg[REG_CHANGE], 1)) { - LOGMASKED(LOG_GENERAL, "resetting due to credit card detection change\n"); + LOG("resetting due to credit card detection change\n"); m_rst_w(0); m_rst_w(1); diff --git a/src/devices/machine/gen_latch.cpp b/src/devices/machine/gen_latch.cpp index 10caccd4c7c..04eebd35038 100644 --- a/src/devices/machine/gen_latch.cpp +++ b/src/devices/machine/gen_latch.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "gen_latch.h" -#define LOG_WARN (1U << 0) +#define LOG_WARN (1U << 1) #define VERBOSE (LOG_WARN) #include "logmacro.h" diff --git a/src/devices/machine/generic_spi_flash.cpp b/src/devices/machine/generic_spi_flash.cpp index 7c0f048eba7..356be2cb8e1 100644 --- a/src/devices/machine/generic_spi_flash.cpp +++ b/src/devices/machine/generic_spi_flash.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "generic_spi_flash.h" -#define LOG_SPI (1U << 1) +#define LOG_SPI (1U << 1) #define VERBOSE (0) diff --git a/src/devices/machine/gt64xxx.cpp b/src/devices/machine/gt64xxx.cpp index ea16a9b0573..ce7ddf2d40f 100644 --- a/src/devices/machine/gt64xxx.cpp +++ b/src/devices/machine/gt64xxx.cpp @@ -3,7 +3,6 @@ #include "emu.h" #include "gt64xxx.h" -#define LOG_GENERAL (1U << 0) #define LOG_GALILEO (1U << 1) #define LOG_TIMERS (1U << 2) #define LOG_DMA (1U << 3) diff --git a/src/devices/machine/hdc92x4.cpp b/src/devices/machine/hdc92x4.cpp index 1abdcf02abc..8c26b3a8663 100644 --- a/src/devices/machine/hdc92x4.cpp +++ b/src/devices/machine/hdc92x4.cpp @@ -73,46 +73,46 @@ #include "formats/imageutl.h" -#define LOG_DETAIL (1U<<1) // More detail -#define LOG_WARN (1U<<2) // Warning +#define LOG_DETAIL (1U << 1) // More detail +#define LOG_WARN (1U << 2) // Warning // Per-command debugging -#define LOG_COMMAND (1U<<3) -#define LOG_SELECT (1U<<4) -#define LOG_STEP (1U<<5) -#define LOG_RESTORE (1U<<6) -#define LOG_SUBSTATES (1U<<7) -#define LOG_READ (1U<<8) -#define LOG_WRITE (1U<<9) -#define LOG_READREG (1U<<10) -#define LOG_SETREG (1U<<11) -#define LOG_SETPTR (1U<<12) -#define LOG_FORMAT (1U<<13) -#define LOG_READTRACK (1U<<14) +#define LOG_COMMAND (1U << 3) +#define LOG_SELECT (1U << 4) +#define LOG_STEP (1U << 5) +#define LOG_RESTORE (1U << 6) +#define LOG_SUBSTATES (1U << 7) +#define LOG_READ (1U << 8) +#define LOG_WRITE (1U << 9) +#define LOG_READREG (1U << 10) +#define LOG_SETREG (1U << 11) +#define LOG_SETPTR (1U << 12) +#define LOG_FORMAT (1U << 13) +#define LOG_READTRACK (1U << 14) // Common states -#define LOG_READID (1U<<15) -#define LOG_VERIFY (1U<<16) -#define LOG_TRANSFER (1U<<17) +#define LOG_READID (1U << 15) +#define LOG_VERIFY (1U << 16) +#define LOG_TRANSFER (1U << 17) // Live states debugging -#define LOG_LIVE (1U<<18) -#define LOG_SHIFT (1U<<19) -#define LOG_SYNC (1U<<20) +#define LOG_LIVE (1U << 18) +#define LOG_SHIFT (1U << 19) +#define LOG_SYNC (1U << 20) // Misc debugging -#define LOG_DELAY (1U<<21) -#define LOG_INT (1U<<22) -#define LOG_LINES (1U<<23) -#define LOG_INDEX (1U<<24) -#define LOG_DMA (1U<<25) -#define LOG_DONE (1U<<26) -#define LOG_FAIL (1U<<27) -#define LOG_AUXBUS (1U<<28) -#define LOG_HEADER (1U<<29) -#define LOG_GAPS (1U<<30) - -#define VERBOSE ( LOG_GENERAL | LOG_WARN ) +#define LOG_DELAY (1U << 21) +#define LOG_INT (1U << 22) +#define LOG_LINES (1U << 23) +#define LOG_INDEX (1U << 24) +#define LOG_DMA (1U << 25) +#define LOG_DONE (1U << 26) +#define LOG_FAIL (1U << 27) +#define LOG_AUXBUS (1U << 28) +#define LOG_HEADER (1U << 29) +#define LOG_GAPS (1U << 30) + +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "logmacro.h" diff --git a/src/devices/machine/i7220.cpp b/src/devices/machine/i7220.cpp index b625172eba1..405305284cf 100644 --- a/src/devices/machine/i7220.cpp +++ b/src/devices/machine/i7220.cpp @@ -29,9 +29,8 @@ #include "i7220.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_REGISTER (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_REGISTER (1U << 1) +#define LOG_DEBUG (1U << 2) //#define VERBOSE (LOG_DEBUG) //#define LOG_OUTPUT_FUNC printf diff --git a/src/devices/machine/i8155.cpp b/src/devices/machine/i8155.cpp index fee07c4a919..c077b038c0e 100644 --- a/src/devices/machine/i8155.cpp +++ b/src/devices/machine/i8155.cpp @@ -38,8 +38,8 @@ DEFINE_DEVICE_TYPE(I8156, i8156_device, "i8156", "Intel 8156 RAM, I/O & Timer") // MACROS / CONSTANTS //************************************************************************** -#define LOG_PORT (1U << 0) -#define LOG_TIMER (1U << 1) +#define LOG_PORT (1U << 1) +#define LOG_TIMER (1U << 2) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/devices/machine/i82357.cpp b/src/devices/machine/i82357.cpp index 91de890a03d..a86ad363115 100644 --- a/src/devices/machine/i82357.cpp +++ b/src/devices/machine/i82357.cpp @@ -22,8 +22,6 @@ #include "emu.h" #include "i82357.h" -#define LOG_GENERAL (1U << 0) - //#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/machine/i8257.cpp b/src/devices/machine/i8257.cpp index 69fe9843eaf..c985d615571 100644 --- a/src/devices/machine/i8257.cpp +++ b/src/devices/machine/i8257.cpp @@ -9,7 +9,6 @@ #include "emu.h" #include "i8257.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already #define LOG_SETUP (1U << 1) #define LOG_TFR (1U << 2) diff --git a/src/devices/machine/i82586.cpp b/src/devices/machine/i82586.cpp index 0a97a5cf66f..a4022231e69 100644 --- a/src/devices/machine/i82586.cpp +++ b/src/devices/machine/i82586.cpp @@ -33,7 +33,6 @@ #include "i82586.h" #include "hashing.h" -#define LOG_GENERAL (1U << 0) #define LOG_FRAMES (1U << 1) #define LOG_FILTER (1U << 2) #define LOG_CONFIG (1U << 3) diff --git a/src/devices/machine/ibm21s850.cpp b/src/devices/machine/ibm21s850.cpp index c58622cace6..9aa66fbacc6 100644 --- a/src/devices/machine/ibm21s850.cpp +++ b/src/devices/machine/ibm21s850.cpp @@ -12,9 +12,9 @@ #include "emu.h" #include "ibm21s850.h" -#define LOG_READS (1 << 1) -#define LOG_WRITES (1 << 2) -#define LOG_UNKNOWNS (1 << 3) +#define LOG_READS (1U << 1) +#define LOG_WRITES (1U << 2) +#define LOG_UNKNOWNS (1U << 3) #define LOG_ALL (LOG_READS | LOG_WRITES | LOG_UNKNOWNS) #define VERBOSE (LOG_ALL) diff --git a/src/devices/machine/ie15.cpp b/src/devices/machine/ie15.cpp index 603c6034ca9..b9d337c8f42 100644 --- a/src/devices/machine/ie15.cpp +++ b/src/devices/machine/ie15.cpp @@ -19,7 +19,6 @@ #include "ie15.lh" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already #define LOG_RAM (1U << 1) #define LOG_CPU (1U << 2) #define LOG_KBD (1U << 3) diff --git a/src/devices/machine/ins8154.cpp b/src/devices/machine/ins8154.cpp index 0ce0dbd11d8..7183122a3d8 100644 --- a/src/devices/machine/ins8154.cpp +++ b/src/devices/machine/ins8154.cpp @@ -14,7 +14,7 @@ #include "emu.h" #include "ins8154.h" -#define LOG_BITS (1U << 1) +#define LOG_BITS (1U << 1) //#define VERBOSE (LOG_BITS) // (LOG_GENERAL|LOG_BITS) #include "logmacro.h" diff --git a/src/devices/machine/laserdsc.cpp b/src/devices/machine/laserdsc.cpp index 34964b27e3b..9c6cd3c48c5 100644 --- a/src/devices/machine/laserdsc.cpp +++ b/src/devices/machine/laserdsc.cpp @@ -24,7 +24,9 @@ // DEBUGGING //************************************************************************** -#define LOG_SLIDER 0 +#define LOG_SLIDER (1U << 1) +#define VERBOSE (0) +#include "logmacro.h" @@ -474,8 +476,7 @@ void laserdisc_device::set_slider_speed(int32_t tracks_per_vsync) m_attospertrack = -(vsyncperiod / -tracks_per_vsync).as_attoseconds(); } - if (LOG_SLIDER) - printf("Slider speed = %d\n", tracks_per_vsync); + LOGMASKED(LOG_SLIDER, "Slider speed = %d\n", tracks_per_vsync); } @@ -491,8 +492,7 @@ void laserdisc_device::advance_slider(int32_t numtracks) // then update the track position add_and_clamp_track(numtracks); - if (LOG_SLIDER) - printf("Advance by %d\n", numtracks); + LOGMASKED(LOG_SLIDER, "Advance by %d\n", numtracks); } diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp index a51d84b19ea..0b9cd4049a7 100644 --- a/src/devices/machine/ldpr8210.cpp +++ b/src/devices/machine/ldpr8210.cpp @@ -27,9 +27,12 @@ // DEBUGGING //************************************************************************** -#define LOG_VBLANK_VBI 0 -#define LOG_SERIAL 0 -#define LOG_SIMUTREK 0 +#define LOG_VBLANK_VBI (1U << 1) +#define LOG_SERIAL (1U << 2) +#define LOG_SIMUTREK (1U << 3) +#define LOG_UNKNOWNS (1U << 4) +#define VERBOSE (0) +#include "logmacro.h" @@ -226,8 +229,7 @@ void pioneer_pr8210_device::control_w(uint8_t data) { m_firstbittime = curtime; m_accumulator = 0x5555; - if (LOG_SERIAL) - logerror("Reset accumulator\n"); + LOGMASKED(LOG_SERIAL, "Reset accumulator\n"); } // 0 bit delta is 1.05 msec, 1 bit delta is 2.11 msec @@ -235,11 +237,7 @@ void pioneer_pr8210_device::control_w(uint8_t data) m_accumulator = (m_accumulator << 1) | longpulse; // log the deltas for debugging - if (LOG_SERIAL) - { - int usecdiff = (int)(delta.attoseconds() / ATTOSECONDS_IN_USEC(1)); - logerror("bitdelta = %5d (%d) - accum = %04X\n", usecdiff, longpulse, m_accumulator); - } + LOGMASKED(LOG_SERIAL, "bitdelta = %5d (%d) - accum = %04X\n", delta.as_ticks(1'000'000), longpulse, m_accumulator); // if we have a complete command, signal it // a complete command is 0,0,1 followed by 5 bits, followed by 0,0 @@ -260,8 +258,7 @@ void pioneer_pr8210_device::control_w(uint8_t data) m_lastcommand = m_pia.porta; // log the command and wait for a keypress - if (LOG_SERIAL) - logerror("--- Command = %02X\n", m_pia.porta >> 3); + LOGMASKED(LOG_SERIAL, "--- Command = %02X\n", m_pia.porta >> 3); // reset the first bit time so that the accumulator clears on the next write m_firstbittime = curtime - SERIAL_MAX_WORD_TIME; @@ -327,14 +324,11 @@ TIMER_CALLBACK_MEMBER(pioneer_pr8210_device::process_vbi_data) // logic relies on fetching it here // logging - if (LOG_VBLANK_VBI) - { - uint32_t line1718 = get_field_code(LASERDISC_CODE_LINE1718, false); - if ((line1718 & VBI_MASK_CAV_PICTURE) == VBI_CODE_CAV_PICTURE) - logerror("%3d:VBI(%05d)\n", screen().vpos(), VBI_CAV_PICTURE(line1718)); - else - logerror("%3d:VBI()\n", screen().vpos()); - } + uint32_t line1718 = get_field_code(LASERDISC_CODE_LINE1718, false); + if ((line1718 & VBI_MASK_CAV_PICTURE) == VBI_CODE_CAV_PICTURE) + LOGMASKED(LOG_VBLANK_VBI, "%3d:VBI(%05d)\n", screen().vpos(), VBI_CAV_PICTURE(line1718)); + else + LOGMASKED(LOG_VBLANK_VBI, "%3d:VBI()\n", screen().vpos()); // update PIA registers based on vbi code m_pia.vbi1 = 0xff; @@ -414,13 +408,10 @@ void pioneer_pr8210_device::device_add_mconfig(machine_config &config) void pioneer_pr8210_device::player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) { // logging - if (LOG_VBLANK_VBI) - { - if ((vbi.line1718 & VBI_MASK_CAV_PICTURE) == VBI_CODE_CAV_PICTURE) - logerror("%3d:VSYNC(%d,%05d)\n", screen().vpos(), fieldnum, VBI_CAV_PICTURE(vbi.line1718)); - else - logerror("%3d:VSYNC(%d)\n", screen().vpos(), fieldnum); - } + if ((vbi.line1718 & VBI_MASK_CAV_PICTURE) == VBI_CODE_CAV_PICTURE) + LOGMASKED(LOG_VBLANK_VBI, "%3d:VSYNC(%d,%05d)\n", screen().vpos(), fieldnum, VBI_CAV_PICTURE(vbi.line1718)); + else + LOGMASKED(LOG_VBLANK_VBI, "%3d:VSYNC(%d)\n", screen().vpos(), fieldnum); // signal VSYNC and set a timer to turn it off m_vsync = true; @@ -439,8 +430,7 @@ void pioneer_pr8210_device::player_vsync(const vbi_metadata &vbi, int fieldnum, int32_t pioneer_pr8210_device::player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) { // logging - if (LOG_VBLANK_VBI) - logerror("%3d:Update(%d)\n", screen().vpos(), fieldnum); + LOGMASKED(LOG_VBLANK_VBI, "%3d:Update(%d)\n", screen().vpos(), fieldnum); // if the spindle is on, we advance by 1 track after completing field #1 return spdl_on() ? fieldnum : 0; @@ -506,20 +496,18 @@ uint8_t pioneer_pr8210_device::i8049_pia_r(offs_t offset) // (C0) VBI decoding state 1 case 0xc0: - if (LOG_VBLANK_VBI) - logerror("%3d:PIA(C0)\n", screen().vpos()); + LOGMASKED(LOG_VBLANK_VBI, "%3d:PIA(C0)\n", screen().vpos()); result = m_pia.vbi1; break; // (E0) VBI decoding state 2 case 0xe0: - if (LOG_VBLANK_VBI) - logerror("%3d:PIA(E0)\n", screen().vpos()); + LOGMASKED(LOG_VBLANK_VBI, "%3d:PIA(E0)\n", screen().vpos()); result = m_pia.vbi2; break; default: - logerror("%s Unknown PR-8210 PIA read from offset %02X\n", machine().describe_context(), offset); + LOGMASKED(LOG_UNKNOWNS, "%s Unknown PR-8210 PIA read from offset %02X\n", machine().describe_context(), offset); break; } return result; @@ -591,7 +579,7 @@ void pioneer_pr8210_device::i8049_pia_w(offs_t offset, uint8_t data) // no other writes known default: - logerror("%s Unknown PR-8210 PIA write to offset %02X = %02X\n", machine().describe_context(), offset, data); + LOGMASKED(LOG_UNKNOWNS, "%s Unknown PR-8210 PIA write to offset %02X = %02X\n", machine().describe_context(), offset, data); break; } } @@ -672,12 +660,13 @@ void pioneer_pr8210_device::i8049_port1_w(uint8_t data) // special override for the Simutrek, which takes over control of this is some situations if (!override_control()) { - if (LOG_SIMUTREK) - logerror("%3d:JUMP TRG\n", screen().vpos()); + LOGMASKED(LOG_SIMUTREK, "%3d:JUMP TRG\n", screen().vpos()); advance_slider(direction); } - else if (LOG_SIMUTREK) - logerror("%3d:Skipped JUMP TRG\n", screen().vpos()); + else + { + LOGMASKED(LOG_SIMUTREK, "%3d:Skipped JUMP TRG\n", screen().vpos()); + } } // bit 1 low enables scanning @@ -905,8 +894,7 @@ simutrek_special_device::simutrek_special_device(const machine_config &mconfig, void simutrek_special_device::data_w(uint8_t data) { m_latch_data_timer->adjust(attotime::zero, data); - if (LOG_SIMUTREK) - logerror("%03d:**** Simutrek Command = %02X\n", screen().vpos(), data); + LOGMASKED(LOG_SIMUTREK, "%03d:**** Simutrek Command = %02X\n", screen().vpos(), data); } @@ -917,8 +905,8 @@ void simutrek_special_device::data_w(uint8_t data) void simutrek_special_device::set_external_audio_squelch(int state) { - if (LOG_SIMUTREK && m_audio_squelch != (state == 0)) - logerror("--> audio squelch = %d\n", state == 0); + if (m_audio_squelch != (state == 0)) + LOGMASKED(LOG_SIMUTREK, "--> audio squelch = %d\n", state == 0); m_audio_squelch = (state == 0); update_audio_squelch(); } @@ -939,15 +927,13 @@ void simutrek_special_device::player_vsync(const vbi_metadata &vbi, int fieldnum } // call the parent - if (LOG_SIMUTREK) - logerror("%3d:VSYNC(%d)\n", screen().vpos(), fieldnum); + LOGMASKED(LOG_SIMUTREK, "%3d:VSYNC(%d)\n", screen().vpos(), fieldnum); pioneer_pr8210_device::player_vsync(vbi, fieldnum, curtime); // process data if (m_data_ready) { - if (LOG_SIMUTREK) - logerror("%3d:VSYNC IRQ\n", screen().vpos()); + LOGMASKED(LOG_SIMUTREK, "%3d:VSYNC IRQ\n", screen().vpos()); m_i8748_cpu->set_input_line(MCS48_INPUT_IRQ, ASSERT_LINE); m_irq_off_timer->adjust(screen().scan_period()); } @@ -1064,19 +1050,18 @@ void simutrek_special_device::i8748_port2_w(uint8_t data) if (!(data & 0x10) && (prev & 0x10)) { int direction = (data & 0x08) ? 1 : -1; - if (LOG_SIMUTREK) - logerror("%3d:JUMP TRG %s\n", screen().vpos(), machine().describe_context()); + LOGMASKED(LOG_SIMUTREK, "%3d:JUMP TRG %s\n", screen().vpos(), machine().describe_context()); advance_slider(direction); } // bit $04 controls who owns the JUMP TRG command - if (LOG_SIMUTREK && ((data ^ prev) & 0x04)) - logerror("%3d:Simutrek ownership line = %d %s\n", screen().vpos(), (data >> 2) & 1, machine().describe_context()); + if ((data ^ prev) & 0x04) + LOGMASKED(LOG_SIMUTREK, "%3d:Simutrek ownership line = %d %s\n", screen().vpos(), (data >> 2) & 1, machine().describe_context()); m_controlnext = (~data >> 2) & 1; // bits $03 control something (status?) - if (LOG_SIMUTREK && ((data ^ prev) & 0x03)) - logerror("Simutrek Status = %d\n", data & 0x03); + if ((data ^ prev) & 0x03) + LOGMASKED(LOG_SIMUTREK, "Simutrek Status = %d\n", data & 0x03); } diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp index 2f382271aaf..1432025efd4 100644 --- a/src/devices/machine/ldv1000.cpp +++ b/src/devices/machine/ldv1000.cpp @@ -29,11 +29,12 @@ // DEBUGGING //************************************************************************** -#define LOG_PORT_IO 0 -#define LOG_STATUS_CHANGES 0 -#define LOG_FRAMES_SEEN 0 -#define LOG_COMMANDS 0 - +#define LOG_PORT_IO (1U << 1) +#define LOG_STATUS_CHANGES (1U << 2) +#define LOG_FRAMES_SEEN (1U << 3) +#define LOG_COMMANDS (1U << 4) +#define VERBOSE (0) +#include "logmacro.h" //************************************************************************** @@ -131,8 +132,7 @@ pioneer_ldv1000_device::pioneer_ldv1000_device(const machine_config &mconfig, co void pioneer_ldv1000_device::data_w(uint8_t data) { m_command = data; - if (LOG_COMMANDS) - logerror("-> COMMAND = %02X (%s)\n", data, (m_portc1 & 0x10) ? "valid" : "invalid"); + LOGMASKED(LOG_COMMANDS, "-> COMMAND = %02X (%s)\n", data, (m_portc1 & 0x10) ? "valid" : "invalid"); } @@ -327,11 +327,9 @@ void pioneer_ldv1000_device::player_vsync(const vbi_metadata &vbi, int fieldnum, int32_t pioneer_ldv1000_device::player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) { - if (LOG_FRAMES_SEEN) - { - int frame = frame_from_metadata(vbi); - if (frame != FRAME_NOT_PRESENT) logerror("== %d\n", frame); - } + int frame = frame_from_metadata(vbi); + if (frame != FRAME_NOT_PRESENT) + LOGMASKED(LOG_FRAMES_SEEN, "== %d\n", frame); return fieldnum; } @@ -420,8 +418,8 @@ uint8_t pioneer_ldv1000_device::z80_controller_r() void pioneer_ldv1000_device::z80_controller_w(uint8_t data) { - if (LOG_STATUS_CHANGES && data != m_status) - logerror("%s:CONTROLLER.W=%02X\n", machine().describe_context(), data); + if (data != m_status) + LOGMASKED(LOG_STATUS_CHANGES, "%s:CONTROLLER.W=%02X\n", machine().describe_context(), data); m_status = data; } @@ -434,8 +432,7 @@ void pioneer_ldv1000_device::z80_controller_w(uint8_t data) void pioneer_ldv1000_device::ppi0_porta_w(uint8_t data) { m_counter_start = data; - if (LOG_PORT_IO) - logerror("%s:PORTA.0=%02X\n", machine().describe_context(), data); + LOGMASKED(LOG_PORT_IO, "%s:PORTA.0=%02X\n", machine().describe_context(), data); } @@ -490,9 +487,9 @@ void pioneer_ldv1000_device::ppi0_portc_w(uint8_t data) // set the new value uint8_t prev = m_portc0; m_portc0 = data; - if (LOG_PORT_IO && ((data ^ prev) & 0x0f) != 0) + if ((data ^ prev) & 0x0f) { - logerror("%s:PORTC.0=%02X%s%s%s\n", machine().describe_context(), data, + LOGMASKED(LOG_PORT_IO, "%s:PORTC.0=%02X%s%s%s\n", machine().describe_context(), data, (data & 0x01) ? " PRELOAD" : "", !(data & 0x02) ? " /MULTIJUMP" : "", (data & 0x04) ? " SCANMODE" : ""); @@ -579,9 +576,9 @@ void pioneer_ldv1000_device::ppi1_portb_w(uint8_t data) // set the new value uint8_t prev = m_portb1; m_portb1 = data; - if (LOG_PORT_IO && ((data ^ prev) & 0xff) != 0) + if ((data ^ prev) & 0xff) { - logerror("%s:PORTB.1=%02X: %s%s%s%s%s%s\n", machine().describe_context(), data, + LOGMASKED(LOG_PORT_IO, "%s:PORTB.1=%02X: %s%s%s%s%s%s\n", machine().describe_context(), data, !(data & 0x01) ? " FOCSON" : "", !(data & 0x02) ? " SPDLRUN" : "", !(data & 0x04) ? " JUMPTRIG" : "", @@ -632,9 +629,9 @@ void pioneer_ldv1000_device::ppi1_portc_w(uint8_t data) // set the new value uint8_t prev = m_portc1; m_portc1 = data; - if (LOG_PORT_IO && ((data ^ prev) & 0xcf) != 0) + if ((data ^ prev) & 0xcf) { - logerror("%s:PORTC.1=%02X%s%s%s%s%s%s%s%s\n", machine().describe_context(), data, + LOGMASKED(LOG_PORT_IO, "%s:PORTC.1=%02X%s%s%s%s%s%s%s%s\n", machine().describe_context(), data, (data & 0x01) ? " AUD1" : "", (data & 0x02) ? " AUD2" : "", (data & 0x04) ? " AUDEN" : "", diff --git a/src/devices/machine/ldvp931.cpp b/src/devices/machine/ldvp931.cpp index 012d23591fb..a92a8bed283 100644 --- a/src/devices/machine/ldvp931.cpp +++ b/src/devices/machine/ldvp931.cpp @@ -25,9 +25,10 @@ // DEBUGGING //************************************************************************** -#define LOG_COMMANDS 0 -#define LOG_PORTS 0 - +#define LOG_COMMANDS (1U << 1) +#define LOG_PORTS (1U << 2) +#define VERBOSE (0) +#include "logmacro.h" //************************************************************************** @@ -237,8 +238,8 @@ TIMER_CALLBACK_MEMBER(philips_22vp931_device::process_vbi_data) TIMER_CALLBACK_MEMBER(philips_22vp931_device::process_deferred_data) { // set the value and mark it pending - if (LOG_COMMANDS && m_fromcontroller_pending) - printf("Dropped previous command byte\n"); + if (m_fromcontroller_pending) + LOGMASKED(LOG_COMMANDS, "Dropped previous command byte\n"); m_fromcontroller = param; m_fromcontroller_pending = true; @@ -246,8 +247,8 @@ TIMER_CALLBACK_MEMBER(philips_22vp931_device::process_deferred_data) if (m_cmdcount < std::size(m_cmdbuf)) { m_cmdbuf[m_cmdcount++ % 3] = param; - if (LOG_COMMANDS && m_cmdcount % 3 == 0) - printf("Cmd: %02X %02X %02X\n", m_cmdbuf[0], m_cmdbuf[1], m_cmdbuf[2]); + if (m_cmdcount % 3 == 0) + LOGMASKED(LOG_COMMANDS, "Cmd: %02X %02X %02X\n", m_cmdbuf[0], m_cmdbuf[1], m_cmdbuf[2]); } } @@ -376,7 +377,7 @@ void philips_22vp931_device::i8049_output0_w(uint8_t data) $01 = inverted -> VIDEO MUTE */ - if (LOG_PORTS && (m_i8049_out0 ^ data) & 0xff) + if ((VERBOSE & LOG_PORTS) && (m_i8049_out0 ^ data) & 0xff) { std::string flags; if ( (data & 0x80)) flags += " ???"; @@ -417,7 +418,7 @@ void philips_22vp931_device::i8049_output1_w(uint8_t data) int32_t speed; - if (LOG_PORTS && (m_i8049_out1 ^ data) & 0x08) + if ((VERBOSE & LOG_PORTS) && (m_i8049_out1 ^ data) & 0x08) { std::string flags; if (!(data & 0x08)) flags += " SMS"; @@ -565,7 +566,7 @@ void philips_22vp931_device::i8049_port1_w(uint8_t data) $01 = P10 = (out) D100 -> some op-amp then to C334, B56, B332 */ - if (LOG_PORTS && (m_i8049_port1 ^ data) & 0x1f) + if ((VERBOSE & LOG_PORTS) && (m_i8049_port1 ^ data) & 0x1f) { std::string flags; if (!(data & 0x10)) flags += " SPEED"; diff --git a/src/devices/machine/locomo.cpp b/src/devices/machine/locomo.cpp index 01cae8787ce..e3da2e35d56 100644 --- a/src/devices/machine/locomo.cpp +++ b/src/devices/machine/locomo.cpp @@ -9,9 +9,9 @@ #include "emu.h" #include "locomo.h" -#define LOG_UNKNOWN (1 << 1) -#define LOG_READS (1 << 2) -#define LOG_WRITES (1 << 3) +#define LOG_UNKNOWN (1U << 1) +#define LOG_READS (1U << 2) +#define LOG_WRITES (1U << 3) #define LOG_ALL (LOG_UNKNOWN | LOG_READS | LOG_WRITES) #define VERBOSE (LOG_ALL) diff --git a/src/devices/machine/mc14411.cpp b/src/devices/machine/mc14411.cpp index 722de11b35e..97f53ca478c 100644 --- a/src/devices/machine/mc14411.cpp +++ b/src/devices/machine/mc14411.cpp @@ -33,15 +33,13 @@ MACROS ***************************************************************************/ -//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h -#define LOG_SETUP (1U << 1) +#define LOG_SETUP (1U << 1) //#define VERBOSE (LOG_GENERAL|LOG_SETUP) //#define LOG_OUTPUT_STREAM std::cout #include "logmacro.h" -//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) diff --git a/src/devices/machine/mc6854.cpp b/src/devices/machine/mc6854.cpp index 55418ee0d23..12af625152d 100644 --- a/src/devices/machine/mc6854.cpp +++ b/src/devices/machine/mc6854.cpp @@ -33,9 +33,9 @@ #include "emu.h" #include "mc6854.h" -#define LOG_SETUP ( 1U << 1 ) -#define LOG_BITS ( 1U << 2 ) -#define LOG_IRQ ( 1U << 3 ) +#define LOG_SETUP (1U << 1) +#define LOG_BITS (1U << 2) +#define LOG_IRQ (1U << 3) //#define VERBOSE (LOG_IRQ | LOG_BITS | LOG_GENERAL | LOG_SETUP) //#define LOG_OUTPUT_STREAM std::cout diff --git a/src/devices/machine/mc68901.cpp b/src/devices/machine/mc68901.cpp index 3f6cc63837c..233df22cff6 100644 --- a/src/devices/machine/mc68901.cpp +++ b/src/devices/machine/mc68901.cpp @@ -45,7 +45,6 @@ #include "mc68901.h" #include "cpu/m68000/m68000.h" -#define LOG_GENERAL (1U << 0) #define LOG_RCV (1U << 1) #define LOG_XMIT (1U << 2) diff --git a/src/devices/machine/mc88200.cpp b/src/devices/machine/mc88200.cpp index 805fb9538c6..0419c279588 100644 --- a/src/devices/machine/mc88200.cpp +++ b/src/devices/machine/mc88200.cpp @@ -21,8 +21,6 @@ #include "mc88200.h" -#define LOG_GENERAL (1U << 0) - //#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/machine/mcf5206e.cpp b/src/devices/machine/mcf5206e.cpp index eb4695be03a..7d1c9d5f0fd 100644 --- a/src/devices/machine/mcf5206e.cpp +++ b/src/devices/machine/mcf5206e.cpp @@ -7,10 +7,10 @@ #include "emu.h" #include "mcf5206e.h" -#define LOG_DEBUG (0U << 0) -#define LOG_INVALID (0U << 1) -#define LOG_TIMER (0U << 2) - +#define LOG_DEBUG (1U << 1) +#define LOG_INVALID (1U << 2) +#define LOG_TIMER (1U << 3) +#define VERBOSE (0) #include "logmacro.h" void mcf5206e_peripheral_device::coldfire_regs_map(address_map &map) diff --git a/src/devices/machine/mos6530n.cpp b/src/devices/machine/mos6530n.cpp index b08638381e1..5a9763c3aa6 100644 --- a/src/devices/machine/mos6530n.cpp +++ b/src/devices/machine/mos6530n.cpp @@ -10,7 +10,6 @@ #include "emu.h" #include "mos6530n.h" -#define LOG_GENERAL (1U << 0) #define LOG_TIMER (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_TIMER) diff --git a/src/devices/machine/mpc106.cpp b/src/devices/machine/mpc106.cpp index 15bdb9645ef..61bcfe3cba3 100755 --- a/src/devices/machine/mpc106.cpp +++ b/src/devices/machine/mpc106.cpp @@ -10,7 +10,6 @@ #include "emu.h" #include "mpc106.h" -#define LOG_GENERAL (1U << 0) #define LOG_RAM (1U << 1) #define VERBOSE (0) diff --git a/src/devices/machine/msm6242.cpp b/src/devices/machine/msm6242.cpp index a4f566c3cd2..003436ff496 100644 --- a/src/devices/machine/msm6242.cpp +++ b/src/devices/machine/msm6242.cpp @@ -16,7 +16,6 @@ #include "emu.h" #include "machine/msm6242.h" -#define LOG_GENERAL (1U << 0) #define LOG_UNMAPPED (1U << 1) #define LOG_IRQ (1U << 2) #define LOG_IRQ_ENABLE (1U << 3) diff --git a/src/devices/machine/mv6436x.cpp b/src/devices/machine/mv6436x.cpp index e0bcc07a3cb..07057c54a2b 100644 --- a/src/devices/machine/mv6436x.cpp +++ b/src/devices/machine/mv6436x.cpp @@ -11,7 +11,6 @@ #include "emu.h" #include "mv6436x.h" -//#define LOG_GENERAL (1U << 0) #define LOG_PCI_CONFIG (1U << 1) #define LOG_PCI_MEM (1U << 2) #define LOG_PCI_IO (1U << 3) diff --git a/src/devices/machine/ncr5380.cpp b/src/devices/machine/ncr5380.cpp index ec7e2c412b3..bed78dd4784 100644 --- a/src/devices/machine/ncr5380.cpp +++ b/src/devices/machine/ncr5380.cpp @@ -15,7 +15,6 @@ #include "emu.h" #include "ncr5380.h" -#define LOG_GENERAL (1U << 0) #define LOG_REGW (1U << 1) #define LOG_REGR (1U << 2) #define LOG_SCSI (1U << 3) diff --git a/src/devices/machine/ncr53c90.cpp b/src/devices/machine/ncr53c90.cpp index 84c8ee18c18..a22dd5c70c3 100644 --- a/src/devices/machine/ncr53c90.cpp +++ b/src/devices/machine/ncr53c90.cpp @@ -10,7 +10,6 @@ #include "emu.h" #include "ncr53c90.h" -#define LOG_GENERAL (1U << 0) #define LOG_STATE (1U << 1) #define LOG_FIFO (1U << 2) #define LOG_COMMAND (1U << 3) diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp index 48d81cacbdb..bba035194f3 100644 --- a/src/devices/machine/netlist.cpp +++ b/src/devices/machine/netlist.cpp @@ -28,7 +28,6 @@ #include #include -#define LOG_GENERAL (1U << 0) #define LOG_DEV_CALLS (1U << 1) #define LOG_DEBUG (1U << 2) #define LOG_TIMING (1U << 3) diff --git a/src/devices/machine/ns32081.cpp b/src/devices/machine/ns32081.cpp index a436a823582..7f4e8f6be55 100644 --- a/src/devices/machine/ns32081.cpp +++ b/src/devices/machine/ns32081.cpp @@ -16,7 +16,6 @@ #include "softfloat3/source/include/softfloat.h" -#define LOG_GENERAL (1U << 0) //#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/machine/ns32082.cpp b/src/devices/machine/ns32082.cpp index fa70331b584..2fe2469420f 100644 --- a/src/devices/machine/ns32082.cpp +++ b/src/devices/machine/ns32082.cpp @@ -15,7 +15,6 @@ #include "emu.h" #include "ns32082.h" -#define LOG_GENERAL (1U << 0) #define LOG_TRANSLATE (1U << 1) //#define VERBOSE (LOG_GENERAL|LOG_TRANSLATE) diff --git a/src/devices/machine/ns32202.cpp b/src/devices/machine/ns32202.cpp index ba97c22ab06..190e2ece5af 100644 --- a/src/devices/machine/ns32202.cpp +++ b/src/devices/machine/ns32202.cpp @@ -15,7 +15,6 @@ #include "emu.h" #include "ns32202.h" -#define LOG_GENERAL (1U << 0) #define LOG_STATE (1U << 1) #define LOG_REGW (1U << 2) #define LOG_REGR (1U << 3) diff --git a/src/devices/machine/ns32382.cpp b/src/devices/machine/ns32382.cpp index 132c37c7b3f..464f9d9fa50 100644 --- a/src/devices/machine/ns32382.cpp +++ b/src/devices/machine/ns32382.cpp @@ -17,7 +17,6 @@ #include "emu.h" #include "ns32382.h" -#define LOG_GENERAL (1U << 0) #define LOG_TRANSLATE (1U << 1) //#define VERBOSE (LOG_GENERAL|LOG_TRANSLATE) diff --git a/src/devices/machine/nscsi_bus.cpp b/src/devices/machine/nscsi_bus.cpp index ade18c33bf3..121d92a2443 100644 --- a/src/devices/machine/nscsi_bus.cpp +++ b/src/devices/machine/nscsi_bus.cpp @@ -3,7 +3,6 @@ #include "emu.h" #include "nscsi_bus.h" -#define LOG_GENERAL (1U << 0) #define LOG_UNSUPPORTED (1U << 1) #define LOG_STATE (1U << 2) #define LOG_CONTROL (1U << 3) diff --git a/src/devices/machine/opti82c861.cpp b/src/devices/machine/opti82c861.cpp index 53d955e41e0..715e498baa8 100644 --- a/src/devices/machine/opti82c861.cpp +++ b/src/devices/machine/opti82c861.cpp @@ -8,8 +8,7 @@ #include "emu.h" #include "opti82c861.h" -#define LOG_GENERAL (1U << 0) -#define LOG_REGISTERS (1U << 0) +#define LOG_REGISTERS (1U << 1) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/devices/machine/pc_fdc.cpp b/src/devices/machine/pc_fdc.cpp index d1668f2381d..0609759f3b3 100644 --- a/src/devices/machine/pc_fdc.cpp +++ b/src/devices/machine/pc_fdc.cpp @@ -17,8 +17,6 @@ #include "machine/pc_fdc.h" #include "imagedev/floppy.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already - //#define VERBOSE (LOG_GENERAL) //#define LOG_OUTPUT_STREAM std::cout diff --git a/src/devices/machine/pccard_sram.cpp b/src/devices/machine/pccard_sram.cpp index f5cc6044335..5275b4367ce 100644 --- a/src/devices/machine/pccard_sram.cpp +++ b/src/devices/machine/pccard_sram.cpp @@ -10,7 +10,6 @@ #include "pccard_sram.h" #include "machine/nvram.h" -//#define LOG_GENERAL (1U << 0) #define LOG_ATTRIBUTE (1U << 1) #define VERBOSE (LOG_GENERAL | LOG_ATTRIBUTE) diff --git a/src/devices/machine/pcf8573.cpp b/src/devices/machine/pcf8573.cpp index 791336b4bf5..e4bc4d7bc23 100644 --- a/src/devices/machine/pcf8573.cpp +++ b/src/devices/machine/pcf8573.cpp @@ -12,8 +12,8 @@ #include "emu.h" #include "pcf8573.h" -#define LOG_DATA (1 << 1) -#define LOG_LINE (1 << 2) +#define LOG_DATA (1U << 1) +#define LOG_LINE (1U << 2) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/devices/machine/pcf8583.cpp b/src/devices/machine/pcf8583.cpp index c09a6fce138..f15145d95fe 100644 --- a/src/devices/machine/pcf8583.cpp +++ b/src/devices/machine/pcf8583.cpp @@ -12,8 +12,8 @@ #include "emu.h" #include "pcf8583.h" -#define LOG_DATA (1 << 1) -#define LOG_LINE (1 << 2) +#define LOG_DATA (1U << 1) +#define LOG_LINE (1U << 2) #define VERBOSE (0) diff --git a/src/devices/machine/pcf8593.cpp b/src/devices/machine/pcf8593.cpp index 3ba4f1af89b..f06b178a011 100644 --- a/src/devices/machine/pcf8593.cpp +++ b/src/devices/machine/pcf8593.cpp @@ -11,14 +11,17 @@ #include "emu.h" #include "pcf8593.h" +#define LOG_LEVEL0 (1U << 1) +#define LOG_LEVEL1 (1U << 2) +#define LOG_LEVEL2 (1U << 3) +#define VERBOSE (LOG_LEVEL0) +#include "logmacro.h" + /*************************************************************************** PARAMETERS/CONSTANTS/MACROS ***************************************************************************/ -#define LOG_LEVEL 1 -#define _logerror(level,x) do { if (LOG_LEVEL > level) logerror x; } while (0) - // get/set date #define RTC_GET_DATE_YEAR ((m_data[5] >> 6) & 3) #define RTC_SET_DATE_YEAR(x) m_data[5] = (m_data[5] & 0x3F) | (((x) % 4) << 6) @@ -61,7 +64,7 @@ pcf8593_device::pcf8593_device(const machine_config &mconfig, const char *tag, d void pcf8593_device::device_start() { - _logerror( 0, ("pcf8593_init\n")); + LOGMASKED(LOG_LEVEL0, "pcf8593_init\n"); memset(m_register, 0, sizeof(m_register)); m_timer = timer_alloc(FUNC(pcf8593_device::clock_tick), this); m_timer->adjust(attotime::from_seconds(1), 0, attotime::from_seconds(1)); @@ -73,7 +76,7 @@ void pcf8593_device::device_start() void pcf8593_device::device_reset() { - _logerror( 0, ("pcf8593_reset\n")); + LOGMASKED(LOG_LEVEL0, "pcf8593_reset\n"); m_pin_scl = 1; m_pin_sda = 1; m_active = false; @@ -92,7 +95,7 @@ void pcf8593_device::device_reset() TIMER_CALLBACK_MEMBER(pcf8593_device::clock_tick) { - _logerror( 2, ("pcf8593_timer_callback (%d)\n", param)); + LOGMASKED(LOG_LEVEL2, "pcf8593_timer_callback (%d)\n", param); // check if counting is enabled if (!(m_data[0] & 0x80)) advance_seconds(); @@ -173,7 +176,7 @@ WRITE_LINE_MEMBER(pcf8593_device::scl_w) // bit 9 = end if (m_bits > 8) { - _logerror( 2, ("pcf8593_write_byte(%02X)\n", m_data_recv[m_data_recv_index])); + LOGMASKED(LOG_LEVEL2, "pcf8593_write_byte(%02X)\n", m_data_recv[m_data_recv_index]); // enter receive mode when 1st byte = 0xA3 if ((m_data_recv[0] == 0xA3) && (m_data_recv_index == 0)) { @@ -209,11 +212,11 @@ WRITE_LINE_MEMBER(pcf8593_device::scl_w) // bit 9 = end if (m_bits > 8) { - _logerror( 2, ("pcf8593_read_byte(%02X)\n", m_data[m_pos])); + LOGMASKED(LOG_LEVEL2, "pcf8593_read_byte(%02X)\n", m_data[m_pos]); // end ? if (m_pin_sda) { - _logerror( 2, ("pcf8593 end\n")); + LOGMASKED(LOG_LEVEL2, "pcf8593 end\n"); m_mode = RTC_MODE_RECV; clear_buffer_rx(); } @@ -241,11 +244,11 @@ WRITE_LINE_MEMBER(pcf8593_device::sda_w) if (m_pin_scl) { // log init I2C - if (state) _logerror( 1, ("pcf8593 init i2c\n")); + if (state) LOGMASKED(LOG_LEVEL1, "pcf8593 init i2c\n"); // start condition (high to low when clock is high) if ((!state) && (m_pin_sda)) { - _logerror( 1, ("pcf8593 start condition\n")); + LOGMASKED(LOG_LEVEL1, "pcf8593 start condition\n"); m_active = true; m_bits = 0; m_data_recv_index = 0; @@ -255,7 +258,7 @@ WRITE_LINE_MEMBER(pcf8593_device::sda_w) // stop condition (low to high when clock is high) if ((state) && (!m_pin_sda)) { - _logerror( 1, ("pcf8593 stop condition\n")); + LOGMASKED(LOG_LEVEL1, "pcf8593 stop condition\n"); m_active = false; } } diff --git a/src/devices/machine/pckeybrd.cpp b/src/devices/machine/pckeybrd.cpp index c2b46fbe4b7..966998eee1f 100644 --- a/src/devices/machine/pckeybrd.cpp +++ b/src/devices/machine/pckeybrd.cpp @@ -24,8 +24,10 @@ /* AT keyboard documentation comes from www.beyondlogic.org and HelpPC documentation */ -/* to enable logging of keyboard read/writes */ -#define LOG_KEYBOARD 0 +/* for logging of keyboard read/writes */ +#define LOG_KEYBOARD (1U << 1) +#define VERBOSE (0) +#include "logmacro.h" /* @@ -378,8 +380,7 @@ void pc_keyboard_device::enable(int state) /* insert a code into the buffer */ void pc_keyboard_device::queue_insert(uint8_t data) { - if (LOG_KEYBOARD) - logerror("keyboard queueing %.2x\n",data); + LOGMASKED(LOG_KEYBOARD, "keyboard queueing %.2x\n", data); m_queue[m_head] = data; m_head++; @@ -622,8 +623,7 @@ uint8_t pc_keyboard_device::read() data = m_queue[m_tail]; - if (LOG_KEYBOARD) - logerror("read(): Keyboard Read 0x%02x\n",data); + LOGMASKED(LOG_KEYBOARD, "read(): Keyboard Read 0x%02x\n", data); m_tail++; m_tail %= std::size(m_queue); @@ -690,8 +690,7 @@ SeeAlso: #P046 void at_keyboard_device::write(uint8_t data) { - if (LOG_KEYBOARD) - logerror("keyboard write %.2x\n",data); + LOGMASKED(LOG_KEYBOARD, "keyboard write %.2x\n", data); switch (m_input_state) { diff --git a/src/devices/machine/pic8259.cpp b/src/devices/machine/pic8259.cpp index d9dafec1503..5d7c2e269bd 100644 --- a/src/devices/machine/pic8259.cpp +++ b/src/devices/machine/pic8259.cpp @@ -16,7 +16,6 @@ #include "emu.h" #include "machine/pic8259.h" -#define LOG_GENERAL (1U << 0) #define LOG_ICW (1U << 1) #define LOG_OCW (1U << 2) diff --git a/src/devices/machine/pxa255.cpp b/src/devices/machine/pxa255.cpp index d387347dd98..eb0bebd206e 100644 --- a/src/devices/machine/pxa255.cpp +++ b/src/devices/machine/pxa255.cpp @@ -15,17 +15,17 @@ #include "screen.h" #include "speaker.h" -#define LOG_UNKNOWN (1 << 1) -#define LOG_I2S (1 << 2) -#define LOG_DMA (1 << 3) -#define LOG_OSTIMER (1 << 4) -#define LOG_INTC (1 << 5) -#define LOG_GPIO (1 << 6) -#define LOG_LCD_DMA (1 << 7) -#define LOG_LCD (1 << 8) -#define LOG_POWER (1 << 9) -#define LOG_RTC (1 << 10) -#define LOG_CLOCKS (1 << 11) +#define LOG_UNKNOWN (1U << 1) +#define LOG_I2S (1U << 2) +#define LOG_DMA (1U << 3) +#define LOG_OSTIMER (1U << 4) +#define LOG_INTC (1U << 5) +#define LOG_GPIO (1U << 6) +#define LOG_LCD_DMA (1U << 7) +#define LOG_LCD (1U << 8) +#define LOG_POWER (1U << 9) +#define LOG_RTC (1U << 10) +#define LOG_CLOCKS (1U << 11) #define LOG_ALL (LOG_UNKNOWN | LOG_I2S | LOG_DMA | LOG_OSTIMER | LOG_INTC | LOG_GPIO | LOG_LCD_DMA | LOG_LCD | LOG_POWER | LOG_RTC | LOG_CLOCKS) #define VERBOSE (LOG_ALL) diff --git a/src/devices/machine/sa1110.cpp b/src/devices/machine/sa1110.cpp index 5bcc62ba456..c6fcc4d3603 100644 --- a/src/devices/machine/sa1110.cpp +++ b/src/devices/machine/sa1110.cpp @@ -9,25 +9,25 @@ #include "emu.h" #include "sa1110.h" -#define LOG_UNKNOWN (1 << 1) -#define LOG_ICP (1 << 2) -#define LOG_UART3 (1 << 3) -#define LOG_UART3_HF (1 << 4) -#define LOG_MCP (1 << 5) -#define LOG_SSP (1 << 6) -#define LOG_OSTIMER (1 << 7) -#define LOG_OSTIMER_HF (1 << 8) -#define LOG_RTC (1 << 9) -#define LOG_RTC_HF (1 << 10) -#define LOG_POWER (1 << 11) -#define LOG_POWER_HF (1 << 12) -#define LOG_RESET (1 << 13) -#define LOG_GPIO (1 << 14) -#define LOG_GPIO_HF (1 << 15) -#define LOG_INTC (1 << 16) -#define LOG_PPC (1 << 17) -#define LOG_DMA (1 << 18) -#define LOG_UDC (1 << 19) +#define LOG_UNKNOWN (1U << 1) +#define LOG_ICP (1U << 2) +#define LOG_UART3 (1U << 3) +#define LOG_UART3_HF (1U << 4) +#define LOG_MCP (1U << 5) +#define LOG_SSP (1U << 6) +#define LOG_OSTIMER (1U << 7) +#define LOG_OSTIMER_HF (1U << 8) +#define LOG_RTC (1U << 9) +#define LOG_RTC_HF (1U << 10) +#define LOG_POWER (1U << 11) +#define LOG_POWER_HF (1U << 12) +#define LOG_RESET (1U << 13) +#define LOG_GPIO (1U << 14) +#define LOG_GPIO_HF (1U << 15) +#define LOG_INTC (1U << 16) +#define LOG_PPC (1U << 17) +#define LOG_DMA (1U << 18) +#define LOG_UDC (1U << 19) #define LOG_ALL (LOG_UNKNOWN | LOG_ICP | LOG_UART3 | LOG_MCP | LOG_OSTIMER | LOG_RTC | LOG_POWER | LOG_RESET | LOG_GPIO | LOG_INTC | LOG_PPC | LOG_DMA | LOG_UDC) #define VERBOSE (0) diff --git a/src/devices/machine/sa1111.cpp b/src/devices/machine/sa1111.cpp index 3a2dd300f78..71cc6304552 100644 --- a/src/devices/machine/sa1111.cpp +++ b/src/devices/machine/sa1111.cpp @@ -9,19 +9,19 @@ #include "emu.h" #include "sa1111.h" -#define LOG_UNKNOWN (1 << 1) -#define LOG_SBI (1 << 2) -#define LOG_SK (1 << 3) -#define LOG_USB (1 << 4) -#define LOG_AUDIO (1 << 5) -#define LOG_SSP (1 << 6) -#define LOG_SSP_HF (1 << 7) -#define LOG_TRACK (1 << 8) -#define LOG_MOUSE (1 << 9) -#define LOG_GPIO (1 << 10) -#define LOG_INTC (1 << 11) -#define LOG_CARD (1 << 12) -#define LOG_AUDIO_DMA (1 << 13) +#define LOG_UNKNOWN (1U << 1) +#define LOG_SBI (1U << 2) +#define LOG_SK (1U << 3) +#define LOG_USB (1U << 4) +#define LOG_AUDIO (1U << 5) +#define LOG_SSP (1U << 6) +#define LOG_SSP_HF (1U << 7) +#define LOG_TRACK (1U << 8) +#define LOG_MOUSE (1U << 9) +#define LOG_GPIO (1U << 10) +#define LOG_INTC (1U << 11) +#define LOG_CARD (1U << 12) +#define LOG_AUDIO_DMA (1U << 13) #define LOG_ALL (LOG_UNKNOWN | LOG_SBI | LOG_SK | LOG_USB | LOG_AUDIO | LOG_SSP | LOG_TRACK | LOG_MOUSE | LOG_GPIO | LOG_INTC | LOG_CARD) #define VERBOSE (0) diff --git a/src/devices/machine/saa7191.cpp b/src/devices/machine/saa7191.cpp index a879506e84b..568139201b3 100644 --- a/src/devices/machine/saa7191.cpp +++ b/src/devices/machine/saa7191.cpp @@ -14,11 +14,11 @@ #include "emu.h" #include "saa7191.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_READS (1 << 1) -#define LOG_WRITES (1 << 2) -#define LOG_ERRORS (1 << 3) -#define LOG_I2C_IGNORES (1 << 4) +#define LOG_UNKNOWN (1U << 1) +#define LOG_READS (1U << 2) +#define LOG_WRITES (1U << 3) +#define LOG_ERRORS (1U << 4) +#define LOG_I2C_IGNORES (1U << 5) #define LOG_DEFAULT (LOG_READS | LOG_WRITES | LOG_ERRORS | LOG_I2C_IGNORES | LOG_UNKNOWN) #define VERBOSE (LOG_DEFAULT) diff --git a/src/devices/machine/scc2698b.cpp b/src/devices/machine/scc2698b.cpp index 892c37c24bf..866c5d67db0 100644 --- a/src/devices/machine/scc2698b.cpp +++ b/src/devices/machine/scc2698b.cpp @@ -26,7 +26,6 @@ Quirks: #include "emu.h" #include "scc2698b.h" -#define LOG_GENERAL (1U << 0) #define LOG_CONFIG_CHANGE (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_CONFIG_CHANGE) diff --git a/src/devices/machine/scc68070.cpp b/src/devices/machine/scc68070.cpp index 7d5ceb81c1a..f10eb8de651 100644 --- a/src/devices/machine/scc68070.cpp +++ b/src/devices/machine/scc68070.cpp @@ -25,15 +25,15 @@ TODO: #include "emu.h" #include "machine/scc68070.h" -#define LOG_I2C (1 << 0) -#define LOG_UART (1 << 1) -#define LOG_TIMERS (1 << 2) -#define LOG_TIMERS_HF (1 << 3) -#define LOG_DMA (1 << 4) -#define LOG_MMU (1 << 5) -#define LOG_IRQS (1 << 6) -#define LOG_UNKNOWN (1 << 7) -#define LOG_MORE_UART (1 << 8) +#define LOG_I2C (1U << 1) +#define LOG_UART (1U << 2) +#define LOG_TIMERS (1U << 3) +#define LOG_TIMERS_HF (1U << 4) +#define LOG_DMA (1U << 5) +#define LOG_MMU (1U << 6) +#define LOG_IRQS (1U << 7) +#define LOG_UNKNOWN (1U << 8) +#define LOG_MORE_UART (1U << 9) #define LOG_ALL (LOG_I2C | LOG_UART | LOG_TIMERS | LOG_DMA | LOG_MMU | LOG_IRQS | LOG_UNKNOWN) #define VERBOSE (0) diff --git a/src/devices/machine/scnxx562.cpp b/src/devices/machine/scnxx562.cpp index 4f2da74c258..487c8065fce 100644 --- a/src/devices/machine/scnxx562.cpp +++ b/src/devices/machine/scnxx562.cpp @@ -87,7 +87,6 @@ DONE (x) (p=partly) NMOS CMOS /* Useful temporary debug printout format */ // printf("TAG %s%s Data:%d\n", __PRETTY_FUNCTION__, owner()->tag(), data); -#define LOG_GENERAL (1U << 0) #define LOG_R (1U << 1) #define LOG_TX (1U << 2) #define LOG_RX (1U << 3) diff --git a/src/devices/machine/scoop.cpp b/src/devices/machine/scoop.cpp index 1a254169f93..5c97c11a47e 100644 --- a/src/devices/machine/scoop.cpp +++ b/src/devices/machine/scoop.cpp @@ -9,9 +9,9 @@ #include "emu.h" #include "scoop.h" -#define LOG_UNKNOWN (1 << 1) -#define LOG_READS (1 << 2) -#define LOG_WRITES (1 << 3) +#define LOG_UNKNOWN (1U << 1) +#define LOG_READS (1U << 2) +#define LOG_WRITES (1U << 3) #define LOG_ALL (LOG_UNKNOWN | LOG_READS | LOG_WRITES) #define VERBOSE (LOG_ALL) diff --git a/src/devices/machine/sdlc.cpp b/src/devices/machine/sdlc.cpp index 7a7303b9e73..040fa7f5045 100644 --- a/src/devices/machine/sdlc.cpp +++ b/src/devices/machine/sdlc.cpp @@ -7,7 +7,6 @@ #include -#define LOG_GENERAL (1U << 0) #define LOG_RXBIT (1U << 1) #define LOG_RXFLAG (1U << 2) #define LOG_LINESTATE (1U << 3) diff --git a/src/devices/machine/smc91c9x.cpp b/src/devices/machine/smc91c9x.cpp index 3ca3fbeed13..daf0891cc11 100644 --- a/src/devices/machine/smc91c9x.cpp +++ b/src/devices/machine/smc91c9x.cpp @@ -17,7 +17,6 @@ DEBUGGING ***************************************************************************/ -#define LOG_GENERAL (1U << 0) #define LOG_PACKETS (1U << 1) #define LOG_TX (1U << 2) #define LOG_RX (1U << 3) diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp index ddbe8d6aaab..69ec5b762f4 100644 --- a/src/devices/machine/smpc.cpp +++ b/src/devices/machine/smpc.cpp @@ -166,8 +166,10 @@ SMPC NVRAM contents: #include "coreutil.h" -#define LOG_SMPC 0 -#define LOG_PAD_CMD 0 +#define LOG_PAD_CMD (1U << 1) +#define VERBOSE (0) +#include "logmacro.h" + //************************************************************************** // GLOBAL VARIABLES @@ -359,13 +361,13 @@ void smpc_hle_device::ireg_w(offs_t offset, uint8_t data) { if(data & 0x40) { - if(LOG_PAD_CMD) printf("SMPC: BREAK request\n"); + LOGMASKED(LOG_PAD_CMD, "SMPC: BREAK request\n"); sr_ack(); m_intback_stage = 0; } else if(data & 0x80) { - if(LOG_PAD_CMD) printf("SMPC: CONTINUE request\n"); + LOGMASKED(LOG_PAD_CMD, "SMPC: CONTINUE request\n"); m_intback_timer->adjust(attotime::from_usec(700)); // TODO: is timing correct? diff --git a/src/devices/machine/spg2xx_audio.cpp b/src/devices/machine/spg2xx_audio.cpp index e8518bdaa59..0fdd32b4fae 100644 --- a/src/devices/machine/spg2xx_audio.cpp +++ b/src/devices/machine/spg2xx_audio.cpp @@ -24,15 +24,15 @@ DEFINE_DEVICE_TYPE(SPG2XX_AUDIO, spg2xx_audio_device, "spg2xx_audio", "SPG2xx-se DEFINE_DEVICE_TYPE(SPG110_AUDIO, spg110_audio_device, "spg110_audio", "SPG110-series System-on-a-Chip Audio") DEFINE_DEVICE_TYPE(SUNPLUS_GCM394_AUDIO, sunplus_gcm394_audio_device, "gcm394_audio", "SunPlus GCM394 System-on-a-Chip (Audio)") -#define LOG_SPU_READS (1U << 0) -#define LOG_SPU_WRITES (1U << 1) -#define LOG_UNKNOWN_SPU (1U << 2) -#define LOG_CHANNEL_READS (1U << 3) -#define LOG_CHANNEL_WRITES (1U << 4) -#define LOG_ENVELOPES (1U << 5) -#define LOG_SAMPLES (1U << 6) -#define LOG_RAMPDOWN (1U << 7) -#define LOG_BEAT (1U << 8) +#define LOG_SPU_READS (1U << 1) +#define LOG_SPU_WRITES (1U << 2) +#define LOG_UNKNOWN_SPU (1U << 3) +#define LOG_CHANNEL_READS (1U << 4) +#define LOG_CHANNEL_WRITES (1U << 5) +#define LOG_ENVELOPES (1U << 6) +#define LOG_SAMPLES (1U << 7) +#define LOG_RAMPDOWN (1U << 8) +#define LOG_BEAT (1U << 9) #define LOG_ALL (LOG_SPU_READS | LOG_SPU_WRITES | LOG_UNKNOWN_SPU | LOG_CHANNEL_READS | LOG_CHANNEL_WRITES \ | LOG_ENVELOPES | LOG_SAMPLES | LOG_RAMPDOWN | LOG_BEAT) diff --git a/src/devices/machine/spg2xx_sysdma.cpp b/src/devices/machine/spg2xx_sysdma.cpp index d48eee75fdf..1cdadba8251 100644 --- a/src/devices/machine/spg2xx_sysdma.cpp +++ b/src/devices/machine/spg2xx_sysdma.cpp @@ -11,7 +11,7 @@ DEFINE_DEVICE_TYPE(SPG2XX_SYSDMA, spg2xx_sysdma_device, "spg2xx_sysdma", "SPG240-series System-on-a-Chip System DMA") -#define LOG_DMA (1U << 9) +#define LOG_DMA (1U << 1) #define LOG_ALL (LOG_DMA) #define VERBOSE (0) diff --git a/src/devices/machine/spg2xx_video.cpp b/src/devices/machine/spg2xx_video.cpp index b8d9fa2d22d..46ffd366068 100644 --- a/src/devices/machine/spg2xx_video.cpp +++ b/src/devices/machine/spg2xx_video.cpp @@ -11,12 +11,12 @@ DEFINE_DEVICE_TYPE(SPG24X_VIDEO, spg24x_video_device, "spg24x_video", "SPG240-series System-on-a-Chip (Video)") -#define LOG_IRQS (1U << 4) -#define LOG_VLINES (1U << 5) -#define LOG_DMA (1U << 9) -#define LOG_PPU_READS (1U << 22) -#define LOG_PPU_WRITES (1U << 23) -#define LOG_UNKNOWN_PPU (1U << 24) +#define LOG_IRQS (1U << 1) +#define LOG_VLINES (1U << 2) +#define LOG_DMA (1U << 3) +#define LOG_PPU_READS (1U << 4) +#define LOG_PPU_WRITES (1U << 5) +#define LOG_UNKNOWN_PPU (1U << 6) #define LOG_PPU (LOG_PPU_READS | LOG_PPU_WRITES | LOG_UNKNOWN_PPU) #define LOG_ALL (LOG_IRQS | LOG_PPU | LOG_VLINES | LOG_DMA ) diff --git a/src/devices/machine/spi_sdcard.cpp b/src/devices/machine/spi_sdcard.cpp index 625f1d823de..fdce4a8d907 100644 --- a/src/devices/machine/spi_sdcard.cpp +++ b/src/devices/machine/spi_sdcard.cpp @@ -29,7 +29,6 @@ #include "spi_sdcard.h" #include "imagedev/harddriv.h" -#define LOG_GENERAL (1U << 0) #define LOG_COMMAND (1U << 1) #define LOG_SPI (1U << 2) @@ -161,7 +160,7 @@ void spi_sdcard_device::latch_in() m_data[m_write_ptr++] = m_in_latch; if (m_write_ptr == (m_blksize + 2)) { - LOGMASKED(LOG_GENERAL, "writing LBA %x, data %02x %02x %02x %02x\n", m_blknext, m_data[0], m_data[1], m_data[2], m_data[3]); + LOG("writing LBA %x, data %02x %02x %02x %02x\n", m_blknext, m_data[0], m_data[1], m_data[2], m_data[3]); if (m_image->write(m_blknext, &m_data[0])) { m_data[0] = DATA_RESPONSE_OK; @@ -334,7 +333,7 @@ void spi_sdcard_device::do_command() { blk /= m_blksize; } - LOGMASKED(LOG_GENERAL, "reading LBA %x\n", blk); + LOG("reading LBA %x\n", blk); m_image->read(blk, &m_data[3]); { util::crc16_t crc16 = util::crc16_creator::simple(&m_data[3], m_blksize); diff --git a/src/devices/machine/spifi3.cpp b/src/devices/machine/spifi3.cpp index 98acba7b731..235f7069916 100644 --- a/src/devices/machine/spifi3.cpp +++ b/src/devices/machine/spifi3.cpp @@ -22,13 +22,12 @@ #include "emu.h" #include "spifi3.h" -#define LOG_GENERAL (1U << 0) -#define LOG_STATE (1U << 1) +#define LOG_STATE (1U << 1) #define LOG_INTERRUPT (1U << 2) -#define LOG_DATA (1U << 3) -#define LOG_REGISTER (1U << 4) -#define LOG_CMD (1U << 5) -#define LOG_AUTO (1U << 6) +#define LOG_DATA (1U << 3) +#define LOG_REGISTER (1U << 4) +#define LOG_CMD (1U << 5) +#define LOG_AUTO (1U << 6) #define SPIFI3_DEBUG (LOG_GENERAL | LOG_REGISTER | LOG_INTERRUPT | LOG_AUTO) #define SPIFI3_TRACE (SPIFI3_DEBUG | LOG_STATE | LOG_CMD) diff --git a/src/devices/machine/stvcd.cpp b/src/devices/machine/stvcd.cpp index af3ac2350c2..73fb7da2672 100644 --- a/src/devices/machine/stvcd.cpp +++ b/src/devices/machine/stvcd.cpp @@ -45,10 +45,10 @@ DASM notes: #include "coreutil.h" -#define LOG_WARN (1U << 1) -#define LOG_CMD (1U << 2) -#define LOG_SEEK (1U << 3) -#define LOG_XFER (1U << 4) +#define LOG_WARN (1U << 1) +#define LOG_CMD (1U << 2) +#define LOG_SEEK (1U << 3) +#define LOG_XFER (1U << 4) #define VERBOSE (LOG_CMD | LOG_WARN) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/devices/machine/sun4c_mmu.cpp b/src/devices/machine/sun4c_mmu.cpp index 12e1f0ceae6..eebecb5d7db 100644 --- a/src/devices/machine/sun4c_mmu.cpp +++ b/src/devices/machine/sun4c_mmu.cpp @@ -17,25 +17,25 @@ DEFINE_DEVICE_TYPE(SUN4_MMU, sun4_mmu_device, "sun4_mmu", "Sun 4 MMU") DEFINE_DEVICE_TYPE(SUN4C_MMU, sun4c_mmu_device, "sun4c_mmu", "Sun 4c MMU") -#define LOG_PAGE_MAP (1U << 0) -#define LOG_SEGMENT_MAP (1U << 1) -#define LOG_CONTEXT (1U << 2) -#define LOG_SYSTEM_ENABLE (1U << 3) -#define LOG_UART (1U << 4) -#define LOG_PARITY (1U << 5) -#define LOG_SEGMENT_FLUSH (1U << 6) -#define LOG_PAGE_FLUSH (1U << 7) -#define LOG_CONTEXT_FLUSH (1U << 8) -#define LOG_ALL_FLUSH (1U << 9) -#define LOG_CACHE_TAGS (1U << 10) -#define LOG_CACHE_DATA (1U << 11) -#define LOG_INVALID_PTE (1U << 12) -#define LOG_BUSERROR (1U << 13) -#define LOG_TYPE0_TIMEOUT (1U << 14) -#define LOG_TYPE1_TIMEOUT (1U << 15) -#define LOG_UNKNOWN_SPACE (1U << 16) -#define LOG_UNKNOWN_SEGMENT (1U << 17) -#define LOG_WRITE_PROTECT (1U << 18) +#define LOG_PAGE_MAP (1U << 1) +#define LOG_SEGMENT_MAP (1U << 2) +#define LOG_CONTEXT (1U << 3) +#define LOG_SYSTEM_ENABLE (1U << 4) +#define LOG_UART (1U << 5) +#define LOG_PARITY (1U << 6) +#define LOG_SEGMENT_FLUSH (1U << 7) +#define LOG_PAGE_FLUSH (1U << 8) +#define LOG_CONTEXT_FLUSH (1U << 9) +#define LOG_ALL_FLUSH (1U << 10) +#define LOG_CACHE_TAGS (1U << 11) +#define LOG_CACHE_DATA (1U << 12) +#define LOG_INVALID_PTE (1U << 13) +#define LOG_BUSERROR (1U << 14) +#define LOG_TYPE0_TIMEOUT (1U << 15) +#define LOG_TYPE1_TIMEOUT (1U << 16) +#define LOG_UNKNOWN_SPACE (1U << 17) +#define LOG_UNKNOWN_SEGMENT (1U << 18) +#define LOG_WRITE_PROTECT (1U << 19) #define LOG_MMU (LOG_PAGE_MAP | LOG_SEGMENT_MAP | LOG_CONTEXT) #define LOG_MISC_HW (LOG_SYSTEM_ENABLE | LOG_UART | LOG_PARITY) #define LOG_FLUSHES (LOG_SEGMENT_FLUSH | LOG_PAGE_FLUSH | LOG_CONTEXT_FLUSH | LOG_ALL_FLUSH) diff --git a/src/devices/machine/timekpr.cpp b/src/devices/machine/timekpr.cpp index e2517e59766..f5c3a8bbc10 100644 --- a/src/devices/machine/timekpr.cpp +++ b/src/devices/machine/timekpr.cpp @@ -18,7 +18,6 @@ #include "machine/timekpr.h" #include "machine/timehelp.h" -#define LOG_GENERAL (1U << 0) #define LOG_TICKS (1U << 1) #define VERBOSE (0) @@ -380,7 +379,7 @@ void timekeeper_device::watchdog_write(u8 data) void timekeeper_device::write(offs_t offset, u8 data) { - LOGMASKED(LOG_GENERAL, "timekeeper_device::write: %04x = %02x\n", offset, data); + LOG("timekeeper_device::write: %04x = %02x\n", offset, data); if (offset == m_offset_control) { if ((m_control & CONTROL_W) != 0 && @@ -440,7 +439,7 @@ u8 timekeeper_device::read(offs_t offset) m_reset_cb(CLEAR_LINE); m_irq_cb(CLEAR_LINE); } - LOGMASKED(LOG_GENERAL, "timekeeper_device::read: %04x (%02x)\n", offset, result); + LOG("timekeeper_device::read: %04x (%02x)\n", offset, result); return result; } diff --git a/src/devices/machine/tmc0430.cpp b/src/devices/machine/tmc0430.cpp index 76e53c88ded..e656a2aa4c6 100644 --- a/src/devices/machine/tmc0430.cpp +++ b/src/devices/machine/tmc0430.cpp @@ -94,13 +94,13 @@ #include "emu.h" #include "tmc0430.h" -#define LOG_DETAIL (1U<<1) // More detail -#define LOG_ADDRESS (1U<<2) // Address bus -#define LOG_CLOCK (1U<<3) // Clock line -#define LOG_READY (1U<<4) // Ready line -#define LOG_LINES (1U<<5) // Select/mode lines +#define LOG_DETAIL (1U << 1) // More detail +#define LOG_ADDRESS (1U << 2) // Address bus +#define LOG_CLOCK (1U << 3) // Clock line +#define LOG_READY (1U << 4) // Ready line +#define LOG_LINES (1U << 5) // Select/mode lines -#define VERBOSE ( LOG_GENERAL ) +#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/machine/tms9901.cpp b/src/devices/machine/tms9901.cpp index 6714945fa2a..e5acfc66176 100644 --- a/src/devices/machine/tms9901.cpp +++ b/src/devices/machine/tms9901.cpp @@ -154,7 +154,6 @@ Clock mode: #include -#define LOG_GENERAL (1U << 0) #define LOG_PINS (1U << 1) #define LOG_MASK (1U << 2) #define LOG_MODE (1U << 3) diff --git a/src/devices/machine/tms9902.cpp b/src/devices/machine/tms9902.cpp index 68c0f671155..47794ed0857 100644 --- a/src/devices/machine/tms9902.cpp +++ b/src/devices/machine/tms9902.cpp @@ -43,7 +43,6 @@ #include -#define LOG_GENERAL (1U << 0) #define LOG_LINES (1U << 1) #define LOG_CRU (1U << 2) #define LOG_DETAIL (1U << 3) @@ -54,7 +53,6 @@ #define VERBOSE (LOG_ERROR) #include "logmacro.h" -#define LOGGENERAL(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) #define LOGLINES(...) LOGMASKED(LOG_LINES, __VA_ARGS__) #define LOGCRU(...) LOGMASKED(LOG_CRU, __VA_ARGS__) #define LOGDETAIL(...) LOGMASKED(LOG_DETAIL, __VA_ARGS__) diff --git a/src/devices/machine/tsb12lv01a.cpp b/src/devices/machine/tsb12lv01a.cpp index b893eafeefe..06ef145c3a6 100644 --- a/src/devices/machine/tsb12lv01a.cpp +++ b/src/devices/machine/tsb12lv01a.cpp @@ -12,10 +12,10 @@ #include "emu.h" #include "tsb12lv01a.h" -#define LOG_READS (1 << 1) -#define LOG_WRITES (1 << 2) -#define LOG_UNKNOWNS (1 << 3) -#define LOG_IRQS (1 << 4) +#define LOG_READS (1U << 1) +#define LOG_WRITES (1U << 2) +#define LOG_UNKNOWNS (1U << 3) +#define LOG_IRQS (1U << 4) #define LOG_ALL (LOG_READS | LOG_WRITES | LOG_UNKNOWNS | LOG_IRQS) #define VERBOSE (LOG_ALL) diff --git a/src/devices/machine/ucb1200.cpp b/src/devices/machine/ucb1200.cpp index 54e68321523..e3410605095 100644 --- a/src/devices/machine/ucb1200.cpp +++ b/src/devices/machine/ucb1200.cpp @@ -9,9 +9,9 @@ #include "emu.h" #include "ucb1200.h" -#define LOG_UNKNOWN (1 << 1) -#define LOG_READS (1 << 2) -#define LOG_WRITES (1 << 3) +#define LOG_UNKNOWN (1U << 1) +#define LOG_READS (1U << 2) +#define LOG_WRITES (1U << 3) #define LOG_ALL (LOG_UNKNOWN | LOG_READS | LOG_WRITES) #define VERBOSE (LOG_ALL) diff --git a/src/devices/machine/upc82c710.cpp b/src/devices/machine/upc82c710.cpp index bf6352a69c7..4f9927b0b09 100644 --- a/src/devices/machine/upc82c710.cpp +++ b/src/devices/machine/upc82c710.cpp @@ -9,11 +9,11 @@ #include "emu.h" #include "machine/upc82c710.h" -#define LOG_CFG (1 << 0) -#define LOG_FDC (1 << 1) -#define LOG_IDE (1 << 2) -#define LOG_LPT (1 << 3) -#define LOG_SER (1 << 4) +#define LOG_CFG (1U << 1) +#define LOG_FDC (1U << 2) +#define LOG_IDE (1U << 3) +#define LOG_LPT (1U << 4) +#define LOG_SER (1U << 5) #define VERBOSE (0) diff --git a/src/devices/machine/upc82c711.cpp b/src/devices/machine/upc82c711.cpp index b162029daa0..20eaa871053 100644 --- a/src/devices/machine/upc82c711.cpp +++ b/src/devices/machine/upc82c711.cpp @@ -9,11 +9,11 @@ #include "emu.h" #include "machine/upc82c711.h" -#define LOG_CFG (1 << 0) -#define LOG_FDC (1 << 1) -#define LOG_IDE (1 << 2) -#define LOG_LPT (1 << 3) -#define LOG_SER (1 << 4) +#define LOG_CFG (1U << 1) +#define LOG_FDC (1U << 2) +#define LOG_IDE (1U << 3) +#define LOG_LPT (1U << 4) +#define LOG_SER (1U << 5) #define VERBOSE (0) diff --git a/src/devices/machine/vrc4373.cpp b/src/devices/machine/vrc4373.cpp index 1100df8b375..7b3ce4c11cf 100644 --- a/src/devices/machine/vrc4373.cpp +++ b/src/devices/machine/vrc4373.cpp @@ -3,7 +3,6 @@ #include "emu.h" #include "vrc4373.h" -#define LOG_GENERAL (1U << 0) #define LOG_NILE (1U << 1) #define LOG_NILE_MASTER (1U << 2) #define LOG_NILE_TARGET (1U << 3) diff --git a/src/devices/machine/vrc5074.cpp b/src/devices/machine/vrc5074.cpp index e812cf20d25..8f661fb0cb9 100644 --- a/src/devices/machine/vrc5074.cpp +++ b/src/devices/machine/vrc5074.cpp @@ -3,14 +3,21 @@ #include "emu.h" #include "vrc5074.h" -#define LOG_NILE (0) -#define LOG_NILE_IRQS (0) -#define LOG_PCI (0) -#define LOG_TIMERS (0) -#define LOG_MAP (0) -#define LOG_NILE_MASTER (0) -#define LOG_NILE_TARGET (0) -#define PRINTF_SERIAL (0) +#define LOG_NILE (1U << 1) +#define LOG_NILE_IRQS (1U << 2) +#define LOG_TIMERS (1U << 3) +#define LOG_MAP (1U << 4) +#define LOG_NILE_MASTER (1U << 5) +#define LOG_NILE_TARGET (1U << 6) +#define LOG_SERIAL_READS (1U << 7) +#define LOG_SERIAL_WRITES (1U << 8) +#define LOG_SERIAL_DATA (1U << 9) +#define LOG_SDRAM (1U << 10) +#define LOG_ERRORS (1U << 11) +#define LOG_UNKNOWNS (1U << 12) +#define LOG_DMACTRL (1U << 13) +#define VERBOSE (0) +#include "logmacro.h" /* NILE 4 registers 0x000-0x0ff */ #define NREG_SDRAM0 (0x000/4) @@ -216,8 +223,7 @@ void vrc5074_device::device_start() if (m_updateRegion) { romSize = m_updateRegion->bytes(); m_cpu_space->install_rom(0x1fd00000, 0x1fd00000 + romSize - 1, m_updateRegion->base()); - if (LOG_NILE) - logerror("%s: vrc5074_device::device_start UPDATE Mapped size: 0x%08X start: 0x1fd00000 end: %08X\n", tag(), romSize, 0x1fd00000 + romSize - 1); + LOGMASKED(LOG_NILE, "%s: vrc5074_device::device_start UPDATE Mapped size: 0x%08X start: 0x1fd00000 end: %08X\n", tag(), romSize, 0x1fd00000 + romSize - 1); } // Nile cpu register mapppings m_cpu_space->install_device(0x1fa00000, 0x1fa001ff, *static_cast(this), &vrc5074_device::cpu_map); @@ -300,8 +306,7 @@ void vrc5074_device::map_cpu_space() m_cpu_space->install_ram(winStart, winStart + winSize - 1, m_sdram[index].data()); m_cpu->add_fastram(winStart, winStart + winSize - 1, false, m_sdram[index].data()); } - if (LOG_NILE | LOG_MAP) - logerror("map_cpu_space ram_size=%08X ram_base=%08X\n", winSize, winStart); + LOGMASKED(LOG_NILE | LOG_MAP, "map_cpu_space ram_size=%08X ram_base=%08X\n", winSize, winStart); } } @@ -317,8 +322,7 @@ void vrc5074_device::map_cpu_space() if (winSize > 0 && m_cs_devices[index - 2] != nullptr) { m_cpu_space->install_device_delegate(winStart, winStart + winSize - 1, *m_cs_devices[index - 2], m_cs_maps[index - 2]); } - if (LOG_NILE | LOG_MAP) - logerror("map_cpu_space cs%d_size=%08X cs%d_base=%08X\n", index, winSize, index, winStart); + LOGMASKED(LOG_NILE | LOG_MAP, "map_cpu_space cs%d_size=%08X cs%d_base=%08X\n", index, winSize, index, winStart); } } @@ -341,8 +345,7 @@ void vrc5074_device::map_cpu_space() m_cpu_space->install_write_handler(winStart, winStart + winSize - 1, write32s_delegate(*this, FUNC(vrc5074_device::pci1_w))); } } - if (LOG_NILE | LOG_MAP) - logerror("map_cpu_space pci%d_size=%08X pci%d_base=%08X\n", index, winSize, index, winStart); + LOGMASKED(LOG_NILE | LOG_MAP, "map_cpu_space pci%d_size=%08X pci%d_base=%08X\n", index, winSize, index, winStart); } } } @@ -364,8 +367,7 @@ void vrc5074_device::map_extra(uint64_t memory_window_start, uint64_t memory_win winEnd = winStart + winSize -1; memory_space->install_read_handler(winStart, winEnd, read32s_delegate(*this, FUNC(vrc5074_device::target1_r))); memory_space->install_write_handler(winStart, winEnd, write32s_delegate(*this, FUNC(vrc5074_device::target1_w))); - if (LOG_NILE | LOG_MAP) - logerror("%s: map_extra Target Window 1 start=%08X end=%08X size=%08X\n", tag(), winStart, winEnd, winSize); + LOGMASKED(LOG_NILE | LOG_MAP, "%s: map_extra Target Window 1 start=%08X end=%08X size=%08X\n", tag(), winStart, winEnd, winSize); } //// PCI Target Window 2 //if (m_cpu_regs[NREG_PCITW2]&0x1000) { @@ -374,8 +376,7 @@ void vrc5074_device::map_extra(uint64_t memory_window_start, uint64_t memory_win // winSize = winEnd - winStart + 1; // memory_space->install_read_handler(winStart, winEnd, read32s_delegate(*this, FUNC(vrc5074_device::target2_r))); // memory_space->install_write_handler(winStart, winEnd, write32s_delegate(*this, FUNC(vrc5074_device::target2_w))); - // if (LOG_NILE) - // logerror("%s: map_extra Target Window 2 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_target2_laddr); + // LOGMASKED(LOG_NILE, "%s: map_extra Target Window 2 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_target2_laddr); //} } @@ -395,7 +396,7 @@ void vrc5074_device::sdram_addr_w(offs_t offset, uint32_t data, uint32_t mem_mas m_sdram_addr[0] = data; else if (offset == 2) m_sdram_addr[1] = data; - logerror("sdram_addr_w: offset: %08X data: %08X mem_mask: %08X\n", offset*4, data, mem_mask); + LOGMASKED(LOG_SDRAM, "sdram_addr_w: offset: %08X data: %08X mem_mask: %08X\n", offset*4, data, mem_mask); } void vrc5074_device::setup_pci_space() @@ -405,9 +406,8 @@ void vrc5074_device::setup_pci_space() m_pci_mask[index] = (1 << (36 - mask)) - 1; m_pci_laddr[index] = m_cpu_regs[NREG_PCIINIT0 + index * 2] & (~m_pci_mask[index]); m_pci_type[index] = m_cpu_regs[NREG_PCIINIT0 + index * 2] & 0xe; - if (1 && LOG_NILE) - logerror("setup_pci_space: mask_sel=%x pci_type=%x pci_mask[%d]=%08X pci_laddr[%d]=%08X\n", - mask, m_pci_type[index], index, m_pci_mask[index], index, m_pci_laddr[index]); + LOGMASKED(LOG_NILE, "setup_pci_space: mask_sel=%x pci_type=%x pci_mask[%d]=%08X pci_laddr[%d]=%08X\n", + mask, m_pci_type[index], index, m_pci_mask[index], index, m_pci_laddr[index]); } } // PCI Master Window 0 @@ -442,11 +442,10 @@ uint32_t vrc5074_device::pci0_r(offs_t offset, uint32_t mem_mask) } break; default: - logerror("Unknown PCI type\n"); + LOGMASKED(LOG_UNKNOWNS, "Unknown PCI type\n"); break; } - if (LOG_NILE_MASTER) - logerror("%s nile pci0_r offset %08X = %08X & %08X\n", machine().describe_context(), pci_addr, result, mem_mask); + LOGMASKED(LOG_NILE_MASTER, "%s nile pci0_r offset %08X = %08X & %08X\n", machine().describe_context(), pci_addr, result, mem_mask); return result; } void vrc5074_device::pci0_w(offs_t offset, uint32_t data, uint32_t mem_mask) @@ -480,12 +479,11 @@ void vrc5074_device::pci0_w(offs_t offset, uint32_t data, uint32_t mem_mask) } break; default: - logerror("Unknown PCI type\n"); + LOGMASKED(LOG_UNKNOWNS, "Unknown PCI type\n"); break; } //this->space(AS_DATA).write_dword(m_pci0_laddr | (offset*4), data, mem_mask); - if (LOG_NILE_MASTER) - logerror("%s nile pci0_w offset %08X = %08X & %08X\n", machine().describe_context(), pci_addr, data, mem_mask); + LOGMASKED(LOG_NILE_MASTER, "%s nile pci0_w offset %08X = %08X & %08X\n", machine().describe_context(), pci_addr, data, mem_mask); } // PCI Master Window 1 @@ -520,11 +518,10 @@ uint32_t vrc5074_device::pci1_r(offs_t offset, uint32_t mem_mask) } break; default: - logerror("Unknown PCI type\n"); + LOGMASKED(LOG_UNKNOWNS, "Unknown PCI type\n"); break; } - if (LOG_NILE_MASTER) - logerror("%s nile pci1_r offset %08X = %08X & %08X\n", machine().describe_context(), pci_addr, result, mem_mask); + LOGMASKED(LOG_NILE_MASTER, "%s nile pci1_r offset %08X = %08X & %08X\n", machine().describe_context(), pci_addr, result, mem_mask); return result; } void vrc5074_device::pci1_w(offs_t offset, uint32_t data, uint32_t mem_mask) @@ -557,20 +554,18 @@ void vrc5074_device::pci1_w(offs_t offset, uint32_t data, uint32_t mem_mask) } break; default: - logerror("Unknown PCI type\n"); + LOGMASKED(LOG_UNKNOWNS, "Unknown PCI type\n"); break; } //this->space(AS_DATA).write_dword(m_pci0_laddr | (offset*4), data, mem_mask); - if (LOG_NILE_MASTER) - logerror("%s nile pci1_w offset %08X = %08X & %08X\n", machine().describe_context(), pci_addr, data, mem_mask); + LOGMASKED(LOG_NILE_MASTER, "%s nile pci1_w offset %08X = %08X & %08X\n", machine().describe_context(), pci_addr, data, mem_mask); } // PCI Target Window 1 uint32_t vrc5074_device::target1_r(offs_t offset, uint32_t mem_mask) { uint32_t result = m_sdram[0][offset]; - if (LOG_NILE_TARGET) - logerror("%s nile target1 read from offset %02X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + LOGMASKED(LOG_NILE_TARGET, "%s nile target1 read from offset %02X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); return result; } void vrc5074_device::target1_w(offs_t offset, uint32_t data, uint32_t mem_mask) @@ -578,8 +573,7 @@ void vrc5074_device::target1_w(offs_t offset, uint32_t data, uint32_t mem_mask) //m_cpu->space(AS_PROGRAM).write_dword(m_target1_laddr | (offset*4), data, mem_mask); COMBINE_DATA(&m_sdram[0][offset]); //m_sdram[0][offset] = data; - if (LOG_NILE_TARGET) - logerror("%s nile target1 write to offset %02X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_NILE_TARGET, "%s nile target1 write to offset %02X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); } // DMA Transfer @@ -589,8 +583,7 @@ TIMER_CALLBACK_MEMBER (vrc5074_device::dma_transfer) //// Check for dma suspension //if (m_cpu_regs[NREG_DMACR1 + which * 0xc] & DMA_SUS) { - // if (LOG_NILE) - // logerror("%s nile DMA Suspended PCI: %08X MEM: %08X Words: %X\n", machine().describe_context(), m_cpu_regs[NREG_DMA_CPAR], m_cpu_regs[NREG_DMA_CMAR], m_cpu_regs[NREG_DMA_REM]); + // LOGMASKED(LOG_NILE, "%s nile DMA Suspended PCI: %08X MEM: %08X Words: %X\n", machine().describe_context(), m_cpu_regs[NREG_DMA_CPAR], m_cpu_regs[NREG_DMA_CMAR], m_cpu_regs[NREG_DMA_REM]); // return; //} @@ -638,7 +631,7 @@ TIMER_CALLBACK_MEMBER (vrc5074_device::dma_transfer) // if (m_irq_num != -1) { // m_cpu->set_input_line(m_irq_num, ASSERT_LINE); // } else { - // logerror("vrc5074_device::dma_transfer Error: DMA configured to trigger interrupt but no interrupt line configured\n"); + // LOGMASKED(LOG_ERRORS, "vrc5074_device::dma_transfer Error: DMA configured to trigger interrupt but no interrupt line configured\n"); // } // } // // Turn off the timer @@ -671,8 +664,7 @@ void vrc5074_device::update_pci_irq(const int index, const int state) { m_nile_irq_state &= ~(1 << (index + 8)); m_nile_irq_state |= state << (index + 8); - if (LOG_NILE_IRQS) - logerror("update_pci_irq: m_nile_irq_state: %04x index=%d state=%d\n", m_nile_irq_state, index, state); + LOGMASKED(LOG_NILE_IRQS, "update_pci_irq: m_nile_irq_state: %04x index=%d state=%d\n", m_nile_irq_state, index, state); update_nile_irqs(); } @@ -722,10 +714,10 @@ void vrc5074_device::update_nile_irqs() /* push out the state */ uint8_t change = m_irq_pins ^ irq; - if (LOG_NILE_IRQS) logerror("NILE IRQs:"); + LOGMASKED(LOG_NILE_IRQS, "NILE IRQs:"); for (i = 0; i < 6; i++) { - if (LOG_NILE_IRQS) logerror(" %d", (irq & (1 << i)) ? 1 : 0); + LOGMASKED(LOG_NILE_IRQS, " %d", (irq & (1 << i)) ? 1 : 0); if (change & (1 << i)) { if (irq & (1 << i)) { @@ -738,7 +730,7 @@ void vrc5074_device::update_nile_irqs() } } m_irq_pins = irq; - if (LOG_NILE_IRQS) logerror("\n"); + LOGMASKED(LOG_NILE_IRQS, "\n"); } @@ -746,7 +738,7 @@ TIMER_CALLBACK_MEMBER(vrc5074_device::nile_timer_callback) { int which = param; - if (LOG_TIMERS | LOG_NILE_IRQS) logerror("timer %d fired period: %e\n", which, m_timer_period[which]); + LOGMASKED(LOG_TIMERS | LOG_NILE_IRQS, "timer %d fired period: %e\n", which, m_timer_period[which]); /* adjust the timer to fire again */ { @@ -780,38 +772,38 @@ uint32_t vrc5074_device::cpu_reg_r(offs_t offset) { case NREG_CPUSTAT + 0: /* CPU status */ case NREG_CPUSTAT + 1: /* CPU status */ - if (LOG_NILE) logerror("%s NILE READ: CPU status(%03X) = %08X\n", machine().describe_context(), offset * 4, result); + LOGMASKED(LOG_NILE, "%s NILE READ: CPU status(%03X) = %08X\n", machine().describe_context(), offset * 4, result); logit = 0; break; case NREG_INTCTRL + 0: /* Interrupt control */ case NREG_INTCTRL + 1: /* Interrupt control */ - if (LOG_NILE) logerror("%s NILE READ: interrupt control(%03X) = %08X\n", machine().describe_context(), offset * 4, result); + LOGMASKED(LOG_NILE, "%s NILE READ: interrupt control(%03X) = %08X\n", machine().describe_context(), offset * 4, result); //update_nile_irqs(); logit = 0; break; case NREG_INTSTAT0 + 0: /* Interrupt status 0 */ case NREG_INTSTAT0 + 1: /* Interrupt status 0 */ - if (LOG_NILE | LOG_NILE_IRQS) logerror("%s NILE READ: interrupt status 0(%03X) = %08X\n", machine().describe_context(), offset * 4, result); + LOGMASKED(LOG_NILE | LOG_NILE_IRQS, "%s NILE READ: interrupt status 0(%03X) = %08X\n", machine().describe_context(), offset * 4, result); logit = 0; break; case NREG_INTSTAT1 + 0: /* Interrupt status 1 */ case NREG_INTSTAT1 + 1: /* Interrupt status 1 */ - if (LOG_NILE | LOG_NILE_IRQS) logerror("%s NILE READ: interrupt status 1/enable(%03X) = %08X\n", machine().describe_context(), offset * 4, result); + LOGMASKED(LOG_NILE | LOG_NILE_IRQS, "%s NILE READ: interrupt status 1/enable(%03X) = %08X\n", machine().describe_context(), offset * 4, result); logit = 0; break; case NREG_INTCLR + 0: /* Interrupt clear */ case NREG_INTCLR + 1: /* Interrupt clear */ - if (LOG_NILE) logerror("%s NILE READ: interrupt clear(%03X) = %08X\n", machine().describe_context(), offset * 4, result); + LOGMASKED(LOG_NILE, "%s NILE READ: interrupt clear(%03X) = %08X\n", machine().describe_context(), offset * 4, result); logit = 0; break; case NREG_INTPPES + 0: /* PCI Interrupt control */ case NREG_INTPPES + 1: /* PCI Interrupt control */ - if (LOG_NILE) logerror("%s NILE READ: PCI interrupt ppes(%03X) = %08X\n", machine().describe_context(), offset * 4, result); + LOGMASKED(LOG_NILE, "%s NILE READ: PCI interrupt ppes(%03X) = %08X\n", machine().describe_context(), offset * 4, result); logit = 0; break; @@ -837,12 +829,12 @@ uint32_t vrc5074_device::cpu_reg_r(offs_t offset) result = m_cpu_regs[offset] = m_timer[which]->remaining().as_double() * clock(); } - if (LOG_TIMERS) logerror("%s NILE READ: timer %d counter(%03X) = %08X\n", machine().describe_context(), which, offset * 4, result); + LOGMASKED(LOG_TIMERS, "%s NILE READ: timer %d counter(%03X) = %08X\n", machine().describe_context(), which, offset * 4, result); logit = 0; break; } - if (LOG_NILE && logit) - logerror("%s cpu_reg_r offset %03X = %08X\n", machine().describe_context(), offset * 4, result); + if (logit) + LOGMASKED(LOG_NILE, "%s cpu_reg_r offset %03X = %08X\n", machine().describe_context(), offset * 4, result); return result; } @@ -885,34 +877,34 @@ void vrc5074_device::cpu_reg_w(offs_t offset, uint32_t data, uint32_t mem_mask) if (data & 0x2) logerror("cpu_reg_w: CPU Warm Reset\n"); [[fallthrough]]; case NREG_CPUSTAT + 1: /* CPU status */ - if (LOG_NILE) logerror("%s NILE WRITE: CPU status(%03X) = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); + LOGMASKED(LOG_NILE, "%s NILE WRITE: CPU status(%03X) = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); logit = 0; break; case NREG_INTCTRL + 0: /* Interrupt control */ case NREG_INTCTRL + 1: /* Interrupt control */ - if (LOG_NILE | LOG_NILE_IRQS) logerror("%s NILE WRITE: interrupt control(%03X) = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); + LOGMASKED(LOG_NILE | LOG_NILE_IRQS, "%s NILE WRITE: interrupt control(%03X) = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); logit = 0; update_nile_irqs(); break; case NREG_INTSTAT0 + 0: /* Interrupt status 0 */ case NREG_INTSTAT0 + 1: /* Interrupt status 0 */ - if (LOG_NILE | LOG_NILE_IRQS) logerror("%s NILE WRITE: interrupt status 0/1(%03X) = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); + LOGMASKED(LOG_NILE | LOG_NILE_IRQS, "%s NILE WRITE: interrupt status 0/1(%03X) = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); logit = 0; //update_nile_irqs(); break; case NREG_INTSTAT1 + 0: /* Interrupt status 1 */ case NREG_INTSTAT1 + 1: /* Interrupt status 1 */ - if (LOG_NILE | LOG_NILE_IRQS) logerror("%s NILE WRITE: interrupt status 0/1 enable(%03X) = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); + LOGMASKED(LOG_NILE | LOG_NILE_IRQS, "%s NILE WRITE: interrupt status 0/1 enable(%03X) = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); logit = 0; //update_nile_irqs(); break; case NREG_INTCLR + 0: /* Interrupt clear */ //case NREG_INTCLR + 1: /* Interrupt clear */ - if (LOG_NILE | LOG_NILE_IRQS) logerror("%s NILE WRITE: interrupt clear(%03X) = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); + LOGMASKED(LOG_NILE | LOG_NILE_IRQS, "%s NILE WRITE: interrupt clear(%03X) = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); logit = 0; // Only edge triggered interrupts are cleared // TODO: Check which are edge triggered for midway vegas it is only the lower (non-pci) interrupts @@ -922,7 +914,7 @@ void vrc5074_device::cpu_reg_w(offs_t offset, uint32_t data, uint32_t mem_mask) case NREG_INTPPES + 0: /* PCI Interrupt control */ case NREG_INTPPES + 1: /* PCI Interrupt control */ - if (LOG_NILE) logerror("%s NILE WRITE: PCI interrupt ppes(%03X) = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); + LOGMASKED(LOG_NILE, "%s NILE WRITE: PCI interrupt ppes(%03X) = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); logit = 0; break; @@ -946,7 +938,7 @@ void vrc5074_device::cpu_reg_w(offs_t offset, uint32_t data, uint32_t mem_mask) case NREG_DMACTRL0: case NREG_DMACTRL1: which = (offset - NREG_DMACTRL0) / 6; - logerror("%s NILE WRITE: DMACTRL %d = %08X\n", machine().describe_context(), which, data); + LOGMASKED(LOG_DMACTRL, "%s NILE WRITE: DMACTRL %d = %08X\n", machine().describe_context(), which, data); logit = 0; break; case NREG_T0CTRL + 1: /* SDRAM timer control (control bits) */ @@ -954,20 +946,20 @@ void vrc5074_device::cpu_reg_w(offs_t offset, uint32_t data, uint32_t mem_mask) case NREG_T2CTRL + 1: /* general purpose timer control (control bits) */ case NREG_T3CTRL + 1: /* watchdog timer control (control bits) */ which = (offset - NREG_T0CTRL) / 4; - if (LOG_NILE | LOG_TIMERS) logerror("%s NILE WRITE: timer %d control(%03X) = %08X & %08X\n", machine().describe_context(), which, offset * 4, data, mem_mask); + LOGMASKED(LOG_NILE | LOG_TIMERS, "%s NILE WRITE: timer %d control(%03X) = %08X & %08X\n", machine().describe_context(), which, offset * 4, data, mem_mask); logit = 0; m_timer_period[which] = (uint64_t(m_cpu_regs[NREG_T0CTRL + which * 4]) + 1) * attotime::from_hz(clock()).as_double(); if (m_cpu_regs[offset] & 2) { // Cascade timer uint32_t scaleSrc = (m_cpu_regs[offset] >> 2) & 0x3; m_timer_period[which] += (uint64_t(m_cpu_regs[NREG_T0CTRL + scaleSrc * 4]) + 1) * attotime::from_hz(clock()).as_double(); - logerror("Timer scale: timer %d is scaled by %08X\n", which, m_cpu_regs[NREG_T0CTRL + which * 4]); + LOGMASKED(LOG_TIMERS, "Timer scale: timer %d is scaled by %08X\n", which, m_cpu_regs[NREG_T0CTRL + which * 4]); } /* timer just enabled? */ if (!(olddata & 1) && (m_cpu_regs[offset] & 1)) { m_timer[which]->adjust(attotime::from_hz(clock()) * m_cpu_regs[NREG_T0CNTR + which * 4], which); - if (LOG_TIMERS) logerror("Starting timer %d at a rate of %f Hz\n", which, attotime::from_double(m_timer_period[which]).as_hz()); + LOGMASKED(LOG_TIMERS, "Starting timer %d at a rate of %f Hz\n", which, attotime::from_double(m_timer_period[which]).as_hz()); } /* timer disabled? */ @@ -983,7 +975,7 @@ void vrc5074_device::cpu_reg_w(offs_t offset, uint32_t data, uint32_t mem_mask) case NREG_T2CNTR: /* general purpose timer control (counter) */ case NREG_T3CNTR: /* watchdog timer control (counter) */ which = (offset - NREG_T0CNTR) / 4; - if (LOG_TIMERS) logerror("%s NILE WRITE: timer %d counter(%03X) = %08X & %08X\n", machine().describe_context(), which, offset * 4, data, mem_mask); + LOGMASKED(LOG_TIMERS, "%s NILE WRITE: timer %d counter(%03X) = %08X & %08X\n", machine().describe_context(), which, offset * 4, data, mem_mask); logit = 0; if (m_cpu_regs[offset - 1] & 1) @@ -993,8 +985,8 @@ void vrc5074_device::cpu_reg_w(offs_t offset, uint32_t data, uint32_t mem_mask) break; } - if (LOG_NILE && logit) - logerror("%s cpu_reg_w offset %03X = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); + if (logit) + LOGMASKED(LOG_NILE, "%s cpu_reg_w offset %03X = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); } WRITE_LINE_MEMBER(vrc5074_device::uart_irq_callback) @@ -1002,8 +994,7 @@ WRITE_LINE_MEMBER(vrc5074_device::uart_irq_callback) if (state ^ m_uart_irq) { m_uart_irq = state; update_nile_irqs(); - if (LOG_NILE | LOG_NILE_IRQS) - logerror("uart_irq_callback: state = %d\n", state); + LOGMASKED(LOG_NILE_IRQS, "uart_irq_callback: state = %d\n", state); } } @@ -1011,17 +1002,16 @@ uint32_t vrc5074_device::serial_r(offs_t offset) { uint32_t result = m_uart->ins8250_r(offset>>1); - if (0 && LOG_NILE) - logerror("%s serial_r offset %03X = %08X (%08x)\n", machine().describe_context(), offset>>1, result, offset*4); + LOGMASKED(LOG_SERIAL_READS, "%s serial_r offset %03X = %08X (%08x)\n", machine().describe_context(), offset>>1, result, offset*4); return result; } void vrc5074_device::serial_w(offs_t offset, uint32_t data, uint32_t mem_mask) { m_uart->ins8250_w(offset>>1, data); - if (PRINTF_SERIAL && offset == NREG_UARTTHR) { + if ((VERBOSE & LOG_SERIAL_DATA) && offset == NREG_UARTTHR) { static std::string debugStr; - printf("%c", data); + logerror("%c", data); if (data == 0xd || debugStr.length()>=80) { logerror("%s", debugStr.c_str()); debugStr.clear(); @@ -1030,6 +1020,5 @@ void vrc5074_device::serial_w(offs_t offset, uint32_t data, uint32_t mem_mask) debugStr += char(data); } } - if (0 && LOG_NILE) - logerror("%s serial_w offset %03X = %08X & %08X (%08x)\n", machine().describe_context(), offset>>1, data, mem_mask, offset*4); + LOGMASKED(LOG_SERIAL_WRITES, "%s serial_w offset %03X = %08X & %08X (%08x)\n", machine().describe_context(), offset>>1, data, mem_mask, offset*4); } diff --git a/src/devices/machine/vt8231_isa.cpp b/src/devices/machine/vt8231_isa.cpp index c80b8144632..8d2589dc8a9 100644 --- a/src/devices/machine/vt8231_isa.cpp +++ b/src/devices/machine/vt8231_isa.cpp @@ -9,7 +9,6 @@ #include "emu.h" #include "vt8231_isa.h" -//#define LOG_GENERAL (1U << 0) #define LOG_MAPPING (1U << 1) #define LOG_REG (1U << 2) #define LOG_SUPERIO (1U << 3) diff --git a/src/devices/machine/wd1010.cpp b/src/devices/machine/wd1010.cpp index 866d52921fe..ca6d3590f8b 100644 --- a/src/devices/machine/wd1010.cpp +++ b/src/devices/machine/wd1010.cpp @@ -9,12 +9,11 @@ #include "emu.h" #include "wd1010.h" -//#define LOG_GENERAL (1U << 0) -#define LOG_CMD (1U << 1) -#define LOG_INT (1U << 2) -#define LOG_SEEK (1U << 3) -#define LOG_REGS (1U << 4) -#define LOG_DATA (1U << 5) +#define LOG_CMD (1U << 1) +#define LOG_INT (1U << 2) +#define LOG_SEEK (1U << 3) +#define LOG_REGS (1U << 4) +#define LOG_DATA (1U << 5) #define VERBOSE (LOG_CMD | LOG_INT | LOG_SEEK | LOG_REGS | LOG_DATA) //#define LOG_OUTPUT_STREAM std::cout diff --git a/src/devices/machine/wd33c9x.cpp b/src/devices/machine/wd33c9x.cpp index cb59256cea1..6b4ea0681de 100644 --- a/src/devices/machine/wd33c9x.cpp +++ b/src/devices/machine/wd33c9x.cpp @@ -18,14 +18,14 @@ #include "emu.h" #include "wd33c9x.h" -#define LOG_READS (1 << 0) -#define LOG_WRITES (1 << 1) -#define LOG_COMMANDS (1 << 2) -#define LOG_ERRORS (1 << 3) -#define LOG_MISC (1 << 4) -#define LOG_LINES (1 << 5) -#define LOG_STATE (1 << 6) -#define LOG_STEP (1 << 7) +#define LOG_READS (1U << 1) +#define LOG_WRITES (1U << 2) +#define LOG_COMMANDS (1U << 3) +#define LOG_ERRORS (1U << 4) +#define LOG_MISC (1U << 5) +#define LOG_LINES (1U << 6) +#define LOG_STATE (1U << 7) +#define LOG_STEP (1U << 8) #define LOG_REGS (LOG_READS | LOG_WRITES) #define LOG_ALL (LOG_REGS | LOG_COMMANDS | LOG_ERRORS | LOG_MISC | LOG_LINES | LOG_STATE | LOG_STEP) diff --git a/src/devices/machine/wd_fdc.cpp b/src/devices/machine/wd_fdc.cpp index ac07dc460d8..1cfab7042d8 100644 --- a/src/devices/machine/wd_fdc.cpp +++ b/src/devices/machine/wd_fdc.cpp @@ -7,7 +7,6 @@ #include "debugger.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already #define LOG_SETUP (1U << 1) // Shows register setup #define LOG_SHIFT (1U << 2) // Shows shift register contents #define LOG_COMP (1U << 3) // Shows operations on the CPU side diff --git a/src/devices/machine/wtl3132.cpp b/src/devices/machine/wtl3132.cpp index 94f448654f2..7e1d1c2a4d5 100644 --- a/src/devices/machine/wtl3132.cpp +++ b/src/devices/machine/wtl3132.cpp @@ -16,7 +16,6 @@ #include "emu.h" #include "wtl3132.h" -#define LOG_GENERAL (1U << 0) #define LOG_REGS (1U << 1) #define LOG_IO (1U << 2) #define LOG_BYPASS (1U << 3) diff --git a/src/devices/machine/z8038.cpp b/src/devices/machine/z8038.cpp index 699c43898ca..54057ac117c 100644 --- a/src/devices/machine/z8038.cpp +++ b/src/devices/machine/z8038.cpp @@ -21,7 +21,6 @@ #include "emu.h" #include "z8038.h" -#define LOG_GENERAL (1U << 0) #define LOG_REG (1U << 1) #define LOG_FIFO (1U << 2) #define LOG_INT (1U << 3) diff --git a/src/devices/machine/z80dma.cpp b/src/devices/machine/z80dma.cpp index 72b77850891..261545b2abb 100644 --- a/src/devices/machine/z80dma.cpp +++ b/src/devices/machine/z80dma.cpp @@ -26,7 +26,6 @@ #include "emu.h" #include "z80dma.h" -#define LOG_GENERAL (1U << 0) #define LOG_DMA (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_DMA) diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp index 8a6efee3fae..5d1a0cffef8 100644 --- a/src/devices/machine/z80scc.cpp +++ b/src/devices/machine/z80scc.cpp @@ -99,16 +99,15 @@ baud rate: // CONFIGURABLE LOGGING //************************************************************************** -#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) -#define LOG_READ (1U << 2) -#define LOG_INT (1U << 3) -#define LOG_CMD (1U << 4) -#define LOG_TX (1U << 5) -#define LOG_RCV (1U << 6) -#define LOG_CTS (1U << 7) -#define LOG_DCD (1U << 8) -#define LOG_SYNC (1U << 9) +#define LOG_SETUP (1U << 1) +#define LOG_READ (1U << 2) +#define LOG_INT (1U << 3) +#define LOG_CMD (1U << 4) +#define LOG_TX (1U << 5) +#define LOG_RCV (1U << 6) +#define LOG_CTS (1U << 7) +#define LOG_DCD (1U << 8) +#define LOG_SYNC (1U << 9) //#define VERBOSE (LOG_GENERAL|LOG_SETUP|LOG_READ|LOG_INT|LOG_CMD|LOG_TX|LOG_RCV|LOG_CTS|LOG_DCD|LOG_SYNC) //#define LOG_OUTPUT_STREAM std::cout diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp index 8306c48bab4..1cc00b784ab 100644 --- a/src/devices/machine/z80sio.cpp +++ b/src/devices/machine/z80sio.cpp @@ -72,19 +72,18 @@ // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) -#define LOG_READ (1U << 2) -#define LOG_INT (1U << 3) -#define LOG_CMD (1U << 4) -#define LOG_TX (1U << 5) -#define LOG_RCV (1U << 6) -#define LOG_CTS (1U << 7) -#define LOG_DCD (1U << 8) -#define LOG_SYNC (1U << 9) -#define LOG_BIT (1U << 10) -#define LOG_RTS (1U << 11) -#define LOG_BRG (1U << 12) +#define LOG_SETUP (1U << 1) +#define LOG_READ (1U << 2) +#define LOG_INT (1U << 3) +#define LOG_CMD (1U << 4) +#define LOG_TX (1U << 5) +#define LOG_RCV (1U << 6) +#define LOG_CTS (1U << 7) +#define LOG_DCD (1U << 8) +#define LOG_SYNC (1U << 9) +#define LOG_BIT (1U << 10) +#define LOG_RTS (1U << 11) +#define LOG_BRG (1U << 12) //#define VERBOSE (LOG_CMD | LOG_SETUP | LOG_SYNC | LOG_BIT | LOG_TX ) //#define LOG_OUTPUT_STREAM std::cout diff --git a/src/devices/sound/ay8910.cpp b/src/devices/sound/ay8910.cpp index a38308f53f0..7ba11e22e56 100644 --- a/src/devices/sound/ay8910.cpp +++ b/src/devices/sound/ay8910.cpp @@ -584,6 +584,11 @@ YM2203 Japanese datasheet contents, translated: http://www.larwe.com/technical/c #include "emu.h" #include "ay8910.h" +#define LOG_IGNORED_WRITES (1U << 1) +#define LOG_WARNINGS (1U << 2) +#define VERBOSE (LOG_WARNINGS) +#include "logmacro.h" + /************************************* * * constants @@ -591,7 +596,6 @@ YM2203 Japanese datasheet contents, translated: http://www.larwe.com/technical/c *************************************/ #define ENABLE_REGISTER_TEST (0) // Enable preprogrammed registers -#define LOG_IGNORED_WRITES (0) static constexpr stream_buffer::sample_t MAX_OUTPUT = 1.0; @@ -1001,7 +1005,7 @@ void ay8910_device::ay8910_write_reg(int r, int v) } } else if (m_mode & 0xf) - logerror("%s: warning: activated unknown mode %02x at %s\n", machine().describe_context(), m_mode & 0xf, name()); + LOGMASKED(LOG_WARNINGS, "%s: warning: activated unknown mode %02x at %s\n", machine().describe_context(), m_mode & 0xf, name()); } } m_envelope[0].set_shape(m_regs[AY_EASHAPE], m_env_step_mask); @@ -1012,13 +1016,11 @@ void ay8910_device::ay8910_write_reg(int r, int v) if (!m_port_a_write_cb.isnull()) m_port_a_write_cb((offs_t)0, m_regs[AY_PORTA]); else - logerror("%s: warning: unmapped write %02x to %s Port A\n", machine().describe_context(), v, name()); + LOGMASKED(LOG_WARNINGS, "%s: warning: unmapped write %02x to %s Port A\n", machine().describe_context(), v, name()); } else { -#if LOG_IGNORED_WRITES - logerror("%s: warning: write %02x to %s Port A set as input - ignored\n", machine().describe_context(), v, name()); -#endif + LOGMASKED(LOG_IGNORED_WRITES, "%s: warning: write %02x to %s Port A set as input - ignored\n", machine().describe_context(), v, name()); } break; case AY_PORTB: @@ -1027,13 +1029,11 @@ void ay8910_device::ay8910_write_reg(int r, int v) if (!m_port_b_write_cb.isnull()) m_port_b_write_cb((offs_t)0, m_regs[AY_PORTB]); else - logerror("%s: warning: unmapped write %02x to %s Port B\n", machine().describe_context(), v, name()); + LOGMASKED(LOG_WARNINGS, "%s: warning: unmapped write %02x to %s Port B\n", machine().describe_context(), v, name()); } else { -#if LOG_IGNORED_WRITES - logerror("%s: warning: write %02x to %s Port B set as input - ignored\n", machine().describe_context(), v, name()); -#endif + LOGMASKED(LOG_IGNORED_WRITES, "%s: warning: write %02x to %s Port B set as input - ignored\n", machine().describe_context(), v, name()); } break; case AY_EBFINE: @@ -1232,7 +1232,7 @@ void ay8910_device::build_mixer_table() if ((m_flags & AY8910_LEGACY_OUTPUT) != 0) { - logerror("%s using legacy output levels!\n", name()); + LOGMASKED(LOG_WARNINGS, "%s using legacy output levels!\n", name()); normalize = 1; } @@ -1317,7 +1317,7 @@ void ay8910_device::device_start() if ((m_flags & AY8910_SINGLE_OUTPUT) != 0) { - logerror("%s device using single output!\n", name()); + LOGMASKED(LOG_WARNINGS, "%s device using single output!\n", name()); m_streams = 1; } @@ -1419,7 +1419,7 @@ void ay8910_device::ay8910_write_ym(int addr, u8 data) } else { - logerror("%s: warning - %s upper address mismatch\n", machine().describe_context(), name()); + LOGMASKED(LOG_WARNINGS, "%s: warning - %s upper address mismatch\n", machine().describe_context(), name()); } } } @@ -1441,7 +1441,7 @@ u8 ay8910_device::ay8910_read_ym() { case AY_PORTA: if ((m_regs[AY_ENABLE] & 0x40) != 0) - logerror("%s: warning - read from %s Port A set as output\n", machine().describe_context(), name()); + LOGMASKED(LOG_WARNINGS, "%s: warning - read from %s Port A set as output\n", machine().describe_context(), name()); /* even if the port is set as output, we still need to return the external data. Some games, like kidniki, need this to work. @@ -1455,15 +1455,15 @@ u8 ay8910_device::ay8910_read_ym() if (!m_port_a_read_cb.isnull()) m_regs[AY_PORTA] = m_port_a_read_cb(0); else - logerror("%s: warning - read 8910 Port A\n", machine().describe_context()); + LOGMASKED(LOG_WARNINGS, "%s: warning - read 8910 Port A\n", machine().describe_context()); break; case AY_PORTB: if ((m_regs[AY_ENABLE] & 0x80) != 0) - logerror("%s: warning - read from 8910 Port B set as output\n", machine().describe_context()); + LOGMASKED(LOG_WARNINGS, "%s: warning - read from 8910 Port B set as output\n", machine().describe_context()); if (!m_port_b_read_cb.isnull()) m_regs[AY_PORTB] = m_port_b_read_cb(0); else - logerror("%s: warning - read 8910 Port B\n", machine().describe_context()); + LOGMASKED(LOG_WARNINGS, "%s: warning - read 8910 Port B\n", machine().describe_context()); break; } diff --git a/src/devices/sound/cem3394.cpp b/src/devices/sound/cem3394.cpp index 0a4ba228827..b047092e00b 100644 --- a/src/devices/sound/cem3394.cpp +++ b/src/devices/sound/cem3394.cpp @@ -23,7 +23,11 @@ // logging -#define LOG_CONTROL_CHANGES (0) +#define LOG_CONTROL_CHANGES (1U << 1) +#define LOG_NANS (1U << 2) +#define LOG_VALUES (1U << 3) +#define VERBOSE (LOG_NANS) +#include "logmacro.h" // use 0.25 as the base volume for pulses @@ -200,7 +204,7 @@ double cem3394_device::filter(double input, double cutoff) // catch any NaNs if (std::isnan(output)) { - logerror("NAN - vco: %6.0f cutoff: %6.0f res: %.5f output: %.5f\n", m_vco_step / m_inv_sample_rate, cutoff, m_filter_resonance, output); + LOGMASKED(LOG_NANS, "NAN - vco: %6.0f cutoff: %6.0f res: %.5f output: %.5f\n", m_vco_step / m_inv_sample_rate, cutoff, m_filter_resonance, output); output = 0; m_filter_out[0] = m_filter_out[1] = 0; } @@ -253,7 +257,7 @@ double cem3394_device::filter(double input, double cutoff) // catch NaNs if (std::isnan(output)) { - logerror("NAN - vco: %6.0f cutoff: %6.0f res: %.5f output: %.5f\n", m_vco_step / m_inv_sample_rate, cutoff, m_filter_resonance, output); + LOGMASKED(LOG_NANS, "NAN - vco: %6.0f cutoff: %6.0f res: %.5f output: %.5f\n", m_vco_step / m_inv_sample_rate, cutoff, m_filter_resonance, output); output = 0; } @@ -298,7 +302,7 @@ void cem3394_device::sound_stream_update(sound_stream &stream, std::vector freq=%f\n", voltage, temp); + LOGMASKED(LOG_CONTROL_CHANGES, "VCO_FREQ=%6.3fV -> freq=%f\n", voltage, temp); break; // wave select determines triangle/sawtooth enable @@ -464,7 +468,7 @@ void cem3394_device::set_voltage(int input, double voltage) m_wave_select |= WAVE_TRIANGLE | WAVE_SAWTOOTH; else if (voltage >= 2.3 && voltage <= 3.9) m_wave_select |= WAVE_SAWTOOTH; - if (LOG_CONTROL_CHANGES) logerror("WAVE_SEL=%6.3fV -> tri=%d saw=%d\n", voltage, (m_wave_select & WAVE_TRIANGLE) ? 1 : 0, (m_wave_select & WAVE_SAWTOOTH) ? 1 : 0); + LOGMASKED(LOG_CONTROL_CHANGES, "WAVE_SEL=%6.3fV -> tri=%d saw=%d\n", voltage, (m_wave_select & WAVE_TRIANGLE) ? 1 : 0, (m_wave_select & WAVE_SAWTOOTH) ? 1 : 0); break; // pulse width determines duty cycle; 0.0 means 0%, 2.0 means 100% @@ -481,13 +485,13 @@ void cem3394_device::set_voltage(int input, double voltage) m_pulse_width = MINIMUM_WIDTH + (MAXIMUM_WIDTH - MINIMUM_WIDTH) * m_pulse_width; m_wave_select |= WAVE_PULSE; } - if (LOG_CONTROL_CHANGES) logerror("PULSE_WI=%6.3fV -> raw=%f adj=%f\n", voltage, voltage * 0.5, m_pulse_width); + LOGMASKED(LOG_CONTROL_CHANGES, "PULSE_WI=%6.3fV -> raw=%f adj=%f\n", voltage, voltage * 0.5, m_pulse_width); break; // final gain is pretty self-explanatory; 0.0 means ~90dB, 4.0 means 0dB case FINAL_GAIN: m_volume = compute_db_volume(voltage); - if (LOG_CONTROL_CHANGES) logerror("TOT_GAIN=%6.3fV -> vol=%f\n", voltage, m_volume); + LOGMASKED(LOG_CONTROL_CHANGES, "TOT_GAIN=%6.3fV -> vol=%f\n", voltage, m_volume); break; // mixer balance is a pan between the external input and the internal input @@ -503,13 +507,13 @@ void cem3394_device::set_voltage(int input, double voltage) m_mixer_internal = compute_db_volume(3.55 - 0.45 * (voltage * 0.25)); m_mixer_external = compute_db_volume(3.55 + voltage); } - if (LOG_CONTROL_CHANGES) logerror(" BALANCE=%6.3fV -> int=%f ext=%f\n", voltage, m_mixer_internal, m_mixer_external); + LOGMASKED(LOG_CONTROL_CHANGES, " BALANCE=%6.3fV -> int=%f ext=%f\n", voltage, m_mixer_internal, m_mixer_external); break; // filter frequency varies from -3.0 to +4.0, at 0.375V/octave case FILTER_FREQENCY: m_filter_frequency = m_filter_zero_freq * pow(2.0, -voltage * (1.0 / 0.375)); - if (LOG_CONTROL_CHANGES) logerror("FLT_FREQ=%6.3fV -> freq=%f\n", voltage, m_filter_frequency); + LOGMASKED(LOG_CONTROL_CHANGES, "FLT_FREQ=%6.3fV -> freq=%f\n", voltage, m_filter_frequency); break; // modulation depth is 0.01*freq at 0V and 2.0*freq at 3.5V @@ -520,7 +524,7 @@ void cem3394_device::set_voltage(int input, double voltage) m_filter_modulation = 1.99; else m_filter_modulation = (voltage * (1.0 / 3.5)) * 1.98 + 0.01; - if (LOG_CONTROL_CHANGES) logerror("FLT_MODU=%6.3fV -> mod=%f\n", voltage, m_filter_modulation); + LOGMASKED(LOG_CONTROL_CHANGES, "FLT_MODU=%6.3fV -> mod=%f\n", voltage, m_filter_modulation); break; // this is not yet implemented @@ -531,7 +535,7 @@ void cem3394_device::set_voltage(int input, double voltage) m_filter_resonance = 1.0; else m_filter_resonance = voltage * (1.0 / 2.5); - if (LOG_CONTROL_CHANGES) logerror("FLT_RESO=%6.3fV -> mod=%f\n", voltage, m_filter_resonance); + LOGMASKED(LOG_CONTROL_CHANGES, "FLT_RESO=%6.3fV -> mod=%f\n", voltage, m_filter_resonance); break; } } diff --git a/src/devices/sound/es1373.cpp b/src/devices/sound/es1373.cpp index d254527b0bc..779b57c6ba9 100644 --- a/src/devices/sound/es1373.cpp +++ b/src/devices/sound/es1373.cpp @@ -6,9 +6,16 @@ #include "speaker.h" -#define LOG_ES (0) -#define LOG_ES_REG (0) -#define LOG_ES_FILE (0) +#define LOG_OTHER (1U << 1) +#define LOG_REG (1U << 2) +#define LOG_IRQ (1U << 3) +#define LOG_ADC (1U << 4) +#define LOG_INVALID (1U << 5) +#define LOG_UNIMPL (1U << 6) +#define LOG_SAMPLES (1U << 7) + +#define VERBOSE (LOG_UNIMPL | LOG_INVALID) +#include "logmacro.h" /* Ensonic ES1373 registers 0x00-0x3f */ @@ -87,7 +94,7 @@ void es1373_device::map(address_map &map) es1373_device::es1373_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pci_device(mconfig, ES1373, tag, owner, clock) , device_sound_interface(mconfig, *this), m_stream(nullptr) - , m_eslog(nullptr), m_tempCount(0), m_timer(nullptr), m_memory_space(nullptr), m_irq_handler(*this) + , m_timer(nullptr), m_memory_space(nullptr), m_irq_handler(*this) { set_ids(0x12741371, 0x04, 0x040100, 0x12741371); } @@ -98,19 +105,6 @@ void es1373_device::device_resolve_objects() m_irq_handler.resolve_safe(); } -//------------------------------------------------- -// device_stop - device-specific stop -//------------------------------------------------- -void es1373_device::device_stop() -{ - /* debugging */ - if (LOG_ES_FILE && m_eslog) - { - fclose(m_eslog); - m_eslog = nullptr; - } -} - //------------------------------------------------- // device_start - device-specific startup //------------------------------------------------- @@ -179,16 +173,6 @@ void es1373_device::device_post_load() void es1373_device::device_reset() { - // debugging - m_tempCount = 0; - if (LOG_ES_FILE && m_eslog) - { - fclose(m_eslog); - m_eslog = nullptr; - } - if (LOG_ES_FILE && !m_eslog) - m_eslog = fopen("es.log", "w"); - pci_device::device_reset(); memset(m_es_regs, 0, sizeof(m_es_regs)); memset(m_ac97_regs, 0, sizeof(m_ac97_regs)); @@ -236,7 +220,7 @@ TIMER_CALLBACK_MEMBER(es1373_device::delayed_stream_update) void es1373_device::sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) { if (m_dac1.enable) { - logerror("%s: sound_stream_update DAC1 not implemented yet\n", tag()); + LOGMASKED(LOG_UNIMPL, "%s: sound_stream_update DAC1 not implemented yet\n", tag()); } if (m_dac2.enable) { @@ -248,13 +232,12 @@ void es1373_device::sound_stream_update(sound_stream &stream, std::vector chan.buf_size) { if (chan.loop_en) { @@ -360,13 +335,11 @@ void es1373_device::send_audio_out(chan_info& chan, uint32_t intr_mask, write_st //chan.buf_count -= 1; // Should check SCTRL_P2_END_MASK chan.buf_count = 0; //chan.buf_rptr -= 1; - if (LOG_ES) - logerror("%s: send_audio_out DAC2 clearing buf_count\n", machine().describe_context()); + LOGMASKED(LOG_OTHER, "%s: send_audio_out DAC2 clearing buf_count\n", machine().describe_context()); } if (chan.int_en) { m_es_regs[ES_INT_CS_STATUS] |= intr_mask; - if (LOG_ES) - logerror("%s: send_audio_out Setting DAC2 interrupt\n", machine().describe_context()); + LOGMASKED(LOG_OTHER, "%s: send_audio_out Setting DAC2 interrupt\n", machine().describe_context()); } } if (buf_row_done && !(chan.buf_rptr&0xf)) { @@ -382,9 +355,8 @@ void es1373_device::transfer_pci_audio(chan_info& chan, int type) { uint32_t pci_addr, data; pci_addr = chan.pci_addr + (chan.pci_count<<2); - if (LOG_ES) - logerror("%s: transfer_pci_audio start chan: %X pci_addr: %08X pci_count: %X pci_size: %X buf_rptr: %X buf_wptr: %X\n", - machine().describe_context(), chan.number, pci_addr, chan.pci_count, chan.pci_size, chan.buf_rptr, chan.buf_wptr); + LOGMASKED(LOG_OTHER, "%s: transfer_pci_audio start chan: %X pci_addr: %08X pci_count: %X pci_size: %X buf_rptr: %X buf_wptr: %X\n", + machine().describe_context(), chan.number, pci_addr, chan.pci_count, chan.pci_size, chan.buf_rptr, chan.buf_wptr); // Always transfer 8 longwords for (int i=0; i<8; i++) { pci_addr = chan.pci_addr + (chan.pci_count<<2); @@ -425,7 +397,7 @@ uint32_t es1373_device::calc_size(const uint8_t &format) return 4; break; } - logerror("%s: calc_size Invalid format = %X specified\n", tag(), format); + LOGMASKED(LOG_INVALID, "%s: calc_size Invalid format = %X specified\n", tag(), format); return 0; } @@ -487,8 +459,7 @@ uint32_t es1373_device::reg_r(offs_t offset, uint32_t mem_mask) default: break; } - if (LOG_ES_REG) - logerror("%s:ES1373 read from offset %02X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + LOGMASKED(LOG_REG, "%s:ES1373 read from offset %02X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); return result; } @@ -538,12 +509,10 @@ void es1373_device::reg_w(offs_t offset, uint32_t data, uint32_t mem_mask) if (m_es_regs[ES_INT_CS_STATUS]&ICSTATUS_INTR_MASK && m_irq_num!=-1) { m_irq_handler(0); m_es_regs[ES_INT_CS_STATUS] &= ~ICSTATUS_INTR_MASK; - if (0 && LOG_ES_REG) - logerror("%s: es1373_device::reg_w Clearing interrupt\n", machine().describe_context()); + LOGMASKED(LOG_IRQ, "%s: es1373_device::reg_w Clearing interrupt\n", machine().describe_context()); } } - if (0 && LOG_ES_REG) - logerror("%s: es1373_device::reg_w adc_int_en: %i dac1_int_en: %i dac2_int_en: %i\n", tag(), m_adc.int_en, m_dac1.int_en, m_dac2.int_en); + LOGMASKED(LOG_ADC, "%s: es1373_device::reg_w adc_int_en: %i dac1_int_en: %i dac2_int_en: %i\n", tag(), m_adc.int_en, m_dac1.int_en, m_dac2.int_en); break; case ES_DAC2_CNT: m_dac2.buf_count = 0; @@ -593,8 +562,7 @@ void es1373_device::reg_w(offs_t offset, uint32_t data, uint32_t mem_mask) case 0xc: m_dac2.pci_count = (data>>16)&0xffff; m_dac2.pci_size = data&0xffff; - if (LOG_ES_REG) - logerror("%s:ES1373 write to offset %02X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_REG, "%s:ES1373 write to offset %02X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); break; default: break; @@ -604,7 +572,5 @@ void es1373_device::reg_w(offs_t offset, uint32_t data, uint32_t mem_mask) break; } - if (LOG_ES_REG) - logerror("%s:ES1373 write to offset %02X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); - + LOGMASKED(LOG_REG, "%s:ES1373 write to offset %02X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); } diff --git a/src/devices/sound/es1373.h b/src/devices/sound/es1373.h index 6d493391ae4..df3c62687bd 100644 --- a/src/devices/sound/es1373.h +++ b/src/devices/sound/es1373.h @@ -24,7 +24,6 @@ public: protected: virtual void device_resolve_objects() override; virtual void device_start() override; - virtual void device_stop() override; virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; virtual void device_post_load() override; @@ -35,8 +34,6 @@ protected: // Sound stream sound_stream *m_stream; - FILE *m_eslog; - private: struct chan_info { int number; @@ -58,7 +55,6 @@ private: uint32_t calc_size(const uint8_t &format); void send_audio_out(chan_info& chan, uint32_t intr_mask, write_stream_view &outL, write_stream_view &outR); - uint32_t m_tempCount; emu_timer *m_timer; address_space *m_memory_space; devcb_write_line m_irq_handler; diff --git a/src/devices/sound/gaelco.cpp b/src/devices/sound/gaelco.cpp index 39a14d6487f..2c04678ff62 100644 --- a/src/devices/sound/gaelco.cpp +++ b/src/devices/sound/gaelco.cpp @@ -40,10 +40,10 @@ Registers per channel: #include "wavwrite.h" -#define VERBOSE_SOUND 0 -#define VERBOSE_READ_WRITES 0 -#define LOG_SOUND(x) do { if (VERBOSE_SOUND) logerror x; } while (0) -#define LOG_READ_WRITES(x) do { if (VERBOSE_READ_WRITES) logerror x; } while (0) +#define LOG_SOUND (1U << 1) +#define LOG_READ_WRITES (1U << 2) +#define VERBOSE (0) +#include "logmacro.h" //#define ALT_MIX @@ -135,7 +135,7 @@ void gaelco_gae1_device::sound_stream_update(sound_stream &stream, std::vectoractive = 0; // play2000 expects these to expire, are they valid? this is unrelated to the missing sounds in touchgo which never hits here m_sndregs[base_offset + 3]--; @@ -192,7 +192,7 @@ void gaelco_gae1_device::sound_stream_update(sound_stream &stream, std::vectorupdate(); @@ -208,7 +208,7 @@ void gaelco_gae1_device::gaelcosnd_w(offs_t offset, uint16_t data, uint16_t mem_ { sound_channel *channel = &m_channel[offset >> 3]; - LOG_READ_WRITES(("%s: (GAE1): write %04x to %04x\n", machine().describe_context(), data, offset)); + LOGMASKED(LOG_READ_WRITES, "%s: (GAE1): write %04x to %04x\n", machine().describe_context(), data, offset); /* first update the stream to this point in time */ m_stream->update(); @@ -221,7 +221,7 @@ void gaelco_gae1_device::gaelcosnd_w(offs_t offset, uint16_t data, uint16_t mem_ // if sample end position isn't 0, and length isn't 0 if ((m_sndregs[offset - 1] != 0) && (data != 0)) { - LOG_SOUND(("(GAE1) Playing or Queuing 1st chunk in channel: %02d, type: %02x, bank: %02x, end: %08x, Length: %04x\n", offset >> 3, (m_sndregs[offset - 2] >> 4) & 0x0f, m_sndregs[offset - 2] & 0x03, m_sndregs[offset - 1] << 8, data)); + LOGMASKED(LOG_SOUND, "(GAE1) Playing or Queuing 1st chunk in channel: %02d, type: %02x, bank: %02x, end: %08x, Length: %04x\n", offset >> 3, (m_sndregs[offset - 2] >> 4) & 0x0f, m_sndregs[offset - 2] & 0x03, m_sndregs[offset - 1] << 8, data); channel->loop = 1; @@ -244,7 +244,7 @@ void gaelco_gae1_device::gaelcosnd_w(offs_t offset, uint16_t data, uint16_t mem_ // if sample end position isn't 0, and length isn't 0 if ((m_sndregs[offset - 1] != 0) && (data != 0)) { - LOG_SOUND(("(GAE1) Playing or Queuing 2nd chunk in channel: %02d, type: %02x, bank: %02x, end: %08x, Length: %04x\n", offset >> 3, (m_sndregs[offset - 2] >> 4) & 0x0f, m_sndregs[offset - 2] & 0x03, m_sndregs[offset - 1] << 8, data)); + LOGMASKED(LOG_SOUND, "(GAE1) Playing or Queuing 2nd chunk in channel: %02d, type: %02x, bank: %02x, end: %08x, Length: %04x\n", offset >> 3, (m_sndregs[offset - 2] >> 4) & 0x0f, m_sndregs[offset - 2] & 0x03, m_sndregs[offset - 1] << 8, data); channel->loop = 1; diff --git a/src/devices/sound/mas3507d.cpp b/src/devices/sound/mas3507d.cpp index 4036fba50f2..c04d60a9a42 100644 --- a/src/devices/sound/mas3507d.cpp +++ b/src/devices/sound/mas3507d.cpp @@ -15,12 +15,11 @@ #include "mas3507d.h" #include "mp3_audio.h" -#define LOG_GENERAL (1 << 0) -#define LOG_READ (1 << 1) -#define LOG_WRITE (1 << 2) -#define LOG_REGISTER (1 << 3) -#define LOG_CONFIG (1 << 4) -#define LOG_OTHER (1 << 5) +#define LOG_READ (1U << 1) +#define LOG_WRITE (1U << 2) +#define LOG_REGISTER (1U << 3) +#define LOG_CONFIG (1U << 4) +#define LOG_OTHER (1U << 5) // #define VERBOSE (LOG_GENERAL | LOG_READ | LOG_WRITE | LOG_REGISTER | LOG_CONFIG | LOG_OTHER) // #define LOG_OUTPUT_STREAM std::cout diff --git a/src/devices/sound/qsound.cpp b/src/devices/sound/qsound.cpp index bae635a6f7b..1843ae1c4fb 100644 --- a/src/devices/sound/qsound.cpp +++ b/src/devices/sound/qsound.cpp @@ -102,7 +102,6 @@ #include #include -#define LOG_GENERAL (1U << 0) #define LOG_COMMAND (1U << 1) #define LOG_SAMPLE (1U << 2) diff --git a/src/devices/sound/sn76477.cpp b/src/devices/sound/sn76477.cpp index 5e98ef94f65..ab61cf894b3 100644 --- a/src/devices/sound/sn76477.cpp +++ b/src/devices/sound/sn76477.cpp @@ -49,7 +49,8 @@ * *****************************************************************************/ -#define VERBOSE 0 +#define VERBOSE (0) +#include "logmacro.h" /* if 1, create a .wav file of the sound produced */ #define LOG_WAV 0 @@ -75,8 +76,6 @@ #define LOG_WAV_FILE_NAME "sn76477_%s.wav" -#define LOG(n,...) do { if (VERBOSE >= (n)) logerror(__VA_ARGS__); } while (0) - #define CHECK_BOOLEAN assert((state & 0x01) == state) #define CHECK_POSITIVE assert(data >= 0.0) #define CHECK_VOLTAGE assert((data >= 0.0) && (data <= 5.0)) @@ -627,7 +626,7 @@ void sn76477_device::log_enable_line() "Enabled", "Inhibited" }; - LOG(1, "SN76477: Enable line (9): %d [%s]\n", m_enable, desc[m_enable]); + LOG("Enable line (9): %d [%s]\n", m_enable, desc[m_enable]); } @@ -639,7 +638,7 @@ void sn76477_device::log_mixer_mode() "SLF/Noise", "SLF/VCO/Noise", "SLF/VCO", "Inhibit" }; - LOG(1, "SN76477: Mixer mode (25-27): %d [%s]\n", m_mixer_mode, desc[m_mixer_mode]); + LOG("Mixer mode (25-27): %d [%s]\n", m_mixer_mode, desc[m_mixer_mode]); } @@ -650,7 +649,7 @@ void sn76477_device::log_envelope_mode() "VCO", "One-Shot", "Mixer Only", "VCO with Alternating Polarity" }; - LOG(1, "SN76477: Envelope mode (1,28): %d [%s]\n", m_envelope_mode, desc[m_envelope_mode]); + LOG("Envelope mode (1,28): %d [%s]\n", m_envelope_mode, desc[m_envelope_mode]); } @@ -661,7 +660,7 @@ void sn76477_device::log_vco_mode() "External (Pin 16)", "Internal (SLF)" }; - LOG(1, "SN76477: VCO mode (22): %d [%s]\n", m_vco_mode, desc[m_vco_mode]); + LOG("VCO mode (22): %d [%s]\n", m_vco_mode, desc[m_vco_mode]); } @@ -671,16 +670,16 @@ void sn76477_device::log_one_shot_time() { if (compute_one_shot_cap_charging_rate() > 0) { - LOG(1, "SN76477: One-shot time (23,24): %.4f sec\n", ONE_SHOT_CAP_VOLTAGE_RANGE * (1 / compute_one_shot_cap_charging_rate())); + LOG("One-shot time (23,24): %.4f sec\n", ONE_SHOT_CAP_VOLTAGE_RANGE * (1 / compute_one_shot_cap_charging_rate())); } else { - LOG(1, "SN76477: One-shot time (23,24): N/A\n"); + LOG("One-shot time (23,24): N/A\n"); } } else { - LOG(1, "SN76477: One-shot time (23,24): External (cap = %.2fV)\n", m_one_shot_cap_voltage); + LOG("One-shot time (23,24): External (cap = %.2fV)\n", m_one_shot_cap_voltage); } } @@ -694,29 +693,29 @@ void sn76477_device::log_slf_freq() double charging_time = (1 / compute_slf_cap_charging_rate()) * SLF_CAP_VOLTAGE_RANGE; double discharging_time = (1 / compute_slf_cap_discharging_rate()) * SLF_CAP_VOLTAGE_RANGE; - LOG(1, "SN76477: SLF frequency (20,21): %.2f Hz\n", 1 / (charging_time + discharging_time)); + LOG("SLF frequency (20,21): %.2f Hz\n", 1 / (charging_time + discharging_time)); } else { - LOG(1, "SN76477: SLF frequency (20,21): N/A\n"); + LOG("SLF frequency (20,21): N/A\n"); } } else { - LOG(1, "SN76477: SLF frequency (20,21): External (cap = %.2fV)\n", m_slf_cap_voltage); + LOG("SLF frequency (20,21): External (cap = %.2fV)\n", m_slf_cap_voltage); } } void sn76477_device::log_vco_pitch_voltage() { - LOG(1, "SN76477: VCO pitch voltage (19): %.2fV\n", m_pitch_voltage); + LOG("VCO pitch voltage (19): %.2fV\n", m_pitch_voltage); } void sn76477_device::log_vco_duty_cycle() { - LOG(1, "SN76477: VCO duty cycle (16,19): %.0f%%\n", compute_vco_duty_cycle() * 100.0); + LOG("VCO duty cycle (16,19): %.0f%%\n", compute_vco_duty_cycle() * 100.0); } @@ -729,16 +728,16 @@ void sn76477_device::log_vco_freq() double min_freq = compute_vco_cap_charging_discharging_rate() / (2 * VCO_CAP_VOLTAGE_RANGE); double max_freq = compute_vco_cap_charging_discharging_rate() / (2 * VCO_TO_SLF_VOLTAGE_DIFF); - LOG(1, "SN76477: VCO frequency (17,18): %.2f Hz - %.1f Hz\n", min_freq, max_freq); + LOG("VCO frequency (17,18): %.2f Hz - %.1f Hz\n", min_freq, max_freq); } else { - LOG(1, "SN76477: VCO frequency (17,18): N/A\n"); + LOG("VCO frequency (17,18): N/A\n"); } } else { - LOG(1, "SN76477: VCO frequency (17,18): External (cap = %.2fV)\n", m_vco_cap_voltage); + LOG("VCO frequency (17,18): External (cap = %.2fV)\n", m_vco_cap_voltage); } } @@ -750,13 +749,13 @@ void sn76477_device::log_vco_ext_voltage() double min_freq = compute_vco_cap_charging_discharging_rate() / (2 * VCO_CAP_VOLTAGE_RANGE); double max_freq = compute_vco_cap_charging_discharging_rate() / (2 * VCO_TO_SLF_VOLTAGE_DIFF); - LOG(1, "SN76477: VCO ext. voltage (16): %.2fV (%.2f Hz)\n", + LOG("VCO ext. voltage (16): %.2fV (%.2f Hz)\n", m_vco_voltage, min_freq + ((max_freq - min_freq) * m_vco_voltage / VCO_MAX_EXT_VOLTAGE)); } else { - LOG(1, "SN76477: VCO ext. voltage (16): %.2fV (saturated, no output)\n", m_vco_voltage); + LOG("VCO ext. voltage (16): %.2fV (saturated, no output)\n", m_vco_voltage); } } @@ -765,17 +764,17 @@ void sn76477_device::log_noise_gen_freq() { if (m_noise_clock_ext) { - LOG(1, "SN76477: Noise gen frequency (4): External\n"); + LOG("Noise gen frequency (4): External\n"); } else { if (compute_noise_gen_freq() > 0) { - LOG(1, "SN76477: Noise gen frequency (4): %d Hz\n", compute_noise_gen_freq()); + LOG("Noise gen frequency (4): %d Hz\n", compute_noise_gen_freq()); } else { - LOG(1, "SN76477: Noise gen frequency (4): N/A\n"); + LOG("Noise gen frequency (4): N/A\n"); } } } @@ -794,21 +793,21 @@ void sn76477_device::log_noise_filter_freq() double charging_time = (1 / charging_rate) * NOISE_CAP_VOLTAGE_RANGE; double discharging_time = (1 / charging_rate) * NOISE_CAP_VOLTAGE_RANGE; - LOG(1, "SN76477: Noise filter frequency (5,6): %.0f Hz\n", 1 / (charging_time + discharging_time)); + LOG("Noise filter frequency (5,6): %.0f Hz\n", 1 / (charging_time + discharging_time)); } else { - LOG(1, "SN76477: Noise filter frequency (5,6): Very Large (Filtering Disabled)\n"); + LOG("Noise filter frequency (5,6): Very Large (Filtering Disabled)\n"); } } else { - LOG(1, "SN76477: Noise filter frequency (5,6): N/A\n"); + LOG("Noise filter frequency (5,6): N/A\n"); } } else { - LOG(1, "SN76477: Noise filter frequency (5,6): External (cap = %.2fV)\n", m_noise_filter_cap); + LOG("Noise filter frequency (5,6): External (cap = %.2fV)\n", m_noise_filter_cap); } } @@ -819,16 +818,16 @@ void sn76477_device::log_attack_time() { if (compute_attack_decay_cap_charging_rate() > 0) { - LOG(1, "SN76477: Attack time (8,10): %.4f sec\n", AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_charging_rate())); + LOG("Attack time (8,10): %.4f sec\n", AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_charging_rate())); } else { - LOG(1, "SN76477: Attack time (8,10): N/A\n"); + LOG("Attack time (8,10): N/A\n"); } } else { - LOG(1, "SN76477: Attack time (8,10): External (cap = %.2fV)\n", m_attack_decay_cap_voltage); + LOG("Attack time (8,10): External (cap = %.2fV)\n", m_attack_decay_cap_voltage); } } @@ -839,23 +838,23 @@ void sn76477_device::log_decay_time() { if (compute_attack_decay_cap_discharging_rate() > 0) { - LOG(1, "SN76477: Decay time (7,8): %.4f sec\n", AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_discharging_rate())); + LOG("Decay time (7,8): %.4f sec\n", AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_discharging_rate())); } else { - LOG(1, "SN76477: Decay time (8,10): N/A\n"); + LOG("Decay time (8,10): N/A\n"); } } else { - LOG(1, "SN76477: Decay time (7, 8): External (cap = %.2fV)\n", m_attack_decay_cap_voltage); + LOG("Decay time (7, 8): External (cap = %.2fV)\n", m_attack_decay_cap_voltage); } } void sn76477_device::log_voltage_out() { - LOG(1, "SN76477: Voltage OUT range (11,12): %.2fV - %.2fV (clips above %.2fV)\n", + LOG("Voltage OUT range (11,12): %.2fV - %.2fV (clips above %.2fV)\n", OUT_CENTER_LEVEL_VOLTAGE + compute_center_to_peak_voltage_out() * out_neg_gain[(int)(AD_CAP_VOLTAGE_MAX * 10)], OUT_CENTER_LEVEL_VOLTAGE + compute_center_to_peak_voltage_out() * out_pos_gain[(int)(AD_CAP_VOLTAGE_MAX * 10)], OUT_HIGH_CLIP_THRESHOLD); @@ -899,7 +898,7 @@ void sn76477_device::open_wav_file() m_file = util::wav_open(wav_file_name, m_our_sample_rate, 2); - LOG(1, "SN76477: Logging output: %s\n", wav_file_name); + LOG("Logging output: %s\n", wav_file_name); } diff --git a/src/devices/sound/sp0256.cpp b/src/devices/sound/sp0256.cpp index 7f709ec90c0..f4a127616d8 100644 --- a/src/devices/sound/sp0256.cpp +++ b/src/devices/sound/sp0256.cpp @@ -23,7 +23,6 @@ #include "emu.h" #include "sp0256.h" -#define LOG_GENERAL (1U << 0) #define LOG_FIFO (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_FIFO) diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp index 77622b12fef..9e2f3c6b278 100644 --- a/src/devices/sound/tms5220.cpp +++ b/src/devices/sound/tms5220.cpp @@ -368,37 +368,35 @@ emulating the tms5220 in MCU code). Look for a 16-pin chip at U6 labeled /* *****debugging defines***** */ -// general, somewhat obsolete, catch all for debugs which don't fit elsewhere -#define LOG_GENERAL (1 << 0) -/* 5220 only; above dumps the data written to the tms52xx to stdout, useful +/* 5220 only; above dumps the data written to the tms52xx to the error log, useful for making logged data dumps for real hardware tests */ -#define LOG_DUMP_INPUT_DATA (1 << 1) +#define LOG_DUMP_INPUT_DATA (1U << 1) // 5220 only; above debugs FIFO stuff: writes, reads and flag updates -#define LOG_FIFO (1 << 2) +#define LOG_FIFO (1U << 2) // dumps each speech frame as binary -#define LOG_PARSE_FRAME_DUMP_BIN (1 << 3) +#define LOG_PARSE_FRAME_DUMP_BIN (1U << 3) // dumps each speech frame as hex -#define LOG_PARSE_FRAME_DUMP_HEX (1 << 4) +#define LOG_PARSE_FRAME_DUMP_HEX (1U << 4) // dumps info if a frame ran out of data -#define LOG_FRAME_ERRORS (1 << 6) +#define LOG_FRAME_ERRORS (1U << 6) // dumps all non-speech-data command writes -#define LOG_COMMAND_DUMP (1 << 7) +#define LOG_COMMAND_DUMP (1U << 7) // dumps decoded info about command writes -#define LOG_COMMAND_VERBOSE (1 << 8) -// spams the errorlog with i/o ready messages whenever the ready or irq pin is read -#define LOG_PIN_READS (1 << 9) +#define LOG_COMMAND_VERBOSE (1U << 8) +// spams the error log with i/o ready messages whenever the ready or irq pin is read +#define LOG_PIN_READS (1U << 9) // dumps debug information related to the sample generation loop, i.e. whether interpolation is inhibited or not, and what the current and target values for each frame are. -#define LOG_GENERATION (1 << 10) +#define LOG_GENERATION (1U << 10) // dumps MUCH MORE debug information related to the sample generation loop, namely the excitation, energy, pitch, k*, and output values for EVERY SINGLE SAMPLE during a frame. -#define LOG_GENERATION_VERBOSE (1 << 11) +#define LOG_GENERATION_VERBOSE (1U << 11) // dumps the lattice filter state data each sample. -#define LOG_LATTICE (1 << 12) -// dumps info to stderr whenever the analog clip hardware is (or would be) clipping the signal. -#define LOG_CLIP (1 << 13) +#define LOG_LATTICE (1U << 12) +// dumps info to the error log whenever the analog clip hardware is (or would be) clipping the signal. +#define LOG_CLIP (1U << 13) // debugs the io ready callback timer -#define LOG_IO_READY (1 << 14) +#define LOG_IO_READY (1U << 14) // debugs the tms5220_data_r and data_w access methods which actually respect rs and ws -#define LOG_RS_WS (1 << 15) +#define LOG_RS_WS (1U << 15) //#define VERBOSE (LOG_GENERAL | LOG_DUMP_INPUT_DATA | LOG_FIFO | LOG_PARSE_FRAME_DUMP_HEX | LOG_FRAME_ERRORS | LOG_COMMAND_DUMP | LOG_COMMAND_VERBOSE | LOG_PIN_READS | LOG_GENERATION | LOG_GENERATION_VERBOSE | LOG_LATTICE | LOG_CLIP | LOG_IO_READY | LOG_RS_WS) #include "logmacro.h" @@ -609,7 +607,7 @@ uint8_t tms5220_device::new_int_read() new_int_write(0, 0, 0, 0); // romclk 0, m0 0, m1 0, addr bus nybble = 0/open bus if (!m_data_cb.isnull()) return m_data_cb(); - LOGMASKED(LOG_GENERAL, "WARNING: CALLBACK MISSING, RETURNING 0!\n"); + LOG("WARNING: CALLBACK MISSING, RETURNING 0!\n"); return 0; } @@ -741,7 +739,7 @@ void tms5220_device::update_fifo_status_and_ints() // also, in this case, regardless if DDIS was set, unset it. if (m_previous_talk_status && !talk_status()) { - LOGMASKED(LOG_GENERAL, "Talk status WAS 1, is now 0, unsetting DDIS and firing an interrupt!\n"); + LOG("Talk status WAS 1, is now 0, unsetting DDIS and firing an interrupt!\n"); set_interrupt_state(1); m_DDIS = false; } @@ -789,7 +787,7 @@ int tms5220_device::extract_bits(int count) while (count--) { val = (val << 1) | new_int_read(); - LOGMASKED(LOG_GENERAL, "bit read: %d\n", val&1); + LOG("bit read: %d\n", val&1); } #endif } @@ -802,7 +800,7 @@ void tms5220_device::perform_dummy_read() if (m_schedule_dummy_read) { int data = new_int_read(); - LOGMASKED(LOG_GENERAL, "TMS5110 performing dummy read; value read = %1i\n", data & 1); + LOG("TMS5110 performing dummy read; value read = %1i\n", data & 1); m_schedule_dummy_read = false; } } @@ -886,7 +884,7 @@ void tms5220_device::process(int16_t *buffer, unsigned int size) int i, bitout; int32_t this_sample; - LOGMASKED(LOG_GENERAL, "process called with size of %d; IP=%d, PC=%d, subcycle=%d, m_SPEN=%d, m_TALK=%d, m_TALKD=%d\n", size, m_IP, m_PC, m_subcycle, m_SPEN, m_TALK, m_TALKD); + LOG("process called with size of %d; IP=%d, PC=%d, subcycle=%d, m_SPEN=%d, m_TALK=%d, m_TALKD=%d\n", size, m_IP, m_PC, m_subcycle, m_SPEN, m_TALK, m_TALKD); /* loop until the buffer is full or we've stopped speaking */ while (size > 0) @@ -1219,8 +1217,8 @@ int32_t tms5220_device::matrix_multiply(int32_t a, int32_t b) const while (b>16383) { b-=32768; } while (b<-16384) { b+=32768; } result = ((a*b)>>9); /** TODO: this isn't technically right to the chip, which truncates the lowest result bit, but it causes glitches otherwise. **/ - if (result>16383) LOGMASKED(LOG_GENERAL, "matrix multiplier overflowed! a: %x, b: %x, result: %x", a, b, result); - if (result<-16384) LOGMASKED(LOG_GENERAL, "matrix multiplier underflowed! a: %x, b: %x, result: %x", a, b, result); + if (result>16383) LOG("matrix multiplier overflowed! a: %x, b: %x, result: %x", a, b, result); + if (result<-16384) LOG("matrix multiplier underflowed! a: %x, b: %x, result: %x", a, b, result); return result; } @@ -1542,9 +1540,9 @@ void tms5220_device::parse_frame() LOGMASKED(LOG_PARSE_FRAME_DUMP_BIN | LOG_PARSE_FRAME_DUMP_HEX, "\n"); if (m_DDIS) - LOGMASKED(LOG_GENERAL, "Parsed a frame successfully in FIFO - %d bits remaining\n", (m_fifo_count*8)-(m_fifo_bits_taken)); + LOG("Parsed a frame successfully in FIFO - %d bits remaining\n", (m_fifo_count*8)-(m_fifo_bits_taken)); else - LOGMASKED(LOG_GENERAL, "Parsed a frame successfully in ROM\n"); + LOG("Parsed a frame successfully in ROM\n"); return; ranout: diff --git a/src/devices/sound/uda1344.cpp b/src/devices/sound/uda1344.cpp index 183ba51fd36..d63aa5a4cd1 100644 --- a/src/devices/sound/uda1344.cpp +++ b/src/devices/sound/uda1344.cpp @@ -9,11 +9,11 @@ #include "emu.h" #include "sound/uda1344.h" -#define LOG_ADDR (1 << 1) -#define LOG_STATUS_REG (1 << 2) -#define LOG_DATA_REG (1 << 3) -#define LOG_INPUT (1 << 4) -#define LOG_OVERRUNS (1 << 5) +#define LOG_ADDR (1U << 1) +#define LOG_STATUS_REG (1U << 2) +#define LOG_DATA_REG (1U << 3) +#define LOG_INPUT (1U << 4) +#define LOG_OVERRUNS (1U << 5) #define LOG_ALL (LOG_ADDR | LOG_STATUS_REG | LOG_DATA_REG | LOG_INPUT | LOG_OVERRUNS) #define VERBOSE (0) diff --git a/src/devices/sound/x1_010.cpp b/src/devices/sound/x1_010.cpp index d18f40c5f84..2947ed66654 100644 --- a/src/devices/sound/x1_010.cpp +++ b/src/devices/sound/x1_010.cpp @@ -56,13 +56,11 @@ Registers: #include "x1_010.h" -#define VERBOSE_SOUND 0 -#define VERBOSE_REGISTER_WRITE 0 -#define VERBOSE_REGISTER_READ 0 - -#define LOG_SOUND(...) do { if (VERBOSE_SOUND) logerror(__VA_ARGS__); } while (0) -#define LOG_REGISTER_WRITE(...) do { if (VERBOSE_REGISTER_WRITE) logerror(__VA_ARGS__); } while (0) -#define LOG_REGISTER_READ(...) do { if (VERBOSE_REGISTER_READ) logerror(__VA_ARGS__); } while (0) +#define LOG_SOUND (1U << 1) +#define LOG_REGISTER_WRITE (1U << 2) +#define LOG_REGISTER_READ (1U << 3) +#define VERBOSE (0) +#include "logmacro.h" namespace { @@ -116,7 +114,7 @@ void x1_010_device::device_start() m_env_offset[i] = 0; } /* Print some more debug info */ - LOG_SOUND("masterclock = %d rate = %d\n", clock(), m_rate); + LOGMASKED(LOG_SOUND, "masterclock = %d rate = %d\n", clock(), m_rate); /* get stream channels */ m_stream = stream_alloc(0, 2, m_rate); @@ -180,7 +178,7 @@ void x1_010_device::write(offs_t offset, u8 data) m_smp_offset[channel] = 0; m_env_offset[channel] = 0; } - LOG_REGISTER_WRITE("%s: offset %6X : data %2X\n", machine().describe_context(), offset, data); + LOGMASKED(LOG_REGISTER_WRITE, "%s: offset %6X : data %2X\n", machine().describe_context(), offset, data); m_reg[offset] = data; } @@ -192,7 +190,7 @@ u16 x1_010_device::word_r(offs_t offset) u16 ret; ret = m_HI_WORD_BUF[offset] << 8; ret |= (read(offset) & 0xff); - LOG_REGISTER_READ("%s: Read X1-010 Offset:%04X Data:%04X\n", machine().describe_context(), offset, ret); + LOGMASKED(LOG_REGISTER_READ, "%s: Read X1-010 Offset:%04X Data:%04X\n", machine().describe_context(), offset, ret); return ret; } @@ -200,7 +198,7 @@ void x1_010_device::word_w(offs_t offset, u16 data) { m_HI_WORD_BUF[offset] = (data >> 8) & 0xff; write(offset, data & 0xff); - LOG_REGISTER_WRITE("%s: Write X1-010 Offset:%04X Data:%04X\n", machine().describe_context(), offset, data); + LOGMASKED(LOG_REGISTER_WRITE, "%s: Write X1-010 Offset:%04X Data:%04X\n", machine().describe_context(), offset, data); } @@ -238,7 +236,7 @@ void x1_010_device::sound_stream_update(sound_stream &stream, std::vectorvolume, ch, reg->end, freq, smp_step, smp_offs); } for (int i = 0; i < bufL.samples(); i++) diff --git a/src/devices/video/315_5124.cpp b/src/devices/video/315_5124.cpp index 7bb4fd18407..1b87b1a8bba 100644 --- a/src/devices/video/315_5124.cpp +++ b/src/devices/video/315_5124.cpp @@ -72,10 +72,9 @@ PAL frame timing * Configurable logging ****************************************************************************/ -#define LOG_GENERAL (1U << 0) -#define LOG_VIDMODE (1U << 1) -#define LOG_REGWRITE (1U << 2) -#define LOG_VCOUNTREAD (1U << 3) +#define LOG_VIDMODE (1U << 1) +#define LOG_REGWRITE (1U << 2) +#define LOG_VCOUNTREAD (1U << 3) //#define VERBOSE (LOG_GENERAL | LOG_VIDMODE | LOG_REGWRITE | LOG_VCOUNTREAD) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/devices/video/atirage.cpp b/src/devices/video/atirage.cpp index 10048a38a27..76c6cc47c3c 100644 --- a/src/devices/video/atirage.cpp +++ b/src/devices/video/atirage.cpp @@ -470,7 +470,7 @@ u32 atirage_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, c break; default: - LOGMASKED(LOG_GENERAL, "Unknown pixel format %d\n", m_format); + LOG("Unknown pixel format %d\n", m_format); break; } diff --git a/src/devices/video/bt431.cpp b/src/devices/video/bt431.cpp index a4a32e98716..a8953edb4e9 100644 --- a/src/devices/video/bt431.cpp +++ b/src/devices/video/bt431.cpp @@ -14,8 +14,6 @@ #include "emu.h" #include "bt431.h" -#define LOG_GENERAL (1U << 0) - //#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/video/bt45x.cpp b/src/devices/video/bt45x.cpp index 26594307513..e3ef49246df 100644 --- a/src/devices/video/bt45x.cpp +++ b/src/devices/video/bt45x.cpp @@ -36,8 +36,8 @@ #include "emu.h" #include "bt45x.h" -#define LOG_READS (1U << 0) -#define LOG_WRITES (1U << 1) +#define LOG_READS (1U << 1) +#define LOG_WRITES (1U << 2) #define VERBOSE (0) diff --git a/src/devices/video/bt47x.cpp b/src/devices/video/bt47x.cpp index d5aea56a400..24c78633228 100644 --- a/src/devices/video/bt47x.cpp +++ b/src/devices/video/bt47x.cpp @@ -27,7 +27,6 @@ #include "emu.h" #include "bt47x.h" -#define LOG_GENERAL (1U << 0) #define LOG_READS (1U << 1) //#define VERBOSE (LOG_GENERAL) diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp index 978e38e792e..61a5a9b9ae8 100644 --- a/src/devices/video/clgd542x.cpp +++ b/src/devices/video/clgd542x.cpp @@ -12,8 +12,10 @@ #include "screen.h" -#define LOG_REG 0 -#define LOG_BLIT 1 +#define LOG_REG (1U << 1) +#define LOG_BLIT (1U << 2) +#define VERBOSE (0) +#include "logmacro.h" #define CRTC_PORT_ADDR ((vga.miscellaneous_output&1)?0x3d0:0x3b0) @@ -266,7 +268,7 @@ void cirrus_gd5428_device::start_bitblt() return; } - if(LOG_BLIT) logerror("CL: BitBLT started: Src: %06x Dst: %06x Width: %i Height %i ROP: %02x Mode: %02x\n",m_blt_source,m_blt_dest,m_blt_width,m_blt_height,m_blt_rop,m_blt_mode); + LOGMASKED(LOG_BLIT, "CL: BitBLT started: Src: %06x Dst: %06x Width: %i Height %i ROP: %02x Mode: %02x\n",m_blt_source,m_blt_dest,m_blt_width,m_blt_height,m_blt_rop,m_blt_mode); m_blt_source_current = m_blt_source; m_blt_dest_current = m_blt_dest; @@ -341,7 +343,7 @@ void cirrus_gd5428_device::start_reverse_bitblt() { uint32_t x,y; - if(LOG_BLIT) logerror("CL: Reverse BitBLT started: Src: %06x Dst: %06x Width: %i Height %i ROP: %02x Mode: %02x\n",m_blt_source,m_blt_dest,m_blt_width,m_blt_height,m_blt_rop,m_blt_mode); + LOGMASKED(LOG_BLIT, "CL: Reverse BitBLT started: Src: %06x Dst: %06x Width: %i Height %i ROP: %02x Mode: %02x\n",m_blt_source,m_blt_dest,m_blt_width,m_blt_height,m_blt_rop,m_blt_mode); // Start at end of blit m_blt_source_current = m_blt_source; @@ -414,7 +416,7 @@ void cirrus_gd5428_device::start_reverse_bitblt() void cirrus_gd5428_device::start_system_bitblt() { - if(LOG_BLIT) logerror("CL: BitBLT from system memory started: Src: %06x Dst: %06x Width: %i Height %i ROP: %02x Mode: %02x\n",m_blt_source,m_blt_dest,m_blt_width,m_blt_height,m_blt_rop,m_blt_mode); + LOGMASKED(LOG_BLIT, "CL: BitBLT from system memory started: Src: %06x Dst: %06x Width: %i Height %i ROP: %02x Mode: %02x\n",m_blt_source,m_blt_dest,m_blt_width,m_blt_height,m_blt_rop,m_blt_mode); m_blt_system_transfer = true; m_blt_system_count = 0; m_blt_system_buffer = 0; @@ -579,7 +581,7 @@ uint8_t cirrus_gd5428_device::cirrus_seq_reg_read(uint8_t index) void cirrus_gd5428_device::cirrus_seq_reg_write(uint8_t index, uint8_t data) { - if(LOG_REG) logerror("CL: SEQ write %02x to SR%02x\n",data,index); + LOGMASKED(LOG_REG, "CL: SEQ write %02x to SR%02x\n",data,index); switch(index) { case 0x02: @@ -793,7 +795,7 @@ uint8_t cirrus_gd5428_device::cirrus_gc_reg_read(uint8_t index) void cirrus_gd5428_device::cirrus_gc_reg_write(uint8_t index, uint8_t data) { - if(LOG_REG) logerror("CL: GC write %02x to GR%02x\n",data,index); + LOGMASKED(LOG_REG, "CL: GC write %02x to GR%02x\n",data,index); switch(index) { case 0x00: // if extended writes are enabled (bit 2 of index 0bh), then index 0 and 1 are extended to 8 bits, however XFree86 does not appear to do this... @@ -1119,7 +1121,7 @@ uint8_t cirrus_gd5428_device::cirrus_crtc_reg_read(uint8_t index) void cirrus_gd5428_device::cirrus_crtc_reg_write(uint8_t index, uint8_t data) { - if(LOG_REG) logerror("CL: CRTC write %02x to CR%02x\n",data,index); + LOGMASKED(LOG_REG, "CL: CRTC write %02x to CR%02x\n",data,index); switch(index) { case 0x16: // VGA Vertical Blank end - some SVGA chipsets use all 8 bits, and this is one of them (according to MFGTST CRTC tests) diff --git a/src/devices/video/decsfb.cpp b/src/devices/video/decsfb.cpp index 528c9897cdc..1a94ba1a694 100644 --- a/src/devices/video/decsfb.cpp +++ b/src/devices/video/decsfb.cpp @@ -26,7 +26,6 @@ #define MODE_TRANSPARENTLINE 6 #define MODE_COPY 7 -#define LOG_GENERAL (1U << 0) #define LOG_REG (1U << 1) #define LOG_IRQ (1U << 2) diff --git a/src/devices/video/epic12.cpp b/src/devices/video/epic12.cpp index 5e5b36ca9c5..97401c7a38e 100644 --- a/src/devices/video/epic12.cpp +++ b/src/devices/video/epic12.cpp @@ -7,7 +7,7 @@ #include "screen.h" -#define LOG_DEBUG (1U << 1) +#define LOG_DEBUG (1U << 1) //#define VERBOSE (LOG_DEBUG) #include "logmacro.h" diff --git a/src/devices/video/fixfreq.cpp b/src/devices/video/fixfreq.cpp index cf4c4bb5517..7b168022aac 100644 --- a/src/devices/video/fixfreq.cpp +++ b/src/devices/video/fixfreq.cpp @@ -23,9 +23,7 @@ #include -// for quick and dirty debugging -#define LOG_GENERAL (1U << 0) - +// for debug logging #define VERBOSE 0 #define LOG_OUTPUT_STREAM std::cerr diff --git a/src/devices/video/hd66421.cpp b/src/devices/video/hd66421.cpp index 6be96c81e1f..449c1abc8d2 100644 --- a/src/devices/video/hd66421.cpp +++ b/src/devices/video/hd66421.cpp @@ -18,8 +18,12 @@ //#define HD66421_BRIGHTNESS_DOES_NOT_WORK -#define LOG_LEVEL 1 -#define _logerror(level,x) do { if (LOG_LEVEL > level) logerror x; } while (0) +#define LOG_LEVEL0 (1U << 1) +#define LOG_LEVEL1 (1U << 2) +#define LOG_LEVEL2 (1U << 3) + +#define VERBOSE (LOG_LEVEL0) +#include "logmacro.h" #define HD66421_RAM_SIZE (hd66421_device::WIDTH * hd66421_device::HEIGHT / 4) // 2-bits per pixel @@ -152,25 +156,25 @@ void hd66421_device::device_start() uint8_t hd66421_device::reg_idx_r() { - _logerror( 2, ("reg_idx_r\n")); + LOGMASKED(LOG_LEVEL2, "reg_idx_r\n"); return m_cmd; } void hd66421_device::reg_idx_w(uint8_t data) { - _logerror( 2, ("reg_idx_w (%02X)\n", data)); + LOGMASKED(LOG_LEVEL2, "reg_idx_w (%02X)\n", data); m_cmd = data; } uint8_t hd66421_device::reg_dat_r() { - _logerror( 2, ("reg_dat_r\n")); + LOGMASKED(LOG_LEVEL2, "reg_dat_r\n"); return m_reg[m_cmd]; } void hd66421_device::reg_dat_w(uint8_t data) { - _logerror( 2, ("reg_dat_w (%02X)\n", data)); + LOGMASKED(LOG_LEVEL2, "reg_dat_w (%02X)\n", data); m_reg[m_cmd] = data; switch (m_cmd) @@ -215,7 +219,7 @@ uint32_t hd66421_device::update_screen(screen_device &screen, bitmap_ind16 &bitm { pen_t pen[4]; - _logerror( 1, ("video_update_hd66421\n")); + LOGMASKED(LOG_LEVEL1, "video_update_hd66421\n"); // update palette for (int i = 0; i < 4; i++) diff --git a/src/devices/video/ims_cvc.cpp b/src/devices/video/ims_cvc.cpp index 0c5b62dfff4..b3abdba027a 100644 --- a/src/devices/video/ims_cvc.cpp +++ b/src/devices/video/ims_cvc.cpp @@ -16,7 +16,6 @@ #include "screen.h" -#define LOG_GENERAL (1U << 0) #define LOG_CONFIG (1U << 1) //#define VERBOSE (LOG_GENERAL|LOG_CONFIG) diff --git a/src/devices/video/mc6847.cpp b/src/devices/video/mc6847.cpp index 590e48d8a1f..7e0e3d4c67e 100644 --- a/src/devices/video/mc6847.cpp +++ b/src/devices/video/mc6847.cpp @@ -90,11 +90,13 @@ #define TIMER_FSYNC_OFF_TIME (TIMER_HSYNC_PERIOD * TOP_BORDER + TIMER_HSYNC_ON_TIME) #define TIMER_FSYNC_ON_TIME (TIMER_HSYNC_PERIOD * (TOP_BORDER + 192) + TIMER_HSYNC_ON_TIME) -#define LOG_SCANLINE 0 -#define LOG_HSYNC 0 -#define LOG_FSYNC 0 -#define LOG_FLUSH 0 -#define LOG_INPUT 0 +#define LOG_SCANLINE (1U << 1) +#define LOG_HSYNC (1U << 2) +#define LOG_FSYNC (1U << 3) +#define LOG_FLUSH (1U << 4) +#define LOG_INPUT (1U << 5) +#define VERBOSE (0) +#include "logmacro.h" const uint32_t mc6847_base_device::s_palette[mc6847_base_device::PALETTE_LENGTH] = @@ -284,8 +286,7 @@ TIMER_CALLBACK_MEMBER(mc6847_friend_device::change_horizontal_sync) // are we on a rising edge? if (line && !m_horizontal_sync) { - if (LOG_SCANLINE) - logerror("%s: change_horizontal_sync(): Recording scanline\n", describe_context()); + LOGMASKED(LOG_SCANLINE, "%s: change_horizontal_sync(): Recording scanline\n", describe_context()); // first store the scanline { @@ -328,8 +329,7 @@ TIMER_CALLBACK_MEMBER(mc6847_friend_device::change_horizontal_sync) m_horizontal_sync = line; // log if apprpriate - if (LOG_HSYNC) - logerror("%s: change_horizontal_sync(): line=%d\n", describe_context(), line ? 1 : 0); + LOGMASKED(LOG_HSYNC, "%s: change_horizontal_sync(): line=%d\n", describe_context(), line ? 1 : 0); // invoke callback m_write_hsync(line); @@ -354,8 +354,7 @@ TIMER_CALLBACK_MEMBER(mc6847_friend_device::change_field_sync) m_field_sync = line; /* log if apprpriate */ - if (LOG_FSYNC) - logerror("%s: change_field_sync(): line=%d\n", describe_context(), line ? 1 : 0); + LOGMASKED(LOG_FSYNC, "%s: change_field_sync(): line=%d\n", describe_context(), line ? 1 : 0); /* invoke callback */ m_write_fsync(line); @@ -482,8 +481,7 @@ void mc6847_friend_device::video_flush() uint32_t new_partial_scanline_clocks = get_clocks_since_hsync(); if (m_partial_scanline_clocks < new_partial_scanline_clocks) { - if (LOG_FLUSH) - logerror("%s: new_partial_scanline_clocks=%u\n", describe_context(), new_partial_scanline_clocks); + LOGMASKED(LOG_FLUSH, "%s: new_partial_scanline_clocks=%u\n", describe_context(), new_partial_scanline_clocks); m_recording_scanline = true; record_partial_body_scanline(m_physical_scanline, m_logical_scanline, m_partial_scanline_clocks, new_partial_scanline_clocks); @@ -627,8 +625,7 @@ void mc6847_base_device::device_reset() uint8_t mc6847_base_device::input(uint16_t address) { uint8_t data = m_input_cb(address); - if (LOG_INPUT) - logerror("%s: input: address=0x%04X data=0x%02X\n", describe_context(), address, data); + LOGMASKED(LOG_INPUT, "%s: input: address=0x%04X data=0x%02X\n", describe_context(), address, data); return data; } diff --git a/src/devices/video/pc_vga.cpp b/src/devices/video/pc_vga.cpp index f1dd9daf19e..502a0f11202 100644 --- a/src/devices/video/pc_vga.cpp +++ b/src/devices/video/pc_vga.cpp @@ -53,6 +53,20 @@ #include "debugger.h" #include "screen.h" +#define LOG_ACCESSES (1U << 1) +#define LOG_REGISTERS (1U << 2) +#define LOG_8514 (1U << 3) +#define LOG_UNIMPL (1U << 4) +#define LOG_WARNINGS (1U << 5) +#define LOG_INVALID (1U << 6) +#define LOG_COMMANDS (1U << 7) +#define LOG_ATI (1U << 8) +#define LOG_OAK (1U << 9) +#define LOG_MEM_READS (1U << 10) + +#define VERBOSE (LOG_GENERAL | LOG_8514 | LOG_ATI | LOG_OAK | LOG_INVALID | LOG_COMMANDS) +#include "logmacro.h" + /*************************************************************************** @@ -105,17 +119,6 @@ enum #define TGA_LINE_LENGTH (vga.crtc.offset<<3) -/*************************************************************************** - - Static declarations - -***************************************************************************/ - -#define LOG_ACCESSES 0 -#define LOG_REGISTERS 0 - -#define LOG_8514 1 - /*************************************************************************** Generic VGA @@ -1363,7 +1366,7 @@ void vga_device::recompute_params_clock(int divisor, int xtal) void vga_device::recompute_params() { if(vga.miscellaneous_output & 8) - logerror("Warning: VGA external clock latch selected\n"); + LOGMASKED(LOG_WARNINGS, "Warning: VGA external clock latch selected\n"); else recompute_params_clock(1, ((vga.miscellaneous_output & 0xc) ? XTAL(28'636'363) : XTAL(25'174'800)).value()); } @@ -1514,7 +1517,7 @@ void vga_device::crtc_reg_write(uint8_t index, uint8_t data) vga.crtc.line_compare |= data & 0xff; break; default: - logerror("Unhandled CRTC reg w %02x %02x\n",index,data); + LOGMASKED(LOG_UNIMPL, "Unhandled CRTC reg w %02x %02x\n",index,data); break; } } @@ -1625,13 +1628,10 @@ void vga_device::vga_crtc_w(offs_t offset, uint8_t data) break; case 5: - if (LOG_REGISTERS) - { - logerror("vga_crtc_w(): CRTC[0x%02X%s] = 0x%02X\n", - vga.crtc.index, - (vga.crtc.index < vga.svga_intf.crtc_regcount) ? "" : "?", - data); - } + LOGMASKED(LOG_REGISTERS, "vga_crtc_w(): CRTC[0x%02X%s] = 0x%02X\n", + vga.crtc.index, + (vga.crtc.index < vga.svga_intf.crtc_regcount) ? "" : "?", + data); crtc_reg_write(vga.crtc.index,data); //screen().update_partial(screen().vpos()); @@ -1707,7 +1707,7 @@ uint8_t vga_device::gc_reg_read(uint8_t index) uint8_t vga_device::seq_reg_read(uint8_t index) { - logerror("Reading unmapped sequencer read register %02x (SVGA?)\n", index); + LOGMASKED(LOG_UNIMPL, "Reading unmapped sequencer read register %02x (SVGA?)\n", index); return 0; } @@ -1837,7 +1837,7 @@ uint8_t vga_device::port_03d0_r(offs_t offset) data = vga_crtc_r(offset); if(offset == 8) { - logerror("VGA: 0x3d8 read %s\n", machine().describe_context()); + LOG("VGA: 0x3d8 read %s\n", machine().describe_context()); data = 0; // TODO: PC-200 reads back CGA register here, everything else returns open bus OR CGA emulation of register 0x3d8 } @@ -1846,8 +1846,7 @@ uint8_t vga_device::port_03d0_r(offs_t offset) void vga_device::port_03b0_w(offs_t offset, uint8_t data) { - if (LOG_ACCESSES) - logerror("vga_port_03b0_w(): port=0x%04x data=0x%02x\n", offset + 0x3b0, data); + LOGMASKED(LOG_ACCESSES, "vga_port_03b0_w(): port=0x%04x data=0x%02x\n", offset + 0x3b0, data); if (CRTC_PORT_ADDR == 0x3b0) vga_crtc_w(offset, data); @@ -1921,8 +1920,7 @@ void vga_device::gc_reg_write(uint8_t index,uint8_t data) void vga_device::port_03c0_w(offs_t offset, uint8_t data) { - if (LOG_ACCESSES) - logerror("vga_port_03c0_w(): port=0x%04x data=0x%02x\n", offset + 0x3c0, data); + LOGMASKED(LOG_ACCESSES, "vga_port_03c0_w(): port=0x%04x data=0x%02x\n", offset + 0x3c0, data); switch (offset) { case 0: @@ -1947,13 +1945,10 @@ void vga_device::port_03c0_w(offs_t offset, uint8_t data) vga.sequencer.index = data; break; case 5: - if (LOG_REGISTERS) - { - logerror("vga_port_03c0_w(): SEQ[0x%02X%s] = 0x%02X\n", - vga.sequencer.index, - (vga.sequencer.index < vga.svga_intf.seq_regcount) ? "" : "?", - data); - } + LOGMASKED(LOG_REGISTERS, "vga_port_03c0_w(): SEQ[0x%02X%s] = 0x%02X\n", + vga.sequencer.index, + (vga.sequencer.index < vga.svga_intf.seq_regcount) ? "" : "?", + data); if (vga.sequencer.index < vga.svga_intf.seq_regcount) { vga.sequencer.data[vga.sequencer.index] = data; @@ -2009,8 +2004,7 @@ void vga_device::port_03c0_w(offs_t offset, uint8_t data) void vga_device::port_03d0_w(offs_t offset, uint8_t data) { - if (LOG_ACCESSES) - logerror("vga_port_03d0_w(): port=0x%04x data=0x%02x\n", offset + 0x3d0, data); + LOGMASKED(LOG_ACCESSES, "vga_port_03d0_w(): port=0x%04x data=0x%02x\n", offset + 0x3d0, data); if (CRTC_PORT_ADDR == 0x3d0) vga_crtc_w(offset, data); @@ -2783,14 +2777,14 @@ void s3_vga_device::s3_crtc_reg_write(uint8_t index, uint8_t data) if(s3.reg_lock2 == 0xa5) { s3.strapping = (s3.strapping & 0xffffff00) | data; - logerror("CR36: Strapping data = %08x\n",s3.strapping); + LOG("CR36: Strapping data = %08x\n",s3.strapping); } break; case 0x37: if(s3.reg_lock2 == 0xa5) { s3.strapping = (s3.strapping & 0xffff00ff) | (data << 8); - logerror("CR37: Strapping data = %08x\n",s3.strapping); + LOG("CR37: Strapping data = %08x\n",s3.strapping); } break; case 0x38: @@ -3037,7 +3031,7 @@ bit 0 Vertical Total bit 10. Bit 10 of the Vertical Total register (3d4h if(s3.reg_lock2 == 0xa5) { s3.strapping = (s3.strapping & 0xff00ffff) | (data << 16); - logerror("CR68: Strapping data = %08x\n",s3.strapping); + LOG("CR68: Strapping data = %08x\n",s3.strapping); } break; case 0x69: @@ -3053,11 +3047,11 @@ bit 0 Vertical Total bit 10. Bit 10 of the Vertical Total register (3d4h if(s3.reg_lock2 == 0xa5) { s3.strapping = (s3.strapping & 0x00ffffff) | (data << 24); - logerror("CR6F: Strapping data = %08x\n",s3.strapping); + LOG("CR6F: Strapping data = %08x\n",s3.strapping); } break; default: - if(LOG_8514) logerror("S3: 3D4 index %02x write %02x\n",index,data); + LOGMASKED(LOG_8514, "S3: 3D4 index %02x write %02x\n",index,data); break; } } @@ -3518,7 +3512,7 @@ uint16_t ibm8514a_device::ibm8514_line_error_r() void ibm8514a_device::ibm8514_line_error_w(uint16_t data) { ibm8514.line_errorterm = data; - if(LOG_8514) logerror("8514/A: Line Parameter/Error Term write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Line Parameter/Error Term write %04x\n",data); } /* @@ -3546,7 +3540,7 @@ uint16_t ibm8514a_device::ibm8514_gpstatus_r() { uint16_t ret = 0x0000; - //if(LOG_8514) logerror("S3: 9AE8 read\n"); + //LOGMASKED(LOG_8514, "S3: 9AE8 read\n"); if(ibm8514.gpbusy == true) ret |= 0x0200; if(ibm8514.data_avail == true) @@ -3698,7 +3692,7 @@ void ibm8514a_device::ibm8514_cmd_w(uint16_t data) case 0x0000: // NOP (for "Short Stroke Vectors") ibm8514.state = IBM8514_IDLE; ibm8514.gpbusy = false; - if(LOG_8514) logerror("8514/A: Command (%04x) - NOP (Short Stroke Vector)\n",ibm8514.current_cmd); + LOGMASKED(LOG_8514, "8514/A: Command (%04x) - NOP (Short Stroke Vector)\n",ibm8514.current_cmd); break; case 0x2000: // Line ibm8514.state = IBM8514_IDLE; @@ -3709,12 +3703,12 @@ void ibm8514a_device::ibm8514_cmd_w(uint16_t data) { ibm8514.state = IBM8514_DRAWING_LINE; ibm8514.data_avail = true; - if(LOG_8514) logerror("8514/A: Command (%04x) - Vector Line (WAIT) %i,%i \n",ibm8514.current_cmd,ibm8514.curr_x,ibm8514.curr_y); + LOGMASKED(LOG_8514, "8514/A: Command (%04x) - Vector Line (WAIT) %i,%i \n",ibm8514.current_cmd,ibm8514.curr_x,ibm8514.curr_y); } else { ibm8514_draw_vector(ibm8514.rect_width,(data & 0x00e0) >> 5,(data & 0010) ? true : false); - if(LOG_8514) logerror("8514/A: Command (%04x) - Vector Line - %i,%i \n",ibm8514.current_cmd,ibm8514.curr_x,ibm8514.curr_y); + LOGMASKED(LOG_8514, "8514/A: Command (%04x) - Vector Line - %i,%i \n",ibm8514.current_cmd,ibm8514.curr_x,ibm8514.curr_y); } } else @@ -3728,7 +3722,7 @@ void ibm8514a_device::ibm8514_cmd_w(uint16_t data) int count = 0; int16_t temp; - if(LOG_8514) logerror("8514/A: Command (%04x) - Line (Bresenham) - %i,%i Axial %i, Diagonal %i, Error %i, Major Axis %i, Minor Axis %i\n",ibm8514.current_cmd, + LOGMASKED(LOG_8514, "8514/A: Command (%04x) - Line (Bresenham) - %i,%i Axial %i, Diagonal %i, Error %i, Major Axis %i, Minor Axis %i\n",ibm8514.current_cmd, ibm8514.curr_x,ibm8514.curr_y,ibm8514.line_axial_step,ibm8514.line_diagonal_step,ibm8514.line_errorterm,ibm8514.rect_width,ibm8514.rect_height); if((data & 0x0040)) @@ -3760,12 +3754,12 @@ void ibm8514a_device::ibm8514_cmd_w(uint16_t data) //ibm8514.gpbusy = true; // DirectX 5 keeps waiting for the busy bit to be clear... ibm8514.bus_size = (data & 0x0600) >> 9; ibm8514.data_avail = true; - if(LOG_8514) logerror("8514/A: Command (%04x) - Rectangle Fill (WAIT) %i,%i Width: %i Height: %i Colour: %08x\n",ibm8514.current_cmd,ibm8514.curr_x, + LOGMASKED(LOG_8514, "8514/A: Command (%04x) - Rectangle Fill (WAIT) %i,%i Width: %i Height: %i Colour: %08x\n",ibm8514.current_cmd,ibm8514.curr_x, ibm8514.curr_y,ibm8514.rect_width,ibm8514.rect_height,ibm8514.fgcolour); break; } - if(LOG_8514) logerror("8514/A: Command (%04x) - Rectangle Fill %i,%i Width: %i Height: %i Colour: %08x\n",ibm8514.current_cmd,ibm8514.curr_x, - ibm8514.curr_y,ibm8514.rect_width,ibm8514.rect_height,ibm8514.fgcolour); + LOGMASKED(LOG_8514, "8514/A: Command (%04x) - Rectangle Fill %i,%i Width: %i Height: %i Colour: %08x\n",ibm8514.current_cmd,ibm8514.curr_x, + ibm8514.curr_y,ibm8514.rect_width,ibm8514.rect_height,ibm8514.fgcolour); off = 0; off += (IBM8514_LINE_LENGTH * ibm8514.curr_y); off += ibm8514.curr_x; @@ -3814,8 +3808,8 @@ void ibm8514a_device::ibm8514_cmd_w(uint16_t data) break; case 0xc000: // BitBLT // TODO: a10cuba sets up blantantly invalid parameters here, CPU core bug maybe? - if(LOG_8514) logerror("8514/A: Command (%04x) - BitBLT from %i,%i to %i,%i Width: %i Height: %i\n",ibm8514.current_cmd, - ibm8514.curr_x,ibm8514.curr_y,ibm8514.dest_x,ibm8514.dest_y,ibm8514.rect_width,ibm8514.rect_height); + LOGMASKED(LOG_8514, "8514/A: Command (%04x) - BitBLT from %i,%i to %i,%i Width: %i Height: %i\n",ibm8514.current_cmd, + ibm8514.curr_x,ibm8514.curr_y,ibm8514.dest_x,ibm8514.dest_y,ibm8514.rect_width,ibm8514.rect_height); off = 0; off += (IBM8514_LINE_LENGTH * ibm8514.dest_y); off += ibm8514.dest_x; @@ -3891,8 +3885,8 @@ void ibm8514a_device::ibm8514_cmd_w(uint16_t data) ibm8514.curr_y = ibm8514.prev_y; break; case 0xe000: // Pattern Fill - if(LOG_8514) logerror("8514/A: Command (%04x) - Pattern Fill - source %i,%i dest %i,%i Width: %i Height: %i\n",ibm8514.current_cmd, - ibm8514.curr_x,ibm8514.curr_y,ibm8514.dest_x,ibm8514.dest_y,ibm8514.rect_width,ibm8514.rect_height); + LOGMASKED(LOG_8514, "8514/A: Command (%04x) - Pattern Fill - source %i,%i dest %i,%i Width: %i Height: %i\n",ibm8514.current_cmd, + ibm8514.curr_x,ibm8514.curr_y,ibm8514.dest_x,ibm8514.dest_y,ibm8514.rect_width,ibm8514.rect_height); off = 0; off += (IBM8514_LINE_LENGTH * ibm8514.dest_y); off += ibm8514.dest_x; @@ -3962,7 +3956,8 @@ void ibm8514a_device::ibm8514_cmd_w(uint16_t data) default: ibm8514.state = IBM8514_IDLE; ibm8514.gpbusy = false; - if(LOG_8514) logerror("8514/A: Unknown command: %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Unknown command: %04x\n",data); + break; } } @@ -3987,7 +3982,7 @@ void ibm8514a_device::ibm8514_desty_w(uint16_t data) { ibm8514.line_axial_step = data; ibm8514.dest_y = data; - if(LOG_8514) logerror("8514/A: Line Axial Step / Destination Y write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Line Axial Step / Destination Y write %04x\n",data); } /* @@ -4012,7 +4007,7 @@ void ibm8514a_device::ibm8514_destx_w(uint16_t data) { ibm8514.line_diagonal_step = data; ibm8514.dest_x = data; - if(LOG_8514) logerror("8514/A: Line Diagonal Step / Destination X write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Line Diagonal Step / Destination X write %04x\n",data); } /* @@ -4164,7 +4159,7 @@ void ibm8514a_device::ibm8514_ssv_w(uint16_t data) ibm8514_draw_ssv(data >> 8); ibm8514_draw_ssv(data & 0xff); } - if(LOG_8514) logerror("8514/A: Short Stroke Vector write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Short Stroke Vector write %04x\n",data); } void ibm8514a_device::ibm8514_wait_draw_vector() @@ -4254,7 +4249,7 @@ uint16_t ibm8514a_device::ibm8514_width_r() void ibm8514a_device::ibm8514_width_w(uint16_t data) { ibm8514.rect_width = data & 0x1fff; - if(LOG_8514) logerror("8514/A: Major Axis Pixel Count / Rectangle Width write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Major Axis Pixel Count / Rectangle Width write %04x\n",data); } uint16_t ibm8514a_device::ibm8514_currentx_r() @@ -4266,7 +4261,7 @@ void ibm8514a_device::ibm8514_currentx_w(uint16_t data) { ibm8514.curr_x = data; ibm8514.prev_x = data; - if(LOG_8514) logerror("8514/A: Current X set to %04x (%i)\n",data,ibm8514.curr_x); + LOGMASKED(LOG_8514, "8514/A: Current X set to %04x (%i)\n",data,ibm8514.curr_x); } uint16_t ibm8514a_device::ibm8514_currenty_r() @@ -4278,7 +4273,7 @@ void ibm8514a_device::ibm8514_currenty_w(uint16_t data) { ibm8514.curr_y = data; ibm8514.prev_y = data; - if(LOG_8514) logerror("8514/A: Current Y set to %04x (%i)\n",data,ibm8514.curr_y); + LOGMASKED(LOG_8514, "8514/A: Current Y set to %04x (%i)\n",data,ibm8514.curr_y); } uint16_t ibm8514a_device::ibm8514_fgcolour_r() @@ -4289,7 +4284,7 @@ uint16_t ibm8514a_device::ibm8514_fgcolour_r() void ibm8514a_device::ibm8514_fgcolour_w(uint16_t data) { ibm8514.fgcolour = data; - if(LOG_8514) logerror("8514/A: Foreground Colour write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Foreground Colour write %04x\n",data); } uint16_t ibm8514a_device::ibm8514_bgcolour_r() @@ -4300,7 +4295,7 @@ uint16_t ibm8514a_device::ibm8514_bgcolour_r() void ibm8514a_device::ibm8514_bgcolour_w(uint16_t data) { ibm8514.bgcolour = data; - if(LOG_8514) logerror("8514/A: Background Colour write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Background Colour write %04x\n",data); } /* @@ -4322,7 +4317,7 @@ uint16_t ibm8514a_device::ibm8514_read_mask_r() void ibm8514a_device::ibm8514_read_mask_w(uint16_t data) { ibm8514.read_mask = (ibm8514.read_mask & 0xffff0000) | data; - if(LOG_8514) logerror("8514/A: Read Mask (Low) write = %08x\n",ibm8514.read_mask); + LOGMASKED(LOG_8514, "8514/A: Read Mask (Low) write = %08x\n",ibm8514.read_mask); } /* @@ -4343,7 +4338,7 @@ uint16_t ibm8514a_device::ibm8514_write_mask_r() void ibm8514a_device::ibm8514_write_mask_w(uint16_t data) { ibm8514.write_mask = (ibm8514.write_mask & 0xffff0000) | data; - if(LOG_8514) logerror("8514/A: Write Mask (Low) write = %08x\n",ibm8514.write_mask); + LOGMASKED(LOG_8514, "8514/A: Write Mask (Low) write = %08x\n",ibm8514.write_mask); } uint16_t ibm8514a_device::ibm8514_multifunc_r() @@ -4362,7 +4357,7 @@ uint16_t ibm8514a_device::ibm8514_multifunc_r() return ibm8514.scissors_right; // TODO: remaining functions default: - if(LOG_8514) logerror("8514/A: Unimplemented multifunction register %i selected\n",ibm8514.multifunc_sel); + LOGMASKED(LOG_8514, "8514/A: Unimplemented multifunction register %i selected\n",ibm8514.multifunc_sel); return 0xff; } } @@ -4379,7 +4374,7 @@ bit 0-10 (911/924) Rectangle Height. Height of BITBLT or rectangle command. */ case 0x0000: ibm8514.rect_height = data & 0x0fff; - if(LOG_8514) logerror("8514/A: Minor Axis Pixel Count / Rectangle Height write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Minor Axis Pixel Count / Rectangle Height write %04x\n",data); break; /* BEE8h index 01h W(R/W): Top Scissors Register (SCISSORS_T). @@ -4404,19 +4399,19 @@ bit 0-10 (911,924) Clipping Right Limit. Defines the right bound of the */ case 0x1000: ibm8514.scissors_top = data & 0x0fff; - if(LOG_8514) logerror("S3: Scissors Top write %04x\n",data); + LOGMASKED(LOG_8514, "S3: Scissors Top write %04x\n",data); break; case 0x2000: ibm8514.scissors_left = data & 0x0fff; - if(LOG_8514) logerror("S3: Scissors Left write %04x\n",data); + LOGMASKED(LOG_8514, "S3: Scissors Left write %04x\n",data); break; case 0x3000: ibm8514.scissors_bottom = data & 0x0fff; - if(LOG_8514) logerror("S3: Scissors Bottom write %04x\n",data); + LOGMASKED(LOG_8514, "S3: Scissors Bottom write %04x\n",data); break; case 0x4000: ibm8514.scissors_right = data & 0x0fff; - if(LOG_8514) logerror("S3: Scissors Right write %04x\n",data); + LOGMASKED(LOG_8514, "S3: Scissors Right write %04x\n",data); break; /* BEE8h index 0Ah W(R/W): Pixel Control Register (PIX_CNTL). @@ -4430,11 +4425,11 @@ BIT 2 (911-928) Pack Data. If set image read data is a monochrome bitmap, */ case 0xa000: ibm8514.pixel_control = data; - if(LOG_8514) logerror("S3: Pixel control write %04x\n",data); + LOGMASKED(LOG_8514, "S3: Pixel control write %04x\n",data); break; case 0xe000: ibm8514.multifunc_misc = data; - if(LOG_8514) logerror("S3: Multifunction Miscellaneous write %04x\n",data); + LOGMASKED(LOG_8514, "S3: Multifunction Miscellaneous write %04x\n",data); break; /* BEE8h index 0Fh W(W): Read Register Select Register (READ_SEL) (801/5,928) @@ -4456,10 +4451,11 @@ bit 0-2 (911-928) READ-REG-SEL. Read Register Select. Selects the register */ case 0xf000: ibm8514.multifunc_sel = data & 0x000f; - if(LOG_8514) logerror("S3: Multifunction select write %04x\n",data); + LOGMASKED(LOG_8514, "S3: Multifunction select write %04x\n",data); break; default: - if(LOG_8514) logerror("S3: Unimplemented multifunction register %i write %03x\n",data >> 12,data & 0x0fff); + LOGMASKED(LOG_8514, "S3: Unimplemented multifunction register %i write %03x\n",data >> 12,data & 0x0fff); + break; } } @@ -4655,7 +4651,7 @@ uint16_t ibm8514a_device::ibm8514_backmix_r() void ibm8514a_device::ibm8514_backmix_w(uint16_t data) { ibm8514.bgmix = data; - if(LOG_8514) logerror("8514/A: BG Mix write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: BG Mix write %04x\n",data); } uint16_t ibm8514a_device::ibm8514_foremix_r() @@ -4666,7 +4662,7 @@ uint16_t ibm8514a_device::ibm8514_foremix_r() void ibm8514a_device::ibm8514_foremix_w(uint16_t data) { ibm8514.fgmix = data; - if(LOG_8514) logerror("8514/A: FG Mix write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: FG Mix write %04x\n",data); } uint16_t ibm8514a_device::ibm8514_pixel_xfer_r(offs_t offset) @@ -4693,7 +4689,7 @@ void ibm8514a_device::ibm8514_pixel_xfer_w(offs_t offset, uint16_t data) if(ibm8514.state == IBM8514_DRAWING_LINE) ibm8514_wait_draw_vector(); - if(LOG_8514) logerror("8514/A: Pixel Transfer = %08x\n",ibm8514.pixel_xfer); + LOGMASKED(LOG_8514, "8514/A: Pixel Transfer = %08x\n",ibm8514.pixel_xfer); } uint8_t s3_vga_device::mem_r(offs_t offset) @@ -4964,7 +4960,8 @@ void s3_vga_device::mem_w(offs_t offset, uint8_t data) dev->ibm8514_wait_draw(); break; default: - if(LOG_8514) logerror("S3: MMIO offset %05x write %02x\n",offset+0xa0000,data); + LOGMASKED(LOG_8514, "S3: MMIO offset %05x write %02x\n",offset+0xa0000,data); + break; } return; } @@ -5011,7 +5008,7 @@ gamtor.cpp implementation uint8_t gamtor_vga_device::mem_linear_r(offs_t offset) { if (!machine().side_effects_disabled()) - logerror("Reading gamtor SVGA memory %08x\n", offset); + LOGMASKED(LOG_MEM_READS, "Reading gamtor SVGA memory %08x\n", offset); return vga.memory[offset]; } @@ -5173,9 +5170,10 @@ void ati_vga_device::set_dot_clock() break; default: clock = XTAL(42'954'545).value(); - logerror("Invalid dot clock %i selected.\n",clock_type); + LOGMASKED(LOG_INVALID, "Invalid dot clock %i selected.\n",clock_type); + break; } -// logerror("ATI: Clock select type %i (%iHz / %i)\n",clock_type,clock,div); +// LOG("ATI: Clock select type %i (%iHz / %i)\n",clock_type,clock,div); recompute_params_clock(divisor,clock / div); } @@ -5245,19 +5243,19 @@ uint8_t ati_vga_device::ati_port_ext_r(offs_t offset) { case 0x20: ret = 0x10; // 16-bit ROM access - logerror("ATI20 read\n"); + LOGMASKED(LOG_ATI, "ATI20 read\n"); break; case 0x28: // Vertical line counter (high) ret = (screen().vpos() >> 8) & 0x03; - logerror("ATI28 (vertical line high) read\n"); + LOGMASKED(LOG_ATI, "ATI28 (vertical line high) read\n"); break; case 0x29: // Vertical line counter (low) ret = screen().vpos() & 0xff; // correct? - logerror("ATI29 (vertical line low) read\n"); + LOGMASKED(LOG_ATI, "ATI29 (vertical line low) read\n"); break; case 0x2a: ret = ati.vga_chip_id; // Chip revision (6 for the 28800-6, 5 for the 28800-5) This register is not listed in ATI's mach32 docs - logerror("ATI2A (VGA ID) read\n"); + LOGMASKED(LOG_ATI, "ATI2A (VGA ID) read\n"); break; case 0x37: { @@ -5269,11 +5267,12 @@ uint8_t ati_vga_device::ati_port_ext_r(offs_t offset) case 0x3d: ret = ati.ext_reg[ati.ext_reg_select] & 0x0f; ret |= 0x10; // EGA DIP switch emulation - logerror("ATI3D (EGA DIP emulation) read\n"); + LOGMASKED(LOG_ATI, "ATI3D (EGA DIP emulation) read\n"); break; default: ret = ati.ext_reg[ati.ext_reg_select]; - logerror("ATI: Extended VGA register 0x01CE index %02x read\n",ati.ext_reg_select); + LOGMASKED(LOG_ATI, "ATI: Extended VGA register 0x01CE index %02x read\n",ati.ext_reg_select); + break; } break; } @@ -5295,15 +5294,15 @@ void ati_vga_device::ati_port_ext_w(offs_t offset, uint8_t data) vga.crtc.start_addr_latch = (vga.crtc.start_addr_latch & 0xfffdffff) | ((data & 0x10) << 13); vga.crtc.cursor_addr = (vga.crtc.cursor_addr & 0xfffdffff) | ((data & 0x08) << 14); ati.ext_reg[ati.ext_reg_select] = data & 0x1f; - logerror("ATI: ATI23 write %02x\n",data); + LOGMASKED(LOG_ATI, "ATI: ATI23 write %02x\n",data); break; case 0x26: ati.ext_reg[ati.ext_reg_select] = data & 0xc9; - logerror("ATI: ATI26 write %02x\n",data); + LOGMASKED(LOG_ATI, "ATI: ATI26 write %02x\n",data); break; case 0x2b: ati.ext_reg[ati.ext_reg_select] = data & 0xdf; - logerror("ATI: ATI2B write %02x\n",data); + LOGMASKED(LOG_ATI, "ATI: ATI2B write %02x\n",data); break; case 0x2d: if(data & 0x08) @@ -5312,17 +5311,17 @@ void ati_vga_device::ati_port_ext_w(offs_t offset, uint8_t data) // bit 1 = bit 8 of horizontal blank start // bit 2 = bit 8 of horizontal retrace start } - logerror("ATI: ATI2D (extensions) write %02x\n",data); + LOGMASKED(LOG_ATI, "ATI: ATI2D (extensions) write %02x\n",data); break; case 0x30: vga.crtc.start_addr_latch = (vga.crtc.start_addr_latch & 0xfffeffff) | ((data & 0x40) << 10); vga.crtc.cursor_addr = (vga.crtc.cursor_addr & 0xfffeffff) | ((data & 0x04) << 14); ati.ext_reg[ati.ext_reg_select] = data & 0x7d; - logerror("ATI: ATI30 write %02x\n",data); + LOGMASKED(LOG_ATI, "ATI: ATI30 write %02x\n",data); break; case 0x31: ati.ext_reg[ati.ext_reg_select] = data & 0x7f; - logerror("ATI: ATI31 write %02x\n",data); + LOGMASKED(LOG_ATI, "ATI: ATI31 write %02x\n",data); break; case 0x32: // memory page select if(ati.ext_reg[0x3e] & 0x08) @@ -5335,7 +5334,7 @@ void ati_vga_device::ati_port_ext_w(offs_t offset, uint8_t data) svga.bank_r = ((data & 0x1e) >> 1); svga.bank_w = ((data & 0x1e) >> 1); } - //logerror("ATI: Memory Page Select write %02x (read: %i write %i)\n",data,svga.bank_r,svga.bank_w); + //LOGMASKED(LOG_ATI, "ATI: Memory Page Select write %02x (read: %i write %i)\n",data,svga.bank_r,svga.bank_w); break; case 0x33: // EEPROM ati.ext_reg[ati.ext_reg_select] = data & 0xef; @@ -5350,38 +5349,41 @@ void ati_vga_device::ati_port_ext_w(offs_t offset, uint8_t data) } } else - logerror("ATI: ATI33 write %02x\n",data); + { + LOGMASKED(LOG_ATI, "ATI: ATI33 write %02x\n",data); + } break; case 0x38: ati.ext_reg[ati.ext_reg_select] = data & 0xef; - logerror("ATI: ATI38 write %02x\n",data); + LOGMASKED(LOG_ATI, "ATI: ATI38 write %02x\n",data); break; case 0x39: ati.ext_reg[ati.ext_reg_select] = data & 0xfe; - logerror("ATI: ATI39 write %02x\n",data); + LOGMASKED(LOG_ATI, "ATI: ATI39 write %02x\n",data); break; case 0x3a: // General purpose read-write bits ati.ext_reg[ati.ext_reg_select] = data & 0x07; - logerror("ATI: ATI3A write %02x\n",data); + LOGMASKED(LOG_ATI, "ATI: ATI3A write %02x\n",data); break; case 0x3c: // Reserved, should be 0 ati.ext_reg[ati.ext_reg_select] = 0; - logerror("ATI: ATI3C write %02x\n",data); + LOGMASKED(LOG_ATI, "ATI: ATI3C write %02x\n",data); break; case 0x3d: ati.ext_reg[ati.ext_reg_select] = data & 0xfd; - logerror("ATI: ATI3D write %02x\n",data); + LOGMASKED(LOG_ATI, "ATI: ATI3D write %02x\n",data); break; case 0x3e: ati.ext_reg[ati.ext_reg_select] = data & 0x1f; - logerror("ATI: ATI3E write %02x\n",data); + LOGMASKED(LOG_ATI, "ATI: ATI3E write %02x\n",data); break; case 0x3f: ati.ext_reg[ati.ext_reg_select] = data & 0x0f; - logerror("ATI: ATI3F write %02x\n",data); + LOGMASKED(LOG_ATI, "ATI: ATI3F write %02x\n",data); break; default: - logerror("ATI: Extended VGA register 0x01CE index %02x write %02x\n",ati.ext_reg_select,data); + LOGMASKED(LOG_ATI, "ATI: Extended VGA register 0x01CE index %02x write %02x\n",ati.ext_reg_select,data); + break; } break; } @@ -5440,7 +5442,7 @@ void ibm8514a_device::ibm8514_htotal_w(offs_t offset, uint8_t data) break; } //vga.crtc.horz_total = data & 0x01ff; - if(LOG_8514) logerror("8514/A: Horizontal total write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Horizontal total write %04x\n",data); } /* @@ -5492,7 +5494,7 @@ void ibm8514a_device::ibm8514_subcontrol_w(uint16_t data) { ibm8514.subctrl = data; ibm8514.substatus &= ~(data & 0x0f); // reset interrupts -// if(LOG_8514) logerror("8514/A: Subsystem control write %04x\n",data); +// LOGMASKED(LOG_8514, "8514/A: Subsystem control write %04x\n",data); } uint16_t ibm8514a_device::ibm8514_subcontrol_r() @@ -5544,7 +5546,7 @@ void ibm8514a_device::ibm8514_vtotal_w(uint16_t data) { ibm8514.vtotal = data; // vga.crtc.vert_total = data; - if(LOG_8514) logerror("8514/A: Vertical total write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Vertical total write %04x\n",data); } uint16_t ibm8514a_device::ibm8514_vdisp_r() @@ -5556,7 +5558,7 @@ void ibm8514a_device::ibm8514_vdisp_w(uint16_t data) { ibm8514.vdisp = data; // vga.crtc.vert_disp_end = data >> 3; - if(LOG_8514) logerror("8514/A: Vertical Displayed write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Vertical Displayed write %04x\n",data); } uint16_t ibm8514a_device::ibm8514_vsync_r() @@ -5567,7 +5569,7 @@ uint16_t ibm8514a_device::ibm8514_vsync_r() void ibm8514a_device::ibm8514_vsync_w(uint16_t data) { ibm8514.vsync = data; - if(LOG_8514) logerror("8514/A: Vertical Sync write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Vertical Sync write %04x\n",data); } void ibm8514a_device::enabled() @@ -5584,7 +5586,7 @@ uint16_t mach8_device::mach8_ec0_r() void mach8_device::mach8_ec0_w(uint16_t data) { ibm8514.ec0 = data; - if(LOG_8514) logerror("8514/A: Extended configuration 0 write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Extended configuration 0 write %04x\n",data); } uint16_t mach8_device::mach8_ec1_r() @@ -5595,7 +5597,7 @@ uint16_t mach8_device::mach8_ec1_r() void mach8_device::mach8_ec1_w(uint16_t data) { ibm8514.ec1 = data; - if(LOG_8514) logerror("8514/A: Extended configuration 1 write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Extended configuration 1 write %04x\n",data); } uint16_t mach8_device::mach8_ec2_r() @@ -5606,7 +5608,7 @@ uint16_t mach8_device::mach8_ec2_r() void mach8_device::mach8_ec2_w(uint16_t data) { ibm8514.ec2 = data; - if(LOG_8514) logerror("8514/A: Extended configuration 2 write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Extended configuration 2 write %04x\n",data); } uint16_t mach8_device::mach8_ec3_r() @@ -5617,7 +5619,7 @@ uint16_t mach8_device::mach8_ec3_r() void mach8_device::mach8_ec3_w(uint16_t data) { ibm8514.ec3 = data; - if(LOG_8514) logerror("8514/A: Extended configuration 3 write %04x\n",data); + LOGMASKED(LOG_8514, "8514/A: Extended configuration 3 write %04x\n",data); } uint16_t mach8_device::mach8_ext_fifo_r() @@ -5628,7 +5630,7 @@ uint16_t mach8_device::mach8_ext_fifo_r() void mach8_device::mach8_linedraw_index_w(uint16_t data) { mach8.linedraw = data & 0x07; - if(LOG_8514) logerror("Mach8: Line Draw Index write %04x\n",data); + LOGMASKED(LOG_8514, "Mach8: Line Draw Index write %04x\n",data); } uint16_t mach8_device::mach8_bresenham_count_r() @@ -5639,7 +5641,7 @@ uint16_t mach8_device::mach8_bresenham_count_r() void mach8_device::mach8_bresenham_count_w(uint16_t data) { ibm8514.rect_width = data & 0x1fff; - if(LOG_8514) logerror("Mach8: Bresenham count write %04x\n",data); + LOGMASKED(LOG_8514, "Mach8: Bresenham count write %04x\n",data); } uint16_t mach8_device::mach8_linedraw_r() @@ -5677,7 +5679,7 @@ void mach8_device::mach8_linedraw_w(uint16_t data) mach8.linedraw = 4; break; } - logerror("ATI: Linedraw register write %04x, mode %i\n",data,mach8.linedraw); + LOGMASKED(LOG_ATI, "ATI: Linedraw register write %04x, mode %i\n",data,mach8.linedraw); } uint16_t mach8_device::mach8_sourcex_r() @@ -5708,7 +5710,7 @@ uint16_t mach8_device::mach8_scratch0_r() void mach8_device::mach8_scratch0_w(uint16_t data) { mach8.scratch0 = data; - if(LOG_8514) logerror("Mach8: Scratch Pad 0 write %04x\n",data); + LOGMASKED(LOG_8514, "Mach8: Scratch Pad 0 write %04x\n",data); } uint16_t mach8_device::mach8_scratch1_r() @@ -5719,32 +5721,32 @@ uint16_t mach8_device::mach8_scratch1_r() void mach8_device::mach8_scratch1_w(uint16_t data) { mach8.scratch1 = data; - if(LOG_8514) logerror("Mach8: Scratch Pad 1 write %04x\n",data); + LOGMASKED(LOG_8514, "Mach8: Scratch Pad 1 write %04x\n",data); } void mach8_device::mach8_crt_pitch_w(uint16_t data) { mach8.crt_pitch = data & 0x00ff; m_vga->set_offset(mach8.crt_pitch); - if(LOG_8514) logerror("Mach8: CRT pitch write %04x\n",mach8.crt_pitch); + LOGMASKED(LOG_8514, "Mach8: CRT pitch write %04x\n",mach8.crt_pitch); } void mach8_device::mach8_ge_offset_l_w(uint16_t data) { mach8.ge_offset = (mach8.ge_offset & 0x0f0000) | data; - if(LOG_8514) logerror("Mach8: Graphics Engine Offset (Low) write %05x\n",mach8.ge_offset); + LOGMASKED(LOG_8514, "Mach8: Graphics Engine Offset (Low) write %05x\n",mach8.ge_offset); } void mach8_device::mach8_ge_offset_h_w(uint16_t data) { mach8.ge_offset = (mach8.ge_offset & 0x00ffff) | ((data & 0x000f) << 16); - if(LOG_8514) logerror("Mach8: Graphics Engine Offset (High) write %05x\n",mach8.ge_offset); + LOGMASKED(LOG_8514, "Mach8: Graphics Engine Offset (High) write %05x\n",mach8.ge_offset); } void mach8_device::mach8_ge_pitch_w(uint16_t data) { mach8.ge_pitch = data & 0x00ff; - if(LOG_8514) logerror("Mach8: Graphics Engine pitch write %04x\n",mach8.ge_pitch); + LOGMASKED(LOG_8514, "Mach8: Graphics Engine pitch write %04x\n",mach8.ge_pitch); } void mach8_device::mach8_scan_x_w(uint16_t data) @@ -5758,7 +5760,7 @@ void mach8_device::mach8_scan_x_w(uint16_t data) ibm8514.data_avail = true; } // TODO: non-wait version of Scan To X - if(LOG_8514) logerror("Mach8: Scan To X write %04x\n",mach8.scan_x); + LOGMASKED(LOG_8514, "Mach8: Scan To X write %04x\n",mach8.scan_x); } void mach8_device::mach8_pixel_xfer_w(offs_t offset, uint16_t data) @@ -5824,7 +5826,7 @@ void mach8_device::mach8_wait_scan() void mach8_device::mach8_dp_config_w(uint16_t data) { mach8.dp_config = data; - if(LOG_8514) logerror("Mach8: Data Path Configuration write %04x\n",mach8.dp_config); + LOGMASKED(LOG_8514, "Mach8: Data Path Configuration write %04x\n",mach8.dp_config); } /* @@ -5888,40 +5890,40 @@ void xga_copro_device::start_command() case 11: if(m_var == TYPE::OTI111) { - logerror("oak specific textblt\n"); + LOGMASKED(LOG_OAK, "oak specific textblt\n"); break; } [[fallthrough]]; case 12: if(m_var == TYPE::OTI111) { - logerror("oak specific fast pattern copy\n"); + LOGMASKED(LOG_OAK, "oak specific fast pattern copy\n"); break; } [[fallthrough]]; default: - logerror("invalid pel op step func %d\n", (m_pelop >> 24) & 15); + LOGMASKED(LOG_INVALID, "invalid pel op step func %d\n", (m_pelop >> 24) & 15); break; case 2: - logerror("draw and step read\n"); + LOGMASKED(LOG_COMMANDS, "draw and step read\n"); break; case 3: - logerror("line draw read\n"); + LOGMASKED(LOG_COMMANDS, "line draw read\n"); break; case 4: - logerror("draw and step write\n"); + LOGMASKED(LOG_COMMANDS, "draw and step write\n"); break; case 5: - logerror("line draw write\n"); + LOGMASKED(LOG_COMMANDS, "line draw write\n"); break; case 8: do_pxblt(); break; case 9: - logerror("inverting pxblt\n"); + LOGMASKED(LOG_COMMANDS, "inverting pxblt\n"); break; case 10: - logerror("area fill pxblt\n"); + LOGMASKED(LOG_COMMANDS, "area fill pxblt\n"); break; } } @@ -5964,7 +5966,7 @@ u32 xga_copro_device::read_map_pixel(int x, int y, int map) wbytes = width; addr += y * wbytes; addr += x; - //logerror("r %d %d %d %d %d %x\n",map,width, height,x,y, addr); + //LOG("r %d %d %d %d %d %x\n",map,width, height,x,y, addr); return m_mem_read_cb(addr); case 4: wbytes = width * 2; @@ -5983,7 +5985,7 @@ u32 xga_copro_device::read_map_pixel(int x, int y, int map) return m_mem_read_cb(addr) | (m_mem_read_cb(addr + 1) << 8) | (m_mem_read_cb(addr + 2) << 16) | (m_mem_read_cb(addr + 3) << 24); } - logerror("invalid pixel map mode %d %d\n", map, m_pelmap_format[map] & 7); + LOGMASKED(LOG_INVALID, "invalid pixel map mode %d %d\n", map, m_pelmap_format[map] & 7); return 0; } @@ -6030,7 +6032,7 @@ void xga_copro_device::write_map_pixel(int x, int y, int map, u32 pixel) wbytes = width; addr += y * wbytes; addr += x; - //logerror("w %d %d %d %d %d %x %x\n",map,width, height,x,y, addr, pixel); + //LOG("w %d %d %d %d %d %x %x\n",map,width, height,x,y, addr, pixel); m_mem_write_cb(addr, (u8)pixel); break; case 4: @@ -6068,7 +6070,7 @@ void xga_copro_device::write_map_pixel(int x, int y, int map, u32 pixel) } break; default: - logerror("invalid pixel map mode %d %d\n", map, m_pelmap_format[map] & 7); + LOGMASKED(LOG_INVALID, "invalid pixel map mode %d %d\n", map, m_pelmap_format[map] & 7); break; } } @@ -6171,11 +6173,11 @@ void xga_copro_device::do_pxblt() u8 srcmap = ((m_pelop >> 20) & 0xf) - 1; u8 dstmap = ((m_pelop >> 16) & 0xf) - 1; u8 patmap = ((m_pelop >> 12) & 0xf) - 1; - logerror("pxblt src %d pat %d dst %d dim1 %d dim2 %d srcbase %x dstbase %x\n", srcmap+1, dstmap+1, patmap+1, m_opdim1 & 0xfff, m_opdim2 & 0xfff, m_pelmap_base[srcmap+1], m_pelmap_base[dstmap+1]); - logerror("%d %d %d %d\n", m_srcxaddr & 0xfff, m_srcyaddr & 0xfff, m_dstxaddr & 0xfff, m_dstyaddr & 0xfff); + LOGMASKED(LOG_COMMANDS, "pxblt src %d pat %d dst %d dim1 %d dim2 %d srcbase %x dstbase %x\n", srcmap+1, dstmap+1, patmap+1, m_opdim1 & 0xfff, m_opdim2 & 0xfff, m_pelmap_base[srcmap+1], m_pelmap_base[dstmap+1]); + LOGMASKED(LOG_COMMANDS, "%d %d %d %d\n", m_srcxaddr & 0xfff, m_srcyaddr & 0xfff, m_dstxaddr & 0xfff, m_dstyaddr & 0xfff); if((srcmap > 2) || (dstmap > 2) || ((patmap > 2) && (patmap != 7) && (patmap != 8))) { - logerror("invalid pelmap\n"); + LOGMASKED(LOG_INVALID, "invalid pelmap\n"); return; } if(dir & 1) diff --git a/src/devices/video/saa5240.cpp b/src/devices/video/saa5240.cpp index a9336398a5a..3ce826a9c28 100644 --- a/src/devices/video/saa5240.cpp +++ b/src/devices/video/saa5240.cpp @@ -9,8 +9,8 @@ #include "emu.h" #include "saa5240.h" -#define LOG_DATA (1 << 1) -#define LOG_LINE (1 << 2) +#define LOG_DATA (1U << 1) +#define LOG_LINE (1U << 2) #define VERBOSE (LOG_DATA) #include "logmacro.h" diff --git a/src/devices/video/scn2674.cpp b/src/devices/video/scn2674.cpp index 3461a15083c..4f82e048c2a 100644 --- a/src/devices/video/scn2674.cpp +++ b/src/devices/video/scn2674.cpp @@ -10,10 +10,10 @@ #include "screen.h" -#define LOG_IR (1 << 0) -#define LOG_COMMAND (1 << 1) -#define LOG_INTR (1 << 2) -#define LOG_READ (1 << 3) +#define LOG_IR (1U << 1) +#define LOG_COMMAND (1U << 2) +#define LOG_INTR (1U << 3) +#define LOG_READ (1U << 4) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/devices/video/sda5708.cpp b/src/devices/video/sda5708.cpp index 05453afadb7..a4fb22dd67d 100644 --- a/src/devices/video/sda5708.cpp +++ b/src/devices/video/sda5708.cpp @@ -17,18 +17,16 @@ // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h -#define LOG_SETUP (1U << 1) -#define LOG_CMD (1U << 2) -#define LOG_DATA (1U << 3) -#define LOG_CNTR (1U << 4) +#define LOG_SETUP (1U << 1) +#define LOG_CMD (1U << 2) +#define LOG_DATA (1U << 3) +#define LOG_CNTR (1U << 4) //#define VERBOSE (LOG_DATA|LOG_SETUP|LOG_CMD|LOG_CNTR|LOG_GENERAL) //#define LOG_OUTPUT_STREAM std::cout #include "logmacro.h" -//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGCMD(...) LOGMASKED(LOG_CMD, __VA_ARGS__) #define LOGDATA(...) LOGMASKED(LOG_DATA, __VA_ARGS__) diff --git a/src/devices/video/sed1356.cpp b/src/devices/video/sed1356.cpp index ccc60d94a95..1b53bdbafc8 100644 --- a/src/devices/video/sed1356.cpp +++ b/src/devices/video/sed1356.cpp @@ -18,20 +18,20 @@ #include "sed1356.h" #include "screen.h" -#define LOG_MISC_RD (1 << 1) -#define LOG_MISC_WR (1 << 2) -#define LOG_LCD_RD (1 << 3) -#define LOG_LCD_WR (1 << 4) -#define LOG_CRT_RD (1 << 5) -#define LOG_CRT_WR (1 << 6) -#define LOG_BITBLT_RD (1 << 7) -#define LOG_BITBLT_WR (1 << 8) -#define LOG_BITBLT_OP (1 << 9) -#define LOG_LUT_RD (1 << 10) -#define LOG_LUT_WR (1 << 11) -#define LOG_MPLUG_RD (1 << 12) -#define LOG_MPLUG_WR (1 << 13) -#define LOG_LCD_RD_HF (1 << 14) +#define LOG_MISC_RD (1U << 1) +#define LOG_MISC_WR (1U << 2) +#define LOG_LCD_RD (1U << 3) +#define LOG_LCD_WR (1U << 4) +#define LOG_CRT_RD (1U << 5) +#define LOG_CRT_WR (1U << 6) +#define LOG_BITBLT_RD (1U << 7) +#define LOG_BITBLT_WR (1U << 8) +#define LOG_BITBLT_OP (1U << 9) +#define LOG_LUT_RD (1U << 10) +#define LOG_LUT_WR (1U << 11) +#define LOG_MPLUG_RD (1U << 12) +#define LOG_MPLUG_WR (1U << 13) +#define LOG_LCD_RD_HF (1U << 14) #define LOG_ALL (LOG_MISC_RD | LOG_MISC_WR | LOG_LCD_RD | LOG_LCD_WR | LOG_CRT_RD | LOG_CRT_WR | LOG_BITBLT_RD | LOG_BITBLT_WR | LOG_BITBLT_OP | LOG_LUT_RD \ | LOG_LUT_WR | LOG_MPLUG_RD | LOG_MPLUG_WR) diff --git a/src/devices/video/sed1375.cpp b/src/devices/video/sed1375.cpp index 793f4f47e2f..9271ad8d754 100644 --- a/src/devices/video/sed1375.cpp +++ b/src/devices/video/sed1375.cpp @@ -13,13 +13,13 @@ #include "sed1375.h" #include "screen.h" -#define LOG_REG_READ (1 << 1) -#define LOG_REG_WRITE (1 << 2) -#define LOG_VRAM_READ (1 << 3) -#define LOG_VRAM_WRITE (1 << 4) -#define LOG_LUT_READ (1 << 5) -#define LOG_LUT_WRITE (1 << 6) -#define LOG_VBL_READ (1 << 7) +#define LOG_REG_READ (1U << 1) +#define LOG_REG_WRITE (1U << 2) +#define LOG_VRAM_READ (1U << 3) +#define LOG_VRAM_WRITE (1U << 4) +#define LOG_LUT_READ (1U << 5) +#define LOG_LUT_WRITE (1U << 6) +#define LOG_VBL_READ (1U << 7) #define LOG_ALL (LOG_REG_READ | LOG_REG_WRITE | LOG_VRAM_READ | LOG_VRAM_WRITE | LOG_LUT_READ | LOG_LUT_WRITE | LOG_VBL_READ) #define VERBOSE (0) diff --git a/src/devices/video/v9938.cpp b/src/devices/video/v9938.cpp index 641e50972f0..34d7782bc64 100644 --- a/src/devices/video/v9938.cpp +++ b/src/devices/video/v9938.cpp @@ -38,17 +38,17 @@ todo: #include "emu.h" #include "v9938.h" -#define LOG_WARN (1U<<1) -#define LOG_INT (1U<<2) -#define LOG_STATUS (1U<<3) -#define LOG_REGWRITE (1U<<4) -#define LOG_COMMAND (1U<<5) -#define LOG_MODE (1U<<6) -#define LOG_NOTIMP (1U<<7) -#define LOG_DETAIL (1U<<8) +#define LOG_WARN (1U << 1) +#define LOG_INT (1U << 2) +#define LOG_STATUS (1U << 3) +#define LOG_REGWRITE (1U << 4) +#define LOG_COMMAND (1U << 5) +#define LOG_MODE (1U << 6) +#define LOG_NOTIMP (1U << 7) +#define LOG_DETAIL (1U << 8) // Minimum log should be warnings -#define VERBOSE (LOG_GENERAL | LOG_WARN ) +#define VERBOSE (LOG_GENERAL | LOG_WARN) #include "logmacro.h" diff --git a/src/frontend/mame/ui/icorender.cpp b/src/frontend/mame/ui/icorender.cpp index 363e64bad8b..2b431592a09 100644 --- a/src/frontend/mame/ui/icorender.cpp +++ b/src/frontend/mame/ui/icorender.cpp @@ -30,9 +30,7 @@ // need to set LOG_OUTPUT_FUNC or LOG_OUTPUT_STREAM because there's no logerror outside devices #define LOG_OUTPUT_FUNC osd_printf_verbose -#define LOG_GENERAL (1U << 0) - -//#define VERBOSE (LOG_GENERAL | LOG_DIB) +//#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/lib/formats/ti99_dsk.cpp b/src/lib/formats/ti99_dsk.cpp index 32409b09a63..805c3b3da54 100644 --- a/src/lib/formats/ti99_dsk.cpp +++ b/src/lib/formats/ti99_dsk.cpp @@ -55,13 +55,13 @@ #define LOG_OUTPUT_FUNC osd_printf_info -#define LOG_WARN (1U<<1) // Warnings -#define LOG_HEADER (1U<<2) // Header -#define LOG_SHIFT (1U<<3) // Shift register -#define LOG_INTERLEAVE (1U<<4) // Interleave information -#define LOG_INFO (1U<<5) // Disk info -#define LOG_DETAIL (1U<<6) // Details -#define LOG_TRACK (1U<<7) // Track output +#define LOG_WARN (1U << 1) // Warnings +#define LOG_HEADER (1U << 2) // Header +#define LOG_SHIFT (1U << 3) // Shift register +#define LOG_INTERLEAVE (1U << 4) // Interleave information +#define LOG_INFO (1U << 5) // Disk info +#define LOG_DETAIL (1U << 6) // Details +#define LOG_TRACK (1U << 7) // Track output #define VERBOSE ( LOG_WARN ) diff --git a/src/mame/acorn/aa310.cpp b/src/mame/acorn/aa310.cpp index 1cc8f37f75e..6af374e30b7 100644 --- a/src/mame/acorn/aa310.cpp +++ b/src/mame/acorn/aa310.cpp @@ -149,7 +149,7 @@ #include "softlist.h" #include "speaker.h" -#define LOG_POST (1 << 0) +#define LOG_POST (1U << 1) #define VERBOSE (LOG_POST) #include "logmacro.h" diff --git a/src/mame/alba/albazg.cpp b/src/mame/alba/albazg.cpp index ddbcc00e944..c14cfc39585 100644 --- a/src/mame/alba/albazg.cpp +++ b/src/mame/alba/albazg.cpp @@ -48,7 +48,7 @@ PCB: // configurable logging -#define LOG_PROTRAM (1U << 1) +#define LOG_PROTRAM (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_PROTRAM) diff --git a/src/mame/amiga/amiga_m.cpp b/src/mame/amiga/amiga_m.cpp index 1400d89bb9f..dd5d5419097 100644 --- a/src/mame/amiga/amiga_m.cpp +++ b/src/mame/amiga/amiga_m.cpp @@ -21,10 +21,13 @@ * *************************************/ -#define LOG_CUSTOM 0 -#define LOG_CIA 0 -#define LOG_BLITS 0 -#define LOG_SERIAL 1 +#define LOG_CUSTOM (1U << 1) +#define LOG_CIA (1U << 2) +#define LOG_BLITS (1U << 3) +#define LOG_SERIAL (1U << 4) + +#define VERBOSE (LOG_SERIAL) +#include "logmacro.h" @@ -854,19 +857,16 @@ TIMER_CALLBACK_MEMBER( amiga_state::amiga_blitter_proc ) uint32_t blitsum = 0; /* logging */ - if (LOG_BLITS) - { - static const char *const type[] = { "ASCENDING", "LINE", "DESCENDING", "LINE" }; - logerror("BLIT %s: %dx%d %04x %04x\n", type[CUSTOM_REG(REG_BLTCON1) & 0x0003], CUSTOM_REG(REG_BLTSIZH), CUSTOM_REG(REG_BLTSIZV), CUSTOM_REG(REG_BLTCON0), CUSTOM_REG(REG_BLTCON1)); - if (CUSTOM_REG(REG_BLTCON0) & 0x0800) - logerror(" A: addr=%06X mod=%3d shift=%2d maskl=%04x maskr=%04x\n", CUSTOM_REG_LONG(REG_BLTAPTH), CUSTOM_REG_SIGNED(REG_BLTAMOD), CUSTOM_REG(REG_BLTCON0) >> 12, CUSTOM_REG(REG_BLTAFWM), CUSTOM_REG(REG_BLTALWM)); - if (CUSTOM_REG(REG_BLTCON0) & 0x0400) - logerror(" B: addr=%06X mod=%3d shift=%2d\n", CUSTOM_REG_LONG(REG_BLTBPTH), CUSTOM_REG_SIGNED(REG_BLTBMOD), CUSTOM_REG(REG_BLTCON1) >> 12); - if (CUSTOM_REG(REG_BLTCON0) & 0x0200) - logerror(" C: addr=%06X mod=%3d\n", CUSTOM_REG_LONG(REG_BLTCPTH), CUSTOM_REG_SIGNED(REG_BLTCMOD)); - if (CUSTOM_REG(REG_BLTCON0) & 0x0100) - logerror(" D: addr=%06X mod=%3d\n", CUSTOM_REG_LONG(REG_BLTDPTH), CUSTOM_REG_SIGNED(REG_BLTDMOD)); - } + static const char *const type[] = { "ASCENDING", "LINE", "DESCENDING", "LINE" }; + LOGMASKED(LOG_BLITS, "BLIT %s: %dx%d %04x %04x\n", type[CUSTOM_REG(REG_BLTCON1) & 0x0003], CUSTOM_REG(REG_BLTSIZH), CUSTOM_REG(REG_BLTSIZV), CUSTOM_REG(REG_BLTCON0), CUSTOM_REG(REG_BLTCON1)); + if (CUSTOM_REG(REG_BLTCON0) & 0x0800) + LOGMASKED(LOG_BLITS, " A: addr=%06X mod=%3d shift=%2d maskl=%04x maskr=%04x\n", CUSTOM_REG_LONG(REG_BLTAPTH), CUSTOM_REG_SIGNED(REG_BLTAMOD), CUSTOM_REG(REG_BLTCON0) >> 12, CUSTOM_REG(REG_BLTAFWM), CUSTOM_REG(REG_BLTALWM)); + if (CUSTOM_REG(REG_BLTCON0) & 0x0400) + LOGMASKED(LOG_BLITS, " B: addr=%06X mod=%3d shift=%2d\n", CUSTOM_REG_LONG(REG_BLTBPTH), CUSTOM_REG_SIGNED(REG_BLTBMOD), CUSTOM_REG(REG_BLTCON1) >> 12); + if (CUSTOM_REG(REG_BLTCON0) & 0x0200) + LOGMASKED(LOG_BLITS, " C: addr=%06X mod=%3d\n", CUSTOM_REG_LONG(REG_BLTCPTH), CUSTOM_REG_SIGNED(REG_BLTCMOD)); + if (CUSTOM_REG(REG_BLTCON0) & 0x0100) + LOGMASKED(LOG_BLITS, " D: addr=%06X mod=%3d\n", CUSTOM_REG_LONG(REG_BLTDPTH), CUSTOM_REG_SIGNED(REG_BLTDMOD)); /* set the zero flag */ CUSTOM_REG(REG_DMACON) |= 0x2000; @@ -891,8 +891,7 @@ TIMER_CALLBACK_MEMBER( amiga_state::amiga_blitter_proc ) /* clear the zero flag if we actually wrote data */ if (blitsum) CUSTOM_REG(REG_DMACON) &= ~0x2000; - if (LOG_BLITS) - logerror("%04x ZF=%d\n", blitsum, bool(BIT(CUSTOM_REG(REG_DMACON), 13))); + LOGMASKED(LOG_BLITS, "%04x ZF=%d\n", blitsum, bool(BIT(CUSTOM_REG(REG_DMACON), 13))); /* no longer busy */ CUSTOM_REG(REG_DMACON) &= ~0x4000; @@ -1019,16 +1018,14 @@ uint16_t amiga_state::cia_r(offs_t offset, uint16_t mem_mask) if ((offset & 0x2000/2) == 0 && ACCESSING_BITS_8_15) data |= m_cia_1->read(offset >> 7) << 8; - if (LOG_CIA) - logerror("%s: cia_r(%06x) = %04x & %04x\n", machine().describe_context(), offset, data, mem_mask); + LOGMASKED(LOG_CIA, "%s: cia_r(%06x) = %04x & %04x\n", machine().describe_context(), offset, data, mem_mask); return data; } void amiga_state::cia_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - if (LOG_CIA) - logerror("%s: cia_w(%06x) = %04x & %04x\n", machine().describe_context(), offset, data, mem_mask); + LOGMASKED(LOG_CIA, "%s: cia_w(%06x) = %04x & %04x\n", machine().describe_context(), offset, data, mem_mask); if ((offset & 0x1000/2) == 0 && ACCESSING_BITS_0_7) m_cia_0->write(offset >> 7, data & 0xff); @@ -1066,8 +1063,7 @@ void amiga_state::cia_0_port_a_write(uint8_t data) WRITE_LINE_MEMBER( amiga_state::cia_0_irq ) { - if (LOG_CIA) - logerror("%s: cia_0_irq: %d\n", machine().describe_context(), state); + LOGMASKED(LOG_CIA, "%s: cia_0_irq: %d\n", machine().describe_context(), state); m_cia_0_irq = state; update_int2(); @@ -1102,8 +1098,7 @@ void amiga_state::cia_1_port_a_write(uint8_t data) WRITE_LINE_MEMBER( amiga_state::cia_1_irq ) { - if (LOG_CIA) - logerror("%s: cia_1_irq: %d\n", machine().describe_context(), state); + LOGMASKED(LOG_CIA, "%s: cia_1_irq: %d\n", machine().describe_context(), state); m_cia_1_irq = state; update_int6(); @@ -1300,8 +1295,7 @@ uint16_t amiga_state::custom_chip_r(offs_t offset) { uint16_t temp; - if (LOG_CUSTOM) - logerror("%06X:read from custom %s\n", m_maincpu->pc(), s_custom_reg_names[offset & 0xff]); + LOGMASKED(LOG_CUSTOM, "%06X:read from custom %s\n", m_maincpu->pc(), s_custom_reg_names[offset & 0xff]); switch (offset & 0xff) { @@ -1315,9 +1309,7 @@ uint16_t amiga_state::custom_chip_r(offs_t offset) return amiga_gethvpos() & 0xffff; case REG_SERDATR: - if (LOG_SERIAL) - logerror("r SERDATR: %04x\n", CUSTOM_REG(REG_SERDATR)); - + LOGMASKED(LOG_SERIAL, "r SERDATR: %04x\n", CUSTOM_REG(REG_SERDATR)); return CUSTOM_REG(REG_SERDATR); case REG_JOY0DAT: @@ -1400,8 +1392,7 @@ void amiga_state::custom_chip_w(offs_t offset, uint16_t data) uint16_t temp; offset &= 0xff; - if (LOG_CUSTOM) - logerror("%06X:write to custom %s = %04X\n", m_maincpu->pc(), s_custom_reg_names[offset & 0xff], data); + LOGMASKED(LOG_CUSTOM, "%06X:write to custom %s = %04X\n", m_maincpu->pc(), s_custom_reg_names[offset & 0xff], data); switch (offset) { @@ -1445,9 +1436,7 @@ void amiga_state::custom_chip_w(offs_t offset, uint16_t data) break; case REG_SERDAT: - if (LOG_SERIAL) - logerror("w SERDAT: %04x\n", data); - + LOGMASKED(LOG_SERIAL, "w SERDAT: %04x\n", data); CUSTOM_REG(REG_SERDAT) = data; // transmit shift register currently empty? @@ -1471,9 +1460,7 @@ void amiga_state::custom_chip_w(offs_t offset, uint16_t data) return; case REG_SERPER: - if (LOG_SERIAL) - logerror("w SERPER: %04x\n", data); - + LOGMASKED(LOG_SERIAL, "w SERPER: %04x\n", data); CUSTOM_REG(REG_SERPER) = data; serial_adjust(); diff --git a/src/mame/amiga/amiga_v.cpp b/src/mame/amiga/amiga_v.cpp index 5d2569c7ae1..d47dbf2d3a3 100644 --- a/src/mame/amiga/amiga_v.cpp +++ b/src/mame/amiga/amiga_v.cpp @@ -11,15 +11,11 @@ #include "emu.h" #include "amiga.h" +#define LOG_SPRITE_DMA (1U << 1) +#define VERBOSE (0) +#include "logmacro.h" -/************************************* - * - * Debugging - * - *************************************/ - -#define LOG_SPRITE_DMA 0 /************************************* * @@ -156,7 +152,7 @@ void amiga_state::set_genlock_color(uint16_t color) void amiga_state::sprite_dma_reset(int which) { - if (LOG_SPRITE_DMA) logerror("sprite %d dma reset\n", which ); + LOGMASKED(LOG_SPRITE_DMA, "sprite %d dma reset\n", which ); m_sprite_dma_reload_mask |= 1 << which; m_sprite_dma_live_mask |= 1 << which; } @@ -164,7 +160,7 @@ void amiga_state::sprite_dma_reset(int which) void amiga_state::sprite_enable_comparitor(int which, int enable) { - if (LOG_SPRITE_DMA) logerror("sprite %d comparitor %sable\n", which, enable ? "en" : "dis" ); + LOGMASKED(LOG_SPRITE_DMA, "sprite %d comparitor %sable\n", which, enable ? "en" : "dis" ); if (enable) { m_sprite_comparitor_enable_mask |= 1 << which; @@ -190,7 +186,7 @@ void amiga_state::fetch_sprite_data(int scanline, int sprite) CUSTOM_REG(REG_SPR0DATA + 4 * sprite) = read_chip_ram(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) + 0); CUSTOM_REG(REG_SPR0DATB + 4 * sprite) = read_chip_ram(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) + 2); CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) += 4; - if (LOG_SPRITE_DMA) logerror("%3d:sprite %d fetch: data=%04X-%04X\n", scanline, sprite, CUSTOM_REG(REG_SPR0DATA + 4 * sprite), CUSTOM_REG(REG_SPR0DATB + 4 * sprite)); + LOGMASKED(LOG_SPRITE_DMA, "%3d:sprite %d fetch: data=%04X-%04X\n", scanline, sprite, CUSTOM_REG(REG_SPR0DATA + 4 * sprite), CUSTOM_REG(REG_SPR0DATB + 4 * sprite)); } void amiga_state::update_sprite_dma(int scanline) @@ -220,7 +216,7 @@ void amiga_state::update_sprite_dma(int scanline) CUSTOM_REG(REG_SPR0POS + 4 * num) = read_chip_ram(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * num) + 0); CUSTOM_REG(REG_SPR0CTL + 4 * num) = read_chip_ram(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * num) + 2); CUSTOM_REG_LONG(REG_SPR0PTH + 2 * num) += 4; - if (LOG_SPRITE_DMA) logerror("%3d:sprite %d fetch: pos=%04X ctl=%04X\n", scanline, num, CUSTOM_REG(REG_SPR0POS + 4 * num), CUSTOM_REG(REG_SPR0CTL + 4 * num)); + LOGMASKED(LOG_SPRITE_DMA, "%3d:sprite %d fetch: pos=%04X ctl=%04X\n", scanline, num, CUSTOM_REG(REG_SPR0POS + 4 * num), CUSTOM_REG(REG_SPR0CTL + 4 * num)); } /* compute vstart/vstop */ @@ -231,7 +227,7 @@ void amiga_state::update_sprite_dma(int scanline) if (scanline == vstart) { m_sprite_comparitor_enable_mask |= 1 << num; - if (LOG_SPRITE_DMA) logerror("%3d:sprite %d comparitor enable\n", scanline, num); + LOGMASKED(LOG_SPRITE_DMA, "%3d:sprite %d comparitor enable\n", scanline, num); } /* if we hit vstop, disable the comparitor and trigger a reload for the next scanline */ @@ -242,7 +238,7 @@ void amiga_state::update_sprite_dma(int scanline) m_sprite_dma_reload_mask |= 1 << num; CUSTOM_REG(REG_SPR0DATA + 4 * num) = 0; /* just a guess */ CUSTOM_REG(REG_SPR0DATB + 4 * num) = 0; - if (LOG_SPRITE_DMA) logerror("%3d:sprite %d comparitor disable, prepare for reload\n", scanline, num); + LOGMASKED(LOG_SPRITE_DMA, "%3d:sprite %d comparitor disable, prepare for reload\n", scanline, num); } /* fetch data if this sprite is enabled */ diff --git a/src/mame/amiga/amigaaga.cpp b/src/mame/amiga/amigaaga.cpp index dee04083707..b617564eb62 100644 --- a/src/mame/amiga/amigaaga.cpp +++ b/src/mame/amiga/amigaaga.cpp @@ -27,16 +27,10 @@ TODO: #include "emu.h" #include "amiga.h" +#define LOG_SPRITE_DMA (1U << 1) - -/************************************* - * - * Debugging - * - *************************************/ - -#define LOG_SPRITE_DMA 0 - +#define VERBOSE (0) +#include "logmacro.h" /************************************* @@ -121,7 +115,7 @@ void amiga_state::aga_fetch_sprite_data(int scanline, int sprite) m_aga_sprdatb[sprite][0] = read_chip_ram(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) + 2); CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) += 4; m_aga_sprite_fetched_words = 1; - if (LOG_SPRITE_DMA) logerror("%3d:sprite %d fetch: data=%04X-%04X\n", scanline, sprite, m_aga_sprdata[sprite][0], m_aga_sprdatb[sprite][0]); + LOGMASKED(LOG_SPRITE_DMA, "%3d:sprite %d fetch: data=%04X-%04X\n", scanline, sprite, m_aga_sprdata[sprite][0], m_aga_sprdatb[sprite][0]); break; case 1: case 2: @@ -132,7 +126,7 @@ void amiga_state::aga_fetch_sprite_data(int scanline, int sprite) m_aga_sprdatb[sprite][1] = read_chip_ram(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) + 2); CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) += 4; m_aga_sprite_fetched_words = 2; - if (LOG_SPRITE_DMA) logerror("%3d:sprite %d fetch: data=%04X-%04X %04X-%04X\n", scanline, sprite, m_aga_sprdata[sprite][0], m_aga_sprdatb[sprite][0], m_aga_sprdata[sprite][1], m_aga_sprdatb[sprite][1] ); + LOGMASKED(LOG_SPRITE_DMA, "%3d:sprite %d fetch: data=%04X-%04X %04X-%04X\n", scanline, sprite, m_aga_sprdata[sprite][0], m_aga_sprdatb[sprite][0], m_aga_sprdata[sprite][1], m_aga_sprdatb[sprite][1] ); break; case 3: m_aga_sprdata[sprite][0] = read_chip_ram(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) + 0); @@ -148,7 +142,7 @@ void amiga_state::aga_fetch_sprite_data(int scanline, int sprite) m_aga_sprdatb[sprite][3] = read_chip_ram(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) + 2); CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) += 4; m_aga_sprite_fetched_words = 4; - if (LOG_SPRITE_DMA) logerror("%3d:sprite %d fetch: data=%04X-%04X %04X-%04X %04X-%04X %04X-%04X\n", + LOGMASKED(LOG_SPRITE_DMA, "%3d:sprite %d fetch: data=%04X-%04X %04X-%04X %04X-%04X %04X-%04X\n", scanline, sprite, m_aga_sprdata[sprite][0], m_aga_sprdatb[sprite][0], m_aga_sprdata[sprite][1], m_aga_sprdatb[sprite][1], @@ -191,7 +185,7 @@ void amiga_state::aga_update_sprite_dma(int scanline) // (it enables sprite 0 only, and +8 for the vstop values) CUSTOM_REG(REG_SPR0CTL + 4 * num) = read_chip_ram(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * num) + spr_fmode_inc); CUSTOM_REG_LONG(REG_SPR0PTH + 2 * num) += 2 * spr_fmode_inc; - if (LOG_SPRITE_DMA) logerror("%3d:sprite %d fetch: pos=%04X ctl=%04X\n", scanline, num, CUSTOM_REG(REG_SPR0POS + 4 * num), CUSTOM_REG(REG_SPR0CTL + 4 * num)); + LOGMASKED(LOG_SPRITE_DMA, "%3d:sprite %d fetch: pos=%04X ctl=%04X\n", scanline, num, CUSTOM_REG(REG_SPR0POS + 4 * num), CUSTOM_REG(REG_SPR0CTL + 4 * num)); } u16 spr0ctl = CUSTOM_REG(REG_SPR0CTL + 4 * num); @@ -209,7 +203,7 @@ void amiga_state::aga_update_sprite_dma(int scanline) if (scanline == vstart) { m_sprite_comparitor_enable_mask |= 1 << num; - if (LOG_SPRITE_DMA) logerror("%3d:sprite %d comparitor enable\n", scanline, num); + LOGMASKED(LOG_SPRITE_DMA, "%3d:sprite %d comparitor enable\n", scanline, num); } /* if we hit vstop, disable the comparitor and trigger a reload for the next scanline */ @@ -220,7 +214,7 @@ void amiga_state::aga_update_sprite_dma(int scanline) m_sprite_dma_reload_mask |= 1 << num; CUSTOM_REG(REG_SPR0DATA + 4 * num) = 0; /* just a guess */ CUSTOM_REG(REG_SPR0DATB + 4 * num) = 0; - if (LOG_SPRITE_DMA) logerror("%3d:sprite %d comparitor disable, prepare for reload\n", scanline, num); + LOGMASKED(LOG_SPRITE_DMA, "%3d:sprite %d comparitor disable, prepare for reload\n", scanline, num); } /* fetch data if this sprite is enabled */ diff --git a/src/mame/amiga/upscope.cpp b/src/mame/amiga/upscope.cpp index 53a629f9f80..03c7a44b642 100644 --- a/src/mame/amiga/upscope.cpp +++ b/src/mame/amiga/upscope.cpp @@ -35,6 +35,11 @@ #include "speaker.h" +#define LOG_IO (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" + namespace { @@ -78,16 +83,6 @@ private: }; -/************************************* - * - * Debugging - * - *************************************/ - -#define LOG_IO 0 - - - /************************************* * * Reset state @@ -143,7 +138,7 @@ void upscope_state::upscope_cia_1_porta_w(uint8_t data) /* if SEL == 1 && BUSY == 0, we latch an address */ if ((data & 5) == 4) { - if (LOG_IO) logerror("Latch address: %02X\n", m_parallel_data); + LOGMASKED(LOG_IO, "Latch address: %02X\n", m_parallel_data); m_nvram_address_latch = m_parallel_data; } @@ -156,7 +151,7 @@ void upscope_state::upscope_cia_1_porta_w(uint8_t data) /* if SEL == 0 && BUSY == 1, we write data to NVRAM */ else if ((data & 5) == 1) { - if (LOG_IO) logerror("NVRAM data write @ %02X = %02X\n", m_nvram_address_latch, m_parallel_data); + LOGMASKED(LOG_IO, "NVRAM data write @ %02X = %02X\n", m_nvram_address_latch, m_parallel_data); m_nvram[m_nvram_address_latch] = m_parallel_data; } @@ -173,7 +168,7 @@ void upscope_state::upscope_cia_1_porta_w(uint8_t data) /* if SEL == 1, we read internal data registers */ if (data & 4) { - if (LOG_IO) logerror("Internal register (%d) read\n", m_nvram_address_latch); + LOGMASKED(LOG_IO, "Internal register (%d) read\n", m_nvram_address_latch); m_nvram_data_latch = m_ppi->read(m_nvram_address_latch & 0x03); } @@ -181,7 +176,7 @@ void upscope_state::upscope_cia_1_porta_w(uint8_t data) else { m_nvram_data_latch = m_nvram[m_nvram_address_latch]; - if (LOG_IO) logerror("NVRAM data read @ %02X = %02X\n", m_nvram_address_latch, m_nvram_data_latch); + LOGMASKED(LOG_IO, "NVRAM data read @ %02X = %02X\n", m_nvram_address_latch, m_nvram_data_latch); } } diff --git a/src/mame/amstrad/nc.cpp b/src/mame/amstrad/nc.cpp index 5a83538db6b..6cbf5c56e5a 100644 --- a/src/mame/amstrad/nc.cpp +++ b/src/mame/amstrad/nc.cpp @@ -64,7 +64,6 @@ #include "formats/pc_dsk.h" -#define LOG_GENERAL (1U << 0) #define LOG_DEBUG (1U << 1) #define LOG_IRQ (1U << 2) diff --git a/src/mame/amstrad/pcw.cpp b/src/mame/amstrad/pcw.cpp index 2966b14a50a..140efd0f640 100644 --- a/src/mame/amstrad/pcw.cpp +++ b/src/mame/amstrad/pcw.cpp @@ -111,15 +111,15 @@ #include "pcw.lh" -#define LOG_PRN (1U << 1) -#define LOG_STROBE (1U << 2) -#define LOG_PAR (1U << 3) -#define LOG_EXP (1U << 4) -#define LOG_MEM (1U << 5) -#define LOG_SYS (1U << 6) -#define LOG_BANK (1U << 7) -#define LOG_RRAM (1U << 8) -#define LOG_IRQ (1U << 9) +#define LOG_PRN (1U << 1) +#define LOG_STROBE (1U << 2) +#define LOG_PAR (1U << 3) +#define LOG_EXP (1U << 4) +#define LOG_MEM (1U << 5) +#define LOG_SYS (1U << 6) +#define LOG_BANK (1U << 7) +#define LOG_RRAM (1U << 8) +#define LOG_IRQ (1U << 9) //#define VERBOSE (LOG_SYS) //#define LOG_OUTPUT_FUNC printf diff --git a/src/mame/amstrad/pcw_v.cpp b/src/mame/amstrad/pcw_v.cpp index 1e49a84a789..b87177c0041 100644 --- a/src/mame/amstrad/pcw_v.cpp +++ b/src/mame/amstrad/pcw_v.cpp @@ -12,8 +12,8 @@ #include "pcw.h" #include "machine/ram.h" -#define LOG_PALETTE (1U << 1) // LOGs what palette is choosen -#define LOG_VOFF (1U << 2) // LOGs when video is OFF +#define LOG_PALETTE (1U << 1) // LOGs what palette is choosen +#define LOG_VOFF (1U << 2) // LOGs when video is OFF //#define VERBOSE (LOG_PALETTE) //#define LOG_OUTPUT_FUNC printf diff --git a/src/mame/apple/apple3_m.cpp b/src/mame/apple/apple3_m.cpp index 2bfb5bc040b..38eedada44f 100644 --- a/src/mame/apple/apple3_m.cpp +++ b/src/mame/apple/apple3_m.cpp @@ -47,8 +47,11 @@ #include "emu.h" #include "apple3.h" -#define LOG_MEMORY 0 -#define LOG_INDXADDR 0 +#define LOG_MEMORY (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" + #define ENV_SLOWSPEED (0x80) #define ENV_IOENABLE (0x40) @@ -527,10 +530,7 @@ void apple3_state::apple3_update_memory() uint16_t bank; uint8_t page; - if (LOG_MEMORY) - { - logerror("apple3_update_memory(): via_0_b=0x%02x via_1_a=0x0x%02x\n", m_via_0_b, m_via_1_a); - } + LOGMASKED(LOG_MEMORY, "apple3_update_memory(): via_0_b=0x%02x via_1_a=0x0x%02x\n", m_via_0_b, m_via_1_a); m_maincpu->set_unscaled_clock(((m_via_0_a & ENV_SLOWSPEED) ? APPLE2_CLOCK : (14.318181_MHz_XTAL / 7)), true); diff --git a/src/mame/apple/awacs_macrisc.cpp b/src/mame/apple/awacs_macrisc.cpp index c97582f29f7..be87caf10f6 100644 --- a/src/mame/apple/awacs_macrisc.cpp +++ b/src/mame/apple/awacs_macrisc.cpp @@ -17,8 +17,7 @@ #include "emu.h" #include "awacs_macrisc.h" -#define LOG_GENERAL (1U << 0) -#define LOG_REGISTERS (1U << 0) +#define LOG_REGISTERS (1U << 1) #define VERBOSE (0) #include "logmacro.h" @@ -149,7 +148,7 @@ void awacs_macrisc_device::write_macrisc(offs_t offset, uint32_t data) { case 0: // Audio Control m_stream->set_sample_rate(clock() / rates[(data >> 8) & 7]); - LOGMASKED(LOG_GENERAL, "%s: sample rate to %d Hz\n", tag(), clock() / rates[(data >> 8) & 7]); + LOG("%s: sample rate to %d Hz\n", tag(), clock() / rates[(data >> 8) & 7]); break; case 4: // Audio CODEC Control @@ -206,5 +205,5 @@ void screamer_device::write_macrisc(offs_t offset, uint32_t data) { m_active &= ~ACTIVE_OUT; } - LOGMASKED(LOG_GENERAL, "%s: Playback %s reg 6 %x)\n", tag(), !BIT(m_registers[6], 1) ? "on" : "off", m_registers[6]); + LOG("%s: Playback %s reg 6 %x)\n", tag(), !BIT(m_registers[6], 1) ? "on" : "off", m_registers[6]); } diff --git a/src/mame/apple/bandit.cpp b/src/mame/apple/bandit.cpp index 3bed4f837fd..8250c79771e 100644 --- a/src/mame/apple/bandit.cpp +++ b/src/mame/apple/bandit.cpp @@ -8,8 +8,6 @@ #include "emu.h" #include "bandit.h" -#define LOG_GENERAL (1U << 0) - #define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/apple/burgundy.cpp b/src/mame/apple/burgundy.cpp index 2f071929c00..99b5b5df0ea 100644 --- a/src/mame/apple/burgundy.cpp +++ b/src/mame/apple/burgundy.cpp @@ -11,8 +11,7 @@ #include "emu.h" #include "burgundy.h" -#define LOG_GENERAL (1U << 0) -#define LOG_REGISTERS (1U << 0) +#define LOG_REGISTERS (1U << 1) #define VERBOSE (0) #include "logmacro.h" @@ -146,12 +145,12 @@ void burgundy_device::write_macrisc(offs_t offset, uint32_t data) { if ((m_registers[0x60] & 6) != 0) { - LOGMASKED(LOG_GENERAL, "%s: Playback enabled\n", tag()); + LOG("%s: Playback enabled\n", tag()); m_active |= ACTIVE_OUT; } else { - LOGMASKED(LOG_GENERAL, "%s: Playback disabled\n", tag()); + LOG("%s: Playback disabled\n", tag()); m_active &= ~ACTIVE_OUT; } } diff --git a/src/mame/apple/dbdma.cpp b/src/mame/apple/dbdma.cpp index cd10acc5561..720ed585c2d 100644 --- a/src/mame/apple/dbdma.cpp +++ b/src/mame/apple/dbdma.cpp @@ -8,8 +8,6 @@ #include "emu.h" #include "dbdma.h" -#define LOG_GENERAL (1U << 0) - #define VERBOSE (0) #include "logmacro.h" @@ -87,11 +85,11 @@ void dbdma_device::control_w(u32 data) m_status &= (mask ^ 0xffff); m_status |= (data & mask); - LOGMASKED(LOG_GENERAL, "%s: channel status/control to %04x (raw %08x)\n", tag(), m_status, data); + LOG("%s: channel status/control to %04x (raw %08x)\n", tag(), m_status, data); if (m_status & STATUS_RUN) { - LOGMASKED(LOG_GENERAL, "%s: channel set to RUN, also setting ACTIVE\n", tag()); + LOG("%s: channel set to RUN, also setting ACTIVE\n", tag()); m_status |= STATUS_ACTIVE; } else @@ -129,7 +127,7 @@ void dbdma_device::cmdpointer_w(u32 data) { if (!(m_status & STATUS_ACTIVE)) { - LOGMASKED(LOG_GENERAL, "%s: %08x to command pointer\n", tag(), swapendian_int32(data)); + LOG("%s: %08x to command pointer\n", tag(), swapendian_int32(data)); m_command_pointer = data; new_command(); @@ -253,7 +251,7 @@ void dbdma_device::step_program() if (m_currentXfer >= m_xferLimit) { m_command_pointer += 16; - LOGMASKED(LOG_GENERAL, "%s: Advancing command pointer to %08x\n", tag(), m_command_pointer); + LOG("%s: Advancing command pointer to %08x\n", tag(), m_command_pointer); new_command(); } } @@ -268,6 +266,6 @@ void dbdma_device::new_command() m_currentXfer = m_statusCount & 0xffff; m_xferLimit = m_opcode & 0xffff; - LOGMASKED(LOG_GENERAL, "%s: new command %08x %08x %08x %08x\n", tag(), m_opcode, m_address, m_cmdDep, m_statusCount); - LOGMASKED(LOG_GENERAL, "%s: opcode %d\n", tag(), m_opcode >> 28); + LOG("%s: new command %08x %08x %08x %08x\n", tag(), m_opcode, m_address, m_cmdDep, m_statusCount); + LOG("%s: opcode %d\n", tag(), m_opcode >> 28); } diff --git a/src/mame/apple/heathrow.cpp b/src/mame/apple/heathrow.cpp index 54cf3e82065..f2fded83fc9 100644 --- a/src/mame/apple/heathrow.cpp +++ b/src/mame/apple/heathrow.cpp @@ -25,7 +25,6 @@ #include "bus/rs232/rs232.h" #include "formats/ap_dsk35.h" -#define LOG_GENERAL (1U << 0) #define LOG_IRQ (1U << 1) #define VERBOSE (0) diff --git a/src/mame/apple/lwriter.cpp b/src/mame/apple/lwriter.cpp index 1964c633fb5..72ecf675ea3 100644 --- a/src/mame/apple/lwriter.cpp +++ b/src/mame/apple/lwriter.cpp @@ -100,7 +100,6 @@ #include "screen.h" -#define LOG_GENERAL (1U << 0) #define LOG_VIDEO (1U << 1) //#define VERBOSE (LOG_COMMAND) diff --git a/src/mame/apple/macrtc.cpp b/src/mame/apple/macrtc.cpp index 0e35e4eb147..17a11a1c125 100644 --- a/src/mame/apple/macrtc.cpp +++ b/src/mame/apple/macrtc.cpp @@ -30,7 +30,6 @@ #include "emu.h" #include "macrtc.h" -#define LOG_GENERAL (1U << 0) #define LOG_COMMANDS (1U << 1) //#define VERBOSE (LOG_COMMANDS) @@ -175,7 +174,7 @@ void rtc3430042_device::rtc_clock_updated(int year, int month, int day, int day_ seconds = (uint32_t)((uint32_t)mktime(&cur_time) - mac_reference); } - LOGMASKED(LOG_GENERAL, "second count 0x%lX\n", (unsigned long) seconds); + LOG("second count 0x%lX\n", (unsigned long) seconds); m_seconds[0] = seconds & 0xff; m_seconds[1] = (seconds >> 8) & 0xff; @@ -237,7 +236,7 @@ void rtc3430042_device::rtc_shift_data(int data) if (m_data_dir) { m_data_out = (m_data_byte >> --m_bit_count) & 0x01; - LOGMASKED(LOG_GENERAL, "RTC shifted new data %d\n", m_data_out); + LOG("RTC shifted new data %d\n", m_data_out); } else { diff --git a/src/mame/apple/v8.cpp b/src/mame/apple/v8.cpp index 5be6273afc6..9f9336ad86d 100644 --- a/src/mame/apple/v8.cpp +++ b/src/mame/apple/v8.cpp @@ -37,7 +37,7 @@ #include "formats/ap_dsk35.h" #include "layout/generic.h" -#define LOG_RAM (1U << 0) +#define LOG_RAM (1U << 1) #define VERBOSE (LOG_RAM) #include "logmacro.h" diff --git a/src/mame/atari/atarigt.cpp b/src/mame/atari/atarigt.cpp index e6a3e0d29b6..5b2d35d09b4 100644 --- a/src/mame/atari/atarigt.cpp +++ b/src/mame/atari/atarigt.cpp @@ -60,8 +60,12 @@ #include "machine/eeprompar.h" #include "speaker.h" +#define LOG_PROTECTION (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" + -#define LOG_PROTECTION (0) #define HACK_TMEK_CONTROLS (0) @@ -332,7 +336,7 @@ void atarigt_state::tmek_protection_w(address_space &space, offs_t offset, uint1 Read ($38488) */ - if (LOG_PROTECTION) logerror("%s:Protection W@%06X = %04X\n", machine().describe_context(), offset, data); + LOGMASKED(LOG_PROTECTION, "%s:Protection W@%06X = %04X\n", machine().describe_context(), offset, data); /* track accesses */ tmek_update_mode(offset); @@ -347,7 +351,7 @@ void atarigt_state::tmek_protection_w(address_space &space, offs_t offset, uint1 void atarigt_state::tmek_protection_r(address_space &space, offs_t offset, uint16_t *data) { - if (LOG_PROTECTION) logerror("%s:Protection R@%06X\n", machine().describe_context(), offset); + LOGMASKED(LOG_PROTECTION, "%s:Protection R@%06X\n", machine().describe_context(), offset); /* track accesses */ tmek_update_mode(offset); @@ -387,21 +391,21 @@ void atarigt_state::primrage_update_mode(offs_t offset) /* this is from the code at $20f90 */ if (m_protaddr[1] == 0xdcc7c4 && m_protaddr[2] == 0xdcc7c4 && m_protaddr[3] == 0xdc4010) { - if (LOG_PROTECTION) logerror("prot:Entering mode 1\n"); + LOGMASKED(LOG_PROTECTION, "prot:Entering mode 1\n"); m_protmode = 1; } /* this is from the code at $27592 */ if (m_protaddr[0] == 0xdcc7ca && m_protaddr[1] == 0xdcc7ca && m_protaddr[2] == 0xdcc7c6 && m_protaddr[3] == 0xdc4022) { - if (LOG_PROTECTION) logerror("prot:Entering mode 2\n"); + LOGMASKED(LOG_PROTECTION, "prot:Entering mode 2\n"); m_protmode = 2; } /* this is from the code at $3d8dc */ if (m_protaddr[0] == 0xdcc7c0 && m_protaddr[1] == 0xdcc7c0 && m_protaddr[2] == 0xdc80f2 && m_protaddr[3] == 0xdc7af2) { - if (LOG_PROTECTION) logerror("prot:Entering mode 3\n"); + LOGMASKED(LOG_PROTECTION, "prot:Entering mode 3\n"); m_protmode = 3; } } @@ -411,20 +415,17 @@ void atarigt_state::primrage_update_mode(offs_t offset) void atarigt_state::primrage_protection_w(address_space &space, offs_t offset, uint16_t data) { - if (LOG_PROTECTION) - { - uint32_t pc = m_maincpu->pcbase(); - switch (pc) + switch (m_maincpu->pcbase()) { /* protection code from 20f90 - 21000 */ case 0x20fba: if (offset % 16 == 0) logerror("\n "); - logerror("W@%06X(%04X) ", offset, data); + LOGMASKED(LOG_PROTECTION, "W@%06X(%04X) ", offset, data); break; /* protection code from 27592 - 27664 */ case 0x275f6: - logerror("W@%06X(%04X) ", offset, data); + LOGMASKED(LOG_PROTECTION, "W@%06X(%04X) ", offset, data); break; /* protection code from 3d8dc - 3d95a */ @@ -432,24 +433,23 @@ void atarigt_state::primrage_protection_w(address_space &space, offs_t offset, u case 0x3d932: case 0x3d938: case 0x3d93e: - logerror("W@%06X(%04X) ", offset, data); + LOGMASKED(LOG_PROTECTION, "W@%06X(%04X) ", offset, data); break; case 0x3d944: - logerror("W@%06X(%04X) - done\n", offset, data); + LOGMASKED(LOG_PROTECTION, "W@%06X(%04X) - done\n", offset, data); break; /* protection code from 437fa - 43860 */ case 0x43830: case 0x43838: - logerror("W@%06X(%04X) ", offset, data); + LOGMASKED(LOG_PROTECTION, "W@%06X(%04X) ", offset, data); break; /* catch anything else */ default: - logerror("%s:Unknown protection W@%06X = %04X\n", machine().describe_context(), offset, data); + LOGMASKED(LOG_PROTECTION, "%s:Unknown protection W@%06X = %04X\n", machine().describe_context(), offset, data); break; } - } /* mask = 0x78fff */ @@ -463,7 +463,7 @@ void atarigt_state::primrage_protection_w(address_space &space, offs_t offset, u if (m_protmode == 2) { int temp = (offset - 0xdc7800) >> 1; - if (LOG_PROTECTION) logerror("prot:mode 2 param = %04X\n", temp); + LOGMASKED(LOG_PROTECTION, "prot:mode 2 param = %04X\n", temp); m_protresult = temp * 0x6915 + 0x6915; } @@ -471,7 +471,7 @@ void atarigt_state::primrage_protection_w(address_space &space, offs_t offset, u { if (offset == 0xdc4700) { - if (LOG_PROTECTION) logerror("prot:Clearing mode 3\n"); + LOGMASKED(LOG_PROTECTION, "prot:Clearing mode 3\n"); m_protmode = 0; } } @@ -484,22 +484,20 @@ void atarigt_state::primrage_protection_r(address_space &space, offs_t offset, u /* track accesses */ primrage_update_mode(offset); -if (LOG_PROTECTION) -{ uint32_t pc = m_maincpu->pcbase(); uint32_t p1, p2, a6; switch (pc) { /* protection code from 20f90 - 21000 */ case 0x20f90: - logerror("Known Protection @ 20F90: R@%06X ", offset); + LOGMASKED(LOG_PROTECTION, "Known Protection @ 20F90: R@%06X ", offset); break; case 0x20f98: case 0x20fa0: - logerror("R@%06X ", offset); + LOGMASKED(LOG_PROTECTION, "R@%06X ", offset); break; case 0x20fcc: - logerror("R@%06X - done\n", offset); + LOGMASKED(LOG_PROTECTION, "R@%06X - done\n", offset); break; /* protection code from 27592 - 27664 */ @@ -509,50 +507,49 @@ if (LOG_PROTECTION) a6 = m_maincpu->state_int(M68K_A6); p1 = (space.read_word(a6+8) << 16) | space.read_word(a6+10); p2 = (space.read_word(a6+12) << 16) | space.read_word(a6+14); - logerror("Known Protection @ 275BC(%08X, %08X): R@%06X ", p1, p2, offset); + LOGMASKED(LOG_PROTECTION, "Known Protection @ 275BC(%08X, %08X): R@%06X ", p1, p2, offset); break; case 0x275d2: case 0x275d8: case 0x275de: case 0x2761e: case 0x2762e: - logerror("R@%06X ", offset); + LOGMASKED(LOG_PROTECTION, "R@%06X ", offset); break; case 0x2763e: - logerror("R@%06X - done\n", offset); + LOGMASKED(LOG_PROTECTION, "R@%06X - done\n", offset); break; /* protection code from 3d8dc - 3d95a */ case 0x3d8f4: a6 = m_maincpu->state_int(M68K_A6); p1 = (space.read_word(a6+12) << 16) | space.read_word(a6+14); - logerror("Known Protection @ 3D8F4(%08X): R@%06X ", p1, offset); + LOGMASKED(LOG_PROTECTION, "Known Protection @ 3D8F4(%08X): R@%06X ", p1, offset); break; case 0x3d8fa: case 0x3d90e: - logerror("R@%06X ", offset); + LOGMASKED(LOG_PROTECTION, "R@%06X ", offset); break; /* protection code from 437fa - 43860 */ case 0x43814: a6 = m_maincpu->state_int(M68K_A6); p1 = space.read_dword(a6+14) & 0xffffff; - logerror("Known Protection @ 43814(%08X): R@%06X ", p1, offset); + LOGMASKED(LOG_PROTECTION, "Known Protection @ 43814(%08X): R@%06X ", p1, offset); break; case 0x4381c: case 0x43840: - logerror("R@%06X ", offset); + LOGMASKED(LOG_PROTECTION, "R@%06X ", offset); break; case 0x43848: - logerror("R@%06X - done\n", offset); + LOGMASKED(LOG_PROTECTION, "R@%06X - done\n", offset); break; /* catch anything else */ default: - logerror("%s:Unknown protection R@%06X\n", machine().describe_context(), offset); + LOGMASKED(LOG_PROTECTION, "%s:Unknown protection R@%06X\n", machine().describe_context(), offset); break; } -} /* handle specific reads */ switch (offset) @@ -571,7 +568,7 @@ if (LOG_PROTECTION) { *data = m_protresult; m_protmode = 0; - if (LOG_PROTECTION) logerror("prot:Clearing mode 2\n"); + LOGMASKED(LOG_PROTECTION, "prot:Clearing mode 2\n"); } break; @@ -579,7 +576,7 @@ if (LOG_PROTECTION) if (m_protmode == 1) { m_protmode = 0; - if (LOG_PROTECTION) logerror("prot:Clearing mode 1\n"); + LOGMASKED(LOG_PROTECTION, "prot:Clearing mode 1\n"); } break; } diff --git a/src/mame/atari/cops.cpp b/src/mame/atari/cops.cpp index e118dd5ce89..9dfcfc61122 100644 --- a/src/mame/atari/cops.cpp +++ b/src/mame/atari/cops.cpp @@ -43,11 +43,14 @@ #include "cops.lh" +#define LOG_CDROM (1U << 1) +#define LOG_DACIA (1U << 2) + +#define VERBOSE (LOG_CDROM | LOG_DACIA) +#include "logmacro.h" -namespace { -#define LOG_CDROM 1 -#define LOG_DACIA 1 +namespace { #define CMP_REGISTER 0 #define AUX_REGISTER 1 @@ -219,12 +222,12 @@ void cops_state::cdrom_data_w(uint8_t data) const char *regs[4] = { "CMD", "PARAM", "WRITE", "CTRL" }; m_cdrom_data = bitswap<8>(data,0,1,2,3,4,5,6,7); uint8_t reg = ((m_cdrom_ctrl & 4) >> 1) | ((m_cdrom_ctrl & 8) >> 3); - if (LOG_CDROM) logerror("%s:cdrom_data_w(reg = %s, data = %02x)\n", machine().describe_context(), regs[reg & 0x03], m_cdrom_data); + LOGMASKED(LOG_CDROM, "%s:cdrom_data_w(reg = %s, data = %02x)\n", machine().describe_context(), regs[reg & 0x03], m_cdrom_data); } void cops_state::cdrom_ctrl_w(uint8_t data) { - if (LOG_CDROM) logerror("%s:cdrom_ctrl_w(%02x)\n", machine().describe_context(), data); + LOGMASKED(LOG_CDROM, "%s:cdrom_ctrl_w(%02x)\n", machine().describe_context(), data); m_cdrom_ctrl = data; } @@ -232,7 +235,7 @@ uint8_t cops_state::cdrom_data_r() { const char *regs[4] = { "STATUS", "RESULT", "READ", "FIFOST" }; uint8_t reg = ((m_cdrom_ctrl & 4) >> 1) | ((m_cdrom_ctrl & 8) >> 3); - if (LOG_CDROM) logerror("%s:cdrom_data_r(reg = %s)\n", machine().describe_context(), regs[reg & 0x03]); + LOGMASKED(LOG_CDROM, "%s:cdrom_data_r(reg = %s)\n", machine().describe_context(), regs[reg & 0x03]); return machine().rand()&0xff; } /************************************* @@ -392,7 +395,7 @@ uint8_t cops_state::dacia_r(offs_t offset) csr |= (m_dacia_dtr1 << 1); csr |= (m_dacia_cts <<4); csr |= (m_dacia_fe1 <<7); - if (LOG_DACIA) logerror("CSR1 %02x\n",csr); + LOGMASKED(LOG_DACIA, "CSR1 %02x\n",csr); return csr; } @@ -401,8 +404,8 @@ uint8_t cops_state::dacia_r(offs_t offset) m_dacia_receiver_full = 0; m_dacia_fe1=0; -// if (LOG_DACIA) logerror("RDR1 %02x\n",m_dacia_receiver_data); - if (LOG_DACIA) logerror("RDR1 %02x\n",m_ld->status_r()); +// LOGMASKED(LOG_DACIA, "RDR1 %02x\n",m_dacia_receiver_data); + LOGMASKED(LOG_DACIA, "RDR1 %02x\n",m_ld->status_r()); return m_ld->status_r(); } case 4: /* ISR2: Interrupt Status Register */ @@ -420,7 +423,7 @@ uint8_t cops_state::dacia_r(offs_t offset) csr2 |= (m_dacia_dtr2 << 1); csr2 |= (m_dacia_cts <<4); csr2 |= (m_dacia_fe2 <<7); - if (LOG_DACIA) logerror("CSR2 %02x\n",csr2); + LOGMASKED(LOG_DACIA, "CSR2 %02x\n",csr2); return csr2; } @@ -428,12 +431,12 @@ uint8_t cops_state::dacia_r(offs_t offset) m_dacia_receiver_full2 = 0; m_dacia_fe2=0; - if (LOG_DACIA) logerror("RDR2 %02x\n",m_ld->status_r()); + LOGMASKED(LOG_DACIA, "RDR2 %02x\n",m_ld->status_r()); return m_ld->status_r(); - default: - if (LOG_DACIA) logerror("%s:dacia_r(%02x)\n", machine().describe_context(), offset); + default: + LOGMASKED(LOG_DACIA, "%s:dacia_r(%02x)\n", machine().describe_context(), offset); return 0; } } @@ -453,7 +456,7 @@ void cops_state::dacia_w(offs_t offset, uint8_t data) { m_dacia_irq1_reg &= ~(data & 0x7f); } - if (LOG_DACIA) logerror("DACIA IRQ 1 Register: %02x\n", m_dacia_irq1_reg); + LOGMASKED(LOG_DACIA, "DACIA IRQ 1 Register: %02x\n", m_dacia_irq1_reg); update_dacia_irq(); break; @@ -465,7 +468,7 @@ void cops_state::dacia_w(offs_t offset, uint8_t data) m_parity_1 = (data & 0x04); m_parity_mode_1 = ((data & 0x18) >> 3); m_bpc_1 = ((data & 0x60) >> 5) +5; - if (LOG_DACIA) logerror("DACIA Format Register: %02x\n", data); + LOGMASKED(LOG_DACIA, "DACIA Format Register: %02x\n", data); } else // Control register { @@ -480,11 +483,11 @@ void cops_state::dacia_w(offs_t offset, uint8_t data) { m_dacia_reg1 = CMP_REGISTER; } - if (LOG_DACIA) logerror("DACIA TIME %02d\n", (XTAL(3'686'400) / m_dacia_ic_div_1).value()); + LOGMASKED(LOG_DACIA, "DACIA TIME %02d\n", (XTAL(3'686'400) / m_dacia_ic_div_1).value()); // m_ld_timer->adjust(attotime::from_hz(XTAL(3'686'400) / m_dacia_ic_div_1), 0, attotime::from_hz(XTAL(3'686'400) / m_dacia_ic_div_1)); - if (LOG_DACIA) logerror("DACIA Ctrl Register: %02x\n", data); + LOGMASKED(LOG_DACIA, "DACIA Ctrl Register: %02x\n", data); } break; @@ -494,16 +497,16 @@ void cops_state::dacia_w(offs_t offset, uint8_t data) { m_dacia_cmp1 = 1; m_dacia_cmpval1 = data; - if (LOG_DACIA) logerror("DACIA Compare mode: %02x \n", data); + LOGMASKED(LOG_DACIA, "DACIA Compare mode: %02x \n", data); // update_dacia_irq(); } else { - if (LOG_DACIA) logerror("DACIA Aux ctrl: %02x \n", data); + LOGMASKED(LOG_DACIA, "DACIA Aux ctrl: %02x \n", data); } [[fallthrough]]; // FIXME: really? case 3: /* Transmit Data Register 1 */ - if (LOG_DACIA) logerror("DACIA Transmit: %02x %c\n", data, (char)data); + LOGMASKED(LOG_DACIA, "DACIA Transmit: %02x %c\n", data, (char)data); m_ld->command_w(data); break; @@ -518,7 +521,7 @@ void cops_state::dacia_w(offs_t offset, uint8_t data) { m_dacia_irq2_reg &= ~(data & 0x7f); } - if (LOG_DACIA) logerror("DACIA IRQ 2 Register: %02x\n", m_dacia_irq2_reg); + LOGMASKED(LOG_DACIA, "DACIA IRQ 2 Register: %02x\n", m_dacia_irq2_reg); update_dacia_irq(); break; @@ -530,7 +533,7 @@ void cops_state::dacia_w(offs_t offset, uint8_t data) m_parity_2 = (data & 0x04); m_parity_mode_2 = ((data & 0x18) >> 3); m_bpc_2 = ((data & 0x60) >> 5) +5; - if (LOG_DACIA) logerror("DACIA Format Register 2: %02x\n", data); + LOGMASKED(LOG_DACIA, "DACIA Format Register 2: %02x\n", data); } else // Control register { @@ -545,11 +548,11 @@ void cops_state::dacia_w(offs_t offset, uint8_t data) { m_dacia_reg2 = CMP_REGISTER; } - if (LOG_DACIA) logerror("DACIA TIME 2 %02d\n", (XTAL(3'686'400) / m_dacia_ic_div_1).value()); + LOGMASKED(LOG_DACIA, "DACIA TIME 2 %02d\n", (XTAL(3'686'400) / m_dacia_ic_div_1).value()); m_ld_timer->adjust(attotime::from_hz(XTAL(3'686'400) / m_dacia_ic_div_2), 0, attotime::from_hz(XTAL(3'686'400) / m_dacia_ic_div_2)); - if (LOG_DACIA) logerror("DACIA Ctrl Register 2: %02x\n", data); + LOGMASKED(LOG_DACIA, "DACIA Ctrl Register 2: %02x\n", data); } break; @@ -559,16 +562,16 @@ void cops_state::dacia_w(offs_t offset, uint8_t data) { m_dacia_cmp2 =1; m_dacia_cmpval2=data; - if (LOG_DACIA) logerror("DACIA Compare mode 2: %02x \n", data); + LOGMASKED(LOG_DACIA, "DACIA Compare mode 2: %02x \n", data); // update_dacia_irq(); } else { - if (LOG_DACIA) logerror("DACIA Aux ctrl 2: %02x \n", data); + LOGMASKED(LOG_DACIA, "DACIA Aux ctrl 2: %02x \n", data); } [[fallthrough]]; // FIXME: really? case 7: /* Transmit Data Register 2 */ - if (LOG_DACIA) logerror("DACIA Transmit 2: %02x %c\n", data, (char)data); + LOGMASKED(LOG_DACIA, "DACIA Transmit 2: %02x %c\n", data, (char)data); // for (int i=0; i <8; i++) { diff --git a/src/mame/atari/jagblit.ipp b/src/mame/atari/jagblit.ipp index 86c3bc9d8d7..44af1e50f15 100644 --- a/src/mame/atari/jagblit.ipp +++ b/src/mame/atari/jagblit.ipp @@ -298,38 +298,35 @@ void jaguar_state::FUNCNAME(uint32_t command, uint32_t a1flags, uint32_t a2flags if (gouraud_iinc & 0x800000) gouraud_iinc |= 0xff000000; - if (LOG_BLITS) - { - logerror("%s:Blit!\n", machine().describe_context()); - logerror(" a1_base = %08X\n", a1_base); - logerror(" a1_pitch = %d\n", a1_pitch); - logerror(" a1_psize = %d\n", 1 << ((A1FIXED >> 3) & 7)); - logerror(" a1_width = %d\n", a1_width); - logerror(" a1_xadd = %f (phrase=%d)\n", (double)a1_xadd / 65536.0, a1_phrase_mode); - logerror(" a1_yadd = %f\n", (double)a1_yadd / 65536.0); - logerror(" a1_xstep = %f\n", (double)a1_xstep / 65536.0); - logerror(" a1_ystep = %f\n", (double)a1_ystep / 65536.0); - logerror(" a1_x = %f\n", (double)a1_x / 65536.0); - logerror(" a1_y = %f\n", (double)a1_y / 65536.0); - - logerror(" a2_base = %08X\n", a2_base); - logerror(" a2_pitch = %d\n", a2_pitch); - logerror(" a2_psize = %d\n", 1 << ((A2FIXED >> 3) & 7)); - logerror(" a2_width = %d\n", a2_width); - logerror(" a2_xadd = %f (phrase=%d)\n", (double)a2_xadd / 65536.0, a2_phrase_mode); - logerror(" a2_yadd = %f\n", (double)a2_yadd / 65536.0); - logerror(" a2_xstep = %f\n", (double)a2_xstep / 65536.0); - logerror(" a2_ystep = %f\n", (double)a2_ystep / 65536.0); - logerror(" a2_x = %f\n", (double)a2_x / 65536.0); - logerror(" a2_y = %f\n", (double)a2_y / 65536.0); - - logerror(" count = %d x %d\n", inner_count, outer_count); - logerror(" command = %08X\n", COMMAND); - } + LOGMASKED(LOG_BLITS, "%s:Blit!\n", machine().describe_context()); + LOGMASKED(LOG_BLITS, " a1_base = %08X\n", a1_base); + LOGMASKED(LOG_BLITS, " a1_pitch = %d\n", a1_pitch); + LOGMASKED(LOG_BLITS, " a1_psize = %d\n", 1 << ((A1FIXED >> 3) & 7)); + LOGMASKED(LOG_BLITS, " a1_width = %d\n", a1_width); + LOGMASKED(LOG_BLITS, " a1_xadd = %f (phrase=%d)\n", (double)a1_xadd / 65536.0, a1_phrase_mode); + LOGMASKED(LOG_BLITS, " a1_yadd = %f\n", (double)a1_yadd / 65536.0); + LOGMASKED(LOG_BLITS, " a1_xstep = %f\n", (double)a1_xstep / 65536.0); + LOGMASKED(LOG_BLITS, " a1_ystep = %f\n", (double)a1_ystep / 65536.0); + LOGMASKED(LOG_BLITS, " a1_x = %f\n", (double)a1_x / 65536.0); + LOGMASKED(LOG_BLITS, " a1_y = %f\n", (double)a1_y / 65536.0); + + LOGMASKED(LOG_BLITS, " a2_base = %08X\n", a2_base); + LOGMASKED(LOG_BLITS, " a2_pitch = %d\n", a2_pitch); + LOGMASKED(LOG_BLITS, " a2_psize = %d\n", 1 << ((A2FIXED >> 3) & 7)); + LOGMASKED(LOG_BLITS, " a2_width = %d\n", a2_width); + LOGMASKED(LOG_BLITS, " a2_xadd = %f (phrase=%d)\n", (double)a2_xadd / 65536.0, a2_phrase_mode); + LOGMASKED(LOG_BLITS, " a2_yadd = %f\n", (double)a2_yadd / 65536.0); + LOGMASKED(LOG_BLITS, " a2_xstep = %f\n", (double)a2_xstep / 65536.0); + LOGMASKED(LOG_BLITS, " a2_ystep = %f\n", (double)a2_ystep / 65536.0); + LOGMASKED(LOG_BLITS, " a2_x = %f\n", (double)a2_x / 65536.0); + LOGMASKED(LOG_BLITS, " a2_y = %f\n", (double)a2_y / 65536.0); + + LOGMASKED(LOG_BLITS, " count = %d x %d\n", inner_count, outer_count); + LOGMASKED(LOG_BLITS, " command = %08X\n", COMMAND); /* check for unhandled command bits */ - if ((COMMAND & 0x24003000) && LOG_UNHANDLED_BLITS) - logerror("Blitter unhandled: these command bits: %08X\n", COMMAND & 0x24003000); + if (COMMAND & 0x24003000) + LOGMASKED(LOG_UNHANDLED_BLITS, "Blitter unhandled: these command bits: %08X\n", COMMAND & 0x24003000); /* top of the outer loop */ outer = outer_count; diff --git a/src/mame/atari/jagobj.ipp b/src/mame/atari/jagobj.ipp index 519cb923b3a..afb120df7d0 100644 --- a/src/mame/atari/jagobj.ipp +++ b/src/mame/atari/jagobj.ipp @@ -7,13 +7,10 @@ ****************************************************************************/ #ifndef INCLUDE_OBJECT_PROCESSOR -#error jagobj.c is not directly compilable! +#error jagobj.ipp is not directly compilable! #endif -#define LOG_OBJECTS 0 - - /************************************* * * Object processor init @@ -559,7 +556,7 @@ static inline uint8_t lookup_pixel(const uint32_t *src, int i, int pitch, int de * *************************************/ -uint32_t *jaguar_state::process_bitmap(uint16_t *scanline, uint32_t *objdata, int vc, bool logit) +uint32_t *jaguar_state::process_bitmap(uint16_t *scanline, uint32_t *objdata, int vc) { /* extract minimal data */ uint32_t upper = objdata[0]; @@ -570,7 +567,7 @@ uint32_t *jaguar_state::process_bitmap(uint16_t *scanline, uint32_t *objdata, in uint32_t data = (upper >> 11); uint32_t *src = (uint32_t *)memory_base(data << 3); - if (logit) + /* debug logging */ { /* second phrase */ uint32_t upper2 = objdata[2]; @@ -586,8 +583,8 @@ uint32_t *jaguar_state::process_bitmap(uint16_t *scanline, uint32_t *objdata, in uint8_t flags = (upper2 >> 13) & 0x0f; uint8_t firstpix = (upper2 >> 17) & 0x3f; - logerror(" ypos=%X height=%X link=%06X data=%06X\n", ypos, height, link << 3, data << 3); - logerror(" xpos=%X depth=%X pitch=%X dwidth=%X iwidth=%X index=%X flags=%X firstpix=%X\n", xpos, depth, pitch, dwidth, iwidth, _index, flags, firstpix); + LOGMASKED(LOG_OBJECTS, " ypos=%X height=%X link=%06X data=%06X\n", ypos, height, link << 3, data << 3); + LOGMASKED(LOG_OBJECTS, " xpos=%X depth=%X pitch=%X dwidth=%X iwidth=%X index=%X flags=%X firstpix=%X\n", xpos, depth, pitch, dwidth, iwidth, _index, flags, firstpix); } /* only render if valid */ @@ -737,7 +734,7 @@ uint32_t *jaguar_state::process_bitmap(uint16_t *scanline, uint32_t *objdata, in * *************************************/ -uint32_t *jaguar_state::process_scaled_bitmap(uint16_t *scanline, uint32_t *objdata, int vc, bool logit) +uint32_t *jaguar_state::process_scaled_bitmap(uint16_t *scanline, uint32_t *objdata, int vc) { /* extract data */ uint32_t upper = objdata[0]; @@ -752,7 +749,7 @@ uint32_t *jaguar_state::process_scaled_bitmap(uint16_t *scanline, uint32_t *objd uint32_t lower3 = objdata[5]; int32_t remainder = (lower3 >> 16) & 0xff; - if (logit) + /* debug logging */ { /* second phrase */ uint32_t upper2 = objdata[2]; @@ -771,9 +768,9 @@ uint32_t *jaguar_state::process_scaled_bitmap(uint16_t *scanline, uint32_t *objd int32_t hscale = lower3 & 0xff; int32_t vscale = (lower3 >> 8) & 0xff; - logerror(" ypos=%X height=%X link=%06X data=%06X\n", ypos, height, link << 3, data << 3); - logerror(" xpos=%X depth=%X pitch=%X dwidth=%X iwidth=%X index=%X flags=%X firstpix=%X\n", xpos, depth, pitch, dwidth, iwidth, _index, flags, firstpix); - logerror(" hscale=%X vscale=%X remainder=%X\n", hscale, vscale, remainder); + LOGMASKED(LOG_OBJECTS, " ypos=%X height=%X link=%06X data=%06X\n", ypos, height, link << 3, data << 3); + LOGMASKED(LOG_OBJECTS, " xpos=%X depth=%X pitch=%X dwidth=%X iwidth=%X index=%X flags=%X firstpix=%X\n", xpos, depth, pitch, dwidth, iwidth, _index, flags, firstpix); + LOGMASKED(LOG_OBJECTS, " hscale=%X vscale=%X remainder=%X\n", hscale, vscale, remainder); } /* only render if valid */ @@ -953,7 +950,7 @@ uint32_t *jaguar_state::process_scaled_bitmap(uint16_t *scanline, uint32_t *objd * *************************************/ -uint32_t *jaguar_state::process_branch(uint32_t *objdata, int vc, bool logit) +uint32_t *jaguar_state::process_branch(uint32_t *objdata, int vc) { uint32_t upper = objdata[0]; uint32_t lower = objdata[1]; @@ -969,31 +966,31 @@ uint32_t *jaguar_state::process_branch(uint32_t *objdata, int vc, bool logit) { /* 0: branch if ypos == vc or ypos == 0x7ff */ case 0: - if (logit) logerror(" branch if %X == vc or %X == 0x7ff to %06X\n", ypos, ypos, link << 3); + LOGMASKED(LOG_OBJECTS, " branch if %X == vc or %X == 0x7ff to %06X\n", ypos, ypos, link << 3); taken = (ypos == vc) || (ypos == 0x7ff); break; /* 1: branch if ypos > vc */ case 1: - if (logit) logerror(" branch if %X > vc to %06X\n", ypos, link << 3); + LOGMASKED(LOG_OBJECTS, " branch if %X > vc to %06X\n", ypos, link << 3); taken = (ypos > vc); break; /* 2: branch if ypos < vc */ case 2: - if (logit) logerror(" branch if %X < vc to %06X\n", ypos, link << 3); + LOGMASKED(LOG_OBJECTS, " branch if %X < vc to %06X\n", ypos, link << 3); taken = (ypos < vc); break; /* 3: branch if object processor flag is set */ case 3: - if (logit) logerror(" branch if object flag set to %06X\n", link << 3); + LOGMASKED(LOG_OBJECTS, " branch if object flag set to %06X\n", link << 3); taken = m_gpu_regs[OBF] & 1; break; /* 4: branch on second half of display line */ case 4: - if (logit) logerror(" branch if second half of line to %06X\n", link << 3); + LOGMASKED(LOG_OBJECTS, " branch if second half of line to %06X\n", link << 3); taken = (vc & 1); break; @@ -1019,15 +1016,12 @@ void jaguar_state::process_object_list(int vc, uint16_t *scanline) { int done = 0, count = 0; uint32_t *objdata; - bool logit; int x; /* erase the scanline first */ for (x = 0; x < 760; x++) scanline[x] = m_gpu_regs[BG]; - logit = LOG_OBJECTS; - /* fetch the object pointer */ objdata = (uint32_t *)memory_base((m_gpu_regs[OLP_H] << 16) | m_gpu_regs[OLP_L]); while (!done && objdata && count++ < 100) @@ -1037,16 +1031,14 @@ void jaguar_state::process_object_list(int vc, uint16_t *scanline) { /* bitmap object */ case 0: - if (logit) - logerror("bitmap = %08X-%08X %08X-%08X\n", objdata[0], objdata[1], objdata[2], objdata[3]); - objdata = process_bitmap(scanline, objdata, vc, logit); + LOGMASKED(LOG_OBJECTS, "bitmap = %08X-%08X %08X-%08X\n", objdata[0], objdata[1], objdata[2], objdata[3]); + objdata = process_bitmap(scanline, objdata, vc); break; /* scaled bitmap object */ case 1: - if (logit) - logerror("scaled = %08X-%08X %08X-%08X %08X-%08X\n", objdata[0], objdata[1], objdata[2], objdata[3], objdata[4], objdata[5]); - objdata = process_scaled_bitmap(scanline, objdata, vc, logit); + LOGMASKED(LOG_OBJECTS, "scaled = %08X-%08X %08X-%08X %08X-%08X\n", objdata[0], objdata[1], objdata[2], objdata[3], objdata[4], objdata[5]); + objdata = process_scaled_bitmap(scanline, objdata, vc); break; @@ -1065,9 +1057,8 @@ void jaguar_state::process_object_list(int vc, uint16_t *scanline) /* branch */ case 3: - if (logit) - logerror("branch = %08X-%08X\n", objdata[0], objdata[1]); - objdata = process_branch(objdata, vc, logit); + LOGMASKED(LOG_OBJECTS, "branch = %08X-%08X\n", objdata[0], objdata[1]); + objdata = process_branch(objdata, vc); break; /* stop */ @@ -1076,8 +1067,7 @@ void jaguar_state::process_object_list(int vc, uint16_t *scanline) int interrupt = (objdata[1] >> 3) & 1; done = 1; - if (logit) - logerror("stop = %08X-%08X\n", objdata[0], objdata[1]); + LOGMASKED(LOG_OBJECTS, "stop = %08X-%08X\n", objdata[0], objdata[1]); if (interrupt) { // TODO: fball95 doesn't have a real handling for stop irq, causing the line to be always asserted, how to prevent? diff --git a/src/mame/atari/jaguar.h b/src/mame/atari/jaguar.h index a342b783ac7..8482a65c177 100644 --- a/src/mame/atari/jaguar.h +++ b/src/mame/atari/jaguar.h @@ -311,9 +311,9 @@ private: /* from jagobj.cpp */ void jagobj_init(); - uint32_t *process_bitmap(uint16_t *scanline, uint32_t *objdata, int vc, bool logit); - uint32_t *process_scaled_bitmap(uint16_t *scanline, uint32_t *objdata, int vc, bool logit); - uint32_t *process_branch(uint32_t *objdata, int vc, bool logit); + uint32_t *process_bitmap(uint16_t *scanline, uint32_t *objdata, int vc); + uint32_t *process_scaled_bitmap(uint16_t *scanline, uint32_t *objdata, int vc); + uint32_t *process_branch(uint32_t *objdata, int vc); void process_object_list(int vc, uint16_t *_scanline); void bitmap_4_draw(uint16_t *scanline, int32_t firstpix, int32_t iwidth, uint32_t *src, int32_t xpos, uint8_t flags, int32_t dxpos, uint16_t *clutbase); void bitmap_4_0(uint16_t *scanline, int32_t firstpix, int32_t iwidth, uint32_t *src, int32_t xpos, uint16_t *clutbase); diff --git a/src/mame/atari/jaguar_v.cpp b/src/mame/atari/jaguar_v.cpp index a3d0cb30e52..eb6e5b6aeb5 100644 --- a/src/mame/atari/jaguar_v.cpp +++ b/src/mame/atari/jaguar_v.cpp @@ -148,14 +148,19 @@ #include "jaguar.h" #include "jagblit.h" +#define LOG_BLITS (1U << 1) +#define LOG_BAD_BLITS (1U << 2) +#define LOG_BLITTER_STATS (1U << 3) +#define LOG_BLITTER_WRITE (1U << 4) +#define LOG_UNHANDLED_BLITS (1U << 5) +#define LOG_OBJECTS (1U << 6) + +#define VERBOSE (0) +#include "logmacro.h" + #define ENABLE_BORDERS 0 -#define LOG_BLITS 0 -#define LOG_BAD_BLITS 0 -#define LOG_BLITTER_STATS 0 -#define LOG_BLITTER_WRITE 0 -#define LOG_UNHANDLED_BLITS 0 // use the new version in jag_blitter.cpp/.h if 0 #define USE_LEGACY_BLITTER 1 @@ -504,7 +509,7 @@ void jaguar_state::blitter_run() return; } - if (LOG_BLITTER_STATS) + /* debug logging */ { static uint32_t blitter_stats[1000][4]; static uint64_t blitter_pixels[1000]; @@ -531,14 +536,14 @@ void jaguar_state::blitter_run() blitter_pixels[i] += (m_blitter_regs[B_COUNT] & 0xffff) * (m_blitter_regs[B_COUNT] >> 16); if (++reps % 100 == 99) { - osd_printf_debug("---\nBlitter stats:\n"); + LOGMASKED(LOG_BLITTER_STATS, "---\nBlitter stats:\n"); for (i = 0; i < blitter_count; i++) { - osd_printf_debug(" CMD=%08X A1=%08X A2=%08X %6d times, %016X pixels\n", + LOGMASKED(LOG_BLITTER_STATS, " CMD=%08X A1=%08X A2=%08X %6d times, %016X pixels\n", blitter_stats[i][0], blitter_stats[i][1], blitter_stats[i][2], blitter_stats[i][3], blitter_pixels[i]); } - osd_printf_debug("---\n"); + LOGMASKED(LOG_BLITTER_STATS, "---\n"); } } @@ -576,8 +581,7 @@ void jaguar_state::blitter_w(offs_t offset, uint32_t data, uint32_t mem_mask) blitter_run(); } - if (LOG_BLITTER_WRITE) - logerror("%s:Blitter write register @ F022%02X = %08X\n", machine().describe_context(), offset * 4, data); + LOGMASKED(LOG_BLITTER_WRITE, "%s:Blitter write register @ F022%02X = %08X\n", machine().describe_context(), offset * 4, data); #else m_blitter->iobus_w(offset, data, mem_mask); #endif diff --git a/src/mame/atari/mhavoc.cpp b/src/mame/atari/mhavoc.cpp index 68c59ceeb40..eee0be2f2ba 100644 --- a/src/mame/atari/mhavoc.cpp +++ b/src/mame/atari/mhavoc.cpp @@ -207,8 +207,8 @@ // configurable logging -#define LOG_COMMS (1U << 1) -#define LOG_A1OUT (1U << 2) +#define LOG_COMMS (1U << 1) +#define LOG_A1OUT (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_COMMS | LOG_A1OUT) diff --git a/src/mame/atari/offtwall.cpp b/src/mame/atari/offtwall.cpp index da6af6a92ee..46e7bcd82d1 100644 --- a/src/mame/atari/offtwall.cpp +++ b/src/mame/atari/offtwall.cpp @@ -37,8 +37,8 @@ // configurable logging -#define LOG_SOUNDCTRL (1U << 1) -#define LOG_BANKSW (1U << 2) +#define LOG_SOUNDCTRL (1U << 1) +#define LOG_BANKSW (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_SOUNDCTRL | LOG_BANKSW) diff --git a/src/mame/atari/rampart.cpp b/src/mame/atari/rampart.cpp index a4b33bcc2ca..ac2c3e221fc 100644 --- a/src/mame/atari/rampart.cpp +++ b/src/mame/atari/rampart.cpp @@ -43,7 +43,7 @@ // configurable logging -#define LOG_COLBANK (1U << 1) +#define LOG_COLBANK (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_COLBANK) diff --git a/src/mame/atari/skullxbo.cpp b/src/mame/atari/skullxbo.cpp index 058ad7ff6c4..4cd156dbbf0 100644 --- a/src/mame/atari/skullxbo.cpp +++ b/src/mame/atari/skullxbo.cpp @@ -37,7 +37,7 @@ // configurable logging -#define LOG_UNKMOBWR (1U << 1) +#define LOG_UNKMOBWR (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_UNKMOBWR) diff --git a/src/mame/barcrest/mpu3.cpp b/src/mame/barcrest/mpu3.cpp index 98a3f62ee62..be8dd5b49c8 100644 --- a/src/mame/barcrest/mpu3.cpp +++ b/src/mame/barcrest/mpu3.cpp @@ -161,14 +161,13 @@ TODO: - Distinguish door switches using manual #include "m3winstr.lh" #include "m3xchngg.lh" - #ifdef MAME_DEBUG -#define MPU3VERBOSE 1 +#define VERBOSE (LOG_GENERAL) #else -#define MPU3VERBOSE 0 +#define VERBOSE (0) #endif -#define LOG(x) do { if (MPU3VERBOSE) logerror x; } while (0) +#include "logmacro.h" namespace { @@ -424,7 +423,7 @@ uint8_t mpu3_state::pia_ic3_porta_r() { static const char *const portnames[] = { "ORANGE1", "ORANGE2", "BLACK1", "BLACK2", "DIL1", "DIL1", "DIL2", "DIL2" }; int data=0,swizzle; - LOG(("%s: IC3 PIA Read of Port A (MUX input data)\n", machine().describe_context())); + LOG("%s: IC3 PIA Read of Port A (MUX input data)\n", machine().describe_context()); //popmessage("%x",m_input_strobe); switch (m_input_strobe) { @@ -465,14 +464,14 @@ uint8_t mpu3_state::pia_ic3_porta_r() void mpu3_state::pia_ic3_portb_w(uint8_t data) { - LOG(("%s: IC3 PIA Port B Set to %2x (Triac)\n", machine().describe_context(),data)); + LOG("%s: IC3 PIA Port B Set to %2x (Triac)\n", machine().describe_context(),data); m_triac_ic3 =data; } WRITE_LINE_MEMBER(mpu3_state::pia_ic3_ca2_w) { - LOG(("%s: IC3 PIA Port CA2 Set to %2x (input A)\n", machine().describe_context(),state)); + LOG("%s: IC3 PIA Port CA2 Set to %2x (input A)\n", machine().describe_context(),state); m_IC11GA = state; ic21_setup(); ic11_update(); @@ -494,7 +493,7 @@ uint8_t mpu3_state::pia_ic4_porta_r() /* IC4, 7 seg leds */ void mpu3_state::pia_ic4_porta_w(uint8_t data) { - LOG(("%s: IC4 PIA Port A Set to %2x (DISPLAY PORT)\n", machine().describe_context(),data)); + LOG("%s: IC4 PIA Port A Set to %2x (DISPLAY PORT)\n", machine().describe_context(),data); m_ic4_input_a=data; switch (m_disp_func) { @@ -527,7 +526,7 @@ void mpu3_state::pia_ic4_porta_w(uint8_t data) void mpu3_state::pia_ic4_portb_w(uint8_t data) { - LOG(("%s: IC4 PIA Port B Set to %2x (Lamp)\n", machine().describe_context(),data)); + LOG("%s: IC4 PIA Port B Set to %2x (Lamp)\n", machine().describe_context(),data); if (m_ic11_active) { if (m_lamp_strobe != m_input_strobe) @@ -546,21 +545,21 @@ void mpu3_state::pia_ic4_portb_w(uint8_t data) WRITE_LINE_MEMBER(mpu3_state::pia_ic4_ca2_w) { - LOG(("%s: IC4 PIA Port CA2 Set to %2x (Input B)\n", machine().describe_context(),state)); + LOG("%s: IC4 PIA Port CA2 Set to %2x (Input B)\n", machine().describe_context(),state); m_IC11GB = state; ic11_update(); } WRITE_LINE_MEMBER(mpu3_state::pia_ic4_cb2_w) { - LOG(("%s: IC4 PIA Port CA2 Set to %2x (Triac)\n", machine().describe_context(),state)); + LOG("%s: IC4 PIA Port CA2 Set to %2x (Triac)\n", machine().describe_context(),state); m_triac_ic4=state; } /* IC5, AUX ports, coin lockouts and AY sound chip select (MODs below 4 only) */ void mpu3_state::pia_ic5_porta_w(uint8_t data) { - LOG(("%s: IC5 PIA Port A Set to %2x (Reel)\n", machine().describe_context(),data)); + LOG("%s: IC5 PIA Port A Set to %2x (Reel)\n", machine().describe_context(),data); m_reels[0]->update( data & 0x03); m_reels[1]->update((data>>2) & 0x03); m_reels[2]->update((data>>4) & 0x03); @@ -592,14 +591,14 @@ void mpu3_state::pia_ic5_portb_w(uint8_t data) WRITE_LINE_MEMBER(mpu3_state::pia_ic5_ca2_w) { - LOG(("%s: IC5 PIA Port CA2 Set to %2x (C)\n", machine().describe_context(),state)); + LOG("%s: IC5 PIA Port CA2 Set to %2x (C)\n", machine().describe_context(),state); m_IC11GC = state; ic11_update(); } WRITE_LINE_MEMBER(mpu3_state::pia_ic5_cb2_w) { - LOG(("%s: IC5 PIA Port CB2 Set to %2x (Triac)\n", machine().describe_context(),state)); + LOG("%s: IC5 PIA Port CB2 Set to %2x (Triac)\n", machine().describe_context(),state); m_triac_ic5 = state; } @@ -618,7 +617,7 @@ uint8_t mpu3_state::pia_ic6_portb_r() void mpu3_state::pia_ic6_porta_w(uint8_t data) { - LOG(("%s: IC6 PIA Port A Set to %2x (Alpha)\n", machine().describe_context(),data)); + LOG("%s: IC6 PIA Port A Set to %2x (Alpha)\n", machine().describe_context(),data); m_vfd->por((data & 0x08)); m_vfd->data((data & 0x20) >> 5); m_vfd->sclk((data & 0x10) >>4); @@ -626,7 +625,7 @@ void mpu3_state::pia_ic6_porta_w(uint8_t data) void mpu3_state::pia_ic6_portb_w(uint8_t data) { - LOG(("%s: IC6 PIA Port B Set to %2x (AUX2)\n", machine().describe_context(),data)); + LOG("%s: IC6 PIA Port B Set to %2x (AUX2)\n", machine().describe_context(),data); m_aux2_input = data; } diff --git a/src/mame/barcrest/mpu4.cpp b/src/mame/barcrest/mpu4.cpp index 0791c2c2ff5..42242313dd8 100644 --- a/src/mame/barcrest/mpu4.cpp +++ b/src/mame/barcrest/mpu4.cpp @@ -225,6 +225,16 @@ To change between them, follow these instructions: #include "mpu4.lh" #include "mpu4ext.lh" +#define LOG_IC3 (1U << 1) +#define LOG_IC8 (1U << 2) + +#ifdef MAME_DEBUG +#define VERBOSE (LOG_GENERAL | LOG_IC3 | LOG_IC8) +#else +#define VERBOSE (0) +#endif +#include "logmacro.h" + #include @@ -446,18 +456,18 @@ WRITE_LINE_MEMBER(mpu4_state::cpu0_irq) if (!m_link7a_connected) { m_maincpu->set_input_line(M6809_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE); - LOG(("6809 IRQ %d \n", combined_state)); + LOG("6809 IRQ %d \n", combined_state); } else { m_maincpu->set_input_line(INPUT_LINE_NMI, combined_state ? ASSERT_LINE : CLEAR_LINE); - LOG(("6809 NMI %d \n", combined_state)); + LOG("6809 NMI %d \n", combined_state); } } else { m_maincpu->set_input_line(M6809_FIRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE); - LOG(("6809 FIRQ %d \n", combined_state)); + LOG("6809 FIRQ %d \n", combined_state); } } @@ -522,7 +532,7 @@ WRITE_LINE_MEMBER(mpu4_state::ic2_o3_callback) /* IC3, lamp data lines + alpha numeric display */ void mpu4_state::pia_ic3_porta_w(uint8_t data) { - LOG_IC3(("%s: IC3 PIA Port A Set to %2x (lamp strobes 1 - 9)\n", machine().describe_context(), data)); + LOGMASKED(LOG_IC3, "%s: IC3 PIA Port A Set to %2x (lamp strobes 1 - 9)\n", machine().describe_context(), data); if(m_ic23_active) { @@ -547,7 +557,7 @@ void mpu4_state::pia_ic3_porta_w(uint8_t data) void mpu4_state::pia_ic3_portb_w(uint8_t data) { - LOG_IC3(("%s: IC3 PIA Port B Set to %2x (lamp strobes 10 - 17)\n", machine().describe_context(), data)); + LOGMASKED(LOG_IC3, "%s: IC3 PIA Port B Set to %2x (lamp strobes 10 - 17)\n", machine().describe_context(), data); if (m_ic23_active) { @@ -569,14 +579,14 @@ void mpu4_state::pia_ic3_portb_w(uint8_t data) WRITE_LINE_MEMBER(mpu4_state::pia_ic3_ca2_w) { - LOG_IC3(("%s: IC3 PIA Write CA2 (alpha data), %02X\n", machine().describe_context(), state)); + LOGMASKED(LOG_IC3, "%s: IC3 PIA Write CA2 (alpha data), %02X\n", machine().describe_context(), state); m_vfd->data(state); } WRITE_LINE_MEMBER(mpu4_state::pia_ic3_cb2_w) { - LOG_IC3(("%s: IC3 PIA Write CB (alpha reset), %02X\n", machine().describe_context(), state)); + LOGMASKED(LOG_IC3, "%s: IC3 PIA Write CB (alpha reset), %02X\n", machine().describe_context(), state); // DM Data pin A m_vfd->por(state); } @@ -653,7 +663,7 @@ WRITE_LINE_MEMBER(mpu4_state::dataport_rxd) { m_pia4->cb1_w(state); m_serial_output = state; - LOG_IC3(("Dataport RX %x\n", state)); + LOGMASKED(LOG_IC3, "Dataport RX %x\n", state); } /* IC4, 7 seg leds, 50Hz timer reel sensors, current sensors */ @@ -724,14 +734,14 @@ uint8_t mpu4_state::pia_ic4_portb_r() if (m_undercurrent) m_ic4_input_b |= 0x01; - LOG_IC3(("%s: IC4 PIA Read of Port B %x\n", machine().describe_context(), m_ic4_input_b)); + LOGMASKED(LOG_IC3, "%s: IC4 PIA Read of Port B %x\n", machine().describe_context(), m_ic4_input_b); return m_ic4_input_b; } WRITE_LINE_MEMBER(mpu4_state::pia_ic4_ca2_w) { - LOG_IC3(("%s: IC4 PIA Write CA (input MUX strobe /LED B), %02X\n", machine().describe_context(), state)); + LOGMASKED(LOG_IC3, "%s: IC4 PIA Write CA (input MUX strobe /LED B), %02X\n", machine().describe_context(), state); m_IC23GB = state; ic23_update(); @@ -739,7 +749,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic4_ca2_w) WRITE_LINE_MEMBER(mpu4_state::pia_ic4_cb2_w) { - LOG_IC3(("%s: IC4 PIA Write CB (Reel optic flag), %02X\n", machine().describe_context(), state)); + LOGMASKED(LOG_IC3, "%s: IC4 PIA Write CB (Reel optic flag), %02X\n", machine().describe_context(), state); m_reel_flag=state; } @@ -792,7 +802,7 @@ uint8_t mpu4_state::pia_ic5_porta_r() } } - LOG(("%s: IC5 PIA Read of Port A (AUX1)\n", machine().describe_context())); + LOG("%s: IC5 PIA Read of Port A (AUX1)\n", machine().describe_context()); uint8_t tempinput = m_aux1_port->read() | m_aux1_input; @@ -911,7 +921,7 @@ uint8_t mpu4_state::pia_ic5_portb_r() } } - LOG(("%s: IC5 PIA Read of Port B (coin input AUX2)\n", machine().describe_context())); + LOG("%s: IC5 PIA Read of Port B (coin input AUX2)\n", machine().describe_context()); if (m_use_coinlocks) { // why are these being set in a read, not when the outputs are written? @@ -967,24 +977,24 @@ void mpu4_state::update_ay() case 0x01: /* CA2 = 1 CB2 = 0? : Read from selected PSG register and make the register data available to Port A */ - LOG(("AY8913 address = %d \n", m_pia6->a_output()&0x0f)); + LOG("AY8913 address = %d \n", m_pia6->a_output()&0x0f); break; case 0x02: /* CA2 = 0 CB2 = 1? : Write to selected PSG register and write data to Port A */ m_ay8913->data_w(m_pia6->a_output()); - LOG(("AY Chip Write \n")); + LOG("AY Chip Write \n"); break; case 0x03: /* CA2 = 1 CB2 = 1? : The register will now be selected and the user can read from or write to it. The register will remain selected until another is chosen.*/ m_ay8913->address_w(m_pia6->a_output()); - LOG(("AY Chip Select \n")); + LOG("AY Chip Select \n"); break; default: - LOG(("AY Chip error \n")); + LOG("AY Chip error \n"); break; } } @@ -1000,7 +1010,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic5_cb2_w) /* IC6, Reel A and B and AY registers (MODs below 4 only) */ void mpu4_state::pia_ic6_portb_w(uint8_t data) { - LOG(("%s: IC6 PIA Port B Set to %2x (Reel A and B)\n", machine().describe_context(), data)); + LOG("%s: IC6 PIA Port B Set to %2x (Reel A and B)\n", machine().describe_context(), data); if (m_reel_mux == SEVEN_REEL) { @@ -1021,7 +1031,7 @@ void mpu4_state::pia_ic6_portb_w(uint8_t data) void mpu4_state::pia_ic6_porta_w(uint8_t data) { - LOG(("%s: IC6 PIA Write A %2x\n", machine().describe_context(), data)); + LOG("%s: IC6 PIA Write A %2x\n", machine().describe_context(), data); if (m_ay8913.found()) { m_ay_data = data; @@ -1032,7 +1042,7 @@ void mpu4_state::pia_ic6_porta_w(uint8_t data) WRITE_LINE_MEMBER(mpu4_state::pia_ic6_ca2_w) { - LOG(("%s: IC6 PIA write CA2 %2x (AY8913 BC1)\n", machine().describe_context(), state)); + LOG("%s: IC6 PIA write CA2 %2x (AY8913 BC1)\n", machine().describe_context(), state); if (m_ay8913.found()) { if ( state ) m_ay8913_address |= 0x01; @@ -1044,7 +1054,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic6_ca2_w) WRITE_LINE_MEMBER(mpu4_state::pia_ic6_cb2_w) { - LOG(("%s: IC6 PIA write CB2 %2x (AY8913 BCDIR)\n", machine().describe_context(), state)); + LOG("%s: IC6 PIA write CB2 %2x (AY8913 BCDIR)\n", machine().describe_context(), state); if (m_ay8913.found()) { if ( state ) m_ay8913_address |= 0x02; @@ -1057,7 +1067,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic6_cb2_w) /* IC7 Reel C and D, mechanical meters/Reel E and F, input strobe bit A */ void mpu4_state::pia_ic7_porta_w(uint8_t data) { - LOG(("%s: IC7 PIA Port A Set to %2x (Reel C and D)\n", machine().describe_context(), data)); + LOG("%s: IC7 PIA Port A Set to %2x (Reel C and D)\n", machine().describe_context(), data); if (m_reel_mux == SEVEN_REEL) { m_reel[5]->update( data &0x0f); @@ -1125,7 +1135,7 @@ uint8_t mpu4_state::pia_ic7_portb_r() WRITE_LINE_MEMBER(mpu4_state::pia_ic7_ca2_w) { - LOG(("%s: IC7 PIA write CA2 %2x (input strobe bit 0 / LED A)\n", machine().describe_context(), state)); + LOG("%s: IC7 PIA write CA2 %2x (input strobe bit 0 / LED A)\n", machine().describe_context(), state); m_IC23GA = state; ic24_setup(); @@ -1141,7 +1151,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic7_cb2_w) /* IC8, Inputs, TRIACS, alpha clock */ uint8_t mpu4_state::pia_ic8_porta_r() { - LOG_IC8(("%s: IC8 PIA Read of Port A (MUX input data)\n", machine().describe_context())); + LOGMASKED(LOG_IC8, "%s: IC8 PIA Read of Port A (MUX input data)\n", machine().describe_context()); /* The orange inputs are polled twice as often as the black ones, for reasons of efficiency. This is achieved via connecting every input line to an AND gate, thus allowing two strobes to represent each orange input bank (strobes are active low). */ @@ -1168,7 +1178,7 @@ void mpu4_state::pia_ic8_portb_w(uint8_t data) m_hopper2_opto = (data & 0x04); data &= ~0x07; //remove Triacs from use } - LOG_IC8(("%s: IC8 PIA Port B Set to %2x (OUTPUT PORT, TRIACS)\n", machine().describe_context(), data)); + LOGMASKED(LOG_IC8, "%s: IC8 PIA Port B Set to %2x (OUTPUT PORT, TRIACS)\n", machine().describe_context(), data); for (uint8_t i = 0; i < 8; i++) { m_triacs[i] = BIT(data, i); @@ -1177,7 +1187,7 @@ void mpu4_state::pia_ic8_portb_w(uint8_t data) WRITE_LINE_MEMBER(mpu4_state::pia_ic8_ca2_w) { - LOG_IC8(("%s: IC8 PIA write CA2 (input_strobe bit 2 / LED C) %02X\n", machine().describe_context(), state & 0xff)); + LOGMASKED(LOG_IC8, "%s: IC8 PIA write CA2 (input_strobe bit 2 / LED C) %02X\n", machine().describe_context(), state & 0xff); m_IC23GC = state; ic23_update(); @@ -1186,7 +1196,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic8_ca2_w) WRITE_LINE_MEMBER(mpu4_state::pia_ic8_cb2_w) { - LOG_IC8(("%s: IC8 PIA write CB2 (alpha clock) %02X\n", machine().describe_context(), state & 0xff)); + LOGMASKED(LOG_IC8, "%s: IC8 PIA write CB2 (alpha clock) %02X\n", machine().describe_context(), state & 0xff); // DM Data pin B diff --git a/src/mame/barcrest/mpu4.h b/src/mame/barcrest/mpu4.h index 0143a8d5814..26b4af0dc0f 100644 --- a/src/mame/barcrest/mpu4.h +++ b/src/mame/barcrest/mpu4.h @@ -24,21 +24,6 @@ #define MPU4_MASTER_CLOCK XTAL(6'880'000) - - -#ifdef MAME_DEBUG -#define MPU4VERBOSE 1 -#else -#define MPU4VERBOSE 0 -#endif - -#define LOG(x) do { if (MPU4VERBOSE) logerror x; } while (0) -#define LOG_CHR(x) do { if (MPU4VERBOSE) logerror x; } while (0) -#define LOG_CHR_FULL(x) do { if (MPU4VERBOSE) logerror x; } while (0) -#define LOG_IC3(x) do { if (MPU4VERBOSE) logerror x; } while (0) -#define LOG_IC8(x) do { if (MPU4VERBOSE) logerror x; } while (0) - - //reel info #define STANDARD_REEL 0 // As originally designed 3/4 reels #define FIVE_REEL_5TO8 1 // Interfaces to meter port, allows some mechanical metering, but there is significant 'bounce' in the extra reel diff --git a/src/mame/barcrest/mpu4vid.cpp b/src/mame/barcrest/mpu4vid.cpp index b46c84ef289..96dffe7f909 100644 --- a/src/mame/barcrest/mpu4vid.cpp +++ b/src/mame/barcrest/mpu4vid.cpp @@ -207,9 +207,11 @@ TODO: #include "v4psi.lh" #include "v4strike.lh" +#define VERBOSE (0) +#include "logmacro.h" -#define VIDEO_MASTER_CLOCK XTAL(10'000'000) +#define VIDEO_MASTER_CLOCK XTAL(10'000'000) namespace { @@ -548,7 +550,7 @@ uint8_t mpu4vid_state::pia_ic5_porta_track_r() We invert the X and Y data at source due to the use of Schmitt triggers in the interface, which clean up the pulses and flip the active phase.*/ - LOG(("%s: IC5 PIA Read of Port A (AUX1)\n",machine().describe_context())); + LOG("%s: IC5 PIA Read of Port A (AUX1)\n",machine().describe_context()); uint8_t data = m_aux1_port->read(); diff --git a/src/mame/be/bebox_m.cpp b/src/mame/be/bebox_m.cpp index e4c30054d15..4e65a206d46 100644 --- a/src/mame/be/bebox_m.cpp +++ b/src/mame/be/bebox_m.cpp @@ -101,9 +101,12 @@ #include "bus/ata/ataintf.h" #include "bus/lpci/pci.h" -#define LOG_CPUIMASK 1 -#define LOG_UART 1 -#define LOG_INTERRUPTS 1 +#define LOG_CPUIMASK (1U << 1) +#define LOG_INTERRUPTS (1U << 2) + +#define VERBOSE (LOG_CPUIMASK | LOG_INTERRUPTS) +#include "logmacro.h" + /************************************* * @@ -151,11 +154,8 @@ void bebox_state::bebox_cpu0_imask_w(offs_t offset, uint64_t data, uint64_t mem_ if (old_imask != m_cpu_imask[0]) { - if (LOG_CPUIMASK) - { - logerror("%s BeBox CPU #0 imask=0x%08x\n", - machine().describe_context(), m_cpu_imask[0]); - } + LOGMASKED(LOG_CPUIMASK, "%s BeBox CPU #0 imask=0x%08x\n", + machine().describe_context(), m_cpu_imask[0]); bebox_update_interrupts(); } } @@ -168,11 +168,8 @@ void bebox_state::bebox_cpu1_imask_w(offs_t offset, uint64_t data, uint64_t mem_ if (old_imask != m_cpu_imask[1]) { - if (LOG_CPUIMASK) - { - logerror("%s BeBox CPU #1 imask=0x%08x\n", - machine().describe_context(), m_cpu_imask[1]); - } + LOGMASKED(LOG_CPUIMASK, "%s BeBox CPU #1 imask=0x%08x\n", + machine().describe_context(), m_cpu_imask[1]); bebox_update_interrupts(); } } @@ -220,14 +217,9 @@ void bebox_state::bebox_crossproc_interrupts_w(offs_t offset, uint64_t data, uin else line = crossproc_map[i].active_high ? CLEAR_LINE : ASSERT_LINE; - if (LOG_INTERRUPTS) - { -/* - logerror("bebox_crossproc_interrupts_w(): CPU #%d %s %s\n", - crossproc_map[i].cpunum, line ? "Asserting" : "Clearing", - (crossproc_map[i].inputline == PPC_INPUT_LINE_SMI) ? "SMI" : "TLBISYNC"); - */ - } + LOGMASKED(LOG_INTERRUPTS, "bebox_crossproc_interrupts_w(): CPU #%d %s %s\n", + crossproc_map[i].cpunum, line ? "Asserting" : "Clearing", + (crossproc_map[i].inputline == 0/*PPC_INPUT_LINE_SMI*/) ? "SMI" : "TLBISYNC"); m_ppc[crossproc_map[i].cpunum]->set_input_line(crossproc_map[i].inputline, line); } @@ -253,11 +245,8 @@ void bebox_state::bebox_update_interrupts() { interrupt = m_interrupts & m_cpu_imask[cpunum]; - if (LOG_INTERRUPTS) - { - logerror("\tbebox_update_interrupts(): CPU #%d [%08X|%08X] IRQ %s\n", cpunum, - m_interrupts, m_cpu_imask[cpunum], interrupt ? "on" : "off"); - } + LOGMASKED(LOG_INTERRUPTS, "\tbebox_update_interrupts(): CPU #%d [%08X|%08X] IRQ %s\n", cpunum, + m_interrupts, m_cpu_imask[cpunum], interrupt ? "on" : "off"); m_ppc[cpunum]->set_input_line(INPUT_LINE_IRQ0, interrupt ? ASSERT_LINE : CLEAR_LINE); } @@ -303,18 +292,15 @@ void bebox_state::bebox_set_irq_bit(unsigned int interrupt_bit, int val) }; uint32_t old_interrupts; - if (LOG_INTERRUPTS) - { - /* make sure that we don't shoot ourself in the foot */ - if ((interrupt_bit >= std::size(interrupt_names)) || !interrupt_names[interrupt_bit]) - throw emu_fatalerror("bebox_state::bebox_set_irq_bit: Raising invalid interrupt"); - - logerror("bebox_set_irq_bit(): pc[0]=0x%08x pc[1]=0x%08x %s interrupt #%u (%s)\n", - unsigned(m_ppc[0]->pc()), - unsigned(m_ppc[1]->pc()), - val ? "Asserting" : "Clearing", - interrupt_bit, interrupt_names[interrupt_bit]); - } + /* make sure that we don't shoot ourself in the foot */ + if ((interrupt_bit >= std::size(interrupt_names)) || !interrupt_names[interrupt_bit]) + throw emu_fatalerror("bebox_state::bebox_set_irq_bit: Raising invalid interrupt"); + + LOGMASKED(LOG_INTERRUPTS, "bebox_set_irq_bit(): pc[0]=0x%08x pc[1]=0x%08x %s interrupt #%u (%s)\n", + unsigned(m_ppc[0]->pc()), + unsigned(m_ppc[1]->pc()), + val ? "Asserting" : "Clearing", + interrupt_bit, interrupt_names[interrupt_bit]); old_interrupts = m_interrupts; if (val) diff --git a/src/mame/bfm/bfm_adr2.cpp b/src/mame/bfm/bfm_adr2.cpp index 1b947b8826a..fe30ec1c6fd 100644 --- a/src/mame/bfm/bfm_adr2.cpp +++ b/src/mame/bfm/bfm_adr2.cpp @@ -103,9 +103,9 @@ E000-FFFF | R | D D D D D D D D | 8K ROM #include "screen.h" // configurable logging -#define LOG_CTRL (1U << 1) -#define LOG_C001 (1U << 2) -#define LOG_SERIAL (1U << 3) +#define LOG_CTRL (1U << 1) +#define LOG_C001 (1U << 2) +#define LOG_SERIAL (1U << 3) //#define VERBOSE (LOG_GENERAL | LOG_CTRL | LOG_C001 | LOG_SERIAL) diff --git a/src/mame/bfm/bfm_sc2.cpp b/src/mame/bfm/bfm_sc2.cpp index 3862f0f51c8..d9ffdf57ca7 100644 --- a/src/mame/bfm/bfm_sc2.cpp +++ b/src/mame/bfm/bfm_sc2.cpp @@ -193,6 +193,17 @@ Adder hardware: #include "sc2heypr.lh" #include "sc2prem2.lh" +// log serial communication between mainboard (scorpion2) and videoboard (adder2) +#define LOG_UART (1U << 1) + +#ifdef MAME_DEBUG +#define VERBOSE (LOG_GENERAL | LOG_UART) +#else +#define VERBOSE 0 +#endif + +#include "logmacro.h" + namespace { @@ -426,17 +437,6 @@ protected: }; -#ifdef MAME_DEBUG -#define VERBOSE 1 -#else -#define VERBOSE 0 -#endif - -// log serial communication between mainboard (scorpion2) and videoboard (adder2) -#define LOG_SERIAL(x) do { if (VERBOSE) logerror x; } while (0) -#define UART_LOG(x) do { if (VERBOSE) logerror x; } while (0) -#define LOG(x) do { if (VERBOSE) logerror x; } while (0) - #define MASTER_CLOCK (XTAL(8'000'000)) /* INPUTS layout @@ -1061,7 +1061,7 @@ uint8_t bfm_sc2_state::uart1data_r() void bfm_sc2_state::uart1ctrl_w(uint8_t data) { - UART_LOG(("uart1ctrl:%x\n", data)); + LOGMASKED(LOG_UART, "uart1ctrl:%x\n", data); } /////////////////////////////////////////////////////////////////////////// @@ -1069,7 +1069,7 @@ void bfm_sc2_state::uart1data_w(uint8_t data) { m_data_to_uart2 = 1; m_uart1_data = data; - UART_LOG(("uart1:%x\n", data)); + LOGMASKED(LOG_UART, "uart1:%x\n", data); } /////////////////////////////////////////////////////////////////////////// @@ -1093,7 +1093,7 @@ uint8_t bfm_sc2_state::uart2data_r() void bfm_sc2_state::uart2ctrl_w(uint8_t data) { - UART_LOG(("uart2ctrl:%x\n", data)); + LOGMASKED(LOG_UART, "uart2ctrl:%x\n", data); } /////////////////////////////////////////////////////////////////////////// @@ -1102,7 +1102,7 @@ void bfm_sc2_state::uart2data_w(uint8_t data) { m_data_to_uart1 = 1; m_uart2_data = data; - UART_LOG(("uart2:%x\n", data)); + LOGMASKED(LOG_UART, "uart2:%x\n", data); } @@ -1169,7 +1169,7 @@ int bfm_sc2_state::recdata(int changed, int data) m_e2data_to_read <<= 1; - LOG(("e2d pin= %d\n", m_e2data_pin)); + LOG("e2d pin= %d\n", m_e2data_pin); m_e2cnt++; if ( m_e2cnt >= 8 ) @@ -1257,7 +1257,7 @@ void bfm_sc2_state::e2ram_w(uint8_t data) { // X24C08 Start condition (1->0 on SDA while SCL=1) m_e2dummywrite = ( m_e2state == 5 ); - LOG(("e2ram: c:%d d:%d Start condition dummywrite=%d\n", (data & SCL)?1:0, (data&SDA)?1:0, m_e2dummywrite )); + LOG("e2ram: c:%d d:%d Start condition dummywrite=%d\n", (data & SCL)?1:0, (data&SDA)?1:0, m_e2dummywrite); m_e2state = 1; // ready for commands m_e2cnt = 0; @@ -1269,7 +1269,7 @@ void bfm_sc2_state::e2ram_w(uint8_t data) ( !(changed & SCL) && (data & SCL) ) // SCL=1 and not changed ) { // X24C08 Stop condition (0->1 on SDA while SCL=1) - LOG(("e2ram: c:%d d:%d Stop condition\n", (data & SCL)?1:0, (data&SDA)?1:0 )); + LOG("e2ram: c:%d d:%d Stop condition\n", (data & SCL)?1:0, (data&SDA)?1:0); m_e2state = 0; m_e2data = 0; break; @@ -1285,8 +1285,8 @@ void bfm_sc2_state::e2ram_w(uint8_t data) m_e2cnt = 0; m_e2rw = m_e2data & 1; - LOG(("e2ram: Slave address received !! device id=%01X device adr=%01d high order adr %0X RW=%d) %02X\n", - m_e2data>>4, (m_e2data & 0x08)?1:0, (m_e2data>>1) & 0x03, m_e2rw , m_e2data )); + LOG("e2ram: Slave address received !! device id=%01X device adr=%01d high order adr %0X RW=%d) %02X\n", + m_e2data>>4, (m_e2data & 0x08)?1:0, (m_e2data>>1) & 0x03, m_e2rw , m_e2data); m_e2state = 2; } @@ -1301,12 +1301,12 @@ void bfm_sc2_state::e2ram_w(uint8_t data) if ( ack < 0 ) { - LOG(("ACK = 0\n")); + LOG("ACK = 0\n"); m_e2state = 0; } else { - LOG(("ACK = 1\n")); + LOG("ACK = 1\n"); if ( m_e2dummywrite ) { m_e2dummywrite = 0; @@ -1324,14 +1324,14 @@ void bfm_sc2_state::e2ram_w(uint8_t data) switch ( m_e2state ) { case 7: - LOG(("read address %04X\n",m_e2address)); + LOG("read address %04X\n",m_e2address); m_e2data_to_read = m_e2ram[m_e2address]; break; case 3: - LOG(("write, awaiting address\n")); + LOG("write, awaiting address\n"); break; default: - LOG(("?unknow action %04X\n",m_e2address)); + LOG("?unknow action %04X\n",m_e2address); break; } } @@ -1346,7 +1346,7 @@ void bfm_sc2_state::e2ram_w(uint8_t data) m_e2data_pin = 0; m_e2address = (m_e2address & 0xFF00) | m_e2data; - LOG(("write address = %04X waiting for ACK\n", m_e2address)); + LOG("write address = %04X waiting for ACK\n", m_e2address); m_e2state = 4; m_e2cnt = 0; m_e2data = 0; @@ -1363,12 +1363,12 @@ void bfm_sc2_state::e2ram_w(uint8_t data) if ( ack < 0 ) { m_e2state = 0; - LOG(("ACK = 0, cancel write\n" )); + LOG("ACK = 0, cancel write\n"); } else { m_e2state = 5; - LOG(("ACK = 1, awaiting data to write\n" )); + LOG("ACK = 1, awaiting data to write\n"); } } break; @@ -1376,7 +1376,7 @@ void bfm_sc2_state::e2ram_w(uint8_t data) case 5: // receive data to write if ( recdata(changed, data) ) { - LOG(("write data = %02X received, awaiting ACK\n", m_e2data)); + LOG("write data = %02X received, awaiting ACK\n", m_e2data); m_e2cnt = 0; m_e2state = 6; // wait ack } @@ -1390,11 +1390,11 @@ void bfm_sc2_state::e2ram_w(uint8_t data) if ( ack < 0 ) { m_e2state = 0; - LOG(("ACK=0, write canceled\n")); + LOG("ACK=0, write canceled\n"); } else { - LOG(("ACK=1, writing %02X to %04X\n", m_e2data, m_e2address)); + LOG("ACK=1, writing %02X to %04X\n", m_e2data, m_e2address); m_e2ram[m_e2address] = m_e2data; @@ -1411,7 +1411,7 @@ void bfm_sc2_state::e2ram_w(uint8_t data) { //m_e2data_pin = 0; - LOG(("address read, data = %02X waiting for ACK\n", m_e2data )); + LOG("address read, data = %02X waiting for ACK\n", m_e2data); m_e2state = 8; } @@ -1427,7 +1427,7 @@ void bfm_sc2_state::e2ram_w(uint8_t data) m_e2data_to_read = m_e2ram[m_e2address]; - LOG(("ready for next address %04X\n", m_e2address)); + LOG("ready for next address %04X\n", m_e2address); m_e2cnt = 0; m_e2data = 0; @@ -1436,7 +1436,7 @@ void bfm_sc2_state::e2ram_w(uint8_t data) case 0: - LOG(("e2ram: ? c:%d d:%d\n", (data & SCL)?1:0, (data&SDA)?1:0 )); + LOG("e2ram: ? c:%d d:%d\n", (data & SCL)?1:0, (data&SDA)?1:0); break; } break; @@ -1446,7 +1446,7 @@ void bfm_sc2_state::e2ram_w(uint8_t data) int bfm_sc2_state::read_e2ram() { - LOG(("e2ram: r %d (%02X) \n", m_e2data_pin, m_e2data_to_read )); + LOG("e2ram: r %d (%02X) \n", m_e2data_pin, m_e2data_to_read); return m_e2data_pin; } diff --git a/src/mame/capcom/blktiger.cpp b/src/mame/capcom/blktiger.cpp index 673cf5a0d44..088f0b593ce 100644 --- a/src/mame/capcom/blktiger.cpp +++ b/src/mame/capcom/blktiger.cpp @@ -149,7 +149,7 @@ Notes: // configurable logging -#define LOG_MCU (1U << 1) +#define LOG_MCU (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_MCU) diff --git a/src/mame/capcom/supduck.cpp b/src/mame/capcom/supduck.cpp index 8cdc103d312..c0e28d91fec 100644 --- a/src/mame/capcom/supduck.cpp +++ b/src/mame/capcom/supduck.cpp @@ -45,7 +45,7 @@ There are known flyers that show an alternate title of HELL OUT // configurable logging -#define LOG_UNKWRITE (1U << 1) +#define LOG_UNKWRITE (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_UNKWRITE) diff --git a/src/mame/cybiko/cybiko_m.cpp b/src/mame/cybiko/cybiko_m.cpp index 48201b4125c..22938c2c766 100644 --- a/src/mame/cybiko/cybiko_m.cpp +++ b/src/mame/cybiko/cybiko_m.cpp @@ -15,11 +15,15 @@ #include "emu.h" #include "cybiko.h" -#define LOG_LEVEL 1 -#define _logerror(level,x) do { if (LOG_LEVEL > level) logerror x; } while (0) +#define LOG_LEVEL0 (1U << 1) +#define LOG_LEVEL1 (1U << 2) +#define LOG_LEVEL2 (1U << 3) + +#define VERBOSE (LOG_LEVEL0) +#include "logmacro.h" -#define RAMDISK_SIZE (512 * 1024) +#define RAMDISK_SIZE (512 * 1024) //////////////////////// // DRIVER INIT & EXIT // @@ -27,13 +31,13 @@ void cybiko_state::init_cybiko() { - _logerror( 0, ("init_cybikov1\n")); + LOGMASKED(LOG_LEVEL0, "init_cybikov1\n"); m_maincpu->space(AS_PROGRAM).install_ram(0x200000, 0x200000 + m_ram->size() - 1, m_ram->pointer()); } void cybiko_state::init_cybikoxt() { - _logerror( 0, ("init_cybikoxt\n")); + LOGMASKED(LOG_LEVEL0, "init_cybikoxt\n"); m_maincpu->space(AS_PROGRAM).install_ram(0x400000, 0x400000 + m_ram->size() - 1, m_ram->pointer()); } @@ -109,7 +113,7 @@ int cybiko_state::cybiko_key_r(offs_t offset, int mem_mask) } if (data != 0xFFFF) { - _logerror( 1, ("cybiko_key_r (%08X/%04X) %04X\n", offset, mem_mask, data)); + LOGMASKED(LOG_LEVEL1, "cybiko_key_r (%08X/%04X) %04X\n", offset, mem_mask, data); } return data; } @@ -137,7 +141,7 @@ uint16_t cybiko_state::cybikov1_io_reg_r(offs_t offset) { uint16_t data = 0; #if 0 - _logerror( 2, ("cybikov1_io_reg_r (%08X)\n", offset)); + LOGMASKED(LOG_LEVEL2, "cybikov1_io_reg_r (%08X)\n", offset); switch (offset) { // keyboard @@ -185,7 +189,7 @@ uint16_t cybiko_state::cybikov2_io_reg_r(offs_t offset) { uint16_t data = 0; #if 0 - _logerror( 2, ("cybikov2_io_reg_r (%08X)\n", offset)); + LOGMASKED(LOG_LEVEL2, "cybikov2_io_reg_r (%08X)\n", offset); switch (offset) { // keyboard @@ -233,7 +237,7 @@ uint16_t cybiko_state::cybikoxt_io_reg_r(offs_t offset) { uint16_t data = 0; #if 0 - _logerror( 2, ("cybikoxt_io_reg_r (%08X)\n", offset)); + LOGMASKED(LOG_LEVEL2, "cybikoxt_io_reg_r (%08X)\n", offset); switch (offset) { // rs232 @@ -272,7 +276,7 @@ uint16_t cybiko_state::cybikoxt_io_reg_r(offs_t offset) void cybiko_state::cybikov1_io_reg_w(offs_t offset, uint16_t data) { #if 0 - _logerror( 2, ("cybikov1_io_reg_w (%08X/%02X)\n", offset, data)); + LOGMASKED(LOG_LEVEL2, "cybikov1_io_reg_w (%08X/%02X)\n", offset, data); switch (offset) { // speaker @@ -315,7 +319,7 @@ void cybiko_state::cybikov1_io_reg_w(offs_t offset, uint16_t data) void cybiko_state::cybikov2_io_reg_w(offs_t offset, uint16_t data) { #if 0 - _logerror( 2, ("cybikov2_io_reg_w (%08X/%02X)\n", offset, data)); + LOGMASKED(LOG_LEVEL2, "cybikov2_io_reg_w (%08X/%02X)\n", offset, data); switch (offset) { // speaker @@ -358,7 +362,7 @@ void cybiko_state::cybikov2_io_reg_w(offs_t offset, uint16_t data) void cybiko_state::cybikoxt_io_reg_w(offs_t offset, uint16_t data) { #if 0 - _logerror( 2, ("cybikoxt_io_reg_w (%08X/%02X)\n", offset, data)); + LOGMASKED(LOG_LEVEL2, "cybikoxt_io_reg_w (%08X/%02X)\n", offset, data); switch (offset) { // speaker @@ -397,6 +401,6 @@ void cybiko_state::cybikoxt_io_reg_w(offs_t offset, uint16_t data) // 20/00, 23/08, 27/01, 2F/08, 2C/02, 2B/08, 28/01, 37/08, 34/04, 33/08, 30/03, 04/80, 05/02, 1B/6C, 00/C8 void cybiko_state::cybiko_usb_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - if (ACCESSING_BITS_8_15) _logerror( 2, ("[%08X] <- %02X\n", 0x200000 + offset * 2 + 0, (data >> 8) & 0xFF)); - if (ACCESSING_BITS_0_7) _logerror( 2, ("[%08X] <- %02X\n", 0x200000 + offset * 2 + 1, (data >> 0) & 0xFF)); + if (ACCESSING_BITS_8_15) LOGMASKED(LOG_LEVEL2, "[%08X] <- %02X\n", 0x200000 + offset * 2 + 0, (data >> 8) & 0xFF); + if (ACCESSING_BITS_0_7) LOGMASKED(LOG_LEVEL2, "[%08X] <- %02X\n", 0x200000 + offset * 2 + 1, (data >> 0) & 0xFF); } diff --git a/src/mame/dai/dai_m.cpp b/src/mame/dai/dai_m.cpp index 074e9655e27..e33c9306879 100644 --- a/src/mame/dai/dai_m.cpp +++ b/src/mame/dai/dai_m.cpp @@ -14,10 +14,11 @@ #include "emu.h" #include "dai.h" -#define DEBUG_DAI_PORTS 0 +#define LOG_PORTS (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" -#define LOG_DAI_PORT_R(_port, _data, _comment) do { if (DEBUG_DAI_PORTS) logerror ("DAI port read : %04x, Data: %02x (%s)\n", _port, _data, _comment); } while (0) -#define LOG_DAI_PORT_W(_port, _data, _comment) do { if (DEBUG_DAI_PORTS) logerror ("DAI port write: %04x, Data: %02x (%s)\n", _port, _data, _comment); } while (0) TIMER_DEVICE_CALLBACK_MEMBER(dai_state::tms_timer) { @@ -135,7 +136,7 @@ uint8_t dai_state::io_discrete_devices_r(offs_t offset) break; default: - LOG_DAI_PORT_R (offset, data, "discrete devices - unmapped"); + LOGMASKED(LOG_PORTS, "DAI port read : %04x, Data: %02x (discrete devices - unmapped)\n", offset, data); break; } return data; @@ -146,14 +147,14 @@ void dai_state::io_discrete_devices_w(offs_t offset, uint8_t data) switch(offset & 0x000f) { case 0x04: m_sound->set_volume(offset, data); - LOG_DAI_PORT_W (offset, data&0x0f, "discrete devices - osc. 0 volume"); - LOG_DAI_PORT_W (offset, BIT(data, 4, 4), "discrete devices - osc. 1 volume"); + LOGMASKED(LOG_PORTS, "DAI port write: %04x, Data: %02x (discrete devices - osc. 0 volume)\n", offset, data & 0x0f); + LOGMASKED(LOG_PORTS, "DAI port write: %04x, Data: %02x (discrete devices - osc. 1 volume)\n", offset, BIT(data, 4, 4)); break; case 0x05: m_sound->set_volume(offset, data); - LOG_DAI_PORT_W (offset, data&0x0f, "discrete devices - osc. 2 volume"); - LOG_DAI_PORT_W (offset, BIT(data, 4, 4), "discrete devices - noise volume"); + LOGMASKED(LOG_PORTS, "DAI port write: %04x, Data: %02x (discrete devices - osc. 2 volume)\n", offset, data & 0x0f); + LOGMASKED(LOG_PORTS, "DAI port write: %04x, Data: %02x (discrete devices - noise volume)\n", offset, BIT(data, 4, 4)); break; case 0x06: @@ -164,15 +165,15 @@ void dai_state::io_discrete_devices_w(offs_t offset, uint8_t data) m_cassette->change_state(m_cassette_motor[0]?CASSETTE_MOTOR_DISABLED:CASSETTE_MOTOR_ENABLED, CASSETTE_MASK_MOTOR); m_cassette->output(BIT(data, 0) ? -1.0 : 1.0); membank("bank2")->set_entry(BIT(data, 6, 2)); - LOG_DAI_PORT_W (offset, BIT(data, 1, 2), "discrete devices - paddle select"); - LOG_DAI_PORT_W (offset, BIT(data, 3), "discrete devices - paddle enable"); - LOG_DAI_PORT_W (offset, BIT(data, 4), "discrete devices - cassette motor 1"); - LOG_DAI_PORT_W (offset, BIT(data, 5), "discrete devices - cassette motor 2"); - LOG_DAI_PORT_W (offset, BIT(data, 6, 2), "discrete devices - ROM bank"); + LOGMASKED(LOG_PORTS, "DAI port write: %04x, Data: %02x (discrete devices - paddle select)\n", offset, BIT(data, 1, 2)); + LOGMASKED(LOG_PORTS, "DAI port write: %04x, Data: %02x (discrete devices - paddle enable)\n", offset, BIT(data, 3)); + LOGMASKED(LOG_PORTS, "DAI port write: %04x, Data: %02x (discrete devices - cassette motor 1)\n", offset, BIT(data, 4)); + LOGMASKED(LOG_PORTS, "DAI port write: %04x, Data: %02x (discrete devices - cassette motor 2)\n", offset, BIT(data, 5)); + LOGMASKED(LOG_PORTS, "DAI port write: %04x, Data: %02x (discrete devices - ROM bank)\n", offset, BIT(data, 6, 2)); break; default: - LOG_DAI_PORT_W (offset, data, "discrete devices - unmapped"); + LOGMASKED(LOG_PORTS, "DAI port write: %04x, Data: %02x (discrete devices - unmapped)\n", offset, data); break; } } @@ -210,5 +211,5 @@ uint8_t dai_state::amd9511_r() void dai_state::amd9511_w(offs_t offset, uint8_t data) { - logerror ("Writing to AMD9511 math chip, %04x, %02x\n", offset, data); + logerror("Writing to AMD9511 math chip, %04x, %02x\n", offset, data); } diff --git a/src/mame/dai/dai_v.cpp b/src/mame/dai/dai_v.cpp index 99298ba1d1e..6ada640d74c 100644 --- a/src/mame/dai/dai_v.cpp +++ b/src/mame/dai/dai_v.cpp @@ -17,9 +17,11 @@ #include "emu.h" #include "dai.h" -#define DEBUG_DAI_VIDEO 0 +#define LOG_LINES (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" -#define LOG_DAI_VIDEO_LINE(_mode, _unit, _resolution, _repeat, _scan) do { if (DEBUG_DAI_VIDEO) logerror ("Mode: %02x, Unit: %02x, Resolution: %02x, Repeat: %d, Current line: %d\n", _mode, _unit, _resolution, _repeat, _scan); } while (0) const rgb_t dai_state::s_palette[16] = { @@ -743,7 +745,7 @@ uint32_t dai_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c break; } current_scan_line += line_repeat_count*2+2; - LOG_DAI_VIDEO_LINE(display_mode, unit_mode, horizontal_resolution, line_repeat_count, current_scan_line); + LOGMASKED(LOG_LINES, "Mode: %02x, Unit: %02x, Resolution: %02x, Repeat: %d, Current line: %d\n", display_mode, unit_mode, horizontal_resolution, line_repeat_count, current_scan_line); } return 0; } diff --git a/src/mame/dataeast/chanbara.cpp b/src/mame/dataeast/chanbara.cpp index 69a418dd6fa..0aa92b404f0 100644 --- a/src/mame/dataeast/chanbara.cpp +++ b/src/mame/dataeast/chanbara.cpp @@ -61,7 +61,7 @@ TODO: // configurable logging -#define LOG_AYOUTS (1U << 1) +#define LOG_AYOUTS (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_AYOUTS) diff --git a/src/mame/dataeast/sshangha.cpp b/src/mame/dataeast/sshangha.cpp index 9eeb3d94cba..ec19996700a 100644 --- a/src/mame/dataeast/sshangha.cpp +++ b/src/mame/dataeast/sshangha.cpp @@ -95,7 +95,7 @@ HB-PCB-A5 M6100691A (distributed by Taito) // configurable logging -#define LOG_VIDEOREGS (1U << 1) +#define LOG_VIDEOREGS (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_VIDEOREGS) diff --git a/src/mame/dataeast/tryout.cpp b/src/mame/dataeast/tryout.cpp index 49d5a45b257..a6526426b97 100644 --- a/src/mame/dataeast/tryout.cpp +++ b/src/mame/dataeast/tryout.cpp @@ -33,7 +33,7 @@ $208 strikes count // configurable logging -#define LOG_GFXCTRL (1U << 1) +#define LOG_GFXCTRL (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_GFXCTRL) diff --git a/src/mame/dec/decioga.cpp b/src/mame/dec/decioga.cpp index e8e60182696..26e4d12d4aa 100644 --- a/src/mame/dec/decioga.cpp +++ b/src/mame/dec/decioga.cpp @@ -10,8 +10,8 @@ #include "emu.h" #include "decioga.h" -#define LOG_DMA (1U << 0) -#define LOG_LANCE_DMA (1U << 1) +#define LOG_DMA (1U << 1) +#define LOG_LANCE_DMA (1U << 2) #define VERBOSE (LOG_DMA|LOG_LANCE_DMA) diff --git a/src/mame/dec/pdp1.cpp b/src/mame/dec/pdp1.cpp index cbff6aa6702..08edf3d8dde 100644 --- a/src/mame/dec/pdp1.cpp +++ b/src/mame/dec/pdp1.cpp @@ -63,6 +63,18 @@ To load and play a game: #include "screen.h" #include "softlist_dev.h" +#define LOG_IOT_EXTRA (1U << 1) + +/* IOT completion may take much more than the 5us instruction time. A possible programming +error would be to execute an IOT before the last IOT of the same kind is over: such a thing +would confuse the targeted IO device, which might ignore the latter IOT, execute either +or both IOT incompletely, or screw up completely. I insist that such an error can be caused +by a pdp-1 programming error, even if there is no emulator error. */ +#define LOG_IOT_OVERLAP (1U << 2) + +#define VERBOSE (0) +#include "logmacro.h" + /* * @@ -373,17 +385,6 @@ we need to determine the exact relationship between the status register and the system (both standard and type 20). */ #define USE_SBS 0 -#define LOG_IOT 0 -#define LOG_IOT_EXTRA 0 - -/* IOT completion may take much more than the 5us instruction time. A possible programming -error would be to execute an IOT before the last IOT of the same kind is over: such a thing -would confuse the targeted IO device, which might ignore the latter IOT, execute either -or both IOT incompletely, or screw up completely. I insist that such an error can be caused -by a pdp-1 programming error, even if there is no emulator error. */ -#define LOG_IOT_OVERLAP 0 - - /* devices which are known to generate a completion pulse (source: maintenance manual 9-??, and 9-20, 9-21): @@ -753,11 +754,9 @@ void pdp1_readtape_image_device::begin_tape_read(int binary, int nac) m_rby = (binary) ? 1 : 0; m_rcp = nac; - if (LOG_IOT_OVERLAP) - { - if (m_timer->enable(0)) - logerror("Error: overlapped perforated tape reads (Read-in mode, RPA/RPB instruction)\n"); - } + if (m_timer->enable(0)) + LOGMASKED(LOG_IOT_OVERLAP, "Error: overlapped perforated tape reads (Read-in mode, RPA/RPB instruction)\n"); + /* set up delay if tape is advancing */ if (m_motor_on && m_rcl) { @@ -850,8 +849,7 @@ TIMER_CALLBACK_MEMBER(pdp1_readtape_image_device::reader_callback) */ void pdp1_readtape_image_device::iot_rpa(int op2, int nac, int mb, int &io, int ac) { - if (LOG_IOT_EXTRA) - logerror("Warning, RPA instruction not fully emulated: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); + LOGMASKED(LOG_IOT_EXTRA, "Warning, RPA instruction not fully emulated: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); begin_tape_read(0, nac); } @@ -889,8 +887,7 @@ void pdp1_readtape_image_device::iot_rpa(int op2, int nac, int mb, int &io, int */ void pdp1_readtape_image_device::iot_rpb(int op2, int nac, int mb, int &io, int ac) { - if (LOG_IOT_EXTRA) - logerror("Warning, RPB instruction not fully emulated: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); + LOGMASKED(LOG_IOT_EXTRA, "Warning, RPB instruction not fully emulated: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); begin_tape_read(1, nac); } @@ -900,8 +897,7 @@ void pdp1_readtape_image_device::iot_rpb(int op2, int nac, int mb, int &io, int */ void pdp1_readtape_image_device::iot_rrb(int op2, int nac, int mb, int &io, int ac) { - if (LOG_IOT_EXTRA) - logerror("RRB instruction: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); + LOGMASKED(LOG_IOT_EXTRA, "RRB instruction: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); io = m_rb; m_st_ptr(0); @@ -955,18 +951,15 @@ TIMER_CALLBACK_MEMBER(pdp1_punchtape_image_device::puncher_callback) */ void pdp1_punchtape_image_device::iot_ppa(int op2, int nac, int mb, int &io, int ac) { - if (LOG_IOT_EXTRA) - logerror("PPA instruction: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); + LOGMASKED(LOG_IOT_EXTRA, "PPA instruction: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); tape_write(io & 0377); m_st_ptp(0); - // delay is approximately 1/63.3 second - if (LOG_IOT_OVERLAP) - { - if (m_timer->enable(0)) - logerror("Error: overlapped PPA/PPB instructions: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); - } + if (m_timer->enable(0)) + LOGMASKED(LOG_IOT_OVERLAP, "Error: overlapped PPA/PPB instructions: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); + + // delay is approximately 1/63.3 second m_timer->adjust(attotime::from_usec(15800), nac); } @@ -983,17 +976,15 @@ void pdp1_punchtape_image_device::iot_ppa(int op2, int nac, int mb, int &io, int */ void pdp1_punchtape_image_device::iot_ppb(int op2, int nac, int mb, int &io, int ac) { - if (LOG_IOT_EXTRA) - logerror("PPB instruction: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); + LOGMASKED(LOG_IOT_EXTRA, "PPB instruction: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); tape_write((io >> 12) | 0200); m_st_ptp(0); + + if (m_timer->enable(0)) + LOGMASKED(LOG_IOT_OVERLAP, "Error: overlapped PPA/PPB instructions: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); + /* delay is approximately 1/63.3 second */ - if (LOG_IOT_OVERLAP) - { - if (m_timer->enable(0)) - logerror("Error: overlapped PPA/PPB instructions: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); - } m_timer->adjust(attotime::from_usec(15800), nac); } @@ -1024,8 +1015,7 @@ void pdp1_typewriter_device::call_unload() */ void pdp1_typewriter_device::typewriter_out(uint8_t data) { - if (LOG_IOT_EXTRA) - logerror("typewriter output %o\n", data); + LOGMASKED(LOG_IOT_EXTRA, "typewriter output %o\n", data); drawchar(data); if (is_loaded()) @@ -1144,8 +1134,7 @@ TIMER_CALLBACK_MEMBER(pdp1_typewriter_device::tyo_callback) */ void pdp1_typewriter_device::iot_tyo(int op2, int nac, int mb, int &io, int ac) { - if (LOG_IOT_EXTRA) - logerror("Warning, TYO instruction not fully emulated: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); + LOGMASKED(LOG_IOT_EXTRA, "Warning, TYO instruction not fully emulated: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); int ch = io & 077; @@ -1171,11 +1160,9 @@ void pdp1_typewriter_device::iot_tyo(int op2, int nac, int mb, int &io, int ac) delay = 105; /* approximately 105ms */ break; } - if (LOG_IOT_OVERLAP) - { - if (m_tyo_timer->enable(0)) - logerror("Error: overlapped TYO instruction: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); - } + + if (m_tyo_timer->enable(0)) + LOGMASKED(LOG_IOT_OVERLAP, "Error: overlapped TYO instruction: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); m_tyo_timer->adjust(attotime::from_msec(delay), nac); } @@ -1196,8 +1183,7 @@ void pdp1_typewriter_device::iot_tyo(int op2, int nac, int mb, int &io, int ac) */ void pdp1_typewriter_device::iot_tyi(int op2, int nac, int mb, int &io, int ac) { - if (LOG_IOT_EXTRA) - logerror("Warning, TYI instruction not fully emulated: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); + LOGMASKED(LOG_IOT_EXTRA, "Warning, TYI instruction not fully emulated: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); io = m_tb; if (! (m_driver_state->m_io_status & io_st_tyi)) @@ -1273,14 +1259,12 @@ void pdp1_state::iot_dpy(int op2, int nac, int mb, int &io, int ac) if (nac) { + /* note that overlap detection is incomplete: it will only work if both DPY + instructions require a completion pulse */ + if (m_dpy_timer->enable(0)) + LOGMASKED(LOG_IOT_OVERLAP, "Error: overlapped DPY instruction: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); + /* 50us delay */ - if (LOG_IOT_OVERLAP) - { - /* note that overlap detection is incomplete: it will only work if both DPY - instructions require a completion pulse */ - if (m_dpy_timer->enable(0)) - logerror("Error: overlapped DPY instruction: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); - } m_dpy_timer->adjust(attotime::from_usec(50)); } } @@ -1482,8 +1466,7 @@ void pdp1_state::iot_011(int op2, int nac, int mb, int &io, int ac) */ void pdp1_state::iot_cks(int op2, int nac, int mb, int &io, int ac) { - if (LOG_IOT_EXTRA) - logerror("CKS instruction: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); + LOGMASKED(LOG_IOT_EXTRA, "CKS instruction: mb=0%06o, (%s)\n", (unsigned) mb, machine().describe_context()); io = m_io_status; } diff --git a/src/mame/dg/aviion88k.cpp b/src/mame/dg/aviion88k.cpp index e0225b951ec..ecf8ce154de 100644 --- a/src/mame/dg/aviion88k.cpp +++ b/src/mame/dg/aviion88k.cpp @@ -38,8 +38,6 @@ #include "debugger.h" -#define LOG_GENERAL (1U << 0) - //#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/mame/dooyong/gundealr.cpp b/src/mame/dooyong/gundealr.cpp index fd1339bc39b..7ad1c5cd626 100644 --- a/src/mame/dooyong/gundealr.cpp +++ b/src/mame/dooyong/gundealr.cpp @@ -81,7 +81,7 @@ Z80 CPU - 12MHz/2 // configurable logging -#define LOG_MCUSIM (1U << 1) +#define LOG_MCUSIM (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_MCUSIM) diff --git a/src/mame/dynax/hnayayoi.cpp b/src/mame/dynax/hnayayoi.cpp index 3e0d0170390..e45b692d051 100644 --- a/src/mame/dynax/hnayayoi.cpp +++ b/src/mame/dynax/hnayayoi.cpp @@ -57,8 +57,8 @@ TODO: // configurable logging -#define LOG_IRQ (1U << 1) -#define LOG_BLITTER (1U << 2) +#define LOG_IRQ (1U << 1) +#define LOG_BLITTER (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_IRQ | LOG_BLITTER) diff --git a/src/mame/efo/cedar_magnet.cpp b/src/mame/efo/cedar_magnet.cpp index fc73d10184f..6b7dd381380 100644 --- a/src/mame/efo/cedar_magnet.cpp +++ b/src/mame/efo/cedar_magnet.cpp @@ -285,12 +285,15 @@ MASTER BOARD #include "emupal.h" #include "screen.h" +#define LOG_IC49_PIO_PB (1U << 1) +#define LOG_IC48_PIO_PB (1U << 2) +#define LOG_IC48_PIO_PA (1U << 3) + +#define VERBOSE (0) +#include "logmacro.h" -namespace { -#define LOG_IC49_PIO_PB 0 -#define LOG_IC48_PIO_PB 0 -#define LOG_IC48_PIO_PA 0 +namespace { class cedar_magnet_state : public driver_device { @@ -754,7 +757,7 @@ u8 cedar_magnet_state::ic48_pio_pa_r() // 0x20 // interrupt source stuff?? ret &= ~0x10; - if (LOG_IC48_PIO_PA) logerror("%s: ic48_pio_pa_r (returning %02x)\n", machine().describe_context(), ret); + LOGMASKED(LOG_IC48_PIO_PA, "%s: ic48_pio_pa_r (returning %02x)\n", machine().describe_context(), ret); return ret; } @@ -766,16 +769,16 @@ void cedar_magnet_state::ic48_pio_pa_w(u8 data) // 0x20 m_ic48_pio_pa_val = data; // address 0x20 - pio ic48 port a - if (LOG_IC48_PIO_PA) logerror("%s: ic48_pio_pa_w %02x (memory banking etc.)\n", machine().describe_context(), data); + LOGMASKED(LOG_IC48_PIO_PA, "%s: ic48_pio_pa_w %02x (memory banking etc.)\n", machine().describe_context(), data); - if (LOG_IC48_PIO_PA) logerror("output bit 0x80 %d (unused)\n", (data >> 7)&1); // A7 -> 12 J4 unpopulated - if (LOG_IC48_PIO_PA) logerror("output bit 0x40 %d (bank)\n", (data >> 6)&1); // A6 -> 2 74HC10 3NAND IC19 - if (LOG_IC48_PIO_PA) logerror("output bit 0x20 %d (bank)\n", (data >> 5)&1); // A5 -> 4 74HC10 3NAND IC19 - if (LOG_IC48_PIO_PA) logerror("input bit 0x10 %d (interrupt source related?)\n", (data >> 4)&1); // 10 in // A4 <- 9 74HC74 IC20 <- input from 18 74LS244 IC61 - if (LOG_IC48_PIO_PA) logerror("input bit 0x08 %d (COIN1)\n", (data >> 3)&1); // 08 in // A3 <- 4 74HC14P (inverter) IC4 <- EDGE 21 COIN1 - if (LOG_IC48_PIO_PA) logerror("output bit 0x04 %d (plane0 CPU/bus related?)\n", (data >> 2)&1); // A2 -> 45 J6 - if (LOG_IC48_PIO_PA) logerror("output bit 0x02 %d (plane0 CPU/bus related?)\n", (data >> 1)&1); // A1 -> 47 J6 - if (LOG_IC48_PIO_PA) logerror("input bit 0x01 %d (plane0 CPU/bus related?)\n", (data >> 0)&1); // A0 -> 49 J6 + LOGMASKED(LOG_IC48_PIO_PA, "output bit 0x80 %d (unused)\n", (data >> 7)&1); // A7 -> 12 J4 unpopulated + LOGMASKED(LOG_IC48_PIO_PA, "output bit 0x40 %d (bank)\n", (data >> 6)&1); // A6 -> 2 74HC10 3NAND IC19 + LOGMASKED(LOG_IC48_PIO_PA, "output bit 0x20 %d (bank)\n", (data >> 5)&1); // A5 -> 4 74HC10 3NAND IC19 + LOGMASKED(LOG_IC48_PIO_PA, "input bit 0x10 %d (interrupt source related?)\n", (data >> 4)&1); // 10 in // A4 <- 9 74HC74 IC20 <- input from 18 74LS244 IC61 + LOGMASKED(LOG_IC48_PIO_PA, "input bit 0x08 %d (COIN1)\n", (data >> 3)&1); // 08 in // A3 <- 4 74HC14P (inverter) IC4 <- EDGE 21 COIN1 + LOGMASKED(LOG_IC48_PIO_PA, "output bit 0x04 %d (plane0 CPU/bus related?)\n", (data >> 2)&1); // A2 -> 45 J6 + LOGMASKED(LOG_IC48_PIO_PA, "output bit 0x02 %d (plane0 CPU/bus related?)\n", (data >> 1)&1); // A1 -> 47 J6 + LOGMASKED(LOG_IC48_PIO_PA, "input bit 0x01 %d (plane0 CPU/bus related?)\n", (data >> 0)&1); // A0 -> 49 J6 int bankbit0 = (m_ic48_pio_pa_val & 0x60) >> 5; m_bank0->set_bank(bankbit0); @@ -795,7 +798,7 @@ u8 cedar_magnet_state::ic48_pio_pb_r() // 0x22 if (!m_cedsprite->is_running()) ret &= ~0x10; if (!m_cedplane1->is_running()) ret &= ~0x01; - if (LOG_IC48_PIO_PB) logerror("%s: ic48_pio_pb_r (returning %02x)\n", machine().describe_context(), ret); + LOGMASKED(LOG_IC48_PIO_PB, "%s: ic48_pio_pb_r (returning %02x)\n", machine().describe_context(), ret); return ret; } @@ -806,17 +809,17 @@ void cedar_magnet_state::ic48_pio_pb_w(u8 data) // 0x22 m_ic48_pio_pb_val = data; - if (LOG_IC48_PIO_PB) logerror("%s: ic48_pio_pb_w %02x\n", machine().describe_context(), data); + LOGMASKED(LOG_IC48_PIO_PB, "%s: ic48_pio_pb_w %02x\n", machine().describe_context(), data); // address 0x22 - pio ic48 port b - if (LOG_IC48_PIO_PB) logerror("input bit 0x80 %d (COIN2)\n", (data >> 7)&1); // B7 <- 2 74HC14P (inverter) IC4 <- EDGE 22 COIN2 - if (LOG_IC48_PIO_PB) logerror("output bit 0x40 (J6) (sprite CPU/bus related?) %d\n", (data >> 6)&1); // B6 -> 41 J6 - if (LOG_IC48_PIO_PB) logerror("output bit 0x20 (J6) (sprite CPU/bus related?) %d\n", (data >> 5)&1); // B5 -> 43 J6 - if (LOG_IC48_PIO_PB) logerror("input bit 0x10 (J6) (sprite CPU/bus related?) %d\n", (data >> 4)&1); // B4 -> 44 J6 - if (LOG_IC48_PIO_PB) logerror("output bit 0x08 (Q8) %d\n", (data >> 3)&1); // B3 -> Q8 transistor - if (LOG_IC48_PIO_PB) logerror("output bit 0x04 (J6) (plane1 CPU/bus related?) %d\n", (data >> 2)&1); // B2 -> 46 J6 - if (LOG_IC48_PIO_PB) logerror("output bit 0x02 (J6) (plane1 CPU/bus related?) %d\n", (data >> 1)&1); // B1 -> 48 J6 - if (LOG_IC48_PIO_PB) logerror("input bit 0x01 (J6) (plane1 CPU/bus related?) %d\n", (data >> 0)&1); // B0 -> 50 J6 + LOGMASKED(LOG_IC48_PIO_PB, "input bit 0x80 %d (COIN2)\n", (data >> 7)&1); // B7 <- 2 74HC14P (inverter) IC4 <- EDGE 22 COIN2 + LOGMASKED(LOG_IC48_PIO_PB, "output bit 0x40 (J6) (sprite CPU/bus related?) %d\n", (data >> 6)&1); // B6 -> 41 J6 + LOGMASKED(LOG_IC48_PIO_PB, "output bit 0x20 (J6) (sprite CPU/bus related?) %d\n", (data >> 5)&1); // B5 -> 43 J6 + LOGMASKED(LOG_IC48_PIO_PB, "input bit 0x10 (J6) (sprite CPU/bus related?) %d\n", (data >> 4)&1); // B4 -> 44 J6 + LOGMASKED(LOG_IC48_PIO_PB, "output bit 0x08 (Q8) %d\n", (data >> 3)&1); // B3 -> Q8 transistor + LOGMASKED(LOG_IC48_PIO_PB, "output bit 0x04 (J6) (plane1 CPU/bus related?) %d\n", (data >> 2)&1); // B2 -> 46 J6 + LOGMASKED(LOG_IC48_PIO_PB, "output bit 0x02 (J6) (plane1 CPU/bus related?) %d\n", (data >> 1)&1); // B1 -> 48 J6 + LOGMASKED(LOG_IC48_PIO_PB, "input bit 0x01 (J6) (plane1 CPU/bus related?) %d\n", (data >> 0)&1); // B0 -> 50 J6 int plane1select = (m_ic48_pio_pb_val & 0x07) >> 0; int spriteselect = (m_ic48_pio_pb_val & 0x70) >> 4; @@ -838,7 +841,7 @@ u8 cedar_magnet_state::ic49_pio_pb_r() // 0x42 if (!m_cedsound->is_running()) ret &= ~0x10; - if (LOG_IC49_PIO_PB) logerror("%s: ic49_pio_pb_r (returning %02x)\n", machine().describe_context(), ret); + LOGMASKED(LOG_IC49_PIO_PB, "%s: ic49_pio_pb_r (returning %02x)\n", machine().describe_context(), ret); return ret; } @@ -851,15 +854,15 @@ void cedar_magnet_state::ic49_pio_pb_w(u8 data) // 0x42 //logerror("%s: ic49_pio_pb_w %02x\n", machine().describe_context(), data); // address 0x42 - pio ic49 port b - if (LOG_IC49_PIO_PB) logerror("output bit 0x80 %d (Q9)\n", (data >> 7)&1); // B7 -> Q9 transistor - if (LOG_IC49_PIO_PB) logerror("output bit 0x40 %d (sound CPU bus related) (J3)\n", (data >> 6)&1); // B6 -> 9 J3 - if (LOG_IC49_PIO_PB) logerror("output bit 0x20 %d (sound CPU bus related) (J3)\n", (data >> 5)&1); // B5 -> 8 J3 - if (LOG_IC49_PIO_PB) logerror("input bit 0x10 %d (sound CPU bus related) (J3)\n", (data >> 4)&1); // B4 -> 7 J3 // input? - if (LOG_IC49_PIO_PB) logerror("output bit 0x08 %d (J7)\n", (data >> 3)&1); // B3 -> 35 J7 bank bits - if (LOG_IC49_PIO_PB) logerror("output bit 0x04 %d (J7)\n", (data >> 2)&1); // B2 -> 36 J7 bank bits + LOGMASKED(LOG_IC49_PIO_PB, "output bit 0x80 %d (Q9)\n", (data >> 7)&1); // B7 -> Q9 transistor + LOGMASKED(LOG_IC49_PIO_PB, "output bit 0x40 %d (sound CPU bus related) (J3)\n", (data >> 6)&1); // B6 -> 9 J3 + LOGMASKED(LOG_IC49_PIO_PB, "output bit 0x20 %d (sound CPU bus related) (J3)\n", (data >> 5)&1); // B5 -> 8 J3 + LOGMASKED(LOG_IC49_PIO_PB, "input bit 0x10 %d (sound CPU bus related) (J3)\n", (data >> 4)&1); // B4 -> 7 J3 // input? + LOGMASKED(LOG_IC49_PIO_PB, "output bit 0x08 %d (J7)\n", (data >> 3)&1); // B3 -> 35 J7 bank bits + LOGMASKED(LOG_IC49_PIO_PB, "output bit 0x04 %d (J7)\n", (data >> 2)&1); // B2 -> 36 J7 bank bits // there is code to mask out both bottom bits here before load operations? - if (LOG_IC49_PIO_PB) logerror("output bit 0x02 %d (IC21)\n", (data >> 1)&1); // B1 -> 3 74HC04 IC21 (set before some SPRITE cpu operations, possibly halts the blitter?) - if (LOG_IC49_PIO_PB) logerror("output bit 0x01 (LED) %d\n", (data >> 0)&1); // B0 -> LED LD1 + LOGMASKED(LOG_IC49_PIO_PB, "output bit 0x02 %d (IC21)\n", (data >> 1)&1); // B1 -> 3 74HC04 IC21 (set before some SPRITE cpu operations, possibly halts the blitter?) + LOGMASKED(LOG_IC49_PIO_PB, "output bit 0x01 (LED) %d\n", (data >> 0)&1); // B0 -> LED LD1 diff --git a/src/mame/ensoniq/enmirage.cpp b/src/mame/ensoniq/enmirage.cpp index 23828be1a06..45ed16bfd9a 100644 --- a/src/mame/ensoniq/enmirage.cpp +++ b/src/mame/ensoniq/enmirage.cpp @@ -79,8 +79,8 @@ #include "enmirage.lh" -#define LOG_ADC_READ (1U << 1) -#define LOG_FILTER_WRITE (1U << 2) +#define LOG_ADC_READ (1U << 1) +#define LOG_FILTER_WRITE (1U << 2) #define VERBOSE (0) //#define VERBOSE (LOG_ADC_READ) //#define VERBOSE (LOG_ADC_READ|LOG_FILTER_WRITE) diff --git a/src/mame/ericsson/eispc_kb.cpp b/src/mame/ericsson/eispc_kb.cpp index cbcdcccb42e..2a47c0c9e7a 100644 --- a/src/mame/ericsson/eispc_kb.cpp +++ b/src/mame/ericsson/eispc_kb.cpp @@ -81,11 +81,11 @@ //************************************************************************** // CONFIGURABLE LOGGING //************************************************************************** -#define LOG_PORTS (1U << 1) -#define LOG_RESET (1U << 2) -#define LOG_BITS (1U << 3) -#define LOG_UI (1U << 4) -#define LOG_LEDS (1U << 5) +#define LOG_PORTS (1U << 1) +#define LOG_RESET (1U << 2) +#define LOG_BITS (1U << 3) +#define LOG_UI (1U << 4) +#define LOG_LEDS (1U << 5) //#define VERBOSE (LOG_LEDS) //#define LOG_OUTPUT_STREAM std::cout diff --git a/src/mame/excellent/witch.cpp b/src/mame/excellent/witch.cpp index bfd729489fa..2b530f067fe 100644 --- a/src/mame/excellent/witch.cpp +++ b/src/mame/excellent/witch.cpp @@ -236,7 +236,7 @@ TODO : // configurable logging -#define LOG_INPUTS (1U << 1) +#define LOG_INPUTS (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_INPUTS) diff --git a/src/mame/exidy/victory_v.cpp b/src/mame/exidy/victory_v.cpp index 7cf46aecd41..468a3a945fc 100644 --- a/src/mame/exidy/victory_v.cpp +++ b/src/mame/exidy/victory_v.cpp @@ -9,6 +9,12 @@ #include "emu.h" #include "victory.h" +#define LOG_MICROCODE (1U << 1) +#define LOG_COLLISION (1U << 2) +#define LOG_UNKNOWN (1U << 3) + +#define VERBOSE (0) +#include "logmacro.h" /* number of ticks per clock of the microcode state machine */ @@ -19,10 +25,6 @@ #define MICRO_STATE_CLOCK_PERIOD attotime::from_hz(VICTORY_MICRO_STATE_CLOCK / 8) -/* debugging constants */ -#define LOG_MICROCODE 0 -#define LOG_COLLISION 0 - /************************************* * * Initialize the video system @@ -144,7 +146,7 @@ uint8_t victory_state::video_control_r(offs_t offset) { case 0x00: /* 5XFIQ */ result = m_fgcollx; - if (LOG_COLLISION) logerror("%04X:5XFIQ read = %02X\n", m_maincpu->pcbase(), result); + LOGMASKED(LOG_COLLISION, "%04X:5XFIQ read = %02X\n", m_maincpu->pcbase(), result); return result; case 0x01: /* 5CLFIQ */ @@ -154,12 +156,12 @@ uint8_t victory_state::video_control_r(offs_t offset) m_fgcoll = 0; update_irq(); } - if (LOG_COLLISION) logerror("%04X:5CLFIQ read = %02X\n", m_maincpu->pcbase(), result); + LOGMASKED(LOG_COLLISION, "%04X:5CLFIQ read = %02X\n", m_maincpu->pcbase(), result); return result; case 0x02: /* 5BACKX */ result = m_bgcollx & 0xfc; - if (LOG_COLLISION) logerror("%04X:5BACKX read = %02X\n", m_maincpu->pcbase(), result); + LOGMASKED(LOG_COLLISION, "%04X:5BACKX read = %02X\n", m_maincpu->pcbase(), result); return result; case 0x03: /* 5BACKY */ @@ -169,7 +171,7 @@ uint8_t victory_state::video_control_r(offs_t offset) m_bgcoll = 0; update_irq(); } - if (LOG_COLLISION) logerror("%04X:5BACKY read = %02X\n", m_maincpu->pcbase(), result); + LOGMASKED(LOG_COLLISION, "%04X:5BACKY read = %02X\n", m_maincpu->pcbase(), result); return result; case 0x04: /* 5STAT */ @@ -184,11 +186,11 @@ uint8_t victory_state::video_control_r(offs_t offset) result |= (~m_vblank_irq & 1) << 5; result |= (~m_bgcoll & 1) << 4; result |= (m_screen->vpos() & 0x100) >> 5; - if (LOG_COLLISION) logerror("%04X:5STAT read = %02X\n", m_maincpu->pcbase(), result); + LOGMASKED(LOG_COLLISION, "%04X:5STAT read = %02X\n", m_maincpu->pcbase(), result); return result; default: - logerror("%04X:video_control_r(%02X)\n", m_maincpu->pcbase(), offset); + LOGMASKED(LOG_UNKNOWN, "%04X:video_control_r(%02X)\n", m_maincpu->pcbase(), offset); break; } return 0; @@ -208,87 +210,87 @@ void victory_state::video_control_w(offs_t offset, uint8_t data) switch (offset) { case 0x00: /* LOAD IL */ - if (LOG_MICROCODE) logerror("%04X:IL=%02X\n", m_maincpu->pcbase(), data); + LOGMASKED(LOG_MICROCODE, "%04X:IL=%02X\n", m_maincpu->pcbase(), data); micro.i = (micro.i & 0xff00) | (data & 0x00ff); break; case 0x01: /* LOAD IH */ - if (LOG_MICROCODE) logerror("%04X:IH=%02X\n", m_maincpu->pcbase(), data); + LOGMASKED(LOG_MICROCODE, "%04X:IH=%02X\n", m_maincpu->pcbase(), data); micro.i = (micro.i & 0x00ff) | ((data << 8) & 0xff00); if (micro.cmdlo == 5) { - if (LOG_MICROCODE) logerror(" Command 5 triggered by write to IH\n"); + LOGMASKED(LOG_MICROCODE, " Command 5 triggered by write to IH\n"); command5(); } break; case 0x02: /* LOAD CMD */ - if (LOG_MICROCODE) logerror("%04X:CMD=%02X\n", m_maincpu->pcbase(), data); + LOGMASKED(LOG_MICROCODE, "%04X:CMD=%02X\n", m_maincpu->pcbase(), data); micro.cmd = data; micro.cmdlo = data & 7; if (micro.cmdlo == 0) - logerror(" Command 0 triggered\n"); + LOGMASKED(LOG_MICROCODE, " Command 0 triggered\n"); else if (micro.cmdlo == 1) - logerror(" Command 1 triggered\n"); + LOGMASKED(LOG_MICROCODE, " Command 1 triggered\n"); else if (micro.cmdlo == 6) { - if (LOG_MICROCODE) logerror(" Command 6 triggered\n"); + LOGMASKED(LOG_MICROCODE, " Command 6 triggered\n"); command6(); } break; case 0x03: /* LOAD G */ - if (LOG_MICROCODE) logerror("%04X:G=%02X\n", m_maincpu->pcbase(), data); + LOGMASKED(LOG_MICROCODE, "%04X:G=%02X\n", m_maincpu->pcbase(), data); micro.g = data; break; case 0x04: /* LOAD X */ - if (LOG_MICROCODE) logerror("%04X:X=%02X\n", m_maincpu->pcbase(), data); + LOGMASKED(LOG_MICROCODE, "%04X:X=%02X\n", m_maincpu->pcbase(), data); micro.xp = data; if (micro.cmdlo == 3) { - if (LOG_MICROCODE) logerror(" Command 3 triggered by write to X\n"); + LOGMASKED(LOG_MICROCODE, " Command 3 triggered by write to X\n"); command3(); } break; case 0x05: /* LOAD Y */ - if (LOG_MICROCODE) logerror("%04X:Y=%02X\n", m_maincpu->pcbase(), data); + LOGMASKED(LOG_MICROCODE, "%04X:Y=%02X\n", m_maincpu->pcbase(), data); micro.yp = data; if (micro.cmdlo == 4) { - if (LOG_MICROCODE) logerror(" Command 4 triggered by write to Y\n"); + LOGMASKED(LOG_MICROCODE, " Command 4 triggered by write to Y\n"); command4(); } break; case 0x06: /* LOAD R */ - if (LOG_MICROCODE) logerror("%04X:R=%02X\n", m_maincpu->pcbase(), data); + LOGMASKED(LOG_MICROCODE, "%04X:R=%02X\n", m_maincpu->pcbase(), data); micro.r = data; break; case 0x07: /* LOAD B */ - if (LOG_MICROCODE) logerror("%04X:B=%02X\n", m_maincpu->pcbase(), data); + LOGMASKED(LOG_MICROCODE, "%04X:B=%02X\n", m_maincpu->pcbase(), data); micro.b = data; if (micro.cmdlo == 2) { - if (LOG_MICROCODE) logerror(" Command 2 triggered by write to B\n"); + LOGMASKED(LOG_MICROCODE, " Command 2 triggered by write to B\n"); command2(); } else if (micro.cmdlo == 7) { - if (LOG_MICROCODE) logerror(" Command 7 triggered by write to B\n"); + LOGMASKED(LOG_MICROCODE, " Command 7 triggered by write to B\n"); command7(); } break; case 0x08: /* SCROLLX */ - if (LOG_MICROCODE) logerror("%04X:SCROLLX write = %02X\n", m_maincpu->pcbase(), data); + LOGMASKED(LOG_MICROCODE, "%04X:SCROLLX write = %02X\n", m_maincpu->pcbase(), data); m_scrollx = data; break; case 0x09: /* SCROLLY */ - if (LOG_MICROCODE) logerror("%04X:SCROLLY write = %02X\n", m_maincpu->pcbase(), data); + LOGMASKED(LOG_MICROCODE, "%04X:SCROLLY write = %02X\n", m_maincpu->pcbase(), data); m_scrolly = data; break; @@ -300,18 +302,18 @@ void victory_state::video_control_w(offs_t offset, uint8_t data) // D3 = SINVERT // D2 = BIR12 // D1 = SELOVER - if (LOG_MICROCODE) logerror("%04X:CONTROL write = %02X\n", m_maincpu->pcbase(), data); + LOGMASKED(LOG_MICROCODE, "%04X:CONTROL write = %02X\n", m_maincpu->pcbase(), data); m_video_control = data; break; case 0x0b: /* CLRVIRQ */ - if (LOG_MICROCODE) logerror("%04X:CLRVIRQ write = %02X\n", m_maincpu->pcbase(), data); + LOGMASKED(LOG_MICROCODE, "%04X:CLRVIRQ write = %02X\n", m_maincpu->pcbase(), data); m_vblank_irq = 0; update_irq(); break; default: - if (LOG_MICROCODE) logerror("%04X:video_control_w(%02X) = %02X\n", m_maincpu->pcbase(), offset, data); + LOGMASKED(LOG_MICROCODE, "%04X:video_control_w(%02X) = %02X\n", m_maincpu->pcbase(), offset, data); break; } } @@ -703,7 +705,7 @@ int victory_state::command4() */ int keep_going = 0; - if (LOG_MICROCODE) logerror("================= EXECUTE BEGIN\n"); + LOGMASKED(LOG_MICROCODE, "================= EXECUTE BEGIN\n"); micro.count_states(4); @@ -716,7 +718,7 @@ int victory_state::command4() micro.r = m_gram[0x2001 + micro.pc]; micro.xp = m_rram[0x2001 + micro.pc]; micro.yp = m_bram[0x2001 + micro.pc]; - if (LOG_MICROCODE) logerror("PC=%03X CMD=%02X I=%04X R=%02X X=%02X Y=%02X\n", micro.pc, micro.cmd, micro.i, micro.r, micro.xp, micro.yp); + LOGMASKED(LOG_MICROCODE, "PC=%03X CMD=%02X I=%04X R=%02X X=%02X Y=%02X\n", micro.pc, micro.cmd, micro.i, micro.r, micro.xp, micro.yp); micro.pc = (micro.pc + 2) & 0x1ff; switch (micro.cmdlo) @@ -732,7 +734,7 @@ int victory_state::command4() } } while (keep_going); - if (LOG_MICROCODE) logerror("================= EXECUTE END\n"); + LOGMASKED(LOG_MICROCODE, "================= EXECUTE END\n"); return micro.cmd & 0x80; } diff --git a/src/mame/force/fccpu20.cpp b/src/mame/force/fccpu20.cpp index 126334a1148..b49a414958d 100644 --- a/src/mame/force/fccpu20.cpp +++ b/src/mame/force/fccpu20.cpp @@ -68,8 +68,7 @@ // CONFIGURABLE LOGGING //************************************************************************** -#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) +#define LOG_SETUP (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_SETUP) //#define LOG_OUTPUT_FUNC printf diff --git a/src/mame/force/fccpu30.cpp b/src/mame/force/fccpu30.cpp index 3b2968ff359..5b67d6bd1ea 100644 --- a/src/mame/force/fccpu30.cpp +++ b/src/mame/force/fccpu30.cpp @@ -209,11 +209,10 @@ #include "machine/clock.h" //#include "machine/timekpr.h" -//#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) -#define LOG_READ (1U << 2) -#define LOG_INT (1U << 3) -#define LOG_INIT (1U << 4) +#define LOG_SETUP (1U << 1) +#define LOG_READ (1U << 2) +#define LOG_INT (1U << 3) +#define LOG_INIT (1U << 4) //#define VERBOSE (LOG_GENERAL | LOG_SETUP) //#define LOG_OUTPUT_FUNC printf diff --git a/src/mame/force/force68k.cpp b/src/mame/force/force68k.cpp index 3467c08b833..8c7c948d015 100644 --- a/src/mame/force/force68k.cpp +++ b/src/mame/force/force68k.cpp @@ -117,8 +117,8 @@ //************************************************************************** // CONFIGURABLE LOGGING //************************************************************************** -//#define LOG_GENERAL (1U << 0) // defined in logmacro.h -#define LOG_SETUP (1U << 1) + +#define LOG_SETUP (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_SETUP) //#define LOG_OUTPUT_FUNC printf diff --git a/src/mame/force/miniforce.cpp b/src/mame/force/miniforce.cpp index b247d04c48f..bc3dacf9678 100644 --- a/src/mame/force/miniforce.cpp +++ b/src/mame/force/miniforce.cpp @@ -105,21 +105,10 @@ #include "bus/vme/vme_hcpu30.h" #include "machine/clock.h" -#define LOG_GENERAL 0x01 -#define LOG_SETUP 0x02 -#define LOG_PRINTF 0x04 +#define VERBOSE (0) // (LOG_GENERAL) +//#define LOG_OUTPUT_FUNC printf +#include "logmacro.h" -#define VERBOSE 0 // (LOG_PRINTF | LOG_SETUP | LOG_GENERAL) - -#define LOGMASK(mask, ...) do { if (VERBOSE & mask) logerror(__VA_ARGS__); } while (0) -#define LOGLEVEL(mask, level, ...) do { if ((VERBOSE & mask) >= level) logerror(__VA_ARGS__); } while (0) - -#define LOG(...) LOGMASK(LOG_GENERAL, __VA_ARGS__) -#define LOGSETUP(...) LOGMASK(LOG_SETUP, __VA_ARGS__) - -#if VERBOSE & LOG_PRINTF -#define logerror printf -#endif #ifdef _MSC_VER #define FUNCNAME __func__ diff --git a/src/mame/fujitsu/fmtowns.cpp b/src/mame/fujitsu/fmtowns.cpp index 1a34b87e571..f381eb91467 100644 --- a/src/mame/fujitsu/fmtowns.cpp +++ b/src/mame/fujitsu/fmtowns.cpp @@ -241,13 +241,18 @@ Notes: #include "speaker.h" #include +#define LOG_SYS (1U << 1) +#define LOG_CD (1U << 2) +#define LOG_CD_UNKNOWN (1U << 3) + +#define VERBOSE (LOG_GENERAL | LOG_CD_UNKNOWN) +#include "logmacro.h" + // CD controller IRQ types #define TOWNS_CD_IRQ_MPU 1 #define TOWNS_CD_IRQ_DMA 2 -#define LOG_SYS 0 -#define LOG_CD 0 enum { @@ -260,8 +265,6 @@ enum }; - - inline uint8_t towns_state::byte_to_bcd(uint8_t val) { return ((val / 10) << 4) | (val % 10); @@ -328,10 +331,10 @@ uint8_t towns_state::towns_system_r(offs_t offset) switch(offset) { case 0x00: - if(LOG_SYS) logerror("SYS: port 0x20 read\n"); + LOGMASKED(LOG_SYS, "SYS: port 0x20 read\n"); return 0x00; case 0x05: - if(LOG_SYS) logerror("SYS: port 0x25 read\n"); + LOGMASKED(LOG_SYS, "SYS: port 0x25 read\n"); return 0x00; /* case 0x06: count = (m_towns_freerun_counter->elapsed() * ATTOSECONDS_TO_HZ(ATTOSECONDS_IN_USEC(1))).as_double(); @@ -340,28 +343,28 @@ uint8_t towns_state::towns_system_r(offs_t offset) count = (m_towns_freerun_counter->elapsed() * ATTOSECONDS_TO_HZ(ATTOSECONDS_IN_USEC(1))).as_double(); return (count >> 8) & 0xff; */ case 0x06: - //if(LOG_SYS) logerror("SYS: (0x26) timer read\n"); + //LOGMASKED(LOG_SYS, "SYS: (0x26) timer read\n"); return m_freerun_timer; case 0x07: return m_freerun_timer >> 8; case 0x08: - //if(LOG_SYS) logerror("SYS: (0x28) NMI mask read\n"); + //LOGMASKED(LOG_SYS, "SYS: (0x28) NMI mask read\n"); return m_nmi_mask & 0x01; case 0x10: - if(LOG_SYS) logerror("SYS: (0x30) Machine ID read\n"); + LOGMASKED(LOG_SYS, "SYS: (0x30) Machine ID read\n"); return (m_towns_machine_id >> 8) & 0xff; case 0x11: - if(LOG_SYS) logerror("SYS: (0x31) Machine ID read\n"); + LOGMASKED(LOG_SYS, "SYS: (0x31) Machine ID read\n"); return m_towns_machine_id & 0xff; case 0x12: /* Bit 0 = data, bit 6 = CLK, bit 7 = RESET, bit 5 is always 1? */ ret = (m_towns_serial_rom[m_towns_srom_position/8] & (1 << (m_towns_srom_position%8))) ? 1 : 0; ret |= m_towns_srom_clk; ret |= m_towns_srom_reset; - //if(LOG_SYS) logerror("SYS: (0x32) Serial ROM read [0x%02x, pos=%i]\n",ret,towns_srom_position); + //LOGMASKED(LOG_SYS, "SYS: (0x32) Serial ROM read [0x%02x, pos=%i]\n",ret,towns_srom_position); return ret; default: - //if(LOG_SYS) logerror("SYS: Unknown system port read (0x%02x)\n",offset+0x20); + //LOGMASKED(LOG_SYS, "SYS: Unknown system port read (0x%02x)\n",offset+0x20); return 0x00; } } @@ -372,17 +375,17 @@ void towns_state::towns_system_w(offs_t offset, uint8_t data) { case 0x00: // bit 7 = NMI vector protect, bit 6 = power off, bit 0 = software reset, bit 3 = A20 line? // space.m_maincpu->set_input_line(INPUT_LINE_A20,(data & 0x08) ? CLEAR_LINE : ASSERT_LINE); - if(LOG_SYS) logerror("SYS: port 0x20 write %02x\n",data); + LOGMASKED(LOG_SYS, "SYS: port 0x20 write %02x\n",data); break; case 0x02: - if(LOG_SYS) logerror("SYS: (0x22) power port write %02x\n",data); + LOGMASKED(LOG_SYS, "SYS: (0x22) power port write %02x\n",data); break; case 0x08: - //if(LOG_SYS) logerror("SYS: (0x28) NMI mask write %02x\n",data); + //LOGMASKED(LOG_SYS, "SYS: (0x28) NMI mask write %02x\n",data); m_nmi_mask = data & 0x01; break; case 0x12: - //if(LOG_SYS) logerror("SYS: (0x32) Serial ROM write %02x\n",data); + //LOGMASKED(LOG_SYS, "SYS: (0x32) Serial ROM write %02x\n",data); // clocks on low-to-high transition if((data & 0x40) && m_towns_srom_clk == 0) // CLK { // advance to next bit @@ -396,7 +399,8 @@ void towns_state::towns_system_w(offs_t offset, uint8_t data) m_towns_srom_reset = data & 0x80; break; default: - if(LOG_SYS) logerror("SYS: Unknown system port write 0x%02x (0x%02x)\n",data,offset); + LOGMASKED(LOG_SYS, "SYS: Unknown system port write 0x%02x (0x%02x)\n",data,offset); + break; } } @@ -456,7 +460,7 @@ TIMER_CALLBACK_MEMBER(towns_state::wait_end) uint8_t towns_state::towns_sys6c_r() { - if(LOG_SYS) logerror("SYS: (0x6c) Timer? read\n"); + LOGMASKED(LOG_SYS, "SYS: (0x6c) Timer? read\n"); return 0x00; } @@ -819,10 +823,10 @@ uint8_t towns_state::towns_sys5e8_r(offs_t offset) switch(offset) { case 0x00: - if(LOG_SYS) logerror("SYS: read RAM size port (%i)\n",m_ram->size()); + LOGMASKED(LOG_SYS, "SYS: read RAM size port (%i)\n",m_ram->size()); return m_ram->size()/1048576; case 0x02: - if(LOG_SYS) logerror("SYS: read port 5ec\n"); + LOGMASKED(LOG_SYS, "SYS: read port 5ec\n"); return m_compat_mode & 0x01; } return 0x00; @@ -833,10 +837,10 @@ void towns_state::towns_sys5e8_w(offs_t offset, uint8_t data) switch(offset) { case 0x00: - if(LOG_SYS) logerror("SYS: wrote 0x%02x to port 5e8\n",data); + LOGMASKED(LOG_SYS, "SYS: wrote 0x%02x to port 5e8\n",data); break; case 0x02: - if(LOG_SYS) logerror("SYS: wrote 0x%02x to port 5ec\n",data); + LOGMASKED(LOG_SYS, "SYS: wrote 0x%02x to port 5ec\n",data); m_compat_mode = data & 0x01; break; } @@ -1192,7 +1196,7 @@ TIMER_CALLBACK_MEMBER(towns_state::towns_cdrom_read_byte) { // end of transfer m_towns_cd.status &= ~0x10; // no longer transferring by DMA m_towns_cd.status &= ~0x20; // no longer transferring by software - if(LOG_CD) logerror("DMA1: end of transfer (LBA=%08x)\n",m_towns_cd.lba_current); + LOGMASKED(LOG_CD, "DMA1: end of transfer (LBA=%08x)\n",m_towns_cd.lba_current); if(m_towns_cd.lba_current >= m_towns_cd.lba_last) { m_towns_cd.extra_status = 0; @@ -1226,7 +1230,7 @@ uint8_t towns_state::towns_cdrom_read_byte_software() { // end of transfer m_towns_cd.status &= ~0x10; // no longer transferring by DMA m_towns_cd.status &= ~0x20; // no longer transferring by software - if(LOG_CD) logerror("CD: end of software transfer (LBA=%08x)\n",m_towns_cd.lba_current); + LOGMASKED(LOG_CD, "CD: end of software transfer (LBA=%08x)\n",m_towns_cd.lba_current); if(m_towns_cd.lba_current >= m_towns_cd.lba_last) { m_towns_cd.extra_status = 0; @@ -1276,7 +1280,7 @@ void towns_state::towns_cdrom_read(cdrom_image_device* device) // if(m_towns_cd.parameter[1] != 0) // m_towns_cd.lba_last += m_towns_cd.parameter[1]; - if(LOG_CD) logerror("CD: Mode 1 read from LBA next:%i last:%i track:%i\n",m_towns_cd.lba_current,m_towns_cd.lba_last,track); + LOGMASKED(LOG_CD, "CD: Mode 1 read from LBA next:%i last:%i track:%i\n",m_towns_cd.lba_current,m_towns_cd.lba_last,track); if(m_towns_cd.lba_current > m_towns_cd.lba_last) { @@ -1333,7 +1337,7 @@ void towns_state::towns_cdrom_play_cdda(cdrom_image_device* device) m_towns_cd.cdda_length = msf_to_lbafm(lba2) - m_towns_cd.cdda_current + 1; m_cdda->start_audio(m_towns_cd.cdda_current,m_towns_cd.cdda_length); - if(LOG_CD) logerror("CD: CD-DA start from LBA:%i length:%i\n",m_towns_cd.cdda_current,m_towns_cd.cdda_length); + LOGMASKED(LOG_CD, "CD: CD-DA start from LBA:%i length:%i\n",m_towns_cd.cdda_current,m_towns_cd.cdda_length); if(m_towns_cd.command & 0x20) { m_towns_cd.extra_status = 1; @@ -1368,7 +1372,7 @@ void towns_state::towns_cdrom_execute_command(cdrom_image_device* device) m_towns_cd.extra_status = 1; towns_cd_set_status(0x00,0x00,0x00,0x00); } - if(LOG_CD) logerror("CD: Command 0x00: SEEK\n"); + LOGMASKED(LOG_CD, "CD: Command 0x00: SEEK\n"); break; case 0x01: // unknown if(m_towns_cd.command & 0x20) @@ -1376,18 +1380,18 @@ void towns_state::towns_cdrom_execute_command(cdrom_image_device* device) m_towns_cd.extra_status = 0; towns_cd_set_status(0x00,0xff,0xff,0xff); } - if(LOG_CD) logerror("CD: Command 0x01: unknown\n"); + LOGMASKED(LOG_CD, "CD: Command 0x01: unknown\n"); break; case 0x02: // Read (MODE1) - if(LOG_CD) logerror("CD: Command 0x02: READ MODE1\n"); + LOGMASKED(LOG_CD, "CD: Command 0x02: READ MODE1\n"); towns_cdrom_read(device); break; case 0x04: // Play Audio Track - if(LOG_CD) logerror("CD: Command 0x04: PLAY CD-DA\n"); + LOGMASKED(LOG_CD, "CD: Command 0x04: PLAY CD-DA\n"); m_towns_cdda_timer->adjust(attotime::from_msec(1),0,attotime::never); break; case 0x05: // Read TOC - if(LOG_CD) logerror("CD: Command 0x05: READ TOC\n"); + LOGMASKED(LOG_CD, "CD: Command 0x05: READ TOC\n"); if(m_towns_cd.command & 0x20) { m_towns_cd.extra_status = 1; @@ -1400,17 +1404,17 @@ void towns_state::towns_cdrom_execute_command(cdrom_image_device* device) } break; case 0x06: // Read CD-DA state? - if(LOG_CD) logerror("CD: Command 0x06: READ CD-DA STATE\n"); + LOGMASKED(LOG_CD, "CD: Command 0x06: READ CD-DA STATE\n"); m_towns_cd.extra_status = 1; towns_cd_set_status(0x00,0x00,0x00,0x00); break; case 0x1f: // unknown - if(LOG_CD) logerror("CD: Command 0x1f: unknown\n"); + LOGMASKED(LOG_CD, "CD: Command 0x1f: unknown\n"); m_towns_cd.extra_status = 0; towns_cd_set_status(0x00,0x00,0x00,0x00); break; case 0x80: // set state - if(LOG_CD) logerror("CD: Command 0x80: set state\n"); + LOGMASKED(LOG_CD, "CD: Command 0x80: set state\n"); if(m_towns_cd.command & 0x20) { m_towns_cd.extra_status = 0; @@ -1427,7 +1431,7 @@ void towns_state::towns_cdrom_execute_command(cdrom_image_device* device) m_towns_cd.extra_status = 0; towns_cd_set_status(0x00,0x00,0x00,0x00); } - if(LOG_CD) logerror("CD: Command 0x81: set state (CDDASET)\n"); + LOGMASKED(LOG_CD, "CD: Command 0x81: set state (CDDASET)\n"); break; case 0x84: // Stop CD audio track -- generates no status output? if(m_towns_cd.command & 0x20) @@ -1436,7 +1440,7 @@ void towns_state::towns_cdrom_execute_command(cdrom_image_device* device) towns_cd_set_status(0x00,0x00,0x00,0x00); } m_cdda->pause_audio(1); - if(LOG_CD) logerror("CD: Command 0x84: STOP CD-DA\n"); + LOGMASKED(LOG_CD, "CD: Command 0x84: STOP CD-DA\n"); break; case 0x85: // Stop CD audio track (difference from 0x84?) if(m_towns_cd.command & 0x20) @@ -1445,7 +1449,7 @@ void towns_state::towns_cdrom_execute_command(cdrom_image_device* device) towns_cd_set_status(0x00,0x00,0x00,0x00); } m_cdda->pause_audio(1); - if(LOG_CD) logerror("CD: Command 0x85: STOP CD-DA\n"); + LOGMASKED(LOG_CD, "CD: Command 0x85: STOP CD-DA\n"); break; case 0x87: // Resume CD-DA playback if(m_towns_cd.command & 0x20) @@ -1454,12 +1458,13 @@ void towns_state::towns_cdrom_execute_command(cdrom_image_device* device) towns_cd_set_status(0x00,0x03,0x00,0x00); } m_cdda->pause_audio(0); - if(LOG_CD) logerror("CD: Command 0x87: RESUME CD-DA\n"); + LOGMASKED(LOG_CD, "CD: Command 0x87: RESUME CD-DA\n"); break; default: m_towns_cd.extra_status = 0; towns_cd_set_status(0x10,0x00,0x00,0x00); - logerror("CD: Unknown or unimplemented command %02x\n",m_towns_cd.command); + LOGMASKED(LOG_CD_UNKNOWN, "CD: Unknown or unimplemented command %02x\n",m_towns_cd.command); + break; } } } @@ -1481,7 +1486,7 @@ uint8_t towns_state::towns_cdrom_r(offs_t offset) switch(offset) { case 0x00: // status - //if(LOG_CD) logerror("CD: status read, returning %02x\n",towns_cd.status); + //LOGMASKED(LOG_CD, "CD: status read, returning %02x\n",towns_cd.status); return m_towns_cd.status; case 0x01: // command status if(m_towns_cd.cmd_status_ptr >= 3) @@ -1611,7 +1616,7 @@ uint8_t towns_state::towns_cdrom_r(offs_t offset) else m_towns_cd.status &= ~0x02; } - if(LOG_CD) logerror("CD: reading command status port (%i), returning %02x\n",m_towns_cd.cmd_status_ptr,ret); + LOGMASKED(LOG_CD, "CD: reading command status port (%i), returning %02x\n",m_towns_cd.cmd_status_ptr,ret); m_towns_cd.cmd_status_ptr++; if(m_towns_cd.cmd_status_ptr > 3) { @@ -1645,16 +1650,16 @@ void towns_state::towns_cdrom_w(offs_t offset, uint8_t data) if(data & 0x40) towns_cdrom_set_irq(TOWNS_CD_IRQ_DMA,0); if(data & 0x04) - logerror("CD: sub MPU reset\n"); + LOG("CD: sub MPU reset\n"); m_towns_cd.mpu_irq_enable = data & 0x02; m_towns_cd.dma_irq_enable = data & 0x01; - if(LOG_CD) logerror("CD: status write %02x\n",data); + LOGMASKED(LOG_CD, "CD: status write %02x\n",data); break; case 0x01: // command m_towns_cd.command = data; towns_cdrom_execute_command(m_cdrom); - if(LOG_CD) logerror("CD: command %02x sent\n",data); - if(LOG_CD) logerror("CD: parameters: %02x %02x %02x %02x %02x %02x %02x %02x\n", + LOGMASKED(LOG_CD, "CD: command %02x sent\n",data); + LOGMASKED(LOG_CD, "CD: parameters: %02x %02x %02x %02x %02x %02x %02x %02x\n", m_towns_cd.parameter[7],m_towns_cd.parameter[6],m_towns_cd.parameter[5], m_towns_cd.parameter[4],m_towns_cd.parameter[3],m_towns_cd.parameter[2], m_towns_cd.parameter[1],m_towns_cd.parameter[0]); @@ -1663,7 +1668,7 @@ void towns_state::towns_cdrom_w(offs_t offset, uint8_t data) for(x=7;x>0;x--) m_towns_cd.parameter[x] = m_towns_cd.parameter[x-1]; m_towns_cd.parameter[0] = data; - if(LOG_CD) logerror("CD: parameter %02x added\n",data); + LOGMASKED(LOG_CD, "CD: parameter %02x added\n",data); break; case 0x03: if(data & 0x08) // software transfer @@ -1684,10 +1689,11 @@ void towns_state::towns_cdrom_w(offs_t offset, uint8_t data) m_towns_cd.read_timer->adjust(attotime::from_hz(300000),1); } } - if(LOG_CD) logerror("CD: transfer mode write %02x\n",data); + LOGMASKED(LOG_CD, "CD: transfer mode write %02x\n",data); break; default: - if(LOG_CD) logerror("CD: write %02x to port %02x\n",data,offset*2); + LOGMASKED(LOG_CD, "CD: write %02x to port %02x\n",data,offset*2); + break; } } diff --git a/src/mame/fujitsu/fmtowns_v.cpp b/src/mame/fujitsu/fmtowns_v.cpp index f93026156d3..fe5b41b8f9b 100644 --- a/src/mame/fujitsu/fmtowns_v.cpp +++ b/src/mame/fujitsu/fmtowns_v.cpp @@ -97,11 +97,20 @@ #include "machine/ram.h" #include "screen.h" +#define LOG_VID (1U << 1) +#define LOG_IRQ (1U << 2) +#define LOG_UNKNOWN (1U << 3) +#define LOG_VGA (1U << 4) +#define LOG_CRTC (1U << 5) +#define LOG_SPR (1U << 6) + +#define VERBOSE (LOG_GENERAL | LOG_UNKNOWN) +#include "logmacro.h" + //#define CRTC_REG_DISP 1 //#define SPR_DEBUG 1 #define LAYER_DISABLE 0 // for debugging, allow the Q and W keys to be used for disabling graphic layers -#define LOG_VID 0 //static uint32_t pshift; // for debugging @@ -302,7 +311,8 @@ uint8_t towns_state::towns_video_cff80_r(offs_t offset) else return 0x00; default: - logerror("VGA: read from invalid or unimplemented memory-mapped port %05x\n",0xcff80+offset*4); + LOGMASKED(LOG_UNKNOWN, "VGA: read from invalid or unimplemented memory-mapped port %05x\n",0xcff80+offset*4); + break; } return 0; @@ -319,7 +329,7 @@ void towns_state::towns_video_cff80_w(offs_t offset, uint8_t data) m_video.towns_vram_wplane = data & 0x0f; m_video.towns_vram_rplane = (data & 0xc0) >> 6; towns_update_video_banks(); - //logerror("VGA: VRAM wplane select = 0x%02x\n",towns_vram_wplane); + LOGMASKED(LOG_VGA, "VGA: VRAM wplane select = 0x%02x\n", m_video.towns_vram_wplane); break; case 0x02: // display plane (bits 0-2), display page select (bit 4) m_video.towns_display_plane = data & 0x27; @@ -331,19 +341,20 @@ void towns_state::towns_video_cff80_w(offs_t offset, uint8_t data) case 0x14: // Kanji offset (high) m_video.towns_kanji_code_h = data & 0x7f; towns_update_kanji_offset(); - //if(LOG_VID) logerror("VID: Kanji code set (high) = %02x %02x\n",towns_kanji_code_h,towns_kanji_code_l); + //LOGMASKED(LOG_VID, "VID: Kanji code set (high) = %02x %02x\n",towns_kanji_code_h,towns_kanji_code_l); break; case 0x15: // Kanji offset (low) m_video.towns_kanji_code_l = data & 0x7f; towns_update_kanji_offset(); - //if(LOG_VID) logerror("VID: Kanji code set (low) = %02x %02x\n",towns_kanji_code_h,towns_kanji_code_l); + //LOGMASKED(LOG_VID, "VID: Kanji code set (low) = %02x %02x\n",towns_kanji_code_h,towns_kanji_code_l); break; case 0x19: // ANK CG ROM m_towns_ankcg_enable = data & 0x01; towns_update_video_banks(); break; default: - logerror("VID: write %08x to invalid or unimplemented memory-mapped port %05x\n",data,0xcff80+offset); + LOGMASKED(LOG_UNKNOWN, "VID: write %08x to invalid or unimplemented memory-mapped port %05x\n",data,0xcff80+offset); + break; } } @@ -383,12 +394,12 @@ uint8_t towns_state::towns_video_440_r(offs_t offset) case 0x00: return m_video.towns_crtc_sel; case 0x02: -// logerror("CRTC: reading register %i (0x442) [%04x]\n",towns_crtc_sel,towns_crtc_reg[towns_crtc_sel]); + LOGMASKED(LOG_CRTC, "CRTC: reading register %i (0x442) [%04x]\n", m_video.towns_crtc_sel, m_video.towns_crtc_reg[m_video.towns_crtc_sel]); if(m_video.towns_crtc_sel == 30) return 0x00; return m_video.towns_crtc_reg[m_video.towns_crtc_sel] & 0x00ff; case 0x03: -// logerror("CRTC: reading register %i (0x443) [%04x]\n",towns_crtc_sel,towns_crtc_reg[towns_crtc_sel]); + LOGMASKED(LOG_CRTC, "CRTC: reading register %i (0x443) [%04x]\n", m_video.towns_crtc_sel, m_video.towns_crtc_reg[m_video.towns_crtc_sel]); if(m_video.towns_crtc_sel == 30) { // check video position @@ -414,7 +425,7 @@ uint8_t towns_state::towns_video_440_r(offs_t offset) case 0x08: return m_video.towns_video_sel; case 0x0a: - if(LOG_VID) logerror("Video: reading register %i (0x44a) [%02x]\n",m_video.towns_video_sel,m_video.towns_video_reg[m_video.towns_video_sel]); + LOGMASKED(LOG_VID, "Video: reading register %i (0x44a) [%02x]\n", m_video.towns_video_sel, m_video.towns_video_reg[m_video.towns_video_sel]); return m_video.towns_video_reg[m_video.towns_video_sel]; case 0x0c: if(m_video.towns_dpmd_flag != 0) @@ -428,7 +439,7 @@ uint8_t towns_state::towns_video_440_r(offs_t offset) case 0x10: return m_video.towns_sprite_sel; case 0x12: - if(LOG_VID) logerror("SPR: reading register %i (0x452) [%02x]\n",m_video.towns_sprite_sel,m_video.towns_sprite_reg[m_video.towns_sprite_sel]); + LOGMASKED(LOG_VID, "SPR: reading register %i (0x452) [%02x]\n", m_video.towns_sprite_sel, m_video.towns_sprite_reg[m_video.towns_sprite_sel]); if(m_video.towns_sprite_sel == 6) return m_video.towns_sprite_page & 0x01 ? 0x10 : 0; return m_video.towns_sprite_reg[m_video.towns_sprite_sel]; @@ -441,7 +452,7 @@ uint8_t towns_state::towns_video_440_r(offs_t offset) return m_vram_mask[idx]; } //default: - //if(LOG_VID) logerror("VID: read port %04x\n",offset+0x440); + //LOGMASKED(LOG_VID, "VID: read port %04x\n", offset + 0x440); } return 0x00; } @@ -454,13 +465,13 @@ void towns_state::towns_video_440_w(offs_t offset, uint8_t data) m_video.towns_crtc_sel = data; break; case 0x02: -// logerror("CRTC: writing register %i (0x442) [%02x]\n",towns_crtc_sel,data); + LOGMASKED(LOG_CRTC, "CRTC: writing register %i (0x442) [%02x]\n", m_video.towns_crtc_sel, data); m_video.towns_crtc_reg[m_video.towns_crtc_sel] = (m_video.towns_crtc_reg[m_video.towns_crtc_sel] & 0xff00) | data; towns_crtc_refresh_mode(); break; case 0x03: -// logerror("CRTC: writing register %i (0x443) [%02x]\n",towns_crtc_sel,data); + LOGMASKED(LOG_CRTC, "CRTC: writing register %i (0x443) [%02x]\n", m_video.towns_crtc_sel, data); if((m_video.towns_crtc_sel == 21) && (m_video.towns_sprite_reg[1] & 0x80)) { m_video.towns_crtc_reg[m_video.towns_crtc_sel] = @@ -475,14 +486,14 @@ void towns_state::towns_video_440_w(offs_t offset, uint8_t data) m_video.towns_video_sel = data & 0x01; break; case 0x0a: - logerror("Video: writing register %i (0x44a) [%02x]\n",m_video.towns_video_sel,data); + LOG("Video: writing register %i (0x44a) [%02x]\n", m_video.towns_video_sel, data); m_video.towns_video_reg[m_video.towns_video_sel] = data; break; case 0x10: m_video.towns_sprite_sel = data & 0x07; break; case 0x12: - logerror("SPR: writing register %i (0x452) [%02x]\n",m_video.towns_sprite_sel,data); + LOG("SPR: writing register %i (0x452) [%02x]\n", m_video.towns_sprite_sel, data); if(m_video.towns_sprite_sel == 6) m_video.towns_sprite_page = data & 0x80 ? 1 : 0; else @@ -499,13 +510,14 @@ void towns_state::towns_video_440_w(offs_t offset, uint8_t data) break; } default: - if(LOG_VID) logerror("VID: wrote 0x%02x to port %04x\n",data,offset+0x440); + LOGMASKED(LOG_VID, "VID: wrote 0x%02x to port %04x\n", data, offset + 0x440); + break; } } uint8_t towns_state::towns_video_5c8_r(offs_t offset) { - //if(LOG_VID) logerror("VID: read port %04x\n",offset+0x5c8); + //LOGMASKED(LOG_VID, "VID: read port %04x\n",offset+0x5c8); switch(offset) { case 0x00: // 0x5c8 - disable TVRAM? @@ -526,11 +538,11 @@ void towns_state::towns_video_5c8_w(offs_t offset, uint8_t data) { case 0x02: // 0x5ca - VSync clear? m_pic_slave->ir3_w(0); - if(IRQ_LOG) logerror("PIC: IRQ11 (VSync) set low\n"); + LOGMASKED(LOG_IRQ, "PIC: IRQ11 (VSync) set low\n"); //towns_vblank_flag = 0; break; } - if(LOG_VID) logerror("VID: wrote 0x%02x to port %04x\n",data,offset+0x5c8); + LOGMASKED(LOG_VID, "VID: wrote 0x%02x to port %04x\n",data,offset+0x5c8); } void towns_state::towns_update_palette() @@ -571,7 +583,7 @@ uint8_t towns_state::towns_video_fd90_r(offs_t offset) pal = m_palette; else pal = m_palette16[(m_video.towns_video_reg[1] & 0x20) >> 5]; -// if(LOG_VID) logerror("VID: read port %04x\n",offset+0xfd90); +// LOGMASKED(LOG_VID, "VID: read port %04x\n",offset+0xfd90); switch(offset) { case 0x00: @@ -638,7 +650,7 @@ void towns_state::towns_video_fd90_w(offs_t offset, uint8_t data) m_video.towns_layer_ctrl = data; break; } - if(LOG_VID) logerror("VID: wrote 0x%02x to port %04x\n",data,offset+0xfd90); + LOGMASKED(LOG_VID, "VID: wrote 0x%02x to port %04x\n",data,offset+0xfd90); } uint8_t towns_state::towns_video_ff81_r() @@ -651,7 +663,7 @@ void towns_state::towns_video_ff81_w(uint8_t data) m_video.towns_vram_wplane = data & 0x0f; m_video.towns_vram_rplane = (data & 0xc0) >> 6; towns_update_video_banks(); - logerror("VID: VRAM wplane select (I/O) = 0x%02x\n",m_video.towns_vram_wplane); + LOG("VID: VRAM wplane select (I/O) = 0x%02x\n",m_video.towns_vram_wplane); } uint8_t towns_state::towns_video_unknown_r() @@ -1022,20 +1034,16 @@ TIMER_CALLBACK_MEMBER(towns_state::draw_sprites) { poffset = (attr & 0x3ff) << 7; coffset = (colour & 0xfff) << 5; -#ifdef SPR_DEBUG - logerror("Sprite4 #%i, X %i Y %i Attr %04x Col %04x Poff %08x Coff %08x\n", + LOGMASKED(LOG_SPR, "Sprite4 #%i, X %i Y %i Attr %04x Col %04x Poff %08x Coff %08x\n", n,x,y,attr,colour,poffset,coffset); -#endif if(!(colour & 0x2000)) render_sprite_4((poffset)&0x1ffff,coffset,x,y,xflip,yflip,xhalfsize,yhalfsize,rotation,rect); } else { poffset = (attr & 0x3ff) << 7; -#ifdef SPR_DEBUG - logerror("Sprite16 #%i, X %i Y %i Attr %04x Col %04x Poff %08x\n", + LOGMASKED(LOG_SPR, "Sprite16 #%i, X %i Y %i Attr %04x Col %04x Poff %08x\n", n,x,y,attr,colour,poffset); -#endif if(!(colour & 0x2000)) render_sprite_16((poffset)&0x1ffff,x,y,xflip,yflip,xhalfsize,yhalfsize,rotation,rect); } @@ -1474,14 +1482,14 @@ TIMER_CALLBACK_MEMBER(towns_state::towns_vblank_end) { // here we'll clear the vsync signal, I presume it goes low on it's own eventually m_pic_slave->ir3_w(0); // IRQ11 = VSync - if(IRQ_LOG) logerror("PIC: IRQ11 (VSync) set low\n"); + LOGMASKED(LOG_IRQ, "PIC: IRQ11 (VSync) set low\n"); m_video.towns_vblank_flag = 0; } INTERRUPT_GEN_MEMBER(towns_state::towns_vsync_irq) { m_pic_slave->ir3_w(1); // IRQ11 = VSync - if(IRQ_LOG) logerror("PIC: IRQ11 (VSync) set high\n"); + LOGMASKED(LOG_IRQ, "PIC: IRQ11 (VSync) set high\n"); m_video.towns_vblank_flag = 1; m_video.vblank_end_timer->adjust(m_screen->time_until_vblank_end()); if(m_video.towns_tvram_enable) diff --git a/src/mame/funtech/supracan.cpp b/src/mame/funtech/supracan.cpp index 6cf840e79aa..baf2812ddf5 100644 --- a/src/mame/funtech/supracan.cpp +++ b/src/mame/funtech/supracan.cpp @@ -87,6 +87,27 @@ DEBUG TRICKS: #include "speaker.h" #include "tilemap.h" +#define LOG_UNKNOWNS (1U << 1) +#define LOG_DMA (1U << 2) +#define LOG_SPRDMA (1U << 3) +#define LOG_SPRITES (1U << 4) +#define LOG_TILEMAP0 (1U << 5) +#define LOG_TILEMAP1 (1U << 6) +#define LOG_TILEMAP2 (1U << 7) +#define LOG_ROZ (1U << 8) +#define LOG_HFVIDEO (1U << 9) +#define LOG_IRQS (1U << 10) +#define LOG_SOUND (1U << 11) +#define LOG_HFUNKNOWNS (1U << 12) +#define LOG_68K_SOUND (1U << 13) +#define LOG_CONTROLS (1U << 14) +#define LOG_VIDEO (LOG_SPRDMA | LOG_SPRITES | LOG_TILEMAP0 | LOG_TILEMAP1 | LOG_TILEMAP2 | LOG_ROZ) +#define LOG_ALL (LOG_UNKNOWNS | LOG_HFUNKNOWNS | LOG_DMA | LOG_VIDEO | LOG_HFVIDEO | LOG_IRQS | LOG_SOUND | LOG_68K_SOUND | LOG_CONTROLS) +#define LOG_DEFAULT (LOG_ALL & ~(LOG_HFVIDEO | LOG_HFUNKNOWNS)) + +#define VERBOSE (LOG_UNKNOWNS | LOG_SOUND | LOG_DMA) +#include "logmacro.h" + namespace { @@ -97,27 +118,6 @@ namespace { #define DEBUG_PRIORITY (0) #define DEBUG_PRIORITY_INDEX (0) // 0-3 -#define LOG_UNKNOWNS (1 << 0) -#define LOG_DMA (1 << 1) -#define LOG_SPRDMA (1 << 2) -#define LOG_SPRITES (1 << 3) -#define LOG_TILEMAP0 (1 << 4) -#define LOG_TILEMAP1 (1 << 5) -#define LOG_TILEMAP2 (1 << 6) -#define LOG_ROZ (1 << 7) -#define LOG_HFVIDEO (1 << 8) -#define LOG_IRQS (1 << 9) -#define LOG_SOUND (1 << 10) -#define LOG_HFUNKNOWNS (1 << 11) -#define LOG_68K_SOUND (1 << 12) -#define LOG_CONTROLS (1 << 13) -#define LOG_VIDEO (LOG_SPRDMA | LOG_SPRITES | LOG_TILEMAP0 | LOG_TILEMAP1 | LOG_TILEMAP2 | LOG_ROZ) -#define LOG_ALL (LOG_UNKNOWNS | LOG_HFUNKNOWNS | LOG_DMA | LOG_VIDEO | LOG_HFVIDEO | LOG_IRQS | LOG_SOUND | LOG_68K_SOUND | LOG_CONTROLS) -#define LOG_DEFAULT (LOG_ALL & ~(LOG_HFVIDEO | LOG_HFUNKNOWNS)) - -#define VERBOSE (LOG_UNKNOWNS | LOG_SOUND | LOG_DMA) -#include "logmacro.h" - class supracan_state : public driver_device { public: diff --git a/src/mame/funworld/supercrd.cpp b/src/mame/funworld/supercrd.cpp index 156700de2c3..c5cc56de3b9 100644 --- a/src/mame/funworld/supercrd.cpp +++ b/src/mame/funworld/supercrd.cpp @@ -198,7 +198,7 @@ // configurable logging -#define LOG_UNKOPCODES (1U << 1) +#define LOG_UNKOPCODES (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_UNKOPCODES) diff --git a/src/mame/gamepark/gp32.cpp b/src/mame/gamepark/gp32.cpp index 2a84059509f..cb1f3a71818 100644 --- a/src/mame/gamepark/gp32.cpp +++ b/src/mame/gamepark/gp32.cpp @@ -40,7 +40,6 @@ #include "softlist_dev.h" #include "speaker.h" -#define LOG_GENERAL (1U << 0) #define LOG_STARTSTOP (1U << 1) #define LOG_TIMER (1U << 2) #define LOG_VRAM (1U << 3) @@ -269,7 +268,7 @@ TIMER_CALLBACK_MEMBER(gp32_state::s3c240x_lcd_timer_exp) case BPPMODE_TFT_04 : s3c240x_lcd_render_04(); break; case BPPMODE_TFT_08 : s3c240x_lcd_render_08(); break; case BPPMODE_TFT_16 : s3c240x_lcd_render_16(); break; - default : LOGMASKED(LOG_GENERAL, "s3c240x_lcd_timer_exp: bppmode %d not supported\n", m_s3c240x_lcd.bppmode); break; + default : LOG("s3c240x_lcd_timer_exp: bppmode %d not supported\n", m_s3c240x_lcd.bppmode); break; } if ((m_s3c240x_lcd.vpos == 0) && (m_s3c240x_lcd.hpos == 0)) break; } @@ -392,7 +391,7 @@ void gp32_state::s3c240x_lcd_palette_w(offs_t offset, uint32_t data, uint32_t me COMBINE_DATA(&m_s3c240x_lcd_palette[offset]); if (mem_mask != 0xffffffff) { - LOGMASKED(LOG_GENERAL, "s3c240x_lcd_palette_w: unknown mask %08x\n", mem_mask); + LOG("s3c240x_lcd_palette_w: unknown mask %08x\n", mem_mask); } m_palette->set_pen_color( offset, s3c240x_get_color_5551( data & 0xFFFF)); } diff --git a/src/mame/gameplan/enigma2.cpp b/src/mame/gameplan/enigma2.cpp index 4bb3e66cf14..735ef306a22 100644 --- a/src/mame/gameplan/enigma2.cpp +++ b/src/mame/gameplan/enigma2.cpp @@ -132,10 +132,13 @@ DIP Switches #include "screen.h" #include "speaker.h" +#define LOG_PROT (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" -namespace { -#define LOG_PROT (0) +namespace { /* these values provide a fairly low refresh rate of around 53Hz, but they were derived from the schematics. The horizontal synch chain @@ -475,7 +478,7 @@ uint8_t enigma2_state::dip_switch_r(offs_t offset) { uint8_t ret = 0x00; - if (LOG_PROT) logerror("DIP SW Read: %x at %x (prot data %x)\n", offset, m_maincpu->pc(), m_protection_data); + LOGMASKED(LOG_PROT, "DIP SW Read: %x at %x (prot data %x)\n", offset, m_maincpu->pc(), m_protection_data); switch (offset) { case 0x01: @@ -523,7 +526,7 @@ uint8_t enigma2_state::sound_latch_r() void enigma2_state::protection_data_w(uint8_t data) { - if (LOG_PROT) logerror("%s: Protection Data Write: %x\n", machine().describe_context(), data); + LOGMASKED(LOG_PROT, "%s: Protection Data Write: %x\n", machine().describe_context(), data); m_protection_data = data; } diff --git a/src/mame/gridcomp/gridcomp.cpp b/src/mame/gridcomp/gridcomp.cpp index 1f33e36ab01..722deb81b22 100644 --- a/src/mame/gridcomp/gridcomp.cpp +++ b/src/mame/gridcomp/gridcomp.cpp @@ -83,9 +83,8 @@ #include "softlist.h" #include "speaker.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_KEYBOARD (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_KEYBOARD (1U << 1) +#define LOG_DEBUG (1U << 2) #define VERBOSE (LOG_GENERAL) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/hp/hp48_m.cpp b/src/mame/hp/hp48_m.cpp index ebc50cdae3d..fb4f09354d2 100644 --- a/src/mame/hp/hp48_m.cpp +++ b/src/mame/hp/hp48_m.cpp @@ -16,18 +16,11 @@ #include "screen.h" +#define LOG_SERIAL (1U << 1) +#define LOG_INVALID (1U << 2) -/*************************************************************************** - DEBUGGING -***************************************************************************/ - - -#define VERBOSE 0 -#define VERBOSE_SERIAL 0 - -#define LOG(x) do { if (VERBOSE) logerror x; } while (0) -#define LOG_SERIAL(x) do { if (VERBOSE_SERIAL) logerror x; } while (0) - +#define VERBOSE (LOG_INVALID) +#include "logmacro.h" /*************************************************************************** @@ -80,7 +73,7 @@ void hp48_state::pulse_irq(int irq_line) /* end of receive event */ TIMER_CALLBACK_MEMBER(hp48_state::rs232_byte_recv_cb) { - LOG_SERIAL(("%f hp48_state::rs232_byte_recv_cb: end of receive, data=%02x\n", machine().time().as_double(), param)); + LOGMASKED(LOG_SERIAL, "%f hp48_state::rs232_byte_recv_cb: end of receive, data=%02x\n", machine().time().as_double(), param); m_io[0x14] = param & 0xf; /* receive zone */ m_io[0x15] = param >> 4; @@ -97,7 +90,7 @@ TIMER_CALLBACK_MEMBER(hp48_state::rs232_byte_recv_cb) /* outside world initiates a receive event */ void hp48_state::rs232_start_recv_byte(uint8_t data) { - LOG_SERIAL(("%f hp48_state::rs232_start_recv_byte: start receiving, data=%02x\n", machine().time().as_double(), data)); + LOGMASKED(LOG_SERIAL, "%f hp48_state::rs232_start_recv_byte: start receiving, data=%02x\n", machine().time().as_double(), data); m_io[0x11] |= 2; /* set byte receiving */ @@ -115,7 +108,7 @@ void hp48_state::rs232_start_recv_byte(uint8_t data) /* end of send event */ TIMER_CALLBACK_MEMBER(hp48_state::rs232_byte_sent_cb) { - LOG_SERIAL(("%f hp48_state::rs232_byte_sent_cb: end of send, data=%02x\n", machine().time().as_double(), param)); + LOGMASKED(LOG_SERIAL, "%f hp48_state::rs232_byte_sent_cb: end of send, data=%02x\n", machine().time().as_double(), param); m_io[0x12] &= ~3; /* clear byte sending and buffer full */ @@ -131,7 +124,7 @@ void hp48_state::rs232_send_byte() { uint8_t data = HP48_IO_8(0x16); /* byte to send */ - LOG_SERIAL(("%s %f hp48_state::rs232_send_byte: start sending, data=%02x\n", machine().describe_context(), machine().time().as_double(), data)); + LOGMASKED(LOG_SERIAL, "%s %f hp48_state::rs232_send_byte: start sending, data=%02x\n", machine().describe_context(), machine().time().as_double(), data); /* set byte sending and send buffer full */ m_io[0x12] |= 3; @@ -149,7 +142,7 @@ void hp48_state::rs232_send_byte() /* CPU sets OUT register (keyboard + beeper) */ void hp48_state::reg_out(uint32_t data) { - LOG(("%s %f hp48_state::reg_out: %03x\n", machine().describe_context(), machine().time().as_double(), data)); + LOG("%s %f hp48_state::reg_out: %03x\n", machine().describe_context(), machine().time().as_double(), data); /* bits 0-8: keyboard lines */ m_out = data & 0x1ff; @@ -185,7 +178,7 @@ int hp48_state::get_in() uint32_t hp48_state::reg_in() { int in = get_in(); - LOG(("%s %f hp48_state::reg_in: %04x\n", machine().describe_context(), machine().time().as_double(), in)); + LOG("%s %f hp48_state::reg_in: %04x\n", machine().describe_context(), machine().time().as_double(), in); return in; } @@ -197,7 +190,7 @@ void hp48_state::update_kdn() /* interrupt on raising edge */ if (in && !m_kdn) { - LOG(("%f hp48_state::update_kdn: interrupt\n", machine().time().as_double())); + LOG("%f hp48_state::update_kdn: interrupt\n", machine().time().as_double()); m_io[0x19] |= 8; // service request pulse_irq(SATURN_WAKEUP_LINE); pulse_irq(SATURN_IRQ_LINE); @@ -212,7 +205,7 @@ TIMER_CALLBACK_MEMBER(hp48_state::kbd_cb) /* NMI for ON key */ if (ioport( "ON" )->read()) { - LOG(("%f hp48_state::kbd_cb: keyboard interrupt, on key\n", machine().time().as_double())); + LOG("%f hp48_state::kbd_cb: keyboard interrupt, on key\n", machine().time().as_double()); m_io[0x19] |= 8; // set service request pulse_irq(SATURN_WAKEUP_LINE); pulse_irq(SATURN_NMI_LINE); @@ -226,7 +219,7 @@ TIMER_CALLBACK_MEMBER(hp48_state::kbd_cb) /* RSI opcode */ WRITE_LINE_MEMBER( hp48_state::rsi ) { - LOG(("%s %f hp48_state::rsi\n", machine().describe_context(), machine().time().as_double())); + LOG("%s %f hp48_state::rsi\n", machine().describe_context(), machine().time().as_double()); // enables interrupts on key repeat (normally, there is only one interrupt, when the key is pressed) m_kdn = 0; @@ -265,7 +258,7 @@ void hp48_state::update_annunciators() void hp48_state::io_w(offs_t offset, uint8_t data) { - LOG(("%s %f hp48_state::io_w: off=%02x data=%x\n", machine().describe_context(), machine().time().as_double(), offset, data)); + LOG("%s %f hp48_state::io_w: off=%02x data=%x\n", machine().describe_context(), machine().time().as_double(), offset, data); switch (offset) { @@ -307,12 +300,12 @@ void hp48_state::io_w(offs_t offset, uint8_t data) /* cards */ case 0x0e: - LOG(("%s: card control write %02x\n", machine().describe_context(), data)); + LOG("%s: card control write %02x\n", machine().describe_context(), data); /* bit 0: software interrupt */ if (data & 1) { - LOG(("%f hp48_state::io_w: software interrupt requested\n", machine().time().as_double())); + LOG("%f hp48_state::io_w: software interrupt requested\n", machine().time().as_double()); pulse_irq(SATURN_IRQ_LINE); data &= ~1; } @@ -325,7 +318,7 @@ void hp48_state::io_w(offs_t offset, uint8_t data) break; case 0x0f: - LOG(("%s: card info write %02x\n", machine().describe_context(), data)); + LOG("%s: card info write %02x\n", machine().describe_context(), data); m_io[0x0f] = data; break; @@ -446,7 +439,7 @@ uint8_t hp48_state::io_r(offs_t offset) /* cards */ case 0x0e: /* detection */ data = m_io[0x0e]; - LOG(( "%s: card control read %02x\n", machine().describe_context(), data )); + LOG("%s: card control read %02x\n", machine().describe_context(), data); break; case 0x0f: /* card info */ data = 0; @@ -480,14 +473,14 @@ uint8_t hp48_state::io_r(offs_t offset) data |= 8; } } - LOG(( "%s: card info read %02x\n", machine().describe_context(), data )); + LOG("%s: card info read %02x\n", machine().describe_context(), data); break; default: data = m_io[offset]; } - LOG(("%s %f hp48_state::io_r: off=%02x data=%x\n", machine().describe_context(), machine().time().as_double(), offset, data)); + LOG("%s %f hp48_state::io_r: off=%02x data=%x\n", machine().describe_context(), machine().time().as_double(), offset, data); return data; } @@ -510,7 +503,7 @@ uint8_t hp48_state::bank_r(offs_t offset) offset &= 0x7e; if ( m_bank_switch != offset ) { - LOG(( "%s %f hp48_state::bank_r: off=%03x\n", machine().describe_context(), machine().time().as_double(), offset )); + LOG("%s %f hp48_state::bank_r: off=%03x\n", machine().describe_context(), machine().time().as_double(), offset); m_bank_switch = offset; apply_modules(); } @@ -523,7 +516,7 @@ void hp48_state::hp49_bank_w(offs_t offset, uint8_t data) offset &= 0x7e; if ( m_bank_switch != offset ) { - LOG(("%s %f hp49_bank_w: off=%03x\n", machine().describe_context(), machine().time().as_double(), offset)); + LOG("%s %f hp49_bank_w: off=%03x\n", machine().describe_context(), machine().time().as_double(), offset); m_bank_switch = offset; apply_modules(); } @@ -542,7 +535,7 @@ TIMER_CALLBACK_MEMBER(hp48_state::timer1_cb) /* wake-up on carry */ if ((m_io[0x2e] & 4) && (m_timer1 == 0xf)) { - LOG(("wake-up on timer1\n")); + LOG("wake-up on timer1\n"); m_io[0x2e] |= 8; /* set service request */ m_io[0x18] |= 4; /* set service request */ pulse_irq(SATURN_WAKEUP_LINE); @@ -550,7 +543,7 @@ TIMER_CALLBACK_MEMBER(hp48_state::timer1_cb) /* interrupt on carry */ if ((m_io[0x2e] & 2) && (m_timer1 == 0xf)) { - LOG(("generate timer1 interrupt\n")); + LOG("generate timer1 interrupt\n"); m_io[0x2e] |= 8; /* set service request */ m_io[0x18] |= 4; /* set service request */ pulse_irq(SATURN_NMI_LINE); @@ -566,7 +559,7 @@ TIMER_CALLBACK_MEMBER(hp48_state::timer2_cb) /* wake-up on carry */ if ((m_io[0x2f] & 4) && (m_timer2 == 0xffffffff)) { - LOG(("wake-up on timer2\n")); + LOG("wake-up on timer2\n"); m_io[0x2f] |= 8; /* set service request */ m_io[0x18] |= 4; /* set service request */ pulse_irq(SATURN_WAKEUP_LINE); @@ -574,7 +567,7 @@ TIMER_CALLBACK_MEMBER(hp48_state::timer2_cb) /* interrupt on carry */ if ((m_io[0x2f] & 2) && (m_timer2 == 0xffffffff)) { - LOG(("generate timer2 interrupt\n")); + LOG("generate timer2 interrupt\n"); m_io[0x2f] |= 8; /* set service request */ m_io[0x18] |= 4; /* set service request */ pulse_irq(SATURN_NMI_LINE); @@ -636,8 +629,8 @@ void hp48_state::apply_modules() { int bank_lo = (m_bank_switch >> 5) & 3; int bank_hi = (m_bank_switch >> 1) & 15; - LOG(("hp48_state::apply_modules: low ROM bank is %i\n", bank_lo)); - LOG(("hp48_state::apply_modules: high ROM bank is %i\n", bank_hi)); + LOG("hp48_state::apply_modules: low ROM bank is %i\n", bank_lo); + LOG("hp48_state::apply_modules: high ROM bank is %i\n", bank_hi); if (m_rom) { space.install_rom(0x00000, 0x3ffff, 0x80000, m_rom + bank_lo * 0x40000); @@ -650,7 +643,7 @@ void hp48_state::apply_modules() if (m_port[1].found() && m_port[1]->port_size() > 0) { int off = (m_bank_switch << 16) % m_port[1]->port_size(); - LOG(("hp48_state::apply_modules: port 2 offset is %i\n", off)); + LOG("hp48_state::apply_modules: port 2 offset is %i\n", off); m_modules[HP48_NCE3].data = m_port[1]->port_data() + off; } @@ -658,7 +651,7 @@ void hp48_state::apply_modules() if (m_io[0x29] & 8) { /* A19 */ - LOG(("hp48_state::apply_modules: A19 enabled, NCE3 disabled\n")); + LOG("hp48_state::apply_modules: A19 enabled, NCE3 disabled\n"); nce3_enable = 0; if (m_rom) space.install_rom(0, 0xfffff, m_rom); @@ -667,7 +660,7 @@ void hp48_state::apply_modules() { /* NCE3 */ nce3_enable = m_bank_switch >> 6; - LOG(("hp48_apply_modules: A19 disabled, NCE3 %s\n", nce3_enable ? "enabled" : "disabled")); + LOG("hp48_apply_modules: A19 disabled, NCE3 %s\n", nce3_enable ? "enabled" : "disabled"); if (m_rom) space.install_rom(0, 0x7ffff, 0x80000, m_rom); } @@ -695,7 +688,7 @@ void hp48_state::apply_modules() /* our code assumes that the 20-bit select_mask is all 1s followed by all 0s */ if (nselect_mask & (nselect_mask + 1)) { - logerror("hp48_apply_modules: invalid mask %05x for module %s\n", select_mask, hp48_module_names[i]); + LOGMASKED(LOG_INVALID, "hp48_apply_modules: invalid mask %05x for module %s\n", select_mask, hp48_module_names[i]); continue; } @@ -730,7 +723,7 @@ void hp48_state::apply_modules() } } - LOG(("hp48_apply_modules: module %s configured at %05x-%05x, mirror %05x\n", hp48_module_names[i], base, end, mirror)); + LOG("hp48_apply_modules: module %s configured at %05x-%05x, mirror %05x\n", hp48_module_names[i], base, end, mirror); if (i == 0) { @@ -764,7 +757,7 @@ void hp48_state::reset_modules() /* RESET opcode */ WRITE_LINE_MEMBER( hp48_state::mem_reset ) { - LOG(("%s %f hp48_state::mem_reset\n", machine().describe_context(), machine().time().as_double())); + LOG("%s %f hp48_state::mem_reset\n", machine().describe_context(), machine().time().as_double()); reset_modules(); } @@ -772,7 +765,7 @@ WRITE_LINE_MEMBER( hp48_state::mem_reset ) /* CONFIG opcode */ void hp48_state::mem_config(uint32_t data) { - LOG(("%s %f hp48_state::mem_config: %05x\n", machine().describe_context(), machine().time().as_double(), data)); + LOG("%s %f hp48_state::mem_config: %05x\n", machine().describe_context(), machine().time().as_double(), data); /* find the highest priority unconfigured module (except non-configurable NCE1)... */ for (int i = 0; i < 5; i++) @@ -790,7 +783,7 @@ void hp48_state::mem_config(uint32_t data) { m_modules[i].base = data & m_modules[i].mask; m_modules[i].state = HP48_MODULE_CONFIGURED; - LOG(("hp48_mem_config: module %s configured base=%05x, mask=%05x\n", hp48_module_names[i], m_modules[i].base, m_modules[i].mask)); + LOG("hp48_mem_config: module %s configured base=%05x, mask=%05x\n", hp48_module_names[i], m_modules[i].base, m_modules[i].mask); apply_modules(); break; } @@ -801,7 +794,7 @@ void hp48_state::mem_config(uint32_t data) /* UNCFG opcode */ void hp48_state::mem_unconfig(uint32_t data) { - LOG(("%s %f hp48_state::mem_unconfig: %05x\n", machine().describe_context(), machine().time().as_double(), data)); + LOG("%s %f hp48_state::mem_unconfig: %05x\n", machine().describe_context(), machine().time().as_double(), data); /* find the highest priority fully configured module at address v (except NCE1)... */ for (int i = 0; i < 5; i++) @@ -810,7 +803,7 @@ void hp48_state::mem_unconfig(uint32_t data) if (m_modules[i].state == HP48_MODULE_CONFIGURED && (m_modules[i].base == (data & m_modules[i].mask))) { m_modules[i].state = i > 0 ? HP48_MODULE_UNCONFIGURED : HP48_MODULE_MASK_KNOWN; - LOG(("hp48_mem_unconfig: module %s\n", hp48_module_names[i])); + LOG("hp48_mem_unconfig: module %s\n", hp48_module_names[i]); apply_modules(); break; } @@ -841,7 +834,7 @@ uint32_t hp48_state::mem_id() } } - LOG(("%s %f mem_id = %02x\n", machine().describe_context(), machine().time().as_double(), data)); + LOG("%s %f mem_id = %02x\n", machine().describe_context(), machine().time().as_double(), data); return data; /* everything is configured */ } @@ -889,7 +882,7 @@ void hp48_state::encode_nibble(uint8_t* dst, uint8_t* src, int size) void hp48_state::init_hp48() { - LOG(( "hp48: driver init called\n" )); + LOG("hp48: driver init called\n"); for (int i = 0; i < 6; i++) { m_modules[i].off_mask = 0x00fff; // 2 KB @@ -906,7 +899,7 @@ void hp48_state::init_hp48() void hp48_state::machine_reset() { - LOG(("hp48: machine reset called\n")); + LOG("hp48: machine reset called\n"); m_bank_switch = 0; m_cur_screen = 0; reset_modules(); @@ -915,7 +908,7 @@ void hp48_state::machine_reset() void hp48_state::base_machine_start(hp48_models model) { - LOG(( "hp48_state::machine_start: model %i\n", model )); + LOG("hp48_state::machine_start: model %i\n", model); m_model = model; diff --git a/src/mame/hp/hp95lx.cpp b/src/mame/hp/hp95lx.cpp index 08faa3f0423..5ca17474d21 100644 --- a/src/mame/hp/hp95lx.cpp +++ b/src/mame/hp/hp95lx.cpp @@ -76,9 +76,8 @@ #include "speaker.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_KEYBOARD (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_KEYBOARD (1U << 1) +#define LOG_DEBUG (1U << 2) //#define VERBOSE (LOG_GENERAL) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/hp/jornada.cpp b/src/mame/hp/jornada.cpp index 9201a4d2b2f..9e3d9d17f4f 100644 --- a/src/mame/hp/jornada.cpp +++ b/src/mame/hp/jornada.cpp @@ -25,7 +25,7 @@ #include "emupal.h" #include "speaker.h" -#define LOG_MCU (1 << 1) +#define LOG_MCU (1U << 1) #define LOG_ALL (LOG_MCU) #define VERBOSE (0) diff --git a/src/mame/ibm/ibm6580.cpp b/src/mame/ibm/ibm6580.cpp index 9147bb4239f..5c0bd315252 100644 --- a/src/mame/ibm/ibm6580.cpp +++ b/src/mame/ibm/ibm6580.cpp @@ -170,9 +170,8 @@ Notes on floppy drive: #include "ibm6580.lh" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_KEYBOARD (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_KEYBOARD (1U << 1) +#define LOG_DEBUG (1U << 2) //#define VERBOSE (LOG_DEBUG) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/ibm/ibm6580_fdc.cpp b/src/mame/ibm/ibm6580_fdc.cpp index 0cc35e56532..0d563371304 100644 --- a/src/mame/ibm/ibm6580_fdc.cpp +++ b/src/mame/ibm/ibm6580_fdc.cpp @@ -4,8 +4,7 @@ #include "ibm6580_fdc.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_DEBUG (1U << 1) +#define LOG_DEBUG (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_DEBUG) //#define LOG_OUTPUT_FUNC printf diff --git a/src/mame/ibm/ibm6580_kbd.cpp b/src/mame/ibm/ibm6580_kbd.cpp index b08095e4a9a..411a84f4c77 100644 --- a/src/mame/ibm/ibm6580_kbd.cpp +++ b/src/mame/ibm/ibm6580_kbd.cpp @@ -4,8 +4,7 @@ #include "ibm6580_kbd.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_DEBUG (1U << 1) +#define LOG_DEBUG (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_DEBUG) //#define LOG_OUTPUT_FUNC printf diff --git a/src/mame/ibm/rosetta.cpp b/src/mame/ibm/rosetta.cpp index 2b32237382f..082eff00335 100644 --- a/src/mame/ibm/rosetta.cpp +++ b/src/mame/ibm/rosetta.cpp @@ -18,7 +18,6 @@ #include "emu.h" #include "rosetta.h" -#define LOG_GENERAL (1U << 0) #define LOG_TLB (1U << 1) #define LOG_RELOAD (1U << 2) #define LOG_ECC (1U << 3) diff --git a/src/mame/ibm/rtpc.cpp b/src/mame/ibm/rtpc.cpp index bf215eb0c77..5dcf400b045 100644 --- a/src/mame/ibm/rtpc.cpp +++ b/src/mame/ibm/rtpc.cpp @@ -105,7 +105,6 @@ #include "imagedev/floppy.h" #include "formats/pc_dsk.h" -#define LOG_GENERAL (1U << 0) #define LOG_KLS (1U << 1) //#define VERBOSE (LOG_GENERAL|LOG_KLS) diff --git a/src/mame/ibm/rtpc_iocc.cpp b/src/mame/ibm/rtpc_iocc.cpp index a82912dd9a4..3355f7f4574 100644 --- a/src/mame/ibm/rtpc_iocc.cpp +++ b/src/mame/ibm/rtpc_iocc.cpp @@ -15,7 +15,6 @@ #include "emu.h" #include "rtpc_iocc.h" -#define LOG_GENERAL (1U << 0) #define LOG_DMA (1U << 1) #define LOG_WIDEPIO (1U << 2) diff --git a/src/mame/igs/igs011.cpp b/src/mame/igs/igs011.cpp index ee9df97852c..0d21d37f22d 100644 --- a/src/mame/igs/igs011.cpp +++ b/src/mame/igs/igs011.cpp @@ -76,6 +76,11 @@ Notes: #include "screen.h" #include "speaker.h" +#define LOG_BLITTER (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" + namespace { @@ -297,8 +302,6 @@ private: }; -#define LOG_BLITTER 0 - /*************************************************************************** Video @@ -522,10 +525,8 @@ void igs011_state::igs011_blit_flags_w(offs_t offset, u16 data, u16 mem_mask) COMBINE_DATA(&blitter.flags); -#if LOG_BLITTER - logerror("%06x: blit x %03x, y %03x, w %03x, h %03x, gfx %03x%04x, depth %02x, pen %02x, flags %03x\n", m_maincpu->pc(), - blitter.x,blitter.y,blitter.w,blitter.h,blitter.gfx_hi,blitter.gfx_lo,blitter.depth,blitter.pen,blitter.flags); -#endif + LOGMASKED(LOG_BLITTER, "%06x: blit x %03x, y %03x, w %03x, h %03x, gfx %03x%04x, depth %02x, pen %02x, flags %03x\n", m_maincpu->pc(), + blitter.x,blitter.y,blitter.w,blitter.h,blitter.gfx_hi,blitter.gfx_lo,blitter.depth,blitter.pen,blitter.flags); u8 *dest = m_layer[blitter.flags & 0x0007].get(); const bool opaque = !(blitter.flags & 0x0008); diff --git a/src/mame/igs/pgm.cpp b/src/mame/igs/pgm.cpp index 8fb13291962..5fe2b3d5092 100644 --- a/src/mame/igs/pgm.cpp +++ b/src/mame/igs/pgm.cpp @@ -205,7 +205,7 @@ Notes: #include "screen.h" #include "speaker.h" -#define LOG_Z80 (1U << 1) +#define LOG_Z80 (1U << 1) #define LOG_ALL (LOG_Z80) diff --git a/src/mame/igs/pgmprot_igs027a_type1.cpp b/src/mame/igs/pgmprot_igs027a_type1.cpp index ec897486fe3..006441db156 100644 --- a/src/mame/igs/pgmprot_igs027a_type1.cpp +++ b/src/mame/igs/pgmprot_igs027a_type1.cpp @@ -62,7 +62,7 @@ #include "screen.h" -#define LOG_PROT (1U << 1) +#define LOG_PROT (1U << 1) #define LOG_ALL (LOG_PROT) #define VERBOSE (0) diff --git a/src/mame/igs/pgmprot_igs027a_type2.cpp b/src/mame/igs/pgmprot_igs027a_type2.cpp index 95c8cca04ce..4592a910a7b 100644 --- a/src/mame/igs/pgmprot_igs027a_type2.cpp +++ b/src/mame/igs/pgmprot_igs027a_type2.cpp @@ -36,7 +36,7 @@ #include "pgm.h" #include "pgmprot_igs027a_type2.h" -#define LOG_PROT (1U << 1) +#define LOG_PROT (1U << 1) #define LOG_ALL (LOG_PROT) #define VERBOSE (0) diff --git a/src/mame/igs/pgmprot_igs027a_type3.cpp b/src/mame/igs/pgmprot_igs027a_type3.cpp index 2408896e2b0..13d3f85db5e 100644 --- a/src/mame/igs/pgmprot_igs027a_type3.cpp +++ b/src/mame/igs/pgmprot_igs027a_type3.cpp @@ -47,7 +47,7 @@ #include "pgm.h" #include "pgmprot_igs027a_type3.h" -#define LOG_PROT (1U << 1) +#define LOG_PROT (1U << 1) #define LOG_ALL (LOG_PROT) #define VERBOSE (0) diff --git a/src/mame/intergraph/interpro_ioga.cpp b/src/mame/intergraph/interpro_ioga.cpp index 22e493c4f93..c7681ac7c00 100644 --- a/src/mame/intergraph/interpro_ioga.cpp +++ b/src/mame/intergraph/interpro_ioga.cpp @@ -24,7 +24,6 @@ // enables hacks which allow iogadiag tests to complete but break scsi dma #define IOGA_DMA_DIAG_HACK 0 -#define LOG_GENERAL (1U << 0) #define LOG_NMI (1U << 1) #define LOG_INT (1U << 2) #define LOG_DMA (1U << 3) diff --git a/src/mame/itech/capbowl.cpp b/src/mame/itech/capbowl.cpp index ba198ab2ee2..0136be5c4db 100644 --- a/src/mame/itech/capbowl.cpp +++ b/src/mame/itech/capbowl.cpp @@ -104,7 +104,7 @@ // configurable logging -#define LOG_BLITTER (1U << 1) +#define LOG_BLITTER (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_BLITTER) diff --git a/src/mame/itech/iteagle_fpga.cpp b/src/mame/itech/iteagle_fpga.cpp index 6b914ea1dd3..a5959f05d92 100644 --- a/src/mame/itech/iteagle_fpga.cpp +++ b/src/mame/itech/iteagle_fpga.cpp @@ -4,12 +4,21 @@ #include "iteagle_fpga.h" #include "coreutil.h" -#define LOG_FPGA (0) -#define LOG_SERIAL (0) -#define LOG_RTC (0) -#define LOG_RAM (0) -#define LOG_EEPROM (0) -#define LOG_PERIPH (0) +#define LOG_FPGA (1U << 1) +#define LOG_FPGA_VERBOSE (1U << 2) +#define LOG_SERIAL (1U << 3) +#define LOG_SERIAL_VERBOSE (1U << 4) +#define LOG_LEDSIGN (1U << 5) +#define LOG_MODEM (1U << 6) +#define LOG_RTC (1U << 7) +#define LOG_RAM (1U << 8) +#define LOG_EEPROM (1U << 9) +#define LOG_PERIPH (1U << 10) +#define LOG_UNKNOWN (1U << 11) + +#define VERBOSE (LOG_UNKNOWN) +#include "logmacro.h" + #define AM85C30_TAG "am85c30_0" #define COM1_TAG "com1" @@ -181,8 +190,7 @@ void iteagle_fpga_device::update_sequence(uint32_t data) m_seq = (m_seq>>8) | ((feed&0xff)<<16); m_fpga_regs[offset] = (m_fpga_regs[offset]&0xFFFFFF00) | ((val1 + m_seq_rem1 + m_seq_rem2) & 0xff); } - if (0 && LOG_FPGA) - logerror("%s:fpga update_sequence In: %02X Seq: %06X Out: %02X\n", machine().describe_context(), data, m_seq, m_fpga_regs[offset]&0xff); + LOGMASKED(LOG_FPGA_VERBOSE, "%s:fpga update_sequence In: %02X Seq: %06X Out: %02X\n", machine().describe_context(), data, m_seq, m_fpga_regs[offset]&0xff); } } @@ -209,9 +217,8 @@ void iteagle_fpga_device::update_sequence_eg1(uint32_t data) m_seq = (m_seq>>9) | ((feed&0x1ff)<<15); m_fpga_regs[offset] = (m_fpga_regs[offset]&0xFFFFFF00) | ((val1 + m_seq_rem1 + m_seq_rem2) & 0xff); } - if (0 && LOG_FPGA) - logerror("%s:fpga update_sequence In: %02X Seq: %06X Out: %02X other %02X%02X%02X\n", machine().describe_context(), - data, m_seq, m_fpga_regs[offset]&0xff, m_seq_rem2, m_seq_rem1, val1); + LOGMASKED(LOG_FPGA_VERBOSE, "%s:fpga update_sequence In: %02X Seq: %06X Out: %02X other %02X%02X%02X\n", machine().describe_context(), + data, m_seq, m_fpga_regs[offset]&0xff, m_seq_rem2, m_seq_rem1, val1); } //------------------------------------------------- @@ -229,8 +236,7 @@ TIMER_CALLBACK_MEMBER(iteagle_fpga_device::assert_vblank_irq) //m_fpga_regs[0x04/4] |= 0x02080000; m_fpga_regs[0x04 / 4] |= 0x00080000; m_cpu->set_input_line(m_irq_num, ASSERT_LINE); - if (LOG_FPGA) - logerror("%s:fpga assert_vblank_irq Setting interrupt(%i)\n", machine().describe_context(), m_irq_num); + LOGMASKED(LOG_FPGA, "%s:fpga assert_vblank_irq Setting interrupt(%i)\n", machine().describe_context(), m_irq_num); } WRITE_LINE_MEMBER(iteagle_fpga_device::vblank_update) @@ -247,16 +253,13 @@ WRITE_LINE_MEMBER(iteagle_fpga_device::vblank_update) //m_timer->adjust(m_screen->time_until_pos(std::max(0, m_gun_y - BEAM_DY), std::max(0, m_gun_x - BEAM_DX))); //printf("w: %d h: %d x: %d y: %d\n", visarea.width(), visarea.height(), m_gun_x, m_gun_y); } - if (LOG_FPGA) - logerror("%s:fpga vblank_update Setting interrupt(%i)\n", machine().describe_context(), m_irq_num); + LOGMASKED(LOG_FPGA, "%s:fpga vblank_update Setting interrupt(%i)\n", machine().describe_context(), m_irq_num); } } WRITE_LINE_MEMBER(iteagle_fpga_device::serial_interrupt) { - if (LOG_SERIAL) { - logerror("serial_interrupt: intr(%i) = %i\n", m_serial_irq_num, state); - } + LOGMASKED(LOG_SERIAL, "serial_interrupt: intr(%i) = %i\n", m_serial_irq_num, state); m_cpu->set_input_line(m_serial_irq_num, state); } @@ -278,28 +281,26 @@ uint32_t iteagle_fpga_device::fpga_r(offs_t offset, uint32_t mem_mask) switch (offset) { case 0x00/4: result = (m_in_cb[IO_SYSTEM](0) << 16) | (m_in_cb[IO_IN1](0)); - if (LOG_FPGA && m_prev_reg!=offset) - logerror("%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + if (m_prev_reg != offset) + LOGMASKED(LOG_FPGA, "%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); break; case 0x04/4: result = (result & 0xFF0FFFFF) | ((m_in_cb[IO_SW5](0) & 0xf) << 20); - if (0 && LOG_FPGA && !ACCESSING_BITS_0_7) - logerror("%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + if (!ACCESSING_BITS_0_7) + LOGMASKED(LOG_FPGA_VERBOSE, "%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); break; case 0x08/4: result = (m_tracky_cb(0) << 8) | m_trackx_cb(0); - if (LOG_FPGA && m_prev_reg!=offset) - logerror("%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + if (m_prev_reg!=offset) + LOGMASKED(LOG_FPGA, "%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); break; case 0x14/4: // GUN1-- Interrupt & 0x4==0x00080000 result = (m_gun_y << 16) | (m_gun_x << 0); - if (LOG_FPGA) - logerror("%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + LOGMASKED(LOG_FPGA, "%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); break; case 0x18/4: // Interrupt & 0x4==0x02000000 result = 0; - if (LOG_FPGA) - logerror("%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + LOGMASKED(LOG_FPGA, "%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); break; case 0x0c/4: // result = 0; @@ -323,8 +324,8 @@ uint32_t iteagle_fpga_device::fpga_r(offs_t offset, uint32_t mem_mask) result |= m_scc1->da_r(offset) << 24; if (LOG_SERIAL) m_serial0_1.read_data(0); } - if (0 && LOG_FPGA && m_prev_reg != offset) - logerror("%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + if (m_prev_reg != offset) + LOGMASKED(LOG_SERIAL_VERBOSE, "%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); break; case 0x1c/4: result = 0; @@ -336,11 +337,11 @@ uint32_t iteagle_fpga_device::fpga_r(offs_t offset, uint32_t mem_mask) } if (ACCESSING_BITS_16_23) { result |= m_serial2_3.read_data(1) << 16; - logerror("fpga_r: LEDSIGN read byte: %02X\n", uint8_t(result >> 16)); + LOGMASKED(LOG_LEDSIGN, "fpga_r: LEDSIGN read byte: %02X\n", uint8_t(result >> 16)); } if (ACCESSING_BITS_24_31) { result |= m_serial2_3.read_data(0) << 24; - logerror("fpga_r: MODEM read byte: %c\n", (result >> 24) & 0xff); + LOGMASKED(LOG_MODEM, "fpga_r: MODEM read byte: %c\n", (result >> 24) & 0xff); } // Clear interrupts if (ACCESSING_BITS_16_31) { @@ -348,12 +349,10 @@ uint32_t iteagle_fpga_device::fpga_r(offs_t offset, uint32_t mem_mask) m_cpu->set_input_line(m_serial_irq_num, CLEAR_LINE); } } - if (LOG_FPGA) - logerror("%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + LOGMASKED(LOG_FPGA, "%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); break; default: - if (LOG_FPGA) - logerror("%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + LOGMASKED(LOG_FPGA, "%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); osd_printf_debug("%s:fpga_r offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); break; } @@ -373,35 +372,29 @@ void iteagle_fpga_device::fpga_w(offs_t offset, uint32_t data, uint32_t mem_mask else // ATMEL Chip access. Returns version id's when bit 7 is set. update_sequence(data & 0xff); - if (0 && LOG_FPGA) - logerror("%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_FPGA_VERBOSE, "%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); } else if (ACCESSING_BITS_8_15) { // Interrupt enable? - if (LOG_FPGA) - logerror("%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_FPGA, "%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); } else if (ACCESSING_BITS_24_31 && (data & 0x01000000)) { // Interrupt clear/enable m_cpu->set_input_line(m_irq_num, CLEAR_LINE); - if (LOG_FPGA) - logerror("%s:fpga_w offset %04X = %08X & %08X Clearing interrupt(%i)\n", machine().describe_context(), offset*4, data, mem_mask, m_irq_num); + LOGMASKED(LOG_FPGA, "%s:fpga_w offset %04X = %08X & %08X Clearing interrupt(%i)\n", machine().describe_context(), offset*4, data, mem_mask, m_irq_num); } else { - if (LOG_FPGA) - logerror("%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_FPGA, "%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); } break; case 0x14/4: if (ACCESSING_BITS_0_7 && (data&0x1)) { m_fpga_regs[0x04/4] &= ~0x00080000; } - if (LOG_FPGA) - logerror("%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_FPGA, "%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); break; case 0x18/4: if (ACCESSING_BITS_0_7 && (data&0x1)) { m_fpga_regs[0x04/4] &= ~0x02000000; } - if (LOG_FPGA) - logerror("%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_FPGA, "%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); break; case 0x0c/4: if (ACCESSING_BITS_0_7) { @@ -432,8 +425,7 @@ void iteagle_fpga_device::fpga_w(offs_t offset, uint32_t data, uint32_t mem_mask m_scc1->da_w(offset, (data >> 24) & 0xff); if (LOG_SERIAL) m_serial0_1.write_data((data >> 24) & 0xff, 0); } - if (1 && LOG_FPGA) - logerror("%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_FPGA, "%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); break; case 0x1c/4: if (ACCESSING_BITS_0_7) { @@ -492,12 +484,10 @@ void iteagle_fpga_device::fpga_w(offs_t offset, uint32_t data, uint32_t mem_mask } - if (LOG_FPGA) - logerror("%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_FPGA, "%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); break; default: - if (LOG_FPGA) - logerror("%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_FPGA, "%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); osd_printf_debug("%s:fpga_w offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); break; } @@ -596,8 +586,7 @@ uint32_t iteagle_fpga_device::rtc_r(offs_t offset, uint32_t mem_mask) switch (offset) { default: - if (LOG_RTC) - logerror("%s:RTC read from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + LOGMASKED(LOG_RTC, "%s:RTC read from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); break; } return result; @@ -627,13 +616,10 @@ void iteagle_fpga_device::rtc_w(offs_t offset, uint32_t data, uint32_t mem_mask) m_rtc_regs[0x7FC/4] = (raw[7]<<24) | (raw[6]<<16) | (raw[5]<<8) | (raw[4] <<0); //m_rtc_regs[0x7FC/4] = (0x95<<24) | (raw[6]<<16) | (raw[5]<<8) | (raw[4] <<0); } - if (LOG_RTC) - logerror("%s:RTC write to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); - + LOGMASKED(LOG_RTC, "%s:RTC write to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); break; default: - if (LOG_RTC) - logerror("%s:RTC write to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_RTC, "%s:RTC write to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); break; } @@ -645,33 +631,30 @@ void iteagle_fpga_device::rtc_w(offs_t offset, uint32_t data, uint32_t mem_mask) uint32_t iteagle_fpga_device::e1_nvram_r(offs_t offset, uint32_t mem_mask) { uint32_t result = m_e1_nv_data[offset]; - if (LOG_RAM) - logerror("FPGA e1_nvram_r from offset %04X = %08X & %08X\n", offset * 4, result, mem_mask); + LOGMASKED(LOG_RAM, "FPGA e1_nvram_r from offset %04X = %08X & %08X\n", offset * 4, result, mem_mask); return result; } void iteagle_fpga_device::e1_nvram_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(&m_e1_nv_data[offset]); - if (LOG_RAM) - logerror("FPGA e1_ram_w to offset %04X = %08X & %08X\n", offset * 4, data, mem_mask); + LOGMASKED(LOG_RAM, "FPGA e1_ram_w to offset %04X = %08X & %08X\n", offset * 4, data, mem_mask); } + //************************************* //* FPGA RAM -- Eagle 1 only //************************************* uint32_t iteagle_fpga_device::e1_ram_r(offs_t offset, uint32_t mem_mask) { uint32_t result = m_e1_ram[offset]; - if (LOG_RAM) - logerror("%s:FPGA e1_ram_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + LOGMASKED(LOG_RAM, "%s:FPGA e1_ram_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); return result; } void iteagle_fpga_device::e1_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(&m_e1_ram[offset]); - if (LOG_RAM) - logerror("%s:FPGA e1_ram_w to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_RAM, "%s:FPGA e1_ram_w to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); } //************************************ @@ -760,14 +743,13 @@ uint32_t iteagle_eeprom_device::eeprom_r(offs_t offset, uint32_t mem_mask) case 0xC/4: // I2C Handler if (ACCESSING_BITS_16_23) { result = m_eeprom->do_read()<<(16+3); - if (LOG_EEPROM) - logerror("%s:eeprom_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); - } else { - logerror("%s:eeprom_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + LOGMASKED(LOG_EEPROM, "%s:eeprom_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + } else { + LOGMASKED(LOG_UNKNOWN, "%s:eeprom_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); } break; default: - logerror("%s:eeprom read from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + LOGMASKED(LOG_UNKNOWN, "%s:eeprom read from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); break; } return result; @@ -788,16 +770,13 @@ void iteagle_eeprom_device::eeprom_w(offs_t offset, uint32_t data, uint32_t mem_ m_eeprom->di_write((data & 0x040000) >> (16+2)); m_eeprom->cs_write((data & 0x020000) ? ASSERT_LINE : CLEAR_LINE); m_eeprom->clk_write((data & 0x010000) ? ASSERT_LINE : CLEAR_LINE); - if (LOG_EEPROM) - logerror("%s:eeprom_w to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); - } else { - //if (LOG_EEPROM) - logerror("%s:eeprom_w to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_EEPROM, "%s:eeprom_w to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + } else { + LOGMASKED(LOG_UNKNOWN, "%s:eeprom_w to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); } break; default: - //if (LOG_EEPROM) - logerror("%s:eeprom write to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); + LOGMASKED(LOG_UNKNOWN, "%s:eeprom write to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); break; } } @@ -862,8 +841,7 @@ uint32_t iteagle_periph_device::ctrl_r(offs_t offset, uint32_t mem_mask) uint32_t result = m_ctrl_regs[offset]; switch (offset) { case 0x0/4: - if (LOG_PERIPH) - logerror("%s:fpga ctrl_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + LOGMASKED(LOG_PERIPH, "%s:fpga ctrl_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); osd_printf_debug("%s:fpga ctrl_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); break; case 0x70/4: @@ -894,12 +872,10 @@ uint32_t iteagle_periph_device::ctrl_r(offs_t offset, uint32_t mem_mask) // High 128 bytes of rtc ram result = (result & 0x00ffffff) | (m_rtc_regs[m_ctrl_regs[0x72 / 4] & 0xff] << 24); } - if (LOG_PERIPH) - logerror("%s:fpga ctrl_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + LOGMASKED(LOG_PERIPH, "%s:fpga ctrl_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); break; default: - if (LOG_PERIPH) - logerror("%s:fpga ctrl_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); + LOGMASKED(LOG_PERIPH, "%s:fpga ctrl_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); osd_printf_debug("%s:fpga ctrl_r from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask); break; } @@ -926,6 +902,5 @@ void iteagle_periph_device::ctrl_w(offs_t offset, uint32_t data, uint32_t mem_ma default: break; } - if (LOG_PERIPH) - logerror("%s:fpga ctrl_w to offset %04X = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); + LOGMASKED(LOG_PERIPH, "%s:fpga ctrl_w to offset %04X = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); } diff --git a/src/mame/jaleco/bigstrkb.cpp b/src/mame/jaleco/bigstrkb.cpp index 927a9dc06f5..8112570739f 100644 --- a/src/mame/jaleco/bigstrkb.cpp +++ b/src/mame/jaleco/bigstrkb.cpp @@ -26,7 +26,7 @@ // configurable logging -#define LOG_VIDREG (1U << 1) +#define LOG_VIDREG (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_VIDREG) diff --git a/src/mame/kaypro/kay_kbd.cpp b/src/mame/kaypro/kay_kbd.cpp index 6cf408fb981..7e9f1dc8402 100644 --- a/src/mame/kaypro/kay_kbd.cpp +++ b/src/mame/kaypro/kay_kbd.cpp @@ -13,7 +13,6 @@ #include "speaker.h" -#define LOG_GENERAL (1U << 0) #define LOG_TXD (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_TXD) diff --git a/src/mame/konami/ajax.cpp b/src/mame/konami/ajax.cpp index c1fcaa37489..cc59738617f 100644 --- a/src/mame/konami/ajax.cpp +++ b/src/mame/konami/ajax.cpp @@ -33,7 +33,7 @@ // configurable logging -#define LOG_LS138 (1U << 1) +#define LOG_LS138 (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_LS138) diff --git a/src/mame/konami/cobra.cpp b/src/mame/konami/cobra.cpp index 7ef3f9ea8a6..539d0a3f4da 100644 --- a/src/mame/konami/cobra.cpp +++ b/src/mame/konami/cobra.cpp @@ -334,6 +334,13 @@ #include "screen.h" #include "speaker.h" +#define LOG_DEBUG_STATES (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" + +#define LOG_GFX_RAM_WRITES (0) +#define LOG_DRAW_COMMANDS (0) namespace { @@ -342,10 +349,6 @@ namespace { #define M2SFIFO_VERBOSE 0 #define S2MFIFO_VERBOSE 0 -#define LOG_DEBUG_STATES 0 -#define LOG_GFX_RAM_WRITES 0 -#define LOG_DRAW_COMMANDS 0 - #define ENABLE_BILINEAR 1 #define DMA_SOUND_BUFFER_SIZE 16000 @@ -1417,12 +1420,10 @@ void cobra_state::main_fifo_w(offs_t offset, uint64_t data, uint64_t mem_mask) if (m_main_debug_state_wc >= 2) { -#if LOG_DEBUG_STATES if (m_main_debug_state != 0) { - printf("MAIN: debug state %02X\n", m_main_debug_state); + LOGMASKED(LOG_DEBUG_STATES, "MAIN: debug state %02X\n", m_main_debug_state); } -#endif if (m_main_debug_state == 0x6b) { @@ -1676,12 +1677,10 @@ void cobra_state::sub_debug_w(offs_t offset, uint32_t data, uint32_t mem_mask) if (m_sub_debug_state_wc >= 2) { -#if LOG_DEBUG_STATES if (m_sub_debug_state != 0) { - printf("SUB: debug state %02X\n", m_sub_debug_state); + LOGMASKED(LOG_DEBUG_STATES, "SUB: debug state %02X\n", m_sub_debug_state); } -#endif m_sub_debug_state = 0; m_sub_debug_state_wc = 0; @@ -2172,10 +2171,7 @@ void cobra_renderer::gfx_fifo_exec() vp_center_x = 256.0f; } -#if LOG_DRAW_COMMANDS - printf("--- Draw command %08X %08X ---\n", w1, w2); -#endif - + if (LOG_DRAW_COMMANDS) cobra->logerror("--- Draw command %08X %08X ---\n", w1, w2); // extract vertex data for (int i=0; i < units; i++) @@ -2226,41 +2222,38 @@ void cobra_renderer::gfx_fifo_exec() vert[i].p[POLY_B] = b * 255.0f; vert[i].p[POLY_A] = a * 255.0f; - -#if LOG_DRAW_COMMANDS if (w2 & 0x40000000) { - printf(" ?: %08X\n", (uint32_t)in[0]); + if (LOG_DRAW_COMMANDS) cobra->logerror(" ?: %08X\n", (uint32_t)in[0]); } if (w2 & 0x20000000) { - printf(" ?: %08X\n", (uint32_t)in[1]); + if (LOG_DRAW_COMMANDS) cobra->logerror(" ?: %08X\n", (uint32_t)in[1]); } - printf(" x: %f\n", x); - printf(" y: %f\n", y); - printf(" ?: %08X\n", (uint32_t)in[2]); - printf(" z: %f\n", z); + if (LOG_DRAW_COMMANDS) cobra->logerror(" x: %f\n", x); + if (LOG_DRAW_COMMANDS) cobra->logerror(" y: %f\n", y); + if (LOG_DRAW_COMMANDS) cobra->logerror(" ?: %08X\n", (uint32_t)in[2]); + if (LOG_DRAW_COMMANDS) cobra->logerror(" z: %f\n", z); if (w2 & 0x00200000) { - printf(" w: %f\n", w); - printf(" u: %f\n", vert[i].p[POLY_U]); - printf(" v: %f\n", vert[i].p[POLY_V]); + if (LOG_DRAW_COMMANDS) cobra->logerror(" w: %f\n", w); + if (LOG_DRAW_COMMANDS) cobra->logerror(" u: %f\n", vert[i].p[POLY_U]); + if (LOG_DRAW_COMMANDS) cobra->logerror(" v: %f\n", vert[i].p[POLY_V]); } - printf(" a: %f\n", a); - printf(" r: %f\n", r); - printf(" g: %f\n", g); - printf(" b: %f\n", b); + if (LOG_DRAW_COMMANDS) cobra->logerror(" a: %f\n", a); + if (LOG_DRAW_COMMANDS) cobra->logerror(" r: %f\n", r); + if (LOG_DRAW_COMMANDS) cobra->logerror(" g: %f\n", g); + if (LOG_DRAW_COMMANDS) cobra->logerror(" b: %f\n", b); if (w2 & 0x00000001) { - printf(" ?: %08X\n", (uint32_t)in[3]); + if (LOG_DRAW_COMMANDS) cobra->logerror(" ?: %08X\n", (uint32_t)in[3]); } - printf("\n"); -#endif + if (LOG_DRAW_COMMANDS) cobra->logerror("\n"); } @@ -2501,12 +2494,10 @@ void cobra_renderer::gfx_fifo_exec() gfx_write_gram(reg, mask, w2); -#if LOG_GFX_RAM_WRITES if (reg != 0x118 && reg != 0x114 && reg != 0x11c) { - printf("gfxfifo_exec: ram write %05X (mask %08X): %08X (%f)\n", reg, mask, w2, u2f(w2)); + if (LOG_GFX_RAM_WRITES) cobra->logerror("gfxfifo_exec: ram write %05X (mask %08X): %08X (%f)\n", reg, mask, w2, u2f(w2)); } -#endif cobra->m_gfx_re_status = RE_STATUS_IDLE; break; @@ -2870,12 +2861,10 @@ void cobra_state::gfx_debug_state_w(offs_t offset, uint64_t data, uint64_t mem_m if (m_gfx_debug_state_wc >= 2) { -#if LOG_DEBUG_STATES if (m_gfx_debug_state != 0) { - printf("GFX: debug state %02X\n", m_gfx_debug_state); + LOGMASKED(LOG_DEBUG_STATES, "GFX: debug state %02X\n", m_gfx_debug_state); } -#endif m_gfx_debug_state = 0; m_gfx_debug_state_wc = 0; diff --git a/src/mame/konami/divebomb.cpp b/src/mame/konami/divebomb.cpp index 5acb10759bf..47cd92253c6 100644 --- a/src/mame/konami/divebomb.cpp +++ b/src/mame/konami/divebomb.cpp @@ -107,7 +107,7 @@ To verify against original HW: // configurable logging -#define LOG_ROZ (1U << 1) +#define LOG_ROZ (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_ROZ) diff --git a/src/mame/konami/gyruss.cpp b/src/mame/konami/gyruss.cpp index 07608f3d645..004fd138e3b 100644 --- a/src/mame/konami/gyruss.cpp +++ b/src/mame/konami/gyruss.cpp @@ -79,7 +79,7 @@ and 1 SFX channel controlled by an 8039: // configurable logging -#define LOG_FILTER (1U << 1) +#define LOG_FILTER (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_FILTER) diff --git a/src/mame/konami/hexion.cpp b/src/mame/konami/hexion.cpp index 9b523bea91d..463e79f0057 100644 --- a/src/mame/konami/hexion.cpp +++ b/src/mame/konami/hexion.cpp @@ -95,9 +95,9 @@ Notes: // configurable logging -#define LOG_UNKWRITE (1U << 1) -#define LOG_BANKEDRAM (1U << 2) -#define LOG_CCU (1U << 3) +#define LOG_UNKWRITE (1U << 1) +#define LOG_BANKEDRAM (1U << 2) +#define LOG_CCU (1U << 3) //#define VERBOSE (LOG_GENERAL | LOG_UNKWRITE | LOG_BANKEDRAM | LOG_CCU) diff --git a/src/mame/konami/ironhors.cpp b/src/mame/konami/ironhors.cpp index 0959eab9896..f958a2f1f66 100644 --- a/src/mame/konami/ironhors.cpp +++ b/src/mame/konami/ironhors.cpp @@ -29,7 +29,7 @@ // configurable logging -#define LOG_PALETTEBANK (1U << 1) +#define LOG_PALETTEBANK (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_PALETTEBANK) diff --git a/src/mame/konami/jackal.cpp b/src/mame/konami/jackal.cpp index 6bdc2f54d23..ba415f5f905 100644 --- a/src/mame/konami/jackal.cpp +++ b/src/mame/konami/jackal.cpp @@ -83,7 +83,7 @@ Address Dir Data Description // configurable logging -#define LOG_RAMBANK (1U << 1) +#define LOG_RAMBANK (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_RAMBANK) diff --git a/src/mame/konami/k001005.cpp b/src/mame/konami/k001005.cpp index 32a24cb25ca..46e61427fd8 100644 --- a/src/mame/konami/k001005.cpp +++ b/src/mame/konami/k001005.cpp @@ -20,9 +20,6 @@ */ -#define LOG_POLY_FIFO 0 - - k001005_renderer::k001005_renderer(device_t &parent, screen_device &screen, device_t *k001006) : poly_manager(screen.machine()) { diff --git a/src/mame/konami/k057714.cpp b/src/mame/konami/k057714.cpp index 447f7220510..c093e466049 100644 --- a/src/mame/konami/k057714.cpp +++ b/src/mame/konami/k057714.cpp @@ -10,11 +10,10 @@ #define DUMP_VRAM 0 -#define LOG_GENERAL (1 << 0) -#define LOG_REGISTER (1 << 1) -#define LOG_FIFO (1 << 2) -#define LOG_CMDEXEC (1 << 3) -#define LOG_DRAW (1 << 4) +#define LOG_REGISTER (1U << 1) +#define LOG_FIFO (1U << 2) +#define LOG_CMDEXEC (1U << 3) +#define LOG_DRAW (1U << 4) // #define VERBOSE (LOG_GENERAL | LOG_REGISTER | LOG_FIFO | LOG_CMDEXEC | LOG_DRAW) // #define LOG_OUTPUT_STREAM std::cout diff --git a/src/mame/konami/k573dio.cpp b/src/mame/konami/k573dio.cpp index f4c5df42ce0..0d3b4cd4631 100644 --- a/src/mame/konami/k573dio.cpp +++ b/src/mame/konami/k573dio.cpp @@ -3,10 +3,9 @@ #include "emu.h" #include "k573dio.h" -#define LOG_GENERAL (1 << 0) -#define LOG_FPGA (1 << 1) -#define LOG_MP3 (1 << 2) -#define LOG_UNKNOWNREG (1 << 3) +#define LOG_FPGA (1U << 1) +#define LOG_MP3 (1U << 2) +#define LOG_UNKNOWNREG (1U << 3) // #define VERBOSE (LOG_GENERAL | LOG_FPGA | LOG_MP3 | LOG_UNKNOWNREG) // #define LOG_OUTPUT_STREAM std::cout diff --git a/src/mame/konami/k573fpga.cpp b/src/mame/konami/k573fpga.cpp index 4e85563af1f..b013267d8d2 100644 --- a/src/mame/konami/k573fpga.cpp +++ b/src/mame/konami/k573fpga.cpp @@ -5,7 +5,6 @@ #include "k573fpga.h" -#define LOG_GENERAL (1 << 0) #define VERBOSE (LOG_GENERAL) // #define LOG_OUTPUT_STREAM std::cout diff --git a/src/mame/konami/ksys573.cpp b/src/mame/konami/ksys573.cpp index b880719b5fd..25cb68828ac 100644 --- a/src/mame/konami/ksys573.cpp +++ b/src/mame/konami/ksys573.cpp @@ -425,12 +425,11 @@ Notes: (all ICs shown) #include "pnchmn.lh" -#define LOG_GENERAL (1 << 0) -#define LOG_CDROM (1 << 1) -#define LOG_CONTROL (1 << 2) -#define LOG_SECURITY (1 << 3) -#define LOG_JVS (1 << 4) -#define LOG_IOBOARD (1 << 5) +#define LOG_CDROM (1U << 1) +#define LOG_CONTROL (1U << 2) +#define LOG_SECURITY (1U << 3) +#define LOG_JVS (1U << 4) +#define LOG_IOBOARD (1U << 5) // #define VERBOSE (LOG_GENERAL | LOG_CDROM | LOG_CONTROL | LOG_SECURITY | LOG_JVS | LOG_IOBOARD) // #define LOG_OUTPUT_STREAM std::cout diff --git a/src/mame/konami/mainevt.cpp b/src/mame/konami/mainevt.cpp index 1c74c60d38e..18585cac50b 100644 --- a/src/mame/konami/mainevt.cpp +++ b/src/mame/konami/mainevt.cpp @@ -48,7 +48,7 @@ Both games run on Konami's PWB351024A PCB // configurable logging -#define LOG_SHBANK (1U << 1) +#define LOG_SHBANK (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_SHBANK) diff --git a/src/mame/konami/plygonet.cpp b/src/mame/konami/plygonet.cpp index 1b0a0e12ca2..231771a25ba 100644 --- a/src/mame/konami/plygonet.cpp +++ b/src/mame/konami/plygonet.cpp @@ -419,11 +419,11 @@ void polygonet_state::sys_w(offs_t offset, u8 data) m_maincpu->set_input_line(M68K_IRQ_5, CLEAR_LINE); m_sys1 = data; - LOGMASKED(LOG_GENERAL, "sys1 write: %02x\n", data); + LOG("sys1 write: %02x\n", data); break; default: - LOGMASKED(LOG_GENERAL, "Unknown sys_w write: %08x = %02x\n", offset, data); + LOG("Unknown sys_w write: %08x = %02x\n", offset, data); break; } } @@ -835,13 +835,13 @@ void polygonet_state::ttl_vram_w(offs_t offset, u32 data, u32 mem_mask) void polygonet_state::fix_regs_w(offs_t offset, u32 data, u32 mem_mask) { COMBINE_DATA(&m_fix_regs[offset]); - LOGMASKED(LOG_GENERAL, "fix_regs_w: %08x = %08x & %08x\n", offset, data, mem_mask); + LOG("fix_regs_w: %08x = %08x & %08x\n", offset, data, mem_mask); } u32 polygonet_state::fix_regs_r(offs_t offset, u32 mem_mask) { const u32 data = m_fix_regs[offset]; - LOGMASKED(LOG_GENERAL, "fix_regs_r: %08x: %08x & %08x\n", offset, data, mem_mask); + LOG("fix_regs_r: %08x: %08x & %08x\n", offset, data, mem_mask); return data; } diff --git a/src/mame/konami/rollerg.cpp b/src/mame/konami/rollerg.cpp index 7c0c94bdc4d..9a169fea817 100644 --- a/src/mame/konami/rollerg.cpp +++ b/src/mame/konami/rollerg.cpp @@ -30,7 +30,7 @@ // configurable logging -#define LOG_UNKWRITE (1U << 1) +#define LOG_UNKWRITE (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_UNKWRITE) diff --git a/src/mame/konami/ultraman.cpp b/src/mame/konami/ultraman.cpp index ad07b60b45c..1c012c3e931 100644 --- a/src/mame/konami/ultraman.cpp +++ b/src/mame/konami/ultraman.cpp @@ -33,7 +33,7 @@ // configurable logging -#define LOG_SHADOWS (1U << 1) +#define LOG_SHADOWS (1U << 1) #define VERBOSE (LOG_GENERAL | LOG_SHADOWS) diff --git a/src/mame/konami/xmen.cpp b/src/mame/konami/xmen.cpp index b183fe1edd7..7cd361a69e6 100644 --- a/src/mame/konami/xmen.cpp +++ b/src/mame/konami/xmen.cpp @@ -49,9 +49,9 @@ likewise a 2 screen game. // configurable logging -#define LOG_EEPROMW (1U << 1) -#define LOG_SOUNDIRQ (1U << 2) -#define LOG_OKI (1U << 3) +#define LOG_EEPROMW (1U << 1) +#define LOG_SOUNDIRQ (1U << 2) +#define LOG_OKI (1U << 3) //#define VERBOSE (LOG_GENERAL | LOG_EEPROMW | LOG_SOUNDIRQ | LOG_OKI) diff --git a/src/mame/luxor/abc1600mac.cpp b/src/mame/luxor/abc1600mac.cpp index b25c63d208f..9a483d4d83f 100644 --- a/src/mame/luxor/abc1600mac.cpp +++ b/src/mame/luxor/abc1600mac.cpp @@ -17,16 +17,18 @@ #include "emu.h" #include "abc1600mac.h" +#define LOG_MAC (1U << 1) +#define LOG_DMA (1U << 2) +#define LOG_TASKS (1U << 3) +#define LOG_ERRORS (1U << 4) +#define VERBOSE (LOG_ERRORS | LOG_TASKS) +#include "logmacro.h" //************************************************************************** // MACROS / CONSTANTS //************************************************************************** -#define LOG 0 -#define LOG_MAC 0 -#define LOG_DMA 0 - #define A8 BIT(offset, 8) #define FC2 BIT(fc, 2) @@ -199,7 +201,7 @@ inline offs_t abc1600_mac_device::get_physical_offset(offs_t offset, int task, b m_cause = ((offset >> 13) & 0x1f) | DMAOK; } - if (LOG && (offset != virtual_offset)) logerror("%s MAC %05x:%06x (SEGA %03x SEGD %02x PGA %03x PGD %04x NONX %u WP %u TASK %u FC %u MAGIC %u)\n", + if (offset != virtual_offset) LOG("%s MAC %05x:%06x (SEGA %03x SEGD %02x PGA %03x PGD %04x NONX %u WP %u TASK %u FC %u MAGIC %u)\n", machine().describe_context(), offset, virtual_offset, sega, segd, pga, page_data, nonx, wp, task, m_cpu->get_fc(), m_magic); return virtual_offset; @@ -224,8 +226,8 @@ uint8_t abc1600_mac_device::read(offs_t offset) { if (offset & 0x80000) { - if (LOG_MAC && (offset != 0x80007)) logerror("%s MAC R %05x\n", - machine().describe_context(), offset); + if (offset != 0x80007) + LOGMASKED(LOG_MAC, "%s MAC R %05x\n",machine().describe_context(), offset); return space(AS_MAC).read_byte(offset); } @@ -247,7 +249,7 @@ uint8_t abc1600_mac_device::read(offs_t offset) { if (nonx) { - logerror("%s BUS ERROR R %05x:%06x (NONX %u WP %u TASK %u FC %u MAGIC %u)\n", + LOGMASKED(LOG_ERRORS, "%s BUS ERROR R %05x:%06x (NONX %u WP %u TASK %u FC %u MAGIC %u)\n", machine().describe_context(), offset, virtual_offset, nonx, wp, task, fc, m_magic); machine().debug_break(); m_cpu->set_buserror_details(offset, 1, m_cpu->get_fc()); @@ -273,8 +275,7 @@ void abc1600_mac_device::write(offs_t offset, uint8_t data) { if (offset & 0x80000) { - if (LOG_MAC) logerror("%s MAC W %05x:%02x\n", - machine().describe_context(), offset, data); + LOGMASKED(LOG_MAC, "%s MAC W %05x:%02x\n", machine().describe_context(), offset, data); space(AS_MAC).write_byte(offset, data); return; @@ -292,7 +293,7 @@ void abc1600_mac_device::write(offs_t offset, uint8_t data) { if (nonx) { - logerror("%s BUS ERROR W %05x:%06x (NONX %u WP %u TASK %u FC %u MAGIC %u)\n", + LOGMASKED(LOG_ERRORS, "%s BUS ERROR W %05x:%06x (NONX %u WP %u TASK %u FC %u MAGIC %u)\n", machine().describe_context(), offset, virtual_offset, nonx, wp, task, fc, m_magic); machine().debug_break(); m_cpu->set_buserror_details(offset, 0, m_cpu->get_fc()); @@ -301,7 +302,7 @@ void abc1600_mac_device::write(offs_t offset, uint8_t data) } if (!wp) { - logerror("%s BUS ERROR W %05x:%06x (NONX %u WP %u TASK %u FC %u MAGIC %u)\n", + LOGMASKED(LOG_ERRORS, "%s BUS ERROR W %05x:%06x (NONX %u WP %u TASK %u FC %u MAGIC %u)\n", machine().describe_context(), offset, virtual_offset, nonx, wp, task, fc, m_magic); machine().debug_break(); m_cpu->set_buserror_details(offset, 0, m_cpu->get_fc()); @@ -376,8 +377,7 @@ void abc1600_mac_device::task_w(offs_t offset, uint8_t data) m_boote = !BIT(data, 6); m_magic = !BIT(data, 7); - if (LOG_MAC) logerror("%s TASK W %02x (TASK %u BOOTE %u MAGIC %u)\n", - machine().describe_context(), data, m_task, m_boote, m_magic); + LOGMASKED(LOG_MAC, "%s TASK W %02x (TASK %u BOOTE %u MAGIC %u)\n", machine().describe_context(), data, m_task, m_boote, m_magic); } @@ -433,9 +433,7 @@ void abc1600_mac_device::segment_w(offs_t offset, uint8_t data) offs_t sega = (m_task << 5) | A8 << 4 | ((offset >> 15) & 0xf); m_segment_ram[sega] = data & 0x7f; - if (LOG_MAC) logerror("%s SEG W %05x:%02x SEGA %03x SEGD %02x TASK %u\n", - machine().describe_context(), offset, data, - sega, m_segment_ram[sega], m_task); + LOGMASKED(LOG_MAC, "%s SEG W %05x:%02x SEGA %03x SEGD %02x TASK %u\n", machine().describe_context(), offset, data, sega, m_segment_ram[sega], m_task); } @@ -536,9 +534,7 @@ void abc1600_mac_device::page_lo_w(offs_t offset, uint8_t data) offs_t pga = ((segd & 0x3f) << 4) | ((offset >> 11) & 0xf); m_page_ram[pga] = (m_page_ram[pga] & 0xff00) | data; - if (LOG_MAC) logerror("%s PAGE W %05x:%02x (SEGA %03x SEGD %02x PGA %03x PGD %04x TASK %u)\n", - machine().describe_context(), offset, data, - sega, segd, pga, m_page_ram[pga], m_task); + LOGMASKED(LOG_MAC, "%s PAGE W %05x:%02x (SEGA %03x SEGD %02x PGA %03x PGD %04x TASK %u)\n", machine().describe_context(), offset, data, sega, segd, pga, m_page_ram[pga], m_task); } @@ -621,8 +617,7 @@ uint8_t abc1600_mac_device::dma_mreq_r(int index, int dmamap, offs_t offset) space().write_byte(virtual_offset, data); } - if (LOG_DMA) logerror("%s DMRQ R:%c %04x:%06x=%02x\n", - machine().describe_context(), rw ? 'R' : 'W', offset, virtual_offset, data); + LOGMASKED(LOG_DMA, "%s DMRQ R:%c %04x:%06x=%02x\n", machine().describe_context(), rw ? 'R' : 'W', offset, virtual_offset, data); return data; } @@ -637,8 +632,7 @@ void abc1600_mac_device::dma_mreq_w(int index, int dmamap, offs_t offset, uint8_ bool rw; offs_t virtual_offset = get_dma_address(dmamap, offset, rw); - if (LOG_DMA) logerror("%s DMRQ W:%c %04x:%06x=%02x\n", - machine().describe_context(), rw ? 'R' : 'W', offset, virtual_offset, data); + LOGMASKED(LOG_DMA, "%s DMRQ W:%c %04x:%06x=%02x\n", machine().describe_context(), rw ? 'R' : 'W', offset, virtual_offset, data); if (!rw) { @@ -656,8 +650,7 @@ uint8_t abc1600_mac_device::dma_iorq_r(int dmamap, offs_t offset) bool rw; offs_t virtual_offset = 0x1fe000 | get_dma_address(dmamap, offset, rw); - if (LOG_DMA) logerror("%s DIORQ R %04x:%06x\n", - machine().describe_context(), offset, virtual_offset); + LOGMASKED(LOG_DMA, "%s DIORQ R %04x:%06x\n", machine().describe_context(), offset, virtual_offset); return space().read_byte(virtual_offset); } @@ -672,8 +665,7 @@ void abc1600_mac_device::dma_iorq_w(int dmamap, offs_t offset, uint8_t data) bool rw; offs_t virtual_offset = 0x1fe000 | get_dma_address(dmamap, offset, rw); - if (LOG_DMA) logerror("%s DIORQ W %04x:%06x=%02x\n", - machine().describe_context(), offset, virtual_offset, data); + LOGMASKED(LOG_DMA, "%s DIORQ W %04x:%06x=%02x\n", machine().describe_context(), offset, virtual_offset, data); space().write_byte(virtual_offset, data); } @@ -700,8 +692,7 @@ void abc1600_mac_device::dmamap_w(offs_t offset, uint8_t data) */ - if (LOG_DMA) logerror("%s DMAMAP %u:%02x\n", - machine().describe_context(), offset & 7, data); + LOGMASKED(LOG_DMA, "%s DMAMAP %u:%02x\n", machine().describe_context(), offset & 7, data); m_dmamap[offset & 7] = data; } @@ -738,7 +729,7 @@ void abc1600_mac_device::dump() bool nonx = PAGE_NONX; bool wp = PAGE_WP; - logerror("TASK %.2u SEGMENT %.2u PAGE %.2u MEM %05x-%05x %06x-%06x %c %c\n", + LOGMASKED(LOG_TASKS, "TASK %.2u SEGMENT %.2u PAGE %.2u MEM %05x-%05x %06x-%06x %c %c\n", task, seg, page, logical, logical + 0x7ff, physical, physical + 0x7ff, nonx ? 'X' : ' ', wp ? ' ' : 'W'); } } diff --git a/src/mame/makerbot/replicator.cpp b/src/mame/makerbot/replicator.cpp index e7b79161d97..da0b4ffd7b2 100644 --- a/src/mame/makerbot/replicator.cpp +++ b/src/mame/makerbot/replicator.cpp @@ -32,19 +32,19 @@ #include "screen.h" #include "speaker.h" -#define LOG_PORT_A (1 << 1) -#define LOG_PORT_B (1 << 2) -#define LOG_PORT_C (1 << 3) -#define LOG_PORT_D (1 << 4) -#define LOG_PORT_E (1 << 5) -#define LOG_PORT_F (1 << 6) -#define LOG_PORT_G (1 << 7) -#define LOG_PORT_H (1 << 8) -#define LOG_PORT_J (1 << 9) -#define LOG_PORT_K (1 << 10) -#define LOG_PORT_L (1 << 11) -#define LOG_LCD_CLK (1 << 12) -#define LOG_LCD_SHIFT (1 << 13) +#define LOG_PORT_A (1U << 1) +#define LOG_PORT_B (1U << 2) +#define LOG_PORT_C (1U << 3) +#define LOG_PORT_D (1U << 4) +#define LOG_PORT_E (1U << 5) +#define LOG_PORT_F (1U << 6) +#define LOG_PORT_G (1U << 7) +#define LOG_PORT_H (1U << 8) +#define LOG_PORT_J (1U << 9) +#define LOG_PORT_K (1U << 10) +#define LOG_PORT_L (1U << 11) +#define LOG_LCD_CLK (1U << 12) +#define LOG_LCD_SHIFT (1U << 13) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/mc/mc68000.cpp b/src/mame/mc/mc68000.cpp index 3dbc63ab2b9..23f1700be32 100644 --- a/src/mame/mc/mc68000.cpp +++ b/src/mame/mc/mc68000.cpp @@ -42,7 +42,6 @@ #include "screen.h" -//#define LOG_GENERAL (1U << 0) #define LOG_IO_READ (1U << 1) #define LOG_IO_WRITE (1U << 2) diff --git a/src/mame/midway/atlantis.cpp b/src/mame/midway/atlantis.cpp index a856a81fdd9..abb6e7b8997 100644 --- a/src/mame/midway/atlantis.cpp +++ b/src/mame/midway/atlantis.cpp @@ -58,6 +58,14 @@ #include "emupal.h" +#define LOG_RTC (1U << 1) +#define LOG_PORT (1U << 2) +#define LOG_IRQ (1U << 3) +#define LOG_IRQ_VERBOSE (1U << 4) + +#define VERBOSE (0) +#include "logmacro.h" + namespace { @@ -98,9 +106,6 @@ namespace { #define PCI_ID_9050 "pci:0b.0" #define DEBUG_CONSOLE (0) -#define LOG_RTC (0) -#define LOG_PORT (0) -#define LOG_IRQ (0) class atlantis_state : public driver_device { @@ -237,16 +242,13 @@ uint32_t atlantis_state::board_ctrl_r(offs_t offset, uint32_t mem_mask) case PLD_REV: // ??? data = 0x1; - if (LOG_IRQ) - logerror("%s:board_ctrl_r read from PLD_REV offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); + LOGMASKED(LOG_IRQ, "%s:board_ctrl_r read from PLD_REV offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); break; case STATUS: - if (LOG_IRQ) - logerror("%s:board_ctrl_r read from STATUS offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); + LOGMASKED(LOG_IRQ, "%s:board_ctrl_r read from STATUS offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); break; default: - if (LOG_IRQ) - logerror("%s:board_ctrl_r read from offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); + LOGMASKED(LOG_IRQ, "%s:board_ctrl_r read from offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); break; } return data; @@ -283,8 +285,7 @@ void atlantis_state::board_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mas m_zeus->reset(); } } - if (LOG_IRQ) - logerror("%s:board_ctrl_w write to RESET offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); + LOGMASKED(LOG_IRQ, "%s:board_ctrl_w write to RESET offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); break; case VSYNC_CLEAR: //VSYNC_IE (0x1) @@ -298,14 +299,12 @@ void atlantis_state::board_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mas else { } } - if (0 && LOG_IRQ) - logerror("%s:board_ctrl_w write to CTRL_VSYNC_CLEAR offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); + LOGMASKED(LOG_IRQ_VERBOSE, "%s:board_ctrl_w write to CTRL_VSYNC_CLEAR offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); break; case IRQ_EN: // Zero bit will clear cause update_asic_irq(); - if (LOG_IRQ) - logerror("%s:board_ctrl_w write to IRQ_EN offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); + LOGMASKED(LOG_IRQ, "%s:board_ctrl_w write to IRQ_EN offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); break; case LED: { @@ -344,8 +343,7 @@ void atlantis_state::board_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mas m_rtc->watchdog_write(); break; default: - if (LOG_IRQ) - logerror("%s:board_ctrl_w write to offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); + LOGMASKED(LOG_IRQ, "%s:board_ctrl_w write to offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); break; } } @@ -357,8 +355,8 @@ uint8_t atlantis_state::cmos_r(offs_t offset) // Initial RTC check expects reads to the RTC to take some time if (offset == 0x7ff9) m_maincpu->eat_cycles(30); - if (LOG_RTC || ((offset >= 0x7ff0) && (offset != 0x7ff9))) - logerror("%s:RTC read from offset %04X = %08X\n", machine().describe_context(), offset, result); + else if (offset >= 0x7ff0 && offset != 0x7ff9) + LOGMASKED(LOG_RTC, "%s:RTC read from offset %04X = %08X\n", machine().describe_context(), offset, result); return result; } @@ -368,8 +366,8 @@ void atlantis_state::cmos_w(offs_t offset, uint8_t data, uint8_t mem_mask) // User I/O 0 = Allow write to cmos[0]. Serial Write Enable? if (offset == 0 && (m_user_io_state & 0x1)) { // Data written is shifted by 1 bit each time. Maybe a serial line output? - if (LOG_RTC && m_serial_count == 0) - logerror("%s: cmos_w[0] start serial %08x = %02x\n", machine().describe_context(), offset, data); + if (m_serial_count == 0) + LOGMASKED(LOG_RTC, "%s: cmos_w[0] start serial %08x = %02x\n", machine().describe_context(), offset, data); m_serial_count++; if (m_serial_count == 8) m_serial_count = 0; @@ -377,8 +375,7 @@ void atlantis_state::cmos_w(offs_t offset, uint8_t data, uint8_t mem_mask) else if (m_cmos_write_enabled) { m_rtc->write(offset, data); m_cmos_write_enabled = false; - if (LOG_RTC || offset >= 0x7ff0) - logerror("%s:RTC write to offset %04X = %08X & %08X\n", machine().describe_context(), offset, data, mem_mask); + LOGMASKED(LOG_RTC, "%s:RTC write to offset %04X = %08X & %08X\n", machine().describe_context(), offset, data, mem_mask); } } @@ -469,8 +466,7 @@ WRITE_LINE_MEMBER(atlantis_state::ide_irq) m_maincpu->set_input_line(IDE_IRQ_NUM, CLEAR_LINE); m_irq_state &= ~(1 << IDE_IRQ_NUM); } - if (LOG_IRQ) - logerror("%s: atlantis_state::ide_irq state = %i\n", machine().describe_context(), state); + LOGMASKED(LOG_IRQ, "%s: atlantis_state::ide_irq state = %i\n", machine().describe_context(), state); } /************************************* @@ -478,8 +474,7 @@ WRITE_LINE_MEMBER(atlantis_state::ide_irq) *************************************/ WRITE_LINE_MEMBER(atlantis_state::ioasic_irq) { - if (LOG_IRQ) - logerror("%s: atlantis_state::ioasic_irq state = %i\n", machine().describe_context(), state); + LOGMASKED(LOG_IRQ, "%s: atlantis_state::ioasic_irq state = %i\n", machine().describe_context(), state); if (state) { board_ctrl[STATUS] |= (1 << IOASIC_IRQ_SHIFT); } @@ -494,8 +489,7 @@ WRITE_LINE_MEMBER(atlantis_state::ioasic_irq) *************************************/ WRITE_LINE_MEMBER(atlantis_state::watchdog_irq) { - if (LOG_IRQ) - logerror("%s: atlantis_state::watchdog_irq state = %i\n", machine().describe_context(), state); + LOGMASKED(LOG_IRQ, "%s: atlantis_state::watchdog_irq state = %i\n", machine().describe_context(), state); if (state) { board_ctrl[STATUS] |= (1 << WDOG_IRQ_SHIFT); } @@ -531,14 +525,12 @@ void atlantis_state::update_asic_irq() if (causeBits && !currState) { m_maincpu->set_input_line(MIPS3_IRQ1 + irqIndex, ASSERT_LINE); m_irq_state |= (2 << irqIndex); - if (LOG_IRQ) - logerror("atlantis_state::update_asic_irq Asserting IRQ(%d) CAUSE = %02X\n", irqIndex, board_ctrl[CAUSE]); + LOGMASKED(LOG_IRQ, "atlantis_state::update_asic_irq Asserting IRQ(%d) CAUSE = %02X\n", irqIndex, board_ctrl[CAUSE]); } else if (!(causeBits) && currState) { m_maincpu->set_input_line(MIPS3_IRQ1 + irqIndex, CLEAR_LINE); m_irq_state &= ~(2 << irqIndex); - if (LOG_IRQ) - logerror("atlantis_state::update_asic_irq Clearing IRQ(%d) CAUSE = %02X\n", irqIndex, board_ctrl[CAUSE]); + LOGMASKED(LOG_IRQ, "atlantis_state::update_asic_irq Clearing IRQ(%d) CAUSE = %02X\n", irqIndex, board_ctrl[CAUSE]); } } } @@ -549,8 +541,7 @@ uint16_t atlantis_state::port_ctrl_r(offs_t offset) { uint32_t newOffset = offset >> 17; uint32_t result = m_port_data; - if (LOG_PORT) - logerror("%s: port_ctrl_r newOffset = %02X data = %08X\n", machine().describe_context(), newOffset, result); + LOGMASKED(LOG_PORT, "%s: port_ctrl_r newOffset = %02X data = %08X\n", machine().describe_context(), newOffset, result); return result; } @@ -571,13 +562,11 @@ void atlantis_state::port_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask m_port_data = (bits >> 8) & 7; // Row 2 else if (!(data & 0x40)) m_port_data = (bits >> 12) & 7; // Row 3 - if (LOG_PORT) - logerror("%s: port_ctrl_w Keypad Row Sel = %04X bits = %08X\n", machine().describe_context(), data, bits); + LOGMASKED(LOG_PORT, "%s: port_ctrl_w Keypad Row Sel = %04X bits = %08X\n", machine().describe_context(), data, bits); break; } default: - if (LOG_PORT) - logerror("%s: port_ctrl_w write to offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); + LOGMASKED(LOG_PORT, "%s: port_ctrl_w write to offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); break; } } diff --git a/src/mame/midway/midvunit_v.cpp b/src/mame/midway/midvunit_v.cpp index a8dda86a057..0cfe078b13a 100644 --- a/src/mame/midway/midvunit_v.cpp +++ b/src/mame/midway/midvunit_v.cpp @@ -14,13 +14,15 @@ #include "cpu/adsp2100/adsp2100.h" #include "cpu/tms34010/tms34010.h" +#define LOG_DMA (1U << 1) -#define WATCH_RENDER (0) -#define LOG_DMA (0) +#define VERBOSE (0) +#include "logmacro.h" -#define DMA_CLOCK 40000000 +#define WATCH_RENDER (0) +#define DMA_CLOCK 40000000 /* for when we implement DMA timing */ #define DMA_QUEUE_SIZE 273 @@ -371,8 +373,8 @@ void midvunit_renderer::process_dma_queue() void midvunit_state::midvunit_dma_queue_w(uint32_t data) { - if (LOG_DMA && machine().input().code_pressed(KEYCODE_L)) - logerror("%06X:queue(%X) = %08X\n", m_maincpu->pc(), m_dma_data_index, data); + if (machine().input().code_pressed(KEYCODE_L)) + LOGMASKED(LOG_DMA, "%06X:queue(%X) = %08X\n", m_maincpu->pc(), m_dma_data_index, data); if (m_dma_data_index < 16) m_dma_data[m_dma_data_index++] = data; } @@ -389,8 +391,8 @@ uint32_t midvunit_state::midvunit_dma_trigger_r(offs_t offset) { if (offset) { - if (LOG_DMA && machine().input().code_pressed(KEYCODE_L)) - logerror("%06X:trigger\n", m_maincpu->pc()); + if (machine().input().code_pressed(KEYCODE_L)) + LOGMASKED(LOG_DMA, "%06X:trigger\n", m_maincpu->pc()); m_poly->process_dma_queue(); m_dma_data_index = 0; } @@ -411,8 +413,8 @@ void midvunit_state::midvunit_page_control_w(uint32_t data) if ((m_page_control ^ data) & 1) { m_video_changed = true; - if (LOG_DMA && machine().input().code_pressed(KEYCODE_L)) - logerror("##########################################################\n"); + if (machine().input().code_pressed(KEYCODE_L)) + LOGMASKED(LOG_DMA, "##########################################################\n"); m_screen->update_partial(m_screen->vpos() - 1); } m_page_control = data; diff --git a/src/mame/midway/midwunit_m.cpp b/src/mame/midway/midwunit_m.cpp index 3fe58effd7a..37f094cbb1c 100644 --- a/src/mame/midway/midwunit_m.cpp +++ b/src/mame/midway/midwunit_m.cpp @@ -9,10 +9,10 @@ #include "emu.h" #include "midwunit.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_CMOS (1 << 1) -#define LOG_IO (1 << 2) -#define LOG_SOUND (1 << 3) +#define LOG_UNKNOWN (1U << 1) +#define LOG_CMOS (1U << 2) +#define LOG_IO (1U << 3) +#define LOG_SOUND (1U << 4) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/midway/midxunit_m.cpp b/src/mame/midway/midxunit_m.cpp index 945ac450f27..cef2cc29904 100644 --- a/src/mame/midway/midxunit_m.cpp +++ b/src/mame/midway/midxunit_m.cpp @@ -9,10 +9,10 @@ #include "emu.h" #include "midxunit.h" -#define LOG_IO (1 << 0) -#define LOG_UART (1 << 1) -#define LOG_UNKNOWN (1 << 2) -#define LOG_SOUND (1 << 3) +#define LOG_IO (1U << 1) +#define LOG_UART (1U << 2) +#define LOG_UNKNOWN (1U << 3) +#define LOG_SOUND (1U << 4) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/midway/midzeus.cpp b/src/mame/midway/midzeus.cpp index 969e16115b0..6629902d639 100644 --- a/src/mame/midway/midzeus.cpp +++ b/src/mame/midway/midzeus.cpp @@ -42,10 +42,10 @@ The Grid v1.2 10/18/2000 #include "crusnexo.lh" -#define LOG_FIREWIRE (1 << 1) -#define LOG_DISK (1 << 2) -#define LOG_DISK_JR (1 << 3) -#define LOG_UNKNOWN (1 << 4) +#define LOG_FIREWIRE (1U << 1) +#define LOG_DISK (1U << 2) +#define LOG_DISK_JR (1U << 3) +#define LOG_UNKNOWN (1U << 4) #define VERBOSE (LOG_FIREWIRE) #include "logmacro.h" diff --git a/src/mame/midway/seattle.cpp b/src/mame/midway/seattle.cpp index c355dba1309..523ea6de9ed 100644 --- a/src/mame/midway/seattle.cpp +++ b/src/mame/midway/seattle.cpp @@ -209,18 +209,13 @@ #include "hyprdriv.lh" #include "sfrush.lh" +#define LOG_WIDGET (1U << 1) -namespace { - -/************************************* - * - * Debugging constants - * - *************************************/ - -#define LOG_WIDGET (0) +#define VERBOSE (0) +#include "logmacro.h" +namespace { /************************************* * @@ -1053,16 +1048,14 @@ uint32_t seattle_state::widget_r(offs_t offset, uint32_t mem_mask) break; } - if (LOG_WIDGET) - logerror("Widget read (%02X) = %08X & %08X\n", offset*4, result, mem_mask); + LOGMASKED(LOG_WIDGET, "Widget read (%02X) = %08X & %08X\n", offset*4, result, mem_mask); return result; } void seattle_state::widget_w(offs_t offset, uint32_t data, uint32_t mem_mask) { - if (LOG_WIDGET) - logerror("Widget write (%02X) = %08X & %08X\n", offset*4, data, mem_mask); + LOGMASKED(LOG_WIDGET, "Widget write (%02X) = %08X & %08X\n", offset*4, data, mem_mask); switch (offset) { diff --git a/src/mame/midway/sente6vb.cpp b/src/mame/midway/sente6vb.cpp index dab50609128..a5bebd127d6 100644 --- a/src/mame/midway/sente6vb.cpp +++ b/src/mame/midway/sente6vb.cpp @@ -61,11 +61,13 @@ #include "machine/clock.h" #include "speaker.h" +#define LOG_CEM_WRITES (1U << 1) -#define LOG_CEM_WRITES 0 +#define VERBOSE (0) +#include "logmacro.h" -DEFINE_DEVICE_TYPE(SENTE6VB, sente6vb_device, "sente6vb", "Bally Sente 6VB Audio Board") +DEFINE_DEVICE_TYPE(SENTE6VB, sente6vb_device, "sente6vb", "Bally Sente 6VB Audio Board") /************************************* @@ -404,19 +406,13 @@ void sente6vb_device::chip_select_w(uint8_t data) for (i = 0; i < 6; i++) if ((diffchip & (1 << i)) && (data & (1 << i))) { -#if LOG_CEM_WRITES - double temp = 0; - // remember the previous value - temp = -#endif - m_cem_device[i]->get_parameter(reg); + double temp = m_cem_device[i]->get_parameter(reg); // set the voltage m_cem_device[i]->set_voltage(reg, voltage); // only log changes -#if LOG_CEM_WRITES if (temp != m_cem_device[i]->get_parameter(reg)) { static const char *const names[] = @@ -430,9 +426,8 @@ void sente6vb_device::chip_select_w(uint8_t data) "PULSE_WIDTH", "WAVE_SELECT" }; - logerror("s%04X: CEM#%d:%s=%f\n", m_audiocpu->pcbase(), i, names[m_dac_register], voltage); + LOGMASKED(LOG_CEM_WRITES, "s%04X: CEM#%d:%s=%f\n", m_audiocpu->pcbase(), i, names[m_dac_register], voltage); } -#endif } // if a timer for counter 0 is running, recompute diff --git a/src/mame/midway/vegas.cpp b/src/mame/midway/vegas.cpp index bfb0d6df09e..4d19e151d7e 100644 --- a/src/mame/midway/vegas.cpp +++ b/src/mame/midway/vegas.cpp @@ -295,17 +295,18 @@ #include "sf2049.lh" +#define LOG_TIMEKEEPER (1U << 1) +#define LOG_TIMEKEEPER_LOCKS (1U << 2) +#define LOG_SIO (1U << 3) +#define LOG_SIO_VERBOSE (1U << 4) +#define LOG_WATCHDOG (1U << 5) +#define LOG_UNKNOWN (1U << 6) -namespace { +#define VERBOSE (LOG_UNKNOWN) +#include "logmacro.h" -/************************************* - * - * Debugging constants - * - *************************************/ -#define LOG_TIMEKEEPER (0) -#define LOG_SIO (0) +namespace { /************************************* * @@ -513,18 +514,15 @@ void vegas_state::machine_start() /* identify our sound board */ if (m_dcs->get_rev() == dcs_audio_device::REV_DSIO) { m_dcs_idma_cs = 6; - if (LOG_SIO) - logerror("Found dsio\n"); + LOGMASKED(LOG_SIO, "Found dsio\n"); } else if (m_dcs->get_rev() == dcs_audio_device::REV_DENV) { m_dcs_idma_cs = 7; - if (LOG_SIO) - logerror("Found denver\n"); + LOGMASKED(LOG_SIO, "Found denver\n"); } else { m_dcs_idma_cs = 0; - if (LOG_SIO) - logerror("Did not find dcs2 sound board\n"); + LOGMASKED(LOG_SIO, "Did not find dcs2 sound board\n"); } m_cmos_unlocked = 0; @@ -557,12 +555,12 @@ void vegas_state::machine_reset() WRITE_LINE_MEMBER(vegas_state::watchdog_irq) { if (state && !(m_sio_irq_state & WD_IRQ)) { - logerror("%s: vegas_state::watchdog_irq state = %i\n", machine().describe_context(), state); + LOGMASKED(LOG_WATCHDOG, "%s: vegas_state::watchdog_irq state = %i\n", machine().describe_context(), state); m_sio_irq_state |= WD_IRQ; update_sio_irqs(); } else if (!state && (m_sio_irq_state & WD_IRQ)) { - logerror("%s: vegas_state::watchdog_irq state = %i\n", machine().describe_context(), state); + LOGMASKED(LOG_WATCHDOG, "%s: vegas_state::watchdog_irq state = %i\n", machine().describe_context(), state); m_sio_irq_state &= ~WD_IRQ; update_sio_irqs(); } @@ -574,8 +572,7 @@ WRITE_LINE_MEMBER(vegas_state::watchdog_irq) WRITE_LINE_MEMBER(vegas_state::watchdog_reset) { if (state) { - printf("vegas_state::watchdog_reset!!!\n"); - logerror("vegas_state::watchdog_reset!!!\n"); + LOGMASKED(LOG_WATCHDOG, "vegas_state::watchdog_reset!!!\n"); machine().schedule_soft_reset(); } } @@ -599,11 +596,11 @@ void vegas_state::timekeeper_w(offs_t offset, uint32_t data, uint32_t mem_mask) if (ACCESSING_BITS_24_31) m_timekeeper->write(offset * 4 + 3, data >> 24); if (offset*4 >= 0x7ff0) - if (LOG_TIMEKEEPER) logerror("%s timekeeper_w(%04X & %08X) = %08X\n", machine().describe_context(), offset*4, mem_mask, data); + LOGMASKED(LOG_TIMEKEEPER, "%s timekeeper_w(%04X & %08X) = %08X\n", machine().describe_context(), offset*4, mem_mask, data); m_cmos_unlocked = 0; } else - logerror("%s: timekeeper_w(%04X,%08X & %08X) without CMOS unlocked\n", machine().describe_context(), offset, data, mem_mask); + LOGMASKED(LOG_TIMEKEEPER_LOCKS, "%s: timekeeper_w(%04X,%08X & %08X) without CMOS unlocked\n", machine().describe_context(), offset, data, mem_mask); } @@ -621,7 +618,7 @@ uint32_t vegas_state::timekeeper_r(offs_t offset, uint32_t mem_mask) if (offset * 4 >= 0x7ff0) { // Initial RTC check expects reads to the RTC to take some time m_maincpu->eat_cycles(30); - if (LOG_TIMEKEEPER) logerror("%s: timekeeper_r(%04X & %08X) = %08X\n", machine().describe_context(), offset * 4, mem_mask, result); + LOGMASKED(LOG_TIMEKEEPER, "%s: timekeeper_r(%04X & %08X) = %08X\n", machine().describe_context(), offset * 4, mem_mask, result); } return result; } @@ -653,11 +650,10 @@ void vegas_state::update_sio_irqs() else { m_nile->pci_intr_c(CLEAR_LINE); } - if (LOG_SIO) { - std::string sioEnable = sioIRQString(m_sio_irq_enable); - std::string sioState = sioIRQString(m_sio_irq_state); - logerror("update_sio_irqs: irq_enable: %02x %s irq_state: %02x %s\n", m_sio_irq_enable, sioEnable, m_sio_irq_state, sioState); - } + + std::string sioEnable = sioIRQString(m_sio_irq_enable); + std::string sioState = sioIRQString(m_sio_irq_state); + LOGMASKED(LOG_SIO, "update_sio_irqs: irq_enable: %02x %s irq_state: %02x %s\n", m_sio_irq_enable, sioEnable, m_sio_irq_state, sioState); } WRITE_LINE_MEMBER(vegas_state::duart_irq_cb) @@ -671,8 +667,7 @@ WRITE_LINE_MEMBER(vegas_state::duart_irq_cb) WRITE_LINE_MEMBER(vegas_state::vblank_assert) { - if (LOG_SIO) - logerror("vblank_assert: m_sio_reset_ctrl: %04x state: %d\n", m_sio_reset_ctrl, state); + LOGMASKED(LOG_SIO, "vblank_assert: m_sio_reset_ctrl: %04x state: %d\n", m_sio_reset_ctrl, state); // latch on the correct polarity transition if ((m_sio_irq_enable & 0x20) && ((state && !(m_sio_reset_ctrl & 0x10)) || (!state && (m_sio_reset_ctrl & 0x10)))) { @@ -723,27 +718,18 @@ uint8_t vegas_state::sio_r(offs_t offset) case 1: // Interrupt Enable result = m_sio_irq_enable; - if (LOG_SIO) { - std::string sioBitSel = sioIRQString(result); - logerror("%s: sio_r: INTR ENABLE 0x%02x %s\n", machine().describe_context(), result, sioBitSel); - } + LOGMASKED(LOG_SIO, "%s: sio_r: INTR ENABLE 0x%02x %s\n", machine().describe_context(), result, sioIRQString(result).c_str()); break; case 2: // Interrupt Cause result = m_sio_irq_state & m_sio_irq_enable; - if (LOG_SIO) { - std::string sioBitSel = sioIRQString(result); - logerror("%s: sio_r: INTR CAUSE 0x%02x %s\n", machine().describe_context(), result, sioBitSel); - } + LOGMASKED(LOG_SIO, "%s: sio_r: INTR CAUSE 0x%02x %s\n", machine().describe_context(), result, sioIRQString(result).c_str()); //m_sio_irq_state &= ~0x02; break; case 3: // Interrupt Status result = m_sio_irq_state; - if (LOG_SIO) { - std::string sioBitSel = sioIRQString(result); - logerror("%s: sio_r: INTR STATUS 0x%02x %s\n", machine().describe_context(), result, sioBitSel); - } + LOGMASKED(LOG_SIO, "%s: sio_r: INTR STATUS 0x%02x %s\n", machine().describe_context(), result, sioIRQString(result).c_str()); break; case 4: // LED @@ -790,12 +776,12 @@ uint8_t vegas_state::sio_r(offs_t offset) result = (((m_io_8way[2]->read() & 0x40) >> 3) | ((m_io_8way[3]->read() & 0x7000) >> 8)); break; } - if (LOG_SIO) logerror("%s: sio_r: offset: %08x index: %d result: %02X\n", machine().describe_context(), offset, index, result); + LOGMASKED(LOG_SIO, "%s: sio_r: offset: %08x index: %d result: %02X\n", machine().describe_context(), offset, index, result); break; } } - if (LOG_SIO && (index < 0x1 || index > 0x4)) - logerror("%s: sio_r: offset: %08x index: %d result: %02X\n", machine().describe_context(), offset, index, result); + if (index < 0x1 || index > 0x4) + LOGMASKED(LOG_SIO, "%s: sio_r: offset: %08x index: %d result: %02X\n", machine().describe_context(), offset, index, result); return result; } @@ -807,8 +793,7 @@ void vegas_state::sio_w(offs_t offset, uint8_t data) int index = offset >> 12; switch (index) { case 0: - if (LOG_SIO) - logerror("sio_w: Reset Control offset: %08x index: %d data: %02X\n", offset, index, data); + LOGMASKED(LOG_SIO, "sio_w: Reset Control offset: %08x index: %d data: %02X\n", offset, index, data); // Reset Control: Bit 0=>Reset IOASIC, Bit 1=>Reset NSS Connection, Bit 2=>Reset SMC, Bit 3=>Reset VSYNC, Bit 4=>VSYNC Polarity /* bit 0 is used to reset the IOASIC */ if (!(data & (1 << 0))) @@ -834,18 +819,13 @@ void vegas_state::sio_w(offs_t offset, uint8_t data) // Bit 3 => NSS / Hi-Link // Bit 4 => Ethernet // Bit 5 => Vsync - if (LOG_SIO) { - std::string sioBitSel = sioIRQString(data); - logerror("sio_w: Interrupt Enable 0x%02x %s\n", data, sioBitSel); - //logerror("sio_w: Interrupt Enable offset: %08x index: %d data: %02X\n", offset, index, data); - } + LOGMASKED(LOG_SIO, "sio_w: Interrupt Enable 0x%02x %s\n", data, sioIRQString(data).c_str()); m_sio_irq_enable = data; update_sio_irqs(); break; case 4: // LED - if (LOG_SIO) - logerror("sio_w: LED offset: %08x index: %d data: %02X\n", offset, index, data); + LOGMASKED(LOG_SIO, "sio_w: LED offset: %08x index: %d data: %02X\n", offset, index, data); m_sio_led_state = data; break; case 6: @@ -855,8 +835,7 @@ void vegas_state::sio_w(offs_t offset, uint8_t data) case 7: // Watchdog m_timekeeper->watchdog_write(); - if (0 && LOG_SIO) - logerror("sio_w: Watchdog: %08x index: %d data: %02X\n", offset, index, data); + LOGMASKED(LOG_SIO_VERBOSE, "sio_w: Watchdog: %08x index: %d data: %02X\n", offset, index, data); //m_maincpu->eat_cycles(100); break; } @@ -880,37 +859,35 @@ void vegas_state::cpu_io_w(offs_t offset, uint8_t data) case 0: { m_system_led = ~data & 0xff; - if (LOG_SIO) { - char digit = 'U'; - switch (data & 0xff) { - case 0xc0: digit = '0'; break; - case 0xf9: digit = '1'; break; - case 0xa4: digit = '2'; break; - case 0xb0: digit = '3'; break; - case 0x99: digit = '4'; break; - case 0x92: digit = '5'; break; - case 0x82: digit = '6'; break; - case 0xf8: digit = '7'; break; - case 0x80: digit = '8'; break; - case 0x90: digit = '9'; break; - case 0x88: digit = 'A'; break; - case 0x83: digit = 'B'; break; - case 0xc6: digit = 'C'; break; - case 0xa7: digit = 'c'; break; - case 0xa1: digit = 'D'; break; - case 0x86: digit = 'E'; break; - case 0x87: digit = 'F'; break; - case 0x7f: digit = '.'; break; - case 0xf7: digit = '_'; break; - case 0xbf: digit = '|'; break; - case 0xfe: digit = '-'; break; - case 0xff: digit = 'Z'; break; - } - //popmessage("System LED: %C", digit); - logerror("%s: cpu_io_w System LED offset %X = %02X '%c'\n", machine().describe_context(), offset, data, digit); + char digit = 'U'; + switch (data & 0xff) { + case 0xc0: digit = '0'; break; + case 0xf9: digit = '1'; break; + case 0xa4: digit = '2'; break; + case 0xb0: digit = '3'; break; + case 0x99: digit = '4'; break; + case 0x92: digit = '5'; break; + case 0x82: digit = '6'; break; + case 0xf8: digit = '7'; break; + case 0x80: digit = '8'; break; + case 0x90: digit = '9'; break; + case 0x88: digit = 'A'; break; + case 0x83: digit = 'B'; break; + case 0xc6: digit = 'C'; break; + case 0xa7: digit = 'c'; break; + case 0xa1: digit = 'D'; break; + case 0x86: digit = 'E'; break; + case 0x87: digit = 'F'; break; + case 0x7f: digit = '.'; break; + case 0xf7: digit = '_'; break; + case 0xbf: digit = '|'; break; + case 0xfe: digit = '-'; break; + case 0xff: digit = 'Z'; break; } - } + //popmessage("System LED: %C", digit); + LOGMASKED(LOG_SIO, "%s: cpu_io_w System LED offset %X = %02X '%c'\n", machine().describe_context(), offset, data, digit); break; + } case 1: m_cpuio_data[2] = (m_cpuio_data[2] & ~0x02) | ((m_cpuio_data[1] & 0x01) << 1) | (m_cpuio_data[1] & 0x01); if (!(data & 0x1)) { @@ -919,20 +896,18 @@ void vegas_state::cpu_io_w(offs_t offset, uint8_t data) // Reset the SIO registers reset_sio(); } - if (LOG_SIO) - logerror("%s: cpu_io_w PLD Config offset %X = %02X\n", machine().describe_context(), offset, data); + LOGMASKED(LOG_SIO, "%s: cpu_io_w PLD Config offset %X = %02X\n", machine().describe_context(), offset, data); break; case 2: - if (LOG_SIO && (m_cpuio_data[3] & 0x1)) - logerror("%s: cpu_io_w PLD Status / Jamma Serial Sense offset %X = %02X\n", machine().describe_context(), offset, data); + if (m_cpuio_data[3] & 0x1) + LOGMASKED(LOG_SIO, "%s: cpu_io_w PLD Status / Jamma Serial Sense offset %X = %02X\n", machine().describe_context(), offset, data); break; case 3: // Bit 0: Enable SIO, Bit 1: Enable SIO_R0/IDE, Bit 2: Enable PCI - if (LOG_SIO) - logerror("%s: cpu_io_w System Reset offset %X = %02X\n", machine().describe_context(), offset, data); + LOGMASKED(LOG_SIO, "%s: cpu_io_w System Reset offset %X = %02X\n", machine().describe_context(), offset, data); break; default: - logerror("%s: cpu_io_w unknown offset %X = %02X\n", machine().describe_context(), offset, data); + LOGMASKED(LOG_UNKNOWN, "%s: cpu_io_w unknown offset %X = %02X\n", machine().describe_context(), offset, data); break; } } @@ -942,8 +917,8 @@ uint8_t vegas_state::cpu_io_r(offs_t offset) uint32_t result = 0; if (offset < 4) result = m_cpuio_data[offset]; - if (LOG_SIO && !(!(m_cpuio_data[3] & 0x1))) - logerror("%s:cpu_io_r offset %X = %02X\n", machine().describe_context(), offset, result); + if (m_cpuio_data[3] & 0x1) + LOGMASKED(LOG_SIO, "%s:cpu_io_r offset %X = %02X\n", machine().describe_context(), offset, result); return result; } diff --git a/src/mame/mips/mips.cpp b/src/mame/mips/mips.cpp index b12757eddbb..7285d4cd561 100644 --- a/src/mame/mips/mips.cpp +++ b/src/mame/mips/mips.cpp @@ -244,7 +244,6 @@ #include "debugger.h" -#define LOG_GENERAL (1U << 0) #define LOG_MMU (1U << 1) #define LOG_IOCB (1U << 2) diff --git a/src/mame/mips/mips_rambo.cpp b/src/mame/mips/mips_rambo.cpp index 892575ced58..f99b1626ecc 100644 --- a/src/mame/mips/mips_rambo.cpp +++ b/src/mame/mips/mips_rambo.cpp @@ -17,7 +17,6 @@ #include "emu.h" #include "mips_rambo.h" -#define LOG_GENERAL (1U << 0) #define LOG_REG (1U << 1) #define LOG_DMA (1U << 2) diff --git a/src/mame/misc/amaticmg.cpp b/src/mame/misc/amaticmg.cpp index 1e22ea25321..6a1637fddcf 100644 --- a/src/mame/misc/amaticmg.cpp +++ b/src/mame/misc/amaticmg.cpp @@ -428,7 +428,7 @@ // configurable logging -#define LOG_PPIOUT (1U << 1) +#define LOG_PPIOUT (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_PPIOUT) diff --git a/src/mame/misc/blitz68k.cpp b/src/mame/misc/blitz68k.cpp index ae3d4307de0..5284ffa45fb 100644 --- a/src/mame/misc/blitz68k.cpp +++ b/src/mame/misc/blitz68k.cpp @@ -65,8 +65,8 @@ To Do: #include "speaker.h" // configurable logging -#define LOG_MCU (1U << 1) -#define LOG_BLITTER (1U << 2) +#define LOG_MCU (1U << 1) +#define LOG_BLITTER (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_MCU | LOG_BLITTER) diff --git a/src/mame/misc/discoboy.cpp b/src/mame/misc/discoboy.cpp index 4cde919b55e..cfdd432173f 100644 --- a/src/mame/misc/discoboy.cpp +++ b/src/mame/misc/discoboy.cpp @@ -55,7 +55,7 @@ Notes: // configurable logging -#define LOG_UNKWRITE (1U << 1) +#define LOG_UNKWRITE (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_UNKWRITE) diff --git a/src/mame/misc/fireball.cpp b/src/mame/misc/fireball.cpp index 31dfdcd9d07..1e8a34805ce 100644 --- a/src/mame/misc/fireball.cpp +++ b/src/mame/misc/fireball.cpp @@ -9,8 +9,8 @@ some pics here http://www.schausteller.de/anzeigenmarkt/euro-ball-66634.html - TODO - -NEVER sends store command to Eeprom so all change are lost + TODO: + - Never sends store command to EEPROM so all changes are lost ************************************************************************************/ @@ -24,24 +24,20 @@ #include "fireball.lh" +#define LOG_DISPLAY (1U << 1) +#define LOG_DISPLAY2 (1U << 2) +#define LOG_INPUT (1U << 3) +#define LOG_AY8912 (1U << 4) +#define LOG_P1 (1U << 5) +#define LOG_P3 (1U << 6) +#define LOG_OUTPUT (1U << 7) -namespace { +#define VERBOSE (0) +#include "logmacro.h" -/**************************** -* LOG defines * -****************************/ -#define LOG_DISPLAY 0 -#define LOG_DISPLAY2 0 -#define LOG_INPUT 0 -#define LOG_AY8912 0 -#define LOG_P1 0 -#define LOG_P3 0 -#define LOG_OUTPUT 0 +namespace { -/**************************** -* Clock defines * -****************************/ #define CPU_CLK XTAL(11'059'200) #define AY_CLK XTAL(11'059'200)/8 @@ -60,6 +56,12 @@ public: void fireball(machine_config &config); private: + virtual void machine_start() override; + virtual void machine_reset() override; + + void fireball_map(address_map &map); + void fireball_io_map(address_map &map); + void io_00_w(uint8_t data); uint8_t io_00_r(); void io_02_w(uint8_t data); @@ -74,82 +76,72 @@ private: void p3_w(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(int_0); - void fireball_io_map(address_map &map); - void fireball_map(address_map &map); - uint8_t m_p1_data = 0; uint8_t m_p3_data = 0; - uint8_t int_timing = 0; - uint8_t int_data = 0; - uint8_t ay_data = 0; - uint8_t to_ay_data = 0; + uint8_t m_int_timing = 0; + uint8_t m_int_data = 0; + uint8_t m_ay_data = 0; + uint8_t m_to_ay_data = 0; uint8_t m_display_data = 0; - virtual void machine_reset() override; - virtual void machine_start() override { m_digits.resolve(); } + required_device m_maincpu; required_device m_ay; required_device m_eeprom; output_finder<8> m_digits; }; + /**************************** * Read/Write Handlers * ****************************/ - uint8_t fireball_state::io_00_r() { - uint8_t tmp=0; - - tmp=ioport("X2-4")->read(); - - if (LOG_INPUT) - logerror("return %02X from 0x00\n",tmp); + uint8_t tmp = ioport("X2-4")->read(); + LOGMASKED(LOG_INPUT, "return %02X from 0x00\n", tmp); return tmp; } void fireball_state::io_00_w(uint8_t data) { - m_display_data= m_display_data&0x7f; - if (LOG_DISPLAY) - logerror("write to 0x00 IO %02X, m_display_data= %01X\n",data,m_display_data); + m_display_data = m_display_data & 0x7f; + LOGMASKED(LOG_DISPLAY, "write to 0x00 IO %02X, m_display_data= %01X\n", data, m_display_data); - switch (data&0x0f) + switch (data & 0x0f) { - case 1: m_digits[2] = m_display_data; - break; - case 2: m_digits[1] = m_display_data; - break; - case 4: m_digits[4] = m_display_data; - break; - case 8: m_digits[3] = m_display_data; - break; + case 1: + m_digits[2] = m_display_data; + break; + case 2: + m_digits[1] = m_display_data; + break; + case 4: + m_digits[4] = m_display_data; + break; + case 8: + m_digits[3] = m_display_data; + break; } - if (LOG_OUTPUT) - logerror("write to 0x00 IO (X11-X11A) %02X\n",data&0xf0); + LOGMASKED(LOG_OUTPUT, "write to 0x00 IO (X11-X11A) %02X\n", data & 0xf0); output().set_value("Hopper1", BIT(data, 4)); output().set_value("Hopper2", BIT(data, 5)); output().set_value("Hopper3", BIT(data, 6)); } + uint8_t fireball_state::io_02_r() { - uint8_t tmp=0; - - tmp=ioport("X6-8")->read(); - - if (LOG_INPUT) - logerror("return %02X from 0x02\n",tmp); + uint8_t tmp = ioport("X6-8")->read(); + LOGMASKED(LOG_INPUT, "return %02X from 0x02\n", tmp); return tmp; } void fireball_state::io_02_w(uint8_t data) { - if (LOG_OUTPUT) - logerror("write to 0x00 IO (X7-X9) %02X\n",data); + LOGMASKED(LOG_OUTPUT, "write to 0x00 IO (X7-X9) %02X\n", data); output().set_value("GameOver", BIT(data, 0)); output().set_value("Title", BIT(data, 1)); @@ -161,134 +153,121 @@ void fireball_state::io_02_w(uint8_t data) output().set_value("RV", BIT(data, 7)); } -uint8_t fireball_state::io_04_r() -{ //contraves per mod prog - uint8_t tmp=0; - - tmp=ioport("X10-12")->read(); - if (LOG_INPUT) - logerror("return %02X from 0x04\n",tmp); +uint8_t fireball_state::io_04_r() +{ + uint8_t tmp = ioport("X10-12")->read(); + LOGMASKED(LOG_INPUT, "return %02X from 0x04\n", tmp); return tmp; } void fireball_state::io_04_w(uint8_t data) -{//display data - if (LOG_DISPLAY) - logerror("display datat write %02X\n",data); - m_display_data=data; +{ + // display data + LOGMASKED(LOG_DISPLAY, "display data write %02X\n", data); + m_display_data = data; } - uint8_t fireball_state::io_06_r() { - if (LOG_AY8912) - logerror("read from 0x06 IO\n"); + LOGMASKED(LOG_AY8912, "read from 0x06 IO\n"); + // bit 0 is unconnected + // bit 6 is used to detect if the unit is powered up - related to eeprom store? return 0xbe; - //bit 0x01 is NC - //bit 0x40 is used to detect is the unit is powered up!!! related to eeprom store? } void fireball_state::io_06_w(uint8_t data) { - if (LOG_AY8912) - logerror("write to 0x06 data =%02X\n",data); + LOGMASKED(LOG_AY8912, "write to 0x06 data =%02X\n", data); - to_ay_data= data; + m_to_ay_data = data; - if (LOG_DISPLAY2) - logerror("On board display write %02X\n",uint8_t(~(data&0xff))); + LOGMASKED(LOG_DISPLAY2, "On board display write %02X\n", uint8_t(~(data & 0xff))); - m_digits[7] = uint8_t(~(data&0xff)); + m_digits[7] = uint8_t(~(data & 0xff)); } uint8_t fireball_state::p1_r() { - uint8_t tmp=0; - tmp=(m_p1_data&0xfe)|(m_eeprom->do_read()); - if (LOG_P1) - logerror("readP1 port data %02X\n",tmp&0x01); + uint8_t tmp = (m_p1_data & 0xfe) | m_eeprom->do_read(); + LOGMASKED(LOG_P1, "read P1 port data %02X\n", tmp & 0x01); return tmp; } void fireball_state::p1_w(uint8_t data) { - //eeprom x24c44/ay8912/system stuff... - //bit0 goes to eeprom pin 3 and 4 (0x01) Data_in and Data_out - //bit1 goes to eeprom pin 1 (0x02) CE Hi active - //bit2 goes to eeprom pin 2 (0x04) SK Clock - //bit3 goes to dis/thr input of a ne555 that somehow reset the 8031... TODO - //bit4 goes to ay8912 pin bc1 (0x10) - //bit5 goes to ay8912 pin bdir (0x20) - //bit6 goes to TODO - //bit7 goes to TODO - - if (LOG_AY8912){ - if(( data&0x30) != (m_p1_data&0x30)){ - logerror("write ay8910 control bc1= %02X bdir= %02X\n",data&0x10, data&0x20); - } -} + // X24C44 EEPROM / AY8912 / system stuff + // bit 0 goes to EEPROM pins 3/4, DI and DO + // bit 1 goes to EEPROM pin 1, CE, active high + // bit 2 goes to EEPROM pin 2, SK (clock) + // bit 3 goes to DIS/THR input of a NE555 that somehow resets the 8031 (TODO) + // bit 4 goes to AY8912 pin bc1 + // bit 5 goes to AY8912 pin bdir + // bit 6, unknown + // bit 7, unknown + + if ((data & 0x30) != (m_p1_data & 0x30)) + { + LOGMASKED(LOG_AY8912, "write ay8910 control bc1= %02X bdir= %02X\n", BIT(data, 4), BIT(data, 5)); + } m_eeprom->di_write(data & 0x01); m_eeprom->clk_write((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); m_eeprom->cs_write((data & 0x02) ? ASSERT_LINE : CLEAR_LINE); - if (LOG_P1){ - if(( data&0xc8) != (m_p1_data&0xc8)){ - logerror("Unknown P1 data changed, old data %02X, new data %02X\n",m_p1_data,data); - } + if ((data & 0xc8) != (m_p1_data & 0xc8)) + { + LOGMASKED(LOG_P1, "Unknown P1 data changed, old data %02X, new data %02X\n", m_p1_data, data); } - //AY 3-8912 data write/read - - if (data & 0x20){ //bdir - //write to ay8912 - if (LOG_AY8912) - logerror("write to 0x06 bdir=1\n"); - if(data & 0x10){ - //address_w - if (LOG_AY8912) - logerror("write to 0x06 bc1=1\n"); - m_ay->address_w(to_ay_data); - if (LOG_AY8912) - logerror("AY8912 address latch write=%02X\n",to_ay_data); - }else{ - //data_w - if (LOG_AY8912) - logerror("write to 0x06 bc1=0\n"); - m_ay->data_w(to_ay_data); - if (LOG_AY8912) - logerror("AY8912 data write=%02X\n",to_ay_data); + // AY-3-8912 data write/read + + if (BIT(data, 5)) // bdir + { + // write to ay8912 + LOGMASKED(LOG_AY8912, "write to 0x06 bdir=1\n"); + if (BIT(data, 4)) + { + // address_w + LOGMASKED(LOG_AY8912, "write to 0x06 bc1=1\n"); + m_ay->address_w(m_to_ay_data); + LOGMASKED(LOG_AY8912, "AY8912 address latch write=%02X\n", m_to_ay_data); + } + else + { + // data_w + LOGMASKED(LOG_AY8912, "write to 0x06 bc1=0\n"); + m_ay->data_w(m_to_ay_data); + LOGMASKED(LOG_AY8912, "AY8912 data write=%02X\n", m_to_ay_data); } - }else{ - if (LOG_AY8912) - logerror("write to 0x06 bdir=0\n"); - ay_data=m_ay->data_r(); + } + else + { + LOGMASKED(LOG_AY8912, "write to 0x06 bdir=0\n"); + m_ay_data = m_ay->data_r(); } - m_p1_data=data; + m_p1_data = data; } uint8_t fireball_state::p3_r() { - uint8_t ret = 0xfb | ((int_data&1)<<2); - if (LOG_P3) - logerror("read P3 port data = %02X\n",ret); + uint8_t ret = 0xfb | ((m_int_data & 1) << 2); + LOGMASKED(LOG_P3, "read P3 port data = %02X\n", ret); return ret; } void fireball_state::p3_w(uint8_t data) { - if (LOG_P3) - logerror("write to P3 port data=%02X\n",data); - - m_p3_data=data; + LOGMASKED(LOG_P3, "write to P3 port data=%02X\n", data); + m_p3_data = data; } + /************************* * Memory Map Information * *************************/ @@ -300,12 +279,10 @@ void fireball_state::fireball_map(address_map &map) void fireball_state::fireball_io_map(address_map &map) { - map(0x00, 0x01).rw(FUNC(fireball_state::io_00_r), FUNC(fireball_state::io_00_w)); map(0x02, 0x03).rw(FUNC(fireball_state::io_02_r), FUNC(fireball_state::io_02_w)); map(0x04, 0x05).rw(FUNC(fireball_state::io_04_r), FUNC(fireball_state::io_04_w)); map(0x06, 0x07).rw(FUNC(fireball_state::io_06_r), FUNC(fireball_state::io_06_w)); - } @@ -313,7 +290,6 @@ void fireball_state::fireball_io_map(address_map &map) * Input Ports * *************************/ - static INPUT_PORTS_START( fireball ) PORT_START("X2-4") @@ -327,8 +303,8 @@ static INPUT_PORTS_START( fireball ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_I) PORT_NAME("800 Points") PORT_START("X6-8") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A) PORT_NAME("Empty Hopper A") //activeLow to fool the game code... - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_S) PORT_NAME("Empty Hopper B")//at least one hopper must be full + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A) PORT_NAME("Empty Hopper A") // active low to fool the game code - + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_S) PORT_NAME("Empty Hopper B") // at least one hopper must be full PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_D) PORT_NAME("Empty Hopper C") PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN1 ) @@ -441,13 +417,19 @@ static INPUT_PORTS_START( fireball ) INPUT_PORTS_END + /****************************** -* machine reset * +* Initialization * ******************************/ +void fireball_state::machine_start() +{ + m_digits.resolve(); +} + void fireball_state::machine_reset() { - int_timing=1; + m_int_timing = 1; m_digits[5] = 0x3f; m_digits[6] = 0x3f; @@ -465,39 +447,40 @@ void fireball_state::machine_reset() output().set_value("RV", 0); } + /************************* * INT callback * *************************/ -TIMER_DEVICE_CALLBACK_MEMBER( fireball_state::int_0 ) +TIMER_DEVICE_CALLBACK_MEMBER(fireball_state::int_0) { /* toggle the INT0 line on the CPU */ - if (int_timing==1){ - //logerror("INT set\n"); + if (m_int_timing == 1) + { m_maincpu->set_input_line(MCS51_INT0_LINE, ASSERT_LINE); - int_data=1; + m_int_data = 1; } - if (int_timing==2){ - //logerror("INT clear\n"); + if (m_int_timing == 2) + { m_maincpu->set_input_line(MCS51_INT0_LINE, CLEAR_LINE); - int_data=0; + m_int_data = 0; } - if (int_timing==5){ - int_timing=0; + if (m_int_timing == 5) + { + m_int_timing = 0; } - int_timing++; + m_int_timing++; } /************************* -* Machine Drivers * +* Machine Driver * *************************/ - void fireball_state::fireball(machine_config &config) { - /* basic machine hardware */ - I8031(config, m_maincpu, CPU_CLK); // + // basic machine hardware + I8031(config, m_maincpu, CPU_CLK); m_maincpu->set_addrmap(AS_PROGRAM, &fireball_state::fireball_map); m_maincpu->set_addrmap(AS_IO, &fireball_state::fireball_io_map); m_maincpu->port_in_cb<1>().set(FUNC(fireball_state::p1_r)); @@ -505,22 +488,22 @@ void fireball_state::fireball(machine_config &config) m_maincpu->port_in_cb<3>().set(FUNC(fireball_state::p3_r)); m_maincpu->port_out_cb<3>().set(FUNC(fireball_state::p3_w)); - //9ms from scope reading 111Hz take care of this in the handler + // 9ms from scope reading 111Hz take care of this in the handler TIMER(config, "int_0", 0).configure_periodic(FUNC(fireball_state::int_0), attotime::from_hz(555)); EEPROM_X24C44_16BIT(config, "eeprom"); - /* sound hardware */ + // sound hardware SPEAKER(config, "mono").front_center(); AY8912(config, m_ay, AY_CLK).add_route(ALL_OUTPUTS, "mono", 1.0); - /* Video */ + // video config.set_default_layout(layout_fireball); } /************************* -* Rom Load * +* ROM Load * *************************/ ROM_START(fireball) @@ -528,14 +511,14 @@ ROM_START(fireball) ROM_LOAD("euroball-89-07-13-c026.bin", 0x0000, 0x2000, CRC(cab3fc1c) SHA1(bcf0d17e26f2d9f5e20bda258728c989ea138702)) ROM_REGION16_BE( 0x20, "eeprom", 0 ) // default eeprom must have some specific value at 0x03 at least - ROM_LOAD( "fireball.nv", 0x0000, 0x020, CRC(1d0f5f0f) SHA1(8e68fcd8782f39ed3b1df6162db9be83cb3335e4) ) //default setting + ROM_LOAD( "fireball.nv", 0x0000, 0x020, CRC(1d0f5f0f) SHA1(8e68fcd8782f39ed3b1df6162db9be83cb3335e4) ) // default setting ROM_END } // anonymous namespace /************************* -* Game Drivers * +* Game Driver * *************************/ // YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS -GAME( 1989, fireball, 0, fireball, fireball, fireball_state, empty_init, ROT0, "Valco", "Fireball", MACHINE_MECHANICAL ) //1989 by rom name +GAME( 1989, fireball, 0, fireball, fireball, fireball_state, empty_init, ROT0, "Valco", "Fireball", MACHINE_MECHANICAL ) // 1989 by rom name diff --git a/src/mame/misc/gameace.cpp b/src/mame/misc/gameace.cpp index eca928be3b1..3544505a941 100644 --- a/src/mame/misc/gameace.cpp +++ b/src/mame/misc/gameace.cpp @@ -60,9 +60,9 @@ TODO: is sound emulation complete? there's data in audio ROM at 0xe000, and whil // configurable logging -#define LOG_MEMBANK (1U << 1) -#define LOG_PALBANK (1U << 2) -#define LOG_VIDBANK (1U << 3) +#define LOG_MEMBANK (1U << 1) +#define LOG_PALBANK (1U << 2) +#define LOG_VIDBANK (1U << 3) //#define VERBOSE (LOG_GENERAL | LOG_MEMBANK | LOG_PALBANK | LOG_VIDBANK) diff --git a/src/mame/misc/hapyfish.cpp b/src/mame/misc/hapyfish.cpp index 2c48af73c5f..8c4beb81273 100644 --- a/src/mame/misc/hapyfish.cpp +++ b/src/mame/misc/hapyfish.cpp @@ -59,10 +59,10 @@ #include -#define LOG_GPIO (1 << 0) -#define LOG_ADC (1 << 1) -#define LOG_I2C (1 << 2) -#define LOG_INPUTS (1 << 3) +#define LOG_GPIO (1U << 1) +#define LOG_ADC (1U << 2) +#define LOG_I2C (1U << 3) +#define LOG_INPUTS (1U << 4) #define VERBOSE (LOG_GPIO | LOG_ADC | LOG_I2C | LOG_INPUTS) #include "logmacro.h" diff --git a/src/mame/misc/istellar.cpp b/src/mame/misc/istellar.cpp index dad61328c0f..adc0596cd27 100644 --- a/src/mame/misc/istellar.cpp +++ b/src/mame/misc/istellar.cpp @@ -33,7 +33,7 @@ Todo: // configurable logging -#define LOG_CPU2 (1U << 1) +#define LOG_CPU2 (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_CPU2) diff --git a/src/mame/misc/mgavegas.cpp b/src/mame/misc/mgavegas.cpp index db368ce2ebe..1bf8796d99f 100644 --- a/src/mame/misc/mgavegas.cpp +++ b/src/mame/misc/mgavegas.cpp @@ -2,15 +2,16 @@ // copyright-holders:ANY /*********************************************************************************** - mgavegas.c + mgavegas.cpp Coin pusher - TODO - -better analog audio out/mixer - -some output (mostly not used) + TODO: + - better analog audio out/mixer + - some output (mostly not used) + - translate the driver's variables into intelligible English -Ver. 1.33 have no speech and no change funcion implemented in software +Ver. 1.33 has no speech and no change funcion implemented in software Ver. 2.1 and 2.3 have change function working and speech Ver. 2.2 should exist @@ -29,18 +30,16 @@ Ver. 2.2 should exist #include "mgavegas.lh" +#define LOG_AY8910 (1U << 1) +#define LOG_MSM5205 (1U << 2) +#define LOG_CSO1 (1U << 3) +#define LOG_CSO2 (1U << 4) -namespace { - -/**************************** -* LOG defines * -****************************/ +#define VERBOSE (0) +#include "logmacro.h" -#define LOG_AY8910 0 -#define LOG_MSM5205 0 -#define LOG_CSO1 0 -#define LOG_CSO2 0 +namespace { /**************************** * Clock defines * @@ -61,7 +60,37 @@ public: m_msm(*this, "5205"), m_ticket(*this, "hopper"), m_filter1(*this, "filter1"), - m_filter2(*this, "filter2") + m_filter2(*this, "filter2"), + m_mga4(*this, "MGA4"), + m_mga3(*this, "MGA3"), + m_mga2(*this, "MGA2"), + m_mga(*this, "MGA"), + m_pl(*this, "PL"), + m_pc(*this, "PC"), + m_pr(*this, "PR"), + m_luz_250_rul(*this, "250"), + m_luz_100_rul(*this, "1002"), + m_luz_50_rlul(*this, "50"), + m_luz_25_lrul(*this, "252"), + m_luz_25_rrul(*this, "25"), + m_fl(*this, "FL"), + m_fc(*this, "FC"), + m_fr(*this, "FR"), + m_insert_coin(*this, "INSERTCOIN"), + m_no_cambio(*this, "NOCAMBIO"), + m_fuse(*this, "FUSE"), + m_falta(*this, "FALTA"), + m_cl(*this, "CL"), + m_cc(*this, "CC"), + m_cr(*this, "CR"), + m_premio_s(*this, "PREMIOS"), + m_100(*this, "100"), + m_200(*this, "200"), + m_300(*this, "300"), + m_500(*this, "500"), + m_ml(*this, "ML"), + m_mc(*this, "MC"), + m_mr(*this, "MR") { } void mgavegas(machine_config &config); @@ -71,66 +100,10 @@ public: void init_mgavegas133(); private: - uint8_t m_int = 0; - - //OUT1 - uint8_t m_ckmod = 0; - uint8_t m_dmod = 0; - uint8_t m_emod = 0; - uint8_t m_inh = 0; - uint8_t m_hop = 0; - uint8_t m_seg = 0; - uint8_t m_printer = 0; - uint8_t m_auxp = 0; - - //helper... - uint8_t m_old_ckmod = 0; - uint8_t m_old_emod = 0; - - //OUT2 - uint8_t m_bobina_ctrl = 0; - uint8_t m_timbre = 0; - uint8_t m_coil_1 = 0; - uint8_t m_coil_2 = 0; - uint8_t m_coil_3 = 0; - uint8_t m_cont_ent = 0; - uint8_t m_cont_sal = 0; - uint8_t m_cont_caj = 0; + virtual void machine_start() override; + virtual void machine_reset() override; - //lamps out - uint64_t m_custom_data = 0L; - uint8_t m_auxs = 0; - uint8_t m_anal = 0; - uint8_t m_anacl = 0; - uint8_t m_anacr = 0; - uint8_t m_anar = 0; - uint8_t m_pl = 0; - uint8_t m_pc = 0; - uint8_t m_pr = 0; - uint8_t m_luz_250_rul = 0; - uint8_t m_luz_100_rul = 0; - uint8_t m_luz_50_rlul = 0; - uint8_t m_luz_25_lrul = 0; - uint8_t m_luz_25_rrul = 0; - uint8_t m_fl = 0; - uint8_t m_fc = 0; - uint8_t m_fr = 0; - uint8_t m_insert_coin = 0; - uint8_t m_no_cambio = 0; - uint8_t m_fuse = 0; - uint8_t m_falta = 0; - uint8_t m_anag = 0; - uint8_t m_cl = 0; - uint8_t m_cc = 0; - uint8_t m_cr = 0; - uint8_t m_premio_s = 0; - uint8_t m_100 = 0; - uint8_t m_200 = 0; - uint8_t m_300 = 0; - uint8_t m_500 = 0; - uint8_t m_ml = 0; - uint8_t m_mc = 0; - uint8_t m_mr = 0; + void mgavegas_map(address_map &map); uint8_t start_read(); @@ -146,7 +119,7 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(int_0); - void mgavegas_map(address_map &map); + void update_custom(); // devices required_device m_maincpu; @@ -156,295 +129,335 @@ private: required_device m_filter1; required_device m_filter2; - // driver_device overrides - virtual void machine_reset() override; - void update_custom(); - void update_lamp(); + // lamp outputs + uint64_t m_custom_data = 0ULL; + output_finder<> m_mga4; + output_finder<> m_mga3; + output_finder<> m_mga2; + output_finder<> m_mga; + output_finder<> m_pl; + output_finder<> m_pc; + output_finder<> m_pr; + output_finder<> m_luz_250_rul; + output_finder<> m_luz_100_rul; + output_finder<> m_luz_50_rlul; + output_finder<> m_luz_25_lrul; + output_finder<> m_luz_25_rrul; + output_finder<> m_fl; + output_finder<> m_fc; + output_finder<> m_fr; + output_finder<> m_insert_coin; + output_finder<> m_no_cambio; + output_finder<> m_fuse; + output_finder<> m_falta; + output_finder<> m_cl; + output_finder<> m_cc; + output_finder<> m_cr; + output_finder<> m_premio_s; + output_finder<> m_100; + output_finder<> m_200; + output_finder<> m_300; + output_finder<> m_500; + output_finder<> m_ml; + output_finder<> m_mc; + output_finder<> m_mr; + + uint8_t m_int = 0; + + // output group 1 + uint8_t m_ckmod = 0; + uint8_t m_dmod = 0; + uint8_t m_emod = 0; + uint8_t m_inh = 0; + uint8_t m_hop = 0; + uint8_t m_seg = 0; + + // helpers + uint8_t m_old_ckmod = 0; + uint8_t m_old_emod = 0; + + // output group 2 + uint8_t m_bobina_ctrl = 0; + uint8_t m_timbre = 0; + uint8_t m_coil_1 = 0; + uint8_t m_coil_2 = 0; + uint8_t m_coil_3 = 0; + uint8_t m_cont_ent = 0; + uint8_t m_cont_sal = 0; + uint8_t m_cont_caj = 0; }; -void mgavegas_state::update_lamp(){ - //output().set_value("AUXS", m_auxs); //unused - output().set_value("MGA4", m_anal&0x01); - output().set_value("MGA3", m_anacl&0x01); - output().set_value("MGA2", m_anacr&0x01); - output().set_value("MGA", m_anar&0x01); - output().set_value("PL", m_pl&0x01); - output().set_value("PC", m_pc&0x01); - output().set_value("PR", m_pr&0x01); - output().set_value("250", m_luz_250_rul&0x01); - output().set_value("1002", m_luz_100_rul&0x01); - output().set_value("50", m_luz_50_rlul&0x01); - output().set_value("252", m_luz_25_lrul&0x01); - output().set_value("25", m_luz_25_rrul&0x01); - output().set_value("FL", m_fl&0x01); - output().set_value("FC", m_fc&0x01); - output().set_value("FR", m_fr&0x01); - output().set_value("INSERTCOIN", m_insert_coin&0x01); - output().set_value("NOCAMBIO", m_no_cambio&0x01); - output().set_value("FUSE", m_fuse&0x01); - output().set_value("FALTA", m_falta&0x01); - //output().set_value("ANAG", m_anag&0x01); //unused - output().set_value("CL", m_cl&0x01); - output().set_value("CC", m_cc&0x01); - output().set_value("CR", m_cr&0x01); - output().set_value("PREMIOS", m_premio_s&0x01); - output().set_value("100", m_100&0x01); - output().set_value("200", m_200&0x01); - output().set_value("300", m_300&0x01); - output().set_value("500", m_500&0x01); - output().set_value("ML", m_ml&0x01); - output().set_value("MC", m_mc&0x01); - output().set_value("MR", m_mr&0x01); -/* - m_inh=BIT(data, 3); - m_printer=BIT(data, 6); //not_used - m_auxp=BIT(data, 7); //not_used - - m_bobina_ctrl=BIT(data, 0); - m_timbre=BIT(data, 1); - m_coil_1=BIT(data, 2); - m_coil_2=BIT(data, 3); - m_coil_3=BIT(data, 4); - m_cont_ent=BIT(data, 5); - m_cont_sal=BIT(data, 6); - m_cont_caj=BIT(data, 7); -*/ +/************************* +* Memory Map Information * +*************************/ + +void mgavegas_state::mgavegas_map(address_map &map) +{ + map(0x0000, 0x7fff).rom(); + map(0x8000, 0x9fff).ram().share("nvram"); + map(0xa000, 0xa003).rw(FUNC(mgavegas_state::r_a0), FUNC(mgavegas_state::w_a0)); // AY-3-8910 + map(0xc000, 0xc001).w(FUNC(mgavegas_state::cso1_w)); // /CSout1 + map(0xc400, 0xc401).w(FUNC(mgavegas_state::cso2_w)); // /CSout2 + map(0xc800, 0xc801).rw(FUNC(mgavegas_state::csoki_r), FUNC(mgavegas_state::csoki_w)); // /CSoki + //map(0xcc00, 0xcc01).rw(FUNC(mgavegas_state::cso3_r), FUNC(mgavegas_state::cso3_w)); // /CSout3, unused + //map(0xe000, 0xe003).rw(FUNC(mgavegas_state::r_e0), FUNC(mgavegas_state::w_e0)); // /CSaux, unused } -void mgavegas_state::update_custom(){ -uint64_t tmp; +/************************* +* Machine Initialization * +*************************/ + +void mgavegas_state::machine_start() +{ + m_mga4.resolve(); + m_mga3.resolve(); + m_mga2.resolve(); + m_mga.resolve(); + m_pl.resolve(); + m_pc.resolve(); + m_pr.resolve(); + m_luz_250_rul.resolve(); + m_luz_100_rul.resolve(); + m_luz_50_rlul.resolve(); + m_luz_25_lrul.resolve(); + m_luz_25_rrul.resolve(); + m_fl.resolve(); + m_fc.resolve(); + m_fr.resolve(); + m_insert_coin.resolve(); + m_no_cambio.resolve(); + m_fuse.resolve(); + m_falta.resolve(); + m_cl.resolve(); + m_cc.resolve(); + m_cr.resolve(); + m_premio_s.resolve(); + m_100.resolve(); + m_200.resolve(); + m_300.resolve(); + m_500.resolve(); + m_ml.resolve(); + m_mc.resolve(); + m_mr.resolve(); +} + +void mgavegas_state::machine_reset() +{ + m_int = 1; + m_custom_data = 0xffffffffffffffffULL; + + m_old_ckmod = 1; + m_old_emod = 0; + + m_ckmod = 0; + m_dmod = 0; + m_emod = 0; + m_inh = 0; + m_hop = 0; + m_seg = 0; + + m_bobina_ctrl = 0; + m_timbre = 0; + m_coil_1 = 0; + m_coil_2 = 0; + m_coil_3 = 0; + m_cont_ent = 0; + m_cont_sal = 0; + m_cont_caj = 0; + + m_filter1->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 0, 0, CAP_N(1)); // RC out of MSM5205 R=1K C=1nF + m_filter2->filter_rc_set_RC(filter_rc_device::HIGHPASS, 3846, 0, 0, CAP_N(100)); // ALP3B active-hybrid filter fc=2.6Khz - 2-pole? +} - if( (m_ckmod==1) & (m_old_ckmod==0) ){ - //vadid clock, sample the data - m_custom_data=(m_custom_data<<1)|(m_dmod&0x01); + +/************************* +* Lamp Updates * +*************************/ + +void mgavegas_state::update_custom() +{ + if (m_ckmod == 1 && m_old_ckmod == 0) + { + // valid clock, sample the data + m_custom_data = (m_custom_data << 1) | (m_dmod & 0x01); } - if( (m_emod==0) & (m_old_emod==1) ){ - //valid emod, check for valid data and updatae custom status this is how the hw works - if( (BIT(m_custom_data, 32)==0) && (BIT(m_custom_data, 33)==0) && (BIT(m_custom_data, 34)==0) && (BIT(m_custom_data, 35)==0) ){ - tmp=~m_custom_data; - m_auxs= tmp&0x00000001; -// m_anal= (tmp&0x00000002)>>1; //schematics error!!! -// m_anacl= (tmp&0x00000004)>>2; //schematics error!!! - m_luz_50_rlul= (tmp&0x00000002)>>1; - m_luz_25_lrul= (tmp&0x00000004)>>2; - m_anacr= (tmp&0x00000008)>>3; - m_anar= (tmp&0x00000010)>>4; - m_pl= (tmp&0x00000020)>>5; - m_pc= (tmp&0x00000040)>>6; - m_pr= (tmp&0x00000080)>>7; - m_luz_250_rul= (tmp&0x00000100)>>8; - m_luz_100_rul= (tmp&0x00000200)>>9; -// m_luz_50_rlul= (tmp&0x00000400)>>10; //schematics error!!! -// m_luz_25_lrul= (tmp&0x00000800)>>11; //schematics error!!! - m_anacl= (tmp&0x00000400)>>10; - m_anal= (tmp&0x00000800)>>11; - m_luz_25_rrul= (tmp&0x00001000)>>12; - m_fl= (tmp&0x00002000)>>13; - m_fc= (tmp&0x00004000)>>14; - m_fr= (tmp&0x00008000)>>15; - m_insert_coin= (tmp&0x00010000)>>16; - m_no_cambio= (tmp&0x00020000)>>17; - m_fuse= (tmp&0x00040000)>>18; - m_falta= (tmp&0x00080000)>>19; - m_anag= (tmp&0x00100000)>>20; - m_cl= (tmp&0x00200000)>>21; - m_cc= (tmp&0x00400000)>>22; - m_cr= (tmp&0x00800000)>>23; - m_premio_s= (tmp&0x01000000)>>24; - m_100= (tmp&0x02000000)>>25; - m_200= (tmp&0x04000000)>>26; - m_300= (tmp&0x08000000)>>27; - m_500= (tmp&0x10000000)>>28; - m_ml= (tmp&0x20000000)>>29; - m_mc= (tmp&0x40000000)>>30; - m_mr= (tmp&0x80000000)>>31; - - update_lamp(); + if (m_emod == 0 && m_old_emod == 1) + { + // valid emod, check for valid data and updatae custom output lamps - this is how the hardware works + if (BIT(m_custom_data, 32) == 0 && BIT(m_custom_data, 33) == 0 && BIT(m_custom_data, 34) == 0 && BIT(m_custom_data, 35) == 0) + { + uint64_t tmp = ~m_custom_data; + m_luz_50_rlul = BIT(tmp, 1); + m_luz_25_lrul = BIT(tmp, 2); + m_mga2 = BIT(tmp, 3); + m_mga = BIT(tmp, 4); + m_pl = BIT(tmp, 5); + m_pc = BIT(tmp, 6); + m_pr = BIT(tmp, 7); + m_luz_250_rul = BIT(tmp, 8); + m_luz_100_rul = BIT(tmp, 9); + m_mga3 = BIT(tmp, 10); + m_mga4 = BIT(tmp, 11); + m_luz_25_rrul = BIT(tmp, 12); + m_fl = BIT(tmp, 13); + m_fc = BIT(tmp, 14); + m_fr = BIT(tmp, 15); + m_insert_coin = BIT(tmp, 16); + m_no_cambio = BIT(tmp, 17); + m_fuse = BIT(tmp, 18); + m_falta = BIT(tmp, 19); + m_cl = BIT(tmp, 21); + m_cc = BIT(tmp, 22); + m_cr = BIT(tmp, 23); + m_premio_s = BIT(tmp, 24); + m_100 = BIT(tmp, 25); + m_200 = BIT(tmp, 26); + m_300 = BIT(tmp, 27); + m_500 = BIT(tmp, 28); + m_ml = BIT(tmp, 29); + m_mc = BIT(tmp, 30); + m_mr = BIT(tmp, 31); } } - m_old_ckmod=m_ckmod; - m_old_emod=m_emod; + m_old_ckmod = m_ckmod; + m_old_emod = m_emod; } uint8_t mgavegas_state::start_read() { -// in HW it look for /IOREQ going down to clear the IRQ line - if (m_int){ + // Hardware looks for falling /IOREQ to clear the IRQ line + if (m_int) + { m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); - m_int=0; + m_int = 0; } return 0xed; } - /**************************** * Read/Write Handlers * ****************************/ + uint8_t mgavegas_state::r_a0(offs_t offset) { -uint8_t ret=0; - - + uint8_t ret = 0; switch (offset&0x03) { - case 1: //bdir=0 BC1=1 - ret=m_ay->data_r(); - break; + case 1: // BDIR = 0, BC1 = 1 + ret = m_ay->data_r(); + break; default: - if (LOG_AY8910) - logerror("AY 3-8910 area unknow read!!!\n"); - break; + LOGMASKED(LOG_AY8910, "Unknown AY-3-8910 read\n"); + break; } - if (LOG_AY8910) - logerror("read from %04X return %02X\n",offset+0xa000,ret); + LOGMASKED(LOG_AY8910, "read from %04X return %02X\n", offset + 0xa000, ret); return ret; } void mgavegas_state::w_a0(offs_t offset, uint8_t data) { - if (LOG_AY8910) - logerror("write to %04X data = %02X \n",offset+0xa000,data); + LOGMASKED(LOG_AY8910, "write to %04X data = %02X \n", offset + 0xa000, data); switch (offset&0x03) { - case 0: //bdir=1 bc1=1 - m_ay->address_w(data); - break; - case 2: //bdir=1 bc1=0 - m_ay->data_w(data); - break; + case 0: // BDIR = 1, BC1 = 1 + m_ay->address_w(data); + break; + case 2: // BDIR = 1, BC1 = 0 + m_ay->data_w(data); + break; /* - case 1: //bdir=0 bc1=1 - break; - case 3: //bdir=0 bc1=0 - break; + case 1: // BDIR = 0, BC1 = 1 + break; + case 3: // BDIR = 0, BC1 = 0 + break; */ default: - if (LOG_AY8910) - logerror("AY 3-8910 area unknow write!!!\n"); - break; + LOGMASKED(LOG_AY8910, "Unknown AY-3-8910 write\n"); + break; } } - - - uint8_t mgavegas_state::csoki_r(offs_t offset) { - uint8_t ret=0; - - if (LOG_MSM5205) - logerror("read from %04X return %02X\n",offset+0xc800,ret); + uint8_t ret = 0; + LOGMASKED(LOG_MSM5205, "read from %04X return %02X\n", offset + 0xc800, ret); return ret; } void mgavegas_state::csoki_w(offs_t offset, uint8_t data) { - if (LOG_MSM5205) - logerror("MSM5205 write to %04X data = %02X \n",offset+0xc800,data); - m_msm->reset_w(data&0x10>>4); - m_msm->data_w(data&0x0f); + LOGMASKED(LOG_MSM5205, "MSM5205 write to %04X data = %02X \n", offset + 0xc800, data); + m_msm->reset_w(BIT(data, 4)); + m_msm->data_w(data & 0x0f); } void mgavegas_state::cso1_w(uint8_t data) { - if (LOG_CSO1) - logerror("write to CSO1 data = %02X\n",data); - - m_ckmod=BIT(data, 0); - m_dmod=BIT(data, 1); - m_emod=BIT(data, 2); - m_inh=BIT(data, 3); - m_hop=BIT(data, 4); - m_seg=BIT(data, 5); - m_printer=BIT(data, 6); //not_used - m_auxp=BIT(data, 7); //not_used + LOGMASKED(LOG_CSO1, "write to CSO1 data = %02X\n", data); + + m_ckmod = BIT(data, 0); + m_dmod = BIT(data, 1); + m_emod = BIT(data, 2); + m_inh = BIT(data, 3); + m_hop = BIT(data, 4); + m_seg = BIT(data, 5); update_custom(); m_ticket->motor_w(m_hop); } + void mgavegas_state::cso2_w(uint8_t data) { - if (LOG_CSO2) - logerror("write to CSO2 data = %02X\n",data); - - m_bobina_ctrl=BIT(data, 0); - m_timbre=BIT(data, 1); - m_coil_1=BIT(data, 2); - m_coil_2=BIT(data, 3); - m_coil_3=BIT(data, 4); - m_cont_ent=BIT(data, 5); - m_cont_sal=BIT(data, 6); - m_cont_caj=BIT(data, 7); - - update_lamp(); + LOGMASKED(LOG_CSO2, "write to CSO2 data = %02X\n", data); + + m_bobina_ctrl = BIT(data, 0); + m_timbre = BIT(data, 1); + m_coil_1 = BIT(data, 2); + m_coil_2 = BIT(data, 3); + m_coil_3 = BIT(data, 4); + m_cont_ent = BIT(data, 5); + m_cont_sal = BIT(data, 6); + m_cont_caj = BIT(data, 7); } uint8_t mgavegas_state::ay8910_a_r() { - uint8_t ret=0xff; - - ret=ioport("INA")->read(); - - if (LOG_AY8910) - logerror("read from port A return %02X\n",ret); - + uint8_t ret = ioport("INA")->read(); + LOGMASKED(LOG_AY8910, "read from port A return %02X\n",ret); return ret; } uint8_t mgavegas_state::ay8910_b_r() { - uint8_t ret=0xff; - - ret=ioport("DSW1")->read(); - - if (LOG_AY8910) - logerror("read from port B return %02X\n",ret); - + uint8_t ret = ioport("DSW1")->read(); + LOGMASKED(LOG_AY8910, "read from AY-3-910 port B: %02X\n",ret); return ret; } -/************************* -* Memory Map Information * -*************************/ - -void mgavegas_state::mgavegas_map(address_map &map) -{ - map(0x0000, 0x7fff).rom(); - map(0x8000, 0x9fff).ram().share("nvram"); - map(0xa000, 0xa003).rw(FUNC(mgavegas_state::r_a0), FUNC(mgavegas_state::w_a0)); // AY-3-8910 - map(0xc000, 0xc001).w(FUNC(mgavegas_state::cso1_w)); // /CSout1 - map(0xc400, 0xc401).w(FUNC(mgavegas_state::cso2_w)); // /CSout2 - map(0xc800, 0xc801).rw(FUNC(mgavegas_state::csoki_r), FUNC(mgavegas_state::csoki_w)); // /CSoki - //map(0xcc00, 0xcc01).rw(FUNC(mgavegas_state::cso3_r), FUNC(mgavegas_state::cso3_w)); // /CSout3 unused - //map(0xe000, 0xe003).rw(FUNC(mgavegas_state::r_e0), FUNC(mgavegas_state::w_e0)); // /CSaux unused -} - - /************************* * Input Ports * *************************/ - static INPUT_PORTS_START( mgavegas ) PORT_START("INA") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) //200ptas in for change with 8 25 ptas coins - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) //25 ptas in to play - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) //100ptas in for change with 4 25 ptas coins + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // 200ptas in for change with 8 25 ptas coins + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // 25 ptas in to play + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) // 100ptas in for change with 4 25 ptas coins PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_BIT( 0x10, IP_ACTIVE_LOW,IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("hopper", ticket_dispenser_device, line_r) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_Y) PORT_NAME("25 ptas level") //"hack" hopper always full @@ -474,7 +487,7 @@ static INPUT_PORTS_START( mgavegas ) PORT_DIPSETTING( 0x40, "Jackpot 1%" ) PORT_DIPSETTING( 0x60, "Jackpot 2,5%" ) PORT_DIPSETTING( 0x00, "Jackpot 5%" ) - //PORT_DIPSETTING( 0x20, DEF_STR( On ) ) //unlisted + //PORT_DIPSETTING( 0x20, DEF_STR( On ) ) // not listed PORT_DIPNAME( 0x80, 0x80, "Reset" ) PORT_DIPSETTING( 0x80, "Normal Gameplay" ) @@ -482,113 +495,14 @@ static INPUT_PORTS_START( mgavegas ) INPUT_PORTS_END -/****************************** -* machine reset * -******************************/ - -void mgavegas_state::machine_reset() -{ - m_int=1; - m_custom_data=0xffffffffffffffffU; - - m_old_ckmod=1; - m_old_emod=0; - - m_ckmod=0; - m_dmod=0; - m_emod=0; - m_inh=0; - m_hop=0; - m_seg=0; - m_printer=0; - m_auxp=0; - - - m_bobina_ctrl=0; - m_timbre=0; - m_coil_1=0; - m_coil_2=0; - m_coil_3=0; - m_cont_ent=0; - m_cont_sal=0; - m_cont_caj=0; - - m_auxs=0; - m_anal=0; - m_anacl=0; - m_anacr=0; - m_anar=0; - m_pl=0; - m_pc=0; - m_pr=0; - m_luz_250_rul=0; - m_luz_100_rul=0; - m_luz_50_rlul=0; - m_luz_25_lrul=0; - m_luz_25_rrul=0; - m_fl=0; - m_fc=0; - m_fr=0; - m_insert_coin=0; - m_no_cambio=0; - m_fuse=0; - m_falta=0; - m_anag=0; - m_cl=0; - m_cc=0; - m_cr=0; - m_premio_s=0; - m_100=0; - m_200=0; - m_300=0; - m_500=0; - m_ml=0; - m_mc=0; - m_mr=0; - - m_filter1->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 0, 0, CAP_N(1) ); /* RC out of MSM5205 R=1K C=1nF */ - m_filter2->filter_rc_set_RC(filter_rc_device::HIGHPASS, 3846, 0, 0, CAP_N(100 )); /*ALP3B active-hybrid filter fc=2.6Khz 2poles???*/ -} - - - -/****************************** -* machine init * -******************************/ - -void mgavegas_state::init_mgavegas21() -{ - //hack to clear the irq on reti instruction - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00ea, 0x00ea, read8smo_delegate(*this, FUNC(mgavegas_state::start_read))); -} - -void mgavegas_state::init_mgavegas() -{ - //hack to clear the irq on reti instruction - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00e2, 0x00e2, read8smo_delegate(*this, FUNC(mgavegas_state::start_read))); -} - - -TIMER_DEVICE_CALLBACK_MEMBER( mgavegas_state::int_0 ) -{ - if(m_int==0){ - m_maincpu->set_input_line(INPUT_LINE_IRQ0, HOLD_LINE); - } -} - -void mgavegas_state::init_mgavegas133() -{ - //hack to clear the irq on reti instruction - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00dd, 0x00dd, read8smo_delegate(*this, FUNC(mgavegas_state::start_read))); -} /************************* -* Machine Drivers * +* Machine Driver * *************************/ void mgavegas_state::mgavegas(machine_config &config) { - /* basic machine hardware */ + // basic machine hardware Z80(config, m_maincpu, CPU_CLK); m_maincpu->set_addrmap(AS_PROGRAM, &mgavegas_state::mgavegas_map); @@ -598,7 +512,7 @@ void mgavegas_state::mgavegas(machine_config &config) TICKET_DISPENSER(config, "hopper", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); - /* sound hardware */ + // sound hardware SPEAKER(config, "mono").front_center(); AY8910(config, m_ay, AY_CLK); m_ay->add_route(ALL_OUTPUTS, "mono", 0.3); @@ -612,14 +526,46 @@ void mgavegas_state::mgavegas(machine_config &config) FILTER_RC(config, "filter1").add_route(ALL_OUTPUTS, "filter2", 2.0); FILTER_RC(config, "filter2").add_route(ALL_OUTPUTS, "mono", 2.0); - /* Video */ + // video config.set_default_layout(layout_mgavegas); } -/************************* -* Rom Load * -*************************/ +/******************* +* Driver Init * +*******************/ + +void mgavegas_state::init_mgavegas21() +{ + // hack to clear the IRQ on RETI instruction + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00ea, 0x00ea, read8smo_delegate(*this, FUNC(mgavegas_state::start_read))); +} + +void mgavegas_state::init_mgavegas() +{ + // hack to clear the IRQ on RETI instruction + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00e2, 0x00e2, read8smo_delegate(*this, FUNC(mgavegas_state::start_read))); +} + + +TIMER_DEVICE_CALLBACK_MEMBER(mgavegas_state::int_0) +{ + if (m_int == 0) + { + m_maincpu->set_input_line(INPUT_LINE_IRQ0, HOLD_LINE); + } +} + +void mgavegas_state::init_mgavegas133() +{ + // hack to clear the IRQ on RETI instruction + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00dd, 0x00dd, read8smo_delegate(*this, FUNC(mgavegas_state::start_read))); +} + + +/********************** +* ROM Loads * +**********************/ ROM_START(mgavegas) diff --git a/src/mame/misc/monon_color.cpp b/src/mame/misc/monon_color.cpp index 37b58c4bcbd..afaa678fe27 100644 --- a/src/mame/misc/monon_color.cpp +++ b/src/mame/misc/monon_color.cpp @@ -64,7 +64,7 @@ #include "cpu/m6502/m65ce02.h" #include "sound/dac.h" -#define LOG_VDP (1U << 1) +#define LOG_VDP (1U << 1) #define LOG_MUSICMCUCOMMS (1U << 2) //#define VERBOSE (LOG_VDP) diff --git a/src/mame/misc/mosaic.cpp b/src/mame/misc/mosaic.cpp index bed929e769a..63212c3fa70 100644 --- a/src/mame/misc/mosaic.cpp +++ b/src/mame/misc/mosaic.cpp @@ -54,7 +54,7 @@ NOTE: PIC16C5x protection chip at 5A (UC02 as silkscreened on PCB) // configurable logging -#define LOG_PICSIM (1U << 1) +#define LOG_PICSIM (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_PICSIM) diff --git a/src/mame/misc/quizpun2.cpp b/src/mame/misc/quizpun2.cpp index 050e49c766f..1e33e6f199b 100644 --- a/src/mame/misc/quizpun2.cpp +++ b/src/mame/misc/quizpun2.cpp @@ -98,8 +98,8 @@ Notes: #include "tilemap.h" // configurable logging -#define LOG_SCROLL (1U << 1) -#define LOG_MCU (1U << 2) +#define LOG_SCROLL (1U << 1) +#define LOG_MCU (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_SCROLL | LOG_MCU) diff --git a/src/mame/misc/ssingles.cpp b/src/mame/misc/ssingles.cpp index 2f7adf3db93..e3dbe4104c8 100644 --- a/src/mame/misc/ssingles.cpp +++ b/src/mame/misc/ssingles.cpp @@ -159,7 +159,7 @@ Dumped by Chack'n // configurable logging -#define LOG_ATAMANOTPROT (1U << 1) +#define LOG_ATAMANOTPROT (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_ATAMANOTPROT) diff --git a/src/mame/misc/truco.cpp b/src/mame/misc/truco.cpp index 2ddc392c7ff..b2b134597d6 100644 --- a/src/mame/misc/truco.cpp +++ b/src/mame/misc/truco.cpp @@ -208,7 +208,7 @@ // configurable logging -#define LOG_PIA (1U << 1) +#define LOG_PIA (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_PIA) diff --git a/src/mame/misc/xyonix.cpp b/src/mame/misc/xyonix.cpp index 48bb8e053d7..ee3229a5956 100644 --- a/src/mame/misc/xyonix.cpp +++ b/src/mame/misc/xyonix.cpp @@ -34,7 +34,7 @@ TODO: // configurable logging -#define LOG_IO (1U << 1) +#define LOG_IO (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_IO) diff --git a/src/mame/motorola/mvme147.cpp b/src/mame/motorola/mvme147.cpp index eec5592fb3b..d5d4a6977b5 100644 --- a/src/mame/motorola/mvme147.cpp +++ b/src/mame/motorola/mvme147.cpp @@ -161,21 +161,10 @@ #include "machine/clock.h" #include "machine/timekpr.h" -#define LOG_GENERAL 0x01 -#define LOG_SETUP 0x02 -#define LOG_PRINTF 0x04 +#define VERBOSE (0) // (LOG_GENERAL) +//#define LOG_OUTPUT_FUNC osd_printf_info +#include "logmacro.h" -#define VERBOSE 0 // (LOG_PRINTF | LOG_SETUP | LOG_GENERAL) - -#define LOGMASK(mask, ...) do { if (VERBOSE & mask) logerror(__VA_ARGS__); } while (0) -#define LOGLEVEL(mask, level, ...) do { if ((VERBOSE & mask) >= level) logerror(__VA_ARGS__); } while (0) - -#define LOG(...) LOGMASK(LOG_GENERAL, __VA_ARGS__) -#define LOGSETUP(...) LOGMASK(LOG_SETUP, __VA_ARGS__) - -#if VERBOSE & LOG_PRINTF -#define logerror printf -#endif #ifdef _MSC_VER #define FUNCNAME __func__ diff --git a/src/mame/motorola/mvme162.cpp b/src/mame/motorola/mvme162.cpp index 56b97a2db60..3374175f61f 100644 --- a/src/mame/motorola/mvme162.cpp +++ b/src/mame/motorola/mvme162.cpp @@ -160,14 +160,10 @@ #include "machine/clock.h" #include "machine/timekpr.h" -#define LOG_SETUP (1U << 1) - -//#define VERBOSE (LOG_GENERAL | LOG_SETUP) -//#define LOG_OUTPUT_STREAM std::cout - +#define VERBOSE (0) // (LOG_GENERAL) +//#define LOG_OUTPUT_STREAM osd_printf_info #include "logmacro.h" -#define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) //************************************************************************** // MACROS / CONSTANTS diff --git a/src/mame/mr/dribling.cpp b/src/mame/mr/dribling.cpp index 90665125250..6254367921d 100644 --- a/src/mame/mr/dribling.cpp +++ b/src/mame/mr/dribling.cpp @@ -45,9 +45,9 @@ // configurable logging -#define LOG_MISC (1U << 1) -#define LOG_SOUND (1U << 2) -#define LOG_PB (1U << 3) +#define LOG_MISC (1U << 1) +#define LOG_SOUND (1U << 2) +#define LOG_PB (1U << 3) //#define VERBOSE (LOG_GENERAL | LOG_MISC | LOG_SOUND | LOG_PB) diff --git a/src/mame/namco/galaga_v.cpp b/src/mame/namco/galaga_v.cpp index a310d055322..71b8d84b0a5 100644 --- a/src/mame/namco/galaga_v.cpp +++ b/src/mame/namco/galaga_v.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "galaga.h" -#define LOG_DEBUG (1U << 0) +#define LOG_DEBUG (1U << 1) #define LOG_ALL (LOG_DEBUG) #define VERBOSE (LOG_ALL) diff --git a/src/mame/namco/namcond1.cpp b/src/mame/namco/namcond1.cpp index c67cd7097fb..afc9662c9a0 100644 --- a/src/mame/namco/namcond1.cpp +++ b/src/mame/namco/namcond1.cpp @@ -206,7 +206,7 @@ Some logic, resistors/caps/transistors, some connectors etc. // configurable logging -#define LOG_CUSKEY (1U << 1) +#define LOG_CUSKEY (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_CUSKEY) diff --git a/src/mame/ncd/ncd68k.cpp b/src/mame/ncd/ncd68k.cpp index f0c076ff554..fc6930dc6f8 100644 --- a/src/mame/ncd/ncd68k.cpp +++ b/src/mame/ncd/ncd68k.cpp @@ -77,7 +77,6 @@ #include "screen.h" #include "video/bt47x.h" -#define LOG_GENERAL (1U << 0) #define LOG_MCU (1U << 1) //#define VERBOSE (LOG_GENERAL|LOG_MCU) diff --git a/src/mame/nec/ews4800.cpp b/src/mame/nec/ews4800.cpp index 71f12c802df..67649532cc1 100644 --- a/src/mame/nec/ews4800.cpp +++ b/src/mame/nec/ews4800.cpp @@ -32,8 +32,6 @@ #include "debugger.h" -#define LOG_GENERAL (1U << 0) - #define VERBOSE 0 #include "logmacro.h" diff --git a/src/mame/nec/pc88va_sgp.cpp b/src/mame/nec/pc88va_sgp.cpp index 17f78530acc..9bea62bf930 100644 --- a/src/mame/nec/pc88va_sgp.cpp +++ b/src/mame/nec/pc88va_sgp.cpp @@ -22,7 +22,7 @@ TODO: #include -#define LOG_COMMAND (1U << 2) +#define LOG_COMMAND (1U << 1) #define VERBOSE (LOG_GENERAL) //#define LOG_OUTPUT_STREAM std::cout diff --git a/src/mame/nec/pc88va_v.cpp b/src/mame/nec/pc88va_v.cpp index 3dd41cc341f..30f4ce5fea4 100644 --- a/src/mame/nec/pc88va_v.cpp +++ b/src/mame/nec/pc88va_v.cpp @@ -7,12 +7,12 @@ #include -#define LOG_IDP (1U << 2) // TSP data -#define LOG_FB (1U << 3) // framebuffer strips (verbose) -#define LOG_KANJI (1U << 4) // empty Kanji data warnings -#define LOG_CRTC (1U << 5) -#define LOG_COLOR (1U << 6) // current color mode -#define LOG_TEXT (1U << 7) // text strips (verbose) +#define LOG_IDP (1U << 1) // TSP data +#define LOG_FB (1U << 2) // framebuffer strips (verbose) +#define LOG_KANJI (1U << 3) // empty Kanji data warnings +#define LOG_CRTC (1U << 4) +#define LOG_COLOR (1U << 5) // current color mode +#define LOG_TEXT (1U << 6) // text strips (verbose) #define VERBOSE (LOG_GENERAL | LOG_IDP) //#define LOG_OUTPUT_STREAM std::cout diff --git a/src/mame/nec/pce_cd.cpp b/src/mame/nec/pce_cd.cpp index 2e4dc4b5baa..6f8e0acb170 100644 --- a/src/mame/nec/pce_cd.cpp +++ b/src/mame/nec/pce_cd.cpp @@ -31,12 +31,12 @@ TODO: #include "coreutil.h" #include "pce_cd.h" -#define LOG_CMD (1U << 1) -#define LOG_CDDA (1U << 2) -#define LOG_SCSI (1U << 3) -#define LOG_FADER (1U << 4) -#define LOG_IRQ (1U << 5) -#define LOG_SCSIXFER (1U << 6) // single byte transfers, verbose +#define LOG_CMD (1U << 1) +#define LOG_CDDA (1U << 2) +#define LOG_SCSI (1U << 3) +#define LOG_FADER (1U << 4) +#define LOG_IRQ (1U << 5) +#define LOG_SCSIXFER (1U << 6) // single byte transfers, verbose #define VERBOSE (LOG_GENERAL | LOG_CMD | LOG_CDDA | LOG_FADER) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/neogeo/neogeo.cpp b/src/mame/neogeo/neogeo.cpp index 5af91a4a40a..8ab79ec86a3 100644 --- a/src/mame/neogeo/neogeo.cpp +++ b/src/mame/neogeo/neogeo.cpp @@ -560,8 +560,10 @@ #include "irrmaze.lh" #include "neogeo.lh" +#define LOG_VIDEO_SYSTEM (1U << 1) -#define LOG_VIDEO_SYSTEM (0) +#define VERBOSE (0) +#include "logmacro.h" class mvs_state : public ngarcade_base_state @@ -757,7 +759,7 @@ protected: void neogeo_base_state::adjust_display_position_interrupt_timer() { attotime period = attotime::from_ticks((uint64_t)m_display_counter + 1, NEOGEO_PIXEL_CLOCK); - if (LOG_VIDEO_SYSTEM) logerror("adjust_display_position_interrupt_timer current y: %02x current x: %02x target y: %x target x: %x\n", m_screen->vpos(), m_screen->hpos(), (m_display_counter + 1) / NEOGEO_HTOTAL, (m_display_counter + 1) % NEOGEO_HTOTAL); + LOGMASKED(LOG_VIDEO_SYSTEM, "adjust_display_position_interrupt_timer current y: %02x current x: %02x target y: %x target x: %x\n", m_screen->vpos(), m_screen->hpos(), (m_display_counter + 1) / NEOGEO_HTOTAL, (m_display_counter + 1) % NEOGEO_HTOTAL); m_display_position_interrupt_timer->adjust(period); } @@ -773,7 +775,7 @@ void neogeo_base_state::set_display_counter_msb(uint16_t data) { m_display_counter = (m_display_counter & 0x0000ffff) | ((uint32_t)data << 16); - if (LOG_VIDEO_SYSTEM) logerror("PC %06x: set_display_counter %08x\n", m_maincpu->pc(), m_display_counter); + LOGMASKED(LOG_VIDEO_SYSTEM, "PC %06x: set_display_counter %08x\n", m_maincpu->pc(), m_display_counter); } @@ -781,11 +783,11 @@ void neogeo_base_state::set_display_counter_lsb(uint16_t data) { m_display_counter = (m_display_counter & 0xffff0000) | data; - if (LOG_VIDEO_SYSTEM) logerror("PC %06x: set_display_counter %08x\n", m_maincpu->pc(), m_display_counter); + LOGMASKED(LOG_VIDEO_SYSTEM, "PC %06x: set_display_counter %08x\n", m_maincpu->pc(), m_display_counter); if (m_display_position_interrupt_control & IRQ2CTRL_LOAD_RELATIVE) { - if (LOG_VIDEO_SYSTEM) logerror("AUTOLOAD_RELATIVE "); + LOGMASKED(LOG_VIDEO_SYSTEM, "AUTOLOAD_RELATIVE "); adjust_display_position_interrupt_timer(); } } @@ -814,11 +816,11 @@ void neogeo_base_state::acknowledge_interrupt(uint16_t data) TIMER_CALLBACK_MEMBER(neogeo_base_state::display_position_interrupt_callback) { - if (LOG_VIDEO_SYSTEM) logerror("--- Scanline @ %d,%d\n", m_screen->vpos(), m_screen->hpos()); + LOGMASKED(LOG_VIDEO_SYSTEM, "--- Scanline @ %d,%d\n", m_screen->vpos(), m_screen->hpos()); if (m_display_position_interrupt_control & IRQ2CTRL_ENABLE) { - if (LOG_VIDEO_SYSTEM) logerror("*** Scanline interrupt (IRQ2) *** y: %02x x: %02x\n", m_screen->vpos(), m_screen->hpos()); + LOGMASKED(LOG_VIDEO_SYSTEM, "*** Scanline interrupt (IRQ2) *** y: %02x x: %02x\n", m_screen->vpos(), m_screen->hpos()); m_display_position_interrupt_pending = 1; update_interrupts(); @@ -826,7 +828,7 @@ TIMER_CALLBACK_MEMBER(neogeo_base_state::display_position_interrupt_callback) if (m_display_position_interrupt_control & IRQ2CTRL_AUTOLOAD_REPEAT) { - if (LOG_VIDEO_SYSTEM) logerror("AUTOLOAD_REPEAT "); + LOGMASKED(LOG_VIDEO_SYSTEM, "AUTOLOAD_REPEAT "); adjust_display_position_interrupt_timer(); } } @@ -836,7 +838,7 @@ TIMER_CALLBACK_MEMBER(neogeo_base_state::display_position_vblank_callback) { if (m_display_position_interrupt_control & IRQ2CTRL_AUTOLOAD_VBLANK) { - if (LOG_VIDEO_SYSTEM) logerror("AUTOLOAD_VBLANK "); + LOGMASKED(LOG_VIDEO_SYSTEM, "AUTOLOAD_VBLANK "); adjust_display_position_interrupt_timer(); } @@ -847,7 +849,7 @@ TIMER_CALLBACK_MEMBER(neogeo_base_state::display_position_vblank_callback) TIMER_CALLBACK_MEMBER(neogeo_base_state::vblank_interrupt_callback) { - if (LOG_VIDEO_SYSTEM) logerror("+++ VBLANK @ %d,%d\n", m_screen->vpos(), m_screen->hpos()); + LOGMASKED(LOG_VIDEO_SYSTEM, "+++ VBLANK @ %d,%d\n", m_screen->vpos(), m_screen->hpos()); m_vblank_interrupt_pending = 1; update_interrupts(); diff --git a/src/mame/nintendo/mmagic.cpp b/src/mame/nintendo/mmagic.cpp index 7e6b39c217c..f16559c24be 100644 --- a/src/mame/nintendo/mmagic.cpp +++ b/src/mame/nintendo/mmagic.cpp @@ -55,16 +55,13 @@ #include "screen.h" #include "tilemap.h" +#define LOG_AUDIO (1U << 1) -namespace { - - -//************************************************************************** -// CONSTANTS / MACROS -//************************************************************************** +#define VERBOSE (LOG_AUDIO) +#include "logmacro.h" -#define LOG_AUDIO 1 +namespace { //************************************************************************** // TYPE DEFINITIONS @@ -316,8 +313,7 @@ static constexpr const char* const sample_names[] = void mmagic_state::audio_w(uint8_t data) { - if (LOG_AUDIO) - logerror("audio_w: %02x\n", data); + LOGMASKED(LOG_AUDIO, "audio_w: %02x\n", data); data ^= 0xff; if (data != m_audio) diff --git a/src/mame/nintendo/nes_sh6578.cpp b/src/mame/nintendo/nes_sh6578.cpp index 0ed79a2ad1d..8fb5f72162e 100644 --- a/src/mame/nintendo/nes_sh6578.cpp +++ b/src/mame/nintendo/nes_sh6578.cpp @@ -22,8 +22,8 @@ #include "machine/bankdev.h" #include "machine/timer.h" -#define LOG_DMA (1U << 2) -#define LOG_PPU (1U << 1) +#define LOG_DMA (1U << 1) +#define LOG_PPU (1U << 2) //#define VERBOSE (LOG_PPU) #define VERBOSE (0) diff --git a/src/mame/nintendo/vt1682.cpp b/src/mame/nintendo/vt1682.cpp index a79659aa4c3..6223a28331c 100644 --- a/src/mame/nintendo/vt1682.cpp +++ b/src/mame/nintendo/vt1682.cpp @@ -76,7 +76,7 @@ #define LOG_SRAM_WRITES (1U << 2) #define LOG_OTHER (1U << 3) -#define LOG_ALL ( LOG_VRAM_WRITES | LOG_SRAM_WRITES | LOG_OTHER ) +#define LOG_ALL (LOG_VRAM_WRITES | LOG_SRAM_WRITES | LOG_OTHER) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/nintendo/vt1682_alu.cpp b/src/mame/nintendo/vt1682_alu.cpp index 0114c56aab5..dfc16145840 100644 --- a/src/mame/nintendo/vt1682_alu.cpp +++ b/src/mame/nintendo/vt1682_alu.cpp @@ -6,9 +6,9 @@ #define LOG_ALU (1U << 1) -#define LOG_ALL ( LOG_ALU ) +#define LOG_ALL (LOG_ALU) -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/nintendo/vt1682_io.cpp b/src/mame/nintendo/vt1682_io.cpp index aaa4f0bbf14..8833f2d1a03 100644 --- a/src/mame/nintendo/vt1682_io.cpp +++ b/src/mame/nintendo/vt1682_io.cpp @@ -4,11 +4,11 @@ #include "emu.h" #include "vt1682_io.h" -#define LOG_IO (1U << 1) +#define LOG_IO (1U << 1) -#define LOG_ALL ( LOG_IO ) +#define LOG_ALL (LOG_IO) -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/nintendo/vt1682_timer.cpp b/src/mame/nintendo/vt1682_timer.cpp index 57a0421bcf6..b7abc771480 100644 --- a/src/mame/nintendo/vt1682_timer.cpp +++ b/src/mame/nintendo/vt1682_timer.cpp @@ -7,11 +7,11 @@ #include "emu.h" #include "vt1682_timer.h" -#define LOG_TIMER (1U << 1) +#define LOG_TIMER (1U << 1) -#define LOG_ALL ( LOG_TIMER ) +#define LOG_ALL (LOG_TIMER) -#define VERBOSE (LOG_TIMER) +#define VERBOSE (LOG_TIMER) #include "logmacro.h" // NOTE, system timer base clock can also be changed with "0x210B TSYNEN" diff --git a/src/mame/nintendo/vt1682_uio.cpp b/src/mame/nintendo/vt1682_uio.cpp index 000ec8acbfe..a6a0230e820 100644 --- a/src/mame/nintendo/vt1682_uio.cpp +++ b/src/mame/nintendo/vt1682_uio.cpp @@ -8,9 +8,9 @@ #define LOG_UIO (1U << 1) -#define LOG_ALL ( LOG_UIO ) +#define LOG_ALL (LOG_UIO) -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/nokia/dbox.cpp b/src/mame/nokia/dbox.cpp index 46554d7fa82..7bad0a77751 100644 --- a/src/mame/nokia/dbox.cpp +++ b/src/mame/nokia/dbox.cpp @@ -412,17 +412,15 @@ // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h -#define LOG_SETUP (1U << 1) -#define LOG_DISPLAY (1U << 2) -#define LOG_FLASH (1U << 3) +#define LOG_SETUP (1U << 1) +#define LOG_DISPLAY (1U << 2) +#define LOG_FLASH (1U << 3) #define VERBOSE (LOG_FLASH) #define LOG_OUTPUT_FUNC printf #include "logmacro.h" -//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGDISPLAY(...) LOGMASKED(LOG_DISPLAY, __VA_ARGS__) #define LOGFLASH(...) LOGMASKED(LOG_FLASH, __VA_ARGS__) diff --git a/src/mame/nokia/nokia_3310.cpp b/src/mame/nokia/nokia_3310.cpp index 0fb3572a401..fb59e8c3b60 100644 --- a/src/mame/nokia/nokia_3310.cpp +++ b/src/mame/nokia/nokia_3310.cpp @@ -22,12 +22,14 @@ #include "emupal.h" #include "screen.h" +#define LOG_MAD2_REGISTER_ACCESS (1U << 1) +#define LOG_CCONT_REGISTER_ACCESS (1U << 2) -namespace { +#define VERBOSE (0) +#include "logmacro.h" -#define LOG_MAD2_REGISTER_ACCESS (0) -#define LOG_CCONT_REGISTER_ACCESS (0) +namespace { class noki3310_state : public driver_device { @@ -112,7 +114,6 @@ private: }; -#if LOG_MAD2_REGISTER_ACCESS static const char * nokia_mad2_reg_desc(uint8_t offset) { switch(offset) @@ -200,9 +201,7 @@ static const char * nokia_mad2_reg_desc(uint8_t offset) default: return ""; } } -#endif -#if LOG_CCONT_REGISTER_ACCESS static const char * nokia_ccont_reg_desc(uint8_t offset) { switch(offset) @@ -226,7 +225,6 @@ static const char * nokia_ccont_reg_desc(uint8_t offset) default: return ""; } } -#endif void noki3310_state::machine_start() { @@ -332,9 +330,7 @@ void noki3310_state::nokia_ccont_w(uint8_t data) { if (m_ccont.dc == false) { -#if LOG_CCONT_REGISTER_ACCESS - logerror("CCONT command %s %x\n", data & 4 ? "R" : "W", data>>3); -#endif + LOGMASKED(LOG_CCONT_REGISTER_ACCESS, "CCONT command %s %x\n", data & 4 ? "R" : "W", data>>3); m_ccont.cmd = data; } else @@ -380,9 +376,7 @@ void noki3310_state::nokia_ccont_w(uint8_t data) break; } -#if LOG_CCONT_REGISTER_ACCESS - logerror("CCONT W %02x = %02x %s\n", addr, data, nokia_ccont_reg_desc(addr)); -#endif + LOGMASKED(LOG_CCONT_REGISTER_ACCESS, "CCONT W %02x = %02x %s\n", addr, data, nokia_ccont_reg_desc(addr)); } m_ccont.dc = !m_ccont.dc; @@ -408,9 +402,7 @@ uint8_t noki3310_state::nokia_ccont_r() m_ccont.dc = !m_ccont.dc; -#if LOG_CCONT_REGISTER_ACCESS - logerror("CCONT R %02x = %02x %s\n", addr, data, nokia_ccont_reg_desc(addr)); -#endif + LOGMASKED(LOG_CCONT_REGISTER_ACCESS, "CCONT R %02x = %02x %s\n", addr, data, nokia_ccont_reg_desc(addr)); return data; } @@ -555,9 +547,7 @@ uint8_t noki3310_state::mad2_io_r(offs_t offset) break; } -#if LOG_MAD2_REGISTER_ACCESS - logerror("MAD2 R %02x = %02x %s\n", offset, data, nokia_mad2_reg_desc(offset)); -#endif + LOGMASKED(LOG_MAD2_REGISTER_ACCESS, "MAD2 R %02x = %02x %s\n", offset, data, nokia_mad2_reg_desc(offset)); return data; } @@ -602,39 +592,29 @@ void noki3310_state::mad2_io_w(offs_t offset, uint8_t data) break; } -#if LOG_MAD2_REGISTER_ACCESS - logerror("MAD2 W %02x = %02x %s\n", offset, data, nokia_mad2_reg_desc(offset)); -#endif + LOGMASKED(LOG_MAD2_REGISTER_ACCESS, "MAD2 W %02x = %02x %s\n", offset, data, nokia_mad2_reg_desc(offset)); } uint8_t noki3310_state::mad2_dspif_r(offs_t offset) { -#if LOG_MAD2_REGISTER_ACCESS - logerror("MAD2 R %02x DSPIF\n", offset); -#endif + LOGMASKED(LOG_MAD2_REGISTER_ACCESS, "MAD2 R %02x DSPIF\n", offset); return 0; } void noki3310_state::mad2_dspif_w(offs_t offset, uint8_t data) { -#if LOG_MAD2_REGISTER_ACCESS - logerror("MAD2 W %02x = %02x DSPIF\n", offset, data); -#endif + LOGMASKED(LOG_MAD2_REGISTER_ACCESS, "MAD2 W %02x = %02x DSPIF\n", offset, data); } uint8_t noki3310_state::mad2_mcuif_r(offs_t offset) { -#if LOG_MAD2_REGISTER_ACCESS - logerror("MAD2 R %02x MCUIF\n", offset); -#endif + LOGMASKED(LOG_MAD2_REGISTER_ACCESS, "MAD2 R %02x MCUIF\n", offset); return 0; } void noki3310_state::mad2_mcuif_w(offs_t offset, uint8_t data) { -#if LOG_MAD2_REGISTER_ACCESS - logerror("MAD2 W %02x = %02x MCUIF\n", offset, data); -#endif + LOGMASKED(LOG_MAD2_REGISTER_ACCESS, "MAD2 W %02x = %02x MCUIF\n", offset, data); } diff --git a/src/mame/pc/ec184x.cpp b/src/mame/pc/ec184x.cpp index acaa4b114df..aac10e26a93 100644 --- a/src/mame/pc/ec184x.cpp +++ b/src/mame/pc/ec184x.cpp @@ -25,9 +25,8 @@ #include "softlist_dev.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_KEYBOARD (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_KEYBOARD (1U << 1) +#define LOG_DEBUG (1U << 2) //#define VERBOSE (LOG_DEBUG) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/pc/mc1502.cpp b/src/mame/pc/mc1502.cpp index bc55bc7d8a9..75d7c1ab8d3 100644 --- a/src/mame/pc/mc1502.cpp +++ b/src/mame/pc/mc1502.cpp @@ -35,9 +35,8 @@ #include "speaker.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_KEYBOARD (1U << 1) -#define LOG_PPI (1U << 2) +#define LOG_KEYBOARD (1U << 1) +#define LOG_PPI (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_VRAM) //#define LOG_OUTPUT_STREAM std::cout diff --git a/src/mame/pc/poisk1.cpp b/src/mame/pc/poisk1.cpp index c461b9b1f5d..5ad7fdf7fde 100644 --- a/src/mame/pc/poisk1.cpp +++ b/src/mame/pc/poisk1.cpp @@ -43,9 +43,8 @@ #include "speaker.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_KEYBOARD (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_KEYBOARD (1U << 1) +#define LOG_DEBUG (1U << 2) //#define VERBOSE (LOG_DEBUG) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/pc/tosh1000.cpp b/src/mame/pc/tosh1000.cpp index fe60b1fe8e6..83208256188 100644 --- a/src/mame/pc/tosh1000.cpp +++ b/src/mame/pc/tosh1000.cpp @@ -52,9 +52,8 @@ #include "softlist.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_KEYBOARD (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_KEYBOARD (1U << 1) +#define LOG_DEBUG (1U << 2) //#define VERBOSE (LOG_DEBUG) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/philips/cdi.cpp b/src/mame/philips/cdi.cpp index a7264fe7432..3176a5aa14d 100644 --- a/src/mame/philips/cdi.cpp +++ b/src/mame/philips/cdi.cpp @@ -67,11 +67,11 @@ TODO: // TODO: NTSC system clock is 30.2098 MHz; additional 4.9152 MHz XTAL provided for UART #define CLOCK_A 30_MHz_XTAL -#define LOG_DVC (1 << 1) -#define LOG_QUIZARD_READS (1 << 2) -#define LOG_QUIZARD_WRITES (1 << 3) -#define LOG_QUIZARD_OTHER (1 << 4) -#define LOG_UART (1 << 5) +#define LOG_DVC (1U << 1) +#define LOG_QUIZARD_READS (1U << 2) +#define LOG_QUIZARD_WRITES (1U << 3) +#define LOG_QUIZARD_OTHER (1U << 4) +#define LOG_UART (1U << 5) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/philips/cdicdic.cpp b/src/mame/philips/cdicdic.cpp index a82f2a5846c..06f9290127b 100644 --- a/src/mame/philips/cdicdic.cpp +++ b/src/mame/philips/cdicdic.cpp @@ -28,15 +28,15 @@ TODO: #include "romload.h" #include "sound/cdda.h" -#define LOG_DECODES (1 << 1) -#define LOG_SAMPLES (1 << 2) -#define LOG_COMMANDS (1 << 3) -#define LOG_SECTORS (1 << 4) -#define LOG_IRQS (1 << 5) -#define LOG_READS (1 << 6) -#define LOG_WRITES (1 << 7) -#define LOG_UNKNOWNS (1 << 8) -#define LOG_RAM (1 << 9) +#define LOG_DECODES (1U << 1) +#define LOG_SAMPLES (1U << 2) +#define LOG_COMMANDS (1U << 3) +#define LOG_SECTORS (1U << 4) +#define LOG_IRQS (1U << 5) +#define LOG_READS (1U << 6) +#define LOG_WRITES (1U << 7) +#define LOG_UNKNOWNS (1U << 8) +#define LOG_RAM (1U << 9) #define LOG_ALL (LOG_DECODES | LOG_SAMPLES | LOG_COMMANDS | LOG_SECTORS | LOG_IRQS | LOG_READS | LOG_WRITES | LOG_UNKNOWNS | LOG_RAM) #define VERBOSE (0) diff --git a/src/mame/philips/cdislavehle.cpp b/src/mame/philips/cdislavehle.cpp index 79192dccf54..104b01ea4b5 100644 --- a/src/mame/philips/cdislavehle.cpp +++ b/src/mame/philips/cdislavehle.cpp @@ -20,11 +20,11 @@ TODO: #include -#define LOG_IRQS (1 << 0) -#define LOG_COMMANDS (1 << 1) -#define LOG_READS (1 << 2) -#define LOG_WRITES (1 << 3) -#define LOG_UNKNOWNS (1 << 4) +#define LOG_IRQS (1U << 1) +#define LOG_COMMANDS (1U << 2) +#define LOG_READS (1U << 3) +#define LOG_WRITES (1U << 4) +#define LOG_UNKNOWNS (1U << 5) #define LOG_ALL (LOG_IRQS | LOG_COMMANDS | LOG_READS | LOG_WRITES | LOG_UNKNOWNS) #define VERBOSE (0) diff --git a/src/mame/pinball/wpc.cpp b/src/mame/pinball/wpc.cpp index 9647a526192..71aa8d2961c 100644 --- a/src/mame/pinball/wpc.cpp +++ b/src/mame/pinball/wpc.cpp @@ -9,7 +9,11 @@ #include "emu.h" #include "wpc.h" -#define LOG_WPC (0) +#define LOG_WPC (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" + DEFINE_DEVICE_TYPE(WPCASIC, wpc_device, "wpc", "Williams WPC ASIC") @@ -155,15 +159,15 @@ void wpc_device::write(offs_t offset, uint8_t data) m_firq_cb(0); m_dmd_irqsrc = false; m_dmd_irqline = data; - if(LOG_WPC) logerror("WPC: DMD FIRQ line set to %i\n",data); + LOGMASKED(LOG_WPC, "WPC: DMD FIRQ line set to %i\n",data); break; case DMD_VISIBLEPAGE: m_dmd_visiblepage = data; - if(LOG_WPC) logerror("WPC: DMD Visible page set to %i\n",data); + LOGMASKED(LOG_WPC, "WPC: DMD Visible page set to %i\n",data); break; case WPC_ROMBANK: m_bank_w(0,data); - if(LOG_WPC) logerror("WPC: ROM bank set to %02x\n",data); + LOGMASKED(LOG_WPC, "WPC: ROM bank set to %02x\n",data); break; case WPC_ALPHAPOS: m_alpha_pos = data & 0x1f; @@ -192,7 +196,7 @@ void wpc_device::write(offs_t offset, uint8_t data) break; case WPC_SWCOLSELECT: m_switch_col = data; - if(LOG_WPC) logerror("WPC: Switch column select %02x\n",data); + LOGMASKED(LOG_WPC, "WPC: Switch column select %02x\n",data); break; case WPC_SOUNDIF: m_sounddata_w(0,data); diff --git a/src/mame/pinball/wpc_an.cpp b/src/mame/pinball/wpc_an.cpp index 334363273ed..0124831202d 100644 --- a/src/mame/pinball/wpc_an.cpp +++ b/src/mame/pinball/wpc_an.cpp @@ -96,10 +96,13 @@ TODO: (wpc in general) #include "wpc_an.lh" +#define LOG_WPC (1U << 1) + +#define VERBOSE (LOG_WPC) +#include "logmacro.h" -namespace { -#define LOG_WPC (1) +namespace { class wpc_an_state : public driver_device { @@ -379,7 +382,7 @@ void wpc_an_state::ram_w(offs_t offset, uint8_t data) if((!m_wpc->memprotect_active()) || ((offset & m_wpc->get_memprotect_mask()) != m_wpc->get_memprotect_mask())) m_ram[offset] = data; else - if(LOG_WPC) logerror("WPC: Memory protection violation at 0x%04x (mask=0x%04x)\n",offset,m_wpc->get_memprotect_mask()); + LOGMASKED(LOG_WPC, "WPC: Memory protection violation at 0x%04x (mask=0x%04x)\n",offset,m_wpc->get_memprotect_mask()); } void wpc_an_state::machine_start() diff --git a/src/mame/playmark/sderby.cpp b/src/mame/playmark/sderby.cpp index ab4678d478e..098dbe6723b 100644 --- a/src/mame/playmark/sderby.cpp +++ b/src/mame/playmark/sderby.cpp @@ -81,8 +81,8 @@ // configurable logging -#define LOG_INPUTS (1U << 1) -#define LOG_CROUPIER_MCU (1U << 2) +#define LOG_INPUTS (1U << 1) +#define LOG_CROUPIER_MCU (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_INPUTS | LOG_CROUPIER_MCU) diff --git a/src/mame/psion/etna.cpp b/src/mame/psion/etna.cpp index fbdadf10347..5d60ef941fd 100644 --- a/src/mame/psion/etna.cpp +++ b/src/mame/psion/etna.cpp @@ -13,10 +13,10 @@ #include "etna.h" -#define LOG_READS (1 << 0) -#define LOG_WRITES (1 << 1) -#define LOG_UNKNOWNS (1 << 2) -#define LOG_PROM (1 << 3) +#define LOG_READS (1U << 1) +#define LOG_WRITES (1U << 2) +#define LOG_UNKNOWNS (1U << 3) +#define LOG_PROM (1U << 4) #define LOG_ALL (LOG_READS | LOG_WRITES | LOG_UNKNOWNS | LOG_PROM) #define VERBOSE (0) diff --git a/src/mame/psion/psion5.cpp b/src/mame/psion/psion5.cpp index bb99adbc767..244b1ae00a3 100644 --- a/src/mame/psion/psion5.cpp +++ b/src/mame/psion/psion5.cpp @@ -20,34 +20,34 @@ #include "utf8.h" -#define LOG_UNKNOWNS (1 << 0) -#define LOG_IRQ (1 << 1) -#define LOG_DISPLAY (1 << 2) -#define LOG_DRAM_READS (1 << 3) -#define LOG_LCD_READS (1 << 4) -#define LOG_POWER_READS (1 << 5) -#define LOG_EOI_READS (1 << 6) -#define LOG_INT_READS (1 << 7) -#define LOG_CODEC_READS (1 << 8) -#define LOG_SSP_READS (1 << 9) -#define LOG_TIMER_READS (1 << 10) -#define LOG_BUZZER_READS (1 << 11) -#define LOG_RTC_READS (1 << 12) -#define LOG_GPIO_READS (1 << 13) -#define LOG_KBD_READS (1 << 14) -#define LOG_DRAM_WRITES (1 << 15) -#define LOG_LCD_WRITES (1 << 16) -#define LOG_POWER_WRITES (1 << 17) -#define LOG_EOI_WRITES (1 << 18) -#define LOG_INT_WRITES (1 << 19) -#define LOG_CODEC_WRITES (1 << 20) -#define LOG_SSP_WRITES (1 << 21) -#define LOG_TIMER_WRITES (1 << 22) -#define LOG_BUZZER_WRITES (1 << 23) -#define LOG_RTC_WRITES (1 << 24) -#define LOG_GPIO_WRITES (1 << 25) -#define LOG_PIN_WRITES (1 << 26) -#define LOG_KBD_WRITES (1 << 27) +#define LOG_UNKNOWNS (1U << 1) +#define LOG_IRQ (1U << 2) +#define LOG_DISPLAY (1U << 3) +#define LOG_DRAM_READS (1U << 4) +#define LOG_LCD_READS (1U << 5) +#define LOG_POWER_READS (1U << 6) +#define LOG_EOI_READS (1U << 7) +#define LOG_INT_READS (1U << 8) +#define LOG_CODEC_READS (1U << 9) +#define LOG_SSP_READS (1U << 10) +#define LOG_TIMER_READS (1U << 11) +#define LOG_BUZZER_READS (1U << 12) +#define LOG_RTC_READS (1U << 13) +#define LOG_GPIO_READS (1U << 14) +#define LOG_KBD_READS (1U << 15) +#define LOG_DRAM_WRITES (1U << 16) +#define LOG_LCD_WRITES (1U << 17) +#define LOG_POWER_WRITES (1U << 18) +#define LOG_EOI_WRITES (1U << 19) +#define LOG_INT_WRITES (1U << 20) +#define LOG_CODEC_WRITES (1U << 21) +#define LOG_SSP_WRITES (1U << 22) +#define LOG_TIMER_WRITES (1U << 23) +#define LOG_BUZZER_WRITES (1U << 24) +#define LOG_RTC_WRITES (1U << 25) +#define LOG_GPIO_WRITES (1U << 26) +#define LOG_PIN_WRITES (1U << 27) +#define LOG_KBD_WRITES (1U << 28) #define LOG_WRITES (LOG_DRAM_WRITES | LOG_LCD_WRITES | LOG_POWER_WRITES | LOG_EOI_WRITES | LOG_INT_WRITES | LOG_CODEC_WRITES \ | LOG_SSP_WRITES | LOG_TIMER_WRITES | LOG_BUZZER_WRITES | LOG_RTC_WRITES | LOG_GPIO_WRITES | LOG_PIN_WRITES | LOG_KBD_WRITES) diff --git a/src/mame/quantel/dpb7000.cpp b/src/mame/quantel/dpb7000.cpp index 98a08efbaa2..a4ba16ecc6d 100644 --- a/src/mame/quantel/dpb7000.cpp +++ b/src/mame/quantel/dpb7000.cpp @@ -49,34 +49,34 @@ #include #include -#define LOG_UNKNOWN (1 << 0) -#define LOG_UCODE (1 << 1) -#define LOG_MORE_UCODE (1 << 2) -#define LOG_CSR (1 << 3) -#define LOG_CTRLBUS (1 << 4) -#define LOG_SYS_CTRL (1 << 5) -#define LOG_FDC_CTRL (1 << 6) -#define LOG_FDC_PORT (1 << 7) -#define LOG_FDC_CMD (1 << 8) -#define LOG_FDC_MECH (1 << 9) -#define LOG_OUTPUT_TIMING (1 << 10) -#define LOG_BRUSH_ADDR (1 << 11) -#define LOG_STORE_ADDR (1 << 12) -#define LOG_COMBINER (1 << 13) -#define LOG_SIZE_CARD (1 << 14) -#define LOG_FILTER_CARD (1 << 15) -#define LOG_KEYBC (1 << 16) -#define LOG_TDS (1 << 17) -#define LOG_TABLET (1 << 18) -#define LOG_COMMANDS (1 << 19) -#define LOG_HDD (1 << 20) -#define LOG_FDD (1 << 21) -#define LOG_DDB (1 << 22) -#define LOG_IRQ (1 << 23) -#define LOG_BRUSH_LATCH (1 << 24) -#define LOG_BRUSH_DRAWS (1 << 25) -#define LOG_BRUSH_WRITES (1 << 26) -#define LOG_STORE_READS (1 << 27) +#define LOG_UNKNOWN (1U << 1) +#define LOG_UCODE (1U << 2) +#define LOG_MORE_UCODE (1U << 3) +#define LOG_CSR (1U << 4) +#define LOG_CTRLBUS (1U << 5) +#define LOG_SYS_CTRL (1U << 6) +#define LOG_FDC_CTRL (1U << 7) +#define LOG_FDC_PORT (1U << 8) +#define LOG_FDC_CMD (1U << 9) +#define LOG_FDC_MECH (1U << 10) +#define LOG_OUTPUT_TIMING (1U << 11) +#define LOG_BRUSH_ADDR (1U << 12) +#define LOG_STORE_ADDR (1U << 13) +#define LOG_COMBINER (1U << 14) +#define LOG_SIZE_CARD (1U << 15) +#define LOG_FILTER_CARD (1U << 16) +#define LOG_KEYBC (1U << 17) +#define LOG_TDS (1U << 18) +#define LOG_TABLET (1U << 19) +#define LOG_COMMANDS (1U << 20) +#define LOG_HDD (1U << 21) +#define LOG_FDD (1U << 22) +#define LOG_DDB (1U << 23) +#define LOG_IRQ (1U << 24) +#define LOG_BRUSH_LATCH (1U << 25) +#define LOG_BRUSH_DRAWS (1U << 26) +#define LOG_BRUSH_WRITES (1U << 27) +#define LOG_STORE_READS (1U << 28) #define LOG_ALL (LOG_UNKNOWN | LOG_CSR | LOG_CTRLBUS | LOG_SYS_CTRL | LOG_BRUSH_ADDR | \ LOG_STORE_ADDR | LOG_COMBINER | LOG_SIZE_CARD | LOG_FILTER_CARD | LOG_COMMANDS | LOG_OUTPUT_TIMING | \ LOG_BRUSH_LATCH | LOG_FDC_PORT | LOG_FDC_CMD | LOG_FDC_MECH | LOG_BRUSH_WRITES | LOG_STORE_READS) diff --git a/src/mame/rm/rmnimbus_m.cpp b/src/mame/rm/rmnimbus_m.cpp index cc1bde464de..272726914ab 100644 --- a/src/mame/rm/rmnimbus_m.cpp +++ b/src/mame/rm/rmnimbus_m.cpp @@ -65,6 +65,18 @@ chdman createhd -o ST125N.chd -chs 41921,1,1 -ss 512 #include "rmnimbus.h" #include "imagedev/floppy.h" +#define LOG_SIO (1U << 1) +#define LOG_DISK_HDD (1U << 2) +#define LOG_DISK (1U << 3) +#define LOG_PC8031 (1U << 4) +#define LOG_PC8031_186 (1U << 5) +#define LOG_PC8031_PORT (1U << 6) +#define LOG_IOU (1U << 7) +#define LOG_RAM (1U << 8) + +#define VERBOSE (0) +#include "logmacro.h" + /*-------------------------------------------------------------------------*/ @@ -123,15 +135,6 @@ chdman createhd -o ST125N.chd -chs 41921,1,1 -ss 512 #define OUTPUT_SEGOFS(mess,seg,ofs) logerror("%s=%04X:%04X [%08X]\n",mess,seg,ofs,((seg<<4)+ofs)) -#define LOG_SIO 0 -#define LOG_DISK_HDD 0 -#define LOG_DISK 0 -#define LOG_PC8031 0 -#define LOG_PC8031_186 0 -#define LOG_PC8031_PORT 0 -#define LOG_IOU 0 -#define LOG_RAM 0 - void rmnimbus_state::external_int(uint8_t vector, bool state) { @@ -343,7 +346,7 @@ void rmnimbus_state::nimbus_bank_memory() map_blocks[1] = (ramblocks[ramblock][1].blocksize==0) ? nullptr : &ram[ramblocks[ramblock][1].blockbase*1024]; map_blocks[2] = (ramblocks[ramblock][2].blocksize==0) ? nullptr : &ram[ramblocks[ramblock][2].blockbase*1024]; - //if(LOG_RAM) logerror("\n\nmcu_reg080=%02X, ramblock=%d, map_blocks[0]=%X, map_blocks[1]=%X, map_blocks[2]=%X\n",m_mcu_reg080,ramblock,(int)map_blocks[0],(int)map_blocks[1],(int)map_blocks[2]); + //LOGMASKED(LOG_RAM, "\n\nmcu_reg080=%02X, ramblock=%d, map_blocks[0]=%X, map_blocks[1]=%X, map_blocks[2]=%X\n",m_mcu_reg080,ramblock,(int)map_blocks[0],(int)map_blocks[1],(int)map_blocks[2]); for(blockno=0;blockno<8;blockno++) { @@ -360,7 +363,7 @@ void rmnimbus_state::nimbus_bank_memory() block_ofs=(ramsel==0x07) ? 0 : ((blockno % 4)*128); - if(LOG_RAM) logerror("mapped %s",bank); + LOGMASKED(LOG_RAM, "mapped %s",bank); if((map_blockno>-1) && (block_ofs < ramblocks[ramblock][map_blockno].blocksize) && (map_blocks[map_blockno]!=nullptr)) @@ -369,12 +372,12 @@ void rmnimbus_state::nimbus_bank_memory() membank(bank)->set_base(map_base); space.install_readwrite_bank(memmap[blockno].start, memmap[blockno].end, membank(bank)); - //if(LOG_RAM) logerror(", base=%X\n",(int)map_base); + //LOGMASKED(LOG_RAM, ", base=%X\n",(int)map_base); } else { space.nop_readwrite(memmap[blockno].start, memmap[blockno].end); - if(LOG_RAM) logerror("NOP\n"); + LOGMASKED(LOG_RAM, "NOP\n"); } } } @@ -407,8 +410,7 @@ Z80SIO, used for the keyboard interface WRITE_LINE_MEMBER(rmnimbus_state::sio_interrupt) { - if(LOG_SIO) - logerror("SIO Interrupt state=%02X\n",state); + LOGMASKED(LOG_SIO, "SIO Interrupt state=%02X\n",state); external_int(0, state); } @@ -423,8 +425,7 @@ void rmnimbus_state::fdc_reset() WRITE_LINE_MEMBER(rmnimbus_state::nimbus_fdc_intrq_w) { - if(LOG_DISK) - logerror("nimbus_drives_intrq = %d\n",state); + LOGMASKED(LOG_DISK, "nimbus_drives_intrq = %d\n",state); if(m_iou_reg092 & DISK_INT_ENABLE) { @@ -434,8 +435,7 @@ WRITE_LINE_MEMBER(rmnimbus_state::nimbus_fdc_intrq_w) WRITE_LINE_MEMBER(rmnimbus_state::nimbus_fdc_drq_w) { - if(LOG_DISK) - logerror("nimbus_drives_drq_w(%d)\n", state); + LOGMASKED(LOG_DISK, "nimbus_drives_drq_w(%d)\n", state); m_maincpu->drq1_w(state && FDC_DRQ_ENABLED()); } @@ -508,8 +508,7 @@ uint8_t rmnimbus_state::scsi_r(offs_t offset) break; } - if(LOG_DISK_HDD) - logerror("Nimbus HDCR at pc=%08X from %04X data=%02X\n",pc,(offset*2)+0x410,result); + LOGMASKED(LOG_DISK_HDD, "Nimbus HDCR at pc=%08X from %04X data=%02X\n",pc,(offset*2)+0x410,result); return result; } @@ -561,8 +560,7 @@ void rmnimbus_state::scsi_w(offs_t offset, uint8_t data) { int pc=m_maincpu->pc(); - if(LOG_DISK_HDD) - logerror("Nimbus HDCW at %05X write of %02X to %04X\n",pc,data,(offset*2)+0x410); + LOGMASKED(LOG_DISK_HDD, "Nimbus HDCW at %05X write of %02X to %04X\n",pc,data,(offset*2)+0x410); switch(offset*2) { @@ -730,8 +728,7 @@ uint8_t rmnimbus_state::nimbus_pc8031_r(offs_t offset) default : result=0; break; } - if(LOG_PC8031_186) - logerror("Nimbus PCIOR %08X read of %04X returns %02X\n",pc,(offset*2)+0xC0,result); + LOGMASKED(LOG_PC8031_186, "Nimbus PCIOR %08X read of %04X returns %02X\n",pc,(offset*2)+0xC0,result); return result; } @@ -755,9 +752,7 @@ void rmnimbus_state::nimbus_pc8031_w(offs_t offset, uint8_t data) break; } - if(LOG_PC8031_186) - logerror("Nimbus PCIOW %08X write of %02X to %04X\n",pc,data,(offset*2)+0xC0); - + LOGMASKED(LOG_PC8031_186, "Nimbus PCIOW %08X write of %02X to %04X\n",pc,data,(offset*2)+0xC0); } /* 8031/8051 Peripheral controller 8031/8051 side */ @@ -781,8 +776,7 @@ uint8_t rmnimbus_state::nimbus_pc8031_iou_r(offs_t offset) if(((offset==2) || (offset==3)) && (m_iou_reg092 & PC8031_INT_ENABLE)) external_int(EXTERNAL_INT_PC8031_8C, true); - if(LOG_PC8031) - logerror("8031: PCIOR %04X read of %04X returns %02X\n",pc,offset,result); + LOGMASKED(LOG_PC8031, "8031: PCIOR %04X read of %04X returns %02X\n",pc,offset,result); return result; } @@ -791,8 +785,7 @@ void rmnimbus_state::nimbus_pc8031_iou_w(offs_t offset, uint8_t data) { int pc=m_iocpu->pc(); - if(LOG_PC8031) - logerror("8031 PCIOW %04X write of %02X to %04X\n",pc,data,offset); + LOGMASKED(LOG_PC8031, "8031 PCIOW %04X write of %02X to %04X\n",pc,data,offset); switch(offset & 0x03) { @@ -831,8 +824,7 @@ uint8_t rmnimbus_state::nimbus_pc8031_port1_r() int pc=m_iocpu->pc(); uint8_t result = (m_eeprom_bits & ~4) | (m_eeprom->do_read() << 2); - if(LOG_PC8031_PORT) - logerror("8031: PCPORTR %04X read of P1 returns %02X\n",pc,result); + LOGMASKED(LOG_PC8031_PORT, "8031: PCPORTR %04X read of P1 returns %02X\n",pc,result); return result; } @@ -842,8 +834,7 @@ uint8_t rmnimbus_state::nimbus_pc8031_port3_r() int pc=m_iocpu->pc(); uint8_t result = 0; - if(LOG_PC8031_PORT) - logerror("8031: PCPORTR %04X read of P3 returns %02X\n",pc,result); + LOGMASKED(LOG_PC8031_PORT, "8031: PCPORTR %04X read of P3 returns %02X\n",pc,result); return result; } @@ -867,16 +858,13 @@ void rmnimbus_state::nimbus_pc8031_port1_w(uint8_t data) m_eeprom->clk_write((data & 1) ? 1 : 0); m_eeprom_bits = data; - if(LOG_PC8031_PORT) - logerror("8031 PCPORTW %04X write of %02X to P1\n",pc,data); + LOGMASKED(LOG_PC8031_PORT, "8031 PCPORTW %04X write of %02X to P1\n",pc,data); } void rmnimbus_state::nimbus_pc8031_port3_w(uint8_t data) { - int pc=m_iocpu->pc(); - - if(LOG_PC8031_PORT) - logerror("8031 PCPORTW %04X write of %02X to P3\n",pc,data); + int pc = m_iocpu->pc(); + LOGMASKED(LOG_PC8031_PORT, "8031 PCPORTW %04X write of %02X to P3\n",pc,data); } @@ -891,8 +879,7 @@ uint8_t rmnimbus_state::nimbus_iou_r(offs_t offset) result=m_iou_reg092; } - if(LOG_IOU) - logerror("Nimbus IOUR %08X read of %04X returns %02X\n",pc,(offset*2)+0x92,result); + LOGMASKED(LOG_IOU, "Nimbus IOUR %08X read of %04X returns %02X\n",pc,(offset*2)+0x92,result); return result; } @@ -901,8 +888,7 @@ void rmnimbus_state::nimbus_iou_w(offs_t offset, uint8_t data) { int pc=m_maincpu->pc(); - if(LOG_IOU) - logerror("Nimbus IOUW %08X write of %02X to %04X\n",pc,data,(offset*2)+0x92); + LOGMASKED(LOG_IOU, "Nimbus IOUW %08X write of %02X to %04X\n",pc,data,(offset*2)+0x92); if(offset==0) { diff --git a/src/mame/robotron/rt1715.cpp b/src/mame/robotron/rt1715.cpp index 5f360abc442..b9b773e8a61 100644 --- a/src/mame/robotron/rt1715.cpp +++ b/src/mame/robotron/rt1715.cpp @@ -38,7 +38,7 @@ #include "screen.h" -#define LOG_BANK (1U << 1) +#define LOG_BANK (1U << 1) #define VERBOSE (LOG_GENERAL) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/sega/chihiro.cpp b/src/mame/sega/chihiro.cpp index 3a5b56b5961..764d8d4167c 100644 --- a/src/mame/sega/chihiro.cpp +++ b/src/mame/sega/chihiro.cpp @@ -447,9 +447,11 @@ Thanks to Alex, Mr Mudkips, and Philip Burke for this info. #include -#define LOG_PCI -//#define LOG_BASEBOARD -//#define VERBOSE_MSG +#define LOG_BASEBOARD (1U << 1) +#define LOG_EXTRA (1U << 2) + +#define VERBOSE (0) +#include "logmacro.h" /* * Class declaration for jvs_master @@ -924,9 +926,7 @@ int ohci_hlean2131qc_device::handle_nonstandard_request(int endpoint, USBSetupPa { int sense; -#ifdef VERBOSE_MSG - printf("Control request to an2131qc: %x %x %x %x %x %x %x\n\r", endpoint, endpoints[endpoint].controldirection, setup->bmRequestType, setup->bRequest, setup->wValue, setup->wIndex, setup->wLength); -#endif + LOGMASKED(LOG_EXTRA, "Control request to an2131qc: %x %x %x %x %x %x %x\n\r", endpoint, endpoints[endpoint].controldirection, setup->bmRequestType, setup->bRequest, setup->wValue, setup->wIndex, setup->wLength); if (endpoint != 0) return -1; // default valuse for data stage @@ -1034,9 +1034,7 @@ int ohci_hlean2131qc_device::handle_nonstandard_request(int endpoint, USBSetupPa // data sent by the host contains first a byte with value 0 that is ignored, then a byte specifying the number of packets that follow, then the data for each packet // the data for each packet contains first a byte with value 0, then the sync byte (0xe0) then all the other bytes of the packet ending with the checksum byte // broadcast packets must have a destination node address of value 0xff -#ifdef VERBOSE_MSG - printf(" Jvs packets data of %d bytes\n\r", setup->wIndex); -#endif + LOGMASKED(LOG_EXTRA, " Jvs packets data of %d bytes\n\r", setup->wIndex); endpoints[endpoint].buffer[0] = 0; if (jvs.buffer_out_used == 0) { @@ -1079,9 +1077,7 @@ int ohci_hlean2131qc_device::handle_nonstandard_request(int endpoint, USBSetupPa int ohci_hlean2131qc_device::handle_bulk_pid(int endpoint, int pid, uint8_t *buffer, int size) { -#ifdef VERBOSE_MSG - printf("Bulk request to an2131qc: %x %d %x\n\r", endpoint, pid, size); -#endif + LOGMASKED(LOG_EXTRA, "Bulk request to an2131qc: %x %d %x\n\r", endpoint, pid, size); if (((endpoint == 1) || (endpoint == 2)) && (pid == InPid)) { if (size > endpoints[endpoint].remain) @@ -1102,19 +1098,15 @@ int ohci_hlean2131qc_device::handle_bulk_pid(int endpoint, int pid, uint8_t *buf { if (size > endpoints[4].remain) size = endpoints[4].remain; -#ifdef VERBOSE_MSG for (int n = 0; n < size; n++) - printf(" %02x", buffer[n]); -#endif + LOGMASKED(LOG_EXTRA, " %02x", buffer[n]); if (size > 0) { memcpy(endpoints[4].position, buffer, size); endpoints[4].position = endpoints[4].position + size; endpoints[4].remain = endpoints[4].remain - size; if (endpoints[4].remain == 0) { -#ifdef VERBOSE_MSG - printf("\n\r"); -#endif + LOGMASKED(LOG_EXTRA, "\n\r"); // extract packets process_jvs_packet(); } @@ -1244,9 +1236,7 @@ void ohci_hlean2131sc_device::initialize() int ohci_hlean2131sc_device::handle_nonstandard_request(int endpoint, USBSetupPacket *setup) { -#ifdef VERBOSE_MSG - printf("Control request to an2131sc: %x %x %x %x %x %x %x\n\r", endpoint, endpoints[endpoint].controldirection, setup->bmRequestType, setup->bRequest, setup->wValue, setup->wIndex, setup->wLength); -#endif + LOGMASKED(LOG_EXTRA, "Control request to an2131sc: %x %x %x %x %x %x %x\n\r", endpoint, endpoints[endpoint].controldirection, setup->bmRequestType, setup->bRequest, setup->wValue, setup->wIndex, setup->wLength); if (endpoint != 0) return -1; // default valuse for data stage @@ -1415,9 +1405,7 @@ int ohci_hlean2131sc_device::handle_nonstandard_request(int endpoint, USBSetupPa int ohci_hlean2131sc_device::handle_bulk_pid(int endpoint, int pid, uint8_t *buffer, int size) { -#ifdef VERBOSE_MSG - printf("Bulk request to an2131sc: %x %d %x\n\r", endpoint, pid, size); -#endif + LOGMASKED(LOG_EXTRA, "Bulk request to an2131sc: %x %d %x\n\r", endpoint, pid, size); if (((endpoint == 1) || (endpoint == 2)) && (pid == InPid)) { if (size > endpoints[endpoint].remain) @@ -1475,9 +1463,7 @@ int ohci_hlean2131sc_device::handle_bulk_pid(int endpoint, int pid, uint8_t *buf void ohci_hlean2131sc_device::process_packet() { uint8_t result = 0; -#ifdef VERBOSE_MSG - printf("%02X %02X %02X %02X\n\r", packet[0], packet[1], packet[2], packet[3]); -#endif + LOGMASKED(LOG_EXTRA, "%02X %02X %02X %02X\n\r", packet[0], packet[1], packet[2], packet[3]); if (packet[0] == 0xff) // 00 00 7f result = 2; else if (packet[0] == 0x81) // 30 7f 4e @@ -1675,12 +1661,12 @@ void chihiro_state::baseboard_ide_event(int type, uint8_t *read_buffer, uint8_t if ((type != 3) || ((write_buffer[0] == 0) && (write_buffer[1] == 0))) return; -#ifdef LOG_BASEBOARD - logerror("Baseboard sector command:\n"); + + LOGMASKED(LOG_BASEBOARD, "Baseboard sector command:\n"); for (int a = 0; a < 32; a++) - logerror(" %02X", write_buffer[a]); - logerror("\n"); -#endif + LOGMASKED(LOG_BASEBOARD, " %02X", write_buffer[a]); + LOGMASKED(LOG_BASEBOARD, "\n"); + // response // second word 8001 (8000+counter), first word=first word of written data (command ?), second dword ? read_buffer[0] = write_buffer[0]; diff --git a/src/mame/sega/kopunch.cpp b/src/mame/sega/kopunch.cpp index f966346fb2b..eef5ce262c1 100644 --- a/src/mame/sega/kopunch.cpp +++ b/src/mame/sega/kopunch.cpp @@ -43,7 +43,7 @@ // configurable logging -#define LOG_PORT34 (1U << 1) +#define LOG_PORT34 (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_PORT34) diff --git a/src/mame/sega/model1_v.cpp b/src/mame/sega/model1_v.cpp index da1eb83c821..90e231627c6 100644 --- a/src/mame/sega/model1_v.cpp +++ b/src/mame/sega/model1_v.cpp @@ -7,10 +7,10 @@ #include "cpu/mb86233/mb86233.h" #include "model1.h" -#define LOG_TGP_VIDEO 0 +#define LOG_TGP (1U << 1) -#define LOG_TGP(x) do { if (LOG_TGP_VIDEO) logerror x; } while (0) -#define LOG_TGP_DEV(d,x) do { if (LOG_TGP_VIDEO) d->logerror x; } while (0) +#define VERBOSE (0) +#include "logmacro.h" // Model 1 geometrizer TGP and rasterizer simulation @@ -220,11 +220,11 @@ void model1_state::fill_quad(bitmap_rgb32 &bitmap, view_t *view, const quad_t& q if (color < 0) { color = -1 - color; - LOG_TGP_DEV(this,("VIDEOD: Q (%d, %d)-(%d, %d)-(%d, %d)-(%d, %d)\n", + LOGMASKED(LOG_TGP, "VIDEOD: Q (%d, %d)-(%d, %d)-(%d, %d)-(%d, %d)\n", q.p[0]->s.x, q.p[0]->s.y, q.p[1]->s.x, q.p[1]->s.y, q.p[2]->s.x, q.p[2]->s.y, - q.p[3]->s.x, q.p[3]->s.y)); + q.p[3]->s.x, q.p[3]->s.y); } for (int i = 0; i < 4; i++) @@ -602,10 +602,10 @@ void model1_state::fclip_push_quad(int level, quad_t& q) if (level == 4) { - LOG_TGP(("VIDEOCQ %d", level)); + LOGMASKED(LOG_TGP, "VIDEOCQ %d", level); for (int i = 0; i < 4; i++) - LOG_TGP((" (%f, %f, %f)", q.p[i]->x, q.p[i]->y, q.p[i]->z)); - LOG_TGP(("\n")); + LOGMASKED(LOG_TGP, " (%f, %f, %f)", q.p[i]->x, q.p[i]->y, q.p[i]->z); + LOGMASKED(LOG_TGP, "\n"); *m_quadpt = q; m_quadpt++; return; @@ -617,10 +617,10 @@ void model1_state::fclip_push_quad(int level, quad_t& q) is_out[i] = m_clipfn[level].m_isclipped(view, q.p[i]); } - LOG_TGP(("VIDEOCQ %d", level)); + LOGMASKED(LOG_TGP, "VIDEOCQ %d", level); for (int i = 0; i < 4; i++) - LOG_TGP((" (%f, %f, %f, %d)", q.p[i]->x, q.p[i]->y, q.p[i]->z, is_out[i])); - LOG_TGP(("\n")); + LOGMASKED(LOG_TGP, " (%f, %f, %f, %d)", q.p[i]->x, q.p[i]->y, q.p[i]->z, is_out[i]); + LOGMASKED(LOG_TGP, "\n"); // No clipping if(!is_out[0] && !is_out[1] && !is_out[2] && !is_out[3]) @@ -792,7 +792,7 @@ void model1_state::push_object(uint32_t tex_adr, uint32_t poly_adr, uint32_t siz #endif if (true) { - LOG_TGP(("XVIDEO: draw object (%x, %x, %x)\n", tex_adr, poly_adr, size)); + LOGMASKED(LOG_TGP, "XVIDEO: draw object (%x, %x, %x)\n", tex_adr, poly_adr, size); } if (!size) @@ -835,11 +835,11 @@ void model1_state::push_object(uint32_t tex_adr, uint32_t poly_adr, uint32_t siz for (int i = 0; i < size; i++) { #if 0 - LOG_TGP(("VIDEO: %08x (%f, %f, %f) (%f, %f, %f) (%f, %f, %f)\n", + LOGMASKED(LOG_TGP, "VIDEO: %08x (%f, %f, %f) (%f, %f, %f) (%f, %f, %f)\n", *(uint32_t *)(poly_data + poly_adr) & ~(0x01800303), poly_data[poly_adr + 1], poly_data[poly_adr + 2], poly_data[poly_adr + 3], poly_data[poly_adr + 4], poly_data[poly_adr + 5], poly_data[poly_adr + 6], - poly_data[poly_adr + 7], poly_data[poly_adr + 8], poly_data[poly_adr + 9])); + poly_data[poly_adr + 7], poly_data[poly_adr + 8], poly_data[poly_adr + 9]); #endif uint32_t flags = *reinterpret_cast(poly_data + poly_adr); @@ -887,22 +887,18 @@ void model1_state::push_object(uint32_t tex_adr, uint32_t poly_adr, uint32_t siz } #if 0 - if (dump) - LOG_TGP(("VIDEO: %08x (%f, %f, %f) (%f, %f, %f)\n", + if (dump) { + LOGMASKED(LOG_TGP, "VIDEO: %08x (%f, %f, %f) (%f, %f, %f)\n", *(uint32_t *)(poly_data + poly_adr), p0->x, p0->y, p0->z, - p1->x, p1->y, p1->z)); -#endif - + p1->x, p1->y, p1->z); -#if 0 - if (true || dump) { - LOG_TGP(("VIDEO: %08x (%d, %d) (%d, %d) (%d, %d) (%d, %d)\n", + LOGMASKED(LOG_TGP, "VIDEO: %08x (%d, %d) (%d, %d) (%d, %d) (%d, %d)\n", *(uint32_t *)(poly_data + poly_adr), old_p0->s.x, old_p0->s.y, old_p1->s.x, old_p1->s.y, p0->s.x, p0->s.y, - p1->s.x, p1->s.y)); + p1->s.x, p1->s.y); } #endif @@ -1006,10 +1002,10 @@ int model1_state::push_direct(int list_offset) { old_p1->y = readf(list_offset + 2 + 14); old_p1->z = readf(list_offset + 2 + 16); - LOG_TGP(("VIDEOD start direct\n")); - LOG_TGP(("VIDEOD (%f, %f, %f) (%f, %f, %f)\n", + LOGMASKED(LOG_TGP, "VIDEOD start direct\n"); + LOGMASKED(LOG_TGP, "VIDEOD (%f, %f, %f) (%f, %f, %f)\n", old_p0->x, old_p0->y, old_p0->z, - old_p1->x, old_p1->y, old_p1->z)); + old_p1->x, old_p1->y, old_p1->z); //m_view-transform_point(old_p0); //m_view->transform_point(old_p1); @@ -1060,9 +1056,9 @@ int model1_state::push_direct(int list_offset) { p0->y = readf(list_offset + 2 + 8); p0->z = readf(list_offset + 2 + 10); z = p0->z; - LOG_TGP(("VIDEOD %08x %08x (%f, %f, %f)\n", + LOGMASKED(LOG_TGP, "VIDEOD %08x %08x (%f, %f, %f)\n", flags, lum, - p0->x, p0->y, p0->z)); + p0->x, p0->y, p0->z); *p1 = *p0; list_offset += 12; } @@ -1075,10 +1071,10 @@ int model1_state::push_direct(int list_offset) { p1->y = readf(list_offset + 2 + 16); p1->z = readf(list_offset + 2 + 18); z = readf(list_offset + 2 + 12); - LOG_TGP(("VIDEOD %08x %08x (%f, %f, %f) (%f, %f, %f)\n", + LOGMASKED(LOG_TGP, "VIDEOD %08x %08x (%f, %f, %f) (%f, %f, %f)\n", flags, lum, p0->x, p0->y, p0->z, - p1->x, p1->y, p1->z)); + p1->x, p1->y, p1->z); list_offset += 20; } @@ -1095,21 +1091,18 @@ int model1_state::push_direct(int list_offset) { m_view->project_point_direct(p1); } -#if 1 if (old_p0 && old_p1) - LOG_TGP(("VIDEOD: %08x (%d, %d) (%d, %d) (%d, %d) (%d, %d)\n", + LOGMASKED(LOG_TGP, "VIDEOD: %08x (%d, %d) (%d, %d) (%d, %d) (%d, %d)\n", flags, old_p0->s.x, old_p0->s.y, old_p1->s.x, old_p1->s.y, p0->s.x, p0->s.y, - p1->s.x, p1->s.y)); + p1->s.x, p1->s.y); else - LOG_TGP(("VIDEOD: %08x (%d, %d) (%d, %d)\n", + LOGMASKED(LOG_TGP, "VIDEOD: %08x (%d, %d) (%d, %d)\n", flags, p0->s.x, p0->s.y, - p1->s.x, p1->s.y)); - -#endif + p1->s.x, p1->s.y); quad_t cquad; if (!link) @@ -1183,7 +1176,7 @@ void model1_state::draw_objects(bitmap_rgb32 &bitmap, const rectangle &cliprect) { if (m_quadpt != &m_quaddb[0]) { - LOG_TGP(("VIDEO: sort&draw\n")); + LOGMASKED(LOG_TGP, "VIDEO: sort&draw\n"); sort_quads(); draw_quads(bitmap, cliprect); } @@ -1195,7 +1188,7 @@ void model1_state::draw_objects(bitmap_rgb32 &bitmap, const rectangle &cliprect) int model1_state::draw_direct(bitmap_rgb32 &bitmap, const rectangle &cliprect, int list_offset) { - LOG_TGP(("VIDEO: draw direct %x\n", readi(list_offset + 2))); + LOGMASKED(LOG_TGP, "VIDEO: draw direct %x\n", readi(list_offset + 2)); draw_objects(bitmap, cliprect); @@ -1242,7 +1235,7 @@ u16 model1_state::model1_listctl_r(offs_t offset) void model1_state::model1_listctl_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(m_listctl + offset); - LOG_TGP(("VIDEO: control=%08x\n", (m_listctl[1] << 16) | m_listctl[0])); + LOGMASKED(LOG_TGP, "VIDEO: control=%08x\n", (m_listctl[1] << 16) | m_listctl[0]); } void model1_state::view_t::init_translation_matrix() @@ -1311,7 +1304,7 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect) { set_current_render_list(); int zz = 0; - LOG_TGP(("VIDEO: render list %d\n", get_list_number())); + LOGMASKED(LOG_TGP, "VIDEO: render list %d\n", get_list_number()); m_view->init_translation_matrix(); @@ -1344,10 +1337,10 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect) } case 3: { - LOG_TGP(("VIDEO: viewport (%d, %d, %d, %d, %d, %d, %d)\n", + LOGMASKED(LOG_TGP, "VIDEO: viewport (%d, %d, %d, %d, %d, %d, %d)\n", readi(list_offset + 2), readi16(list_offset + 4), readi16(list_offset + 6), readi16(list_offset + 8), - readi16(list_offset + 10), readi16(list_offset + 12), readi16(list_offset + 14))); + readi16(list_offset + 10), readi16(list_offset + 12), readi16(list_offset + 14)); draw_objects(bitmap, cliprect); @@ -1367,7 +1360,7 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect) { int adr = readi(list_offset + 2); int len = readi(list_offset + 4) + 1; - LOG_TGP(("ZVIDEO: color write, adr=%x, len=%x\n", adr, len)); + LOGMASKED(LOG_TGP, "ZVIDEO: color write, adr=%x, len=%x\n", adr, len); for (int i = 0; i < len; i++) { m_tgp_ram[adr - 0x40000 + i] = readi16(list_offset + 6 + 2 * i); @@ -1390,7 +1383,7 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect) { int adr = readi(list_offset + 2); int len = readi(list_offset + 4); - LOG_TGP(("VIDEO: upload data, adr=%x, len=%x\n", adr, len)); + LOGMASKED(LOG_TGP, "VIDEO: upload data, adr=%x, len=%x\n", adr, len); for (int i = 0; i < len; i++) { int v = readi(list_offset + 6 + i * 2); @@ -1404,31 +1397,31 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect) break; } case 7: - LOG_TGP(("VIDEO: code 7 (%d)\n", readi(list_offset + 2))); + LOGMASKED(LOG_TGP, "VIDEO: code 7 (%d)\n", readi(list_offset + 2)); zz++; list_offset += 4; break; case 8: - LOG_TGP(("VIDEO: select mode %08x\n", readi(list_offset + 2))); + LOGMASKED(LOG_TGP, "VIDEO: select mode %08x\n", readi(list_offset + 2)); list_offset += 4; break; case 9: - LOG_TGP(("VIDEO: zoom (%f, %f)\n", readf(list_offset + 2), readf(list_offset + 4))); + LOGMASKED(LOG_TGP, "VIDEO: zoom (%f, %f)\n", readf(list_offset + 2), readf(list_offset + 4)); m_view->set_zoom(readf(list_offset + 2) * 4, readf(list_offset + 4) * 4); list_offset += 6; break; case 0xa: - LOG_TGP(("VIDEO: light vector (%f, %f, %f)\n", readf(list_offset + 2), readf(list_offset + 4), readf(list_offset + 6))); + LOGMASKED(LOG_TGP, "VIDEO: light vector (%f, %f, %f)\n", readf(list_offset + 2), readf(list_offset + 4), readf(list_offset + 6)); m_view->set_light_direction(readf(list_offset + 2), readf(list_offset + 4), readf(list_offset + 6)); list_offset += 8; break; case 0xb: { - LOG_TGP(("VIDEO: matrix (%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f)\n", + LOGMASKED(LOG_TGP, "VIDEO: matrix (%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f)\n", readf(list_offset + 2), readf(list_offset + 4), readf(list_offset + 6), readf(list_offset + 8), readf(list_offset + 10), readf(list_offset + 12), readf(list_offset + 14), readf(list_offset + 16), readf(list_offset + 18), - readf(list_offset + 20), readf(list_offset + 22), readf(list_offset + 24))); + readf(list_offset + 20), readf(list_offset + 22), readf(list_offset + 24)); float mat[12]; for (int i = 0; i < 12; i++) { @@ -1439,7 +1432,7 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect) break; } case 0xc: - LOG_TGP(("VIDEO: trans (%f, %f)\n", readf(list_offset + 2), readf(list_offset + 4))); + LOGMASKED(LOG_TGP, "VIDEO: trans (%f, %f)\n", readf(list_offset + 2), readf(list_offset + 4)); m_view->set_view_translation(readf(list_offset + 2), readf(list_offset + 4)); list_offset += 6; break; @@ -1447,7 +1440,7 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect) //case -1: goto end; default: - LOG_TGP(("VIDEO: unknown type %d\n", type)); + LOGMASKED(LOG_TGP, "VIDEO: unknown type %d\n", type); goto end; } } @@ -1474,7 +1467,7 @@ void model1_state::tgp_scan() { set_current_render_list(); // Skip everything but the data uploads - LOG_TGP(("VIDEO: scan list %d\n", get_list_number())); + LOGMASKED(LOG_TGP, "VIDEO: scan list %d\n", get_list_number()); int list_offset = 0; for (;;) @@ -1499,7 +1492,7 @@ void model1_state::tgp_scan() { int adr = readi(list_offset + 2); int len = readi(list_offset + 4) + 1; - LOG_TGP(("ZVIDEO: scan color write, adr=%x, len=%x\n", adr, len)); + LOGMASKED(LOG_TGP, "ZVIDEO: scan color write, adr=%x, len=%x\n", adr, len); for (int i = 0; ilightparams[i + adr].a = (float((v >> 8) & 0xff)) / 255.0f; m_view->lightparams[i + adr].s = (float((v >> 16) & 0xff)) / 255.0f; m_view->lightparams[i + adr].p = (v >> 24) & 0xff; - //LOG_TGP((" %02X\n",v)); + //LOGMASKED(LOG_TGP, " %02X\n",v); } list_offset += 6 + len * 2; break; @@ -1557,7 +1550,7 @@ void model1_state::tgp_scan() case -1: goto end; default: - LOG_TGP(("VIDEO: unknown type %d\n", type)); + LOGMASKED(LOG_TGP, "VIDEO: unknown type %d\n", type); goto end; } } @@ -1678,6 +1671,6 @@ WRITE_LINE_MEMBER(model1_state::screen_vblank_model1) { tgp_scan(); end_frame(); - LOG_TGP(("TGP: vsync\n")); + LOGMASKED(LOG_TGP, "TGP: vsync\n"); } } diff --git a/src/mame/sega/saturn_m.cpp b/src/mame/sega/saturn_m.cpp index c5da63fea24..5d54781b4f1 100644 --- a/src/mame/sega/saturn_m.cpp +++ b/src/mame/sega/saturn_m.cpp @@ -48,12 +48,6 @@ #include "cpu/sh/sh2.h" #include "cpu/scudsp/scudsp.h" -/* TODO: do this in a verboselog style */ -#define LOG_CDB 0 -#define LOG_SCU 1 -#define LOG_IRQ 0 -#define LOG_IOGA 0 - /**************************************************************************************/ diff --git a/src/mame/sega/saturn_v.cpp b/src/mame/sega/saturn_v.cpp index 4702183e279..5ddf63124a1 100644 --- a/src/mame/sega/saturn_v.cpp +++ b/src/mame/sega/saturn_v.cpp @@ -24,6 +24,19 @@ Framebuffer todo: #include "emu.h" #include "saturn.h" +#define LOG_VDP2 (1U << 1) +#define LOG_ROZ (1U << 2) + +#define DEBUG_MODE 0 + +#if DEBUG_MODE +#define VERBOSE (LOG_VDP2) +#else +#define VERBOSE (0) +#endif + +#include "logmacro.h" + #define VDP1_LOG 0 @@ -2323,7 +2336,6 @@ In other words,the first three types uses the offset and not the color allocated \-N Stores VDP1 ram contents into a file. */ -#define DEBUG_MODE 0 #define TEST_FUNCTIONS 0 #define POPMESSAGE_DEBUG 0 @@ -2336,13 +2348,7 @@ enum STV_TRANSPARENCY_ALPHA = 0x4 }; -#if DEBUG_MODE -#define LOG_VDP2 1 -#define LOG_ROZ 0 -#else -#define LOG_VDP2 0 -#define LOG_ROZ 0 -#endif +#define DEBUG_DRAW_ROZ (0) /* @@ -4403,20 +4409,19 @@ void saturn_state::stv_vdp2_fill_rotation_parameter_table( uint8_t rot_parameter #define RP stv_current_rotation_parameter_table - if(LOG_ROZ == 1) logerror( "Rotation parameter table (%d)\n", rot_parameter ); - if(LOG_ROZ == 1) logerror( "xst = %x, yst = %x, zst = %x\n", RP.xst, RP.yst, RP.zst ); - if(LOG_ROZ == 1) logerror( "dxst = %x, dyst = %x\n", RP.dxst, RP.dyst ); - if(LOG_ROZ == 1) logerror( "dx = %x, dy = %x\n", RP.dx, RP.dy ); - if(LOG_ROZ == 1) logerror( "A = %x, B = %x, C = %x, D = %x, E = %x, F = %x\n", RP.A, RP.B, RP.C, RP.D, RP.E, RP.F ); - if(LOG_ROZ == 1) logerror( "px = %x, py = %x, pz = %x\n", RP.px, RP.py, RP.pz ); - if(LOG_ROZ == 1) logerror( "cx = %x, cy = %x, cz = %x\n", RP.cx, RP.cy, RP.cz ); - if(LOG_ROZ == 1) logerror( "mx = %x, my = %x\n", RP.mx, RP.my ); - if(LOG_ROZ == 1) logerror( "kx = %x, ky = %x\n", RP.kx, RP.ky ); - if(LOG_ROZ == 1) logerror( "kast = %x, dkast = %x, dkax = %x\n", RP.kast, RP.dkast, RP.dkax ); + LOGMASKED(LOG_ROZ, "Rotation parameter table (%d)\n", rot_parameter); + LOGMASKED(LOG_ROZ, "xst = %x, yst = %x, zst = %x\n", RP.xst, RP.yst, RP.zst); + LOGMASKED(LOG_ROZ, "dxst = %x, dyst = %x\n", RP.dxst, RP.dyst); + LOGMASKED(LOG_ROZ, "dx = %x, dy = %x\n", RP.dx, RP.dy); + LOGMASKED(LOG_ROZ, "A = %x, B = %x, C = %x, D = %x, E = %x, F = %x\n", RP.A, RP.B, RP.C, RP.D, RP.E, RP.F); + LOGMASKED(LOG_ROZ, "px = %x, py = %x, pz = %x\n", RP.px, RP.py, RP.pz); + LOGMASKED(LOG_ROZ, "cx = %x, cy = %x, cz = %x\n", RP.cx, RP.cy, RP.cz); + LOGMASKED(LOG_ROZ, "mx = %x, my = %x\n", RP.mx, RP.my); + LOGMASKED(LOG_ROZ, "kx = %x, ky = %x\n", RP.kx, RP.ky); + LOGMASKED(LOG_ROZ, "kast = %x, dkast = %x, dkax = %x\n", RP.kast, RP.dkast, RP.dkax); /*Attempt to show on screen the rotation table*/ - #if 0 - if(LOG_ROZ == 2) + if (DEBUG_DRAW_ROZ) { if(machine().input().code_pressed_once(JOYCODE_Y_UP_SWITCH)) m_vdpdebug_roz++; @@ -4442,7 +4447,6 @@ void saturn_state::stv_vdp2_fill_rotation_parameter_table( uint8_t rot_parameter case 10: break; } } - #endif } /* check if RGB layer has rotation applied */ @@ -6329,15 +6333,12 @@ void saturn_state::stv_vdp2_draw_basic_tilemap(bitmap_rgb32 &bitmap, const recta uppermaskshift = (1-stv2_current_tilemap.pattern_data_size) | ((1-stv2_current_tilemap.tile_size)<<1); uppermask = 0x1ff >> uppermaskshift; - if ( LOG_VDP2 ) + LOGMASKED(LOG_VDP2, "Layer RBG%d, size %d x %d\n", stv2_current_tilemap.layer_name & 0x7f, cliprect.right() + 1, cliprect.bottom() + 1); + LOGMASKED(LOG_VDP2, "Tiles: min %08X, max %08X\n", tilecodemin, tilecodemax); + LOGMASKED(LOG_VDP2, "MAP size in dwords %08X\n", mpsize_dwords); + for (i = 0; i < stv2_current_tilemap.map_count; i++) { - logerror( "Layer RBG%d, size %d x %d\n", stv2_current_tilemap.layer_name & 0x7f, cliprect.right() + 1, cliprect.bottom() + 1 ); - logerror( "Tiles: min %08X, max %08X\n", tilecodemin, tilecodemax ); - logerror( "MAP size in dwords %08X\n", mpsize_dwords ); - for (i = 0; i < stv2_current_tilemap.map_count; i++) - { - logerror( "Map register %d: base %08X\n", stv2_current_tilemap.map_offset[i], base[i] ); - } + LOGMASKED(LOG_VDP2, "Map register %d: base %08X\n", stv2_current_tilemap.map_offset[i], base[i]); } // store map information @@ -6498,7 +6499,7 @@ void saturn_state::stv_vdp2_check_tilemap_with_linescroll(bitmap_rgb32 &bitmap, i++; } -// if ( LOG_VDP2 ) logerror( "Linescroll: y < %d, %d >, scrollx = %d, scrolly = %d, incx = %f\n", mycliprect.top(), mycliprect.bottom(), stv2_current_tilemap.scrollx, stv2_current_tilemap.scrolly, (float)stv2_current_tilemap.incx/65536.0 ); +// LOGMASKED(LOG_VDP2, "Linescroll: y < %d, %d >, scrollx = %d, scrolly = %d, incx = %f\n", mycliprect.top(), mycliprect.bottom(), stv2_current_tilemap.scrollx, stv2_current_tilemap.scrolly, (float)stv2_current_tilemap.incx/65536.0); // render current tilemap portion if (stv2_current_tilemap.bitmap_enable) // this layer is a bitmap { @@ -6792,12 +6793,12 @@ void saturn_state::stv_vdp2_copy_roz_bitmap(bitmap_rgb32 &bitmap, coeff_table_val = 0; coeff_table_base = nullptr; - if ( LOG_ROZ == 1 ) logerror( "Rendering RBG with parameter %s\n", iRP == 1 ? "A" : "B" ); - if ( LOG_ROZ == 1 ) logerror( "RPMD (parameter mode) = %x\n", STV_VDP2_RPMD ); - if ( LOG_ROZ == 1 ) logerror( "RPRCTL (parameter read control) = %04x\n", STV_VDP2_RPRCTL ); - if ( LOG_ROZ == 1 ) logerror( "KTCTL (coefficient table control) = %04x\n", STV_VDP2_KTCTL ); - if ( LOG_ROZ == 1 ) logerror( "KTAOF (coefficient table address offset) = %04x\n", STV_VDP2_KTAOF ); - if ( LOG_ROZ == 1 ) logerror( "RAOVR (screen-over process) = %x\n", STV_VDP2_RAOVR ); + LOGMASKED(LOG_ROZ, "Rendering RBG with parameter %s\n", iRP == 1 ? "A" : "B"); + LOGMASKED(LOG_ROZ, "RPMD (parameter mode) = %x\n", STV_VDP2_RPMD); + LOGMASKED(LOG_ROZ, "RPRCTL (parameter read control) = %04x\n", STV_VDP2_RPRCTL); + LOGMASKED(LOG_ROZ, "KTCTL (coefficient table control) = %04x\n", STV_VDP2_KTCTL); + LOGMASKED(LOG_ROZ, "KTAOF (coefficient table address offset) = %04x\n", STV_VDP2_KTAOF); + LOGMASKED(LOG_ROZ, "RAOVR (screen-over process) = %x\n", STV_VDP2_RAOVR); if ( iRP == 1 ) { use_coeff_table = STV_VDP2_RAKTE; @@ -7775,7 +7776,7 @@ void saturn_state::stv_vdp2_draw_rotation_screen(bitmap_rgb32 &bitmap, const rec stv2_current_tilemap.fade_control = 0; { auto profile1 = g_profiler.start(PROFILER_USER1); - if ( LOG_VDP2 ) logerror( "Checking for cached RBG bitmap, cache_dirty = %d, memcmp() = %d\n", stv_rbg_cache_data.is_cache_dirty, memcmp(&stv_rbg_cache_data.layer_data[iRP-1],&stv2_current_tilemap,sizeof(stv2_current_tilemap))); + LOGMASKED(LOG_VDP2, "Checking for cached RBG bitmap, cache_dirty = %d, memcmp() = %d\n", stv_rbg_cache_data.is_cache_dirty, memcmp(&stv_rbg_cache_data.layer_data[iRP-1],&stv2_current_tilemap,sizeof(stv2_current_tilemap))); if ( (stv_rbg_cache_data.is_cache_dirty & iRP) || memcmp(&stv_rbg_cache_data.layer_data[iRP-1],&stv2_current_tilemap,sizeof(stv2_current_tilemap)) != 0 ) { @@ -7789,8 +7790,8 @@ void saturn_state::stv_vdp2_draw_rotation_screen(bitmap_rgb32 &bitmap, const rec stv_rbg_cache_data.map_offset_max[iRP-1] = stv_vdp2_layer_data_placement.map_offset_max; stv_rbg_cache_data.tile_offset_min[iRP-1] = stv_vdp2_layer_data_placement.tile_offset_min; stv_rbg_cache_data.tile_offset_max[iRP-1] = stv_vdp2_layer_data_placement.tile_offset_max; - if ( LOG_VDP2 ) logerror( "Cache watch: map = %06X - %06X, tile = %06X - %06X\n", stv_rbg_cache_data.map_offset_min[iRP-1], - stv_rbg_cache_data.map_offset_max[iRP-1], stv_rbg_cache_data.tile_offset_min[iRP-1], stv_rbg_cache_data.tile_offset_max[iRP-1] ); + LOGMASKED(LOG_VDP2, "Cache watch: map = %06X - %06X, tile = %06X - %06X\n", stv_rbg_cache_data.map_offset_min[iRP-1], + stv_rbg_cache_data.map_offset_max[iRP-1], stv_rbg_cache_data.tile_offset_min[iRP-1], stv_rbg_cache_data.tile_offset_max[iRP-1]); } // stop profiling USER1 } @@ -8006,7 +8007,7 @@ void saturn_state::saturn_vdp2_vram_w(offs_t offset, uint32_t data, uint32_t mem (offset >= stv_rbg_cache_data.tile_offset_min[0] && offset < stv_rbg_cache_data.tile_offset_max[0]) ) { - if ( LOG_VDP2 ) logerror( "RBG Cache: dirtying for RP = 1, write at offset = %06X\n", offset ); + LOGMASKED(LOG_VDP2, "RBG Cache: dirtying for RP = 1, write at offset = %06X\n", offset); stv_rbg_cache_data.is_cache_dirty |= STV_VDP2_RBG_ROTATION_PARAMETER_A; stv_rbg_cache_data.watch_vdp2_vram_writes &= ~STV_VDP2_RBG_ROTATION_PARAMETER_A; } @@ -8018,7 +8019,7 @@ void saturn_state::saturn_vdp2_vram_w(offs_t offset, uint32_t data, uint32_t mem (offset >= stv_rbg_cache_data.tile_offset_min[1] && offset < stv_rbg_cache_data.tile_offset_max[1]) ) { - if ( LOG_VDP2 ) logerror( "RBG Cache: dirtying for RP = 2, write at offset = %06X\n", offset ); + LOGMASKED(LOG_VDP2, "RBG Cache: dirtying for RP = 2, write at offset = %06X\n", offset); stv_rbg_cache_data.is_cache_dirty |= STV_VDP2_RBG_ROTATION_PARAMETER_B; stv_rbg_cache_data.watch_vdp2_vram_writes &= ~STV_VDP2_RBG_ROTATION_PARAMETER_B; } diff --git a/src/mame/sega/segac2.cpp b/src/mame/sega/segac2.cpp index 13b13d99075..49562428e47 100644 --- a/src/mame/sega/segac2.cpp +++ b/src/mame/sega/segac2.cpp @@ -90,6 +90,12 @@ #include "screen.h" #include "speaker.h" +#define LOG_PROTECTION (1U << 1) +#define LOG_PALETTE (1U << 2) + +#define VERBOSE (0) +#include "logmacro.h" + namespace { @@ -97,10 +103,6 @@ namespace { #define XL2_CLOCK XTAL(53'693'175) -#define LOG_PROTECTION 0 -#define LOG_PALETTE 0 -#define LOG_IOCHIP 0 - typedef device_delegate segac2_prot_delegate; class segac2_state : public driver_device @@ -561,7 +563,7 @@ void segac2_state::control_w(uint8_t data) /* protection chip reads */ uint8_t segac2_state::prot_r() { - if (LOG_PROTECTION) logerror("%06X:protection r=%02X\n", m_maincpu->pcbase(), m_prot_read_buf); + LOGMASKED(LOG_PROTECTION, "%06X:protection r=%02X\n", m_maincpu->pcbase(), m_prot_read_buf); return m_prot_read_buf | 0xf0; } @@ -581,7 +583,7 @@ void segac2_state::prot_w(uint8_t data) /* determine the value to return, should a read occur */ m_prot_read_buf = m_prot_func(table_index); - if (LOG_PROTECTION) logerror("%06X:protection w=%02X, new result=%02X\n", m_maincpu->pcbase(), data & 0x0f, m_prot_read_buf); + LOGMASKED(LOG_PROTECTION, "%06X:protection w=%02X, new result=%02X\n", m_maincpu->pcbase(), data & 0x0f, m_prot_read_buf); /* if the palette changed, force an update */ if (new_sp_palbase != m_sp_palbase || new_bg_palbase != m_bg_palbase) @@ -590,7 +592,7 @@ void segac2_state::prot_w(uint8_t data) m_sp_palbase = new_sp_palbase; m_bg_palbase = new_bg_palbase; recompute_palette_tables(); - if (LOG_PALETTE && m_screen) logerror("Set palbank: %d/%d (scan=%d)\n", m_bg_palbase, m_sp_palbase, m_screen->vpos()); + if (m_screen) LOGMASKED(LOG_PALETTE, "Set palbank: %d/%d (scan=%d)\n", m_bg_palbase, m_sp_palbase, m_screen->vpos()); } } diff --git a/src/mame/sega/segahang.cpp b/src/mame/sega/segahang.cpp index 41b5d1057b6..52dfcd06b8c 100644 --- a/src/mame/sega/segahang.cpp +++ b/src/mame/sega/segahang.cpp @@ -27,7 +27,7 @@ #include "speaker.h" -#define LOG_MCU (1 << 1) +#define LOG_MCU (1U << 1) //#define VERBOSE (LOG_MCU) #include "logmacro.h" diff --git a/src/mame/sega/segaic16_m.cpp b/src/mame/sega/segaic16_m.cpp index 080386e1f86..6ace39b45a6 100644 --- a/src/mame/sega/segaic16_m.cpp +++ b/src/mame/sega/segaic16_m.cpp @@ -11,14 +11,11 @@ #include -//************************************************************************** -// DEBUGGING -//************************************************************************** - -#define LOG_MULTIPLY (0) -#define LOG_DIVIDE (0) -#define LOG_COMPARE (0) +#define LOG_DIVIDE (1U << 1) +#define LOG_COMPARE (1U << 2) +#define VERBOSE (0) +#include "logmacro.h" //************************************************************************** @@ -139,7 +136,7 @@ u16 sega_315_5249_divider_device::read(offs_t offset) void sega_315_5249_divider_device::write(offs_t offset, u16 data, u16 mem_mask) { - if (LOG_DIVIDE) logerror("divide_w(%X) = %04X\n", offset, data); + LOGMASKED(LOG_DIVIDE, "divide_w(%X) = %04X\n", offset, data); // only 4 effective write registers switch (offset & 3) @@ -307,7 +304,7 @@ void sega_315_5250_compare_timer_device::interrupt_ack() u16 sega_315_5250_compare_timer_device::read(offs_t offset) { - if (LOG_COMPARE) logerror("compare_r(%X) = %04X\n", offset, m_regs[offset]); + LOGMASKED(LOG_COMPARE, "compare_r(%X) = %04X\n", offset, m_regs[offset]); switch (offset & 15) { case 0x0: return m_regs[0]; @@ -331,7 +328,7 @@ u16 sega_315_5250_compare_timer_device::read(offs_t offset) void sega_315_5250_compare_timer_device::write(offs_t offset, u16 data, u16 mem_mask) { - if (LOG_COMPARE) logerror("compare_w(%X) = %04X\n", offset, data); + LOGMASKED(LOG_COMPARE, "compare_w(%X) = %04X\n", offset, data); switch (offset & 15) { case 0x0: COMBINE_DATA(&m_regs[0]); execute(); break; diff --git a/src/mame/sega/sms.h b/src/mame/sega/sms.h index 2981324cdb4..e3775d7e599 100644 --- a/src/mame/sega/sms.h +++ b/src/mame/sega/sms.h @@ -22,10 +22,6 @@ #include "screen.h" -#define LOG_REG -#define LOG_PAGING -#define LOG_COLOR - class sms_state : public driver_device { diff --git a/src/mame/sega/suprloco.cpp b/src/mame/sega/suprloco.cpp index 403341d8b40..468c3dafdf7 100644 --- a/src/mame/sega/suprloco.cpp +++ b/src/mame/sega/suprloco.cpp @@ -36,7 +36,7 @@ Sega PCB 834-5137 // configurable logging -#define LOG_CTRLBIT4 (1U << 1) +#define LOG_CTRLBIT4 (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_CTRLBIT4) diff --git a/src/mame/seibu/seibucop.cpp b/src/mame/seibu/seibucop.cpp index 26fb9af4b49..3058411c16c 100644 --- a/src/mame/seibu/seibucop.cpp +++ b/src/mame/seibu/seibucop.cpp @@ -106,23 +106,24 @@ #include "seibucop.h" #include "debugger.h" +#define LOG_COMMANDS (1U << 1) +#define LOG_TRIGONOMETRY (1U << 2) +#define LOG_DIVISION (1U << 3) +#define LOG_MOVE0205 (1U << 4) +#define LOG_MOVE0905 (1U << 5) + +#define VERBOSE (0) +#include "logmacro.h" + + // use Z to dump out table info //#define TABLE_DUMPER -#define LOG_Commands 0 -#define LOG_Phytagoras 0 -#define LOG_Division 0 -#define LOG_Move0205 0 -#define LOG_Move0905 0 - #include "seibucop_dma.ipp" #include "seibucop_cmd.ipp" #include -#define seibu_cop_log \ - if (LOG_Commands) logerror - DEFINE_DEVICE_TYPE(RAIDEN2COP, raiden2cop_device, "raiden2cop", "Seibu COP (Raiden 2)") @@ -635,7 +636,7 @@ int raiden2cop_device::find_trigger_match(uint16_t triggerval, uint16_t mask) otherlog = 0; } - seibu_cop_log(" Cop Command %04x found in slot %02x with other params %04x %04x\n", triggerval, i, cop_func_value[i], cop_func_mask[i]); + LOGMASKED(LOG_COMMANDS, " Cop Command %04x found in slot %02x with other params %04x %04x\n", triggerval, i, cop_func_value[i], cop_func_mask[i]); if (otherlog == 1) printf("used command %04x\n", triggerval); @@ -647,18 +648,18 @@ int raiden2cop_device::find_trigger_match(uint16_t triggerval, uint16_t mask) if (matched == 1) { int j; - seibu_cop_log(" Sequence: "); + LOGMASKED(LOG_COMMANDS, " Sequence: "); for (j=0;j<0x8;j++) { - seibu_cop_log("%04x ", cop_program[command*8+j]); + LOGMASKED(LOG_COMMANDS, "%04x ", cop_program[command*8+j]); } - seibu_cop_log("\n"); + LOGMASKED(LOG_COMMANDS, "\n"); return command; } else if (matched == 0) { - seibu_cop_log(" Cop Command %04x NOT IN TABLE!\n", triggerval); + LOGMASKED(LOG_COMMANDS, " Cop Command %04x NOT IN TABLE!\n", triggerval); printf("Command Not Found!\n"); return -1; } @@ -1364,7 +1365,7 @@ void raiden2cop_device::LEGACY_cop_cmd_w(offs_t offset, uint16_t data) int command; - //seibu_cop_log("%s: COPX execute table macro command %04x | regs %08x %08x %08x %08x %08x\n", machine().describe_context(), data, cop_regs[0], cop_regs[1], cop_regs[2], cop_regs[3], cop_regs[4]); + //LOGMASKED(LOG_COMMANDS, "%s: COPX execute table macro command %04x | regs %08x %08x %08x %08x %08x\n", machine().describe_context(), data, cop_regs[0], cop_regs[1], cop_regs[2], cop_regs[3], cop_regs[4]); command = find_trigger_match(data, 0xf800); diff --git a/src/mame/seibu/seibucop_cmd.ipp b/src/mame/seibu/seibucop_cmd.ipp index 51f486c1bc7..05caa482a7c 100644 --- a/src/mame/seibu/seibucop_cmd.ipp +++ b/src/mame/seibu/seibucop_cmd.ipp @@ -27,10 +27,8 @@ void raiden2cop_device::execute_0205(int offset, uint16_t data) int ppos = m_host_space->read_dword(cop_regs[0] + 0x04 + offset * 4); int npos = ppos + m_host_space->read_dword(cop_regs[0] + 0x10 + offset * 4); int delta = (npos >> 16) - (ppos >> 16); -#if LOG_Move0205 - // ... -#endif m_host_space->write_dword(cop_regs[0] + 4 + offset * 4, npos); + // LOGMASKED(LOG_MOVE0205, ...); cop_write_word(cop_regs[0] + 0x1e + offset * 4, cop_read_word(cop_regs[0] + 0x1e + offset * 4) + delta); } @@ -44,9 +42,7 @@ void raiden2cop_device::execute_0205(int offset, uint16_t data) void raiden2cop_device::execute_0904(int offset, uint16_t data) { -#if LOG_Move0905 - printf("cmd %04x: %08x %08x [%08x]\n",data, m_host_space->read_dword(cop_regs[0] + 16 + offset * 4),m_host_space->read_dword(cop_regs[0] + 0x28 + offset * 4),cop_regs[0]); -#endif + LOGMASKED(LOG_MOVE0905, "cmd %04x: %08x %08x [%08x]\n",data, m_host_space->read_dword(cop_regs[0] + 16 + offset * 4),m_host_space->read_dword(cop_regs[0] + 0x28 + offset * 4),cop_regs[0]); if (data&0x0001) m_host_space->write_dword(cop_regs[0] + 16 + offset * 4, m_host_space->read_dword(cop_regs[0] + 16 + offset * 4) + m_host_space->read_dword(cop_regs[0] + 0x28 + offset * 4)); @@ -179,9 +175,7 @@ void raiden2cop_device::execute_338e(int offset, uint16_t data, bool is_yflip) cop_angle &= 0xff; } -#if LOG_Phytagoras - printf("cmd %04x: dx = %d dy = %d angle = %02x %04x\n",data,dx,dy,cop_angle); -#endif + LOGMASKED(LOG_TRIGONOMETRY, "cmd %04x: dx = %d dy = %d angle = %02x %04x\n",data,dx,dy,cop_angle); if (data & 0x0080) { // TODO: byte or word? @@ -212,9 +206,7 @@ void raiden2cop_device::execute_3b30(int offset, uint16_t data) dy = dy >> 16; cop_dist = sqrt((double)(dx*dx + dy*dy)); -#if LOG_Phytagoras - printf("cmd %04x: dx = %d dy = %d dist = %08x \n",data,dx >> 16,dy >> 16,cop_dist); -#endif + LOGMASKED(LOG_TRIGONOMETRY, "cmd %04x: dx = %d dy = %d dist = %08x \n",data,dx >> 16,dy >> 16,cop_dist); if (data & 0x0080) cop_write_word(cop_regs[0] + (data & 0x200 ? 0x3a : 0x38), cop_dist); @@ -228,9 +220,7 @@ void raiden2cop_device::execute_42c2(int offset, uint16_t data) { int div = cop_read_word(cop_regs[0] + (0x36)); -#if LOG_Division - printf("cmd %04x: div = %04x scale = %04x\n",data,div,cop_scale); -#endif + LOGMASKED(LOG_DIVISION, "cmd %04x: div = %04x scale = %04x\n",data,div,cop_scale); if (!div) { @@ -242,12 +232,10 @@ void raiden2cop_device::execute_42c2(int offset, uint16_t data) /* TODO: bits 5-6-15 */ cop_status = 7; -#if LOG_Division - printf("res = %04x dist %04x\n",(cop_dist << (5 - cop_scale)) / div,cop_dist); + LOGMASKED(LOG_DIVISION, "res = %04x dist %04x\n",(cop_dist << (5 - cop_scale)) / div,cop_dist); // if(div & 0x8000) // machine().debugger().debug_break(); -#endif cop_write_word(cop_regs[0] + (0x38), (cop_dist << (5 - cop_scale)) / div); } @@ -678,9 +666,7 @@ void raiden2cop_device::LEGACY_execute_e30e(int offset, uint16_t data) cop_angle &= 0xff; } -#if LOG_Phytagoras - printf("cmd %04x: dx = %d dy = %d angle = %02x %04x\n",data,dx,dy,cop_angle); -#endif + LOGMASKED(LOG_TRIGONOMETRY, "cmd %04x: dx = %d dy = %d angle = %02x %04x\n",data,dx,dy,cop_angle); // TODO: byte or word? if (data & 0x0080) diff --git a/src/mame/sgi/4dpi.cpp b/src/mame/sgi/4dpi.cpp index be8d327445d..f99f4824fed 100644 --- a/src/mame/sgi/4dpi.cpp +++ b/src/mame/sgi/4dpi.cpp @@ -63,8 +63,6 @@ #include "4dpi.lh" -#define LOG_GENERAL (1U << 0) - #define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/mame/sgi/crime.cpp b/src/mame/sgi/crime.cpp index 91742ec2f85..951ebec2ad7 100644 --- a/src/mame/sgi/crime.cpp +++ b/src/mame/sgi/crime.cpp @@ -9,9 +9,9 @@ #include "emu.h" #include "crime.h" -#define LOG_UNKNOWN (1U << 0) -#define LOG_READS (1U << 1) -#define LOG_WRITES (1U << 2) +#define LOG_UNKNOWN (1U << 1) +#define LOG_READS (1U << 2) +#define LOG_WRITES (1U << 3) #define LOG_ALL (LOG_UNKNOWN | LOG_READS | LOG_WRITES) #define VERBOSE (LOG_ALL) diff --git a/src/mame/sgi/crimson.cpp b/src/mame/sgi/crimson.cpp index 9467dac31c9..790eadcf54c 100644 --- a/src/mame/sgi/crimson.cpp +++ b/src/mame/sgi/crimson.cpp @@ -18,7 +18,7 @@ #include "machine/nvram.h" #include "machine/pit8253.h" -#define LOG_UNKNOWN (1 << 0) +#define LOG_UNKNOWN (1U << 1) #define LOG_ALL (LOG_UNKNOWN) #define VERBOSE (0) diff --git a/src/mame/sgi/hal2.cpp b/src/mame/sgi/hal2.cpp index cc08a78be01..7c0d25e4f52 100644 --- a/src/mame/sgi/hal2.cpp +++ b/src/mame/sgi/hal2.cpp @@ -9,9 +9,9 @@ #include "emu.h" #include "hal2.h" -#define LOG_UNKNOWN (1U << 0) -#define LOG_READS (1U << 1) -#define LOG_WRITES (1U << 2) +#define LOG_UNKNOWN (1U << 1) +#define LOG_READS (1U << 2) +#define LOG_WRITES (1U << 3) #define LOG_ALL (LOG_UNKNOWN | LOG_READS | LOG_WRITES) #define VERBOSE (0) diff --git a/src/mame/sgi/hpc1.cpp b/src/mame/sgi/hpc1.cpp index 8e139e3d953..b2bddb1e49b 100644 --- a/src/mame/sgi/hpc1.cpp +++ b/src/mame/sgi/hpc1.cpp @@ -17,18 +17,18 @@ #include "hpc1.h" #include "speaker.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_READS (1 << 1) -#define LOG_WRITES (1 << 2) -#define LOG_INT (1 << 3) -#define LOG_EEPROM (1 << 4) -#define LOG_SCSI (1 << 5) -#define LOG_SCSI_DMA (1 << 6) -#define LOG_DUART0 (1 << 7) -#define LOG_DUART1 (1 << 8) -#define LOG_DUART2 (1 << 9) -#define LOG_PIT (1 << 10) -#define LOG_CHAIN (1 << 11) +#define LOG_UNKNOWN (1U << 1) +#define LOG_READS (1U << 2) +#define LOG_WRITES (1U << 3) +#define LOG_INT (1U << 4) +#define LOG_EEPROM (1U << 5) +#define LOG_SCSI (1U << 6) +#define LOG_SCSI_DMA (1U << 7) +#define LOG_DUART0 (1U << 8) +#define LOG_DUART1 (1U << 9) +#define LOG_DUART2 (1U << 10) +#define LOG_PIT (1U << 11) +#define LOG_CHAIN (1U << 12) #define LOG_REGS (LOG_UNKNOWN | LOG_READS | LOG_WRITES) #define LOG_DUART (LOG_DUART0 | LOG_DUART1 | LOG_DUART2) #define LOG_ALL (LOG_REGS | LOG_INT | LOG_EEPROM | LOG_SCSI | LOG_SCSI_DMA | LOG_DUART | LOG_PIT | LOG_CHAIN) diff --git a/src/mame/sgi/hpc3.cpp b/src/mame/sgi/hpc3.cpp index ad5b58dd9dd..ca734852f33 100644 --- a/src/mame/sgi/hpc3.cpp +++ b/src/mame/sgi/hpc3.cpp @@ -9,14 +9,14 @@ #include "emu.h" #include "hpc3.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_PBUS_DMA (1 << 1) -#define LOG_SCSI (1 << 2) -#define LOG_SCSI_DMA (1 << 3) -#define LOG_SCSI_IRQ (1 << 4) -#define LOG_ETHERNET (1 << 5) -#define LOG_CHAIN (1 << 6) -#define LOG_EEPROM (1 << 7) +#define LOG_UNKNOWN (1U << 1) +#define LOG_PBUS_DMA (1U << 2) +#define LOG_SCSI (1U << 3) +#define LOG_SCSI_DMA (1U << 4) +#define LOG_SCSI_IRQ (1U << 5) +#define LOG_ETHERNET (1U << 6) +#define LOG_CHAIN (1U << 7) +#define LOG_EEPROM (1U << 8) #define LOG_ALL (LOG_UNKNOWN | LOG_PBUS_DMA | LOG_SCSI | LOG_SCSI_DMA | LOG_SCSI_IRQ | LOG_ETHERNET | LOG_CHAIN | LOG_EEPROM) #define VERBOSE (0) diff --git a/src/mame/sgi/indigo.cpp b/src/mame/sgi/indigo.cpp index a369a430939..28c6e3a78ac 100644 --- a/src/mame/sgi/indigo.cpp +++ b/src/mame/sgi/indigo.cpp @@ -24,9 +24,9 @@ #include "sgi.h" #include "light.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_INT (1 << 1) -#define LOG_DSP (1 << 2) +#define LOG_UNKNOWN (1U << 1) +#define LOG_INT (1U << 2) +#define LOG_DSP (1U << 3) #define LOG_ALL (LOG_UNKNOWN | LOG_INT | LOG_DSP) #define VERBOSE (LOG_UNKNOWN) diff --git a/src/mame/sgi/ioc2.cpp b/src/mame/sgi/ioc2.cpp index 7522eb84c69..31056762a65 100644 --- a/src/mame/sgi/ioc2.cpp +++ b/src/mame/sgi/ioc2.cpp @@ -11,18 +11,18 @@ #include "machine/input_merger.h" #include "ioc2.h" -#define LOG_PI1 (1 << 0) -#define LOG_SERIAL (1 << 1) -#define LOG_MOUSEKBD (1 << 2) -#define LOG_PANEL (1 << 3) -#define LOG_SYSID (1 << 4) -#define LOG_READ (1 << 5) -#define LOG_DMA_SEL (1 << 6) -#define LOG_RESET (1 << 7) -#define LOG_WRITE (1 << 8) -#define LOG_INT3 (1 << 9) -#define LOG_PIT (1 << 10) -#define LOG_IRQS (1 << 11) +#define LOG_PI1 (1U << 1) +#define LOG_SERIAL (1U << 2) +#define LOG_MOUSEKBD (1U << 3) +#define LOG_PANEL (1U << 4) +#define LOG_SYSID (1U << 5) +#define LOG_READ (1U << 6) +#define LOG_DMA_SEL (1U << 7) +#define LOG_RESET (1U << 8) +#define LOG_WRITE (1U << 9) +#define LOG_INT3 (1U << 10) +#define LOG_PIT (1U << 11) +#define LOG_IRQS (1U << 12) #define LOG_ALL (LOG_PI1 | LOG_SERIAL | LOG_MOUSEKBD | LOG_PANEL | LOG_SYSID | LOG_READ | LOG_DMA_SEL | LOG_RESET | LOG_WRITE | LOG_INT3 | LOG_PIT | LOG_IRQS) #define LOG_DEFAULT (LOG_ALL & ~(LOG_SYSID)) diff --git a/src/mame/sgi/iris3130.cpp b/src/mame/sgi/iris3130.cpp index 3a3d7e7c3d0..0030914a2ff 100644 --- a/src/mame/sgi/iris3130.cpp +++ b/src/mame/sgi/iris3130.cpp @@ -46,9 +46,9 @@ #include -#define LOG_RTC (1 << 0) -#define LOG_INVALID_SEGMENT (1 << 1) -#define LOG_OTHER (1 << 2) +#define LOG_RTC (1U << 1) +#define LOG_INVALID_SEGMENT (1U << 2) +#define LOG_OTHER (1U << 3) #define VERBOSE (0) diff --git a/src/mame/sgi/iris_power.cpp b/src/mame/sgi/iris_power.cpp index 6de75309521..7ab03b1fe1a 100644 --- a/src/mame/sgi/iris_power.cpp +++ b/src/mame/sgi/iris_power.cpp @@ -27,7 +27,7 @@ #include "emu.h" #include "cpu/mips/mips1.h" -#define LOG_UNKNOWN (1 << 0) +#define LOG_UNKNOWN (1U << 1) #define LOG_ALL (LOG_UNKNOWN) #define VERBOSE (0) diff --git a/src/mame/sgi/light.cpp b/src/mame/sgi/light.cpp index 9d2f986b34a..c0fd7cc7b53 100644 --- a/src/mame/sgi/light.cpp +++ b/src/mame/sgi/light.cpp @@ -9,7 +9,7 @@ #include "light.h" #include "screen.h" -#define LOG_REX (1 << 0) +#define LOG_REX (1U << 1) #define LOG_ALL (LOG_REX) #define VERBOSE (0) diff --git a/src/mame/sgi/mace.cpp b/src/mame/sgi/mace.cpp index f6819aea24b..52d3bb5abd3 100644 --- a/src/mame/sgi/mace.cpp +++ b/src/mame/sgi/mace.cpp @@ -9,31 +9,31 @@ #include "emu.h" #include "mace.h" -#define LOG_READ_PCI (1U << 0) -#define LOG_READ_VIN1 (1U << 1) -#define LOG_READ_VIN2 (1U << 2) -#define LOG_READ_VOUT (1U << 3) -#define LOG_READ_ENET (1U << 4) -#define LOG_READ_AUDIO (1U << 5) -#define LOG_READ_ISA (1U << 6) -#define LOG_READ_KBDMS (1U << 7) -#define LOG_READ_I2C (1U << 8) -#define LOG_READ_UST_MSC (1U << 9) -#define LOG_READ_ISA_EXT (1U << 10) -#define LOG_READ_RTC (1U << 11) -#define LOG_WRITE_PCI (1U << 12) -#define LOG_WRITE_VIN1 (1U << 13) -#define LOG_WRITE_VIN2 (1U << 14) -#define LOG_WRITE_VOUT (1U << 15) -#define LOG_WRITE_ENET (1U << 16) -#define LOG_WRITE_AUDIO (1U << 17) -#define LOG_WRITE_ISA (1U << 18) -#define LOG_WRITE_KBDMS (1U << 19) -#define LOG_WRITE_I2C (1U << 20) -#define LOG_WRITE_UST_MSC (1U << 21) -#define LOG_WRITE_ISA_EXT (1U << 22) -#define LOG_WRITE_RTC (1U << 23) -#define LOG_HIFREQ (1U << 24) +#define LOG_READ_PCI (1U << 1) +#define LOG_READ_VIN1 (1U << 2) +#define LOG_READ_VIN2 (1U << 3) +#define LOG_READ_VOUT (1U << 4) +#define LOG_READ_ENET (1U << 5) +#define LOG_READ_AUDIO (1U << 6) +#define LOG_READ_ISA (1U << 7) +#define LOG_READ_KBDMS (1U << 8) +#define LOG_READ_I2C (1U << 9) +#define LOG_READ_UST_MSC (1U << 10) +#define LOG_READ_ISA_EXT (1U << 11) +#define LOG_READ_RTC (1U << 12) +#define LOG_WRITE_PCI (1U << 13) +#define LOG_WRITE_VIN1 (1U << 14) +#define LOG_WRITE_VIN2 (1U << 15) +#define LOG_WRITE_VOUT (1U << 16) +#define LOG_WRITE_ENET (1U << 17) +#define LOG_WRITE_AUDIO (1U << 18) +#define LOG_WRITE_ISA (1U << 19) +#define LOG_WRITE_KBDMS (1U << 20) +#define LOG_WRITE_I2C (1U << 21) +#define LOG_WRITE_UST_MSC (1U << 22) +#define LOG_WRITE_ISA_EXT (1U << 23) +#define LOG_WRITE_RTC (1U << 24) +#define LOG_HIFREQ (1U << 25) #define LOG_PCI (LOG_READ_PCI | LOG_WRITE_PCI) #define LOG_VIN1 (LOG_READ_VIN1 | LOG_WRITE_VIN1) #define LOG_VIN2 (LOG_READ_VIN2 | LOG_WRITE_VIN2) diff --git a/src/mame/sgi/octane.cpp b/src/mame/sgi/octane.cpp index 0e76d05d78f..ab51f3b9eab 100644 --- a/src/mame/sgi/octane.cpp +++ b/src/mame/sgi/octane.cpp @@ -14,7 +14,7 @@ #include "emu.h" #include "cpu/mips/mips3.h" -#define LOG_UNKNOWN (1 << 0) +#define LOG_UNKNOWN (1U << 1) #define LOG_ALL (LOG_UNKNOWN) #define VERBOSE (0) diff --git a/src/mame/sgi/sgi.cpp b/src/mame/sgi/sgi.cpp index 9203a705a23..3574fcd5da9 100644 --- a/src/mame/sgi/sgi.cpp +++ b/src/mame/sgi/sgi.cpp @@ -11,15 +11,15 @@ #include "emu.h" #include "sgi.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_READS (1 << 1) -#define LOG_WRITES (1 << 2) -#define LOG_RPSS (1 << 3) -#define LOG_WATCHDOG (1 << 4) -#define LOG_MEMCFG (1 << 5) -#define LOG_MEMCFG_EXT (1 << 6) -#define LOG_EEPROM (1 << 7) -#define LOG_DMA (1 << 8) +#define LOG_UNKNOWN (1U << 1) +#define LOG_READS (1U << 2) +#define LOG_WRITES (1U << 3) +#define LOG_RPSS (1U << 4) +#define LOG_WATCHDOG (1U << 5) +#define LOG_MEMCFG (1U << 6) +#define LOG_MEMCFG_EXT (1U << 7) +#define LOG_EEPROM (1U << 8) +#define LOG_DMA (1U << 9) #define LOG_DEFAULT (LOG_READS | LOG_WRITES | LOG_RPSS | LOG_WATCHDOG | LOG_UNKNOWN) #define VERBOSE (0) diff --git a/src/mame/sgi/sgi_ge5.cpp b/src/mame/sgi/sgi_ge5.cpp index 2016d43c026..6d5e1384e34 100644 --- a/src/mame/sgi/sgi_ge5.cpp +++ b/src/mame/sgi/sgi_ge5.cpp @@ -25,7 +25,6 @@ #include "debugger.h" #include "sgi_ge5.h" -#define LOG_GENERAL (1U << 0) #define LOG_TOKEN (1U << 1) #define LOG_MEMORY (1U << 2) #define LOG_DMA (1U << 3) diff --git a/src/mame/sgi/sgi_gr1.cpp b/src/mame/sgi/sgi_gr1.cpp index eed77bfc59a..c2fa3bd62d9 100644 --- a/src/mame/sgi/sgi_gr1.cpp +++ b/src/mame/sgi/sgi_gr1.cpp @@ -59,7 +59,6 @@ #include "emu.h" #include "sgi_gr1.h" -#define LOG_GENERAL (1U << 0) #define LOG_READS (1U << 1) //#define VERBOSE (LOG_GENERAL) diff --git a/src/mame/sgi/sgi_re2.cpp b/src/mame/sgi/sgi_re2.cpp index 6b973c5fc34..401dd228636 100644 --- a/src/mame/sgi/sgi_re2.cpp +++ b/src/mame/sgi/sgi_re2.cpp @@ -15,7 +15,6 @@ #include "debugger.h" #include "sgi_re2.h" -#define LOG_GENERAL (1U << 0) #define LOG_REG (1U << 1) //#define VERBOSE (LOG_GENERAL|LOG_REG) diff --git a/src/mame/sgi/sgi_xmap2.cpp b/src/mame/sgi/sgi_xmap2.cpp index 789387bc743..70e75017b41 100644 --- a/src/mame/sgi/sgi_xmap2.cpp +++ b/src/mame/sgi/sgi_xmap2.cpp @@ -8,8 +8,6 @@ #include "emu.h" #include "sgi_xmap2.h" -#define LOG_GENERAL (1U << 0) - //#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/mame/sgi/vino.cpp b/src/mame/sgi/vino.cpp index 5de93c7fb78..6e201c2ad31 100644 --- a/src/mame/sgi/vino.cpp +++ b/src/mame/sgi/vino.cpp @@ -11,18 +11,18 @@ #include "emu.h" #include "vino.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_READS (1 << 1) -#define LOG_WRITES (1 << 2) -#define LOG_DESCS (1 << 3) -#define LOG_DMA (1 << 4) -#define LOG_DMA_DATA (1 << 5) -#define LOG_FIFO (1 << 6) -#define LOG_FIELDS (1 << 7) -#define LOG_COORDS (1 << 8) -#define LOG_INPUTS (1 << 9) -#define LOG_INTERRUPTS (1 << 10) -#define LOG_INDICES (1 << 11) +#define LOG_UNKNOWN (1U << 1) +#define LOG_READS (1U << 2) +#define LOG_WRITES (1U << 3) +#define LOG_DESCS (1U << 4) +#define LOG_DMA (1U << 5) +#define LOG_DMA_DATA (1U << 6) +#define LOG_FIFO (1U << 7) +#define LOG_FIELDS (1U << 8) +#define LOG_COORDS (1U << 9) +#define LOG_INPUTS (1U << 10) +#define LOG_INTERRUPTS (1U << 11) +#define LOG_INDICES (1U << 12) #define LOG_DEFAULT (LOG_WRITES | LOG_FIELDS | LOG_DMA | LOG_DESCS | LOG_READS | LOG_INTERRUPTS | LOG_INDICES | LOG_COORDS) #define VERBOSE (0) diff --git a/src/mame/shared/cage.cpp b/src/mame/shared/cage.cpp index 9276b8b6dfc..37124081192 100644 --- a/src/mame/shared/cage.cpp +++ b/src/mame/shared/cage.cpp @@ -83,10 +83,12 @@ #include "emu.h" #include "cage.h" +#define LOG_COMM (1U << 1) +#define LOG_32031_IOPORTS (1U << 2) +#define LOG_WARNINGS (1U << 3) -#define LOG_COMM (0) -#define LOG_32031_IOPORTS (0) - +#define VERBOSE (LOG_WARNINGS) +#include "logmacro.h" /************************************* @@ -293,9 +295,9 @@ void atari_cage_device::update_dma_state() /* make sure our assumptions are correct */ if (m_tms32031_io_regs[DMA_DEST_ADDR] != 0x808048) - logerror("CAGE DMA: unexpected dest address %08X!\n", m_tms32031_io_regs[DMA_DEST_ADDR]); + LOGMASKED(LOG_WARNINGS, "CAGE DMA: unexpected dest address %08X!\n", m_tms32031_io_regs[DMA_DEST_ADDR]); if ((m_tms32031_io_regs[DMA_GLOBAL_CTL] & 0xfef) != 0xe03) - logerror("CAGE DMA: unexpected transfer params %08X!\n", m_tms32031_io_regs[DMA_GLOBAL_CTL]); + LOGMASKED(LOG_WARNINGS, "CAGE DMA: unexpected transfer params %08X!\n", m_tms32031_io_regs[DMA_GLOBAL_CTL]); /* do the DMA up front */ addr = m_tms32031_io_regs[DMA_SOURCE_ADDR]; @@ -363,7 +365,7 @@ void atari_cage_device::update_timer(int which) /* make sure our assumptions are correct */ if (m_tms32031_io_regs[base + TIMER0_GLOBAL_CTL] != 0x2c1) - logerror("CAGE TIMER%d: unexpected timer config %08X!\n", which, m_tms32031_io_regs[base + TIMER0_GLOBAL_CTL]); + LOGMASKED(LOG_WARNINGS, "CAGE TIMER%d: unexpected timer config %08X!\n", which, m_tms32031_io_regs[base + TIMER0_GLOBAL_CTL]); m_timer[which]->adjust(period, which); } @@ -438,8 +440,7 @@ uint32_t atari_cage_device::tms32031_io_r(offs_t offset) break; } - if (LOG_32031_IOPORTS) - logerror("%s CAGE:%s read -> %08X\n", machine().describe_context(), register_names[offset & 0x7f], result); + LOGMASKED(LOG_32031_IOPORTS, "%s CAGE:%s read -> %08X\n", machine().describe_context(), register_names[offset & 0x7f], result); return result; } @@ -448,8 +449,7 @@ void atari_cage_device::tms32031_io_w(offs_t offset, uint32_t data, uint32_t mem { COMBINE_DATA(&m_tms32031_io_regs[offset]); - if (LOG_32031_IOPORTS) - logerror("%s CAGE:%s write = %08X\n", machine().describe_context(), register_names[offset & 0x7f], m_tms32031_io_regs[offset]); + LOGMASKED(LOG_32031_IOPORTS, "%s CAGE:%s write = %08X\n", machine().describe_context(), register_names[offset & 0x7f], m_tms32031_io_regs[offset]); switch (offset) { @@ -525,8 +525,7 @@ void atari_cage_device::update_control_lines() uint32_t atari_cage_device::cage_from_main_r() { - if (LOG_COMM) - logerror("%s CAGE read command = %04X\n", machine().describe_context(), m_from_main); + LOGMASKED(LOG_COMM, "%s CAGE read command = %04X\n", machine().describe_context(), m_from_main); m_cpu_to_cage_ready = 0; update_control_lines(); m_cpu->set_input_line(TMS3203X_IRQ0, CLEAR_LINE); @@ -536,17 +535,13 @@ uint32_t atari_cage_device::cage_from_main_r() void atari_cage_device::cage_from_main_ack_w(uint32_t data) { - if (LOG_COMM) - { - logerror("%s CAGE ack command = %04X\n", machine().describe_context(), m_from_main); - } + LOGMASKED(LOG_COMM, "%s CAGE ack command = %04X\n", machine().describe_context(), m_from_main); } void atari_cage_device::cage_to_main_w(uint32_t data) { - if (LOG_COMM) - logerror("%s Data from CAGE = %04X\n", machine().describe_context(), data); + LOGMASKED(LOG_COMM, "%s Data from CAGE = %04X\n", machine().describe_context(), data); m_soundlatch->write(data); m_cage_to_cpu_ready = 1; update_control_lines(); @@ -566,8 +561,7 @@ uint32_t atari_cage_device::cage_io_status_r() uint16_t atari_cage_device::main_r() { - if (LOG_COMM) - logerror("%s:main read data = %04X\n", machine().describe_context(), m_soundlatch->read()); + LOGMASKED(LOG_COMM, "%s:main read data = %04X\n", machine().describe_context(), m_soundlatch->read()); m_cage_to_cpu_ready = 0; update_control_lines(); return m_soundlatch->read(); @@ -585,8 +579,7 @@ TIMER_CALLBACK_MEMBER( atari_cage_device::cage_deferred_w ) void atari_cage_device::main_w(uint16_t data) { - if (LOG_COMM) - logerror("%s:Command to CAGE = %04X\n", machine().describe_context(), data); + LOGMASKED(LOG_COMM, "%s:Command to CAGE = %04X\n", machine().describe_context(), data); machine().scheduler().synchronize(timer_expired_delegate(FUNC(atari_cage_device::cage_deferred_w),this), data); } diff --git a/src/mame/shared/dcs.cpp b/src/mame/shared/dcs.cpp index d1a447d1a3d..b8d9963af76 100644 --- a/src/mame/shared/dcs.cpp +++ b/src/mame/shared/dcs.cpp @@ -156,13 +156,14 @@ #include "dcs.h" #include "speaker.h" +#define LOG_DCS_TRANSFERS (1U << 1) +#define LOG_DCS_IO (1U << 2) -#define LOG_DCS_TRANSFERS (0) -#define LOG_DCS_IO (0) -#define LOG_BUFFER_FILLING (0) +#define VERBOSE (LOG_GENERAL) +#include "logmacro.h" -#define ENABLE_HLE_TRANSFERS (1) +#define ENABLE_HLE_TRANSFERS (1) /************************************* @@ -540,8 +541,7 @@ void dcs_audio_device::dcs_boot() TIMER_CALLBACK_MEMBER( dcs_audio_device::dcs_reset ) { - if (LOG_DCS_IO) - logerror("dcs_reset\n"); + LOGMASKED(LOG_DCS_IO, "dcs_reset\n"); /* reset the memory banking */ switch (m_rev) @@ -880,7 +880,7 @@ void dcs2_audio_device::device_start() if (m_ram_map) m_ram_map->set_bank(0); m_data_bank->configure_entries(0, m_sounddata_banks, m_sounddata, soundbank_words * 2); - logerror("device_start: audio ram banks: %x size: %x\n", m_sounddata_banks, soundbank_words); + LOG("device_start: audio ram banks: %x size: %x\n", m_sounddata_banks, soundbank_words); } @@ -1234,7 +1234,7 @@ uint16_t dcs_audio_device::dsio_r(offs_t offset) dsio.channelbits ^= 0x0010; result = (result & ~0x0010) | dsio.channelbits; } - if (LOG_DCS_IO && offset != 2) logerror("%s dsio_r 0x%x = %04x\n", machine().describe_context(), offset, result); + if (offset != 2) LOGMASKED(LOG_DCS_IO, "%s dsio_r 0x%x = %04x\n", machine().describe_context(), offset, result); return result; } @@ -1263,7 +1263,7 @@ void dcs_audio_device::dsio_w(offs_t offset, uint16_t data) m_data_bank->set_entry(DSIO_DM_PG % m_sounddata_banks); break; } - if (LOG_DCS_IO) logerror("%s dsio_w 0x%x = %04x\n", machine().describe_context(), offset, data); + LOGMASKED(LOG_DCS_IO, "%s dsio_w 0x%x = %04x\n", machine().describe_context(), offset, data); } @@ -1310,7 +1310,7 @@ uint16_t dcs_audio_device::denver_r(offs_t offset) // SDRC Revision result = 0x0003; } - if (LOG_DCS_IO && offset != 0x2) logerror("%s denver_r %s 0x%x = %04x\n", machine().describe_context(), denver_regname[offset], offset, result); + if (offset != 0x2) LOGMASKED(LOG_DCS_IO, "%s denver_r %s 0x%x = %04x\n", machine().describe_context(), denver_regname[offset], offset, result); return result; } @@ -1347,7 +1347,7 @@ void dcs_audio_device::denver_w(offs_t offset, uint16_t data) } // Disable timer after DENV_RES_TFS if (!m_timer_ignore && DENV_RES_TFS && DENV_MUTE) { - logerror("%s denver_w: Disabling timer\n", machine().describe_context()); + LOG("%s denver_w: Disabling timer\n", machine().describe_context()); m_timer_ignore = true; } break; @@ -1363,7 +1363,7 @@ void dcs_audio_device::denver_w(offs_t offset, uint16_t data) m_fifo_reset_w(1); break; } - if (LOG_DCS_IO && offset != 0x2) logerror("%s denver_w %s 0x%x = %04x\n", machine().describe_context(), denver_regname[offset], offset, data); + if (offset != 0x2) LOGMASKED(LOG_DCS_IO, "%s denver_w %s 0x%x = %04x\n", machine().describe_context(), denver_regname[offset], offset, data); } @@ -1376,8 +1376,7 @@ void dcs_audio_device::denver_w(offs_t offset, uint16_t data) void dcs_audio_device::dsio_idma_addr_w(uint32_t data) { - if (LOG_DCS_TRANSFERS) - logerror("%s IDMA_addr = %04X\n", machine().describe_context(), data); + LOGMASKED(LOG_DCS_TRANSFERS, "%s IDMA_addr = %04X\n", machine().describe_context(), data); downcast(m_cpu)->idma_addr_w(data); if (data == 0) m_dsio.start_on_next_write = 2; @@ -1392,19 +1391,19 @@ void dcs_audio_device::dsio_idma_data_w(offs_t offset, uint32_t data, uint32_t m m_ram_map->set_bank(0); if (ACCESSING_BITS_0_15) { - if (LOG_DCS_TRANSFERS && !(downcast(m_cpu)->idma_addr_r() & 0x00ff)) - logerror("%s IDMA_data_w(%04X) = %04X\n", machine().describe_context(), downcast(m_cpu)->idma_addr_r(), data & 0xffff); + if (!(downcast(m_cpu)->idma_addr_r() & 0x00ff)) + LOGMASKED(LOG_DCS_TRANSFERS, "%s IDMA_data_w(%04X) = %04X\n", machine().describe_context(), downcast(m_cpu)->idma_addr_r(), data & 0xffff); downcast(m_cpu)->idma_data_w(data & 0xffff); } if (ACCESSING_BITS_16_31) { - if (LOG_DCS_TRANSFERS && !(downcast(m_cpu)->idma_addr_r() & 0x00ff)) - logerror("%s IDMA_data_w(%04X) = %04X\n", machine().describe_context(), downcast(m_cpu)->idma_addr_r(), data >> 16); + if (!(downcast(m_cpu)->idma_addr_r() & 0x00ff)) + LOGMASKED(LOG_DCS_TRANSFERS, "%s IDMA_data_w(%04X) = %04X\n", machine().describe_context(), downcast(m_cpu)->idma_addr_r(), data >> 16); downcast(m_cpu)->idma_data_w(data >> 16); } if (dsio.start_on_next_write && --dsio.start_on_next_write == 0) { - logerror("%s: Starting DSIO CPU\n", machine().describe_context()); + LOG("%s: Starting DSIO CPU\n", machine().describe_context()); m_cpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); } // Restore internal/external mapping @@ -1422,8 +1421,7 @@ uint32_t dcs_audio_device::dsio_idma_data_r() result = downcast(m_cpu)->idma_data_r(); // Restore internal/external mapping m_ram_map->set_bank(m_dmovlay_val); - if (LOG_DCS_TRANSFERS) - logerror("%s IDMA_data_r(%04X) = %04X\n", machine().describe_context(), downcast(m_cpu)->idma_addr_r(), result); + LOGMASKED(LOG_DCS_TRANSFERS, "%s IDMA_data_r(%04X) = %04X\n", machine().describe_context(), downcast(m_cpu)->idma_addr_r(), result); return result; } @@ -1436,19 +1434,17 @@ void dcs_audio_device::dmovlay_remap_memory() } else { m_ram_map->set_bank(1); } - if (LOG_DCS_IO) { - if (m_dmovlay_val==0) - logerror("%s dmovlay_remap_memory: Switching to internal data ram location dmovlay=%i\n", machine().describe_context(), m_dmovlay_val); - else - logerror("%s dmovlay_remap_memory: Switching to external data ram location dmovlay=%i\n", machine().describe_context(), m_dmovlay_val); - } + if (m_dmovlay_val==0) + LOGMASKED(LOG_DCS_IO, "%s dmovlay_remap_memory: Switching to internal data ram location dmovlay=%i\n", machine().describe_context(), m_dmovlay_val); + else + LOGMASKED(LOG_DCS_IO, "%s dmovlay_remap_memory: Switching to external data ram location dmovlay=%i\n", machine().describe_context(), m_dmovlay_val); } void dcs_audio_device::dmovlay_callback(uint32_t data) { // Do some checking first if (data < 0 || data > 1) { - logerror("dmovlay_callback: Error! dmovlay called with value = %X\n", data); + LOG("dmovlay_callback: Error! dmovlay called with value = %X\n", data); } else { m_dmovlay_val = data; dmovlay_remap_memory(); @@ -1491,7 +1487,7 @@ void dcs_audio_device::reset_w(int state) /* going low halts the CPU */ if (!state) { - // logerror("%s: DCS reset = %d\n", machine().describe_context(), state); + // LOG("%s: DCS reset = %d\n", machine().describe_context(), state); /* just run through the init code again */ machine().scheduler().synchronize(timer_expired_delegate(FUNC(dcs_audio_device::dcs_reset),this)); @@ -1535,8 +1531,7 @@ uint16_t dcs_audio_device::fifo_input_r() void dcs_audio_device::dcs_delayed_data_w(uint16_t data) { - if (LOG_DCS_IO) - logerror("%s:dcs_data_w(%04X)\n", machine().describe_context(), data); + LOGMASKED(LOG_DCS_IO, "%s:dcs_data_w(%04X)\n", machine().describe_context(), data); /* boost the interleave temporarily */ machine().scheduler().add_quantum(attotime::from_nsec(500), attotime::from_usec(5)); @@ -1582,8 +1577,7 @@ void dcs_audio_device::input_latch_ack_w(uint16_t data) SET_INPUT_EMPTY(); m_cpu->set_input_line(ADSP2105_IRQ2, CLEAR_LINE); - if (LOG_DCS_IO) - logerror("%s input_latch_ack_w\n", machine().describe_context()); + LOGMASKED(LOG_DCS_IO, "%s input_latch_ack_w\n", machine().describe_context()); } @@ -1592,8 +1586,7 @@ uint16_t dcs_audio_device::input_latch_r() if (m_auto_ack) input_latch_ack_w(0); - if (LOG_DCS_IO) - logerror("%s input_latch_r(%04X)\n", machine().describe_context(), m_input_data); + LOGMASKED(LOG_DCS_IO, "%s input_latch_r(%04X)\n", machine().describe_context(), m_input_data); return m_input_data; } @@ -1601,8 +1594,7 @@ uint32_t dcs_audio_device::input_latch32_r() { if (m_auto_ack) input_latch_ack_w(0); - if (LOG_DCS_IO) - logerror("%s input_latch32_r(%04X)\n", machine().describe_context(), m_input_data); + LOGMASKED(LOG_DCS_IO, "%s input_latch32_r(%04X)\n", machine().describe_context(), m_input_data); return m_input_data << 8; } @@ -1622,8 +1614,7 @@ TIMER_CALLBACK_MEMBER( dcs_audio_device::latch_delayed_w ) void dcs_audio_device::output_latch_w(uint16_t data) { m_pre_output_data = data; - if (LOG_DCS_IO) - logerror("%s output_latch_w(%04X) (empty=%d)\n", machine().describe_context(), data, IS_OUTPUT_EMPTY()); + LOGMASKED(LOG_DCS_IO, "%s output_latch_w(%04X) (empty=%d)\n", machine().describe_context(), data, IS_OUTPUT_EMPTY()); machine().scheduler().synchronize(timer_expired_delegate(FUNC(dcs_audio_device::latch_delayed_w),this), data>>8); } @@ -1631,8 +1622,7 @@ void dcs_audio_device::output_latch_w(uint16_t data) void dcs_audio_device::output_latch32_w(uint32_t data) { m_pre_output_data = data >> 8; - if (LOG_DCS_IO) - logerror("%s output_latch32_w(%04X) (empty=%d)\n", machine().describe_context(), data>>8, IS_OUTPUT_EMPTY()); + LOGMASKED(LOG_DCS_IO, "%s output_latch32_w(%04X) (empty=%d)\n", machine().describe_context(), data>>8, IS_OUTPUT_EMPTY()); machine().scheduler().synchronize(timer_expired_delegate(FUNC(dcs_audio_device::latch_delayed_w),this), data>>8); } @@ -1652,8 +1642,7 @@ TIMER_CALLBACK_MEMBER( dcs_audio_device::delayed_ack_w_callback ) void dcs_audio_device::ack_w() { - if (LOG_DCS_IO) - logerror("%s:ack_w\n", machine().describe_context()); + LOGMASKED(LOG_DCS_IO, "%s:ack_w\n", machine().describe_context()); machine().scheduler().synchronize(timer_expired_delegate(FUNC(dcs_audio_device::delayed_ack_w_callback),this)); } @@ -1670,8 +1659,7 @@ uint16_t dcs_audio_device::data_r() if (m_auto_ack) delayed_ack_w(); - if (LOG_DCS_IO) - logerror("%s:dcs_data_r(%04X)\n", machine().describe_context(), m_output_data); + LOGMASKED(LOG_DCS_IO, "%s:dcs_data_r(%04X)\n", machine().describe_context(), m_output_data); return m_output_data; } @@ -1683,8 +1671,7 @@ uint16_t dcs_audio_device::data_r() TIMER_CALLBACK_MEMBER( dcs_audio_device::output_control_delayed_w ) { - //if (LOG_DCS_IO) - // logerror("output_control = %04X\n", param); + //LOGMASKED(LOG_DCS_IO, "output_control = %04X\n", param); m_output_control = param; m_output_control_cycles = 0; } @@ -1692,16 +1679,14 @@ TIMER_CALLBACK_MEMBER( dcs_audio_device::output_control_delayed_w ) void dcs_audio_device::output_control_w(uint16_t data) { - if (LOG_DCS_IO) - logerror("%s output_control_w = %04X\n", machine().describe_context(), data); + LOGMASKED(LOG_DCS_IO, "%s output_control_w = %04X\n", machine().describe_context(), data); machine().scheduler().synchronize(timer_expired_delegate(FUNC(dcs_audio_device::output_control_delayed_w),this), data); } uint16_t dcs_audio_device::output_control_r() { - if (LOG_DCS_IO) - logerror("%s output_control_r = %04X\n", machine().describe_context(), m_output_control); + LOGMASKED(LOG_DCS_IO, "%s output_control_r = %04X\n", machine().describe_context(), m_output_control); m_output_control_cycles = m_cpu->total_cycles(); return m_output_control; } @@ -1709,8 +1694,7 @@ uint16_t dcs_audio_device::output_control_r() int dcs_audio_device::data2_r() { - if (LOG_DCS_IO) - logerror("%s: dcs:data2_r = %04X\n", machine().describe_context(), m_output_control); + LOGMASKED(LOG_DCS_IO, "%s: dcs:data2_r = %04X\n", machine().describe_context(), m_output_control); return m_output_control; } @@ -1801,8 +1785,7 @@ void dcs_audio_device::reset_timer() m_program->read_dword(0x1b) == 0x0C0020 && /* DIS SEC_REG */ m_program->read_dword(0x1c) == 0x0A001F) /* RTI */ { - if (LOG_DCS_IO) - logerror("reset_timer: Disabled timer %llu\n", m_timer_start_cycles); + LOGMASKED(LOG_DCS_IO, "reset_timer: Disabled timer %llu\n", m_timer_start_cycles); m_timer_ignore = true; } else if (m_rev == REV_DSIO && m_program->read_dword(0x30) == 0x0c0030 && /* ENA SEC_REG */ @@ -1811,8 +1794,7 @@ void dcs_audio_device::reset_timer() m_program->read_dword(0x33) == 0x0C0020 && /* DIS SEC_REG */ m_program->read_dword(0x34) == 0x0A001F) /* RTI */ { - if (LOG_DCS_IO) - logerror("reset_timer: Disabled timer %llu\n", m_timer_start_cycles); + LOGMASKED(LOG_DCS_IO, "reset_timer: Disabled timer %llu\n", m_timer_start_cycles); m_timer_ignore = true; } } @@ -1827,13 +1809,13 @@ WRITE_LINE_MEMBER(dcs_audio_device::timer_enable_callback) { if (state) { - //logerror("Timer enabled @ %d cycles/int, or %f Hz\n", m_timer_scale * (m_timer_period + 1), 1.0 / m_cpu->cycles_to_attotime(m_timer_scale * (m_timer_period + 1)).as_double()); + //LOG("Timer enabled @ %d cycles/int, or %f Hz\n", m_timer_scale * (m_timer_period + 1), 1.0 / m_cpu->cycles_to_attotime(m_timer_scale * (m_timer_period + 1)).as_double()); m_timer_enable = state; reset_timer(); } else { - //logerror("Timer disabled\n"); + //LOG("Timer disabled\n"); // Update the timer so the start count is correct the next time the timer is enabled update_timer_count(); m_timer_enable = state; @@ -1894,8 +1876,7 @@ uint16_t dcs_audio_device::adsp_control_r(offs_t offset) result = m_control_regs[offset]; break; } - if (LOG_DCS_IO) - logerror("%s adsp_control_r(%06x) = %04X\n", machine().describe_context(), offset + 0x3fe0, result); + LOGMASKED(LOG_DCS_IO, "%s adsp_control_r(%06x) = %04X\n", machine().describe_context(), offset + 0x3fe0, result); return result; } @@ -1910,7 +1891,7 @@ void dcs_audio_device:: adsp_control_w(offs_t offset, uint16_t data) /* bit 9 forces a reset (not on 2181) */ if ((data & 0x0200) && !(m_rev == REV_DSIO || m_rev == REV_DENV)) { - logerror("%s Rebooting DCS due to SYSCONTROL write = %04X\n", machine().describe_context(), data); + LOG("%s Rebooting DCS due to SYSCONTROL write = %04X\n", machine().describe_context(), data); m_cpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); dcs_boot(); m_control_regs[SYSCONTROL_REG] = 0; @@ -1931,8 +1912,7 @@ void dcs_audio_device:: adsp_control_w(offs_t offset, uint16_t data) // Start the SPORT0 timer // SPORT0 is used as a 1kHz timer m_sport0_timer->adjust(attotime::from_usec(10), 0, attotime::from_hz(1000)); - if (LOG_DCS_IO) - logerror("adsp_control_w: Setting SPORT0 freqency to 1kHz\n"); + LOGMASKED(LOG_DCS_IO, "adsp_control_w: Setting SPORT0 freqency to 1kHz\n"); } else { @@ -1953,9 +1933,9 @@ void dcs_audio_device:: adsp_control_w(offs_t offset, uint16_t data) case S1_CONTROL_REG: if (((data >> 4) & 3) == 2) - logerror("DCS: Oh no!, the data is compressed with u-law encoding\n"); + LOG("DCS: Oh no!, the data is compressed with u-law encoding\n"); if (((data >> 4) & 3) == 3) - logerror("DCS: Oh no!, the data is compressed with A-law encoding\n"); + LOG("DCS: Oh no!, the data is compressed with A-law encoding\n"); break; case TIMER_SCALE_REG: @@ -1987,8 +1967,7 @@ void dcs_audio_device:: adsp_control_w(offs_t offset, uint16_t data) dsio_idma_addr_w(data); break; } - if (LOG_DCS_IO) - logerror("%s adsp_control_w(%06x) = %04X\n", machine().describe_context(), offset + 0x3fe0, data); + LOGMASKED(LOG_DCS_IO, "%s adsp_control_w(%06x) = %04X\n", machine().describe_context(), offset + 0x3fe0, data); } @@ -2000,8 +1979,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( dcs_audio_device::dcs_irq ) { /* get the index register */ int reg = m_cpu->state_int(ADSP2100_I0 + m_ireg); - if (LOG_DCS_IO) - logerror("dcs_irq: m_ireg: %x m_size: %x m_incs: %x m_channels: %d m_ireg_base: %x reg: %06x\n", m_ireg, m_size, m_incs, m_channels, m_ireg_base, reg); + LOGMASKED(LOG_DCS_IO, "dcs_irq: m_ireg: %x m_size: %x m_incs: %x m_channels: %d m_ireg_base: %x reg: %06x\n", m_ireg, m_size, m_incs, m_channels, m_ireg_base, reg); /* copy the current data into the buffer */ { @@ -2028,15 +2006,13 @@ TIMER_DEVICE_CALLBACK_MEMBER( dcs_audio_device::dcs_irq ) reg = m_ireg_base; /* generate the (internal, thats why the pulse) irq */ - if (LOG_DCS_IO) - logerror("dcs_irq: Generating interrupt\n"); + LOGMASKED(LOG_DCS_IO, "dcs_irq: Generating interrupt\n"); m_cpu->pulse_input_line(ADSP2105_IRQ1, m_cpu->minimum_quantum_time()); } /* store it */ m_cpu->set_state_int(ADSP2100_I0 + m_ireg, reg); - if (LOG_DCS_IO) - logerror("dcs_irq end: m_size: %x m_incs: %x m_channels: %d m_ireg_base: %x reg: %06x\n", m_size, m_incs, m_channels, m_ireg_base, reg); + LOGMASKED(LOG_DCS_IO, "dcs_irq end: m_size: %x m_incs: %x m_channels: %d m_ireg_base: %x reg: %06x\n", m_size, m_incs, m_channels, m_ireg_base, reg); } TIMER_DEVICE_CALLBACK_MEMBER( dcs_audio_device::sport0_irq ) @@ -2073,8 +2049,7 @@ void dcs_audio_device::recompute_sample_rate() dmadac_set_frequency(&m_dmadac[0], m_channels, sample_period.as_hz()); dmadac_enable(&m_dmadac[0], m_channels, 1); - if (LOG_DCS_IO) - logerror("recompute_sample_rate: Channels: %d Freq: %e Size: 0x%x m_incs: 0x%x\n", m_channels, sample_period.as_hz(), m_size, m_incs); + LOGMASKED(LOG_DCS_IO, "recompute_sample_rate: Channels: %d Freq: %e Size: 0x%x m_incs: 0x%x\n", m_channels, sample_period.as_hz(), m_size, m_incs); /* fire off a timer which will hit every half-buffer */ if (m_incs) @@ -2088,7 +2063,7 @@ void dcs_audio_device::sound_tx_callback(offs_t offset, uint32_t data) { /* check if it's for SPORT1 */ if (offset != 1) { - logerror("sound_tx_callback: No code for offset %x\n", offset); + LOG("sound_tx_callback: No code for offset %x\n", offset); return; } @@ -2124,14 +2099,13 @@ void dcs_audio_device::sound_tx_callback(offs_t offset, uint32_t data) /* save it as it is now */ m_ireg_base = source; - if (LOG_DCS_IO) - logerror("sound_tx_callback: m_ireg_base: %x m_size: %x m_incs: %x \n", m_ireg_base, m_size, m_incs); + LOGMASKED(LOG_DCS_IO, "sound_tx_callback: m_ireg_base: %x m_size: %x m_incs: %x \n", m_ireg_base, m_size, m_incs); /* recompute the sample rate and timer */ recompute_sample_rate(); return; } else - logerror( "ADSP SPORT1: trying to transmit and autobuffer not enabled!\n" ); + LOG("ADSP SPORT1: trying to transmit and autobuffer not enabled!\n"); } /* if we get there, something went wrong. Disable playing */ @@ -2252,8 +2226,7 @@ int dcs_audio_device::preprocess_stage_1(uint16_t data) /* look for command 0x001a to transfer chunks of data */ if (data == 0x001a) { - if (LOG_DCS_TRANSFERS) - logerror("%s:DCS Transfer command %04X\n", machine().describe_context(), data); + LOGMASKED(LOG_DCS_TRANSFERS, "%s:DCS Transfer command %04X\n", machine().describe_context(), data); transfer.state++; if (transfer.hle_enabled) return 1; @@ -2262,16 +2235,14 @@ int dcs_audio_device::preprocess_stage_1(uint16_t data) /* look for command 0x002a to start booting the uploaded program */ else if (data == 0x002a) { - if (LOG_DCS_TRANSFERS) - logerror("%s:DCS State change %04X\n", machine().describe_context(), data); + LOGMASKED(LOG_DCS_TRANSFERS, "%s:DCS State change %04X\n", machine().describe_context(), data); transfer.dcs_state = 1; } /* anything else is ignored */ else { - if (LOG_DCS_TRANSFERS) - logerror("Command: %04X\n", data); + LOGMASKED(LOG_DCS_TRANSFERS, "Command: %04X\n", data); } break; @@ -2279,8 +2250,7 @@ int dcs_audio_device::preprocess_stage_1(uint16_t data) /* first word is the start address */ transfer.start = data; transfer.state++; - if (LOG_DCS_TRANSFERS) - logerror("Start address = %04X\n", transfer.start); + LOGMASKED(LOG_DCS_TRANSFERS, "Start address = %04X\n", transfer.start); if (transfer.hle_enabled) return 1; break; @@ -2289,8 +2259,7 @@ int dcs_audio_device::preprocess_stage_1(uint16_t data) /* second word is the stop address */ transfer.stop = data; transfer.state++; - if (LOG_DCS_TRANSFERS) - logerror("Stop address = %04X\n", transfer.stop); + LOGMASKED(LOG_DCS_TRANSFERS, "Stop address = %04X\n", transfer.stop); if (transfer.hle_enabled) return 1; break; @@ -2302,7 +2271,7 @@ int dcs_audio_device::preprocess_stage_1(uint16_t data) /* transfer type 2 = SRAM bank 1 */ transfer.type = data; transfer.state++; - if (LOG_DCS_TRANSFERS) logerror("Transfer type = %04X\n", transfer.type); + LOGMASKED(LOG_DCS_TRANSFERS, "Transfer type = %04X\n", transfer.type); /* at this point, we can compute how many words to expect for the transfer */ transfer.writes_left = transfer.stop - transfer.start + 1; @@ -2336,7 +2305,7 @@ int dcs_audio_device::preprocess_stage_1(uint16_t data) /* if we're out, stop the transfer */ if (--transfer.writes_left == 0) { - if (LOG_DCS_TRANSFERS) logerror("Transfer done, sum = %04X\n", transfer.sum); + LOGMASKED(LOG_DCS_TRANSFERS, "Transfer done, sum = %04X\n", transfer.sum); transfer.state = 0; } @@ -2388,8 +2357,7 @@ int dcs_audio_device::preprocess_stage_2(uint16_t data) /* look for command 0x55d0 or 0x55d1 to transfer chunks of data */ if (data == 0x55d0 || data == 0x55d1) { - if (LOG_DCS_TRANSFERS) - logerror("%s:DCS Transfer command %04X\n", machine().describe_context(), data); + LOGMASKED(LOG_DCS_TRANSFERS, "%s:DCS Transfer command %04X\n", machine().describe_context(), data); transfer.state++; if (transfer.hle_enabled) return 1; @@ -2398,8 +2366,7 @@ int dcs_audio_device::preprocess_stage_2(uint16_t data) /* anything else is ignored */ else { - if (LOG_DCS_TRANSFERS) - logerror("%s:Command: %04X\n", machine().describe_context(), data); + LOGMASKED(LOG_DCS_TRANSFERS, "%s:Command: %04X\n", machine().describe_context(), data); } break; @@ -2415,8 +2382,7 @@ int dcs_audio_device::preprocess_stage_2(uint16_t data) /* second word is the lower bits of the start address */ transfer.start |= data; transfer.state++; - if (LOG_DCS_TRANSFERS) - logerror("Start address = %08X\n", transfer.start); + LOGMASKED(LOG_DCS_TRANSFERS, "Start address = %08X\n", transfer.start); if (transfer.hle_enabled) return 1; break; @@ -2433,8 +2399,7 @@ int dcs_audio_device::preprocess_stage_2(uint16_t data) /* fourth word is the lower bits of the stop address */ transfer.stop |= data; transfer.state++; - if (LOG_DCS_TRANSFERS) - logerror("Stop address = %08X\n", transfer.stop); + LOGMASKED(LOG_DCS_TRANSFERS, "Stop address = %08X\n", transfer.stop); /* at this point, we can compute how many words to expect for the transfer */ transfer.writes_left = transfer.stop - transfer.start + 1; @@ -2455,8 +2420,7 @@ int dcs_audio_device::preprocess_stage_2(uint16_t data) /* if we're out, stop the transfer */ if (--transfer.writes_left == 0) { - if (LOG_DCS_TRANSFERS) - logerror("Transfer done, sum = %04X\n", transfer.sum); + LOGMASKED(LOG_DCS_TRANSFERS, "Transfer done, sum = %04X\n", transfer.sum); transfer.state = 0; } diff --git a/src/mame/shared/megacdcd.cpp b/src/mame/shared/megacdcd.cpp index c7fc4753c31..35c64e9386a 100644 --- a/src/mame/shared/megacdcd.cpp +++ b/src/mame/shared/megacdcd.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "megacdcd.h" -#define LOG_WARN (1U << 1) +#define LOG_WARN (1U << 1) #define VERBOSE (LOG_GENERAL | LOG_WARN) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/shared/ms7004.cpp b/src/mame/shared/ms7004.cpp index ee04d98c888..39e5e3fb28c 100644 --- a/src/mame/shared/ms7004.cpp +++ b/src/mame/shared/ms7004.cpp @@ -13,8 +13,7 @@ #include "speaker.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_DEBUG (1U << 1) +#define LOG_DEBUG (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_DEBUG) //#define LOG_OUTPUT_FUNC printf diff --git a/src/mame/shared/xbox_nv2a.cpp b/src/mame/shared/xbox_nv2a.cpp index 74cdc8c0b15..b6c95a33fda 100644 --- a/src/mame/shared/xbox_nv2a.cpp +++ b/src/mame/shared/xbox_nv2a.cpp @@ -6,7 +6,18 @@ #include #include -//#define LOG_NV2A +#define LOG_NV2A_VERBOSE (1U << 1) + +#ifdef LOG_NV2A +#define VERBOSE (LOG_GENERAL) +#else +#define VERBOSE (0) +#endif + +#define LOG_OUTPUT_FUNC machine().logerror +#include "logmacro.h" + + #define DEBUG_CHECKS // enable for debugging char const *const vertex_program_disassembler::srctypes[] = { "??", "Rn", "Vn", "Cn" }; @@ -2710,9 +2721,7 @@ void nv2a_renderer::clear_render_target(int what, uint32_t value) return; } } -#ifdef LOG_NV2A - printf("clearscreen\n\r"); -#endif + LOG("clearscreen\n\r"); } void nv2a_renderer::clear_depth_buffer(int what, uint32_t value) @@ -3136,9 +3145,7 @@ int nv2a_renderer::execute_method(address_space &space, uint32_t chanel, uint32_ data = space.read_dword(address); channel[chanel][subchannel].object.method[method / 4] = data; -#ifdef LOG_NV2A - //printf("A:%08X CH=%02d SCH=%02d MTHD:%08X D:%08X\n\r",address,chanel,subchannel,maddress,data); -#endif + LOGMASKED(LOG_NV2A_VERBOSE, "A:%08X CH=%02d SCH=%02d MTHD:%08X D:%08X\n\r", address, chanel, subchannel, method, data); if (channel[chanel][subchannel].object.objclass == 0x97) return execute_method_3d(space, chanel, subchannel, method, address, data, countlen); if (channel[chanel][subchannel].object.objclass == 0x39) // 0180 @@ -3198,9 +3205,7 @@ int nv2a_renderer::execute_method_3d(address_space& space, uint32_t chanel, uint offset = data & 0xffffff; count = (data >> 24) & 0xff; -#ifdef LOG_NV2A - printf("vertex %d %d\n\r", offset, count); -#endif + LOG("vertex %d %d\n\r", offset, count); for (n = 0; n <= count; n++) { read_vertices_0x1810(space, vertex_first, n + offset, 1); assemble_primitive(vertex_first, 1); @@ -3544,17 +3549,13 @@ int nv2a_renderer::execute_method_3d(address_space& space, uint32_t chanel, uint pitch_rendertarget=data & 0xffff; pitch_depthbuffer=(data >> 16) & 0xffff; compute_size_rendertarget(chanel, subchannel); -#ifdef LOG_NV2A - printf("Pitch color %04X zbuffer %04X\n\r", pitch_rendertarget, pitch_depthbuffer); -#endif + LOG("Pitch color %04X zbuffer %04X\n\r", pitch_rendertarget, pitch_depthbuffer); countlen--; } if (maddress == 0x0100) { countlen--; if (data != 0) { -#ifdef LOG_NV2A - machine().logerror("Software method %04x\n", data); -#endif + LOG("Software method %04x\n", data); pgraph[0x704 / 4] = 0x100 | (chanel << 20) | (subchannel << 16); pgraph[0x708 / 4] = data; pgraph[0x100 / 4] |= 1; @@ -3592,17 +3593,13 @@ int nv2a_renderer::execute_method_3d(address_space& space, uint32_t chanel, uint old_rendertarget = rendertarget; // To see it with the image watch extension: @mem(0x000002d2263af060, UINT8, 4, 640, 480, 2560) rendertarget = (uint32_t *)direct_access_ptr(data); -#ifdef LOG_NV2A - printf("Render target at %08X\n\r", data); -#endif + LOG("Render target at %08X\n\r", data); countlen--; } if (maddress == 0x0214) { // zbuffer offset ? depthbuffer = (uint32_t *)direct_access_ptr(data); -#ifdef LOG_NV2A - printf("Depth buffer at %08X\n\r",data); -#endif + LOG("Depth buffer at %08X\n\r",data); if ((data == 0) || (data > 0x7ffffffc)) depth_write_enabled = false; else if (channel[chanel][subchannel].object.method[0x035c / 4] != 0) @@ -3847,10 +3844,8 @@ int nv2a_renderer::execute_method_3d(address_space& space, uint32_t chanel, uint *(uint32_t *)(&matrix.translate[maddress]) = data; // set corresponding vertex shader constant too vertexprogram.exec.c_constant[59].iv(maddress, data); // constant -37 -#ifdef LOG_NV2A if (maddress == 3) - machine().logerror("viewport translate = {%f %f %f %f}\n", matrix.translate[0], matrix.translate[1], matrix.translate[2], matrix.translate[3]); -#endif + LOG("viewport translate = {%f %f %f %f}\n", matrix.translate[0], matrix.translate[1], matrix.translate[2], matrix.translate[3]); countlen--; } // viewport scale @@ -3859,10 +3854,8 @@ int nv2a_renderer::execute_method_3d(address_space& space, uint32_t chanel, uint *(uint32_t *)(&matrix.scale[maddress]) = data; // set corresponding vertex shader constant too vertexprogram.exec.c_constant[58].iv(maddress, data); // constant -38 -#ifdef LOG_NV2A if (maddress == 3) - machine().logerror("viewport scale = {%f %f %f %f}\n", matrix.scale[0], matrix.scale[1], matrix.scale[2], matrix.scale[3]); -#endif + LOG("viewport scale = {%f %f %f %f}\n", matrix.scale[0], matrix.scale[1], matrix.scale[2], matrix.scale[3]); countlen--; } // Vertex program (shader) @@ -3923,15 +3916,13 @@ int nv2a_renderer::execute_method_3d(address_space& space, uint32_t chanel, uint machine().logerror("Need to increase size of vertexprogram.parameter to %d\n\r", vertexprogram.upload_parameter_index); vertexprogram.upload_parameter_component++; if (vertexprogram.upload_parameter_component >= 4) { -#ifdef LOG_NV2A if ((vertexprogram.upload_parameter_index == 58) || (vertexprogram.upload_parameter_index == 59)) - machine().logerror("vp constant %d (%s) = {%f %f %f %f}\n", vertexprogram.upload_parameter_index, + LOG("vp constant %d (%s) = {%f %f %f %f}\n", vertexprogram.upload_parameter_index, vertexprogram.upload_parameter_index == 58 ? "viewport scale" : "viewport translate", vertexprogram.exec.c_constant[vertexprogram.upload_parameter_index].fv[0], vertexprogram.exec.c_constant[vertexprogram.upload_parameter_index].fv[1], vertexprogram.exec.c_constant[vertexprogram.upload_parameter_index].fv[2], vertexprogram.exec.c_constant[vertexprogram.upload_parameter_index].fv[3]); -#endif vertexprogram.upload_parameter_component = 0; vertexprogram.upload_parameter_index++; } @@ -4072,9 +4063,7 @@ int nv2a_renderer::execute_method_3d(address_space& space, uint32_t chanel, uint int nv2a_renderer::execute_method_m2mf(address_space &space, uint32_t chanel, uint32_t subchannel, uint32_t method, uint32_t address, uint32_t data, int &countlen) { if (method == 0x0180) { -#ifdef LOG_NV2A - machine().logerror("m2mf method 0180 notify\n"); -#endif + LOG("m2mf method 0180 notify\n"); geforce_read_dma_object(data, dma_offset[10], dma_size[10]); } return 0; @@ -4083,15 +4072,11 @@ int nv2a_renderer::execute_method_m2mf(address_space &space, uint32_t chanel, ui int nv2a_renderer::execute_method_surf2d(address_space &space, uint32_t chanel, uint32_t subchannel, uint32_t method, uint32_t address, uint32_t data, int &countlen) { if (method == 0x0184) { -#ifdef LOG_NV2A - machine().logerror("surf2d method 0184 source\n"); -#endif + LOG("surf2d method 0184 source\n"); geforce_read_dma_object(data, dma_offset[11], dma_size[11]); } if (method == 0x0188) { -#ifdef LOG_NV2A - machine().logerror("surf2d method 0188 destination\n"); -#endif + LOG("surf2d method 0188 destination\n"); geforce_read_dma_object(data, dma_offset[12], dma_size[12]); } if (method == 0x0300) { @@ -4113,14 +4098,10 @@ int nv2a_renderer::execute_method_surf2d(address_space &space, uint32_t chanel, int nv2a_renderer::execute_method_blit(address_space &space, uint32_t chanel, uint32_t subchannel, uint32_t method, uint32_t address, uint32_t data, int &countlen) { if (method == 0x019c) { -#ifdef LOG_NV2A - machine().logerror("blit method 019c surface objecct handle %d\n", data); // set to 0x11 -#endif + LOG("blit method 019c surface objecct handle %d\n", data); // set to 0x11 } if (method == 0x02fc) { -#ifdef LOG_NV2A - machine().logerror("blit method 02fc operation %d\n", data); // 3 is copy from source to destination -#endif + LOG("blit method 02fc operation %d\n", data); // 3 is copy from source to destination bitblit.op = data; } if (method == 0x0300) { @@ -4784,9 +4765,7 @@ void nv2a_renderer::combiner_compute_alpha_outputs(int id, int stage_number) WRITE_LINE_MEMBER(nv2a_renderer::vblank_callback) { -/*#ifdef LOG_NV2A - printf("vblank_callback\n\r"); -#endif*/ + LOGMASKED(LOG_NV2A_VERBOSE, "vblank_callback\n\r"); if ((state != 0) && (puller_waiting == 1)) { puller_waiting = 0; puller_timer_work(0); @@ -4841,15 +4820,11 @@ void nv2a_renderer::geforce_assign_object(address_space &space, uint32_t chanel, handle = space.read_dword(address); offset = geforce_object_offset(handle); -#ifdef LOG_NV2A - machine().logerror(" assign to subchannel %d object at %d in ramin", subchannel, offset); -#endif + LOG(" assign to subchannel %d object at %d in ramin", subchannel, offset); channel[chanel][subchannel].object.offset = offset; data = ramin[offset / 4]; objclass = data & 0xff; -#ifdef LOG_NV2A - machine().logerror(" class %03X\n", objclass); -#endif + LOG(" class %03X\n", objclass); channel[chanel][subchannel].object.objclass = objclass; } @@ -4875,13 +4850,9 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work) switch (cmdtype) { case COMMAND::JUMP: - #ifdef LOG_NV2A - machine().logerror("jump dmaget %08X", *dmaget); - #endif + LOG("jump dmaget %08X", *dmaget); *dmaget = cmd & 0xfffffffc; - #ifdef LOG_NV2A - machine().logerror(" -> %08X\n\r", *dmaget); - #endif + LOG(" -> %08X\n\r", *dmaget); break; case COMMAND::INCREASING: method = cmd & (2047 << 2); // if method >= 0x100 send it to assigned object @@ -4892,9 +4863,7 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work) *dmaget += 4; } else { - #ifdef LOG_NV2A - machine().logerror(" subch. %d method %04x count %d\n", subch, method, count); - #endif + LOG(" subch. %d method %04x count %d\n", subch, method, count); ret = 0; while (count > 0) { countlen = 1; @@ -4921,9 +4890,7 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work) *dmaget += 4; } else { - #ifdef LOG_NV2A - machine().logerror(" subch. %d method %04x count %d\n", subch, method, count); - #endif + LOG(" subch. %d method %04x count %d\n", subch, method, count); while (count > 0) { countlen = count; ret = execute_method(*space, chanel, subch, method, *dmaget, countlen); @@ -4942,9 +4909,7 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work) *dmaget += 4; } else { - #ifdef LOG_NV2A - machine().logerror(" subch. %d method %04x count %d\n", subch, method, count); - #endif + LOG(" subch. %d method %04x count %d\n", subch, method, count); while (count > 0) { countlen = count; ret = execute_method(*space, chanel, subch, method, *dmaget, countlen); @@ -5079,9 +5044,7 @@ void nv2a_renderer::geforce_w(address_space &space, offs_t offset, uint32_t data update_int = true; if (e == 0x800 / 4) { displayedtarget = (uint32_t *)direct_access_ptr(pcrtc[e]); -#ifdef LOG_NV2A - printf("crtc buffer %08X\n\r", data); -#endif + LOG("crtc buffer %08X\n\r", data); } //machine().logerror("NV_2A: write PCRTC[%06X]=%08X\n",offset*4-0x00600000,data & mem_mask); } diff --git a/src/mame/shared/xbox_pci.cpp b/src/mame/shared/xbox_pci.cpp index a097e049ad2..7584a6f88a0 100644 --- a/src/mame/shared/xbox_pci.cpp +++ b/src/mame/shared/xbox_pci.cpp @@ -11,7 +11,11 @@ #include -//#define LOG_AUDIO +#define LOG_AUDIO (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" + /* * Host @@ -1109,9 +1113,7 @@ TIMER_CALLBACK_MEMBER(mcpx_apu_device::audio_update) uint32_t mcpx_apu_device::apu_r(offs_t offset, uint32_t mem_mask) { -#ifdef LOG_AUDIO - logerror("Audio_APU: read from %08X mask %08X\n", 0xfe800000 + offset * 4, mem_mask); -#endif + LOGMASKED(LOG_AUDIO, "Audio_APU: read from %08X mask %08X\n", 0xfe800000 + offset * 4, mem_mask); if (offset == 0x20010 / 4) // some kind of internal counter or state value return 0x20 + 4 + 8 + 0x48 + 0x80; return apust.memory[offset]; @@ -1121,9 +1123,7 @@ void mcpx_apu_device::apu_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t v; -#ifdef LOG_AUDIO - logerror("Audio_APU: write at %08X mask %08X value %08X\n", 0xfe800000 + offset * 4, mem_mask, data); -#endif + LOGMASKED(LOG_AUDIO, "Audio_APU: write at %08X mask %08X value %08X\n", 0xfe800000 + offset * 4, mem_mask, data); apust.memory[offset] = data; if (offset == 0x02040 / 4) // address of memory area with scatter-gather info (gpdsp scratch dma) apust.gpdsp_sgaddress = data; @@ -1288,9 +1288,7 @@ uint32_t mcpx_ac97_audio_device::ac97_audio_r(offs_t offset, uint32_t mem_mask) { uint32_t ret = 0; -#ifdef LOG_AUDIO - logerror("Audio_AC3: read from %08X mask %08X\n", 0xfec00000 + offset * 4, mem_mask); -#endif + LOGMASKED(LOG_AUDIO, "Audio_AC3: read from %08X mask %08X\n", 0xfec00000 + offset * 4, mem_mask); if (offset < 0x80 / 4) { ret = ac97st.mixer_regs[offset]; @@ -1317,9 +1315,7 @@ uint32_t mcpx_ac97_audio_device::ac97_audio_r(offs_t offset, uint32_t mem_mask) void mcpx_ac97_audio_device::ac97_audio_w(offs_t offset, uint32_t data, uint32_t mem_mask) { -#ifdef LOG_AUDIO - logerror("Audio_AC3: write at %08X mask %08X value %08X\n", 0xfec00000 + offset * 4, mem_mask, data); -#endif + LOGMASKED(LOG_AUDIO, "Audio_AC3: write at %08X mask %08X value %08X\n", 0xfec00000 + offset * 4, mem_mask, data); if (offset < 0x80 / 4) { COMBINE_DATA(ac97st.mixer_regs + offset); diff --git a/src/mame/shared/xbox_usb.cpp b/src/mame/shared/xbox_usb.cpp index 48be6a458b7..751ca3455ef 100644 --- a/src/mame/shared/xbox_usb.cpp +++ b/src/mame/shared/xbox_usb.cpp @@ -9,13 +9,13 @@ #include "machine/pci.h" #include "machine/idectrl.h" -//#define LOG_OHCI +#define LOG_OHCI (0) + /* * OHCI usb controller */ -#ifdef LOG_OHCI static const char *const usbregnames[] = { "HcRevision", "HcControl", @@ -40,7 +40,6 @@ static const char *const usbregnames[] = { "HcRhStatus", "HcRhPortStatus[1]" }; -#endif ohci_usb_controller::ohci_usb_controller() { @@ -75,12 +74,13 @@ uint32_t ohci_usb_controller::read(offs_t offset) { uint32_t ret; -#ifdef LOG_OHCI - if (offset >= 0x54 / 4) - logerror("usb controller 0 register HcRhPortStatus[%d] read\n", (offset - 0x54 / 4) + 1); - else - logerror("usb controller 0 register %s read\n", usbregnames[offset]); -#endif + if (LOG_OHCI) + { + if (offset >= 0x54 / 4) + m_maincpu->machine().logerror("usb controller 0 register HcRhPortStatus[%d] read\n", (offset - 0x54 / 4) + 1); + else + m_maincpu->machine().logerror("usb controller 0 register %s read\n", usbregnames[offset]); + } ret = ohcist.hc_regs[offset]; return ret; } @@ -89,12 +89,13 @@ void ohci_usb_controller::write(offs_t offset, uint32_t data) { uint32_t old = ohcist.hc_regs[offset]; -#ifdef LOG_OHCI - if (offset >= 0x54 / 4) - logerror("usb controller 0 register HcRhPortStatus[%d] write %08X\n", (offset - 0x54 / 4) + 1, data); - else - logerror("usb controller 0 register %s write %08X\n", usbregnames[offset], data); -#endif + if (LOG_OHCI) + { + if (offset >= 0x54 / 4) + m_maincpu->machine().logerror("usb controller 0 register HcRhPortStatus[%d] write %08X\n", (offset - 0x54 / 4) + 1, data); + else + m_maincpu->machine().logerror("usb controller 0 register %s write %08X\n", usbregnames[offset], data); + } if (offset == HcRhStatus) { if (data & CRWE) ohcist.hc_regs[HcRhStatus] &= ~DRWE; diff --git a/src/mame/sharp/pc1251.cpp b/src/mame/sharp/pc1251.cpp index c05ecb508ea..b70d9bf6923 100644 --- a/src/mame/sharp/pc1251.cpp +++ b/src/mame/sharp/pc1251.cpp @@ -7,7 +7,7 @@ // TODO: Convert to SVG rendering or internal layout -#define LOG_LCD (1 << 0) +#define LOG_LCD (1U << 1) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/sharp/pc1350.cpp b/src/mame/sharp/pc1350.cpp index da7b0fb7f04..e8d61fd6db3 100644 --- a/src/mame/sharp/pc1350.cpp +++ b/src/mame/sharp/pc1350.cpp @@ -7,7 +7,7 @@ // TODO: Convert to SVG rendering or internal layout -#define LOG_LCD (1 << 0) +#define LOG_LCD (1U << 1) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/sharp/pc1403_m.cpp b/src/mame/sharp/pc1403_m.cpp index 3c514430a56..a3934371261 100644 --- a/src/mame/sharp/pc1403_m.cpp +++ b/src/mame/sharp/pc1403_m.cpp @@ -7,7 +7,7 @@ #include "pc1403.h" #include "machine/ram.h" -#define LOG_ASIC (1 << 0) +#define LOG_ASIC (1U << 1) #define VERBSOE (0) #include "logmacro.h" diff --git a/src/mame/sharp/x68k.cpp b/src/mame/sharp/x68k.cpp index c71c9babaa3..ee17edaaecf 100644 --- a/src/mame/sharp/x68k.cpp +++ b/src/mame/sharp/x68k.cpp @@ -136,9 +136,9 @@ #include "x68000.lh" -#define LOG_FDC (1 << 1) -#define LOG_SYS (1 << 2) -#define LOG_IRQ (1 << 3) +#define LOG_FDC (1U << 1) +#define LOG_SYS (1U << 2) +#define LOG_IRQ (1U << 3) //#define VERBOSE (LOG_FDC | LOG_SYS | LOG_IRQ) #include "logmacro.h" diff --git a/src/mame/sigma/r2dtank.cpp b/src/mame/sigma/r2dtank.cpp index e9fb7795274..9e8919c1ac3 100644 --- a/src/mame/sigma/r2dtank.cpp +++ b/src/mame/sigma/r2dtank.cpp @@ -49,10 +49,13 @@ XTAL values appear to be 3579.545 (X1) and 11.200 (X2). #include "screen.h" #include "speaker.h" +#define LOG_AUDIO_COMM (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" -namespace { -#define LOG_AUDIO_COMM (0) +namespace { #define MAIN_CPU_MASTER_CLOCK (11.2_MHz_XTAL) #define PIXEL_CLOCK (MAIN_CPU_MASTER_CLOCK / 2) @@ -146,7 +149,7 @@ uint8_t r2dtank_state::audio_command_r() { uint8_t ret = m_soundlatch->read(); -if (LOG_AUDIO_COMM) logerror("%08X CPU#1 Audio Command Read: %x\n", m_audiocpu->pc(), ret); + LOGMASKED(LOG_AUDIO_COMM, "%08X CPU#1 Audio Command Read: %x\n", m_audiocpu->pc(), ret); return ret; } @@ -157,14 +160,14 @@ void r2dtank_state::audio_command_w(uint8_t data) m_soundlatch->write(~data); m_audiocpu->set_input_line(M6802_IRQ_LINE, HOLD_LINE); -if (LOG_AUDIO_COMM) logerror("%08X CPU#0 Audio Command Write: %x\n", m_maincpu->pc(), data^0xff); + LOGMASKED(LOG_AUDIO_COMM, "%08X CPU#0 Audio Command Write: %x\n", m_maincpu->pc(), data^0xff); } uint8_t r2dtank_state::audio_answer_r() { uint8_t ret = m_soundlatch2->read(); -if (LOG_AUDIO_COMM) logerror("%08X CPU#0 Audio Answer Read: %x\n", m_maincpu->pc(), ret); + LOGMASKED(LOG_AUDIO_COMM, "%08X CPU#0 Audio Answer Read: %x\n", m_maincpu->pc(), ret); return ret; } @@ -179,7 +182,7 @@ void r2dtank_state::audio_answer_w(uint8_t data) m_soundlatch2->write(data); m_maincpu->set_input_line(M6809_IRQ_LINE, HOLD_LINE); -if (LOG_AUDIO_COMM) logerror("%08X CPU#1 Audio Answer Write: %x\n", m_audiocpu->pc(), data); + LOGMASKED(LOG_AUDIO_COMM, "%08X CPU#1 Audio Answer Write: %x\n", m_audiocpu->pc(), data); } @@ -194,7 +197,7 @@ void r2dtank_state::AY8910_select_w(uint8_t data) D5-D7 - not used */ m_AY8910_selected = data; -if (LOG_AUDIO_COMM) logerror("%s: CPU#1 AY8910_select_w: %x\n", machine().describe_context(), data); + LOGMASKED(LOG_AUDIO_COMM, "%s: CPU#1 AY8910_select_w: %x\n", machine().describe_context(), data); } diff --git a/src/mame/skeleton/alfaskop_s41_kb.cpp b/src/mame/skeleton/alfaskop_s41_kb.cpp index 11bf3da6f9c..42bf55fb602 100644 --- a/src/mame/skeleton/alfaskop_s41_kb.cpp +++ b/src/mame/skeleton/alfaskop_s41_kb.cpp @@ -34,14 +34,14 @@ //************************************************************************** // CONFIGURABLE LOGGING //************************************************************************** -#define LOG_IRQ (1U << 1) -#define LOG_RESET (1U << 2) -#define LOG_BITS (1U << 3) -#define LOG_UI (1U << 4) -#define LOG_LEDS (1U << 5) -#define LOG_ROM (1U << 6) -#define LOG_ADEC (1U << 7) -#define LOG_IO (1U << 8) +#define LOG_IRQ (1U << 1) +#define LOG_RESET (1U << 2) +#define LOG_BITS (1U << 3) +#define LOG_UI (1U << 4) +#define LOG_LEDS (1U << 5) +#define LOG_ROM (1U << 6) +#define LOG_ADEC (1U << 7) +#define LOG_IO (1U << 8) //#define VERBOSE (LOG_GENERAL|LOG_IO|LOG_IRQ|LOG_LEDS|LOG_BITS|LOG_RESET) //#define LOG_OUTPUT_STREAM std::cout diff --git a/src/mame/skeleton/bitgraph.cpp b/src/mame/skeleton/bitgraph.cpp index af5cc727824..af9956e1440 100644 --- a/src/mame/skeleton/bitgraph.cpp +++ b/src/mame/skeleton/bitgraph.cpp @@ -76,9 +76,8 @@ #define EAROM_TAG "earom" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_PIA (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_PIA (1U << 1) +#define LOG_DEBUG (1U << 2) //#define VERBOSE (LOG_DEBUG) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/skeleton/blit.cpp b/src/mame/skeleton/blit.cpp index c1aef0bceb8..07958e64d43 100644 --- a/src/mame/skeleton/blit.cpp +++ b/src/mame/skeleton/blit.cpp @@ -44,9 +44,8 @@ #define RS232_K_TAG "keyboard" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_PIA (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_PIA (1U << 1) +#define LOG_DEBUG (1U << 2) //#define VERBOSE (LOG_DEBUG) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/skeleton/candela.cpp b/src/mame/skeleton/candela.cpp index 3f890f3b71b..b14cef154da 100644 --- a/src/mame/skeleton/candela.cpp +++ b/src/mame/skeleton/candela.cpp @@ -53,15 +53,14 @@ // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) -#define LOG_SCAN (1U << 2) -#define LOG_BANK (1U << 3) -#define LOG_SCREEN (1U << 4) -#define LOG_READ (1U << 5) -#define LOG_CS (1U << 6) -#define LOG_PLA (1U << 7) -#define LOG_PROM (1U << 8) +#define LOG_SETUP (1U << 1) +#define LOG_SCAN (1U << 2) +#define LOG_BANK (1U << 3) +#define LOG_SCREEN (1U << 4) +#define LOG_READ (1U << 5) +#define LOG_CS (1U << 6) +#define LOG_PLA (1U << 7) +#define LOG_PROM (1U << 8) //#define VERBOSE (LOG_READ | LOG_GENERAL | LOG_SETUP | LOG_PLA | LOG_BANK) //#define LOG_OUTPUT_FUNC printf diff --git a/src/mame/skeleton/didact.cpp b/src/mame/skeleton/didact.cpp index 6b820f6404e..bf6afd909b4 100644 --- a/src/mame/skeleton/didact.cpp +++ b/src/mame/skeleton/didact.cpp @@ -63,10 +63,10 @@ // MACROS / CONSTANTS //************************************************************************** -#define LOG_SETUP (1U << 1) -#define LOG_READ (1U << 2) -#define LOG_DISPLAY (1U << 3) -#define LOG_KEYBOARD (1U << 4) +#define LOG_SETUP (1U << 1) +#define LOG_READ (1U << 2) +#define LOG_DISPLAY (1U << 3) +#define LOG_KEYBOARD (1U << 4) //#define VERBOSE (LOG_KEYBOARD) //#define LOG_OUTPUT_FUNC printf diff --git a/src/mame/skeleton/e100.cpp b/src/mame/skeleton/e100.cpp index 1c4d4a1b601..5e7f5f61d1f 100644 --- a/src/mame/skeleton/e100.cpp +++ b/src/mame/skeleton/e100.cpp @@ -45,13 +45,12 @@ // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) -#define LOG_SETUP (1U << 1) -#define LOG_SCAN (1U << 2) -#define LOG_BANK (1U << 3) -#define LOG_SCREEN (1U << 4) -#define LOG_READ (1U << 5) -#define LOG_CS (1U << 6) +#define LOG_SETUP (1U << 1) +#define LOG_SCAN (1U << 2) +#define LOG_BANK (1U << 3) +#define LOG_SCREEN (1U << 4) +#define LOG_READ (1U << 5) +#define LOG_CS (1U << 6) //#define VERBOSE (LOG_READ | LOG_GENERAL | LOG_SETUP | LOG_BANK) //#define LOG_OUTPUT_FUNC printf diff --git a/src/mame/skeleton/eurocom2.cpp b/src/mame/skeleton/eurocom2.cpp index 01432c5d09d..4507d762791 100644 --- a/src/mame/skeleton/eurocom2.cpp +++ b/src/mame/skeleton/eurocom2.cpp @@ -52,9 +52,8 @@ static constexpr int VC_TOTAL_VERT = 312; static constexpr int VC_DISP_VERT = 256; -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_KEYBOARD (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_KEYBOARD (1U << 1) +#define LOG_DEBUG (1U << 2) //#define VERBOSE (LOG_DEBUG) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/skeleton/hprot1.cpp b/src/mame/skeleton/hprot1.cpp index 03075b699a9..d016a8b864b 100644 --- a/src/mame/skeleton/hprot1.cpp +++ b/src/mame/skeleton/hprot1.cpp @@ -63,6 +63,11 @@ Infinite loop is reached at address 0x7699 #include "screen.h" #include "speaker.h" +#define LOG_IO_PORTS (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" + namespace { @@ -97,8 +102,6 @@ private: required_device m_lcdc; }; -#define LOG_IO_PORTS 0 - void hprot1_state::i80c31_prg(address_map &map) { map(0x0000, 0xffff).rom(); @@ -204,14 +207,13 @@ void hprot1_state::machine_reset() void hprot1_state::henry_p1_w(uint8_t data) { - if (LOG_IO_PORTS && data != 0xFF && data != 0xEF) - logerror("Write to P1: %02X\n", data); + if (data != 0xFF && data != 0xEF) + LOGMASKED(LOG_IO_PORTS, "Write to P1: %02X\n", data); } void hprot1_state::henry_p3_w(uint8_t data) { - if (LOG_IO_PORTS) - logerror("Write to P3: %02X\n", data); + LOGMASKED(LOG_IO_PORTS, "Write to P3: %02X\n", data); } void hprot1_state::hprot1_palette(palette_device &palette) const diff --git a/src/mame/skeleton/miuchiz.cpp b/src/mame/skeleton/miuchiz.cpp index d4e5f960555..b2a3fd79087 100644 --- a/src/mame/skeleton/miuchiz.cpp +++ b/src/mame/skeleton/miuchiz.cpp @@ -22,15 +22,12 @@ #include "screen.h" // defines and logging -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already #define VERBOSE (LOG_GENERAL) //#define LOG_OUTPUT_FUNC printf #include "logmacro.h" namespace { -#define LOGGEN(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) - // class definition class miuchiz_state : public driver_device { diff --git a/src/mame/skeleton/terco.cpp b/src/mame/skeleton/terco.cpp index 2e4f7df1d79..cc4b4fb7543 100644 --- a/src/mame/skeleton/terco.cpp +++ b/src/mame/skeleton/terco.cpp @@ -39,9 +39,9 @@ //#include "machine/kb3600.h" //#include "machine/mc14411.h" -#define LOG_SETUP (1U << 1) -#define LOG_READ (1U << 2) -#define LOG_BCD (1U << 3) +#define LOG_SETUP (1U << 1) +#define LOG_READ (1U << 2) +#define LOG_BCD (1U << 3) //#define VERBOSE (LOG_BCD|LOG_SETUP) //#define LOG_OUTPUT_STREAM std::cout diff --git a/src/mame/skeleton/ti630.cpp b/src/mame/skeleton/ti630.cpp index 09da5ac64a3..b3218b66350 100644 --- a/src/mame/skeleton/ti630.cpp +++ b/src/mame/skeleton/ti630.cpp @@ -40,6 +40,11 @@ It means we probably would have to emulate a modem device for it to treat commun #include "emupal.h" #include "screen.h" +#define LOG_IO_PORTS (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" + namespace { @@ -72,8 +77,6 @@ private: required_device m_lcdc; }; -#define LOG_IO_PORTS 0 - void ti630_state::i80c31_prg(address_map &map) { map(0x0000, 0xffff).rom(); @@ -102,22 +105,18 @@ void ti630_state::machine_reset() uint8_t ti630_state::i80c31_p1_r() { uint8_t value = 0; - if (LOG_IO_PORTS) - logerror("P1 read value:%02X\n", value); - + LOGMASKED(LOG_IO_PORTS, "P1 read value:%02X\n", value); return value; } void ti630_state::i80c31_p1_w(uint8_t data) { - if (LOG_IO_PORTS) - logerror("Write to P1: %02X\n", data); + LOGMASKED(LOG_IO_PORTS, "Write to P1: %02X\n", data); } void ti630_state::i80c31_p3_w(uint8_t data) { - if (LOG_IO_PORTS) - logerror("Write to P3: %02X\n", data); + LOGMASKED(LOG_IO_PORTS, "Write to P3: %02X\n", data); } void ti630_state::ti630_palette(palette_device &palette) const diff --git a/src/mame/skeleton/tsispch.cpp b/src/mame/skeleton/tsispch.cpp index 6974970c400..9d75af98af6 100644 --- a/src/mame/skeleton/tsispch.cpp +++ b/src/mame/skeleton/tsispch.cpp @@ -123,9 +123,8 @@ // defines -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_PARAM (1U << 1) -#define LOG_DSP (1U << 2) +#define LOG_PARAM (1U << 1) +#define LOG_DSP (1U << 2) #define VERBOSE (LOG_GENERAL | LOG_PARAM) //#define LOG_OUTPUT_FUNC printf @@ -133,7 +132,6 @@ namespace { -#define LOGGEN(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) #define LOGPRM(...) LOGMASKED(LOG_PARAM, __VA_ARGS__) #define LOGDSP(...) LOGMASKED(LOG_DSP, __VA_ARGS__) @@ -238,19 +236,19 @@ uint16_t tsispch_state::dsp_status_r() void tsispch_state::dsp_status_w(uint16_t data) { - LOGGEN("warning: upd772x status register should never be written to!\n"); + LOG("warning: upd772x status register should never be written to!\n"); m_dsp->snesdsp_write(false, data); } WRITE_LINE_MEMBER( tsispch_state::dsp_to_8086_p0_w ) { - LOGGEN("upd772x changed p0 state to %d!\n",state); + LOG("upd772x changed p0 state to %d!\n",state); //TODO: do stuff here! } WRITE_LINE_MEMBER( tsispch_state::dsp_to_8086_p1_w ) { - LOGGEN("upd772x changed p1 state to %d!\n",state); + LOG("upd772x changed p1 state to %d!\n",state); //TODO: do stuff here! } @@ -259,7 +257,7 @@ WRITE_LINE_MEMBER( tsispch_state::dsp_to_8086_p1_w ) *****************************************************************************/ void tsispch_state::machine_reset() { - LOGGEN("machine reset\n"); + LOG("machine reset\n"); m_dsp->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); // starts in reset } @@ -267,7 +265,7 @@ void tsispch_state::init_prose2k() { uint8_t *dspsrc = (uint8_t *)(memregion("dspprgload")->base()); uint32_t *dspprg = (uint32_t *)(memregion("dspprg")->base()); - LOGGEN("driver init\n"); + LOG("driver init\n"); // unpack 24 bit 7720 data into 32 bit space and shuffle it so it can run as 7725 code // data format as-is in dspsrc: (L = always 0, X = doesn't matter) // source upd7720 dest upd7725 diff --git a/src/mame/snk/hng64.cpp b/src/mame/snk/hng64.cpp index f64e1d4f740..62fa35e8ea2 100644 --- a/src/mame/snk/hng64.cpp +++ b/src/mame/snk/hng64.cpp @@ -677,7 +677,6 @@ LVS-DG2 #include "cpu/z80/z80.h" #include "machine/nvram.h" -#define LOG_GENERAL (1U << 0) #define LOG_COMRW (1U << 1) #define LOG_SNDCOM_UNKNWN (1U << 2) #define LOG_DMA (1U << 3) diff --git a/src/mame/sony/cxd8452aq.cpp b/src/mame/sony/cxd8452aq.cpp index 88c01f250a7..fa13b2abeff 100644 --- a/src/mame/sony/cxd8452aq.cpp +++ b/src/mame/sony/cxd8452aq.cpp @@ -247,7 +247,7 @@ TIMER_CALLBACK_MEMBER(cxd8452aq_device::dma_check) if (rxDmaActive && txDmaActive) { // TODO: is this an error? allow it for now, but log it. - LOGMASKED(LOG_GENERAL, "WARNING: RX and TX DMA active at the same time, this may not be a valid condition.\n"); + LOG("WARNING: RX and TX DMA active at the same time, this may not be a valid condition.\n"); } if (rxDmaActive) diff --git a/src/mame/sony/dmac3.cpp b/src/mame/sony/dmac3.cpp index cc240117dca..e74d26dbf0f 100644 --- a/src/mame/sony/dmac3.cpp +++ b/src/mame/sony/dmac3.cpp @@ -5,10 +5,9 @@ #include "emu.h" #include "dmac3.h" -#define LOG_GENERAL (1U << 0) -#define LOG_REGISTER (1U << 1) +#define LOG_REGISTER (1U << 1) #define LOG_INTERRUPT (1U << 2) -#define LOG_DATA (1U << 3) +#define LOG_DATA (1U << 3) #define DMAC3_DEBUG (LOG_GENERAL | LOG_REGISTER | LOG_INTERRUPT) #define DMAC3_TRACE (DMAC3_DEBUG | LOG_DATA) @@ -92,7 +91,7 @@ void dmac3_device::csr_w(dmac3_controller controller, uint32_t data) LOGMASKED(LOG_REGISTER, "dmac3-%d csr_w: 0x%x\n", controller, data); if (data & CSR_RESET) { - LOGMASKED(LOG_GENERAL, "dmac3-%d chip reset\n", controller); + LOG("dmac3-%d chip reset\n", controller); reset_controller(controller); } else diff --git a/src/mame/sony/dmac_0266.cpp b/src/mame/sony/dmac_0266.cpp index 22f1402ad0a..4d69a02e702 100644 --- a/src/mame/sony/dmac_0266.cpp +++ b/src/mame/sony/dmac_0266.cpp @@ -18,7 +18,6 @@ #include "emu.h" #include "dmac_0266.h" -#define LOG_GENERAL (1U << 0) #define LOG_DATA (1U << 1) //#define VERBOSE (LOG_GENERAL) diff --git a/src/mame/sony/news_r4k.cpp b/src/mame/sony/news_r4k.cpp index 3f92e8e70e2..f25df0f9dac 100644 --- a/src/mame/sony/news_r4k.cpp +++ b/src/mame/sony/news_r4k.cpp @@ -673,12 +673,12 @@ void news_r4k_state::cpu_map_main_memory(address_map &map) { if (data == 0x10001) { - LOGMASKED(LOG_GENERAL, "Enabling RAM map shift!\n"); + LOG("Enabling RAM map shift!\n"); m_ram_map_shift = true; } else { - LOGMASKED(LOG_GENERAL, "Disabling RAM map shift!\n"); + LOG("Disabling RAM map shift!\n"); m_ram_map_shift = false; } })); @@ -769,7 +769,7 @@ uint8_t news_r4k_state::ram_r(offs_t offset) } else { - LOGMASKED(LOG_GENERAL, "Unmapped RAM read attempted at offset 0x%x\n", offset); + LOG("Unmapped RAM read attempted at offset 0x%x\n", offset); } return result; } @@ -792,7 +792,7 @@ void news_r4k_state::ram_w(offs_t offset, uint8_t data) } else { - LOGMASKED(LOG_GENERAL, "Unmapped RAM write attempted at offset 0x%x (data: 0x%x)\n", offset, data); + LOG("Unmapped RAM write attempted at offset 0x%x (data: 0x%x)\n", offset, data); } } diff --git a/src/mame/sony/pockstat.cpp b/src/mame/sony/pockstat.cpp index 6d7b4191347..83fb5a682f6 100644 --- a/src/mame/sony/pockstat.cpp +++ b/src/mame/sony/pockstat.cpp @@ -40,15 +40,15 @@ #include "screen.h" #include "speaker.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_FTLB (1 << 1) -#define LOG_IRQS (1 << 2) -#define LOG_INTC (1 << 3) -#define LOG_TIMER (1 << 4) -#define LOG_CLOCK (1 << 5) -#define LOG_RTC (1 << 6) -#define LOG_LCD (1 << 7) -#define LOG_AUDIO (1 << 8) +#define LOG_UNKNOWN (1U << 1) +#define LOG_FTLB (1U << 2) +#define LOG_IRQS (1U << 3) +#define LOG_INTC (1U << 4) +#define LOG_TIMER (1U << 5) +#define LOG_CLOCK (1U << 6) +#define LOG_RTC (1U << 7) +#define LOG_LCD (1U << 8) +#define LOG_AUDIO (1U << 9) #define LOG_ALL (LOG_UNKNOWN | LOG_FTLB | LOG_IRQS | LOG_INTC | LOG_TIMER | LOG_CLOCK | LOG_RTC | LOG_LCD | LOG_AUDIO) #define LOG_DEFAULT LOG_ALL diff --git a/src/mame/sony/psxcd.cpp b/src/mame/sony/psxcd.cpp index b6b5bc600a3..187b450a11b 100644 --- a/src/mame/sony/psxcd.cpp +++ b/src/mame/sony/psxcd.cpp @@ -4,10 +4,10 @@ #include "psxcd.h" #include "debugger.h" -#define LOG_CMD (1 << 1) -#define LOG_MISC (1 << 2) +#define LOG_CMD (1U << 1) +#define LOG_MISC (1U << 2) -#define VERBOSE ( 0 ) +#define VERBOSE (0) #include "logmacro.h" enum cdrom_events diff --git a/src/mame/sony/pve500.cpp b/src/mame/sony/pve500.cpp index cfe10754298..bcc65468fb8 100644 --- a/src/mame/sony/pve500.cpp +++ b/src/mame/sony/pve500.cpp @@ -41,9 +41,6 @@ * Initial driver skeleton */ -#define LOG_7SEG_DISPLAY_SIGNALS 0 -#define DEBUGGING_INDUCE_SELFDIAGNOSE 0 - #include "emu.h" #include "bus/rs232/rs232.h" /* actually meant to be RS422 ports */ #include "cpu/mb88xx/mb88xx.h" @@ -58,9 +55,16 @@ #include "pve500.lh" +#define LOG_7SEG_DISPLAY_SIGNALS (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" + namespace { +#define DEBUGGING_INDUCE_SELFDIAGNOSE 0 + #define IO_EXPANDER_PORTA 0 #define IO_EXPANDER_PORTB 1 #define IO_EXPANDER_PORTC 2 @@ -318,9 +322,7 @@ void pve500_state::io_sc_w(uint8_t data) { const int swap[4] = {2,1,0,3}; -#if LOG_7SEG_DISPLAY_SIGNALS - printf("CXD1095 PORTA (io_SC=%02X)\n", data); -#endif + LOGMASKED(LOG_7SEG_DISPLAY_SIGNALS, "CXD1095 PORTA (io_SC=%02X)\n", data); io_SC = data; for (int j=0; j<8; j++){ @@ -337,25 +339,19 @@ void pve500_state::io_sc_w(uint8_t data) void pve500_state::io_le_w(uint8_t data) { -#if LOG_7SEG_DISPLAY_SIGNALS - printf("CXD1095 PORTB (io_LE=%02X)\n", data); -#endif + LOGMASKED(LOG_7SEG_DISPLAY_SIGNALS, "CXD1095 PORTB (io_LE=%02X)\n", data); io_LE = data; } void pve500_state::io_ld_w(uint8_t data) { -#if LOG_7SEG_DISPLAY_SIGNALS - printf("CXD1095 PORTD (io_LD=%02X)\n", data); -#endif + LOGMASKED(LOG_7SEG_DISPLAY_SIGNALS, "CXD1095 PORTD (io_LD=%02X)\n", data); io_LD = data; } void pve500_state::io_sel_w(uint8_t data) { -#if LOG_7SEG_DISPLAY_SIGNALS - printf("CXD1095 PORTE (io_SEL=%02X)\n", data); -#endif + LOGMASKED(LOG_7SEG_DISPLAY_SIGNALS, "CXD1095 PORTE (io_SEL=%02X)\n", data); io_SEL = data; for (int i=0; i<4; i++){ if (BIT(io_SEL, i)){ diff --git a/src/mame/suna/goindol.cpp b/src/mame/suna/goindol.cpp index 3049ea06992..56cb19cf83a 100644 --- a/src/mame/suna/goindol.cpp +++ b/src/mame/suna/goindol.cpp @@ -34,7 +34,7 @@ Notes: // configurable logging -#define LOG_PROTECTION (1U << 1) +#define LOG_PROTECTION (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_PROTECTION) diff --git a/src/mame/svision/svis_snd.cpp b/src/mame/svision/svis_snd.cpp index 0444ecab3ea..c7e4ffbc56b 100644 --- a/src/mame/svision/svis_snd.cpp +++ b/src/mame/svision/svis_snd.cpp @@ -10,8 +10,8 @@ #include "svis_snd.h" // configurable logging -#define LOG_DMA (1U << 1) -#define LOG_NOISE (1U << 2) +#define LOG_DMA (1U << 1) +#define LOG_NOISE (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_DMA | LOG_NOISE) diff --git a/src/mame/svision/svision.cpp b/src/mame/svision/svision.cpp index c9a537ae164..0dccfc1e5c4 100644 --- a/src/mame/svision/svision.cpp +++ b/src/mame/svision/svision.cpp @@ -25,7 +25,7 @@ // configurable logging -#define LOG_REGS (1U << 1) +#define LOG_REGS (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_REGS) diff --git a/src/mame/taito/arkanoid_m.cpp b/src/mame/taito/arkanoid_m.cpp index 21095759640..234e3b87e51 100644 --- a/src/mame/taito/arkanoid_m.cpp +++ b/src/mame/taito/arkanoid_m.cpp @@ -12,9 +12,14 @@ #include "emu.h" #include "arkanoid.h" - /* To log specific reads and writes of the bootlegs */ -#define ARKANOID_BOOTLEG_VERBOSE 1 +#define LOG_F000_R (1U << 1) +#define LOG_F002_R (1U << 2) +#define LOG_D018_W (1U << 3) +#define LOG_D008_R (1U << 4) + +#define VERBOSE (LOG_F000_R | LOG_F002_R | LOG_D018_W | LOG_D008_R) +#include "logmacro.h" CUSTOM_INPUT_MEMBER(arkanoid_state::arkanoid_semaphore_input_r) @@ -84,12 +89,6 @@ TO DO (2006.09.12) : */ -#define LOG_F000_R if (ARKANOID_BOOTLEG_VERBOSE) logerror("%s: arkanoid_bootleg_f000_r - cmd = %02x - val = %02x\n", machine().describe_context(), m_bootleg_cmd, arkanoid_bootleg_val); -#define LOG_F002_R if (ARKANOID_BOOTLEG_VERBOSE) logerror("%s: arkanoid_bootleg_f002_r - cmd = %02x - val = %02x\n", machine().describe_context(), m_bootleg_cmd, arkanoid_bootleg_val); -#define LOG_D018_W if (ARKANOID_BOOTLEG_VERBOSE) logerror("%s: arkanoid_bootleg_d018_w - data = %02x - cmd = %02x\n", machine().describe_context(), data, m_bootleg_cmd); -#define LOG_D008_R if (ARKANOID_BOOTLEG_VERBOSE) logerror("%s: arkanoid_bootleg_d008_r - val = %02x\n", machine().describe_context(), arkanoid_bootleg_d008_val); - - /* Kludge for some bootlegs that read this address */ uint8_t arkanoid_state::arkanoid_bootleg_f000_r() { @@ -108,7 +107,7 @@ uint8_t arkanoid_state::arkanoid_bootleg_f000_r() default: break; } - LOG_F000_R + LOGMASKED(LOG_F000_R, "%s: arkanoid_bootleg_f000_r - cmd = %02x - val = %02x\n", machine().describe_context(), m_bootleg_cmd, arkanoid_bootleg_val); break; case BLOCK2: switch (m_bootleg_cmd) @@ -122,7 +121,7 @@ uint8_t arkanoid_state::arkanoid_bootleg_f000_r() default: break; } - LOG_F000_R + LOGMASKED(LOG_F000_R, "%s: arkanoid_bootleg_f000_r - cmd = %02x - val = %02x\n", machine().describe_context(), m_bootleg_cmd, arkanoid_bootleg_val); break; default: logerror("%s: arkanoid_bootleg_f000_r - cmd = %02x - unknown bootleg !\n", machine().describe_context(), m_bootleg_cmd); @@ -146,7 +145,7 @@ uint8_t arkanoid_state::arkanoid_bootleg_f002_r() default: break; } - LOG_F002_R + LOGMASKED(LOG_F002_R, "%s: arkanoid_bootleg_f002_r - cmd = %02x - val = %02x\n", machine().describe_context(), m_bootleg_cmd, arkanoid_bootleg_val); break; case ARKANGC2: /* There are no reads from 0xf002 in these bootlegs */ case BLOCK2: @@ -155,7 +154,7 @@ uint8_t arkanoid_state::arkanoid_bootleg_f002_r() default: break; } - LOG_F002_R + LOGMASKED(LOG_F002_R, "%s: arkanoid_bootleg_f002_r - cmd = %02x - val = %02x\n", machine().describe_context(), m_bootleg_cmd, arkanoid_bootleg_val); break; case ARKBLOC2: switch (m_bootleg_cmd) @@ -163,7 +162,7 @@ uint8_t arkanoid_state::arkanoid_bootleg_f002_r() default: break; } - LOG_F002_R + LOGMASKED(LOG_F002_R, "%s: arkanoid_bootleg_f002_r - cmd = %02x - val = %02x\n", machine().describe_context(), m_bootleg_cmd, arkanoid_bootleg_val); break; case ARKGCBL: switch (m_bootleg_cmd) @@ -177,7 +176,7 @@ uint8_t arkanoid_state::arkanoid_bootleg_f002_r() default: break; } - LOG_F002_R + LOGMASKED(LOG_F002_R, "%s: arkanoid_bootleg_f002_r - cmd = %02x - val = %02x\n", machine().describe_context(), m_bootleg_cmd, arkanoid_bootleg_val); break; case PADDLE2: switch (m_bootleg_cmd) @@ -209,7 +208,7 @@ uint8_t arkanoid_state::arkanoid_bootleg_f002_r() default: break; } - LOG_F002_R + LOGMASKED(LOG_F002_R, "%s: arkanoid_bootleg_f002_r - cmd = %02x - val = %02x\n", machine().describe_context(), m_bootleg_cmd, arkanoid_bootleg_val); break; default: logerror("%s: arkanoid_bootleg_f002_r - cmd = %02x - unknown bootleg !\n", machine().describe_context(), m_bootleg_cmd); @@ -258,7 +257,7 @@ void arkanoid_state::arkanoid_bootleg_d018_w(uint8_t data) m_bootleg_cmd = 0x00; break; } - LOG_D018_W + LOGMASKED(LOG_D018_W, "%s: arkanoid_bootleg_d018_w - data = %02x - cmd = %02x\n", machine().describe_context(), data, m_bootleg_cmd); break; case ARKANGC2: switch (data) @@ -301,7 +300,7 @@ void arkanoid_state::arkanoid_bootleg_d018_w(uint8_t data) m_bootleg_cmd = 0x00; break; } - LOG_D018_W + LOGMASKED(LOG_D018_W, "%s: arkanoid_bootleg_d018_w - data = %02x - cmd = %02x\n", machine().describe_context(), data, m_bootleg_cmd); break; case BLOCK2: switch (data) @@ -318,7 +317,7 @@ void arkanoid_state::arkanoid_bootleg_d018_w(uint8_t data) m_bootleg_cmd = 0x00; break; } - LOG_D018_W + LOGMASKED(LOG_D018_W, "%s: arkanoid_bootleg_d018_w - data = %02x - cmd = %02x\n", machine().describe_context(), data, m_bootleg_cmd); break; case ARKBLOC2: switch (data) @@ -365,7 +364,7 @@ void arkanoid_state::arkanoid_bootleg_d018_w(uint8_t data) m_bootleg_cmd = 0x00; break; } - LOG_D018_W + LOGMASKED(LOG_D018_W, "%s: arkanoid_bootleg_d018_w - data = %02x - cmd = %02x\n", machine().describe_context(), data, m_bootleg_cmd); break; case ARKGCBL: switch (data) @@ -412,7 +411,7 @@ void arkanoid_state::arkanoid_bootleg_d018_w(uint8_t data) m_bootleg_cmd = 0x00; break; } - LOG_D018_W + LOGMASKED(LOG_D018_W, "%s: arkanoid_bootleg_d018_w - data = %02x - cmd = %02x\n", machine().describe_context(), data, m_bootleg_cmd); break; case PADDLE2: switch (data) @@ -467,7 +466,7 @@ void arkanoid_state::arkanoid_bootleg_d018_w(uint8_t data) m_bootleg_cmd = 0x00; break; } - LOG_D018_W + LOGMASKED(LOG_D018_W, "%s: arkanoid_bootleg_d018_w - data = %02x - cmd = %02x\n", machine().describe_context(), data, m_bootleg_cmd); break; default: @@ -546,7 +545,7 @@ uint8_t arkanoid_state::arkanoid_bootleg_d008_r() for (b = 0; b < 8; b++) arkanoid_bootleg_d008_val |= (arkanoid_bootleg_d008_bit[b] << b); - LOG_D008_R + LOGMASKED(LOG_D008_R, "%s: arkanoid_bootleg_d008_r - val = %02x\n", machine().describe_context(), arkanoid_bootleg_d008_val); return arkanoid_bootleg_d008_val; } diff --git a/src/mame/taito/chaknpop.cpp b/src/mame/taito/chaknpop.cpp index add343b225e..fc91006d36c 100644 --- a/src/mame/taito/chaknpop.cpp +++ b/src/mame/taito/chaknpop.cpp @@ -125,8 +125,8 @@ Notes: // configurable logging -#define LOG_UNKWRITE (1U << 1) -#define LOG_COINLOCK (1U << 2) +#define LOG_UNKWRITE (1U << 1) +#define LOG_COINLOCK (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_UNKWRITE | LOG_COINLOCK) diff --git a/src/mame/taito/crbaloon.cpp b/src/mame/taito/crbaloon.cpp index f49f252be26..97b511f6003 100644 --- a/src/mame/taito/crbaloon.cpp +++ b/src/mame/taito/crbaloon.cpp @@ -17,6 +17,12 @@ #include "machine/watchdog.h" #include "screen.h" +#define LOG_PC3092 (1U << 1) +#define LOG_PC3259 (1U << 2) + +#define VERBOSE (0) +#include "logmacro.h" + /************************************* * @@ -40,9 +46,6 @@ * *************************************/ -#define LOG_PC3092 0 - - void crbaloon_state::pc3092_reset(void) { /* nothing yet */ @@ -59,7 +62,7 @@ void crbaloon_state::pc3092_w(offs_t offset, uint8_t data) { m_pc3092_data[offset] = data & 0x0f; - if (LOG_PC3092) logerror("%04X: write PC3092 #%d = 0x%02x\n", m_maincpu->pc(), offset, m_pc3092_data[offset]); + LOGMASKED(LOG_PC3092, "%04X: write PC3092 #%d = 0x%02x\n", m_maincpu->pc(), offset, m_pc3092_data[offset]); pc3092_update(); } @@ -75,7 +78,7 @@ CUSTOM_INPUT_MEMBER(crbaloon_state::pc3092_r) else ret = 0x00; - if (LOG_PC3092) logerror("%s: read PC3092 = 0x%02x\n", machine().describe_context(), ret); + LOGMASKED(LOG_PC3092, "%s: read PC3092 = 0x%02x\n", machine().describe_context(), ret); return ret; } @@ -102,8 +105,6 @@ CUSTOM_INPUT_MEMBER(crbaloon_state::pc3092_r) * *************************************/ -#define LOG_PC3259 0 - void crbaloon_state::pc3259_update(void) { @@ -139,7 +140,7 @@ uint8_t crbaloon_state::pc3259_r(offs_t offset) break; } - if (LOG_PC3259) logerror("%04X: read PC3259 #%d = 0x%02x\n", m_maincpu->pc(), reg, ret); + LOGMASKED(LOG_PC3259, "%04X: read PC3259 #%d = 0x%02x\n", m_maincpu->pc(), reg, ret); return ret | (ioport("DSW1")->read() & 0xf0); } diff --git a/src/mame/taito/galastrm.cpp b/src/mame/taito/galastrm.cpp index 275b42f159e..51bfcf9d5cc 100644 --- a/src/mame/taito/galastrm.cpp +++ b/src/mame/taito/galastrm.cpp @@ -64,7 +64,7 @@ TODO: // configurable logging -#define LOG_BADSPRITES (1U << 1) +#define LOG_BADSPRITES (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_BADSPRITES) diff --git a/src/mame/taito/gunbustr.cpp b/src/mame/taito/gunbustr.cpp index 2a607c6fd34..830323facad 100644 --- a/src/mame/taito/gunbustr.cpp +++ b/src/mame/taito/gunbustr.cpp @@ -60,7 +60,7 @@ // configurable logging -#define LOG_BADSPRITES (1U << 1) +#define LOG_BADSPRITES (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_BADSPRITES) diff --git a/src/mame/taito/rollrace.cpp b/src/mame/taito/rollrace.cpp index c78fb2ce10e..b48f2ef2a53 100644 --- a/src/mame/taito/rollrace.cpp +++ b/src/mame/taito/rollrace.cpp @@ -24,7 +24,7 @@ Issues: // configurable logging -#define LOG_D900 (1U << 1) +#define LOG_D900 (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_D900) diff --git a/src/mame/taito/taitopjc.cpp b/src/mame/taito/taitopjc.cpp index 98a7c3fe2b2..4bf2b18ee9d 100644 --- a/src/mame/taito/taitopjc.cpp +++ b/src/mame/taito/taitopjc.cpp @@ -94,12 +94,17 @@ #include "screen.h" #include "tilemap.h" +#define LOG_TLCS_TO_PPC_COMMANDS (1U << 1) +#define LOG_PPC_TO_TLCS_COMMANDS (1U << 2) +#define LOG_DISPLAY_LIST (1U << 3) + +#define VERBOSE (0) +#include "logmacro.h" + namespace { -#define LOG_TLCS_TO_PPC_COMMANDS 0 -#define LOG_PPC_TO_TLCS_COMMANDS 0 -#define LOG_DISPLAY_LIST 0 +#define FATAL_UNKNOWN_CALLS (0) class taitopjc_state : public driver_device { @@ -413,12 +418,10 @@ void taitopjc_state::ppc_common_w(offs_t offset, uint64_t data, uint64_t mem_mas if (offset == 0x7ff && ACCESSING_BITS_48_63) { -#if LOG_PPC_TO_TLCS_COMMANDS if (m_io_share_ram[0xfff] != 0x0000) { - printf("PPC -> TLCS cmd %04X\n", m_io_share_ram[0xfff]); + LOGMASKED(LOG_PPC_TO_TLCS_COMMANDS, "PPC -> TLCS cmd %04X\n", m_io_share_ram[0xfff]); } -#endif m_iocpu->set_input_line(TLCS900_INT6, ASSERT_LINE); m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); @@ -452,7 +455,7 @@ void taitopjc_state::print_display_list() uint16_t cmd = m_dsp_ram[0xffe]; if (cmd == 0x5245) { - printf("DSP command RE\n"); + logerror("DSP command RE\n"); bool end = false; do { @@ -464,7 +467,7 @@ void taitopjc_state::print_display_list() for (int i=0; i < count; i++) { uint16_t s = m_dsp_ram[ptr++]; - printf(" %04X -> [%04X]\n", s, d); + logerror(" %04X -> [%04X]\n", s, d); d++; } } @@ -477,33 +480,34 @@ void taitopjc_state::print_display_list() switch (w) { case 0x406d: - printf(" Call %04X [%04X %04X]\n", w, m_dsp_ram[ptr], m_dsp_ram[ptr+1]); + logerror(" Call %04X [%04X %04X]\n", w, m_dsp_ram[ptr], m_dsp_ram[ptr+1]); ptr += 2; break; case 0x40cd: - printf(" Call %04X [%04X %04X]\n", w, m_dsp_ram[ptr], m_dsp_ram[ptr+1]); + logerror(" Call %04X [%04X %04X]\n", w, m_dsp_ram[ptr], m_dsp_ram[ptr+1]); ptr += 2; break; case 0x40ac: - printf(" Call %04X [%04X %04X %04X %04X %04X %04X %04X %04X]\n", w, m_dsp_ram[ptr], m_dsp_ram[ptr+1], m_dsp_ram[ptr+2], m_dsp_ram[ptr+3], m_dsp_ram[ptr+4], m_dsp_ram[ptr+5], m_dsp_ram[ptr+6], m_dsp_ram[ptr+7]); + logerror(" Call %04X [%04X %04X %04X %04X %04X %04X %04X %04X]\n", w, m_dsp_ram[ptr], m_dsp_ram[ptr+1], m_dsp_ram[ptr+2], m_dsp_ram[ptr+3], m_dsp_ram[ptr+4], m_dsp_ram[ptr+5], m_dsp_ram[ptr+6], m_dsp_ram[ptr+7]); ptr += 8; break; case 0x4774: - printf(" Call %04X [%04X %04X %04X]\n", w, m_dsp_ram[ptr], m_dsp_ram[ptr+1], m_dsp_ram[ptr+2]); + logerror(" Call %04X [%04X %04X %04X]\n", w, m_dsp_ram[ptr], m_dsp_ram[ptr+1], m_dsp_ram[ptr+2]); ptr += 3; break; case 0x47d9: - printf(" Call %04X [%04X %04X %04X %04X %04X %04X %04X %04X]\n", w, m_dsp_ram[ptr], m_dsp_ram[ptr+1], m_dsp_ram[ptr+2], m_dsp_ram[ptr+3], m_dsp_ram[ptr+4], m_dsp_ram[ptr+5], m_dsp_ram[ptr+6], m_dsp_ram[ptr+7]); + logerror(" Call %04X [%04X %04X %04X %04X %04X %04X %04X %04X]\n", w, m_dsp_ram[ptr], m_dsp_ram[ptr+1], m_dsp_ram[ptr+2], m_dsp_ram[ptr+3], m_dsp_ram[ptr+4], m_dsp_ram[ptr+5], m_dsp_ram[ptr+6], m_dsp_ram[ptr+7]); ptr += 8; break; default: { - printf("Unknown call %04X\n", w); + logerror("Unknown call %04X\n", w); for (int i=0; i < 10; i++) { - printf("%04X\n", m_dsp_ram[ptr++]); + logerror("%04X\n", m_dsp_ram[ptr++]); } - fatalerror("Unknown call %04X\n", w); + if (FATAL_UNKNOWN_CALLS) + fatalerror("Unknown call %04X\n", w); break; } } @@ -513,7 +517,7 @@ void taitopjc_state::print_display_list() else { if (cmd != 0) - printf("DSP command %04X\n", cmd); + logerror("DSP command %04X\n", cmd); return; } } @@ -537,7 +541,7 @@ void taitopjc_state::dsp_w(offs_t offset, uint64_t data, uint64_t mem_mask) } #endif -#if LOG_DISPLAY_LIST +#if (VERBOSE & LOG_DISPLAY_LIST) print_display_list(); #endif } @@ -609,13 +613,11 @@ void taitopjc_state::tlcs_common_w(offs_t offset, uint8_t data) if (offset == 0x1ffd) { -#if LOG_TLCS_TO_PPC_COMMANDS if (m_io_share_ram[0xffe] != 0xd000 && m_io_share_ram[0xffe] != 0x7000) { - printf("TLCS -> PPC cmd %04X\n", m_io_share_ram[0xffe]); + LOGMASKED(LOG_TLCS_TO_PPC_COMMANDS, "TLCS -> PPC cmd %04X\n", m_io_share_ram[0xffe]); } -#endif if (m_io_share_ram[0xffe] == 0xd000) m_iocpu->set_input_line(TLCS900_INT1, CLEAR_LINE); diff --git a/src/mame/taito/taitotz.cpp b/src/mame/taito/taitotz.cpp index 792502bf853..b8dcbc05661 100644 --- a/src/mame/taito/taitotz.cpp +++ b/src/mame/taito/taitotz.cpp @@ -180,6 +180,13 @@ Notes: #include "video/poly.h" #include "screen.h" +#define LOG_PPC_TO_TLCS_COMMANDS (1U << 1) +#define LOG_TLCS_TO_PPC_COMMANDS (1U << 2) + +#define VERBOSE (LOG_PPC_TO_TLCS_COMMANDS | LOG_TLCS_TO_PPC_COMMANDS) +#include "logmacro.h" + + /* Interesting mem areas @@ -511,10 +518,6 @@ Notes: namespace { -#define LOG_PPC_TO_TLCS_COMMANDS 1 -#define LOG_TLCS_TO_PPC_COMMANDS 1 - -#define LOG_DISPLAY_LIST 0 #define ENABLE_LIGHTING 1 #define PPC_TLCS_COMM_TRIGGER 12345 @@ -1945,7 +1948,6 @@ void taitotz_state::ppc_common_w(offs_t offset, uint64_t data, uint64_t mem_mask if (offset == 0x7ff) { -#if LOG_PPC_TO_TLCS_COMMANDS if (m_io_share_ram[0xfff] != 0x0000 && m_io_share_ram[0xfff] != 0x1010 && m_io_share_ram[0xfff] != 0x1020 && @@ -1956,12 +1958,12 @@ void taitotz_state::ppc_common_w(offs_t offset, uint64_t data, uint64_t mem_mask m_io_share_ram[0xfff] != 0x4002 && m_io_share_ram[0xfff] != 0x4003) { - printf("PPC -> TLCS cmd %04X\n", m_io_share_ram[0xfff]); + LOGMASKED(LOG_PPC_TO_TLCS_COMMANDS, "PPC -> TLCS cmd %04X\n", m_io_share_ram[0xfff]); } if (m_io_share_ram[0xfff] == 0x4000) { - printf(" %04X %04X %04X %04X %04X %04X %04X %04X %04X %04X\n", + LOGMASKED(LOG_PPC_TO_TLCS_COMMANDS, " %04X %04X %04X %04X %04X %04X %04X %04X %04X %04X\n", m_io_share_ram[0x1c34/2], m_io_share_ram[0x1c36/2], m_io_share_ram[0x1c38/2], @@ -1973,7 +1975,7 @@ void taitotz_state::ppc_common_w(offs_t offset, uint64_t data, uint64_t mem_mask m_io_share_ram[0x1c24/2], m_io_share_ram[0x1c26/2] ); - printf(" %04X %04X %04X %04X %04X %04X %04X %04X %04X %04X\n", + LOGMASKED(LOG_PPC_TO_TLCS_COMMANDS, " %04X %04X %04X %04X %04X %04X %04X %04X %04X %04X\n", m_io_share_ram[0x1c28/2], m_io_share_ram[0x1c2a/2], m_io_share_ram[0x1c1c/2], @@ -1990,12 +1992,10 @@ void taitotz_state::ppc_common_w(offs_t offset, uint64_t data, uint64_t mem_mask /* if (m_io_share_ram[0xfff] == 0x1010) { - printf("PPC -> TLCS cmd 1010: %04X %04X %04X %04X\n", m_io_share_ram[0x1a02/2], m_io_share_ram[0x1a04/2], m_io_share_ram[0x1a06/2], m_io_share_ram[0x1a08/2]); + LOGMASKED(LOG_PPC_TO_TLCS_COMMANDS, "PPC -> TLCS cmd 1010: %04X %04X %04X %04X\n", m_io_share_ram[0x1a02/2], m_io_share_ram[0x1a04/2], m_io_share_ram[0x1a06/2], m_io_share_ram[0x1a08/2]); } */ -#endif - // hacky way to handle some commands for now if (m_io_share_ram[0xfff] == 0x4001) @@ -2119,16 +2119,14 @@ void taitotz_state::tlcs_common_w(offs_t offset, uint8_t data) if (offset == 0x1ffd) { -#if LOG_TLCS_TO_PPC_COMMANDS if (m_io_share_ram[0xffe] != 0xd000 && m_io_share_ram[0xffe] != 0x1011 && m_io_share_ram[0xffe] != 0x1012 && m_io_share_ram[0xffe] != 0x1022) { - printf("TLCS -> PPC cmd %04X\n", m_io_share_ram[0xffe]); - //printf("0x40080104 = %08X\n", (uint32_t)(m_work_ram[0x80104/8])); + LOGMASKED(LOG_TLCS_TO_PPC_COMMANDS, "TLCS -> PPC cmd %04X\n", m_io_share_ram[0xffe]); + //LOGMASKED(LOG_TLCS_TO_PPC_COMMANDS, "0x40080104 = %08X\n", (uint32_t)(m_work_ram[0x80104/8])); } -#endif m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); m_iocpu->set_input_line(TLCS900_INT0, CLEAR_LINE); diff --git a/src/mame/taito/warriorb.cpp b/src/mame/taito/warriorb.cpp index a137bc2e9f0..e79255985b0 100644 --- a/src/mame/taito/warriorb.cpp +++ b/src/mame/taito/warriorb.cpp @@ -168,7 +168,7 @@ Colscroll effects? // configurable logging -#define LOG_PANDATA (1U << 1) +#define LOG_PANDATA (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_PANDATA) diff --git a/src/mame/tecfri/speedbal.cpp b/src/mame/tecfri/speedbal.cpp index b52b5c25bd8..43863f19933 100644 --- a/src/mame/tecfri/speedbal.cpp +++ b/src/mame/tecfri/speedbal.cpp @@ -44,7 +44,7 @@ Interrupt frequency on audio CPU is not a periodical signal, but there are a lot // configurable logging -#define LOG_UNKWRITE (1U << 1) +#define LOG_UNKWRITE (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_UNKWRITE) diff --git a/src/mame/technos/dogfgt.cpp b/src/mame/technos/dogfgt.cpp index 74181d84854..23cc3ece75f 100644 --- a/src/mame/technos/dogfgt.cpp +++ b/src/mame/technos/dogfgt.cpp @@ -22,8 +22,8 @@ driver by Nicola Salmoria // configurable logging -#define LOG_BITMAPRAM (1U << 1) -#define LOG_1800 (1U << 2) +#define LOG_BITMAPRAM (1U << 1) +#define LOG_1800 (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_BITMAPRAM | LOG_1800) diff --git a/src/mame/technos/vball.cpp b/src/mame/technos/vball.cpp index bab0303b5eb..bfb97ef17b7 100644 --- a/src/mame/technos/vball.cpp +++ b/src/mame/technos/vball.cpp @@ -96,7 +96,7 @@ VBlank = 58Hz // configurable logging -#define LOG_SCROLL (1U << 1) +#define LOG_SCROLL (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_SCROLL) diff --git a/src/mame/tecmo/spbactn.cpp b/src/mame/tecmo/spbactn.cpp index 326211c9c8b..a8897d700eb 100644 --- a/src/mame/tecmo/spbactn.cpp +++ b/src/mame/tecmo/spbactn.cpp @@ -151,7 +151,7 @@ cpu #0 (PC=00001A1A): unmapped memory word write to 00090030 = 00F7 & 00FF #include "spbactnp.lh" // configurable logging -#define LOG_PROTO (1U << 1) +#define LOG_PROTO (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_PROTO) diff --git a/src/mame/thomson/thomson_m.cpp b/src/mame/thomson/thomson_m.cpp index cb46c076a4a..f0af0d0975a 100644 --- a/src/mame/thomson/thomson_m.cpp +++ b/src/mame/thomson/thomson_m.cpp @@ -13,18 +13,17 @@ #include "machine/6821pia.h" #include "machine/ram.h" -#define VERBOSE 0 -#define VERBOSE_KBD 0 /* TO8 / TO9 / TO9+ keyboard */ -#define VERBOSE_BANK 0 -#define VERBOSE_VIDEO 0 /* video & lightpen */ +#define LOG_KBD (1U << 1) /* TO8 / TO9 / TO9+ keyboard */ +#define LOG_BANK (1U << 2) +#define LOG_VIDEO (1U << 3) /* video & lightpen */ +#define LOG_EXTRA (1U << 4) +#define LOG_ERRORS (1U << 5) + +#define VERBOSE (LOG_ERRORS) +#include "logmacro.h" -#define PRINT(x) osd_printf_info x -#define LOG(x) do { if (VERBOSE) logerror x; } while (0) -#define VLOG(x) do { if (VERBOSE > 1) logerror x; } while (0) -#define LOG_KBD(x) do { if (VERBOSE_KBD) logerror x; } while (0) -#define LOG_BANK(x) do { if (VERBOSE_BANK) logerror x; } while (0) -#define LOG_VIDEO(x) do { if (VERBOSE_VIDEO) logerror x; } while (0) +#define PRINT(x) osd_printf_info x /* This set to 1 handle the .k7 files without passing through .wav */ /* It must be set accordingly in formats/thom_cas.c */ @@ -77,9 +76,9 @@ int thomson_state::to7_get_cassette() /* hack, feed existing bits */ if ( bitpos >= m_to7_k7_bitsize ) bitpos = m_to7_k7_bitsize -1; - VLOG (( "$%04x %f to7_get_cassette: state=$%X pos=%f samppos=%i bit=%i\n", + LOGMASKED(LOG_EXTRA, "$%04x %f to7_get_cassette: state=$%X pos=%f samppos=%i bit=%i\n", m_maincpu->pc(), machine().time().as_double(), state, pos, bitpos, - m_to7_k7_bits[ bitpos ] )); + m_to7_k7_bits[ bitpos ]); return m_to7_k7_bits[ bitpos ]; } else @@ -98,9 +97,9 @@ int thomson_state::to7_get_cassette() chg++; } k = ( chg >= 13 ) ? 1 : 0; - VLOG (( "$%04x %f to7_get_cassette: state=$%X pos=%f samppos=%i bit=%i (%i)\n", + LOGMASKED(LOG_EXTRA, "$%04x %f to7_get_cassette: state=$%X pos=%f samppos=%i bit=%i (%i)\n", m_maincpu->pc(), machine().time().as_double(), state, pos, bitpos, - k, chg )); + k, chg); return k; } @@ -124,9 +123,9 @@ WRITE_LINE_MEMBER( thomson_state::to7_set_cassette_motor ) cassette_state cassstate = m_cassette->get_state(); double pos = m_cassette->get_position(); - LOG (( "$%04x %f to7_set_cassette_motor: cassette motor %s bitpos=%i\n", + LOG("$%04x %f to7_set_cassette_motor: cassette motor %s bitpos=%i\n", m_maincpu->pc(), machine().time().as_double(), state ? "off" : "on", - (int) (pos / TO7_BIT_LENGTH) )); + (int) (pos / TO7_BIT_LENGTH)); if ( (cassstate & CASSETTE_MASK_MOTOR) == CASSETTE_MOTOR_DISABLED && !state && pos > 0.3 ) { @@ -172,9 +171,9 @@ int thomson_state::mo5_get_cassette() cass->get_sample( 0, pos, 0, &hbit ); hbit = hbit >= 0; - VLOG (( "$%04x %f mo5_get_cassette: state=$%X pos=%f hbitpos=%i hbit=%i\n", + LOGMASKED(LOG_EXTRA, "$%04x %f mo5_get_cassette: state=$%X pos=%f hbitpos=%i hbit=%i\n", m_maincpu->pc(), machine().time().as_double(), state, pos, - (int) (pos / MO5_HBIT_LENGTH), hbit )); + (int) (pos / MO5_HBIT_LENGTH), hbit); return hbit; } else @@ -195,9 +194,9 @@ WRITE_LINE_MEMBER( thomson_state::mo5_set_cassette_motor ) cassette_state cassstate = m_cassette->get_state(); double pos = m_cassette->get_position(); - LOG (( "$%04x %f mo5_set_cassette_motor: cassette motor %s hbitpos=%i\n", + LOG("$%04x %f mo5_set_cassette_motor: cassette motor %s hbitpos=%i\n", m_maincpu->pc(), machine().time().as_double(), state ? "off" : "on", - (int) (pos / MO5_HBIT_LENGTH) )); + (int) (pos / MO5_HBIT_LENGTH)); if ( (cassstate & CASSETTE_MASK_MOTOR) == CASSETTE_MOTOR_DISABLED && !state && pos > 0.3 ) { @@ -313,7 +312,7 @@ void thomson_state::to7_update_cart_bank() { m_cartbank->set_entry( bank ); m_old_cart_bank = bank; - LOG_BANK(( "to7_update_cart_bank: CART is cartridge bank %i\n", bank )); + LOGMASKED(LOG_BANK, "to7_update_cart_bank: CART is cartridge bank %i\n", bank); } } @@ -384,7 +383,7 @@ void thomson_state::to7_lightpen_cb( int step ) if ( ! m_to7_lightpen ) return; - LOG_VIDEO(( "%f to7_lightpen_cb: step=%i\n", machine().time().as_double(), step )); + LOGMASKED(LOG_VIDEO, "%f to7_lightpen_cb: step=%i\n", machine().time().as_double(), step); m_pia_sys->cb1_w( 1 ); m_pia_sys->cb1_w( 0 ); m_to7_lightpen_step = step; @@ -400,7 +399,7 @@ void thomson_state::to7_set_init( int init ) { /* INIT signal wired to system PIA 6821 */ - LOG_VIDEO(( "%f to7_set_init: init=%i\n", machine().time().as_double(), init )); + LOGMASKED(LOG_VIDEO, "%f to7_set_init: init=%i\n", machine().time().as_double(), init); m_pia_sys->ca1_w( init ); } @@ -625,7 +624,7 @@ TIMER_CALLBACK_MEMBER(thomson_state::to7_game_update_cb) void thomson_state::to7_game_init() { - LOG (( "to7_game_init called\n" )); + LOG("to7_game_init called\n"); m_to7_game_timer = timer_alloc(FUNC(thomson_state::to7_game_update_cb), this); m_to7_game_timer->adjust(TO7_GAME_POLL_PERIOD, 0, TO7_GAME_POLL_PERIOD); save_item(NAME(m_to7_game_sound)); @@ -636,7 +635,7 @@ void thomson_state::to7_game_init() void thomson_state::to7_game_reset() { - LOG (( "to7_game_reset called\n" )); + LOG("to7_game_reset called\n"); m_pia_game->ca1_w( 0 ); m_to7_game_sound = 0; m_to7_game_mute = 0; @@ -651,7 +650,7 @@ void thomson_state::to7_game_reset() MACHINE_RESET_MEMBER( thomson_state, to7 ) { - LOG (( "to7: machine reset called\n" )); + LOG("to7: machine reset called\n"); /* subsystems */ thom_irq_reset(); @@ -685,7 +684,7 @@ MACHINE_START_MEMBER( thomson_state, to7 ) uint8_t* cartmem = &m_cart_rom[0]; uint8_t* ram = m_ram->pointer(); - LOG (( "to7: machine start called\n" )); + LOG("to7: machine start called\n"); /* subsystems */ to7_game_init(); @@ -742,7 +741,7 @@ MACHINE_START_MEMBER( thomson_state, to7 ) WRITE_LINE_MEMBER( thomson_state::to770_sys_cb2_out ) { /* video overlay: black pixels are transparent and show TV image underneath */ - LOG(( "$%04x to770_sys_cb2_out: video overlay %i\n", m_maincpu->pc(), state )); + LOG("$%04x to770_sys_cb2_out: video overlay %i\n", m_maincpu->pc(), state); } @@ -779,7 +778,7 @@ void thomson_state::to770_update_ram_bank() case 0xf8: return; default: - logerror( "to770_update_ram_bank unknown bank $%02X\n", portb & 0xf8 ); + LOGMASKED(LOG_ERRORS, "to770_update_ram_bank unknown bank $%02X\n", portb & 0xf8); return; } @@ -796,7 +795,7 @@ void thomson_state::to770_update_ram_bank() space.nop_readwrite(0xa000, 0xdfff); } m_old_ram_bank = bank; - LOG_BANK(( "to770_update_ram_bank: RAM bank change %i\n", bank )); + LOGMASKED(LOG_BANK, "to770_update_ram_bank: RAM bank change %i\n", bank); } } @@ -852,7 +851,7 @@ uint8_t thomson_state::to770_gatearray_r(offs_t offset) case 2: return (lt3 << 7) | (inil << 6); case 3: return (init << 7); default: - logerror( "$%04x to770_gatearray_r: invalid offset %i\n", m_maincpu->pc(), offset ); + LOGMASKED(LOG_ERRORS, "$%04x to770_gatearray_r: invalid offset %i\n", m_maincpu->pc(), offset); return 0; } } @@ -873,7 +872,7 @@ void thomson_state::to770_gatearray_w(offs_t offset, uint8_t data) MACHINE_RESET_MEMBER( thomson_state, to770 ) { - LOG (( "to770: machine reset called\n" )); + LOG("to770: machine reset called\n"); /* subsystems */ thom_irq_reset(); @@ -909,7 +908,7 @@ MACHINE_START_MEMBER( thomson_state, to770 ) uint8_t* cartmem = &m_cart_rom[0]; uint8_t* ram = m_ram->pointer(); - LOG (( "to770: machine start called\n" )); + LOG("to770: machine start called\n"); /* subsystems */ to7_game_init(); @@ -1043,7 +1042,7 @@ uint8_t mo5_state::mo5_gatearray_r(offs_t offset) case 2: return (lt3 << 7) | (inil << 6); case 3: return (init << 7); default: - logerror( "$%04x mo5_gatearray_r: invalid offset %i\n", m_maincpu->pc(), offset ); + LOGMASKED(LOG_ERRORS, "$%04x mo5_gatearray_r: invalid offset %i\n", m_maincpu->pc(), offset); return 0; } } @@ -1139,7 +1138,7 @@ void mo5_state::mo5_update_cart_bank() space.install_read_bank( 0xb000, 0xefff, m_cartbank); space.nop_write( 0xb000, 0xefff); } - LOG_BANK(( "mo5_update_cart_bank: CART is cartridge bank %i (A7CB style)\n", bank )); + LOGMASKED(LOG_BANK, "mo5_update_cart_bank: CART is cartridge bank %i (A7CB style)\n", bank); } } else if ( rom_is_ram ) @@ -1159,9 +1158,9 @@ void mo5_state::mo5_update_cart_bank() { space.install_readwrite_bank( 0xb000, 0xefff, m_cartbank); } - LOG_BANK(( "mo5_update_cart_bank: CART is nanonetwork RAM bank %i (%s)\n", + LOGMASKED(LOG_BANK, "mo5_update_cart_bank: CART is nanonetwork RAM bank %i (%s)\n", m_mo5_reg_cart & 3, - bank_is_read_only ? "read-only":"read-write")); + bank_is_read_only ? "read-only":"read-write"); m_old_cart_bank_was_read_only = bank_is_read_only; } } @@ -1179,7 +1178,7 @@ void mo5_state::mo5_update_cart_bank() space.install_write_handler( 0xb000, 0xefff, write8sm_delegate(*this, FUNC(mo5_state::mo5_cartridge_w)) ); space.install_read_handler( 0xbffc, 0xbfff, read8sm_delegate(*this, FUNC(mo5_state::mo5_cartridge_r)) ); } - LOG_BANK(( "mo5_update_cart_bank: CART is cartridge bank %i\n", bank )); + LOGMASKED(LOG_BANK, "mo5_update_cart_bank: CART is cartridge bank %i\n", bank); } } else @@ -1189,7 +1188,7 @@ void mo5_state::mo5_update_cart_bank() { space.install_read_bank( 0xb000, 0xefff, m_cartbank); space.install_write_handler( 0xb000, 0xefff, write8sm_delegate(*this, FUNC(mo5_state::mo5_cartridge_w)) ); - LOG_BANK(( "mo5_update_cart_bank: CART is internal\n")); + LOGMASKED(LOG_BANK, "mo5_update_cart_bank: CART is internal\n"); } } } @@ -1250,7 +1249,7 @@ void mo5_state::mo5_ext_w(uint8_t data) MACHINE_RESET_MEMBER( mo5_state, mo5 ) { - LOG (( "mo5: machine reset called\n" )); + LOG("mo5: machine reset called\n"); /* subsystems */ thom_irq_reset(); @@ -1283,7 +1282,7 @@ MACHINE_START_MEMBER( mo5_state, mo5 ) uint8_t* cartmem = &m_cart_rom[0]; uint8_t* ram = m_ram->pointer(); - LOG (( "mo5: machine start called\n" )); + LOG("mo5: machine start called\n"); /* subsystems */ to7_game_init(); @@ -1331,14 +1330,14 @@ MACHINE_START_MEMBER( mo5_state, mo5 ) void to9_state::to9_ieee_w(offs_t offset, uint8_t data) { - logerror( "$%04x %f to9_ieee_w: unhandled write $%02X to register %i\n", m_maincpu->pc(), machine().time().as_double(), data, offset ); + LOGMASKED(LOG_ERRORS, "$%04x %f to9_ieee_w: unhandled write $%02X to register %i\n", m_maincpu->pc(), machine().time().as_double(), data, offset); } uint8_t to9_state::to9_ieee_r(offs_t offset) { - logerror( "$%04x %f to9_ieee_r: unhandled read from register %i\n", m_maincpu->pc(), machine().time().as_double(), offset ); + LOGMASKED(LOG_ERRORS, "$%04x %f to9_ieee_r: unhandled read from register %i\n", m_maincpu->pc(), machine().time().as_double(), offset); return 0; } @@ -1369,7 +1368,7 @@ uint8_t to9_state::to9_gatearray_r(offs_t offset) case 2: return (lt3 << 7) | (inil << 6); case 3: return (v.init << 7) | (init << 6); /* != TO7/70 */ default: - logerror( "$%04x to9_gatearray_r: invalid offset %i\n", m_maincpu->pc(), offset ); + LOGMASKED(LOG_ERRORS, "$%04x to9_gatearray_r: invalid offset %i\n", m_maincpu->pc(), offset); return 0; } } @@ -1436,7 +1435,7 @@ void to9_state::to9_set_video_mode( uint8_t data, int style ) case 0x5b: thom_set_video_mode( THOM_VMODE_BITMAP16_ALT ); break; default: - logerror( "to9_set_video_mode: unknown mode $%02X tr=%i phi=%i mod=%i\n", data, (data >> 5) & 3, (data >> 3) & 2, data & 7 ); + LOGMASKED(LOG_ERRORS, "to9_set_video_mode: unknown mode $%02X tr=%i phi=%i mod=%i\n", data, (data >> 5) & 3, (data >> 3) & 2, data & 7); } } @@ -1464,7 +1463,7 @@ uint8_t to9_state::to9_vreg_r(offs_t offset) return 0; default: - logerror( "to9_vreg_r: invalid read offset %i\n", offset ); + LOGMASKED(LOG_ERRORS, "to9_vreg_r: invalid read offset %i\n", offset); return 0; } } @@ -1473,7 +1472,7 @@ uint8_t to9_state::to9_vreg_r(offs_t offset) void to9_state::to9_vreg_w(offs_t offset, uint8_t data) { - LOG_VIDEO(( "$%04x %f to9_vreg_w: off=%i ($%04X) data=$%02X\n", m_maincpu->pc(), machine().time().as_double(), offset, 0xe7da + offset, data )); + LOGMASKED(LOG_VIDEO, "$%04x %f to9_vreg_w: off=%i ($%04X) data=$%02X\n", m_maincpu->pc(), machine().time().as_double(), offset, 0xe7da + offset, data); switch ( offset ) { @@ -1502,7 +1501,7 @@ void to9_state::to9_vreg_w(offs_t offset, uint8_t data) break; default: - logerror( "to9_vreg_w: invalid write offset %i data=$%02X\n", offset, data ); + LOGMASKED(LOG_ERRORS, "to9_vreg_w: invalid write offset %i data=$%02X\n", offset, data); } } @@ -1538,7 +1537,7 @@ void to9_state::to9_update_cart_bank() { space.install_read_bank( 0x0000, 0x3fff, m_cartbank ); } - LOG_BANK(( "to9_update_cart_bank: CART is BASIC bank %i\n", m_to9_soft_bank )); + LOGMASKED(LOG_BANK, "to9_update_cart_bank: CART is BASIC bank %i\n", m_to9_soft_bank); } break; case 1: @@ -1550,7 +1549,7 @@ void to9_state::to9_update_cart_bank() { space.install_read_bank( 0x0000, 0x3fff, m_cartbank ); } - LOG_BANK(( "to9_update_cart_bank: CART is software 1 bank %i\n", m_to9_soft_bank )); + LOGMASKED(LOG_BANK, "to9_update_cart_bank: CART is software 1 bank %i\n", m_to9_soft_bank); } break; case 2: @@ -1562,7 +1561,7 @@ void to9_state::to9_update_cart_bank() { space.install_read_bank( 0x0000, 0x3fff, m_cartbank ); } - LOG_BANK(( "to9_update_cart_bank: CART is software 2 bank %i\n", m_to9_soft_bank )); + LOGMASKED(LOG_BANK, "to9_update_cart_bank: CART is software 2 bank %i\n", m_to9_soft_bank); } break; case 3: @@ -1578,7 +1577,7 @@ void to9_state::to9_update_cart_bank() space.install_write_handler( 0x0000, 0x3fff, write8sm_delegate(*this, FUNC(to9_state::to9_cartridge_w)) ); space.install_read_handler( 0x0000, 0x0003, read8sm_delegate(*this, FUNC(to9_state::to9_cartridge_r)) ); } - LOG_BANK(( "to9_update_cart_bank: CART is cartridge bank %i\n", m_thom_cart_bank )); + LOGMASKED(LOG_BANK, "to9_update_cart_bank: CART is cartridge bank %i\n", m_thom_cart_bank); } } else @@ -1586,7 +1585,7 @@ void to9_state::to9_update_cart_bank() if ( m_old_cart_bank != 0 ) { space.nop_read( 0x0000, 0x3fff); - LOG_BANK(( "to9_update_cart_bank: CART is unmapped\n")); + LOGMASKED(LOG_BANK, "to9_update_cart_bank: CART is unmapped\n"); } } break; @@ -1663,7 +1662,7 @@ void to9_state::to9_update_ram_bank() case 0: return; default: - logerror( "to9_update_ram_bank: unknown RAM bank pia=$%02X disk=%i\n", portb & 0xf8, disk ); + LOGMASKED(LOG_ERRORS, "to9_update_ram_bank: unknown RAM bank pia=$%02X disk=%i\n", portb & 0xf8, disk); return; } @@ -1678,7 +1677,7 @@ void to9_state::to9_update_ram_bank() space.nop_readwrite( 0xa000, 0xdfff); } m_old_ram_bank = bank; - LOG_BANK(( "to9_update_ram_bank: bank %i selected (pia=$%02X disk=%i)\n", bank, portb & 0xf8, disk )); + LOGMASKED(LOG_BANK, "to9_update_ram_bank: bank %i selected (pia=$%02X disk=%i)\n", bank, portb & 0xf8, disk); } } @@ -1772,13 +1771,13 @@ uint8_t to9_state::to9_kbd_r(offs_t offset) /* bit 6: parity error */ /* bit 7: interrupt */ - LOG_KBD(( "$%04x %f to9_kbd_r: status $%02X (rdrf=%i, tdre=%i, ovrn=%i, pe=%i, irq=%i)\n", + LOGMASKED(LOG_KBD, "$%04x %f to9_kbd_r: status $%02X (rdrf=%i, tdre=%i, ovrn=%i, pe=%i, irq=%i)\n", m_maincpu->pc(), machine().time().as_double(), m_to9_kbd_status, (m_to9_kbd_status & ACIA_6850_RDRF) ? 1 : 0, (m_to9_kbd_status & ACIA_6850_TDRE) ? 1 : 0, (m_to9_kbd_status & ACIA_6850_OVRN) ? 1 : 0, (m_to9_kbd_status & ACIA_6850_PE) ? 1 : 0, - (m_to9_kbd_status & ACIA_6850_irq) ? 1 : 0 )); + (m_to9_kbd_status & ACIA_6850_irq) ? 1 : 0 ); return m_to9_kbd_status; case 1: /* get input data */ @@ -1790,13 +1789,13 @@ uint8_t to9_state::to9_kbd_r(offs_t offset) else m_to9_kbd_status &= ~(ACIA_6850_OVRN | ACIA_6850_RDRF); m_to9_kbd_overrun = 0; - LOG_KBD(( "$%04x %f to9_kbd_r: read data $%02X\n", m_maincpu->pc(), machine().time().as_double(), m_to9_kbd_in )); + LOGMASKED(LOG_KBD, "$%04x %f to9_kbd_r: read data $%02X\n", m_maincpu->pc(), machine().time().as_double(), m_to9_kbd_in); to9_kbd_update_irq(); } return m_to9_kbd_in; default: - logerror( "$%04x to9_kbd_r: invalid offset %i\n", m_maincpu->pc(), offset ); + LOGMASKED(LOG_ERRORS, "$%04x to9_kbd_r: invalid offset %i\n", m_maincpu->pc(), offset); return 0; } } @@ -1817,7 +1816,7 @@ void to9_state::to9_kbd_w(offs_t offset, uint8_t data) m_to9_kbd_overrun = 0; m_to9_kbd_status = ACIA_6850_TDRE; m_to9_kbd_intr = 0; - LOG_KBD(( "$%04x %f to9_kbd_w: reset (data=$%02X)\n", m_maincpu->pc(), machine().time().as_double(), data )); + LOGMASKED(LOG_KBD, "$%04x %f to9_kbd_w: reset (data=$%02X)\n", m_maincpu->pc(), machine().time().as_double(), data); } else { @@ -1830,10 +1829,10 @@ void to9_state::to9_kbd_w(offs_t offset, uint8_t data) /* bit 7: interrupt on receive */ m_to9_kbd_intr = data >> 5; - LOG_KBD(( "$%04x %f to9_kbd_w: set control to $%02X (parity=%i, intr in=%i out=%i)\n", + LOGMASKED(LOG_KBD, "$%04x %f to9_kbd_w: set control to $%02X (parity=%i, intr in=%i out=%i)\n", m_maincpu->pc(), machine().time().as_double(), data, m_to9_kbd_parity, m_to9_kbd_intr >> 2, - (m_to9_kbd_intr & 3) ? 1 : 0 )); + (m_to9_kbd_intr & 3) ? 1 : 0); } to9_kbd_update_irq(); break; @@ -1862,19 +1861,19 @@ void to9_state::to9_kbd_w(offs_t offset, uint8_t data) case 0xFE: m_to9_kbd_periph = 0; break; default: - logerror( "$%04x %f to9_kbd_w: unknown kbd command %02X\n", m_maincpu->pc(), machine().time().as_double(), data ); + LOGMASKED(LOG_ERRORS, "$%04x %f to9_kbd_w: unknown kbd command %02X\n", m_maincpu->pc(), machine().time().as_double(), data); } m_caps_led = !m_to9_kbd_caps; - LOG(( "$%04x %f to9_kbd_w: kbd command %02X (caps=%i, pad=%i, periph=%i)\n", + LOG("$%04x %f to9_kbd_w: kbd command %02X (caps=%i, pad=%i, periph=%i)\n", m_maincpu->pc(), machine().time().as_double(), data, - m_to9_kbd_caps, m_to9_kbd_pad, m_to9_kbd_periph )); + m_to9_kbd_caps, m_to9_kbd_pad, m_to9_kbd_periph); break; default: - logerror( "$%04x to9_kbd_w: invalid offset %i (data=$%02X) \n", m_maincpu->pc(), offset, data ); + LOGMASKED(LOG_ERRORS, "$%04x to9_kbd_w: invalid offset %i (data=$%02X) \n", m_maincpu->pc(), offset, data); } } @@ -1890,7 +1889,7 @@ void to9_state::to9_kbd_send( uint8_t data, int parity ) { /* overrun will be set when the current valid byte is read */ m_to9_kbd_overrun = 1; - LOG_KBD(( "%f to9_kbd_send: overrun => drop data=$%02X, parity=%i\n", machine().time().as_double(), data, parity )); + LOGMASKED(LOG_KBD, "%f to9_kbd_send: overrun => drop data=$%02X, parity=%i\n", machine().time().as_double(), data, parity); } else { @@ -1901,7 +1900,7 @@ void to9_state::to9_kbd_send( uint8_t data, int parity ) m_to9_kbd_status &= ~ACIA_6850_PE; /* parity OK */ else m_to9_kbd_status |= ACIA_6850_PE; /* parity error */ - LOG_KBD(( "%f to9_kbd_send: data=$%02X, parity=%i, status=$%02X\n", machine().time().as_double(), data, parity, m_to9_kbd_status )); + LOGMASKED(LOG_KBD, "%f to9_kbd_send: data=$%02X, parity=%i, status=$%02X\n", machine().time().as_double(), data, parity, m_to9_kbd_status); } to9_kbd_update_irq(); } @@ -2019,14 +2018,14 @@ int to9_state::to9_kbd_get_key() m_to9_kbd_key_count++; if ( m_to9_kbd_key_count < TO9_KBD_REPEAT_DELAY || (m_to9_kbd_key_count - TO9_KBD_REPEAT_DELAY) % TO9_KBD_REPEAT_PERIOD ) return 0; - LOG_KBD(( "to9_kbd_get_key: repeat key $%02X '%c'\n", asc, asc )); + LOGMASKED(LOG_KBD, "to9_kbd_get_key: repeat key $%02X '%c'\n", asc, asc); return asc; } else { m_to9_kbd_last_key = key; m_to9_kbd_key_count = 0; - LOG_KBD(( "to9_kbd_get_key: key down $%02X '%c'\n", asc, asc )); + LOGMASKED(LOG_KBD, "to9_kbd_get_key: key down $%02X '%c'\n", asc, asc); return asc; } } @@ -2093,7 +2092,7 @@ TIMER_CALLBACK_MEMBER(to9_state::to9_kbd_timer_cb) void to9_state::to9_kbd_reset() { - LOG(( "to9_kbd_reset called\n" )); + LOG("to9_kbd_reset called\n"); m_to9_kbd_overrun = 0; /* no byte lost */ m_to9_kbd_status = ACIA_6850_TDRE; /* clear to transmit */ m_to9_kbd_intr = 0; /* interrupt disabled */ @@ -2112,7 +2111,7 @@ void to9_state::to9_kbd_reset() void to9_state::to9_kbd_init() { - LOG(( "to9_kbd_init called\n" )); + LOG("to9_kbd_init called\n"); m_to9_kbd_timer = timer_alloc(FUNC(to9_state::to9_kbd_timer_cb), this); save_item(NAME(m_to9_kbd_parity)); save_item(NAME(m_to9_kbd_intr)); @@ -2136,7 +2135,7 @@ uint8_t to9_state::to9_sys_porta_in() { uint8_t ktest = to9_kbd_ktest(); - LOG_KBD(( "to9_sys_porta_in: ktest=%i\n", ktest )); + LOGMASKED(LOG_KBD, "to9_sys_porta_in: ktest=%i\n", ktest); // PB1-7 are not connected, and are pulled hi internally return ktest | 0xfe; @@ -2165,7 +2164,7 @@ void to9_state::to9_sys_portb_out(uint8_t data) to9_update_ram_bank(); if ( data & 4 ) /* bit 2: video overlay (TODO) */ - LOG(( "to9_sys_portb_out: video overlay not handled\n" )); + LOG("to9_sys_portb_out: video overlay not handled\n"); } @@ -2188,7 +2187,7 @@ void to9_state::to9_timer_port_out(uint8_t data) MACHINE_RESET_MEMBER( to9_state, to9 ) { - LOG (( "to9: machine reset called\n" )); + LOG("to9: machine reset called\n"); /* subsystems */ thom_irq_reset(); @@ -2225,7 +2224,7 @@ MACHINE_START_MEMBER( to9_state, to9 ) uint8_t* cartmem = &m_cart_rom[0]; uint8_t* ram = m_ram->pointer(); - LOG (( "to9: machine start called\n" )); + LOG("to9: machine start called\n"); /* subsystems */ to7_game_init(); @@ -2400,7 +2399,7 @@ void to9_state::to8_kbd_timer_func() { attotime d; - LOG_KBD(( "%f to8_kbd_timer_cb: step=%i ack=%i data=$%03X\n", machine().time().as_double(), m_to8_kbd_step, m_to8_kbd_ack, m_to8_kbd_data )); + LOGMASKED(LOG_KBD, "%f to8_kbd_timer_cb: step=%i ack=%i data=$%03X\n", machine().time().as_double(), m_to8_kbd_step, m_to8_kbd_ack, m_to8_kbd_data); if( ! m_to8_kbd_step ) { @@ -2418,7 +2417,7 @@ void to9_state::to8_kbd_timer_func() else { /* got key! */ - LOG_KBD(( "to8_kbd_timer_cb: got key $%03X\n", k )); + LOGMASKED(LOG_KBD, "to8_kbd_timer_cb: got key $%03X\n", k); m_to8_kbd_data = k; m_to8_kbd_step = 1; d = attotime::from_usec( 100 ); @@ -2485,13 +2484,13 @@ void to9_state::to8_kbd_set_ack( int data ) if ( data ) { double len = m_to8_kbd_signal->elapsed( ).as_double() * 1000. - 2.; - LOG_KBD(( "%f to8_kbd_set_ack: CPU end ack, len=%f\n", machine().time().as_double(), len )); + LOGMASKED(LOG_KBD, "%f to8_kbd_set_ack: CPU end ack, len=%f\n", machine().time().as_double(), len); if ( m_to8_kbd_data == 0xfff ) { /* end signal from CPU */ if ( len >= 0.6 && len <= 0.8 ) { - LOG (( "%f to8_kbd_set_ack: INIT signal\n", machine().time().as_double() )); + LOG("%f to8_kbd_set_ack: INIT signal\n", machine().time().as_double()); m_to8_kbd_last_key = 0xff; m_to8_kbd_key_count = 0; m_to8_kbd_caps = 1; @@ -2506,12 +2505,12 @@ void to9_state::to8_kbd_set_ack( int data ) m_to8_kbd_timer->adjust(TO8_KBD_POLL_PERIOD); if ( len >= 1.2 && len <= 1.4 ) { - LOG (( "%f to8_kbd_set_ack: CAPS on signal\n", machine().time().as_double() )); + LOG("%f to8_kbd_set_ack: CAPS on signal\n", machine().time().as_double()); m_to8_kbd_caps = 1; } else if ( len >= 1.8 && len <= 2.0 ) { - LOG (( "%f to8_kbd_set_ack: CAPS off signal\n", machine().time().as_double() )); + LOG("%f to8_kbd_set_ack: CAPS off signal\n", machine().time().as_double()); m_to8_kbd_caps = 0; } } @@ -2541,7 +2540,7 @@ void to9_state::to8_kbd_set_ack( int data ) m_to8_kbd_timer->adjust(attotime::from_usec( 400 )); m_to8_kbd_signal->adjust(attotime::never); } - LOG_KBD(( "%f to8_kbd_set_ack: CPU ack, data=$%03X\n", machine().time().as_double(), m_to8_kbd_data )); + LOGMASKED(LOG_KBD, "%f to8_kbd_set_ack: CPU ack, data=$%03X\n", machine().time().as_double(), m_to8_kbd_data); } } @@ -2601,7 +2600,7 @@ void to9_state::to8_update_ram_bank() case 0xd8: bank = 7; break; case 0xf8: return; default: - logerror( "to8_update_ram_bank: unknown RAM bank=$%02X\n", portb & 0xf8 ); + LOGMASKED(LOG_ERRORS, "to8_update_ram_bank: unknown RAM bank=$%02X\n", portb & 0xf8); return; } } @@ -2629,7 +2628,7 @@ void to9_state::to8_update_ram_bank() } m_to8_data_vpage = bank; m_old_ram_bank = bank; - LOG_BANK(( "to8_update_ram_bank: select bank %i (%s style)\n", bank, (m_to8_reg_sys1 & 0x10) ? "new" : "old")); + LOGMASKED(LOG_BANK, "to8_update_ram_bank: select bank %i (%s style)\n", bank, (m_to8_reg_sys1 & 0x10) ? "new" : "old"); } } @@ -2696,9 +2695,7 @@ void to9_state::to8_update_cart_bank() * bank requested */ space.nop_readwrite( 0x0000, 0x3fff); } - LOG_BANK(( "to8_update_cart_bank: CART is RAM bank %i (%s)\n", - m_to8_cart_vpage, - bank_is_read_only ? "read-only":"read-write")); + LOGMASKED(LOG_BANK, "to8_update_cart_bank: CART is RAM bank %i (%s)\n", m_to8_cart_vpage, bank_is_read_only ? "read-only" : "read-write"); } else { @@ -2719,9 +2716,7 @@ void to9_state::to8_update_cart_bank() space.install_readwrite_bank( 0x0000, 0x3fff, m_cartbank ); } } - LOG_BANK(( "to8_update_cart_bank: update CART bank %i write status to %s\n", - m_to8_cart_vpage, - bank_is_read_only ? "read-only":"read-write")); + LOGMASKED(LOG_BANK, "to8_update_cart_bank: update CART bank %i write status to %s\n", m_to8_cart_vpage, bank_is_read_only ? "read-only" : "read-write"); } } m_old_cart_bank_was_read_only = bank_is_read_only; @@ -2739,7 +2734,7 @@ void to9_state::to8_update_cart_bank() space.install_read_bank( 0x0000, 0x3fff, m_cartbank ); space.install_write_handler( 0x0000, 0x3fff, write8sm_delegate(*this, FUNC(to9_state::to8_cartridge_w)) ); } - LOG_BANK(( "to8_update_cart_bank: CART is internal bank %i\n", m_to8_soft_bank )); + LOGMASKED(LOG_BANK, "to8_update_cart_bank: CART is internal bank %i\n", m_to8_soft_bank); } } else @@ -2756,7 +2751,7 @@ void to9_state::to8_update_cart_bank() space.install_write_handler( 0x0000, 0x3fff, write8sm_delegate(*this, FUNC(to9_state::to8_cartridge_w)) ); space.install_read_handler( 0x0000, 0x0003, read8sm_delegate(*this, FUNC(to9_state::to8_cartridge_r)) ); } - LOG_BANK(( "to8_update_cart_bank: CART is external cartridge bank %i\n", bank )); + LOGMASKED(LOG_BANK, "to8_update_cart_bank: CART is external cartridge bank %i\n", bank); } } else @@ -2764,7 +2759,7 @@ void to9_state::to8_update_cart_bank() if ( m_old_cart_bank != 0 ) { space.nop_read( 0x0000, 0x3fff); - LOG_BANK(( "to8_update_cart_bank: CART is unmapped\n")); + LOGMASKED(LOG_BANK, "to8_update_cart_bank: CART is unmapped\n"); } } } @@ -2868,13 +2863,11 @@ uint8_t to9_state::to8_gatearray_r(offs_t offset) break; default: - logerror( "$%04x to8_gatearray_r: invalid offset %i\n", m_maincpu->pc(), offset ); + LOGMASKED(LOG_ERRORS, "$%04x to8_gatearray_r: invalid offset %i\n", m_maincpu->pc(), offset); res = 0; } - LOG_VIDEO(( "$%04x %f to8_gatearray_r: off=%i ($%04X) res=$%02X lightpen=%i\n", - m_maincpu->pc(), machine().time().as_double(), - offset, 0xe7e4 + offset, res, m_to7_lightpen )); + LOGMASKED(LOG_VIDEO, "$%04x %f to8_gatearray_r: off=%i ($%04X) res=$%02X lightpen=%i\n", m_maincpu->pc(), machine().time().as_double(), offset, 0xe7e4 + offset, res, m_to7_lightpen); return res; } @@ -2883,9 +2876,7 @@ uint8_t to9_state::to8_gatearray_r(offs_t offset) void to9_state::to8_gatearray_w(offs_t offset, uint8_t data) { - LOG_VIDEO(( "$%04x %f to8_gatearray_w: off=%i ($%04X) data=$%02X\n", - m_maincpu->pc(), machine().time().as_double(), - offset, 0xe7e4 + offset, data )); + LOGMASKED(LOG_VIDEO, "$%04x %f to8_gatearray_w: off=%i ($%04X) data=$%02X\n", m_maincpu->pc(), machine().time().as_double(), offset, 0xe7e4 + offset, data); switch ( offset ) { @@ -2913,8 +2904,7 @@ void to9_state::to8_gatearray_w(offs_t offset, uint8_t data) break; default: - logerror( "$%04x to8_gatearray_w: invalid offset %i (data=$%02X)\n", - m_maincpu->pc(), offset, data ); + LOGMASKED(LOG_ERRORS, "$%04x to8_gatearray_w: invalid offset %i (data=$%02X)\n", m_maincpu->pc(), offset, data); } } @@ -2955,7 +2945,7 @@ uint8_t to9_state::to8_vreg_r(offs_t offset) return 0; default: - logerror( "to8_vreg_r: invalid read offset %i\n", offset ); + LOGMASKED(LOG_ERRORS, "to8_vreg_r: invalid read offset %i\n", offset); return 0; } } @@ -2964,9 +2954,7 @@ uint8_t to9_state::to8_vreg_r(offs_t offset) void to9_state::to8_vreg_w(offs_t offset, uint8_t data) { - LOG_VIDEO(( "$%04x %f to8_vreg_w: off=%i ($%04X) data=$%02X\n", - m_maincpu->pc(), machine().time().as_double(), - offset, 0xe7da + offset, data )); + LOGMASKED(LOG_VIDEO, "$%04x %f to8_vreg_w: off=%i ($%04X) data=$%02X\n", m_maincpu->pc(), machine().time().as_double(), offset, 0xe7da + offset, data); switch ( offset ) { @@ -3005,7 +2993,7 @@ void to9_state::to8_vreg_w(offs_t offset, uint8_t data) break; default: - logerror( "to8_vreg_w: invalid write offset %i data=$%02X\n", offset, data ); + LOGMASKED(LOG_ERRORS, "to8_vreg_w: invalid write offset %i data=$%02X\n", offset, data); } } @@ -3018,7 +3006,7 @@ uint8_t to9_state::to8_sys_porta_in() { int ktest = to8_kbd_ktest(); - LOG_KBD(( "$%04x %f: to8_sys_porta_in ktest=%i\n", m_maincpu->pc(), machine().time().as_double(), ktest )); + LOGMASKED(LOG_KBD, "$%04x %f: to8_sys_porta_in ktest=%i\n", m_maincpu->pc(), machine().time().as_double(), ktest); // PB1-7 are not connected, and are pulled hi internally return ktest | 0xfe; @@ -3034,7 +3022,7 @@ void to9_state::to8_sys_portb_out(uint8_t data) to8_update_ram_bank(); if ( data & 4 ) /* bit 2: video overlay (TODO) */ - LOG(( "to8_sys_portb_out: video overlay not handled\n" )); + LOG("to8_sys_portb_out: video overlay not handled\n"); } @@ -3101,7 +3089,7 @@ void to9_state::to8_lightpen_cb( int step ) MACHINE_RESET_MEMBER( to9_state, to8 ) { - LOG (( "to8: machine reset called\n" )); + LOG("to8: machine reset called\n"); /* subsystems */ thom_irq_reset(); @@ -3147,7 +3135,7 @@ MACHINE_START_MEMBER( to9_state, to8 ) uint8_t* cartmem = &m_cart_rom[0]; uint8_t* ram = m_ram->pointer(); - LOG (( "to8: machine start called\n" )); + LOG("to8: machine start called\n"); /* subsystems */ to7_game_init(); @@ -3246,7 +3234,7 @@ void to9_state::to9p_timer_port_out(uint8_t data) MACHINE_RESET_MEMBER( to9_state, to9p ) { - LOG (( "to9p: machine reset called\n" )); + LOG("to9p: machine reset called\n"); /* subsystems */ thom_irq_reset(); @@ -3291,7 +3279,7 @@ MACHINE_START_MEMBER( to9_state, to9p ) uint8_t* cartmem = &m_cart_rom[0]; uint8_t* ram = m_ram->pointer(); - LOG (( "to9p: machine start called\n" )); + LOG("to9p: machine start called\n"); /* subsystems */ to7_game_init(); @@ -3364,7 +3352,7 @@ void mo6_state::mo6_update_ram_bank() m_datahibank->set_entry( bank ); m_to8_data_vpage = bank; m_old_ram_bank = bank; - LOG_BANK(( "mo6_update_ram_bank: select bank %i (new style)\n", bank )); + LOGMASKED(LOG_BANK, "mo6_update_ram_bank: select bank %i (new style)\n", bank); } } @@ -3429,9 +3417,7 @@ void mo6_state::mo6_update_cart_bank() } } } - LOG_BANK(( "mo6_update_cart_bank: CART is RAM bank %i (%s)\n", - m_to8_cart_vpage, - bank_is_read_only ? "read-only":"read-write")); + LOGMASKED(LOG_BANK, "mo6_update_cart_bank: CART is RAM bank %i (%s)\n", m_to8_cart_vpage, bank_is_read_only ? "read-only" : "read-write"); } else if ( bank_is_read_only != m_old_cart_bank_was_read_only ) { @@ -3452,9 +3438,7 @@ void mo6_state::mo6_update_cart_bank() space.install_readwrite_bank( 0xc000, 0xefff, m_carthibank ); } } - LOG_BANK(( "mo6_update_cart_bank: update CART bank %i write status to %s\n", - m_to8_cart_vpage, - bank_is_read_only ? "read-only":"read-write")); + LOGMASKED(LOG_BANK, "mo6_update_cart_bank: update CART bank %i write status to %s\n", m_to8_cart_vpage, bank_is_read_only ? "read-only" : "read-write"); } m_old_cart_bank_was_read_only = bank_is_read_only; } @@ -3470,7 +3454,7 @@ void mo6_state::mo6_update_cart_bank() space.install_read_bank( 0xc000, 0xefff, m_carthibank ); space.nop_write( 0xb000, 0xefff); } - LOG_BANK(( "mo6_update_cart_bank: CART is external cartridge bank %i (A7CB style)\n", bank )); + LOGMASKED(LOG_BANK, "mo6_update_cart_bank: CART is external cartridge bank %i (A7CB style)\n", bank); } } else @@ -3495,9 +3479,7 @@ void mo6_state::mo6_update_cart_bank() space.install_readwrite_bank( 0xc000, 0xefff, m_carthibank ); } } - LOG_BANK(( "mo6_update_cart_bank: CART is RAM bank %i (MO5 compat.) (%s)\n", - m_to8_cart_vpage, - bank_is_read_only ? "read-only":"read-write")); + LOGMASKED(LOG_BANK, "mo6_update_cart_bank: CART is RAM bank %i (MO5 compat.) (%s)\n", m_to8_cart_vpage, bank_is_read_only ? "read-only" : "read-write"); } else if ( bank_is_read_only != m_old_cart_bank_was_read_only ) { @@ -3512,9 +3494,7 @@ void mo6_state::mo6_update_cart_bank() space.install_readwrite_bank( 0xb000, 0xbfff, m_cartlobank ); space.install_readwrite_bank( 0xc000, 0xefff, m_carthibank ); } - LOG_BANK(( "mo5_update_cart_bank: update CART bank %i write status to %s\n", - m_to8_cart_vpage, - bank_is_read_only ? "read-only":"read-write")); + LOGMASKED(LOG_BANK, "mo5_update_cart_bank: update CART bank %i write status to %s\n", m_to8_cart_vpage, bank_is_read_only ? "read-only" : "read-write"); } m_old_cart_bank_was_read_only = bank_is_read_only; } @@ -3541,7 +3521,7 @@ void mo6_state::mo6_update_cart_bank() space.install_read_bank( 0xc000, 0xefff, m_carthibank ); space.install_write_handler( 0xb000, 0xefff, write8sm_delegate(*this, FUNC(mo6_state::mo6_cartridge_w)) ); } - LOG_BANK(( "mo6_update_cart_bank: CART is internal ROM bank %i\n", b )); + LOGMASKED(LOG_BANK, "mo6_update_cart_bank: CART is internal ROM bank %i\n", b); } } else @@ -3559,7 +3539,7 @@ void mo6_state::mo6_update_cart_bank() space.install_write_handler( 0xb000, 0xefff, write8sm_delegate(*this, FUNC(mo6_state::mo6_cartridge_w)) ); space.install_read_handler( 0xbffc, 0xbfff, read8sm_delegate(*this, FUNC(mo6_state::mo6_cartridge_r)) ); } - LOG_BANK(( "mo6_update_cart_bank: CART is external cartridge bank %i\n", bank )); + LOGMASKED(LOG_BANK, "mo6_update_cart_bank: CART is external cartridge bank %i\n", bank); } } else @@ -3567,7 +3547,7 @@ void mo6_state::mo6_update_cart_bank() if ( m_old_cart_bank != 0 ) { space.nop_read( 0xb000, 0xefff ); - LOG_BANK(( "mo6_update_cart_bank: CART is unmapped\n")); + LOGMASKED(LOG_BANK, "mo6_update_cart_bank: CART is unmapped\n"); } } } @@ -3638,7 +3618,7 @@ WRITE_LINE_MEMBER( mo6_state::mo6_centronics_busy ) void mo6_state::mo6_game_porta_out(uint8_t data) { - LOG (( "$%04x %f mo6_game_porta_out: CENTRONICS set data=$%02X\n", m_maincpu->pc(), machine().time().as_double(), data )); + LOG("$%04x %f mo6_game_porta_out: CENTRONICS set data=$%02X\n", m_maincpu->pc(), machine().time().as_double(), data); /* centronics data */ m_cent_data_out->write(data); @@ -3648,7 +3628,7 @@ void mo6_state::mo6_game_porta_out(uint8_t data) WRITE_LINE_MEMBER( mo6_state::mo6_game_cb2_out ) { - LOG (( "$%04x %f mo6_game_cb2_out: CENTRONICS set strobe=%i\n", m_maincpu->pc(), machine().time().as_double(), state )); + LOG("$%04x %f mo6_game_cb2_out: CENTRONICS set strobe=%i\n", m_maincpu->pc(), machine().time().as_double(), state); /* centronics strobe */ m_centronics->write_strobe(state); @@ -3678,7 +3658,7 @@ TIMER_CALLBACK_MEMBER(mo6_state::mo6_game_update_cb) void mo6_state::mo6_game_init() { - LOG (( "mo6_game_init called\n" )); + LOG("mo6_game_init called\n"); m_to7_game_timer = timer_alloc(FUNC(mo6_state::mo6_game_update_cb), this); m_to7_game_timer->adjust(TO7_GAME_POLL_PERIOD, 0, TO7_GAME_POLL_PERIOD); save_item(NAME(m_to7_game_sound)); @@ -3689,7 +3669,7 @@ void mo6_state::mo6_game_init() void mo6_state::mo6_game_reset() { - LOG (( "mo6_game_reset called\n" )); + LOG("mo6_game_reset called\n"); m_pia_game->ca1_w( 0 ); m_to7_game_sound = 0; m_to7_game_mute = 0; @@ -3746,7 +3726,7 @@ void mo6_state::mo6_sys_porta_out(uint8_t data) WRITE_LINE_MEMBER( mo6_state::mo6_sys_cb2_out ) { /* SCART pin 8 = slow switch (?) */ - LOG(( "mo6_sys_cb2_out: SCART slow switch set to %i\n", state )); + LOG("mo6_sys_cb2_out: SCART slow switch set to %i\n", state); } @@ -3803,13 +3783,11 @@ uint8_t mo6_state::mo6_gatearray_r(offs_t offset) break; default: - logerror( "$%04x mo6_gatearray_r: invalid offset %i\n", m_maincpu->pc(), offset ); + LOGMASKED(LOG_ERRORS, "$%04x mo6_gatearray_r: invalid offset %i\n", m_maincpu->pc(), offset); res = 0; } - LOG_VIDEO(( "$%04x %f mo6_gatearray_r: off=%i ($%04X) res=$%02X lightpen=%i\n", - m_maincpu->pc(), machine().time().as_double(), - offset, 0xa7e4 + offset, res, m_to7_lightpen )); + LOGMASKED(LOG_VIDEO, "$%04x %f mo6_gatearray_r: off=%i ($%04X) res=$%02X lightpen=%i\n", m_maincpu->pc(), machine().time().as_double(), offset, 0xa7e4 + offset, res, m_to7_lightpen); return res; } @@ -3818,9 +3796,7 @@ uint8_t mo6_state::mo6_gatearray_r(offs_t offset) void mo6_state::mo6_gatearray_w(offs_t offset, uint8_t data) { - LOG_VIDEO(( "$%04x %f mo6_gatearray_w: off=%i ($%04X) data=$%02X\n", - m_maincpu->pc(), machine().time().as_double(), - offset, 0xa7e4 + offset, data )); + LOGMASKED(LOG_VIDEO, "$%04x %f mo6_gatearray_w: off=%i ($%04X) data=$%02X\n", m_maincpu->pc(), machine().time().as_double(), offset, 0xa7e4 + offset, data); switch ( offset ) { @@ -3848,7 +3824,7 @@ void mo6_state::mo6_gatearray_w(offs_t offset, uint8_t data) break; default: - logerror( "$%04x mo6_gatearray_w: invalid offset %i (data=$%02X)\n", m_maincpu->pc(), offset, data ); + LOGMASKED(LOG_ERRORS, "$%04x mo6_gatearray_w: invalid offset %i (data=$%02X)\n", m_maincpu->pc(), offset, data); } } @@ -3877,7 +3853,7 @@ uint8_t mo6_state::mo6_vreg_r(offs_t offset) return 0; default: - logerror( "mo6_vreg_r: invalid read offset %i\n", offset ); + LOGMASKED(LOG_ERRORS, "mo6_vreg_r: invalid read offset %i\n", offset); return 0; } } @@ -3886,9 +3862,7 @@ uint8_t mo6_state::mo6_vreg_r(offs_t offset) void mo6_state::mo6_vreg_w(offs_t offset, uint8_t data) { - LOG_VIDEO(( "$%04x %f mo6_vreg_w: off=%i ($%04X) data=$%02X\n", - m_maincpu->pc(), machine().time().as_double(), - offset, 0xa7da + offset, data )); + LOGMASKED(LOG_VIDEO, "$%04x %f mo6_vreg_w: off=%i ($%04X) data=$%02X\n", m_maincpu->pc(), machine().time().as_double(), offset, 0xa7da + offset, data); switch ( offset ) { @@ -3918,7 +3892,7 @@ void mo6_state::mo6_vreg_w(offs_t offset, uint8_t data) break; default: - logerror( "mo6_vreg_w: invalid write offset %i data=$%02X\n", offset, data ); + LOGMASKED(LOG_ERRORS, "mo6_vreg_w: invalid write offset %i data=$%02X\n", offset, data); } } @@ -3930,7 +3904,7 @@ void mo6_state::mo6_vreg_w(offs_t offset, uint8_t data) MACHINE_RESET_MEMBER( mo6_state, mo6 ) { - LOG (( "mo6: machine reset called\n" )); + LOG("mo6: machine reset called\n"); /* subsystems */ thom_irq_reset(); @@ -3972,7 +3946,7 @@ MACHINE_START_MEMBER( mo6_state, mo6 ) uint8_t* cartmem = &m_cart_rom[0]; uint8_t* ram = m_ram->pointer(); - LOG (( "mo6: machine start called\n" )); + LOG("mo6: machine start called\n"); /* subsystems */ mo6_game_init(); @@ -4071,7 +4045,7 @@ void mo5nr_state::mo5nr_sys_porta_out(uint8_t data) void mo5nr_state::mo5nr_game_init() { - LOG (( "mo5nr_game_init called\n" )); + LOG("mo5nr_game_init called\n"); m_to7_game_timer = timer_alloc(FUNC(mo5nr_state::mo6_game_update_cb), this); m_to7_game_timer->adjust( TO7_GAME_POLL_PERIOD, 0, TO7_GAME_POLL_PERIOD ); save_item(NAME(m_to7_game_sound)); @@ -4082,7 +4056,7 @@ void mo5nr_state::mo5nr_game_init() void mo5nr_state::mo5nr_game_reset() { - LOG (( "mo5nr_game_reset called\n" )); + LOG("mo5nr_game_reset called\n"); m_pia_game->ca1_w( 0 ); m_to7_game_sound = 0; m_to7_game_mute = 0; @@ -4101,7 +4075,7 @@ uint8_t mo5nr_state::id_r() MACHINE_RESET_MEMBER( mo5nr_state, mo5nr ) { - LOG (( "mo5nr: machine reset called\n" )); + LOG("mo5nr: machine reset called\n"); m_extension_view.select(m_nanoreseau_config->read() & 1); @@ -4145,7 +4119,7 @@ MACHINE_START_MEMBER( mo5nr_state, mo5nr ) uint8_t* cartmem = &m_cart_rom[0]; uint8_t* ram = m_ram->pointer(); - LOG (( "mo5nr: machine start called\n" )); + LOG("mo5nr: machine start called\n"); /* subsystems */ mo5nr_game_init(); diff --git a/src/mame/ti/geneve.cpp b/src/mame/ti/geneve.cpp index 6bcd41dc156..6ed56482df3 100644 --- a/src/mame/ti/geneve.cpp +++ b/src/mame/ti/geneve.cpp @@ -191,14 +191,14 @@ #include "speaker.h" -#define LOG_WARN (1U<<1) -#define LOG_CRU (1U<<4) -#define LOG_CRUKEY (1U<<5) -#define LOG_READ (1U<<6) -#define LOG_READG (1U<<7) -#define LOG_WRITE (1U<<8) -#define LOG_CONFIG (1U<<9) -#define LOG_PFM (1U<<10) +#define LOG_WARN (1U << 1) +#define LOG_CRU (1U << 2) +#define LOG_CRUKEY (1U << 3) +#define LOG_READ (1U << 4) +#define LOG_READG (1U << 5) +#define LOG_WRITE (1U << 6) +#define LOG_CONFIG (1U << 7) +#define LOG_PFM (1U << 8) // Minimum log should be settings and warnings #define VERBOSE ( LOG_GENERAL | LOG_CONFIG | LOG_WARN ) @@ -944,7 +944,7 @@ WRITE_LINE_MEMBER( geneve_state::joystick_select ) WRITE_LINE_MEMBER( geneve_state::keyboard_reset ) { if (state==CLEAR_LINE) - LOGMASKED(LOG_GENERAL, "Keyboard reset (line not connected)\n"); + LOG("Keyboard reset (line not connected)\n"); } /* diff --git a/src/mame/ti/ti99_2.cpp b/src/mame/ti/ti99_2.cpp index 302f0b0824b..717687b701c 100644 --- a/src/mame/ti/ti99_2.cpp +++ b/src/mame/ti/ti99_2.cpp @@ -174,9 +174,9 @@ #define TI992_ROM "rom_region" #define TI992_SCREEN_TAG "screen" -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CRU (1U<<2) // CRU activities -#define LOG_SIGNALS (1U<<3) // Signals like HOLD/HOLDA +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CRU (1U << 2) // CRU activities +#define LOG_SIGNALS (1U << 3) // Signals like HOLD/HOLDA // Minimum log should be config and warnings #define VERBOSE ( LOG_GENERAL | LOG_WARN ) diff --git a/src/mame/ti/ti99_4p.cpp b/src/mame/ti/ti99_4p.cpp index de3926ca18a..02cb1568d27 100644 --- a/src/mame/ti/ti99_4p.cpp +++ b/src/mame/ti/ti99_4p.cpp @@ -129,13 +129,13 @@ #define SGCPU_TMS9901_TAG "tms9901" // Debugging -#define LOG_WARN (1U<<1) // Warnings -#define LOG_ILLWRITE (1U<<2) -#define LOG_READY (1U<<3) -#define LOG_INTERRUPTS (1U<<4) -#define LOG_ADDRESS (1U<<5) -#define LOG_MEM (1U<<6) -#define LOG_MUX (1U<<7) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_ILLWRITE (1U << 2) +#define LOG_READY (1U << 3) +#define LOG_INTERRUPTS (1U << 4) +#define LOG_ADDRESS (1U << 5) +#define LOG_MEM (1U << 6) +#define LOG_MUX (1U << 7) #define VERBOSE ( LOG_GENERAL | LOG_WARN ) diff --git a/src/mame/ti/ti99_4x.cpp b/src/mame/ti/ti99_4x.cpp index 8fd14328ed7..a668fa52492 100644 --- a/src/mame/ti/ti99_4x.cpp +++ b/src/mame/ti/ti99_4x.cpp @@ -59,13 +59,13 @@ #define TI99_SCREEN_TAG "screen" // Debugging -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) // Configuration -#define LOG_READY (1U<<3) -#define LOG_INTERRUPTS (1U<<4) -#define LOG_CRU (1U<<5) -#define LOG_CRUREAD (1U<<6) -#define LOG_RESETLOAD (1U<<7) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) // Configuration +#define LOG_READY (1U << 3) +#define LOG_INTERRUPTS (1U << 4) +#define LOG_CRU (1U << 5) +#define LOG_CRUREAD (1U << 6) +#define LOG_RESETLOAD (1U << 7) #define VERBOSE ( LOG_GENERAL | LOG_CONFIG | LOG_WARN | LOG_RESETLOAD ) diff --git a/src/mame/ti/ti99_8.cpp b/src/mame/ti/ti99_8.cpp index 7c0fab42796..ad941285fd2 100644 --- a/src/mame/ti/ti99_8.cpp +++ b/src/mame/ti/ti99_8.cpp @@ -180,13 +180,13 @@ Known Issues (MZ, 2019-05-10) #include "speaker.h" // Debugging -#define LOG_WARN (1U<<1) // Warnings -#define LOG_CONFIG (1U<<2) // Configuration -#define LOG_READY (1U<<3) -#define LOG_INTERRUPTS (1U<<4) -#define LOG_CRU (1U<<5) -#define LOG_CRUREAD (1U<<6) -#define LOG_RESETLOAD (1U<<7) +#define LOG_WARN (1U << 1) // Warnings +#define LOG_CONFIG (1U << 2) // Configuration +#define LOG_READY (1U << 3) +#define LOG_INTERRUPTS (1U << 4) +#define LOG_CRU (1U << 5) +#define LOG_CRUREAD (1U << 6) +#define LOG_RESETLOAD (1U << 7) #define VERBOSE ( LOG_CONFIG | LOG_WARN | LOG_RESETLOAD ) diff --git a/src/mame/toaplan/twincobr_m.cpp b/src/mame/toaplan/twincobr_m.cpp index a40c535a6d8..6448322c8ed 100644 --- a/src/mame/toaplan/twincobr_m.cpp +++ b/src/mame/toaplan/twincobr_m.cpp @@ -10,9 +10,8 @@ #include "cpu/tms32010/tms32010.h" #include "twincobr.h" - -#define LOG_DSP_CALLS 0 -#define LOG(x) do { if (LOG_DSP_CALLS) logerror x; } while (0) +#define VERBOSE (0) +#include "logmacro.h" WRITE_LINE_MEMBER(twincobr_state::twincobr_vblank_irq) @@ -35,7 +34,7 @@ void twincobr_state::twincobr_dsp_addrsel_w(u16 data) m_main_ram_seg = ((data & 0xe000) << 3); m_dsp_addr_w = ((data & 0x1fff) << 1); - LOG(("DSP PC:%04x IO write %04x (%08x) at port 0\n",m_dsp->pcbase(),data,m_main_ram_seg + m_dsp_addr_w)); + LOG("DSP PC:%04x IO write %04x (%08x) at port 0\n",m_dsp->pcbase(),data,m_main_ram_seg + m_dsp_addr_w); } u16 twincobr_state::twincobr_dsp_r() @@ -52,7 +51,7 @@ u16 twincobr_state::twincobr_dsp_r() break;} default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n",m_dsp->pcbase(),m_main_ram_seg + m_dsp_addr_w); break; } - LOG(("DSP PC:%04x IO read %04x at %08x (port 1)\n",m_dsp->pcbase(),input_data,m_main_ram_seg + m_dsp_addr_w)); + LOG("DSP PC:%04x IO read %04x at %08x (port 1)\n",m_dsp->pcbase(),input_data,m_main_ram_seg + m_dsp_addr_w); return input_data; } @@ -70,7 +69,7 @@ void twincobr_state::twincobr_dsp_w(u16 data) break;} default: logerror("DSP PC:%04x Warning !!! IO writing to %08x (port 1)\n",m_dsp->pcbase(),m_main_ram_seg + m_dsp_addr_w); break; } - LOG(("DSP PC:%04x IO write %04x at %08x (port 1)\n",m_dsp->pcbase(),data,m_main_ram_seg + m_dsp_addr_w)); + LOG("DSP PC:%04x IO write %04x at %08x (port 1)\n",m_dsp->pcbase(),data,m_main_ram_seg + m_dsp_addr_w); } void twincobr_state::wardner_dsp_addrsel_w(u16 data) @@ -85,7 +84,7 @@ void twincobr_state::wardner_dsp_addrsel_w(u16 data) if (m_main_ram_seg == 0x6000) m_main_ram_seg = 0x7000; - LOG(("DSP PC:%04x IO write %04x (%08x) at port 0\n",m_dsp->pcbase(),data,m_main_ram_seg + m_dsp_addr_w)); + LOG("DSP PC:%04x IO write %04x (%08x) at port 0\n",m_dsp->pcbase(),data,m_main_ram_seg + m_dsp_addr_w); } u16 twincobr_state::wardner_dsp_r() @@ -103,7 +102,7 @@ u16 twincobr_state::wardner_dsp_r() break;} default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n",m_dsp->pcbase(),m_main_ram_seg + m_dsp_addr_w); break; } - LOG(("DSP PC:%04x IO read %04x at %08x (port 1)\n",m_dsp->pcbase(),input_data,m_main_ram_seg + m_dsp_addr_w)); + LOG("DSP PC:%04x IO read %04x at %08x (port 1)\n",m_dsp->pcbase(),input_data,m_main_ram_seg + m_dsp_addr_w); return input_data; } @@ -122,7 +121,7 @@ void twincobr_state::wardner_dsp_w(u16 data) break;} default: logerror("DSP PC:%04x Warning !!! IO writing to %08x (port 1)\n",m_dsp->pcbase(),m_main_ram_seg + m_dsp_addr_w); break; } - LOG(("DSP PC:%04x IO write %04x at %08x (port 1)\n",m_dsp->pcbase(),data,m_main_ram_seg + m_dsp_addr_w)); + LOG("DSP PC:%04x IO write %04x at %08x (port 1)\n",m_dsp->pcbase(),data,m_main_ram_seg + m_dsp_addr_w); } void twincobr_state::twincobr_dsp_bio_w(u16 data) @@ -132,7 +131,7 @@ void twincobr_state::twincobr_dsp_bio_w(u16 data) /* Actually only DSP data bit 15 controls this */ /* data 0x0000 means set DSP BIO line active and disable */ /* communication to main processor*/ - LOG(("DSP PC:%04x IO write %04x at port 3\n",m_dsp->pcbase(),data)); + LOG("DSP PC:%04x IO write %04x at port 3\n",m_dsp->pcbase(),data); if (data & 0x8000) { m_dsp_bio = CLEAR_LINE; @@ -141,7 +140,7 @@ void twincobr_state::twincobr_dsp_bio_w(u16 data) { if (m_dsp_execute) { - LOG(("Turning the main CPU on\n")); + LOG("Turning the main CPU on\n"); m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); m_dsp_execute = 0; } @@ -156,7 +155,7 @@ u16 twincobr_state::fsharkbt_dsp_r() /* Port is read three times during startup. First and last data */ /* read must equal, but second data read must be different */ m_fsharkbt_8741 += 1; - LOG(("DSP PC:%04x IO read %04x from 8741 MCU (port 2)\n",m_dsp->pcbase(),(m_fsharkbt_8741 & 0x08))); + LOG("DSP PC:%04x IO read %04x from 8741 MCU (port 2)\n",m_dsp->pcbase(),(m_fsharkbt_8741 & 0x08)); return (m_fsharkbt_8741 & 1); } @@ -186,7 +185,7 @@ WRITE_LINE_MEMBER(twincobr_state::dsp_int_w) if (state) { // assert the INT line to the DSP - LOG(("Turning DSP on and main CPU off\n")); + LOG("Turning DSP on and main CPU off\n"); m_dsp->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); m_dsp->set_input_line(0, ASSERT_LINE); // TMS32010 INT m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); @@ -194,7 +193,7 @@ WRITE_LINE_MEMBER(twincobr_state::dsp_int_w) else { // inhibit the INT line to the DSP - LOG(("Turning DSP off\n")); + LOG("Turning DSP off\n"); m_dsp->set_input_line(0, CLEAR_LINE); // TMS32010 INT m_dsp->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); } diff --git a/src/mame/trs/6883sam.cpp b/src/mame/trs/6883sam.cpp index 140791aa7fb..63cc20d454c 100644 --- a/src/mame/trs/6883sam.cpp +++ b/src/mame/trs/6883sam.cpp @@ -57,12 +57,12 @@ // CONSTANTS //************************************************************************** -#define LOG_FBITS (1U << 1) -#define LOG_VBITS (1U << 2) -#define LOG_PBITS (1U << 3) -#define LOG_TBITS (1U << 4) -#define LOG_MBITS (1U << 5) -#define LOG_RBITS (1U << 6) +#define LOG_FBITS (1U << 1) +#define LOG_VBITS (1U << 2) +#define LOG_PBITS (1U << 3) +#define LOG_TBITS (1U << 4) +#define LOG_MBITS (1U << 5) +#define LOG_RBITS (1U << 6) #define VERBOSE (0) // #define VERBOSE (LOG_FBITS) diff --git a/src/mame/trs/coco.cpp b/src/mame/trs/coco.cpp index 4bb956608dc..587f520195d 100644 --- a/src/mame/trs/coco.cpp +++ b/src/mame/trs/coco.cpp @@ -61,14 +61,6 @@ -//************************************************************************** -// CONSTANTS -//************************************************************************** - -#define LOG_INTERRUPTS 0 - - - //************************************************************************** // BODY //************************************************************************** diff --git a/src/mame/trs/dgn_beta_m.cpp b/src/mame/trs/dgn_beta_m.cpp index 4e7907a39f1..7c255ca402b 100644 --- a/src/mame/trs/dgn_beta_m.cpp +++ b/src/mame/trs/dgn_beta_m.cpp @@ -74,18 +74,19 @@ #include #include -#define VERBOSE 0 +#define LOG_BANK_UPDATE (1U << 1) +#define LOG_DEFAULT_TASK (1U << 2) +#define LOG_PAGE_WRITE (1U << 3) +#define LOG_HALT (1U << 4) +#define LOG_TASK (1U << 5) +#define LOG_KEYBOARD (1U << 6) +#define LOG_VIDEO (1U << 7) +#define LOG_DISK (1U << 8) +#define LOG_INTS (1U << 9) +#define LOG_ALL (LOG_BAK_UPDATE | LOG_DEFAULT_TASK | LOG_PAGE_WRITE | LOG_HALT | LOG_TASK | LOG_KEYBOARD | LOG_VIDEO | LOG_DISK | LOG_INTS) - -#define LOG_BANK_UPDATE(x) do { if (VERBOSE) logerror x; } while (0) -#define LOG_DEFAULT_TASK(x) do { if (VERBOSE) logerror x; } while (0) -#define LOG_PAGE_WRITE(x) do { if (VERBOSE) logerror x; } while (0) -#define LOG_HALT(x) do { if (VERBOSE) logerror x; } while (0) -#define LOG_TASK(x) do { if (VERBOSE) logerror x; } while (0) -#define LOG_KEYBOARD(x) do { if (VERBOSE) logerror x; } while (0) -#define LOG_VIDEO(x) do { if (VERBOSE) logerror x; } while (0) -#define LOG_DISK(x) do { if (VERBOSE) logerror x; } while (0) -#define LOG_INTS(x) do { if (VERBOSE) logerror x; } while (0) +#define VERBOSE (0) // LOG_ALL +#include "logmacro.h" //static int DMA_NMI; /* DMA cpu has received an NMI */ @@ -120,7 +121,7 @@ void dgn_beta_state::UpdateBanks(int first, int last) int bank_end; int MapPage; - LOG_BANK_UPDATE(("\n\n%s Updating banks %d to %d\n", machine().describe_context(), first, last)); + LOGMASKED(LOG_BANK_UPDATE, "\n\n%s Updating banks %d to %d\n", machine().describe_context(), first, last); for(Page=first;Page<=last;Page++) { bank_start = Page < 16 ? Page * 0x1000 : 0xff00; @@ -171,11 +172,11 @@ void dgn_beta_state::UpdateBanks(int first, int last) space_1.unmap_write(bank_start, bank_end); } - LOG_BANK_UPDATE(("UpdateBanks:MapPage=$%02X readbank=$%X\n",MapPage,(int)(uintptr_t)readbank)); - LOG_BANK_UPDATE(("PageRegsSet Task=%X Page=%x\n",m_TaskReg,Page)); - //LOG_BANK_UPDATE(("%X)\n",membank(Page+1))); - LOG_BANK_UPDATE(("memory_install_write8_handler CPU=0\n")); - LOG_BANK_UPDATE(("memory_install_write8_handler CPU=1\n")); + LOGMASKED(LOG_BANK_UPDATE, "UpdateBanks:MapPage=$%02X readbank=$%X\n",MapPage,(int)(uintptr_t)readbank); + LOGMASKED(LOG_BANK_UPDATE, "PageRegsSet Task=%X Page=%x\n",m_TaskReg,Page); + //LOGMASKED(LOG_BANK_UPDATE, "%X)\n",membank(Page+1)); + LOGMASKED(LOG_BANK_UPDATE, "memory_install_write8_handler CPU=0\n"); + LOGMASKED(LOG_BANK_UPDATE, "memory_install_write8_handler CPU=1\n"); } } @@ -184,7 +185,7 @@ void dgn_beta_state::SetDefaultTask() { int Idx; - LOG_DEFAULT_TASK(("SetDefaultTask()\n")); + LOGMASKED(LOG_DEFAULT_TASK, "SetDefaultTask()\n"); //if (VERBOSE) debug_console_printf(machine())->set_base("Set Default task\n"); m_TaskReg=NoPagingTask; @@ -229,7 +230,7 @@ void dgn_beta_state::dgn_beta_page_w(offs_t offset, uint8_t data) { m_PageRegs[m_PIATaskReg][offset].value=data; - LOG_PAGE_WRITE(("PageRegWrite : task=$%X offset=$%X value=$%X\n",m_PIATaskReg,offset,data)); + LOGMASKED(LOG_PAGE_WRITE, "PageRegWrite : task=$%X offset=$%X value=$%X\n",m_PIATaskReg,offset,data); if (m_EnableMapRegs) { @@ -332,7 +333,7 @@ uint8_t dgn_beta_state::d_pia0_pb_r() "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" }; - LOG_KEYBOARD(("PB Read\n")); + LOGMASKED(LOG_KEYBOARD,"PB Read\n"); m_KAny_next = 0; @@ -358,7 +359,7 @@ uint8_t dgn_beta_state::d_pia0_pb_r() RetVal = (m_KInDat_next<<5) | (m_KAny_next<<2); - LOG_KEYBOARD(("FC22=$%02X KAny=%d\n", RetVal, m_KAny_next)); + LOGMASKED(LOG_KEYBOARD,"FC22=$%02X KAny=%d\n", RetVal, m_KAny_next); return RetVal; } @@ -368,12 +369,12 @@ void dgn_beta_state::d_pia0_pb_w(uint8_t data) int InClkState; //int OutClkState; - LOG_KEYBOARD(("PB Write\n")); + LOGMASKED(LOG_KEYBOARD,"PB Write\n"); InClkState = data & KInClk; //OutClkState = data & KOutClk; - LOG_KEYBOARD(("InClkState=$%02X OldInClkState=$%02X Keyrow=$%02X ",InClkState,(m_d_pia0_pb_last & KInClk),m_Keyrow)); + LOGMASKED(LOG_KEYBOARD,"InClkState=$%02X OldInClkState=$%02X Keyrow=$%02X ",InClkState,(m_d_pia0_pb_last & KInClk),m_Keyrow); /* Input clock bit has changed state */ if ((InClkState) != (m_d_pia0_pb_last & KInClk)) @@ -383,7 +384,7 @@ void dgn_beta_state::d_pia0_pb_w(uint8_t data) { m_KInDat_next=(~m_Keyrow & 0x40)>>6; m_Keyrow = ((m_Keyrow<<1) | 0x01) & 0x7F ; - LOG_KEYBOARD(("Keyrow=$%02X KInDat_next=%X\n",m_Keyrow,m_KInDat_next)); + LOGMASKED(LOG_KEYBOARD,"Keyrow=$%02X KInDat_next=%X\n",m_Keyrow,m_KInDat_next); } } @@ -393,7 +394,7 @@ void dgn_beta_state::d_pia0_pb_w(uint8_t data) WRITE_LINE_MEMBER(dgn_beta_state::d_pia0_cb2_w) { int RowNo; - LOG_KEYBOARD(("\nCB2 Write\n")); + LOGMASKED(LOG_KEYBOARD,"\nCB2 Write\n"); /* load keyrow on rising edge of CB2 */ if((state==1) && (m_d_pia0_cb2_last==0)) @@ -405,7 +406,7 @@ WRITE_LINE_MEMBER(dgn_beta_state::d_pia0_cb2_w) /* In the beta the shift registers are a cmos 4015, and a cmos 4013 in series */ m_RowShifter = (m_RowShifter<<1) | ((m_d_pia0_pb_last & KOutDat)>>4); m_RowShifter &= 0x3FF; - LOG_KEYBOARD(("Rowshifter=$%02X Keyrow=$%02X\n",m_RowShifter,m_Keyrow)); + LOGMASKED(LOG_KEYBOARD,"Rowshifter=$%02X Keyrow=$%02X\n",m_RowShifter,m_Keyrow); if (VERBOSE) machine().debugger().console().printf("rowshifter clocked, value=%3X, RowNo=%d, Keyrow=%2X\n",m_RowShifter,RowNo,m_Keyrow); } @@ -452,7 +453,7 @@ void dgn_beta_state::d_pia1_pa_w(uint8_t data) else HALT_DMA = CLEAR_LINE; - LOG_HALT(("DMA_CPU HALT=%d\n", HALT_DMA)); + LOGMASKED(LOG_HALT, "DMA_CPU HALT=%d\n", HALT_DMA); m_dmacpu->set_input_line(INPUT_LINE_HALT, HALT_DMA); /* CPU un-halted let it run ! */ @@ -482,7 +483,7 @@ void dgn_beta_state::d_pia1_pa_w(uint8_t data) // not connected: bit 5 = ENP m_fdc->dden_w(BIT(data, 6)); - LOG_DISK(("Set density %s\n", BIT(data, 6) ? "low" : "high")); + LOGMASKED(LOG_DISK, "Set density %s\n", BIT(data, 6) ? "low" : "high"); } uint8_t dgn_beta_state::d_pia1_pb_r() @@ -503,7 +504,7 @@ void dgn_beta_state::d_pia1_pb_w(uint8_t data) else HALT_CPU = ASSERT_LINE; - LOG_HALT(("MAIN_CPU HALT=%d\n", HALT_CPU)); + LOGMASKED(LOG_HALT, "MAIN_CPU HALT=%d\n", HALT_CPU); m_maincpu->set_input_line(INPUT_LINE_HALT, HALT_CPU); m_d_pia1_pb_last = data & 0x02; @@ -545,7 +546,7 @@ void dgn_beta_state::d_pia2_pa_w(uint8_t data) int OldEnableMap; int NMI; - LOG_TASK(("FCC0 write : $%02X\n", data)); + LOGMASKED(LOG_TASK, "FCC0 write : $%02X\n", data); /* Bit 7 of $FFC0, seems to control NMI on second CPU */ NMI=(data & 0x80); @@ -553,7 +554,7 @@ void dgn_beta_state::d_pia2_pa_w(uint8_t data) /* only take action if NMI changed */ if(NMI != m_DMA_NMI_LAST) { - LOG_INTS(("cpu1 NMI : %d\n", NMI)); + LOGMASKED(LOG_INTS, "cpu1 NMI : %d\n", NMI); if(!NMI) { m_dmacpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); @@ -579,7 +580,7 @@ void dgn_beta_state::d_pia2_pa_w(uint8_t data) OldTask = m_PIATaskReg; m_PIATaskReg = data & 0x0F; - LOG_TASK(("OldTask=$%02X EnableMapRegs=%d OldEnableMap=%d\n", OldTask, m_EnableMapRegs, OldEnableMap)); + LOGMASKED(LOG_TASK, "OldTask=$%02X EnableMapRegs=%d OldEnableMap=%d\n", OldTask, m_EnableMapRegs, OldEnableMap); // Mapping was enabled or disabled, select appropriate task reg // and map it in @@ -601,7 +602,7 @@ void dgn_beta_state::d_pia2_pa_w(uint8_t data) UpdateBanks(0, IOPage + 1); } } - LOG_TASK(("TaskReg=$%02X PIATaskReg=$%02X\n", m_TaskReg, m_PIATaskReg)); + LOGMASKED(LOG_TASK, "TaskReg=$%02X PIATaskReg=$%02X\n", m_TaskReg, m_PIATaskReg); } uint8_t dgn_beta_state::d_pia2_pb_r() @@ -642,7 +643,7 @@ void dgn_beta_state::cpu0_recalc_irq(int state) IRQ = CLEAR_LINE; m_maincpu->set_input_line(M6809_IRQ_LINE, IRQ); - LOG_INTS(("cpu0 IRQ : %d\n", IRQ)); + LOGMASKED(LOG_INTS, "cpu0 IRQ : %d\n", IRQ); } void dgn_beta_state::cpu0_recalc_firq(int state) @@ -657,7 +658,7 @@ void dgn_beta_state::cpu0_recalc_firq(int state) m_maincpu->set_input_line(M6809_FIRQ_LINE, FIRQ); - LOG_INTS(("cpu0 FIRQ : %d\n", FIRQ)); + LOGMASKED(LOG_INTS, "cpu0 FIRQ : %d\n", FIRQ); } /* CPU 1 */ @@ -665,7 +666,7 @@ void dgn_beta_state::cpu0_recalc_firq(int state) void dgn_beta_state::cpu1_recalc_firq(int state) { m_dmacpu->set_input_line(M6809_FIRQ_LINE, state); - LOG_INTS(("cpu1 FIRQ : %d\n",state)); + LOGMASKED(LOG_INTS, "cpu1 FIRQ : %d\n",state); } /********************************************************************************************/ @@ -675,7 +676,7 @@ void dgn_beta_state::cpu1_recalc_firq(int state) /* The INTRQ line goes through pia2 ca1, in exactly the same way as DRQ from DragonDos does */ WRITE_LINE_MEMBER( dgn_beta_state::dgnbeta_fdc_intrq_w ) { - LOG_DISK(("dgnbeta_fdc_intrq_w(%d)\n", state)); + LOGMASKED(LOG_DISK, "dgnbeta_fdc_intrq_w(%d)\n", state); if(m_wd2797_written) m_pia_2->ca1_w(state); @@ -684,7 +685,7 @@ WRITE_LINE_MEMBER( dgn_beta_state::dgnbeta_fdc_intrq_w ) /* DRQ is routed through various logic to the FIRQ interrupt line on *BOTH* CPUs */ WRITE_LINE_MEMBER( dgn_beta_state::dgnbeta_fdc_drq_w ) { - LOG_DISK(("dgnbeta_fdc_drq_w(%d)\n", state)); + LOGMASKED(LOG_DISK, "dgnbeta_fdc_drq_w(%d)\n", state); cpu1_recalc_firq(state); } @@ -712,7 +713,7 @@ void dgn_beta_state::ScanInKeyboard(void) "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" }; - LOG_KEYBOARD(("Scanning Host keyboard\n")); + LOGMASKED(LOG_KEYBOARD,"Scanning Host keyboard\n"); for(Idx=0; Idxcb2_w(CLEAR_LINE); -// LOG_VIDEO(("Vblank\n")); +// LOGMASKED(LOG_VIDEO, "Vblank\n"); ScanInKeyboard(); } diff --git a/src/mame/ultratec/minicom.cpp b/src/mame/ultratec/minicom.cpp index 25cafc478c3..3b97ce77edb 100644 --- a/src/mame/ultratec/minicom.cpp +++ b/src/mame/ultratec/minicom.cpp @@ -37,16 +37,20 @@ Segment data is sent to each 14seg digit by first writing half of the data to po * Initial driver skeleton */ -#define LOG_IO_PORTS 0 -#define PRINTER_ATTACHED 1 - #include "emu.h" #include "cpu/mcs51/mcs51.h" #include "minicom.lh" +#define LOG_IO_PORTS (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" + namespace { +#define PRINTER_ATTACHED 1 + class minicom_state : public driver_device { public: @@ -114,12 +118,12 @@ uint8_t minicom_state::i87c52_p2_r() return 1; //to skip the "NO POWER" warning. I'm not sure why. } -#if LOG_IO_PORTS -static void printbits(uint8_t v) { - int i; - for(i = 7; i >= 0; i--) putchar('0' + ((v >> i) & 1)); +static void printbits(uint8_t v, char *buf) +{ + for (int i = 7; i >= 0; i--) + buf[7 - i] = '0' + BIT(v, i); + buf[8] = '\0'; } -#endif #define FALLING_EDGE(old_data, new_data, bit) (BIT(old_data ^ new_data, bit) && !BIT(new_data, bit)) #define RISING_EDGE(old_data, new_data, bit) (BIT(old_data ^ new_data, bit) && BIT(new_data, bit)) @@ -149,15 +153,13 @@ void minicom_state::i87c52_p1_w(uint8_t data) { if (data != m_p[1]) { -#if LOG_IO_PORTS uint8_t changed = m_p[1] ^ data; if (changed ^ P1_UNKNOWN_BITS) { - printf("Write to P1: %02X changed: ( ) (", data); - printbits(changed); - printf(") ( ) ( )\n"); + char bitbuf[9]; + printbits(changed, bitbuf); + LOGMASKED(LOG_IO_PORTS, "Write to P1: %02X changed: ( ) (%s) ( ) ( )\n", data, bitbuf); } -#endif if (FALLING_EDGE(m_p[1], data, 2)) { m_digit_index--; @@ -171,15 +173,13 @@ void minicom_state::i87c52_p2_w(uint8_t data) { if (data != m_p[2]) { -#if LOG_IO_PORTS uint8_t changed = m_p[2] ^ data; if (changed ^ P2_UNKNOWN_BITS) { - printf("Write to P2: %02X changed: ( ) ( ) (", data); - printbits(changed); - printf(") ( )\n"); + char bitbuf[9]; + printbits(changed, bitbuf); + LOGMASKED(LOG_IO_PORTS, "Write to P2: %02X changed: ( ) ( ) (%s) ( )\n", data, bitbuf); } -#endif m_p[2] = data; } } @@ -189,14 +189,12 @@ void minicom_state::i87c52_p3_w(uint8_t data) if (data != m_p[3]) { uint8_t changed = m_p[3] ^ data; -#if LOG_IO_PORTS if (changed ^ P3_UNKNOWN_BITS) { - printf("Write to P3: %02X changed: ( ) ( ) ( ) (", data); - printbits(changed); - printf(")\n"); + char bitbuf[9]; + printbits(changed, bitbuf); + LOGMASKED(LOG_IO_PORTS, "Write to P3: %02X changed: ( ) ( ) ( ) (%s)\n", data, bitbuf); } -#endif if (FALLING_EDGE(m_p[3], data, 4)) //P3.4 = T0 { diff --git a/src/mame/unisys/univac.cpp b/src/mame/unisys/univac.cpp index 317450d130a..a3e9a9acc6a 100644 --- a/src/mame/unisys/univac.cpp +++ b/src/mame/unisys/univac.cpp @@ -109,7 +109,6 @@ After entering the characters, press FCTN and CTRL PAGE keys again to save the s #include "screen.h" #include "speaker.h" -#define LOG_GENERAL (1U << 0) #define LOG_PARITY (1U << 1) #define LOG_NVRAM (1U << 2) diff --git a/src/mame/ussr/dvk_kcgd.cpp b/src/mame/ussr/dvk_kcgd.cpp index d55fd45478f..8aefc8daa27 100644 --- a/src/mame/ussr/dvk_kcgd.cpp +++ b/src/mame/ussr/dvk_kcgd.cpp @@ -45,9 +45,8 @@ #include "screen.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_VRAM (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_VRAM (1U << 1) +#define LOG_DEBUG (1U << 2) //#define VERBOSE (LOG_DEBUG) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/ussr/dvk_ksm.cpp b/src/mame/ussr/dvk_ksm.cpp index 25d6cbb31d5..430cacc5389 100644 --- a/src/mame/ussr/dvk_ksm.cpp +++ b/src/mame/ussr/dvk_ksm.cpp @@ -65,9 +65,8 @@ ksm|DVK KSM, #include "screen.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_KEYBOARD (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_KEYBOARD (1U << 1) +#define LOG_DEBUG (1U << 2) //#define VERBOSE (LOG_DEBUG) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/ussr/km035.cpp b/src/mame/ussr/km035.cpp index c233717a9c6..cd96fa9e5fa 100644 --- a/src/mame/ussr/km035.cpp +++ b/src/mame/ussr/km035.cpp @@ -12,8 +12,7 @@ #include "speaker.h" -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_DEBUG (1U << 1) +#define LOG_DEBUG (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_DEBUG) //#define LOG_OUTPUT_FUNC printf diff --git a/src/mame/ussr/mk98.cpp b/src/mame/ussr/mk98.cpp index f462dacf2e5..2fde130bccd 100644 --- a/src/mame/ussr/mk98.cpp +++ b/src/mame/ussr/mk98.cpp @@ -49,8 +49,8 @@ #include "speaker.h" -#define LOG_KEYBOARD (1U << 1) -#define LOG_DEBUG (1U << 2) +#define LOG_KEYBOARD (1U << 1) +#define LOG_DEBUG (1U << 2) #define VERBOSE (LOG_GENERAL|LOG_DEBUG) //#define LOG_OUTPUT_FUNC printf diff --git a/src/mame/ussr/ms0515.cpp b/src/mame/ussr/ms0515.cpp index 31a56a7e621..511eec1be0f 100644 --- a/src/mame/ussr/ms0515.cpp +++ b/src/mame/ussr/ms0515.cpp @@ -49,9 +49,8 @@ #include "ms0515.lh" -#define LOG_GENERAL (1U << 0) -#define LOG_BANK (1U << 1) -#define LOG_SYSREG (1U << 2) +#define LOG_BANK (1U << 1) +#define LOG_SYSREG (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_BANK | LOG_SYSREG) //#define LOG_OUTPUT_FUNC osd_printf_info diff --git a/src/mame/valadon/tankbust.cpp b/src/mame/valadon/tankbust.cpp index 50e673a84b8..7db0d323a72 100644 --- a/src/mame/valadon/tankbust.cpp +++ b/src/mame/valadon/tankbust.cpp @@ -30,9 +30,9 @@ To do: // configurable logging -#define LOG_SCROLL (1U << 1) -#define LOG_SOUND (1U << 2) -#define LOG_E0XX (1U << 3) +#define LOG_SCROLL (1U << 1) +#define LOG_SOUND (1U << 2) +#define LOG_E0XX (1U << 3) //#define VERBOSE (LOG_GENERAL | LOG_SCROLL | LOG_SOUND | LOG_E0XX) diff --git a/src/mame/votrax/votrhv.cpp b/src/mame/votrax/votrhv.cpp index 5e19b386555..89a8b4c3614 100644 --- a/src/mame/votrax/votrhv.cpp +++ b/src/mame/votrax/votrhv.cpp @@ -60,10 +60,9 @@ // defines -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_INPUT (1U << 1) -#define LOG_LATCHX (1U << 2) -#define LOG_LATCHY (1U << 3) +#define LOG_INPUT (1U << 1) +#define LOG_LATCHX (1U << 2) +#define LOG_LATCHY (1U << 3) #define VERBOSE (LOG_GENERAL) //#define LOG_OUTPUT_FUNC printf @@ -71,7 +70,6 @@ namespace { -#define LOGGEN(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) #define LOGINP(...) LOGMASKED(LOG_INPUT, __VA_ARGS__) #define LOGLTX(...) LOGMASKED(LOG_LATCHX, __VA_ARGS__) #define LOGLTY(...) LOGMASKED(LOG_LATCHY, __VA_ARGS__) diff --git a/src/mame/vtech/iqunlim.cpp b/src/mame/vtech/iqunlim.cpp index b56f813c92b..e8e8f642e8c 100644 --- a/src/mame/vtech/iqunlim.cpp +++ b/src/mame/vtech/iqunlim.cpp @@ -62,10 +62,10 @@ A4 = MAX232 #include "screen.h" #include "softlist_dev.h" -#define LOG_CARD_A_READ (1 << 1u) -#define LOG_CARD_A_WRITE (1 << 2u) -#define LOG_CARD_B_READ (1 << 3u) -#define LOG_CARD_B_WRITE (1 << 4u) +#define LOG_CARD_A_READ (1U << 1) +#define LOG_CARD_A_WRITE (1U << 2) +#define LOG_CARD_B_READ (1U << 3) +#define LOG_CARD_B_WRITE (1U << 4) #define LOG_ALL (LOG_CARD_A_READ | LOG_CARD_A_WRITE | LOG_CARD_B_READ | LOG_CARD_B_WRITE) #define VERBOSE (LOG_ALL) diff --git a/src/mame/vtech/vtech1.cpp b/src/mame/vtech/vtech1.cpp index c075be7e2e0..ed560daf137 100644 --- a/src/mame/vtech/vtech1.cpp +++ b/src/mame/vtech/vtech1.cpp @@ -46,6 +46,11 @@ Todo: #include "formats/imageutl.h" #include "formats/vt_cas.h" +#define LOG_VTECH1_LATCH (1U << 1) + +#define VERBOSE (0) +#include "logmacro.h" + namespace { @@ -53,8 +58,6 @@ namespace { CONSTANTS & MACROS ***************************************************************************/ -#define LOG_VTECH1_LATCH 0 - #define VTECH1_CLK 3579500 #define VZ300_XTAL1_CLK XTAL(17'734'470) @@ -266,8 +269,7 @@ uint8_t vtech1_base_state::keyboard_r(offs_t offset) void vtech1_base_state::latch_w(uint8_t data) { - if (LOG_VTECH1_LATCH) - logerror("vtech1_latch_w $%02X\n", data); + LOGMASKED(LOG_VTECH1_LATCH, "vtech1_latch_w $%02X\n", data); // bit 2, cassette out (actually bits 1 and 2 perform this function, so either can be used) m_cassette->output( BIT(data, 2) ? 1.0 : -1.0); diff --git a/src/mame/wing/pinkiri8.cpp b/src/mame/wing/pinkiri8.cpp index 6e0a5c9cf0a..550d3d86d95 100644 --- a/src/mame/wing/pinkiri8.cpp +++ b/src/mame/wing/pinkiri8.cpp @@ -45,6 +45,13 @@ Dumped by Chackn #include "screen.h" #include "speaker.h" +#define LOG_VRAM (1U << 1) + +#define VERBOSE (0) +//#define LOG_OUTPUT_FUNC printf +#include "logmacro.h" + + /* VDP device to give us our own memory map */ class janshi_vdp_device : public device_t, public device_memory_interface { @@ -407,33 +414,31 @@ void pinkiri8_state::output_regs_w(uint8_t data) } -#define LOG_VRAM 0 - void pinkiri8_state::pinkiri8_vram_w(offs_t offset, uint8_t data) { switch(offset) { case 0: m_vram_addr = (data << 0) | (m_vram_addr&0xffff00); - if (LOG_VRAM) printf("\n prev writes was %04x\n\naddress set to %04x -\n", m_prev_writes, m_vram_addr ); + LOGMASKED(LOG_VRAM, "\n prev writes was %04x\n\naddress set to %04x -\n", m_prev_writes, m_vram_addr); m_prev_writes = 0; break; case 1: m_vram_addr = (data << 8) | (m_vram_addr & 0xff00ff); - if (LOG_VRAM)printf("\naddress set to %04x\n", m_vram_addr); + LOGMASKED(LOG_VRAM, "\naddress set to %04x\n", m_vram_addr); break; case 2: m_vram_addr = (data << 16) | (m_vram_addr & 0x00ffff); - if (LOG_VRAM)printf("\naddress set to %04x\n", m_vram_addr); + LOGMASKED(LOG_VRAM, "\naddress set to %04x\n", m_vram_addr); break; case 3: { address_space &vdp_space = m_vdp->space(); - if (LOG_VRAM) printf("%02x ", data); + LOGMASKED(LOG_VRAM, "%02x ", data); m_prev_writes++; m_vram_addr++; diff --git a/src/mame/wing/superwng.cpp b/src/mame/wing/superwng.cpp index e1601aaf925..b638c767327 100644 --- a/src/mame/wing/superwng.cpp +++ b/src/mame/wing/superwng.cpp @@ -46,7 +46,7 @@ TODO: // configurable logging -#define LOG_UNKWRITE (1U << 1) +#define LOG_UNKWRITE (1U << 1) //#define VERBOSE (LOG_GENERAL | LOG_UNKWRITE) diff --git a/src/mame/yamaha/ymdx7.cpp b/src/mame/yamaha/ymdx7.cpp index f1aafad8737..1da6ceb48c2 100755 --- a/src/mame/yamaha/ymdx7.cpp +++ b/src/mame/yamaha/ymdx7.cpp @@ -38,7 +38,6 @@ #include "emupal.h" #include "screen.h" -#define LOG_GENERAL (1U << 0) #define LOG_OPS (1U << 1) #define LOG_EGS (1U << 2) @@ -135,18 +134,18 @@ private: void yamaha_dx7_state::dx7_acept_w(offs_t address, u8 data) { m_acept++; - LOGMASKED(LOG_GENERAL, "ACEPT reg:0x%x = 0x%x \n", address, data); + LOG("ACEPT reg:0x%x = 0x%x \n", address, data); m_irq0 = 1; m_maincpu->set_input_line(M6800_IRQ_LINE, CLEAR_LINE); } u8 yamaha_dx7_state::dx7_p1_r(offs_t) { - LOGMASKED(LOG_GENERAL, "reading PORT1\n"); + LOG("reading PORT1\n"); return m_PORT1; } u8 yamaha_dx7_state::dx7_p2_r(offs_t) { - LOGMASKED(LOG_GENERAL, "reading PORT2\n"); + LOG("reading PORT2\n"); u8 temp = 0; //P0 is WRITE! does the CPU re-reads its OWN data? can it? if(m_irq0) { @@ -163,7 +162,7 @@ u8 yamaha_dx7_state::dx7_p2_r(offs_t) } void yamaha_dx7_state::dx7_p2_w(offs_t offset, u8 data) { - LOGMASKED(LOG_GENERAL, "W PORT2 0x%x\n", data); + LOG("W PORT2 0x%x\n", data); m_PORT2 = data; } diff --git a/src/mame/yunsung/paradise.cpp b/src/mame/yunsung/paradise.cpp index a4319bf23fb..b7a6fc3e605 100644 --- a/src/mame/yunsung/paradise.cpp +++ b/src/mame/yunsung/paradise.cpp @@ -102,8 +102,8 @@ sticker from Jan 95 and factory sticker 94*41. #include "tilemap.h" // configurable logging -#define LOG_CPUBANK (1U << 1) -#define LOG_OKIBANK (1U << 2) +#define LOG_CPUBANK (1U << 1) +#define LOG_OKIBANK (1U << 2) //#define VERBOSE (LOG_GENERAL | LOG_CPUBANK | LOG_OKIBANK) -- cgit v1.2.3