tailix
/
mrubyvisor
mirror of https://github.com/tailix/mrubyvisor.git
1
0
Fork 0
Code Releases Activity

Move stack trace code to separate module

This commit is contained in:
Alex Kotov 2022-12-01 02:35:09 +04:00
parent 6a9a64a7ab
commit 3cedd7b2a8
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
4 changed files with 120 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile
View File

@ -20,7 +20,14 @@ CPPFLAGS = \
$(MRUBY_FLAGS) \
-DKERNAUX_DEBUG \
OBJS = multiboot2.c.o start.S.o main.c.o libc.c.o logger.c.o panic.c.o
OBJS = \
libc.c.o \
logger.c.o \
main.c.o \
multiboot2.c.o \
panic.c.o \
stack_trace.c.o \
start.S.o
all: $(MRUBYVISOR)

99
src/main.c
View File

@ -1,6 +1,7 @@
#include "libc.h"
#include "logger.h"
#include "panic.h"
#include "stack_trace.h"
#include <stdbool.h>
#include <stddef.h>
@ -17,7 +18,6 @@
static mrb_state *mrb = NULL;
static mrbc_context *context = NULL;
static void load_elf_symbols(const struct KernAux_Multiboot2_Info *multiboot2_info);
static bool load_module(const char *source, size_t size, const char *cmdline);
static mrb_value ruby_console_puts(mrb_state *mrb, mrb_value self);
@ -32,7 +32,7 @@ void main(
ASSERT(multiboot2_info_magic == KERNAUX_MULTIBOOT2_INFO_MAGIC);
ASSERT(KernAux_Multiboot2_Info_is_valid(multiboot2_info));
load_elf_symbols(multiboot2_info);
stack_trace_init(multiboot2_info);
ASSERT(mrb = mrb_open());
ASSERT(context = mrbc_context_new(mrb));
@ -71,101 +71,6 @@ void main(
}
}
#include <kernaux/macro/packing_start.run>
struct SectionEntry {
uint32_t name;
uint32_t type;
uint32_t flags;
uint32_t vaddr;
uint32_t file_offset;
uint32_t file_size;
uint32_t link;
uint32_t info;
uint32_t alignment;
uint32_t ent_size;
}
KERNAUX_PACKED;
#include <kernaux/macro/packing_end.run>
void load_elf_symbols(
const struct KernAux_Multiboot2_Info *const multiboot2_info
) {
const struct KernAux_Multiboot2_ITag_ELFSymbols *const elf_symbols_tag =
(const struct KernAux_Multiboot2_ITag_ELFSymbols*)
KernAux_Multiboot2_Info_first_tag_with_type(
multiboot2_info,
KERNAUX_MULTIBOOT2_ITAG_ELF_SYMBOLS
);
if (!elf_symbols_tag) {
kernaux_drivers_console_puts("ELF symbols tag not found");
return;
}
const struct SectionEntry *const section_headers =
// FIXME: GRUB 2 doesn't conform the spec!
// https://www.mail-archive.com/grub-devel@gnu.org/msg30790.html
// (const struct SectionEntry*)KERNAUX_MULTIBOOT2_DATA(elf_symbols_tag);
(const struct SectionEntry*)(&((uint8_t*)elf_symbols_tag)[20]);
kernaux_drivers_console_puts("ELF symbols tag:");
KernAux_Multiboot2_ITag_ELFSymbols_print(
elf_symbols_tag,
kernaux_drivers_console_printf
);
kernaux_drivers_console_printf(" data: 0x%p\n", (void*)section_headers);
kernaux_drivers_console_putc('\n');
const struct SectionEntry *const shstrtab =
// FIXME: GRUB 2 doesn't conform the spec!
// https://www.mail-archive.com/grub-devel@gnu.org/msg30790.html
// &section_headers[elf_symbols_tag->shndx];
&section_headers[(uint32_t)(((uint8_t*)elf_symbols_tag)[16])];
if (shstrtab == section_headers) return;
size_t debug_info_index = 0;
size_t debug_abbrev_index = 0;
size_t debug_str_index = 0;
for (size_t index = 0; index < elf_symbols_tag->num; ++index) {
const struct SectionEntry *const section_header =
&section_headers[index];
const char *const section_name =
&((const char*)shstrtab->vaddr)[section_header->name];
kernaux_drivers_console_printf("section %lu: %s\n",
index, section_name);
if (strcmp(section_name, ".debug_info") == 0) {
debug_info_index = index;
} else if (strcmp(section_name, ".debug_abbrev") == 0) {
debug_abbrev_index = index;
} else if (strcmp(section_name, ".debug_str") == 0) {
debug_str_index = index;
}
}
kernaux_drivers_console_putc('\n');
kernaux_drivers_console_printf(".debug_info: %lu\n", debug_info_index);
kernaux_drivers_console_printf(".debug_abbrev: %lu\n", debug_abbrev_index);
kernaux_drivers_console_printf(".debug_str: %lu\n", debug_str_index);
kernaux_drivers_console_putc('\n');
if (!debug_info_index || !debug_abbrev_index || !debug_str_index) return;
const struct SectionEntry *const debug_info =
&section_headers[debug_info_index];
const struct SectionEntry *const debug_abbrev =
&section_headers[debug_abbrev_index];
const struct SectionEntry *const debug_str =
&section_headers[debug_str_index];
}
bool load_module(
const char *const source,
const size_t size,

102
src/stack_trace.c Normal file
View File

@ -0,0 +1,102 @@
#include "stack_trace.h"
#include <string.h>
#include <kernaux/drivers/console.h>
#include <kernaux/multiboot2.h>
#include <kernaux/macro/packing_start.run>
struct SectionEntry {
uint32_t name;
uint32_t type;
uint32_t flags;
uint32_t vaddr;
uint32_t file_offset;
uint32_t file_size;
uint32_t link;
uint32_t info;
uint32_t alignment;
uint32_t ent_size;
}
KERNAUX_PACKED;
#include <kernaux/macro/packing_end.run>
void stack_trace_init(
const struct KernAux_Multiboot2_Info *const multiboot2_info
) {
const struct KernAux_Multiboot2_ITag_ELFSymbols *const elf_symbols_tag =
(const struct KernAux_Multiboot2_ITag_ELFSymbols*)
KernAux_Multiboot2_Info_first_tag_with_type(
multiboot2_info,
KERNAUX_MULTIBOOT2_ITAG_ELF_SYMBOLS
);
if (!elf_symbols_tag) {
kernaux_drivers_console_puts("ELF symbols tag not found");
return;
}
const struct SectionEntry *const section_headers =
// FIXME: GRUB 2 doesn't conform the spec!
// https://www.mail-archive.com/grub-devel@gnu.org/msg30790.html
// (const struct SectionEntry*)KERNAUX_MULTIBOOT2_DATA(elf_symbols_tag);
(const struct SectionEntry*)(&((uint8_t*)elf_symbols_tag)[20]);
kernaux_drivers_console_puts("ELF symbols tag:");
KernAux_Multiboot2_ITag_ELFSymbols_print(
elf_symbols_tag,
kernaux_drivers_console_printf
);
kernaux_drivers_console_printf(" data: 0x%p\n", (void*)section_headers);
kernaux_drivers_console_putc('\n');
const struct SectionEntry *const shstrtab =
// FIXME: GRUB 2 doesn't conform the spec!
// https://www.mail-archive.com/grub-devel@gnu.org/msg30790.html
// &section_headers[elf_symbols_tag->shndx];
&section_headers[(uint32_t)(((uint8_t*)elf_symbols_tag)[16])];
if (shstrtab == section_headers) return;
size_t debug_info_index = 0;
size_t debug_abbrev_index = 0;
size_t debug_str_index = 0;
for (size_t index = 0; index < elf_symbols_tag->num; ++index) {
const struct SectionEntry *const section_header =
&section_headers[index];
const char *const section_name =
&((const char*)shstrtab->vaddr)[section_header->name];
kernaux_drivers_console_printf("section %lu: %s\n",
index, section_name);
if (strcmp(section_name, ".debug_info") == 0) {
debug_info_index = index;
} else if (strcmp(section_name, ".debug_abbrev") == 0) {
debug_abbrev_index = index;
} else if (strcmp(section_name, ".debug_str") == 0) {
debug_str_index = index;
}
}
kernaux_drivers_console_putc('\n');
kernaux_drivers_console_printf(".debug_info: %lu\n", debug_info_index);
kernaux_drivers_console_printf(".debug_abbrev: %lu\n", debug_abbrev_index);
kernaux_drivers_console_printf(".debug_str: %lu\n", debug_str_index);
kernaux_drivers_console_putc('\n');
if (!debug_info_index || !debug_abbrev_index || !debug_str_index) return;
/*
const struct SectionEntry *const debug_info =
&section_headers[debug_info_index];
const struct SectionEntry *const debug_abbrev =
&section_headers[debug_abbrev_index];
const struct SectionEntry *const debug_str =
&section_headers[debug_str_index];
*/
}

8
src/stack_trace.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef INCLUDED_STACK_TRACE
#define INCLUDED_STACK_TRACE
#include <kernaux/multiboot2.h>
void stack_trace_init(const struct KernAux_Multiboot2_Info *multiboot2_info);
#endif