git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated build system to remove `install` from `all`
[tpg/acess2.git]
/
Kernel
/
binary.c
diff --git
a/Kernel/binary.c
b/Kernel/binary.c
index
dae3cfa
..
e96da76
100644
(file)
--- a/
Kernel/binary.c
+++ b/
Kernel/binary.c
@@
-9,9
+9,10
@@
// === CONSTANTS ===
\r
#define BIN_LOWEST MM_USER_MIN // 1MiB
\r
#define BIN_GRANUALITY 0x10000 // 64KiB
\r
// === CONSTANTS ===
\r
#define BIN_LOWEST MM_USER_MIN // 1MiB
\r
#define BIN_GRANUALITY 0x10000 // 64KiB
\r
+//! \todo Move 0xBC000000 to mm_virt.h
\r
#define BIN_HIGHEST (0xBC000000-BIN_GRANUALITY) // Just below the kernel
\r
#define KLIB_LOWEST MM_MODULE_MIN
\r
#define BIN_HIGHEST (0xBC000000-BIN_GRANUALITY) // Just below the kernel
\r
#define KLIB_LOWEST MM_MODULE_MIN
\r
-#define KLIB_GRANUALITY 0x
8000
// 32KiB
\r
+#define KLIB_GRANUALITY 0x
10000
// 32KiB
\r
#define KLIB_HIGHEST (MM_MODULE_MAX-KLIB_GRANUALITY)
\r
\r
// === TYPES ===
\r
#define KLIB_HIGHEST (MM_MODULE_MAX-KLIB_GRANUALITY)
\r
\r
// === TYPES ===
\r
@@
-322,6
+323,8
@@
Uint Binary_MapIn(tBinary *binary)
MM_SetFlags( addr, MM_PFLAG_COW, -1 );
\r
}
\r
\r
MM_SetFlags( addr, MM_PFLAG_COW, -1 );
\r
}
\r
\r
+ //Log("Mapped '%s' to 0x%x", binary->TruePath, base);
\r
+
\r
//LOG("*0x%x = 0x%x\n", binary->Pages[0].Virtual, *(Uint*)binary->Pages[0].Virtual);
\r
\r
return base;
\r
//LOG("*0x%x = 0x%x\n", binary->Pages[0].Virtual, *(Uint*)binary->Pages[0].Virtual);
\r
\r
return base;
\r
@@
-725,7
+728,7
@@
Uint Binary_Relocate(void *Base)
}
\r
\r
Warning("[BIN ] 0x%x is an unknown file type. (0x%x 0x%x 0x%x 0x%x)",
\r
}
\r
\r
Warning("[BIN ] 0x%x is an unknown file type. (0x%x 0x%x 0x%x 0x%x)",
\r
- Base, ident&0xFF,
ident>>8, ident>>16, ident>>24
);
\r
+ Base, ident&0xFF,
(ident>>8)&0xFF, (ident>>16)&0xFF, (ident>>24)&0xFF
);
\r
return 0;
\r
}
\r
\r
return 0;
\r
}
\r
\r
UCC
git Repository :: git.ucc.asn.au