Changeset 7258c6a in buchla-68k for ram/etadyn.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/etadyn.c (modified) (8 diffs)

ram/etadyn.c

@@ -18 +18 @@
 #include "instdsp.h"
 
-extern  unsigned        setsr(unsigned sr);
-
-extern  unsigned        *asgob;
-
-extern  unsigned        curintp;
-
-extern  short           stccol;
-extern  short           stcrow;
-extern  short           timemlt;
-
-extern  char            dspbuf[];
-
-extern  short           vce2grp[];
-extern  short           grpdyn[];
-extern  short           dyntab[];
-
-extern  short           expbit[];
-
-extern  short           adbox[][8];
+extern  uint16_t        setsr(uint16_t sr);
+
+extern  uint16_t        *asgob;
+
+extern  uint16_t        curintp;
+
+extern  int16_t         stccol;
+extern  int16_t         stcrow;
+extern  int16_t         timemlt;
+
+extern  int8_t          dspbuf[];
+
+extern  int16_t         vce2grp[];
+extern  int16_t         grpdyn[];
+extern  int16_t         dyntab[];
+
+extern  int16_t         expbit[];
+
+extern  int16_t         adbox[][8];
 
 extern  struct instdef  vbufs[];
@@ -50 +50 @@
 */
 
-short et_adyn(short n)
-{
-        register short grp;
+int16_t et_adyn(int16_t n)
+{
+        register int16_t grp;
 
         grp = 0x00FF & (n >> 8);
@@ -74 +74 @@
 */
 
-void setdyn(short grp, short dyn)
-{
-        register short g, i, val;
-        register long ltmp;
-        register unsigned *fpu;
+void setdyn(int16_t grp, int16_t dyn)
+{
+        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;
 
         grpdyn[grp] = dyn;
@@ -88 +88 @@
         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];
@@ -107 +107 @@
 
                         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;
 
@@ -139 +139 @@
 */
 
-short ef_adyn(short n)
-{
-        register short dyn, grp;
+int16_t ef_adyn(int16_t n)
+{
+        register int16_t dyn, grp;
 
         grp = 0x00FF & (n >> 8);
@@ -165 +165 @@
 */
 
-short rd_adyn(short nn)
-{
-        register short n, grp;
+int16_t rd_adyn(int16_t nn)
+{
+        register int16_t n, grp;
 
         n = 0x00FF & nn;
@@ -188 +188 @@
 */
 
-short nd_adyn(short nn, short k)
-{
-        register short n;
+int16_t nd_adyn(int16_t nn, int16_t k)
+{
+        register int16_t n;
 
         n = nn & 0xFF;