Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. 40acafbb21bfaf6e75fa06df75aaf762079d2dd0
|
From: kosmirror <kos...@us...> - 2025-05-21 18:20:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".
The branch, master has been updated
via 40acafbb21bfaf6e75fa06df75aaf762079d2dd0 (commit)
from 07614ba6df19ea975310f41fcb4932dcbe8b7adc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 40acafbb21bfaf6e75fa06df75aaf762079d2dd0
Author: darc <da...@pr...>
Date: Wed May 21 13:01:25 2025 -0500
Fix warnings previously hidden behind ifdef guards
-----------------------------------------------------------------------
Summary of changes:
kernel/arch/dreamcast/fs/fs_vmu.c | 2 +-
kernel/fs/elf.c | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/kernel/arch/dreamcast/fs/fs_vmu.c b/kernel/arch/dreamcast/fs/fs_vmu.c
index 7518d017..59ffc09c 100644
--- a/kernel/arch/dreamcast/fs/fs_vmu.c
+++ b/kernel/arch/dreamcast/fs/fs_vmu.c
@@ -520,7 +520,7 @@ static ssize_t vmu_write(void * hnd, const void *buffer, size_t cnt) {
/* insert the data in buffer into fh->data at fh->loc */
if(__is_defined(VMUFS_DEBUG)) {
- dbglog(DBG_KDEBUG, "VMUFS: adding %d bytes of data at loc %d (%d avail)\n",
+ dbglog(DBG_KDEBUG, "VMUFS: adding %d bytes of data at loc %ld (%ld avail)\n",
cnt, fh->loc, fh->filesize * 512);
}
diff --git a/kernel/fs/elf.c b/kernel/fs/elf.c
index c080f17a..2d40db4b 100644
--- a/kernel/fs/elf.c
+++ b/kernel/fs/elf.c
@@ -194,12 +194,12 @@ int elf_load(const char * fn, klibrary_t * shell, elf_prog_t * out) {
for(i = 0; i < hdr->shnum; i++) {
if(shdrs[i].flags & SHF_ALLOC) {
if(shdrs[i].type == SHT_NOBITS) {
- DBG((" setting %d bytes of zeros at %08x\n",
+ DBG((" setting %ld bytes of zeros at %08lx\n",
shdrs[i].size, shdrs[i].addr));
memset(imgout + shdrs[i].addr, 0, shdrs[i].size);
}
else {
- DBG((" copying %d bytes from %08x to %08x\n",
+ DBG((" copying %ld bytes from %08lx to %08lx\n",
shdrs[i].size, shdrs[i].offset, shdrs[i].addr));
memcpy(imgout + shdrs[i].addr,
img + shdrs[i].offset,
@@ -232,7 +232,7 @@ int elf_load(const char * fn, klibrary_t * shell, elf_prog_t * out) {
}
/* Patch it in */
- DBG((" symbol '%s' patched to 0x%lx\n",
+ DBG((" symbol '%s' patched to 0x%x\n",
(const char *)(symtab[i].name),
sym->ptr));
symtab[i].value = sym->ptr;
@@ -266,7 +266,7 @@ int elf_load(const char * fn, klibrary_t * shell, elf_prog_t * out) {
sym = ELF32_R_SYM(relatab[j].info);
if(symtab[sym].shndx == SHN_UNDEF) {
- DBG((" Writing undefined RELA %08x(%08lx+%08lx) -> %08x\n",
+ DBG((" Writing undefined RELA %08lx(%08lx+%08lx) -> %08lx\n",
symtab[sym].value + relatab[j].addend,
symtab[sym].value,
relatab[j].addend,
@@ -278,7 +278,7 @@ int elf_load(const char * fn, klibrary_t * shell, elf_prog_t * out) {
+ relatab[j].addend;
}
else {
- DBG((" Writing RELA %08x(%08x+%08x+%08x+%08x) -> %08x\n",
+ DBG((" Writing RELA %08lx(%08lx+%08lx+%08lx+%08lx) -> %08lx\n",
vma + shdrs[symtab[sym].shndx].addr + symtab[sym].value + relatab[j].addend,
vma, shdrs[symtab[sym].shndx].addr, symtab[sym].value, relatab[j].addend,
vma + shdrs[sect].addr + relatab[j].offset));
@@ -317,7 +317,7 @@ int elf_load(const char * fn, klibrary_t * shell, elf_prog_t * out) {
uint32 value = symtab[sym].value;
if(sect == 1 && j < 5) {
- DBG((" Writing undefined %s %08x -> %08x",
+ DBG((" Writing undefined %s %08lx -> %08lx",
pcrel ? "PCREL" : "ABSREL",
value,
vma + shdrs[sect].addr + reltab[j].offset));
@@ -332,7 +332,7 @@ int elf_load(const char * fn, klibrary_t * shell, elf_prog_t * out) {
+= value;
if(sect == 1 && j < 5) {
- DBG(("(%08x)\n", *((uint32 *)(imgout + shdrs[sect].addr + reltab[j].offset))));
+ DBG(("(%08lx)\n", *((uint32 *)(imgout + shdrs[sect].addr + reltab[j].offset))));
}
}
else {
@@ -340,7 +340,7 @@ int elf_load(const char * fn, klibrary_t * shell, elf_prog_t * out) {
+ symtab[sym].value;
if(sect == 1 && j < 5) {
- DBG((" Writing %s %08x(%08x+%08x+%08x) -> %08x",
+ DBG((" Writing %s %08lx(%08lx+%08lx+%08lx) -> %08lx",
pcrel ? "PCREL" : "ABSREL",
value,
vma, shdrs[symtab[sym].shndx].addr, symtab[sym].value,
@@ -356,7 +356,7 @@ int elf_load(const char * fn, klibrary_t * shell, elf_prog_t * out) {
+= value;
if(sect == 1 && j < 5) {
- DBG(("(%08x)\n", *((uint32 *)(imgout + shdrs[sect].addr + reltab[j].offset))));
+ DBG(("(%08lx)\n", *((uint32 *)(imgout + shdrs[sect].addr + reltab[j].offset))));
}
}
}
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
