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

misc: Consistently call x86-64 such, instead of x86_64

This commit is contained in:
mintsuki 2023-09-16 11:07:44 -05:00
parent e9b5511084
commit 45958f7162
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/check.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
run: ./bootstrap && ./configure TOOLCHAIN_FOR_TARGET=llvm --enable-werror --enable-all && make all && make maintainer-clean run: ./bootstrap && ./configure TOOLCHAIN_FOR_TARGET=llvm --enable-werror --enable-all && make all && make maintainer-clean
- name: Build the bootloader (GNU, x86) - name: Build the bootloader (GNU, x86)
run: ./bootstrap && ./configure TOOLCHAIN_FOR_TARGET=gnu --enable-werror --enable-bios --enable-uefi-ia32 --enable-uefi-x86_64 && make all && make maintainer-clean run: ./bootstrap && ./configure TOOLCHAIN_FOR_TARGET=gnu --enable-werror --enable-bios --enable-uefi-ia32 --enable-uefi-x86-64 && make all && make maintainer-clean
- name: Build the bootloader (GNU, aarch64) - name: Build the bootloader (GNU, aarch64)
run: ./bootstrap && ./configure TOOLCHAIN_FOR_TARGET=aarch64-linux-gnu --enable-werror --enable-uefi-aarch64 && make all && make maintainer-clean run: ./bootstrap && ./configure TOOLCHAIN_FOR_TARGET=aarch64-linux-gnu --enable-werror --enable-uefi-aarch64 && make all && make maintainer-clean

12
PROTOCOL.md
View File

@ -114,7 +114,7 @@ config).
## Machine state at entry ## Machine state at entry
### x86_64 ### x86-64
`rip` will be the entry point as defined as part of the executable file format, `rip` will be the entry point as defined as part of the executable file format,
unless the an Entry Point feature is requested (see below), in which case, unless the an Entry Point feature is requested (see below), in which case,
@ -518,7 +518,7 @@ The possible settings are as follows:
The effect of each of these options matches the effect of the `stty(1)` The effect of each of these options matches the effect of the `stty(1)`
options by the same name. options by the same name.
#### x86_64 #### x86-64
Additionally, the kernel must ensure, when calling `write()`, that: Additionally, the kernel must ensure, when calling `write()`, that:
@ -699,7 +699,7 @@ The response indicates which paging mode was actually enabled by the bootloader.
Kernels must be prepared to handle the case where the requested paging mode is Kernels must be prepared to handle the case where the requested paging mode is
not supported by the hardware. not supported by the hardware.
#### x86_64 #### x86-64
Values for `mode`: Values for `mode`:
```c ```c
@ -769,7 +769,7 @@ struct limine_5_level_paging_response {
``` ```
Notes: The presence of this request will prompt the bootloader to turn on Notes: The presence of this request will prompt the bootloader to turn on
x86_64 5-level paging. It will not be turned on if this request is not present. x86-64 5-level paging. It will not be turned on if this request is not present.
If the response pointer is changed to a valid pointer, 5-level paging is engaged. If the response pointer is changed to a valid pointer, 5-level paging is engaged.
### SMP (multiprocessor) Feature ### SMP (multiprocessor) Feature
@ -789,9 +789,9 @@ struct limine_smp_request {
}; };
``` ```
* `flags` - Bit 0: Enable X2APIC, if possible. (x86_64-only) * `flags` - Bit 0: Enable X2APIC, if possible. (x86-64 only)
#### x86_64: #### x86-64:
Response: Response:

4
README.md
View File

@ -21,7 +21,7 @@ Donations welcome, but absolutely not mandatory!
### Supported architectures ### Supported architectures
* IA-32 (32-bit x86) * IA-32 (32-bit x86)
* x86_64 * x86-64
* aarch64 (arm64) * aarch64 (arm64)
* riscv64 * riscv64
@ -49,7 +49,7 @@ opening issues or pull requests related to this.
For 32-bit x86 systems, support is only ensured starting with those with For 32-bit x86 systems, support is only ensured starting with those with
Pentium Pro (i686) class CPUs. Pentium Pro (i686) class CPUs.
All x86_64, aarch64, and riscv64 (UEFI) systems are supported. All x86-64, aarch64, and riscv64 (UEFI) systems are supported.
## Packaging status ## Packaging status

6
common/lib/elf.c
View File

@ -280,7 +280,7 @@ bool elf64_load_section(uint8_t *elf, void *buffer, const char *name, size_t lim
#if defined (__x86_64__) || defined (__i386__) #if defined (__x86_64__) || defined (__i386__)
if (hdr->machine != ARCH_X86_64) { if (hdr->machine != ARCH_X86_64) {
printv("elf: Not an x86_64 ELF file.\n"); printv("elf: Not an x86-64 ELF file.\n");
return false; return false;
} }
#elif defined (__aarch64__) #elif defined (__aarch64__)
@ -426,7 +426,7 @@ bool elf64_load(uint8_t *elf, uint64_t *entry_point, uint64_t *_slide, uint32_t
#if defined (__x86_64__) || defined (__i386__) #if defined (__x86_64__) || defined (__i386__)
if (hdr->machine != ARCH_X86_64) { if (hdr->machine != ARCH_X86_64) {
panic(true, "elf: Not an x86_64 ELF file.\n"); panic(true, "elf: Not an x86-64 ELF file.\n");
} }
#elif defined (__aarch64__) #elif defined (__aarch64__)
if (hdr->machine != ARCH_AARCH64) { if (hdr->machine != ARCH_AARCH64) {
@ -689,7 +689,7 @@ bool elf64_load_elsewhere(uint8_t *elf, uint64_t *entry_point,
} }
if (hdr->machine != ARCH_X86_64) { if (hdr->machine != ARCH_X86_64) {
printv("elf: Not an x86_64 ELF file.\n"); printv("elf: Not an x86-64 ELF file.\n");
return false; return false;
} }