Merge pull request #489 from sneakywumpus/dev

make this less cryptic for the casual reader & core name typo
udo-munk · Dec 19, 2024 · c31677e · c31677e
2 parents 5a060fe + da9b5fc
commit c31677e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/picosim/srcsim/picosim.c b/picosim/srcsim/picosim.c
@@ -149,7 +149,7 @@ int main(void)
 	printf("%s release %s\n", USR_COM, USR_REL);
 #if PICO_RP2350
 #if PICO_RISCV
-	puts("running on Hazard RISC-V cores");
+	puts("running on Hazard3 RISC-V cores");
 #else
 	puts("running on ARM Cortex-M33 cores");
 #endif

diff --git a/z80asm/z80alst.c b/z80asm/z80alst.c
@@ -348,7 +348,7 @@ static void lst_byte(BYTE b)
 	register char c;
 
 	c = b >> 4;
-	fputc(c + (c < 10 ? '0' : 'W'), lstfp);
+	fputc(c + (c < 10 ? '0' : 'a' - 10), lstfp);
 	c = b & 0xf;
-	fputc(c + (c < 10 ? '0' : 'W'), lstfp);
+	fputc(c + (c < 10 ? '0' : 'a' - 10), lstfp);
 }
diff --git a/z80asm/z80amfun.c b/z80asm/z80amfun.c
@@ -328,13 +328,13 @@ static void expn_add_loc(struct expn *e, char *name)
 		asmerr(E_OUTLCL);
 	} else {
 		c = mac_loc_cnt >> 12;
-		*s++ = c + (c < 10 ? '0' : 'W');
+		*s++ = c + (c < 10 ? '0' : 'a' - 10);
 		c = (mac_loc_cnt >> 8) & 0xf;
-		*s++ = c + (c < 10 ? '0' : 'W');
+		*s++ = c + (c < 10 ? '0' : 'a' - 10);
 		c = (mac_loc_cnt >> 4) & 0xf;
-		*s++ = c + (c < 10 ? '0' : 'W');
+		*s++ = c + (c < 10 ? '0' : 'a' - 10);
 		c = mac_loc_cnt++ & 0xf;
-		*s++ = c + (c < 10 ? '0' : 'W');
+		*s++ = c + (c < 10 ? '0' : 'a' - 10);
 	}
 	*s = '\0';
 	l->loc_next = NULL;
@@ -791,7 +791,7 @@ static char *mac_next_parm(char *s)
 			/* generate digits backwards in current radix */
 			for (t = t1; m > 0; m--) {
 				v = w % r;
-				*--t = v + (v < 10 ? '0' : 'W');
+				*--t = v + (v < 10 ? '0' : 'a' - 10);
 				w /= r;
 			}
 			break;

diff --git a/z80asm/z80anum.c b/z80asm/z80anum.c
@@ -181,7 +181,7 @@ static int get_token(void)
 		n = 0;
 		while (IS_XDIG(*s)) {
 			n *= 16;
-			n += TO_UPP(*s) - ((*s <= '9') ? '0' : '7');
+			n += TO_UPP(*s) - ((*s <= '9') ? '0' : 'A' - 10);
 			s++;
 		}
 		if (*s == STRDEL) {
@@ -218,7 +218,8 @@ static int get_token(void)
 					continue;
 				}
 				if (IS_XDIG(*p1)) {
-					m = *p1 - ((*p1 <= '9') ? '0' : '7');
+					m = *p1 - ((*p1 <= '9') ? '0'
+								: 'A' - 10);
 					if (m < base) {
 						n *= base;
 						n += m;

diff --git a/z80asm/z80aobj.c b/z80asm/z80aobj.c
@@ -468,9 +468,9 @@ static char *btoh(BYTE b, char *p)
 	register char c;
 
 	c = b >> 4;
-	*p++ = c + (c < 10 ? '0' : '7');
+	*p++ = c + (c < 10 ? '0' : 'A' - 10);
 	c = b & 0xf;
-	*p++ = c + (c < 10 ? '0' : '7');
+	*p++ = c + (c < 10 ? '0' : 'A' - 10);
 	return p;
 }
 

diff --git a/z80core/simdis.c b/z80core/simdis.c
@@ -446,9 +446,9 @@ static char *btoh(BYTE b, char *p)
 	register char c;
 
 	c = b >> 4;
-	*p++ = c + (c < 10 ? '0' : '7');
+	*p++ = c + (c < 10 ? '0' : 'A' - 10);
 	c = b & 0xf;
-	*p++ = c + (c < 10 ? '0' : '7');
+	*p++ = c + (c < 10 ? '0' : 'A' - 10);
 	return p;
 }
 
@@ -467,7 +467,7 @@ static char *wtoa(WORD w, char *p)
 		if (onlyz && c > 9)
 			*p++ = '0';
 		if (!onlyz || c) {
-			*p++ = c + (c < 10 ? '0' : '7');
+			*p++ = c + (c < 10 ? '0' : 'A' - 10);
 			onlyz = 0;
 		}
 	}