justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 00:14:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

[libj6] Take out explicit type IDs from object_types.inc

Browse Source 
This caused errors when there were gaps, so don't allow explicit IDs,
and just number types in order.
This commit is contained in:
Justin C. Miller
2023-03-16 19:47:29 -07:00
parent 936b12a977
commit 373121c455
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/objects/kobject.cpp
View File

@@ -16,7 +16,7 @@ static_assert(types_count <= (1 << kobject::koid_type_bits),
"kobject::koid_type_bits cannot represent all kobject types"); "kobject::koid_type_bits cannot represent all kobject types");
static const char *type_names[] = { static const char *type_names[] = {
#define OBJECT_TYPE( name, val ) #name , #define OBJECT_TYPE( name ) #name ,
#include <j6/tables/object_types.inc> #include <j6/tables/object_types.inc>
#undef OBJECT_TYPE #undef OBJECT_TYPE
nullptr nullptr

2
src/kernel/objects/kobject.h
View File

@@ -16,7 +16,7 @@ public:
/// Types of kernel objects. /// Types of kernel objects.
enum class type : uint8_t enum class type : uint8_t
{ {
#define OBJECT_TYPE( name, val ) name = val, #define OBJECT_TYPE( name ) name ,
#include <j6/tables/object_types.inc> #include <j6/tables/object_types.inc>
#undef OBJECT_TYPE #undef OBJECT_TYPE

16
src/libraries/j6/j6/tables/object_types.inc
View File

@@ -1,13 +1,13 @@
OBJECT_TYPE( none, 0x00 ) OBJECT_TYPE( none )
OBJECT_TYPE( system, 0x01 ) OBJECT_TYPE( system )
OBJECT_TYPE( event, 0x02 ) OBJECT_TYPE( event )
OBJECT_TYPE( endpoint, 0x04 ) OBJECT_TYPE( endpoint )
OBJECT_TYPE( mailbox, 0x05 ) OBJECT_TYPE( mailbox )
OBJECT_TYPE( vma, 0x06 ) OBJECT_TYPE( vma )
OBJECT_TYPE( process, 0x07 ) OBJECT_TYPE( process )
OBJECT_TYPE( thread, 0x08 ) OBJECT_TYPE( thread )

2
src/libraries/j6/j6/types.h
View File

@@ -35,7 +35,7 @@ typedef uint64_t j6_handle_t;
typedef uint16_t j6_cap_t; typedef uint16_t j6_cap_t;
enum j6_object_type { enum j6_object_type {
#define OBJECT_TYPE( name, val ) j6_object_type_ ## name = val, #define OBJECT_TYPE( name ) j6_object_type_ ## name ,
#include <j6/tables/object_types.inc> #include <j6/tables/object_types.inc>
#undef OBJECT_TYPE #undef OBJECT_TYPE