Changeset 7258c6a in buchla-68k for ram/etloc.c

Timestamp:

07/09/2017 04:45:34 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

8618599

Parents:

0292fbb

Message:

Use standard integer types.

File:

• ram/etloc.c (modified) (9 diffs)

ram/etloc.c

@@ -20 +20 @@
 #include "instdsp.h"
 
-extern  unsigned        setsr(unsigned sr);
-
-extern  unsigned        *obj8;
-
-extern  unsigned        curintp;
-
-extern  short           ctrsw;
-extern  short           timemlt;
-extern  short           recsw;
-extern  short           stccol;
-
-extern  short           grploc[];
-extern  short           grpmode[];
-extern  short           grpstat[];
-extern  short           loctab[];
-extern  short           vce2grp[];
-
-extern  short           expbit[];
+extern  uint16_t        setsr(uint16_t sr);
+
+extern  uint16_t        *obj8;
+
+extern  uint16_t        curintp;
+
+extern  int16_t         ctrsw;
+extern  int16_t         timemlt;
+extern  int16_t         recsw;
+extern  int16_t         stccol;
+
+extern  int16_t         grploc[];
+extern  int16_t         grpmode[];
+extern  int16_t         grpstat[];
+extern  int16_t         loctab[];
+extern  int16_t         vce2grp[];
+
+extern  int16_t         expbit[];
 
 extern  struct gdsel    *gdstbc[];
@@ -53 +53 @@
 */
 
-short et_loc(short n)
+int16_t et_loc(int16_t n)
 {
         ebuf[0] =grploc[n] + 1 + '0';
@@ -71 +71 @@
 */
 
-void setloc(short grp, short loc)
-{
-        register short g, i, val;
-        register long ltmp;
-        register unsigned *fpu;
+void setloc(int16_t grp, int16_t loc)
+{
+        register int16_t g, i, val;
+        register int32_t ltmp;
+        register uint16_t *fpu;
         register struct idfnhdr *fp;
-        unsigned fpmant, fpexp;
-        short oldsr;
-        short nop;
+        uint16_t fpmant, fpexp;
+        int16_t oldsr;
+        int16_t nop;
 
         grploc[grp] = loc;
@@ -85 +85 @@
         g = grp + 1;
 
-        fpmant = (((long)curintp & 0x0000FFF0L) *
-                  ((long)timemlt & 0x0000FFFFL)) >> 15;
+        fpmant = (((int32_t)curintp & 0x0000FFF0L) *
+                  ((int32_t)timemlt & 0x0000FFFFL)) >> 15;
 
         fpexp = expbit[curintp & 0x000F];
@@ -105 +105 @@
                         fp->idftmd ^= I_NVBITS;
 
-                        *(fpu + (long)FPU_TMNT) = fpmant;
+                        *(fpu + (int32_t)FPU_TMNT) = fpmant;
                         ++nop;  ++nop;  ++nop;
-                        *(fpu + (long)FPU_TEXP) = fpexp;
+                        *(fpu + (int32_t)FPU_TEXP) = fpexp;
                         ++nop;  ++nop;  ++nop;
 
                         if (fp->idftmd & I_VNSUBN)
-                                *(fpu + (long)FPU_TNV1) = val;
+                                *(fpu + (int32_t)FPU_TNV1) = val;
                         else
-                                *(fpu + (long)FPU_TNV0) = val;
+                                *(fpu + (int32_t)FPU_TNV0) = val;
 
                         ++nop;  ++nop;  ++nop;
 
-                        *(fpu + (long)FPU_TCTL) =
+                        *(fpu + (int32_t)FPU_TCTL) =
                                 (fp->idftmd & (I_NRATIO | I_NVBITS)) | 0x0001;
 
@@ -137 +137 @@
 */
 
-short ef_loc(short n)
-{
-        register short ival;
+int16_t ef_loc(int16_t n)
+{
+        register int16_t ival;
         register struct s_entry *ep;
 
@@ -186 +186 @@
 */
 
-short rd_loc(short n)
+int16_t rd_loc(int16_t n)
 {
         if (v_regs[5] & 0x0180)
@@ -204 +204 @@
 void ds_loc(void)
 {
-        register short i;
+        register int16_t i;
 
         for (i = 0; i < 12; i++)
@@ -220 +220 @@
 */
 
-short nd_loc(short n, short k)
+int16_t nd_loc(int16_t n, int16_t k)
 {
         ebuf[0]  = k + '0';