← Back to branch summary

~ubuntu-branches/ubuntu/lucid/sdlmame/lucid

« back to all changes in this revision

Viewing changes to src/emu/cpu/m37710/m37710op.h

  • Committer: Bazaar Package Importer
  • Author(s): Cesare Falco
  • Date: 2009-11-03 17:10:15 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20091103171015-6hop4ory5lxnumpn
Tags: 0.135-0ubuntu1
https://launchpad.net/bugs/403212
* New upstream release - Closes (LP: #403212)
* debian/watch: unstable releases are no longer detected
* mame.ini: added the cheat subdirectories to cheatpath so zipped
  cheatfiles will be searched too
* renamed crsshair subdirectory to crosshair to reflect upstream change
* mame.ini: renamed references to crosshair subdirectory (see above)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/emu/cpu/m37710/m37710op.h
77
77
{
78
78
        address = ADDRESS_37710(address);
79
79
        if (address & 1)
80
 
                return m37710_read_8(address) | m37710_read_8(address+1)<<8;
 
80
                return m37710_read_8(address) | m37710_read_8((address)+1)<<8;
81
81
        else
82
82
                return m37710_read_16(address);
83
83
}
2253
2253
                        CLK(CLK_OP + CLK_RMW8 + CLK_W_##MODE);                                                  \
2254
2254
                        DST    = EA_##MODE(cpustate);                                                                                   \
2255
2255
                        REG_IM = read_8_##MODE(DST);                                                                    \
2256
 
                        REG_IM2 = read_8_NORM(REG_PC);  \
 
2256
                        REG_IM2 = read_8_NORM(REG_PB | REG_PC); \
2257
2257
                        REG_PC++;                       \
2258
2258
                        write_8_##MODE(DST, REG_IM & ~REG_IM2);
2259
2259
#else
2261
2261
                        CLK(CLK_OP + CLK_RMW16 + CLK_W_##MODE);                                                 \
2262
2262
                        DST    = EA_##MODE(cpustate);                                                                                   \
2263
2263
                        REG_IM = read_16_##MODE(DST);                                                                   \
2264
 
                        REG_IM2 = read_16_NORM(REG_PC); \
 
2264
                        REG_IM2 = read_16_NORM(REG_PB | REG_PC);        \
2265
2265
                        REG_PC+=2;                      \
2266
2266
                        write_16_##MODE(DST, REG_IM & ~REG_IM2);
2267
2267
#endif
2273
2273
                        CLK(CLK_OP + CLK_RMW8 + CLK_W_##MODE);                                                  \
2274
2274
                        DST    = EA_##MODE(cpustate);                                                                                   \
2275
2275
                        REG_IM = read_8_##MODE(DST);                                                                    \
2276
 
                        REG_IM2 = read_8_NORM(REG_PC);  \
 
2276
                        REG_IM2 = read_8_NORM(REG_PB | REG_PC); \
2277
2277
                        REG_PC++;                       \
2278
2278
                        write_8_##MODE(DST, REG_IM | REG_IM2);
2279
2279
#else
2281
2281
                        CLK(CLK_OP + CLK_RMW16 + CLK_W_##MODE);                                                 \
2282
2282
                        DST    = EA_##MODE(cpustate);                                                                                   \
2283
2283
                        REG_IM = read_16_##MODE(DST);                                                                   \
2284
 
                        REG_IM2 = read_16_NORM(REG_PC); \
 
2284
                        REG_IM2 = read_16_NORM(REG_PB | REG_PC);        \
2285
2285
                        REG_PC+=2;                      \
2286
2286
                        write_16_##MODE(DST, REG_IM | REG_IM2);
2287
2287
#endif