Changeset add86dd in buchla-68k

Timestamp:

07/14/2017 02:32:11 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

4422c8e

Parents:

7d4cf30

Message:

Incompatible pointers, pointer-int conversions.

Location:

rom

Files:

• booter.c (modified) (3 diffs)
• booter.x (modified) (1 diff)
• romp.c (modified) (11 diffs)
• romp.x (modified) (2 diffs)

rom/booter.c

@@ -24 +24 @@
         B_chk;          /* checksum */
 
-int8_t  *B_buf_a;       /* boot load address */
+int32_t B_buf_a;        /* boot load address */
 
 int16_t B_log_s;        /* boot log switch */
@@ -122 +122 @@
         B_lod_l = B_fhdr.F_Text + B_fhdr.F_Data;
 
-        if (0 NE flread(B_buf_a, B_lod_l, B_file)) {
+        if (0 NE flread((void *)B_buf_a, B_lod_l, B_file)) {
         
 #if     PRINTIT
@@ -138 +138 @@
         B_bss_l = B_fhdr.F_BSS;
 
-        cp    = B_buf_a;        /* calculate checksum */
+        cp    = (int8_t *)B_buf_a;      /* calculate checksum */
         B_chk = 0L;
 

rom/booter.x

@@ -18 +18 @@
 extern  int32_t         B_bss_l;
 extern  int32_t         B_bss_o;
-extern  int8_t          *B_buf_a;
+extern  int32_t         B_buf_a;
 extern  int32_t         B_chk;
 extern  int32_t         B_dat_l;

rom/romp.c

@@ -246 +246 @@
         *p_end,         /* end parameter */
         *p_from,        /* from parameter */
-        *p_goto,        /* goto parameter */
         *p_to,          /* to parameter */
         *sptr;          /* string scan pointer */
@@ -301 +300 @@
 jmp_buf restart;        /* jmp environment */
 
-int32_t p_len,          /* length parameter */
+int32_t p_goto,         /* goto parameter */
+        p_len,          /* length parameter */
         p_value,        /* value parameter */
         p_width;        /* width parameter */
@@ -338 +338 @@
 int16_t cx_rest(void)
 {
-        rjumpto(ROMADDR);
+        rjumpto((void *)ROMADDR);
         return(TRUE);                   /* not reached */
 }
@@ -449 +449 @@
         } else {
 
-                for (i = 0; i < 8; i++)         /* clear d0..d7 */
+                for (i = 0; i < 8; i++)                 /* clear d0..d7 */
                         regptr->d_reg[i] = 0L;
 
-                for (i = 0; i < 7; i++)         /* clear a0..a6 */
+                for (i = 0; i < 7; i++)                 /* clear a0..a6 */
                         regptr->a_reg[i] = 0L;
 
-                regptr->a_reg[7] = ISTACK;      /* setup initial stack */
-
-                regptr->reg_sr = INITSR;        /* setup sr */
-                regptr->reg_pc = B_buf_a;       /* setup pc */
+                regptr->a_reg[7] = ISTACK;              /* setup initial stack */
+
+                regptr->reg_sr = INITSR;                /* setup sr */
+                regptr->reg_pc = (uint32_t)B_buf_a;     /* setup pc */
 
                 return(TRUE);
@@ -581 +581 @@
         vsndpal(dfltpal);
 
-        obj0 = 0x200400L;
+        obj0 = (uint16_t *)0x200400L;
 
         SetObj(0, 0, 0, obj0, 512, 350, 0, 0, (V_RES3 | V_TDE), -1);
@@ -1079 +1079 @@
 */
 
-void padr(int32_t adr, int16_t unit)
+void padr(void *adr, int16_t unit)
 {
         puthn((uint32_t)adr, 8, unit);
@@ -1340 +1340 @@
 
         if (oldloc LT (int16_t *)USER_RAM)
-                rjumpto((int32_t)ROMADDR);
+                rjumpto((void *)ROMADDR);
 
         return(TRUE);
@@ -1364 +1364 @@
         if (getarg()) {
 
-                if (setp(&p_goto, p_goto) EQ FALSE)
-                        return(FALSE);
-
-                if (1L & (int32_t)p_goto)
+                if (setvar(&p_goto, p_goto) EQ FALSE)
+                        return(FALSE);
+
+                if (1L & p_goto)
                         return(FALSE);
 
@@ -1438 +1438 @@
                 *p++ = 0;
 
-        rjumpto(ROMADDR);
+        rjumpto((void *)ROMADDR);
         return(TRUE);                   /* not reached */
 }
@@ -3822 +3822 @@
                                 return(FALSE);
                         else
-                                sjumpto(B_buf_a, (void *)ISTACK);
+                                sjumpto((void *)B_buf_a, (void *)ISTACK);
 
                 } else if (astat AND (asig EQ ROMPKEY)) {       /* ROMP key */
@@ -3902 +3902 @@
         b1flag = FALSE;
 
-        p_goto  = (int8_t *)ROMADDR;
+        p_goto  = ROMADDR;
         p_len   = 0L;
         p_width = 16L;

rom/romp.x

@@ -66 +66 @@
 extern  int8_t          *p_end;
 extern  int8_t          *p_from;
-extern  int8_t          *p_goto;
+extern  int32_t         p_goto;
 extern  int32_t         p_len;
 extern  int8_t          *p_to;
@@ -158 +158 @@
 extern  int16_t         ldump(int32_t *loc, int32_t *lastloc, int16_t nwide, int16_t unit);
 extern  void            main(void);
-extern  void            padr(int32_t adr, int16_t unit);
+extern  void            padr(void *adr, int16_t unit);
 extern  int16_t         pclr(void);
 extern  void            progid(void);