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

ram/sedump.c

@@ -18 +18 @@
 #include "instdsp.h"
 
-extern  unsigned        scrl;
-
-extern  short   curfunc;
-extern  short   curvce;
-extern  short   sbase;
-extern  short   sd;
-extern  short   se;
-extern  short   soffset;
-extern  short   subj;
-
-extern  short   varmode[][16];
+extern  uint16_t        scrl;
+
+extern  int16_t curfunc;
+extern  int16_t curvce;
+extern  int16_t sbase;
+extern  int16_t sd;
+extern  int16_t se;
+extern  int16_t soffset;
+extern  int16_t subj;
+
+extern  int16_t varmode[][16];
 
 extern  struct  gdsel   *gdstbc[NGDSEL];
@@ -39 +39 @@
 extern  struct  instdef vbufs[];
 
-extern  char    *idbxlbl[];
-extern  char    *osclbl[];
-
-/* 
-
-*/
-
-char    *A6PTR = 0L;            /* traceback a6 starting address */
-char    *A7PTR = 0L;            /* traceback a7 starting address */
-char    *A7TOP = 0x000FFFFFL;   /* traceback stack top */
-
-short   SCnumv = 0;             /* voice for SCvoice()  to dump (0..11) */
-short   SL_Flag;                /* ROMP trap disable flag */
-short   x_unrec;                /* unrecognized event type or size flag */
-
-long    SCdlim = MAX_SE;        /* score dump limit */
-
-char *evkinds[N_ETYPES] = {     /* event types (must match score.h) */
+extern  int8_t  *idbxlbl[];
+extern  int8_t  *osclbl[];
+
+/* 
+
+*/
+
+int8_t  *A6PTR = 0L;            /* traceback a6 starting address */
+int8_t  *A7PTR = 0L;            /* traceback a7 starting address */
+int8_t  *A7TOP = 0x000FFFFFL;   /* traceback stack top */
+
+int16_t SCnumv = 0;             /* voice for SCvoice()  to dump (0..11) */
+int16_t SL_Flag;                /* ROMP trap disable flag */
+int16_t x_unrec;                /* unrecognized event type or size flag */
+
+int32_t SCdlim = MAX_SE;        /* score dump limit */
+
+int8_t *evkinds[N_ETYPES] = {   /* event types (must match score.h) */
 
         "00: EV_NULL  null event   ",   "01: EV_SCORE score begin  ",
@@ -72 +72 @@
 };
 
-char    *hpname[N_TYPES] = {    /* header type names (must match score.h) */
+int8_t  *hpname[N_TYPES] = {    /* header type names (must match score.h) */
 
         "EH_INST",      "EH_GRP ",      "EH_LOCN",      "EH_DYN ",
@@ -79 +79 @@
 };
 
-char    *var_lbl[6] = {         /* variable names */
+int8_t  *var_lbl[6] = {         /* variable names */
 
         "Pch/Hor",      "Mod/Vrt",      "Brth/LP",      "GPC/CV1",
@@ -85 +85 @@
 };
 
-char    *srcname[] = {          /* source names (must match smdefs.h) */
+int8_t  *srcname[] = {          /* source names (must match smdefs.h) */
 
         "NONE", "RAND", "CTL1", "?03?", "?04?", "PTCH", "KPRS", "KVEL",
@@ -91 +91 @@
 };
 
-char    *actname[] = {          /* function action names */
+int8_t  *actname[] = {          /* function action names */
 
         "NULL", "SUST", "ENBL", "JUMP", "LOOP", "KYUP", "KYDN", "HERE"
@@ -108 +108 @@
 */
 
-char *ev_kind(struct s_entry *sep)
+int8_t *ev_kind(struct s_entry *sep)
 {
         if ((sep->e_type & 0x00FF) GE N_ETYPES) {
@@ -157 +157 @@
 void SEsnap(void)
 {
-        register short i, j;
+        register int16_t i, j;
 
         printf("\n");
@@ -211 +211 @@
 struct s_entry *SEdump(struct s_entry *sep)
 {
-        char    *et;
+        int8_t  *et;
 
         x_unrec = TRUE;
@@ -280 +280 @@
 */
 
-struct s_entry *SEchase(struct s_entry *ep, long n)
-{
-        register long i;
+struct s_entry *SEchase(struct s_entry *ep, int32_t n)
+{
+        register int32_t i;
         register struct s_entry *np;
 
@@ -331 +331 @@
 void SLdump(void)
 {
-        register short i;
+        register int16_t i;
         register struct gdsel *gp;
 
@@ -374 +374 @@
 void SECdump(void)
 {
-        register short i;
+        register int16_t i;
 
         printf("p_sbgn = $%08lX  p_send = $%08lX\n",
@@ -438 +438 @@
 void DOA(void)
 {
-        register long *olda6, *cura6;
-        register short n, *prptr;
+        register int32_t *olda6, *cura6;
+        register int16_t n, *prptr;
 
         if (A6PTR AND A7PTR) {
@@ -551 +551 @@
 void SCslice(void)
 {
-        register short i, s;
+        register int16_t i, s;
         register struct gdsel *gp;
 
@@ -652 +652 @@
 */
 
-void SCvce(int n)
-{
-        register short i, j, pif, pt1;
+void SCvce(int16_t n)
+{
+        register int16_t i, j, pif, pt1;
         register struct instdef *ip;
         register struct idfnhdr *fp;
@@ -743 +743 @@
 void SCvces(void)
 {
-        register short i;
+        register int16_t i;
 
         for (i = 0; i < 12; i++)