Changeset 09d1345 in buchla-68k for vlib/vobjfns.c

Timestamp:

07/15/2017 10:03:02 AM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

bf89cfb

Parents:

6a37d5b

Message:

Prefer signed integers in vlib.

File:

• vlib/vobjfns.c (modified) (7 diffs)

vlib/vobjfns.c

@@ -69 +69 @@
         op = &v_obtab[obj];
 
-        newbank = ((op->obank & 0x0001) << 8) | ((op->obank & 0x0002) << 6);
+        newbank = ((op->obank & 0x0001u) << 8) | ((op->obank & 0x0002u) << 6);
 
         v_nobj = obj;
@@ -109 +109 @@
         setipl(7);                              /* disable interrupts */
 
-        vi_ctl |= (1 << pri);                   /* set unblank bit */
+        vi_ctl |= (1u << pri);                  /* set unblank bit */
 
         if (*((int32_t *)0x000064) NE &VIint)   /* make sure VI vector is set */
@@ -124 +124 @@
 */
 
-void SetObj(int16_t obj, int16_t type, int16_t bank, uint16_t *base, int16_t xpix, int16_t ypix, int16_t x0, int16_t y0, int16_t flags, int16_t pri)
+void SetObj(int16_t obj, int16_t type, int16_t bank, uint16_t *base, int16_t xpix, int16_t ypix, int16_t x0, int16_t y0, uint16_t flags, int16_t pri)
 {
         register struct octent *op;
@@ -148 +148 @@
         if (type) {     /* character objects */
 
-                op->odtw0 = (flags & 0xF9FF) | V_CTYPE;
+                op->odtw0 = (flags & 0xF9FFu) | V_CTYPE;
 
                 switch (V_RES3 & op->odtw0) {
@@ -179 +179 @@
         } else {        /* bitmap objects */
 
-                op->odtw0 = (flags & 0x0E37) | (V_BTYPE | ((bank & 3) << 6));
+                op->odtw0 = (flags & 0x0E37u) | (V_BTYPE | (((uint16_t)bank & 3u) << 6));
 
                 switch (V_RES3 & op->odtw0) {
@@ -201 +201 @@
         }
 
-        op->odtw1 = ((x0 >> 1) & 0x03FF) | (0xFC00 & (wsize << 10));
+        op->odtw1 = (((uint16_t)x0 >> 1) & 0x03FFu) | (0xFC00u & ((uint16_t)wsize << 10));
 
         if (pri < 0)
@@ -219 +219 @@
 */
 
-void CpyObj(uint16_t *from, uint16_t *to, uint16_t w, uint16_t h, uint16_t sw)
+void CpyObj(uint16_t *from, uint16_t *to, int16_t w, int16_t h, int16_t sw)
 {
         register uint16_t *tp;
-        register uint16_t i, j;
+        register int16_t i, j;
 
         for (i = h; i--; ) {