Permalink
Browse files

memory: Remove support for decrypted bases, use an address space inst…

…ead [O. Galibert]
  • Loading branch information...
galibert committed Jun 4, 2015
1 parent d1583b9 commit 88949a5b47798b3c82851c31b6f801e4fb8ca06f
Showing with 3,441 additions and 3,018 deletions.
  1. +2 −2 docs/m6502.txt
  2. +1 −1 src/emu/cpu/8x300/8x300.c
  3. +1 −1 src/emu/cpu/adsp2100/adsp2100.c
  4. +2 −2 src/emu/cpu/alph8201/alph8201.h
  5. +2 −2 src/emu/cpu/am29000/am29000.c
  6. +1 −1 src/emu/cpu/arm/arm.c
  7. +2 −2 src/emu/cpu/arm7/arm7.c
  8. +5 −5 src/emu/cpu/arm7/arm7drc.inc
  9. +1 −1 src/emu/cpu/asap/asap.c
  10. +1 −1 src/emu/cpu/ccpu/ccpu.c
  11. +1 −1 src/emu/cpu/cop400/cop400.c
  12. +1 −1 src/emu/cpu/cosmac/cosmac.c
  13. +3 −3 src/emu/cpu/cubeqcpu/cubeqcpu.c
  14. +1 −1 src/emu/cpu/dsp16/dsp16.c
  15. +1 −1 src/emu/cpu/dsp32/dsp32.c
  16. +1 −1 src/emu/cpu/dsp56k/dsp56k.c
  17. +1 −1 src/emu/cpu/e132xs/e132xs.h
  18. +1 −1 src/emu/cpu/esrip/esrip.c
  19. +6 −6 src/emu/cpu/f8/f8.c
  20. +2 −2 src/emu/cpu/h6280/h6280.c
  21. +1 −1 src/emu/cpu/h8/h8.c
  22. +1 −1 src/emu/cpu/hphybrid/hphybrid.c
  23. +3 −3 src/emu/cpu/i386/i386priv.h
  24. +3 −3 src/emu/cpu/i4004/i4004.c
  25. +2 −2 src/emu/cpu/i8008/i8008.c
  26. +4 −4 src/emu/cpu/i8085/i8085.c
  27. +2 −2 src/emu/cpu/i86/i186.c
  28. +2 −2 src/emu/cpu/i86/i286.c
  29. +2 −2 src/emu/cpu/i86/i86.c
  30. +5 −5 src/emu/cpu/i960/i960.c
  31. +2 −2 src/emu/cpu/ie15/ie15.c
  32. +1 −1 src/emu/cpu/jaguar/jaguar.c
  33. +1 −1 src/emu/cpu/lc8670/lc8670.c
  34. +67 −67 src/emu/cpu/lh5801/5801tbl.inc
  35. +2 −2 src/emu/cpu/m37710/m37710cm.h
  36. +7 −1 src/emu/cpu/m6502/deco16.c
  37. +11 −8 src/emu/cpu/m6502/m4510.c
  38. +4 −4 src/emu/cpu/m6502/m4510.h
  39. +27 −15 src/emu/cpu/m6502/m6502.c
  40. +12 −12 src/emu/cpu/m6502/m6502.h
  41. +2 −2 src/emu/cpu/m6502/m6502make.py
  42. +9 −8 src/emu/cpu/m6502/m6504.c
  43. +4 −4 src/emu/cpu/m6502/m6504.h
  44. +9 −7 src/emu/cpu/m6502/m6509.c
  45. +4 −4 src/emu/cpu/m6502/m6509.h
  46. +18 −8 src/emu/cpu/m6502/m6510.c
  47. +4 −4 src/emu/cpu/m6502/m6510.h
  48. +7 −7 src/emu/cpu/m6502/n2a03.c
  49. +4 −4 src/emu/cpu/m6502/n2a03.h
  50. +6 −6 src/emu/cpu/m6502/odeco16.lst
  51. +14 −14 src/emu/cpu/m6502/om6502.lst
  52. +5 −5 src/emu/cpu/m6502/om65c02.lst
  53. +4 −4 src/emu/cpu/m6502/om65ce02.lst
  54. +7 −7 src/emu/cpu/m6502/om740.lst
  55. +17 −2 src/emu/cpu/m6800/m6800.c
  56. +4 −3 src/emu/cpu/m6800/m6800.h
  57. +9 −13 src/emu/cpu/m68000/m68000.h
  58. +46 −40 src/emu/cpu/m68000/m68kcpu.c
  59. +3 −12 src/emu/cpu/m68000/m68kcpu.h
  60. +2 −2 src/emu/cpu/m6805/m6805.c
  61. +0 −3 src/emu/cpu/m6809/hd6309.ops
  62. +36 −4 src/emu/cpu/m6809/m6809.c
  63. +29 −9 src/emu/cpu/m6809/m6809.h
  64. +0 −3 src/emu/cpu/m6809/m6809.ops
  65. +0 −42 src/emu/cpu/m6809/m6809inl.h
  66. +1 −1 src/emu/cpu/mb86233/mb86233.c
  67. +1 −1 src/emu/cpu/mb88xx/mb88xx.c
  68. +2 −2 src/emu/cpu/mc68hc11/mc68hc11.c
  69. +2 −2 src/emu/cpu/mcs48/mcs48.c
  70. +3 −3 src/emu/cpu/mcs51/mcs51.c
  71. +1 −1 src/emu/cpu/mcs96/mcs96.h
  72. +1 −1 src/emu/cpu/mips/mips3.c
  73. +6 −6 src/emu/cpu/mips/mips3drc.c
  74. +1 −1 src/emu/cpu/mips/mips3fe.c
  75. +1 −1 src/emu/cpu/mips/r3000.c
  76. +2 −2 src/emu/cpu/nec/nec.c
  77. +2 −2 src/emu/cpu/nec/v25.c
  78. +1 −1 src/emu/cpu/pic16c5x/pic16c5x.c
  79. +1 −1 src/emu/cpu/pic16c62x/pic16c62x.c
  80. +4 −4 src/emu/cpu/powerpc/ppcdrc.c
  81. +1 −1 src/emu/cpu/powerpc/ppcfe.c
  82. +2 −2 src/emu/cpu/pps4/pps4.c
  83. +4 −4 src/emu/cpu/psx/psx.c
  84. +5 −5 src/emu/cpu/rsp/rspdrc.c
  85. +1 −1 src/emu/cpu/rsp/rspfe.c
  86. +2 −2 src/emu/cpu/s2650/s2650.c
  87. +2 −2 src/emu/cpu/saturn/satops.inc
  88. +4 −4 src/emu/cpu/sc61860/scops.inc
  89. +2 −2 src/emu/cpu/scmp/scmp.c
  90. +1 −1 src/emu/cpu/score/score.c
  91. +1 −1 src/emu/cpu/se3208/se3208.c
  92. +13 −1 src/emu/cpu/sh2/sh2.c
  93. +3 −3 src/emu/cpu/sh2/sh2.h
  94. +4 −4 src/emu/cpu/sh2/sh2drc.c
  95. +1 −1 src/emu/cpu/sh2/sh2fe.c
  96. +6 −6 src/emu/cpu/sh4/sh4.c
  97. +1 −1 src/emu/cpu/ssp1601/ssp1601.c
  98. +1 −1 src/emu/cpu/t11/t11.c
  99. +2 −2 src/emu/cpu/tms32010/tms32010.c
  100. +2 −2 src/emu/cpu/tms32025/tms32025.c
  101. +1 −1 src/emu/cpu/tms32031/tms32031.c
  102. +1 −1 src/emu/cpu/tms32051/tms32051.c
  103. +1 −1 src/emu/cpu/tms32082/tms32082.c
  104. +3 −3 src/emu/cpu/tms34010/34010ops.c
  105. +5 −5 src/emu/cpu/tms34010/tms34010.c
  106. +1 −1 src/emu/cpu/tms7000/tms7000.c
  107. +2 −2 src/emu/cpu/tms7000/tms7000.h
  108. +1 −1 src/emu/cpu/upd7725/upd7725.c
  109. +2 −2 src/emu/cpu/upd7810/upd7810_macros.h
  110. +2 −2 src/emu/cpu/v30mz/v30mz.c
  111. +10 −10 src/emu/cpu/v60/v60.c
  112. +1 −1 src/emu/cpu/v810/v810.c
  113. +15 −0 src/emu/cpu/z180/z180.c
  114. +4 −1 src/emu/cpu/z180/z180.h
  115. +1 −1 src/emu/cpu/z180/z180dd.inc
  116. +1 −1 src/emu/cpu/z180/z180ed.inc
  117. +3 −3 src/emu/cpu/z180/z180ops.h
  118. +1 −1 src/emu/cpu/z8/z8.c
  119. +2 −2 src/emu/cpu/z8/z8ops.inc
  120. +20 −5 src/emu/cpu/z80/z80.c
  121. +5 −2 src/emu/cpu/z80/z80.h
  122. +11 −7 src/emu/debug/debugcmd.c
  123. +18 −22 src/emu/debug/debugcpu.c
  124. +1 −1 src/emu/debug/debugcpu.h
  125. +11 −10 src/emu/debug/dvdisasm.c
  126. +1 −0 src/emu/debug/dvdisasm.h
  127. +1 −0 src/emu/devcpu.h
  128. +8 −0 src/emu/dimemory.h
  129. +1 −1 src/emu/machine/6821pia.c
  130. +1 −1 src/emu/machine/68307.c
  131. +1 −2 src/emu/mconfig.h
  132. +10 −112 src/emu/memory.c
  133. +30 −83 src/emu/memory.h
  134. +1 −1 src/emu/sound/bsmt2000.c
  135. +2 −2 src/emu/sound/c352.c
  136. +2 −2 src/emu/sound/es5503.c
  137. +2 −2 src/emu/sound/multipcm.c
  138. +7 −7 src/emu/sound/okim6295.c
  139. +17 −17 src/emu/sound/okim9810.c
  140. +22 −22 src/emu/sound/qs1000.c
  141. +9 −9 src/emu/sound/ymf278b.c
  142. +0 −2 src/emu/validity.c
  143. +68 −31 src/mame/audio/seibu.c
  144. +26 −1 src/mame/audio/seibu.h
  145. +1 −1 src/mame/audio/turrett.c
  146. +17 −4 src/mame/drivers/angelkds.c
  147. +47 −3 src/mame/drivers/appoooh.c
  148. +5 −1 src/mame/drivers/boogwing.c
  149. +14 −22 src/mame/drivers/cabal.c
  150. +13 −5 src/mame/drivers/calorie.c
  151. +13 −1 src/mame/drivers/cbasebal.c
  152. +127 −49 src/mame/drivers/cclimber.c
  153. +15 −4 src/mame/drivers/chinsan.c
  154. +1 −2 src/mame/drivers/circusc.c
  155. +20 −29 src/mame/drivers/commando.c
  156. +17 −4 src/mame/drivers/cps1.c
  157. +9 −4 src/mame/drivers/cps2.c
  158. +9 −48 src/mame/drivers/cps3.c
  159. +18 −16 src/mame/drivers/cshooter.c
  160. +7 −4 src/mame/drivers/darkmist.c
  161. +9 −2 src/mame/drivers/dblewing.c
  162. +1 −2 src/mame/drivers/deadang.c
  163. +6 −1 src/mame/drivers/dietgo.c
  164. +1 −1 src/mame/drivers/dynduke.c
  165. +1 −2 src/mame/drivers/finalizr.c
  166. +48 −32 src/mame/drivers/freekick.c
  167. +0 −6 src/mame/drivers/funworld.c
  168. +23 −18 src/mame/drivers/galaxian.c
  169. +1 −2 src/mame/drivers/gyruss.c
  170. +1 −2 src/mame/drivers/hyperspt.c
  171. +13 −5 src/mame/drivers/igs017.c
  172. +15 −12 src/mame/drivers/jack.c
  173. +1 −3 src/mame/drivers/jailbrek.c
  174. +41 −6 src/mame/drivers/jongkyo.c
  175. +1 −4 src/mame/drivers/junofrst.c
  176. +14 −16 src/mame/drivers/kchamp.c
  177. +11 −7 src/mame/drivers/ladybug.c
  178. +17 −15 src/mame/drivers/liberate.c
  179. +1 −2 src/mame/drivers/megazone.c
  180. +38 −38 src/mame/drivers/mitchell.c
  181. +10 −10 src/mame/drivers/mouser.c
  182. +1 −3 src/mame/drivers/mustache.c
  183. +16 −7 src/mame/drivers/ninjakd2.c
  184. +40 −37 src/mame/drivers/pacman.c
  185. +43 −12 src/mame/drivers/pbaction.c
  186. +39 −10 src/mame/drivers/pengo.c
  187. +6 −1 src/mame/drivers/pktgaldx.c
  188. +9 −7 src/mame/drivers/raiden.c
  189. +2 −5 src/mame/drivers/rocnrope.c
  190. +12 −6 src/mame/drivers/sbasketb.c
  191. +6 −0 src/mame/drivers/scramble.c
  192. +107 −17 src/mame/drivers/segae.c
  193. +61 −3 src/mame/drivers/segag80r.c
  194. +14 −8 src/mame/drivers/segahang.c
  195. +1 −1 src/mame/drivers/segaorun.c
  196. +63 −2 src/mame/drivers/segas16a.c
  197. +30 −20 src/mame/drivers/segas16b.c
  198. +7 −7 src/mame/drivers/segas18.c
  199. +21 −33 src/mame/drivers/seicross.c
  200. +73 −23 src/mame/drivers/senjyo.c
  201. +40 −7 src/mame/drivers/sg1000a.c
  202. +6 −0 src/mame/drivers/stfight.c
  203. +31 −18 src/mame/drivers/suna8.c
  204. +30 −5 src/mame/drivers/suprloco.c
  205. +825 −119 src/mame/drivers/system1.c
  206. +20 −21 src/mame/drivers/system16.c
  207. +0 −3 src/mame/drivers/tcl.c
  208. +15 −14 src/mame/drivers/toki.c
  209. +6 −13 src/mame/drivers/trackfld.c
  210. +27 −3 src/mame/drivers/turbo.c
  211. +30 −26 src/mame/drivers/wiz.c
  212. +98 −35 src/mame/drivers/zaxxon.c
  213. +3 −1 src/mame/includes/angelkds.h
  214. +3 −1 src/mame/includes/appoooh.h
  215. +3 −1 src/mame/includes/boogwing.h
  216. +4 −2 src/mame/includes/cclimber.h
  217. +3 −1 src/mame/includes/commando.h
  218. +4 −1 src/mame/includes/cps1.h
  219. +5 −5 src/mame/includes/cps3.h
  220. +3 −1 src/mame/includes/darkmist.h
  221. +1 −1 src/mame/includes/decocrpt.h
  222. +3 −1 src/mame/includes/dietgo.h
  223. +4 −1 src/mame/includes/freekick.h
  224. +3 −1 src/mame/includes/galaxian.h
  225. +3 −1 src/mame/includes/jack.h
  226. +4 −2 src/mame/includes/kchamp.h
  227. +3 −1 src/mame/includes/ladybug.h
  228. +3 −1 src/mame/includes/liberate.h
  229. +2 −2 src/mame/includes/mitchell.h
  230. +3 −1 src/mame/includes/mouser.h
  231. +3 −1 src/mame/includes/ninjakd2.h
  232. +3 −1 src/mame/includes/pacman.h
  233. +3 −1 src/mame/includes/pbaction.h
  234. +3 −1 src/mame/includes/pktgaldx.h
  235. +3 −1 src/mame/includes/segag80r.h
  236. +3 −1 src/mame/includes/segahang.h
  237. +2 −0 src/mame/includes/segas16a.h
  238. +3 −1 src/mame/includes/segas16b.h
  239. +3 −1 src/mame/includes/seicross.h
  240. +3 −1 src/mame/includes/senjyo.h
  241. +3 −1 src/mame/includes/stfight.h
  242. +3 −1 src/mame/includes/suprloco.h
  243. +13 −1 src/mame/includes/system1.h
  244. +3 −1 src/mame/includes/system16.h
  245. +2 −0 src/mame/includes/turbo.h
  246. +3 −1 src/mame/includes/wiz.h
  247. +3 −1 src/mame/includes/zaxxon.h
  248. +2 −7 src/mame/machine/cclimber.c
  249. +3 −10 src/mame/machine/cps2crpt.c
  250. +2 −10 src/mame/machine/deco102.c
  251. +4 −4 src/mame/machine/deco222.c
  252. +2 −2 src/mame/machine/deco222.h
  253. +3 −3 src/mame/machine/decocpu6.c
  254. +1 −1 src/mame/machine/decocpu6.h
  255. +2 −2 src/mame/machine/decocpu7.c
  256. +1 −1 src/mame/machine/decocpu7.h
  257. +8 −7 src/mame/machine/fd1089.c
  258. +1 −1 src/mame/machine/fd1089.h
  259. +19 −13 src/mame/machine/fd1094.c
  260. +2 −0 src/mame/machine/fd1094.h
  261. +1 −1 src/mame/machine/fddebug.c
  262. +26 −47 src/mame/machine/kabuki.c
  263. +15 −15 src/mame/machine/kabuki.h
  264. +31 −41 src/mame/machine/konami1.c
  265. +25 −2 src/mame/machine/konami1.h
  266. +5 −34 src/mame/machine/mc8123.c
  267. +3 −3 src/mame/machine/mc8123.h
  268. +2 −2 src/mame/machine/scramble.c
  269. +5 −199 src/mame/machine/segacrp2.c
  270. +5 −8 src/mame/machine/segacrp2.h
  271. +13 −830 src/mame/machine/segacrpt.c
  272. +2 −25 src/mame/machine/segacrpt.h
  273. +13 −5 src/mame/machine/segaic16.c
  274. +5 −3 src/mame/machine/segaic16.h
  275. +1 −1 src/mame/machine/slapstic.c
  276. +1 −5 src/mame/machine/stfight.c
