From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sun, 10 Apr 2022 16:30:04 +0000 (+0100)
Subject: attempting to sort out what looks like a stack overflow
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d5d8c74be474364d884a842e2466a2328044f253;p=ls2.git

attempting to sort out what looks like a stack overflow
---

diff --git a/coldboot/coldboot.c b/coldboot/coldboot.c
index 0f42a82..bd030c4 100644
--- a/coldboot/coldboot.c
+++ b/coldboot/coldboot.c
@@ -35,15 +35,6 @@ struct uart_regs {
 	uint32_t ev_enable;
 };
 
-void memcpy(void *dest, void *src, size_t n) {
-   int i;
-   //cast src and dest to char*
-   char *src_char = (char *)src;
-   char *dest_char = (char *)dest;
-   for (i=0; i<n; i++)
-	  dest_char[i] = src_char[i]; //copy contents byte by byte
-}
-
 void uart_writeuint32(uint32_t val) {
 	const char lut[] = { '0', '1', '2', '3', '4', '5', '6', '7',
                          '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
@@ -56,6 +47,23 @@ void uart_writeuint32(uint32_t val) {
 	}
 }
 
+void memcpy(void *dest, void *src, size_t n) {
+    int i;
+    //cast src and dest to char*
+    char *src_char = (char *)src;
+    char *dest_char = (char *)dest;
+    for (i=0; i<n; i++) {
+#if 0
+        if ((i % 1024) == 1023) {
+            puts("memcpy ");
+            uart_writeuint32(i);
+            puts("\r\n");
+        }
+#endif
+        dest_char[i] = src_char[i]; //copy contents byte by byte
+    }
+}
+
 void isr(void) {
 
 }
@@ -104,7 +112,7 @@ static unsigned long copy_flash(unsigned int offset)
         puts(" size ");
         uart_writeuint32(size);
         puts(" addr ");
-        uart_writeuint32((uint32_t)addr);
+        uart_writeuint32((uint32_t)(unsigned long)addr);
         puts("\r\n");
         fl_read(addr, off, size);
         poff += ehdr.e_phentsize;
diff --git a/coldboot/powerpc.lds.S b/coldboot/powerpc.lds.S
index b673295..4063402 100644
--- a/coldboot/powerpc.lds.S
+++ b/coldboot/powerpc.lds.S
@@ -22,6 +22,6 @@ SECTIONS
 	}
 	. = ALIGN(0x10);
 	__bss_end = .;
-	. = . + 0x5000;
+	. = . + 0x5500;
 	__stack_top = .;
 }