TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-12 22:17:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove tabs

Browse Source
This commit is contained in:
Baptiste Wicht 2016-08-08 22:33:05 +02:00
parent 4c6d00c0b0
commit 76dad98cec
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kernel/include/gdt_types.hpp
View File

@ -50,18 +50,18 @@ struct gdt_ptr {
} __attribute__ ((packed)); } __attribute__ ((packed));
struct gdt_descriptor_t { struct gdt_descriptor_t {
unsigned int limit_low : 16; unsigned int limit_low : 16;
unsigned int base_low : 24; unsigned int base_low : 24;
uint8_t type : 4; uint8_t type : 4;
unsigned int always_1 : 1; unsigned int always_1 : 1;
unsigned int dpl : 2; unsigned int dpl : 2;
unsigned int present : 1; unsigned int present : 1;
unsigned int limit_high : 4; unsigned int limit_high : 4;
unsigned int avl : 1; unsigned int avl : 1;
unsigned int long_mode : 1; unsigned int long_mode : 1;
unsigned int big : 1; unsigned int big : 1;
unsigned int granularity : 1; unsigned int granularity : 1;
unsigned int base_high : 8; unsigned int base_high : 8;
} __attribute__((packed)); } __attribute__((packed));
static_assert(sizeof(gdt_descriptor_t) == 8, "GDT selector in long mode is 8 bytes long"); static_assert(sizeof(gdt_descriptor_t) == 8, "GDT selector in long mode is 8 bytes long");

6
kernel/include/thor.hpp
View File

@ -23,9 +23,9 @@ extern "C" {
typedef int uarch_t; typedef int uarch_t;
struct atexit_func_entry_t { struct atexit_func_entry_t {
void (*destructor_func)(void *); void (*destructor_func)(void *);
void *obj_ptr; void *obj_ptr;
void *dso_handle; void *dso_handle;
}; };
int __cxa_atexit(void (*f)(void *), void *objptr, void *dso); int __cxa_atexit(void (*f)(void *), void *objptr, void *dso);