further improvements (nw)

This commit is contained in:
David Haywood 2013-08-02 18:08:50 +00:00
parent d088c182b0
commit 246daa5c0f

View file

@ -568,20 +568,20 @@ void pgm_arm_type1_state::command_handler_ddp3(int pc)
UINT8 puzzli2_level_decode[256] = {
0x32, 0x3e, 0xb2, 0x37, 0x31, 0x22, 0xd6, 0x0d, 0x35, 0x5c, 0x8d, 0x3c, 0x7a, 0x5f, 0xd4, 0xad,
0x53, 0xff, 0xe9, 0x45, 0xed, 0x11, 0x68, 0x77, 0xd8, 0x34, 0x36, 0x45, 0xa6, 0xeb, 0x1c, 0xc7,
0x3b, 0xbd, 0xad, 0x2f, 0x18, 0xde, 0xa1, 0xaa, 0xdd, 0x50, 0x57, 0xc2, 0xe5, 0x0a, 0x01, 0x6d,
0x67, 0x65, 0x14, 0x70, 0xb7, 0x39, 0x24, 0x79, 0x83, 0xd2, 0x71, 0xb9, 0x10, 0xf5, 0x92, 0x93,
0xfa, 0xe4, 0x5e, 0xb0, 0xf6, 0xaf, 0x95, 0x8a, 0x7d, 0x73, 0xf9, 0x63, 0x86, 0xcb, 0x1a, 0x56,
0x3b, 0xbd, 0xad, 0x2f, 0x18, 0xde, 0xa1, 0xaa, 0xdd, 0x52, 0x57, 0xc2, 0xe5, 0x0a, 0x01, 0x6d,
0x67, 0x65, 0x14, 0x70, 0xb7, 0x39, 0x27, 0x78, 0x83, 0xd2, 0x71, 0xb9, 0x10, 0xf5, 0x92, 0x93,
0xfa, 0xe4, 0x5e, 0xb0, 0xf6, 0xaf, 0x95, 0x8a, 0x7c, 0x73, 0xf9, 0x63, 0x86, 0xcb, 0x1a, 0x56,
0xf1, 0x3a, 0xae, 0x63, 0x01, 0x29, 0x96, 0x22, 0x8f, 0x5d, 0x9a, 0x65, 0x74, 0x21, 0x20, 0x40,
0xd3, 0x05, 0xa2, 0xe3, 0xbc, 0x9e, 0x1e, 0x10, 0x15, 0x0c, 0x8a, 0x9c, 0xec, 0x38, 0xb6, 0x9d,
0x2a, 0xf7, 0x14, 0x0e, 0x85, 0xc7, 0x7f, 0xce, 0x94, 0x16, 0x48, 0xa9, 0x80, 0x6e, 0x78, 0xd8,
0xa6, 0x7e, 0x42, 0xe4, 0xa2, 0x2b, 0xef, 0xed, 0x24, 0xba, 0xb8, 0x7e, 0xc9, 0x2b, 0x90, 0xcc,
0xd3, 0x05, 0xa2, 0xe3, 0xbc, 0x9e, 0x1e, 0x10, 0x15, 0x0c, 0x8a, 0x9c, 0xec, 0x38, 0xb5, 0x9d,
0x2d, 0xf7, 0x14, 0x0e, 0x85, 0xc7, 0x7f, 0xce, 0x94, 0x16, 0x48, 0xa9, 0x80, 0x6e, 0x7b, 0xd8,
0xa7, 0x7e, 0x42, 0xe6, 0xa2, 0x2a, 0xef, 0xee, 0x24, 0xba, 0xb8, 0x7e, 0xc9, 0x2b, 0x90, 0xcc,
0x58, 0xd1, 0xf3, 0xe2, 0x6f, 0xed, 0x9f, 0xf0, 0x4a, 0x54, 0x8d, 0x08, 0xf8, 0x51, 0x68, 0xc8,
0x03, 0x0b, 0xbb, 0xc1, 0xe2, 0x4c, 0x04, 0xc5, 0x8c, 0x09, 0x0e, 0xbf, 0x62, 0x48, 0x75, 0x59,
0x1d, 0x80, 0xdf, 0x60, 0x07, 0xe2, 0x1b, 0x67, 0xa5, 0xbf, 0xcd, 0x86, 0xdc, 0xc3, 0x6a, 0x4e,
0x03, 0x0b, 0xbb, 0xc1, 0xe3, 0x4c, 0x04, 0xc5, 0x8f, 0x09, 0x0e, 0xbf, 0x62, 0x49, 0x76, 0x59,
0x1d, 0x80, 0xde, 0x60, 0x07, 0xe2, 0x1b, 0x67, 0xa5, 0xbf, 0xcd, 0x86, 0xdc, 0xc3, 0x6a, 0x4e,
0xd0, 0xfc, 0xd5, 0x3f, 0x98, 0x96, 0x2e, 0x4c, 0xb3, 0xea, 0x2d, 0x75, 0xe6, 0xc0, 0x6c, 0x69,
0x9b, 0xb7, 0x43, 0x8b, 0x41, 0x47, 0x02, 0xda, 0x98, 0x3d, 0xa3, 0x79, 0x50, 0x4f, 0xb4, 0x55,
0x5a, 0x25, 0xf4, 0xc8, 0x58, 0x30, 0xc4, 0x12, 0xa9, 0x45, 0xda, 0x91, 0xa4, 0xaa, 0xfc, 0x84,
0xfa, 0x88, 0x06, 0xce, 0xfe, 0x32, 0xd5, 0x28, 0x1d, 0x19, 0x4b, 0xb1, 0x83, 0xf2, 0x72, 0x26,
0xfa, 0x88, 0x06, 0xcf, 0xfe, 0x33, 0xd5, 0x28, 0x1d, 0x19, 0x4b, 0xb1, 0x83, 0xf2, 0x72, 0x26,
};
@ -1825,9 +1825,16 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,puzzli2)
//#define PUZZLI2_LEVEL_STRUCTURE_LOG
#ifdef PUZZLI2_LEVEL_STRUCTURE_LOG
UINT8 *src2 = (UINT8 *) (machine().root_device().memregion("maincpu")->base());
UINT8 new_puzzli2_level_decode[256];
for (int i=0;i<256;i++)
new_puzzli2_level_decode[i] = puzzli2_level_decode[i];
int offset;
int limit;
UINT8 coverage[256];
for (int i=0;i<256;i++)
coverage[i] = 0;
if (!strcmp(machine().system().name,"puzzli2"))
{
@ -1900,7 +1907,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,puzzli2)
}
else if (stage==2)
{
printf("%02x <- Mask value equal to number of entries\n", rawvalue);
printf("%02x <- Mask value equal to number of entries (xor table location is %02x)", rawvalue, tableloc);
stage = 3;
//
@ -1909,8 +1916,20 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,puzzli2)
// for 0 entries skip back to state 1 instead of 3, because there is nothing following
stage = 1;
currentcolumn++;
coverage[tableloc] = 1;
if (rawvalue!=0)
{
printf(" invalid mask after 00 length?");
// attempt to correct the table
new_puzzli2_level_decode[tableloc] ^= rawvalue;
}
}
printf("\n");
}
else if (stage==3)
{
@ -1935,12 +1954,33 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,puzzli2)
printf("total number of valid columns was %02x\n", currentcolumn);
if ((currentcolumn!=0x6) && (currentcolumn!=0x7) && (currentcolumn!=0x8) && (currentcolumn!=0x5)) // 5 is suspicious
if ((currentcolumn!=0x6) && (currentcolumn!=0x7) && (currentcolumn!=0x8)) // 5 is suspicious
fatalerror("invalid number of columns?\n");
printf("\n");
}
for (int i=0;i<256;i++)
{
printf("%d ",coverage[i]);
}
printf("\n");
int c=0;
for (int i=0;i<256;i++)
{
printf("0x%02x, ", new_puzzli2_level_decode[i]);
c++;
if (c==16)
{
printf("\n");
c = 0;
}
}
#endif