Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: Remove unnecessary ifdefs added in previous commits

Browse Source
This commit is contained in:
mintsuki 2023-10-05 07:25:02 -05:00
parent b474b6bad0
commit c1f5b21177
5 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/fs/file.h
View File

@ -36,8 +36,6 @@ struct file_handle *fopen(struct volume *part, const char *filename);
void fread(struct file_handle *fd, void *buf, uint64_t loc, uint64_t count); void fread(struct file_handle *fd, void *buf, uint64_t loc, uint64_t count);
void fclose(struct file_handle *fd); void fclose(struct file_handle *fd);
void *freadall(struct file_handle *fd, uint32_t type); void *freadall(struct file_handle *fd, uint32_t type);
#if defined (__x86_64__) || defined (__aarch64__) || defined (__riscv64)
void *freadall_mode(struct file_handle *fd, uint32_t type, bool allow_high_allocs); void *freadall_mode(struct file_handle *fd, uint32_t type, bool allow_high_allocs);
#endif
#endif #endif

6
common/fs/file.s2.c
View File

@ -96,12 +96,10 @@ void fread(struct file_handle *fd, void *buf, uint64_t loc, uint64_t count) {
} }
void *freadall(struct file_handle *fd, uint32_t type) { void *freadall(struct file_handle *fd, uint32_t type) {
#if defined (__x86_64__) || defined (__aarch64__) || defined (__riscv64)
return freadall_mode(fd, type, false); return freadall_mode(fd, type, false);
} }
void *freadall_mode(struct file_handle *fd, uint32_t type, bool allow_high_allocs) { void *freadall_mode(struct file_handle *fd, uint32_t type, bool allow_high_allocs) {
#endif
if (fd->is_memfile) { if (fd->is_memfile) {
if (fd->readall) { if (fd->readall) {
return fd->fd; return fd->fd;
@ -110,11 +108,7 @@ void *freadall_mode(struct file_handle *fd, uint32_t type, bool allow_high_alloc
fd->readall = true; fd->readall = true;
return fd->fd; return fd->fd;
} else { } else {
#if defined (__x86_64__) || defined (__aarch64__) || defined (__riscv64)
void *ret = ext_mem_alloc_type_aligned_mode(fd->size, type, 4096, allow_high_allocs); void *ret = ext_mem_alloc_type_aligned_mode(fd->size, type, 4096, allow_high_allocs);
#else
void *ret = ext_mem_alloc_type_aligned(fd->size, type, 4096);
#endif
fd->read(fd, ret, 0, fd->size); fd->read(fd, ret, 0, fd->size);
fd->close(fd); fd->close(fd);
fd->fd = ret; fd->fd = ret;

2
common/mm/pmm.h
View File

@ -56,9 +56,7 @@ void pmm_randomise_memory(void);
void *ext_mem_alloc(size_t count); void *ext_mem_alloc(size_t count);
void *ext_mem_alloc_type(size_t count, uint32_t type); void *ext_mem_alloc_type(size_t count, uint32_t type);
void *ext_mem_alloc_type_aligned(size_t count, uint32_t type, size_t alignment); void *ext_mem_alloc_type_aligned(size_t count, uint32_t type, size_t alignment);
#if defined (__x86_64__) || defined (__aarch64__) || defined (__riscv64)
void *ext_mem_alloc_type_aligned_mode(size_t count, uint32_t type, size_t alignment, bool allow_high_allocs); void *ext_mem_alloc_type_aligned_mode(size_t count, uint32_t type, size_t alignment, bool allow_high_allocs);
#endif
void *conv_mem_alloc(size_t count); void *conv_mem_alloc(size_t count);

4
common/mm/pmm.s2.c
View File

@ -568,13 +568,15 @@ void *ext_mem_alloc_type(size_t count, uint32_t type) {
} }
void *ext_mem_alloc_type_aligned(size_t count, uint32_t type, size_t alignment) { void *ext_mem_alloc_type_aligned(size_t count, uint32_t type, size_t alignment) {
#if defined (__x86_64__) || defined (__aarch64__) || defined (__riscv64)
return ext_mem_alloc_type_aligned_mode(count, type, alignment, false); return ext_mem_alloc_type_aligned_mode(count, type, alignment, false);
} }
// Allocate memory top down. // Allocate memory top down.
void *ext_mem_alloc_type_aligned_mode(size_t count, uint32_t type, size_t alignment, bool allow_high_allocs) { void *ext_mem_alloc_type_aligned_mode(size_t count, uint32_t type, size_t alignment, bool allow_high_allocs) {
#if !defined (__x86_64__) && !defined (__aarch64__) && !defined (__riscv64)
(void)allow_high_allocs;
#endif #endif
count = ALIGN_UP(count, alignment); count = ALIGN_UP(count, alignment);
if (allocations_disallowed) if (allocations_disallowed)

4
common/protos/limine.c
View File

@ -250,11 +250,7 @@ static struct limine_file get_file(struct file_handle *file, char *cmdline) {
ret.path = reported_addr(path); ret.path = reported_addr(path);
#if defined (__x86_64__) || defined (__aarch64__) || defined (__riscv64)
ret.address = reported_addr(freadall_mode(file, MEMMAP_KERNEL_AND_MODULES, true)); ret.address = reported_addr(freadall_mode(file, MEMMAP_KERNEL_AND_MODULES, true));
#else
ret.address = reported_addr(freadall(file, MEMMAP_KERNEL_AND_MODULES));
#endif
ret.size = file->size; ret.size = file->size;
ret.cmdline = reported_addr(cmdline); ret.cmdline = reported_addr(cmdline);