Merge branch 'main' of 188.68.55.73:karlos/karlos

This commit is contained in:
uosfz 2026-06-03 22:29:05 +02:00
commit f037dfa939
Signed by: uosfz
SSH key fingerprint: SHA256:FlktuluyhTQg3jHZNLKwxOOC5hbfrUXM0tz3IA3lGJo

View file

@ -15,11 +15,7 @@ extern BOOTBOOT bootboot;
#define FREE_BLOCK_MAGIC 0x01020304F5EEB10Cul
#ifdef DEBUG_RAM
#define DEBUG_PRINTLINEF(...) prinlinef(__VA_ARGS__)
#else
#define DEBUG_PRINTLINEF(...) do { } while (0)
#endif
#define DEBUG_PRINTLINEF(...) do { if (ram_enable_logging) printlinef(__VA_ARGS__); } while (0)
bool ram_initialized = false;
#if defined(INIT_ASSERTED)
@ -529,7 +525,7 @@ ram_init(void)
// TODO this could be done with bit tricks
unsigned level = 0;
for (;;) {
unsigned next_level_bytes = NUM_BYTES_COVERED_IN_LEVEL(level + 1);
uint64_t next_level_bytes = NUM_BYTES_COVERED_IN_LEVEL(level + 1);
// size and alignment need to fit
if (length < next_level_bytes || (addr & (next_level_bytes - 1)) != 0) {
break;