Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add back x86_32 support #5

Merged
Bananymous merged 46 commits from x86_32 into main 2024-04-03 02:36:29 +03:00
Conversation 0 Commits 46 Files Changed 76 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5dbe51a52e - Show all commits

2
userspace/aoc2023/day19/main.cpp
View File

@ -260,7 +260,7 @@ i64 puzzle2(FILE* fp)
clock_gettime(CLOCK_MONOTONIC, &time_stop);
u64 duration_us = (time_stop.tv_sec * 1'000'000 + time_stop.tv_nsec / 1'000) - (time_start.tv_sec * 1'000'000 + time_start.tv_nsec / 1'000);
printf("took %lu.%03lu ms, estimate %lu s\n", duration_us / 1000, duration_us % 1000, (values_sorted[0].size() - xi - 2) * duration_us / 1'000'000);
printf("step took %" PRIu64 ".%03" PRIu64 " ms, estimate %" PRIu64 " s\n", duration_us / 1000, duration_us % 1000, (values_sorted[0].size() - xi - 2) * duration_us / 1'000'000);
}
return result;

2
userspace/image/Netbpm.cpp
View File

@ -87,7 +87,7 @@ BAN::ErrorOr<BAN::UniqPtr<Image>> load_netbpm(const void* mmap_addr, size_t size
return BAN::Error::from_errno(EINVAL);
}
printf("Netbpm image %" PRIuPTR "x%" PRIuPTR "\n", *width, *height);
printf("Netbpm image %" PRIu64 "x%" PRIu64 "\n", *width, *height);
BAN::Vector<Image::Color> bitmap;
TRY(bitmap.resize(*width * *height));

2
userspace/mmap-shared-test/main.cpp
View File

@ -152,7 +152,7 @@ int test2_job2()
return 1;
}
*(size_t*)addr = 0x123456789;
*(size_t*)addr = 0x12345678;
if (msync(addr, sizeof(size_t), MS_SYNC) == -1)
{