From 64b01f843364ad0ea29504bc7539212cb53eaf11 Mon Sep 17 00:00:00 2001 From: Quinten Kock Date: Mon, 7 Dec 2020 01:55:12 +0100 Subject: [PATCH] store arch info in NASM (as test) --- kernel/src/arch/i386/info.c | 3 ++- kernel/src/arch/i386/info.nasm | 2 ++ kernel/src/arch/x86_64/info.c | 4 +++- kernel/src/arch/x86_64/info.nasm | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 kernel/src/arch/i386/info.nasm create mode 100644 kernel/src/arch/x86_64/info.nasm diff --git a/kernel/src/arch/i386/info.c b/kernel/src/arch/i386/info.c index 19ab434..923fad0 100644 --- a/kernel/src/arch/i386/info.c +++ b/kernel/src/arch/i386/info.c @@ -1 +1,2 @@ -const char *arch = "i386"; + extern char archval; + const char *arch = &archval; diff --git a/kernel/src/arch/i386/info.nasm b/kernel/src/arch/i386/info.nasm new file mode 100644 index 0000000..2b55bec --- /dev/null +++ b/kernel/src/arch/i386/info.nasm @@ -0,0 +1,2 @@ +global archval +archval db "i386-nasm", 0 \ No newline at end of file diff --git a/kernel/src/arch/x86_64/info.c b/kernel/src/arch/x86_64/info.c index 7c64153..686e883 100644 --- a/kernel/src/arch/x86_64/info.c +++ b/kernel/src/arch/x86_64/info.c @@ -1 +1,3 @@ -const char *arch = "x86_64"; + extern char archval; + const char *arch = &archval; + diff --git a/kernel/src/arch/x86_64/info.nasm b/kernel/src/arch/x86_64/info.nasm new file mode 100644 index 0000000..599fe31 --- /dev/null +++ b/kernel/src/arch/x86_64/info.nasm @@ -0,0 +1,2 @@ +global archval +archval db "x86_64-nasm", 0 \ No newline at end of file