Changeset 26553e2 in buchla-68k for ram

Timestamp:

11/12/2017 07:21:55 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

3fcb810

Parents:

fa50076

Message:

Fixed sqexec.c.

Location:

ram

Files:

• ptdisp.c (modified) (1 diff)
• ptdisp.x (modified) (1 diff)
• sqexec.c (modified) (16 diffs)
• sqexec.x (modified) (2 diffs)

ram/ptdisp.c

@@ -9 +9 @@
 
 uint16_t        seqflag[16];            /* sequence flags */
-uint16_t        seqline[16];            /* current sequencer line */
+int16_t         seqline[16];            /* current sequencer line */
 uint16_t        seqstim[16];            /* sequence stimulus */
 uint16_t        seqtime[16];            /* sequence timers */

ram/ptdisp.x

@@ -20 +20 @@
 extern  int8_t          *ptmcon[];
 extern  uint16_t        seqflag[16];
-extern  uint16_t        seqline[16];
+extern  int16_t         seqline[16];
 extern  uint16_t        seqstim[16];
 extern  struct  seqent  seqtab[NSLINES];

ram/sqexec.c

@@ -21 +21 @@
 #endif
 
-int16_t seqdspn;
-
-int16_t rtab[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F,
-                   0x003F, 0x003F, 0x003F };
+int16_t         seqdspn;
+
+uint16_t        rtab[] = {
+                        0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F,
+                        0x003F, 0x003F, 0x003F
+};
 
 /*
@@ -50 +52 @@
         case SQ_RND:    /* random number */
 
-                return((int16_t)rand24() & rtab[SQ_MVAL & dat]);
+                return((uint16_t)rand24() & rtab[SQ_MVAL & dat]);
 
         default:        /* something weird got in here ... */
@@ -64 +66 @@
 */
 
-int16_t dosqact(uint16_t seq, uint16_t act, uint16_t dat)
+int16_t dosqact(int16_t seq, uint16_t act, uint16_t dat)
 {
         register uint16_t obj, val;
@@ -105 +107 @@
                 trstate[val] = 1;
                 putwq(&ptefifo, (0x1100 | val));
-                seqdupd |= (1 << val);
+                seqdupd |= ((uint16_t)1 << val);
                 return(0);
 
@@ -111 +113 @@
 
                 trstate[val] = 0;
-                seqdupd |= (1 << val);
+                seqdupd |= ((uint16_t)1 << val);
                 return(0);
 
@@ -121 +123 @@
                         putwq(&ptefifo, (0x1100 | val));
 
-                seqdupd |= (1 << val);
+                seqdupd |= ((uint16_t)1 << val);
                 return(0);
 
@@ -131 +133 @@
 
                 sregval[obj] = evaltv(dat);
-                seqdupd |= (1 << obj);
+                seqdupd |= ((uint16_t)1 << obj);
                 return(0);
 
@@ -138 +140 @@
                 if (dat & SQ_MFLG) {
 
-                        sv = sregval[obj] - evaltv(dat);
+                        sv = (int16_t)(sregval[obj] - evaltv(dat));
 
                         if (sv < 0)
                                 sv = 0;
 
-                        sregval[obj] = sv;
+                        sregval[obj] = (uint16_t)sv;
 
                 } else {
 
-                        sv = sregval[obj] + evaltv(dat);
+                        sv = (int16_t)(sregval[obj] + evaltv(dat));
 
                         if (sv > 99)
                                 sv = 99;
 
-                        sregval[obj] = sv;
+                        sregval[obj] = (uint16_t)sv;
 
                 }
 
-                seqdupd |= (1 << obj);
+                seqdupd |= ((uint16_t)1 << obj);
                 return(0);
 
@@ -195 +197 @@
         case SQ_JUMP:                   /* Jump to sequence line */
 
-                seqline[seq]  = dat;
+                seqline[seq]  = (int16_t)dat;
                 seqtime[seq]  = seqtab[dat].seqtime;
                 seqflag[seq] |= SQF_CLK;
 
-                seqdupd |= (1 << seq);
+                seqdupd |= ((uint16_t)1 << seq);
                 return(-1);
 
@@ -209 +211 @@
                 seqtime[seq] = 0;
 
-                seqdupd |= (1 << seq);
+                seqdupd |= ((uint16_t)1 << seq);
                 return(-1);
 
@@ -221 +223 @@
 */
 
-void sqexec(uint16_t seq)
+void sqexec(int16_t seq)
 {
-        register uint16_t act, dat, line;
+        register uint16_t act, dat;
         register struct seqent *sp;
-        register int16_t rc;
+        register int16_t line, rc;
 
         line = seqline[seq];
@@ -291 +293 @@
 #endif
 
-        seqdupd |= (1 << seq);
+        seqdupd |= ((uint16_t)1 << seq);
 }
 
@@ -302 +304 @@
 void seqproc(void)
 {
-        register uint16_t oldsr, seq;
-        register int16_t dspn;
+        register uint16_t oldsr;
+        register int16_t seq, dspn;
         register uint16_t *fp;
         int8_t  linbuf[66];
@@ -319 +321 @@
 
                                         if (0 EQ --seqtime[seq])
-                                                *fp &= ~SQF_CLK;
+                                                *fp &= ~(uint16_t)SQF_CLK;
 
                                 } else {
 
-                                        *fp &= ~SQF_CLK;
+                                        *fp &= ~(uint16_t)SQF_CLK;
                                 }
                         }
@@ -344 +346 @@
                         ndisp, seqdupd);
 #endif
-                if (seqdupd & (1 << seqdspn)) {
+                if (seqdupd & ((uint16_t)1 << seqdspn)) {
 
                         dspn = seqdspn;
@@ -371 +373 @@
                                   PDSEQRN : PDSEQFG) << 4) | PDSEQBG, 16);
 #endif
-                        seqdupd &= ~(1 << dspn);
+                        seqdupd &= ~((uint16_t)1 << dspn);
                 }
 

ram/sqexec.x

@@ -15 +15 @@
 */
 
-extern  int16_t         rtab[];
+extern  uint16_t        rtab[];
 extern  int16_t         seqdspn;
 
@@ -24 +24 @@
 */
 
-extern  int16_t         dosqact(uint16_t seq, uint16_t act, uint16_t dat);
+extern  int16_t         dosqact(int16_t seq, uint16_t act, uint16_t dat);
 extern  uint16_t        evaltv(uint16_t dat);
 extern  void            seqproc(void);
-extern  void            sqexec(uint16_t seq);
+extern  void            sqexec(int16_t seq);