New system to unify instruction meta-data

GrieferAtWork · Apr 5, 2024 · 388cf05 · 388cf05
1 parent a9c4b85
commit 388cf05
Show file tree

Hide file tree

Showing 12 changed files with 1,726 additions and 2,466 deletions.
diff --git a/.vs/deemon.sln b/.vs/deemon.sln
@@ -347,6 +347,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2360741E-F
 		..\util\test\compiler-lexer-corners.dee = ..\util\test\compiler-lexer-corners.dee
 		..\util\test\compiler-paren-brace-pasing.dee = ..\util\test\compiler-paren-brace-pasing.dee
 		..\util\test\compiler-print-in-statement-expressions.dee = ..\util\test\compiler-print-in-statement-expressions.dee
+		..\util\test\compiler-qmarkqmark-operator.dee = ..\util\test\compiler-qmarkqmark-operator.dee
 		..\util\test\compiler-range-expressions.dee = ..\util\test\compiler-range-expressions.dee
 		..\util\test\compiler-recursive-references.dee = ..\util\test\compiler-recursive-references.dee
 		..\util\test\compiler-self-recursion.dee = ..\util\test\compiler-self-recursion.dee

diff --git a/.vs/deemon.vcxproj b/.vs/deemon.vcxproj
@@ -43,6 +43,7 @@
 		<ClInclude Include="..\include\deemon\alloc.h" />
 		<ClInclude Include="..\include\deemon\api.h" />
 		<ClInclude Include="..\include\deemon\arg.h" />
+		<ClInclude Include="..\include\deemon\asm-table.h" />
 		<ClInclude Include="..\include\deemon\asm.h" />
 		<ClInclude Include="..\include\deemon\attribute.h" />
 		<ClInclude Include="..\include\deemon\bool.h" />
@@ -229,7 +230,6 @@
 		<ClInclude Include="..\src\deemon\compiler\asm\genasm-yield.c.inl" />
 		<ClInclude Include="..\src\deemon\compiler\asm\genstore-setup.c.inl" />
 		<ClInclude Include="..\src\deemon\compiler\lexer\decl-escape-text-impl.c.inl" />
-		<ClInclude Include="..\src\deemon\execute\code-exec-targets.c.inl" />
 		<ClInclude Include="..\src\deemon\execute\code-exec.c.inl" />
 		<ClInclude Include="..\src\deemon\execute\code-invoke-kw.c.inl" />
 		<ClInclude Include="..\src\deemon\execute\code-invoke.c.inl" />

diff --git a/.vs/deemon.vcxproj.filters b/.vs/deemon.vcxproj.filters
@@ -102,6 +102,9 @@
 		<ClInclude Include="..\include\deemon\arg.h">
 			<Filter>include</Filter>
 		</ClInclude>
+		<ClInclude Include="..\include\deemon\asm-table.h">
+			<Filter>include</Filter>
+		</ClInclude>
 		<ClInclude Include="..\include\deemon\asm.h">
 			<Filter>include</Filter>
 		</ClInclude>
@@ -660,9 +663,6 @@
 		<ClInclude Include="..\src\deemon\compiler\lexer\decl-escape-text-impl.c.inl">
 			<Filter>src\compiler\lexer</Filter>
 		</ClInclude>
-		<ClInclude Include="..\src\deemon\execute\code-exec-targets.c.inl">
-			<Filter>src\execute</Filter>
-		</ClInclude>
 		<ClInclude Include="..\src\deemon\execute\code-exec.c.inl">
 			<Filter>src\execute</Filter>
 		</ClInclude>

diff --git a/include/deemon/api.h b/include/deemon/api.h
@@ -208,8 +208,6 @@ __pragma_GCC_diagnostic_ignored(Wstringop_overread)
 #endif /* !Dee_ASSUMED_VALUE */
 
 
-DECL_BEGIN
-
 /* #define CONFIG_NO_THREADS */
 
 /* CONFIG:  Enable tracing of all incref()s and decref()s that
@@ -489,7 +487,9 @@ DECL_BEGIN
 
 #ifndef Dee_BREAKPOINT
 #ifdef _MSC_VER
+DECL_BEGIN
 extern void (__debugbreak)(void);
+DECL_END
 #pragma intrinsic(__debugbreak)
 #define Dee_BREAKPOINT() __debugbreak()
 #elif defined(__COMPILER_HAVE_GCC_ASM) && !defined(__NO_XBLOCK) && (defined(__i386__) || defined(__x86_64__))
@@ -562,6 +562,7 @@ extern void (__debugbreak)(void);
 #define DWEAK /* Annotation for data that is thread-volatile. */
 #endif /* !DWEAK */
 
+DECL_BEGIN
 #if !defined(NDEBUG) && !defined(CONFIG_NO_CHECKMEMORY) && defined(_DEBUG)
 #ifdef CONFIG_HOST_WINDOWS
 #ifdef _MSC_VER
@@ -600,6 +601,7 @@ DFUNDEF void (DCALL _DeeAssert_Fail)(char const *expr, char const *file, int lin
 DFUNDEF void (_DeeAssert_Failf)(char const *expr, char const *file, int line, char const *format, ...);
 DFUNDEF ATTR_NORETURN void (DCALL _DeeAssert_XFail)(char const *expr, char const *file, int line);
 DFUNDEF ATTR_NORETURN void (_DeeAssert_XFailf)(char const *expr, char const *file, int line, char const *format, ...);
+DECL_END
 
 #ifdef Dee_BREAKPOINT_IS_NOOP
 #define _Dee_Fatal(expr)       _DeeAssert_Fail(expr, __FILE__, __LINE__)
@@ -688,6 +690,4 @@ DFUNDEF ATTR_NORETURN void (_DeeAssert_XFailf)(char const *expr, char const *fil
 #define DOC_GET Dee_DOC_GET
 #endif /* DEE_SOURCE */
 
-DECL_END
-
 #endif /* !GUARD_DEEMON_API_H */