diff --git a/src/xenia/kernel/util/export_table_post.inc b/src/xenia/kernel/util/export_table_post.inc index 7c3909fb9..8a69c1db3 100644 --- a/src/xenia/kernel/util/export_table_post.inc +++ b/src/xenia/kernel/util/export_table_post.inc @@ -2,13 +2,12 @@ ****************************************************************************** * Xenia : Xbox 360 Emulator Research Project * ****************************************************************************** - * Copyright 2013 Ben Vanik. All rights reserved. * + * Copyright 2021 Ben Vanik. All rights reserved. * * Released under the BSD license - see LICENSE in the root for more details. * ****************************************************************************** */ // Post-include file for an export table. - #undef FLAG #undef XE_EXPORT diff --git a/src/xenia/kernel/util/export_table_pre.inc b/src/xenia/kernel/util/export_table_pre.inc index e17068901..7647dcead 100644 --- a/src/xenia/kernel/util/export_table_pre.inc +++ b/src/xenia/kernel/util/export_table_pre.inc @@ -2,7 +2,7 @@ ****************************************************************************** * Xenia : Xbox 360 Emulator Research Project * ****************************************************************************** - * Copyright 2013 Ben Vanik. All rights reserved. * + * Copyright 2021 Ben Vanik. All rights reserved. * * Released under the BSD license - see LICENSE in the root for more details. * ****************************************************************************** */ @@ -22,8 +22,7 @@ * my_module_export_table, xe::countof(my_module_export_table)); */ - #define XE_EXPORT(module, ordinal, name, type) \ xe::cpu::Export(ordinal, xe::cpu::Export::Type::type, #name) -#define FLAG(t) kXEKernelExportFlag##t +#define FLAG(t) kXEKernelExportFlag##t diff --git a/src/xenia/kernel/util/ordinal_table_post.inc b/src/xenia/kernel/util/ordinal_table_post.inc index 722b2da06..62c881976 100644 --- a/src/xenia/kernel/util/ordinal_table_post.inc +++ b/src/xenia/kernel/util/ordinal_table_post.inc @@ -2,12 +2,11 @@ ****************************************************************************** * Xenia : Xbox 360 Emulator Research Project * ****************************************************************************** - * Copyright 2013 Ben Vanik. All rights reserved. * + * Copyright 2021 Ben Vanik. All rights reserved. * * Released under the BSD license - see LICENSE in the root for more details. * ****************************************************************************** */ // Post-include file for an ordinal table. - #undef XE_EXPORT diff --git a/src/xenia/kernel/util/ordinal_table_pre.inc b/src/xenia/kernel/util/ordinal_table_pre.inc index 612156693..015b65f57 100644 --- a/src/xenia/kernel/util/ordinal_table_pre.inc +++ b/src/xenia/kernel/util/ordinal_table_pre.inc @@ -2,7 +2,7 @@ ****************************************************************************** * Xenia : Xbox 360 Emulator Research Project * ****************************************************************************** - * Copyright 2013 Ben Vanik. All rights reserved. * + * Copyright 2021 Ben Vanik. All rights reserved. * * Released under the BSD license - see LICENSE in the root for more details. * ****************************************************************************** */ @@ -21,7 +21,4 @@ * #include "xenia/kernel/util/ordinal_table_post.inc" */ - -#define XE_EXPORT(module, ordinal, name, type) \ - name = ordinal - +#define XE_EXPORT(module, ordinal, name, type) name = ordinal diff --git a/src/xenia/kernel/xam/xam_module_export_groups.inc b/src/xenia/kernel/xam/xam_module_export_groups.inc index da6a363c6..563b789a5 100644 --- a/src/xenia/kernel/xam/xam_module_export_groups.inc +++ b/src/xenia/kernel/xam/xam_module_export_groups.inc @@ -2,7 +2,7 @@ ****************************************************************************** * Xenia : Xbox 360 Emulator Research Project * ****************************************************************************** - * Copyright 2020 Ben Vanik. All rights reserved. * + * Copyright 2021 Ben Vanik. All rights reserved. * * Released under the BSD license - see LICENSE in the root for more details. * ****************************************************************************** */ diff --git a/src/xenia/kernel/xam/xam_table.inc b/src/xenia/kernel/xam/xam_table.inc index 0bc4f02e6..2e22f5629 100644 --- a/src/xenia/kernel/xam/xam_table.inc +++ b/src/xenia/kernel/xam/xam_table.inc @@ -2,7 +2,7 @@ ****************************************************************************** * Xenia : Xbox 360 Emulator Research Project * ****************************************************************************** - * Copyright 2013 Ben Vanik. All rights reserved. * + * Copyright 2021 Ben Vanik. All rights reserved. * * Released under the BSD license - see LICENSE in the root for more details. * ****************************************************************************** */ @@ -10,6 +10,7 @@ // This is a partial file designed to be included by other files when // constructing various tables. +// clang-format off XE_EXPORT(xam, 0x00000001, NetDll_WSAStartup, kFunction), XE_EXPORT(xam, 0x00000002, NetDll_WSACleanup, kFunction), diff --git a/src/xenia/kernel/xbdm/xbdm_table.inc b/src/xenia/kernel/xbdm/xbdm_table.inc index 62a5ad75e..ab217b3ab 100644 --- a/src/xenia/kernel/xbdm/xbdm_table.inc +++ b/src/xenia/kernel/xbdm/xbdm_table.inc @@ -2,7 +2,7 @@ ****************************************************************************** * Xenia : Xbox 360 Emulator Research Project * ****************************************************************************** - * Copyright 2013 Ben Vanik. All rights reserved. * + * Copyright 2021 Ben Vanik. All rights reserved. * * Released under the BSD license - see LICENSE in the root for more details. * ****************************************************************************** */ @@ -10,6 +10,7 @@ // This is a partial file designed to be included by other files when // constructing various tables. +// clang-format off XE_EXPORT(xbdm, 0x00000001, DmAllocatePool, kFunction), XE_EXPORT(xbdm, 0x00000002, DmAllocatePoolWithTag, kFunction), diff --git a/src/xenia/kernel/xboxkrnl/xboxkrnl_table.inc b/src/xenia/kernel/xboxkrnl/xboxkrnl_table.inc index 3d6f6cc6f..0e0447055 100644 --- a/src/xenia/kernel/xboxkrnl/xboxkrnl_table.inc +++ b/src/xenia/kernel/xboxkrnl/xboxkrnl_table.inc @@ -2,7 +2,7 @@ ****************************************************************************** * Xenia : Xbox 360 Emulator Research Project * ****************************************************************************** - * Copyright 2013 Ben Vanik. All rights reserved. * + * Copyright 2021 Ben Vanik. All rights reserved. * * Released under the BSD license - see LICENSE in the root for more details. * ****************************************************************************** */ @@ -10,6 +10,7 @@ // This is a partial file designed to be included by other files when // constructing various tables. +// clang-format off XE_EXPORT(xboxkrnl, 0x00000001, DbgBreakPoint, kFunction), XE_EXPORT(xboxkrnl, 0x00000002, DbgBreakPointWithStatus, kFunction), diff --git a/xenia-build b/xenia-build index fdc31459a..6bba02562 100755 --- a/xenia-build +++ b/xenia-build @@ -1324,7 +1324,7 @@ def find_xenia_source_files(): return [os.path.join(root, name) for root, dirs, files in os.walk('src') for name in files - if name.endswith(('.cc', '.c', '.h', '.inl'))] + if name.endswith(('.cc', '.c', '.h', '.inl', '.inc'))] def find_all_source_files():