@@ -233,8 +233,8 @@ subclass has been created. It's called memory_interface, declared in
m6502_device, and provides the following accessors:
- UINT8 read(UINT16 adr) - normal read
- UINT8 read_direct(UINT16 adr) - direct read
- UINT8 read_decrypted(UINT16 adr) - decrypted data read
- UINT8 read_sync(UINT16 adr) - opcode read with sync active (first byte of opcode)
- UINT8 read_arg(UINT16 adr) - opcode read with sync inactive (rest of opcode)
- void write(UINT16 adr, UINT8 val) - normal write
- UINT8 read_9(UINT16 adr) - special y-indexed 6509 read, defaults to read()
@@ -12,7 +12,7 @@
#include "debugger.h"
#include "8x300.h"
#define FETCHOP(a) (m_direct->read_decrypted_word(a))
#define FETCHOP(a) (m_direct->read_word(a))
#define CYCLES(x) do { m_icount -= (x); } while (0)
#define READPORT(a) (m_io->read_byte(a))
#define WRITEPORT(a,v) (m_io->write_byte((a), (v)))
@@ -811,7 +811,7 @@ inline void adsp21xx_device::program_write(UINT32 addr, UINT32 data)
inline UINT32 adsp21xx_device::opcode_read()
{
return m_direct->read_decrypted_dword(m_pc << 2);
return m_direct->read_dword(m_pc << 2);
}
@@ -72,8 +72,8 @@ class alpha8201_cpu_device : public cpu_device
UINT8 M_RDMEM(UINT16 A) { return m_program->read_byte(A); }
void M_WRMEM(UINT16 A,UINT8 V) { m_program->write_byte(A, V); }
UINT8 M_RDOP(UINT16 A) { return m_direct->read_decrypted_byte(A); }
UINT8 M_RDOP_ARG(UINT16 A) { return m_direct->read_raw_byte(A); }
UINT8 M_RDOP(UINT16 A) { return m_direct->read_byte(A); }
UINT8 M_RDOP_ARG(UINT16 A) { return m_direct->read_byte(A); }
UINT8 RD_REG(UINT8 x) { return m_RAM[(m_regPtr<<3)+(x)]; }
void WR_REG(UINT8 x, UINT8 d) { m_RAM[(m_regPtr<<3)+(x)]=(d); }
@@ -479,7 +479,7 @@ UINT32 am29000_cpu_device::read_program_word(UINT32 address)
{
/* TODO: ROM enable? */
if (m_cps & CPS_PI || m_cps & CPS_RE)
return m_direct->read_decrypted_dword(address);
return m_direct->read_dword(address);
else
{
fatalerror("Am29000 instruction MMU translation enabled!\n");
@@ -626,7 +626,7 @@ void am29000_cpu_device::execute_run()
if (m_cfg & CFG_VF)
{
UINT32 vaddr = m_vab | m_exception_queue[0] * 4;
UINT32 vect = m_datadirect->read_decrypted_dword(vaddr);
UINT32 vect = m_datadirect->read_dword(vaddr);
m_pc = vect & ~3;
m_next_pc = m_pc;
@@ -345,7 +345,7 @@ void arm_cpu_device::execute_run()
/* load instruction */
pc = R15;
insn = m_direct->read_decrypted_dword( pc & ADDRESS_MASK );
insn = m_direct->read_dword( pc & ADDRESS_MASK );
switch (insn >> INSN_COND_SHIFT)
{
@@ -641,7 +641,7 @@ void arm7_cpu_device::execute_run()
}
}
insn = m_direct->read_decrypted_word(raddr);
insn = m_direct->read_word(raddr);
(this->*thumb_handler[(insn & 0xffc0) >> 6])(pc, insn);
}
@@ -672,7 +672,7 @@ void arm7_cpu_device::execute_run()
}
#endif
insn = m_direct->read_decrypted_dword(raddr);
insn = m_direct->read_dword(raddr);
/* process condition codes for this instruction */
switch (insn >> INSN_COND_SHIFT)
@@ -1203,12 +1203,12 @@ void arm7_cpu_device::generate_checksum_block(drcuml_block *block, compiler_stat
if (!(seqhead->flags & OPFLAG_VIRTUAL_NOOP))
{
UINT32 sum = seqhead->opptr.l[0];
void *base = m_direct->read_decrypted_ptr(seqhead->physpc);
void *base = m_direct->read_ptr(seqhead->physpc);
UML_LOAD(block, uml::I0, base, 0, uml::SIZE_DWORD, uml::SCALE_x4); // load i0,base,0,dword
if (seqhead->delay.first() != NULL && seqhead->physpc != seqhead->delay.first()->physpc)
{
base = m_direct->read_decrypted_ptr(seqhead->delay.first()->physpc);
base = m_direct->read_ptr(seqhead->delay.first()->physpc);
UML_LOAD(block, uml::I1, base, 0, uml::SIZE_DWORD, uml::SCALE_x4); // load i1,base,dword
UML_ADD(block, uml::I0, uml::I0, uml::I1); // add i0,i0,i1
@@ -1224,20 +1224,20 @@ void arm7_cpu_device::generate_checksum_block(drcuml_block *block, compiler_stat
else
{
UINT32 sum = 0;
void *base = m_direct->read_decrypted_ptr(seqhead->physpc);
void *base = m_direct->read_ptr(seqhead->physpc);
UML_LOAD(block, uml::I0, base, 0, uml::SIZE_DWORD, uml::SCALE_x4); // load i0,base,0,dword
sum += seqhead->opptr.l[0];
for (curdesc = seqhead->next(); curdesc != seqlast->next(); curdesc = curdesc->next())
if (!(curdesc->flags & OPFLAG_VIRTUAL_NOOP))
{
base = m_direct->read_decrypted_ptr(curdesc->physpc);
base = m_direct->read_ptr(curdesc->physpc);
UML_LOAD(block, uml::I1, base, 0, uml::SIZE_DWORD, uml::SCALE_x4); // load i1,base,dword
UML_ADD(block, uml::I0, uml::I0, uml::I1); // add i0,i0,i1
sum += curdesc->opptr.l[0];
if (curdesc->delay.first() != NULL && (curdesc == seqlast || (curdesc->next() != NULL && curdesc->next()->physpc != curdesc->delay.first()->physpc)))
{
base = m_direct->read_decrypted_ptr(curdesc->delay.first()->physpc);
base = m_direct->read_ptr(curdesc->delay.first()->physpc);
UML_LOAD(block, uml::I1, base, 0, uml::SIZE_DWORD, uml::SCALE_x4); // load i1,base,dword
UML_ADD(block, uml::I0, uml::I0, uml::I1); // add i0,i0,i1
sum += curdesc->delay.first()->opptr.l[0];
@@ -343,7 +343,7 @@ offs_t asap_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *opr
inline UINT32 asap_device::readop(offs_t pc)
{
return m_direct->read_decrypted_dword(pc);
return m_direct->read_dword(pc);
}
@@ -22,7 +22,7 @@ const device_type CCPU = &device_creator<ccpu_cpu_device>;
MACROS
***************************************************************************/
#define READOP(a) (m_direct->read_decrypted_byte(a))
#define READOP(a) (m_direct->read_byte(a))
#define RDMEM(a) (m_data->read_word((a) * 2) & 0xfff)
#define WRMEM(a,v) (m_data->write_word((a) * 2, (v)))
@@ -97,7 +97,7 @@ const device_type COP445 = &device_creator<cop445_cpu_device>;
MACROS
***************************************************************************/
#define ROM(a) m_direct->read_decrypted_byte(a)
#define ROM(a) m_direct->read_byte(a)
#define RAM_R(a) m_data->read_byte(a)
#define RAM_W(a, v) m_data->write_byte(a, v)
@@ -533,7 +533,7 @@ offs_t cdp1802_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *
inline UINT8 cosmac_device::read_opcode(offs_t pc)
{
return m_direct->read_decrypted_byte(pc);
return m_direct->read_byte(pc);
}
@@ -520,7 +520,7 @@ void cquestsnd_cpu_device::execute_run()
do
{
/* Decode the instruction */
UINT64 inst = m_direct->read_decrypted_qword(SND_PC << 3);
UINT64 inst = m_direct->read_qword(SND_PC << 3);
UINT32 inslow = inst & 0xffffffff;
UINT32 inshig = inst >> 32;
@@ -776,7 +776,7 @@ void cquestrot_cpu_device::execute_run()
do
{
/* Decode the instruction */
UINT64 inst = m_direct->read_decrypted_qword(ROT_PC << 3);
UINT64 inst = m_direct->read_qword(ROT_PC << 3);
UINT32 inslow = inst & 0xffffffff;
UINT32 inshig = inst >> 32;
@@ -1196,7 +1196,7 @@ void cquestlin_cpu_device::execute_run()
int prog = (m_clkcnt & 3) ? BACKGROUND : FOREGROUND;
m_curpc = LINE_PC;
UINT64 inst = m_direct->read_decrypted_qword(LINE_PC << 3);
UINT64 inst = m_direct->read_qword(LINE_PC << 3);
UINT32 inslow = inst & 0xffffffff;
UINT32 inshig = inst >> 32;
@@ -373,7 +373,7 @@ inline void dsp16_device::data_write(const UINT16& addr, const UINT16& data)
inline UINT32 dsp16_device::opcode_read(const UINT8 pcOffset)
{
const UINT16 readPC = m_pc + pcOffset;
return m_direct->read_decrypted_dword(readPC << 1);
return m_direct->read_dword(readPC << 1);
}
@@ -437,7 +437,7 @@ offs_t dsp32c_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *o
inline UINT32 dsp32c_device::ROPCODE(offs_t pc)
{
return m_direct->read_decrypted_dword(pc);
return m_direct->read_dword(pc);
}
inline UINT8 dsp32c_device::RBYTE(offs_t addr)
@@ -144,7 +144,7 @@ DIRECT_UPDATE_MEMBER( dsp56k_device::dsp56k_direct_handler )
/***************************************************************************
MEMORY ACCESSORS
***************************************************************************/
#define ROPCODE(pc) cpustate->direct->read_decrypted_word(pc)
#define ROPCODE(pc) cpustate->direct->read_word(pc)
/***************************************************************************
@@ -199,7 +199,7 @@ extern unsigned dasm_hyperstone(char *buffer, unsigned pc, const UINT8 *oprom, u
#define IO_WRITE_W(addr, data) m_io->write_dword(((addr) >> 11) & 0x7ffc, data)
#define READ_OP(addr) m_direct->read_decrypted_word((addr), m_opcodexor)
#define READ_OP(addr) m_direct->read_word((addr), m_opcodexor)
//**************************************************************************
// TYPE DEFINITIONS
@@ -1901,7 +1901,7 @@ void esrip_device::execute_run()
m_pl7 = m_l7;
/* Latch instruction */
inst = m_direct->read_decrypted_qword(RIP_PC << 3);
inst = m_direct->read_qword(RIP_PC << 3);
in_h = inst >> 32;
in_l = inst & 0xffffffff;
@@ -96,7 +96,7 @@ void f8_cpu_device::ROMC_00(int insttim) /* SKR - added parameter to tell if */
* of PC0.
*/
m_dbus = m_direct->read_decrypted_byte(m_pc0);
m_dbus = m_direct->read_byte(m_pc0);
m_pc0 += 1;
m_icount -= insttim; /* SKR - ROMC00 is usually short, not short+long, */
/* but DS is long */
@@ -110,7 +110,7 @@ void f8_cpu_device::ROMC_01()
* location addressed by PC0; then all devices add the 8-bit value
* on the data bus as signed binary number to PC0.
*/
m_dbus = m_direct->read_raw_byte(m_pc0);
m_dbus = m_direct->read_byte(m_pc0);
m_pc0 += (INT8)m_dbus;
m_icount -= cL;
}
@@ -134,7 +134,7 @@ void f8_cpu_device::ROMC_03(int insttim) /* SKR - added parameter to tell if */
* Similiar to 0x00, except that it is used for immediate operands
* fetches (using PC0) instead of instruction fetches.
*/
m_dbus = m_io = m_direct->read_raw_byte(m_pc0);
m_dbus = m_io = m_direct->read_byte(m_pc0);
m_pc0 += 1;
m_icount -= insttim;
}
@@ -228,7 +228,7 @@ void f8_cpu_device::ROMC_0C()
* by PC0 into the data bus; then all devices move the value that
* has just been placed on the data bus into the low order byte of PC0.
*/
m_dbus = m_direct->read_raw_byte(m_pc0);
m_dbus = m_direct->read_byte(m_pc0);
m_pc0 = (m_pc0 & 0xff00) | m_dbus;
m_icount -= cL;
}
@@ -251,7 +251,7 @@ void f8_cpu_device::ROMC_0E()
* The value on the data bus is then moved to the low order byte
* of DC0 by all devices.
*/
m_dbus = m_direct->read_raw_byte(m_pc0);
m_dbus = m_direct->read_byte(m_pc0);
m_dc0 = (m_dc0 & 0xff00) | m_dbus;
m_icount -= cL;
}
@@ -289,7 +289,7 @@ void f8_cpu_device::ROMC_11()
* data bus. All devices must then move the contents of the
* data bus to the upper byte of DC0.
*/
m_dbus = m_direct->read_raw_byte(m_pc0);
m_dbus = m_direct->read_byte(m_pc0);
m_dc0 = (m_dc0 & 0x00ff) | (m_dbus << 8);
m_icount -= cL;
}
@@ -2388,15 +2388,15 @@ void h6280_device::pull(UINT8 &value)
***************************************************************/
UINT8 h6280_device::read_opcode()
{
return m_direct->read_decrypted_byte(translated(PCW));
return m_direct->read_byte(translated(PCW));
}
/***************************************************************
* read_opcode_arg read an opcode argument
***************************************************************/
UINT8 h6280_device::read_opcode_arg()
{
return m_direct->read_raw_byte(translated(PCW));
return m_direct->read_byte(translated(PCW));
}
@@ -511,7 +511,7 @@ offs_t h8_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom
UINT16 h8_device::read16i(UINT32 adr)
{
icount--;
return direct->read_decrypted_word(adr & ~1);
return direct->read_word(adr & ~1);
}
UINT16 h8_device::fetch()
@@ -831,7 +831,7 @@ UINT16 hp_hybrid_cpu_device::RM(UINT16 addr)
return 0;
}
} else {
return m_direct->read_decrypted_word((offs_t)addr << 1);
return m_direct->read_word((offs_t)addr << 1);
}
}
@@ -543,7 +543,7 @@ UINT8 i386_device::FETCH()
if(!translate_address(m_CPL,TRANSLATE_FETCH,&address,&error))
PF_THROW(error);
value = m_direct->read_decrypted_byte(address & m_a20_mask);
value = m_direct->read_byte(address & m_a20_mask);
#ifdef DEBUG_MISSING_OPCODE
m_opcode_bytes[m_opcode_bytes_length] = value;
m_opcode_bytes_length = (m_opcode_bytes_length + 1) & 15;
@@ -564,7 +564,7 @@ UINT16 i386_device::FETCH16()
if(!translate_address(m_CPL,TRANSLATE_FETCH,&address,&error))
PF_THROW(error);
address &= m_a20_mask;
value = m_direct->read_decrypted_word(address);
value = m_direct->read_word(address);
m_eip += 2;
m_pc += 2;
}
@@ -585,7 +585,7 @@ UINT32 i386_device::FETCH32()
PF_THROW(error);
address &= m_a20_mask;
value = m_direct->read_decrypted_dword(address);
value = m_direct->read_dword(address);
m_eip += 4;
m_pc += 4;
}
@@ -36,15 +36,15 @@ i4004_cpu_device::i4004_cpu_device(const machine_config &mconfig, const char *ta
UINT8 i4004_cpu_device::ROP()
{
UINT8 retVal = m_direct->read_decrypted_byte(GET_PC.w.l);
UINT8 retVal = m_direct->read_byte(GET_PC.w.l);
GET_PC.w.l = (GET_PC.w.l + 1) & 0x0fff;
m_PC = GET_PC;
return retVal;
}
UINT8 i4004_cpu_device::READ_ROM()
{
return m_direct->read_decrypted_byte((GET_PC.w.l & 0x0f00) | m_R[0]);
return m_direct->read_byte((GET_PC.w.l & 0x0f00) | m_R[0]);
}
void i4004_cpu_device::WPM()
@@ -56,7 +56,7 @@ void i4004_cpu_device::WPM()
UINT8 i4004_cpu_device::ARG()
{
UINT8 retVal = m_direct->read_raw_byte(GET_PC.w.l);
UINT8 retVal = m_direct->read_byte(GET_PC.w.l);
GET_PC.w.l = (GET_PC.w.l + 1) & 0x0fff;
m_PC = GET_PC;
return retVal;
@@ -620,7 +620,7 @@ inline void i8008_device::pop_stack()
inline UINT8 i8008_device::rop()
{
UINT8 retVal = m_direct->read_decrypted_byte(GET_PC.w.l);
UINT8 retVal = m_direct->read_byte(GET_PC.w.l);
GET_PC.w.l = (GET_PC.w.l + 1) & 0x3fff;
m_PC = GET_PC;
return retVal;
@@ -658,7 +658,7 @@ inline void i8008_device::set_reg(UINT8 reg, UINT8 val)
inline UINT8 i8008_device::arg()
{
UINT8 retVal = m_direct->read_raw_byte(GET_PC.w.l);
UINT8 retVal = m_direct->read_byte(GET_PC.w.l);
GET_PC.w.l = (GET_PC.w.l + 1) & 0x3fff;
m_PC = GET_PC;
return retVal;
Oops, something went wrong.

0 comments on commit 88949a5

Please sign in to comment.