fixed optimization bug where array index is 16-bit, e.g. arr16[i & 0x7f7f]

[cc65] / include / _vic.h

diff --git a/include/_vic.h b/include/_vic.h
index 05897140426e6decd7c4930d38a325d303d14d0f..ac4d8a2ca5db1ce2cef23be7f6ceddc45b101279 100644 (file)
--- a/include/_vic.h
+++ b/include/_vic.h
@@ -1,12 +1,12 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                 _vic.h                                   */
+/*                                  _vic.h                                   */
 /*                                                                           */
-/*               Internal include file, do not use directly                 */
+/*                Internal include file, do not use directly                 */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2000 Ullrich von Bassewitz                                       */
+/* (C) 2002      Ullrich von Bassewitz                                       */
 /*               Wacholderweg 14                                             */
 /*               D-70597 Stuttgart                                           */
 /* EMail:        uz@musoftware.de                                            */
@@ -40,57 +40,22 @@
 
 /* Define a structure with the vic register offsets */
 struct __vic {
-    unsigned char      spr0_x;         /* Sprite 0, X coordinate */
-    unsigned char      spr0_y;         /* Sprite 0, Y coordinate */
-    unsigned char              spr1_x;         /* Sprite 1, X coordinate */
-    unsigned char      spr1_y;         /* Sprite 1, Y coordinate */
-    unsigned char      spr2_x;         /* Sprite 2, X coordinate */
-    unsigned char      spr2_y;         /* Sprite 2, Y coordinate */
-    unsigned char      spr3_x;         /* Sprite 3, X coordinate */
-    unsigned char      spr3_y;         /* Sprite 3, Y coordinate */
-    unsigned char      spr4_x;         /* Sprite 4, X coordinate */
-    unsigned char      spr4_y;         /* Sprite 4, Y coordinate */
-    unsigned char      spr5_x;         /* Sprite 5, X coordinate */
-    unsigned char      spr5_y;         /* Sprite 5, Y coordinate */
-    unsigned char      spr6_x;         /* Sprite 6, X coordinate */
-    unsigned char      spr6_y;         /* Sprite 6, Y coordinate */
-    unsigned char      spr7_x;         /* Sprite 7, X coordinate */
-    unsigned char      spr7_y;         /* Sprite 7, Y coordinate */
-    unsigned char      spr_hi_x;       /* High bits of X coordinate */
-    unsigned char      ctrl1;          /* Control register 1 */
-    unsigned char      rasterline;     /* Current raster line */
-    unsigned char      strobe_x;       /* Light pen, X position */
-    unsigned char      strobe_y;       /* Light pen, Y position */
-    unsigned char      spr_ena;        /* Enable sprites */
-    unsigned char      ctrl2;          /* Control register 2 */
-    unsigned char      spr_exp_x;      /* Expand sprites in X dir */
-    unsigned char      addr;           /* Address of chargen and video ram */
-    unsigned char      irr;            /* Interrupt request register */
-    unsigned char      imr;            /* Interrupt mask register */
-    unsigned char      spr_bg_prio;    /* Priority to background */
-    unsigned char      spr_mcolor;     /* Sprite multicolor bits */
-    unsigned char      spr_exp_y;      /* Expand sprites in Y dir */
-    unsigned char      spr_coll;       /* Sprite/sprite collision reg */
-    unsigned char      spr_bg_coll;    /* Sprite/background collision reg */
-    unsigned char              bordercolor;    /* Border color */
-    unsigned char      bgcolor0;       /* Background color 0 */
-    unsigned char      bgcolor1;       /* Background color 1 */
-    unsigned char      bgcolor2;       /* Background color 2 */
-    unsigned char      bgcolor3;       /* Background color 3 */
-    unsigned char      spr_mcolor0;    /* Color 0 for multicolor sprites */
-    unsigned char              spr_mcolor1;    /* Color 1 for multicolor sprites */
-    unsigned char      spr0_color;     /* Color sprite 0 */
-    unsigned char              spr1_color;     /* Color sprite 1 */
-    unsigned char      spr2_color;     /* Color sprite 2 */
-    unsigned char      spr3_color;     /* Color sprite 3 */
-    unsigned char      spr4_color;     /* Color sprite 4 */
-    unsigned char      spr5_color;     /* Color sprite 5 */
-    unsigned char      spr6_color;     /* Color sprite 6 */
-    unsigned char      spr7_color;     /* Color sprite 7 */
-
-    /* The following ones are only valid in the C128: */
-    unsigned char      x_kbd;          /* Additional keyboard lines */
-    unsigned char      clock;          /* Clock switch bit */
+    unsigned char       leftborder;
+    unsigned char       upperborder;
+    unsigned char       charsperline;   /* Characters per line */
+    unsigned char       linecount;      /* Number of lines */
+    unsigned char       rasterline;     /* Current raster line */
+    unsigned char       addr;           /* Address of chargen and video ram */
+    unsigned char       strobe_x;       /* Light pen, X position */
+    unsigned char       strobe_y;       /* Light pen, Y position */
+    unsigned char       analog_x;       /* Analog input X */
+    unsigned char       analog_y;       /* Analog input Y */
+    unsigned char       voice1;         /* Sound generator #1 */
+    unsigned char       voice2;         /* Sound generator #2 */
+    unsigned char       voice3;         /* Sound generator #3 */
+    unsigned char       noise;          /* Noise generator */
+    unsigned char       volume_color;   /* Bits 0..3: volume, 4..7: color */
+    unsigned char       bg_border_color;/* Background and border color */
 };