Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 09:28:51 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert "Model1: fix TGP parser crashing MAME"

Browse Source 
This reverts commit 2936148bb6.
This commit is contained in:
Ariane Fugmann 2016-06-04 09:42:14 +02:00
parent 34436425ea
commit 50f27e3ed3
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/mame/video/model1.cpp
View File

@ -1198,13 +1198,11 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect)
for(;;) { for(;;) {
int type = (list[1]<<16)|list[0]; int type = (list[1]<<16)|list[0];
m_glist=list; m_glist=list;
switch(type) { switch(type & 15) {
case 0x0: case 0:
LOG_TGP(("VIDEO: unknown type %x\n", type));
list += 2; list += 2;
break; break;
case 0x1: case 1:
case 0x41:
// 1 = plane 1 // 1 = plane 1
// 2 = ?? draw object (413d3, 17c4c, e) // 2 = ?? draw object (413d3, 17c4c, e)
// 3 = plane 2 // 3 = plane 2
@ -1216,10 +1214,10 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect)
push_object(readi(list+2), readi(list+4), readi(list+6)); push_object(readi(list+2), readi(list+4), readi(list+6));
list += 8; list += 8;
break; break;
case 0x2: case 2:
list = draw_direct(bitmap, cliprect, list+2); list = draw_direct(bitmap, cliprect, list+2);
break; break;
case 0x3: case 3:
LOG_TGP(("VIDEO: viewport (%d, %d, %d, %d, %d, %d, %d)\n", LOG_TGP(("VIDEO: viewport (%d, %d, %d, %d, %d, %d, %d)\n",
readi(list+2), readi(list+2),
readi16(list+4), readi16(list+6), readi16(list+8), readi16(list+4), readi16(list+6), readi16(list+8),
@ -1238,7 +1236,7 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect)
list += 16; list += 16;
break; break;
case 0x4: { case 4: {
int adr = readi(list+2); int adr = readi(list+2);
int len = readi(list+4)+1; int len = readi(list+4)+1;
int i; int i;
@ -1248,12 +1246,11 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect)
list += 6+len*2; list += 6+len*2;
break; break;
} }
case 0x5: case 5:
{ {
int adr = readi(list+2); int adr = readi(list+2);
int len = readi(list+4); int len = readi(list+4);
int i; int i;
LOG_TGP(("VIDEO: write poly ram, adr=%x, len=%x\n", adr, len));
for(i=0;i<len;++i) for(i=0;i<len;++i)
{ {
m_poly_ram[adr-0x800000+i]=readi(list+2*i+6); m_poly_ram[adr-0x800000+i]=readi(list+2*i+6);
@ -1261,7 +1258,7 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect)
list+=6+len*2; list+=6+len*2;
} }
break; break;
case 0x6: { case 6: {
int adr = readi(list+2); int adr = readi(list+2);
int len = readi(list+4); int len = readi(list+4);
int i; int i;
@ -1277,16 +1274,16 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect)
list += 6+len*2; list += 6+len*2;
break; break;
} }
case 0x7: case 7:
LOG_TGP(("VIDEO: code 7 (%d)\n", readi(list+2))); LOG_TGP(("VIDEO: code 7 (%d)\n", readi(list+2)));
zz++; zz++;
list += 4; list += 4;
break; break;
case 0x8: case 8:
LOG_TGP(("VIDEO: select mode %08x\n", readi(list+2))); LOG_TGP(("VIDEO: select mode %08x\n", readi(list+2)));
list += 4; list += 4;
break; break;
case 0x9: case 9:
LOG_TGP(("VIDEO: zoom (%f, %f)\n", readf(list+2), readf(list+4))); LOG_TGP(("VIDEO: zoom (%f, %f)\n", readf(list+2), readf(list+4)));
view->zoomx = readf(list+2)*4; view->zoomx = readf(list+2)*4;
view->zoomy = readf(list+4)*4; view->zoomy = readf(list+4)*4;
@ -1325,12 +1322,10 @@ void model1_state::tgp_render(bitmap_rgb32 &bitmap, const rectangle &cliprect)
list += 6; list += 6;
break; break;
case 0xf: case 0xf:
// end of list
LOG_TGP(("VIDEO: end of list\n"));
//case -1: //case -1:
goto end; goto end;
default: default:
LOG_TGP(("VIDEO: unknown type %x\n", type)); LOG_TGP(("VIDEO: unknown type %d\n", type));
goto end; goto end;
} }
} }
@ -1366,7 +1361,6 @@ void model1_state::tgp_scan()
list += 2; list += 2;
break; break;
case 1: case 1:
case 41:
list += 8; list += 8;
break; break;
case 2: case 2:
@ -1436,7 +1430,7 @@ void model1_state::tgp_scan()
case -1: case -1:
goto end; goto end;
default: default:
LOG_TGP(("VIDEO: unknown type %x\n", type)); LOG_TGP(("VIDEO: unknown type %d\n", type));
goto end; goto end;
} }
} }