Previous 199869 Revisions Next

r36462 Tuesday 17th March, 2015 at 20:37:21 UTC by Michael Zapf
Merge branch 'master' of https://github.com/mamedev/mame
[src/emu/cpu/hmcs40]hmcs40.c hmcs40op.inc
[src/mame]mame.lst
[src/mame/drivers]psikyo.c

trunk/src/emu/cpu/hmcs40/hmcs40.c
r244973r244974
570570      m_i = BITSWAP8(m_op,7,6,5,4,0,1,2,3) & 0xf; // reversed bit-order for immediate param
571571      increment_pc();
572572
573      // handle opcode
574      switch (m_op)
575      {
573576/*
574577
575578op_ayy();  -
r244973r244974
585588op_blem(); - 267 024
586589op_lay();  - 118
587590
591
588592*/
589593
590      // handle opcode
591      switch (m_op)
592      {
593594         case 0x118:
594595            op_lay(); // probably lay
595596            break;
597         
598         case 0x046:
599            op_daa();
600            break;
601         case 0x045:
602            op_das();
603            break;
604
605
596606         case 0x267:
597            op_blem(); break; // bnem or blem
607            op_blem(); // bnem or blem
608            break;
609
598610         case 0x124:
599611            op_alem(); // alem or anem
600612            break;
601613         case 0x324:
602            op_anem(); break; // "
614            op_anem(); // "
615            break;
616
603617         case 0x024:
604618            //op_nega();
605619            //op_am();
606620            op_illegal();
607621            break;
608         case 0x234:
609            // sm?
610#if 0
611            m_a = ram_r() - m_a;
612            m_s = ~m_a >> 4 & 1;
613            m_a &= 0xf;
614#else
615            op_am();
616#endif
622
623         case 0x04b:
624            op_illegal();
625            //op_rec();
617626            break;
618627         case 0x04c:
619            op_illegal();
620            //m_c ^= 1;
621            //op_lat();
628            op_rec();
622629            break;
623630
631         case 0x030:
632            op_amc();
633            break;
634         case 0x034:
635            //op_illegal();
636            op_amc(); // mirror?
637            break;
624638
639         case 0x230:
640            op_smc();
641            break;
642         case 0x234:
643            //op_illegal();
644            op_smc(); // mirror?
645            break;
625646
626647
648
649
650
651
652
627653         /* 0x000 */
628654         
629655         case 0x000: case 0x001: case 0x002: case 0x003:
r244973r244974
637663/* ok */      op_lmiiy(); break;
638664         case 0x020: case 0x021: case 0x022: case 0x023:
639665            op_lbm(); break;
640         case 0x030:
641            op_amc(); break;
642666         case 0x03c:
643667            op_lta(); break;
644668         
645669         case 0x040:
646670/* ok */      op_lxa(); break;
647         case 0x04b:
648            op_rec(); break;
649671         case 0x04f:
650672            op_sec(); break;
651673         case 0x050:
r244973r244974
751773/* ok */      op_rotr(); break;
752774         case 0x225:
753775/* ok */      op_rotl(); break;
754         case 0x230:
755            op_smc(); break;
756776         case 0x23c:
757777            op_lat(); break;
758778         
trunk/src/emu/cpu/hmcs40/hmcs40op.inc
r244973r244974
662662   if (o & 0x100)
663663   {
664664      // B3 B2 B1 B0 A0 A1 A2 A3
665      m_a = BITSWAP8((UINT8)o,7,6,5,4,0,1,2,3) & 0xf;
665      m_a = BITSWAP8(o,7,6,5,4,0,1,2,3) & 0xf;
666666      m_b = o >> 4 & 0xf;
667667   }
668668   if (o & 0x200)
669669   {
670670      // R20 R21 R22 R23 R30 R31 R32 R33
671      o = BITSWAP8((UINT8)o,0,1,2,3,4,5,6,7);
671      o = BITSWAP8(o,0,1,2,3,4,5,6,7);
672672      write_r(2, o & 0xf);
673673      write_r(3, o >> 4 & 0xf);
674674   }
trunk/src/mame/drivers/psikyo.c
r244973r244974
14061406
14071407ROM_END
14081408
1409
1410ROM_START( btlkroadk )
1411
1412   ROM_REGION( 0x100000, "maincpu", 0 )        /* Main CPU Code */
1413   ROM_LOAD32_WORD_SWAP( "4(dot).u46", 0x000000, 0x040000, CRC(e724d429) SHA1(8b5f80366fd22d6f7e7d8a9623de4fe231303267) ) // 1&0
1414   ROM_LOAD32_WORD_SWAP( "5(dot).u39", 0x000002, 0x040000, CRC(c0d65765) SHA1(a6a26e6b9693a2ef245e9aaa4c9daa888aebb360)) // 3&2
1415
1416   ROM_REGION( 0x020000, "audiocpu", 0 )       /* Sound CPU Code */
1417   ROM_LOAD( "3(k).u71", 0x00000, 0x20000, CRC(e0f0c597) SHA1(cc337633f1f579baf0f8ba1dd65c5d51122a7e97) )
1418
1419   ROM_REGION( 0x700000, "gfx1", 0 )   /* Sprites */
1420   ROM_LOAD( "u14.bin",  0x000000, 0x200000, CRC(282d89c3) SHA1(3b4b17f4a37efa2f7e232488aaba7c77d10c84d2) )
1421   ROM_LOAD( "u24.bin",  0x200000, 0x200000, CRC(bbe9d3d1) SHA1(9da0b0b993e8271a8119e9c2f602e52325983f79) )
1422   ROM_LOAD( "u15.bin",  0x400000, 0x200000, CRC(d4d1b07c) SHA1(232109db8f6e137fbc8826f38a96057067cb19dc) )
1423//  ROM_LOAD( "u25.bin",  0x600000, 0x100000  NOT PRESENT
1424
1425   ROM_REGION( 0x200000, "gfx2", 0 )   /* Layers 0 + 1 */
1426   ROM_LOAD( "u33.bin",  0x000000, 0x200000, CRC(4c8577f1) SHA1(d27043514632954a06667ac63f4a4e4a31870511) )
1427
1428   ROM_REGION( 0x100000, "ymsnd", 0 )  /* ADPCM Samples */
1429   ROM_LOAD( "u56.bin",  0x000000, 0x100000, CRC(51d73682) SHA1(562038d08e9a4389ffa39f3a659b2a29b94dc156) )
1430
1431   ROM_REGION( 0x080000, "ymsnd.deltat", 0 )   /* DELTA-T Samples */
1432   ROM_LOAD( "u64.bin",  0x000000, 0x080000, CRC(0f33049f) SHA1(ca4fd5f3906685ace1af40b75f5678231d7324e8) )
1433
1434   ROM_REGION( 0x040000, "spritelut", 0 )  /* Sprites LUT */
1435   ROM_LOAD( "u3.bin",  0x000000, 0x040000, CRC(30d541ed) SHA1(6f7fb5f5ecbce7c086185392de164ebb6887e780) )
1436
1437   ROM_REGION( 0x0400, "plds", 0 )
1438   ROM_LOAD( "tibpal16l8.u69", 0x0000, 0x0104, NO_DUMP ) /* PAL is read protected */
1439   ROM_LOAD( "tibpal16l8.u19", 0x0200, 0x0104, NO_DUMP ) /* PAL is read protected */
1440
1441ROM_END
1442
14091443/***************************************************************************
14101444
14111445                            Strikers 1945 (Japan, unprotected)
r244973r244974
19561990
19571991***************************************************************************/
19581992
1959/* Working Games */
19601993GAME( 1993, samuraia, 0,        sngkace,  samuraia, psikyo_state, sngkace,  ROT270, "Psikyo", "Samurai Aces (World)", GAME_SUPPORTS_SAVE ) // Banpresto?
19611994GAME( 1993, sngkace,  samuraia, sngkace,  sngkace, psikyo_state,  sngkace,  ROT270, "Psikyo", "Sengoku Ace (Japan)", GAME_SUPPORTS_SAVE ) // Banpresto?
1995
19621996GAME( 1994, gunbird,  0,        gunbird,  gunbird, psikyo_state,  gunbird,  ROT270, "Psikyo", "Gunbird (World)", GAME_SUPPORTS_SAVE )
19631997GAME( 1994, gunbirdk, gunbird,  gunbird,  gunbirdj, psikyo_state, gunbird,  ROT270, "Psikyo", "Gunbird (Korea)", GAME_SUPPORTS_SAVE )
19641998GAME( 1994, gunbirdj, gunbird,  gunbird,  gunbirdj, psikyo_state, gunbird,  ROT270, "Psikyo", "Gunbird (Japan)", GAME_SUPPORTS_SAVE )
1999
19652000GAME( 1994, btlkroad, 0,        gunbird,  btlkroad, psikyo_state, gunbird,  ROT0,   "Psikyo", "Battle K-Road", GAME_SUPPORTS_SAVE )
2001GAME( 1994, btlkroadk, btlkroad,gunbird,  btlkroad, psikyo_state, gunbird,  ROT0,   "Psikyo", "Battle K-Road (Korean PCB)", GAME_SUPPORTS_SAVE ) // game code is still multi-region, but sound rom appears to be Korea specific at least
2002
19662003GAME( 1995, s1945,    0,        s1945,    s1945, psikyo_state,    s1945,    ROT270, "Psikyo", "Strikers 1945 (World)", GAME_SUPPORTS_SAVE )
19672004GAME( 1995, s1945a,   s1945,    s1945,    s1945a, psikyo_state,   s1945a,   ROT270, "Psikyo", "Strikers 1945 (Japan / World)", GAME_SUPPORTS_SAVE ) // Region dip - 0x0f=Japan, anything else=World
19682005GAME( 1995, s1945j,   s1945,    s1945,    s1945j, psikyo_state,   s1945j,   ROT270, "Psikyo", "Strikers 1945 (Japan)", GAME_SUPPORTS_SAVE )
19692006GAME( 1995, s1945jn,  s1945,    gunbird,  s1945j, psikyo_state,   s1945jn,  ROT270, "Psikyo", "Strikers 1945 (Japan, unprotected)", GAME_SUPPORTS_SAVE )
19702007GAME( 1995, s1945k,   s1945,    s1945,    s1945j, psikyo_state,   s1945,    ROT270, "Psikyo", "Strikers 1945 (Korea)", GAME_SUPPORTS_SAVE )
19712008GAME( 1995, s1945bl,  s1945,    s1945bl,  s1945bl, psikyo_state,  s1945bl,  ROT270, "bootleg","Strikers 1945 (Hong Kong, bootleg)", GAME_SUPPORTS_SAVE )
2009
19722010GAME( 1996, tengai,   0,        s1945,    tengai, psikyo_state,   tengai,   ROT0,   "Psikyo", "Tengai (World)", GAME_SUPPORTS_SAVE )
19732011GAME( 1996, tengaij,  tengai,   s1945,    tengaij, psikyo_state,  tengai,   ROT0,   "Psikyo", "Sengoku Blade: Sengoku Ace Episode II / Tengai", GAME_SUPPORTS_SAVE ) // Region dip - 0x0f=Japan, anything else=World
trunk/src/mame/mame.lst
r244973r244974
87738773gunbirdk        // (c) 1994
87748774gunbirdj        // (c) 1994
87758775btlkroad        // (c) 1994
8776btlkroadk      // (c) 1994
87768777s1945           // (c) 1995
87778778s1945a          // (c) 1995
87788779s1945j          // (c) 1995

https://github.com/mamedev/mame/commit/7ef3198fc1b7d6e47edc92b20b6f61267acf58eb

Previous 199869 Revisions Next

© 1997-2024 The MAME Team