Previous 15994 Revisions Next

r990 Sunday 16th September, 2007 at 22:50:45 UTC by Nathan Woods
Fixed various crashes
[src/mess/drivers]jaguar.c
[src/mess/video]apple2.c epnick.c epnick.h

src/mess/video/epnick.c
r989r990
2525
2626// MESS specific
2727/* 8-bit pixel write! */
28#define NICK_WRITE_PIXEL(ci, dest)   \
29   *dest = Machine->pens[ci];   \
30   dest++
28static void nick_write_pixel(NICK_STATE *nick, int ci)
29{
30   if (nick->dest_pos < nick->dest_max_pos)
31   {
32      nick->dest[nick->dest_pos++] = Machine->pens[ci];
33   }
34}
3135
3236/*****************************************************/
3337
r989r990
167171
168172   for (i=0; i<(Clocks<<4); i++)
169173   {
170      NICK_WRITE_PIXEL(ColIndex, Nick.dest);
174      nick_write_pixel(&Nick, ColIndex);
171175   }
172176}
173177
r989r990
236240   {
237241      PenIndex = ColIndex[(Data>>7) & 0x01];
238242
239      NICK_WRITE_PIXEL(PenIndex, Nick.dest);
243      nick_write_pixel(&Nick, PenIndex);
240244
241245      Data = Data<<1;
242246   }
r989r990
258262   {
259263      PenIndex = ColIndex[(Data>>7) & 0x01];
260264
261      NICK_WRITE_PIXEL(PenIndex, Nick.dest);
262      NICK_WRITE_PIXEL(PenIndex, Nick.dest);
265      nick_write_pixel(&Nick, PenIndex);
266      nick_write_pixel(&Nick, PenIndex);
263267
264268      Data = Data<<1;
265269   }
r989r990
350354            PenIndex = Nick_PenIndexLookup_4Colour[Data];
351355            PalIndex = Nick.LPT.COL[PenIndex & 0x03];
352356
353            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
354            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
357            nick_write_pixel(&Nick, PalIndex);
358            nick_write_pixel(&Nick, PalIndex);
355359
356360            Data = Data<<1;
357361          }
r989r990
380384
381385            PalIndex = Nick_GetColourIndex(PenIndex);
382386
383            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
384            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
385            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
386            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
387            nick_write_pixel(&Nick, PalIndex);
388            nick_write_pixel(&Nick, PalIndex);
389            nick_write_pixel(&Nick, PalIndex);
390            nick_write_pixel(&Nick, PalIndex);
387391
388392            Data = Data<<1;
389393         }
r989r990
406410
407411         PalIndex = Data;
408412
409         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
410         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
411         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
412         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
413         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
414         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
415         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
416         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
413         nick_write_pixel(&Nick, PalIndex);
414         nick_write_pixel(&Nick, PalIndex);
415         nick_write_pixel(&Nick, PalIndex);
416         nick_write_pixel(&Nick, PalIndex);
417         nick_write_pixel(&Nick, PalIndex);
418         nick_write_pixel(&Nick, PalIndex);
419         nick_write_pixel(&Nick, PalIndex);
420         nick_write_pixel(&Nick, PalIndex);
417421
418422
419423      }
r989r990
504508            PenIndex = Nick_PenIndexLookup_4Colour[Data];
505509            PalIndex = Nick.LPT.COL[PenIndex & 0x03];
506510
507            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
508            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
509            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
510            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
511            nick_write_pixel(&Nick, PalIndex);
512            nick_write_pixel(&Nick, PalIndex);
513            nick_write_pixel(&Nick, PalIndex);
514            nick_write_pixel(&Nick, PalIndex);
511515
512516            Data = Data<<1;
513517          }
r989r990
536540
537541            PalIndex = Nick_GetColourIndex(PenIndex);
538542
539            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
540            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
541            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
542            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
543            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
544            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
545            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
546            NICK_WRITE_PIXEL(PalIndex, Nick.dest);
543            nick_write_pixel(&Nick, PalIndex);
544            nick_write_pixel(&Nick, PalIndex);
545            nick_write_pixel(&Nick, PalIndex);
546            nick_write_pixel(&Nick, PalIndex);
547            nick_write_pixel(&Nick, PalIndex);
548            nick_write_pixel(&Nick, PalIndex);
549            nick_write_pixel(&Nick, PalIndex);
550            nick_write_pixel(&Nick, PalIndex);
547551
548552            Data = Data<<1;
549553         }
r989r990
566570
567571         PalIndex = Data;
568572
569         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
570         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
571         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
572         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
573         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
574         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
575         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
576         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
573         nick_write_pixel(&Nick, PalIndex);
574         nick_write_pixel(&Nick, PalIndex);
575         nick_write_pixel(&Nick, PalIndex);
576         nick_write_pixel(&Nick, PalIndex);
577         nick_write_pixel(&Nick, PalIndex);
578         nick_write_pixel(&Nick, PalIndex);
579         nick_write_pixel(&Nick, PalIndex);
580         nick_write_pixel(&Nick, PalIndex);
577581
578         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
579         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
580         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
581         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
582         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
583         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
584         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
585         NICK_WRITE_PIXEL(PalIndex, Nick.dest);
582         nick_write_pixel(&Nick, PalIndex);
583         nick_write_pixel(&Nick, PalIndex);
584         nick_write_pixel(&Nick, PalIndex);
585         nick_write_pixel(&Nick, PalIndex);
586         nick_write_pixel(&Nick, PalIndex);
587         nick_write_pixel(&Nick, PalIndex);
588         nick_write_pixel(&Nick, PalIndex);
589         nick_write_pixel(&Nick, PalIndex);
586590
587591
588592      }
src/mess/video/epnick.h
r989r990
6666   unsigned long LD2;
6767
6868   LPT_ENTRY   LPT;
69   unsigned short *dest;
7069
70   UINT16 *dest;
71   int dest_pos;
72   int dest_max_pos;
73
7174   unsigned char Reg[16];
7275} NICK_STATE;
7376
src/mess/video/apple2.c
r989r990
255255
256256   assert((columns == 40) || (columns == 80));
257257
258   for (row = beginrow; row <= endrow; row++)
258   for (row = beginrow; row < endrow; row++)
259259   {
260260      for (col = 0; col < 40; col++)
261261      {
r989r990
281281            |   (((UINT32) vram_row[col+1] & 0x7f) <<  7)
282282            |   (((UINT32) vram_row[col+2] & 0x7f) << 14);
283283   
284         switch(columns) {
285         case 40:
286            artifact_map_ptr = &hires_artifact_map[((vram_row[col+1] & 0x80) >> 7) * 16];
287            for (b = 0; b < 7; b++)
288            {
289               v = artifact_map_ptr[((w >> (b + 7-1)) & 0x07) | (((b ^ col) & 0x01) << 3)];
290               *(p++) = v;
291               *(p++) = v;
292            }
293            break;
284         switch(columns)
285         {
286            case 40:
287               artifact_map_ptr = &hires_artifact_map[((vram_row[col+1] & 0x80) >> 7) * 16];
288               for (b = 0; b < 7; b++)
289               {
290                  v = artifact_map_ptr[((w >> (b + 7-1)) & 0x07) | (((b ^ col) & 0x01) << 3)];
291                  *(p++) = v;
292                  *(p++) = v;
293               }
294               break;
294295
295         case 80:
296            for (b = 0; b < 7; b++)
297            {
298               v = dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F];
299               *(p++) = v;
300            }
301            break;
296            case 80:
297               for (b = 0; b < 7; b++)
298               {
299                  v = dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F];
300                  *(p++) = v;
301               }
302               break;
302303
303         default:
304            assert(0);
305            break;
304            default:
305               fatalerror("Invalid column count");
306               break;
306307         }
307308      }
308309   }
src/mess/drivers/jaguar.c
r989r990
462462   /* video hardware */
463463   MDRV_VIDEO_ATTRIBUTES(VIDEO_TYPE_RASTER | VIDEO_UPDATE_BEFORE_VBLANK)
464464   MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
465   MDRV_SCREEN_SIZE(40*8, 30*8)
465   MDRV_SCREEN_SIZE(42*8, 262)     /* guess -- TOM registers should be used to configure screen */
466466   MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
467467   MDRV_PALETTE_LENGTH(65534)
468468

Previous 15994 Revisions Next


© 1998-2018 The MESS Team