diff options
| author | Lenny Komow <lenny@lunarg.com> | 2017-07-03 14:48:38 -0600 |
|---|---|---|
| committer | Lenny Komow <lenny@lunarg.com> | 2017-07-05 15:02:04 -0600 |
| commit | 50e2dc04b53368fd5a5d35008db5a013766a4804 (patch) | |
| tree | 26b327086e912c70085e7eb86a9b767d58a92108 /loader | |
| parent | 6a09cf0ac332b0a0f0a15f6de1cd318e3d37ef85 (diff) | |
| download | usermoji-50e2dc04b53368fd5a5d35008db5a013766a4804.tar.xz | |
loader: Rename files to better reflect their use
Change-Id: Ie3df06c1c4f78cd515cb4579e93bd80331913669
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | loader/asm_offset.c | 2 | ||||
| -rw-r--r-- | loader/unknown_ext_chain.c (renamed from loader/phys_dev_chain.c) | 1 | ||||
| -rw-r--r-- | loader/unknown_ext_chain_gas.asm (renamed from loader/phys_dev_chain_gas.asm) | 7 | ||||
| -rw-r--r-- | loader/unknown_ext_chain_masm.asm (renamed from loader/phys_dev_chain_masm.asm) | 7 |
5 files changed, 14 insertions, 11 deletions
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 0e87e217..4a70e39f 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -93,7 +93,7 @@ if (WIN32) if (NOT CMAKE_CL_64) set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} /safeseh) endif() - set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} phys_dev_chain_masm.asm) + set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain_masm.asm) add_executable(asm_offset asm_offset.c) add_dependencies(asm_offset generate_helper_files loader_gen_files) @@ -101,7 +101,7 @@ if (WIN32) add_custom_target(loader_asm_gen_files DEPENDS gen_defines.asm) else() message(WARNING "Could not find working MASM assebler\n${ASM_FAILURE_MSG}") - set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} phys_dev_chain.c) + set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain.c) add_custom_target(loader_asm_gen_files) endif() else() @@ -113,14 +113,14 @@ else() try_compile(ASSEMBLER_WORKS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/asm_test.asm) file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/asm_test.asm) if (ASSEMBLER_WORKS) - set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} phys_dev_chain_gas.asm) + set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain_gas.asm) add_executable(asm_offset asm_offset.c) add_dependencies(asm_offset generate_helper_files loader_gen_files) add_custom_command(OUTPUT gen_defines.asm DEPENDS asm_offset COMMAND asm_offset GAS) add_custom_target(loader_asm_gen_files DEPENDS gen_defines.asm) else() message(WARNING "Could not find working x86 GAS assembler\n${ASM_FAILURE_MSG}") - set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} phys_dev_chain.c) + set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain.c) add_custom_target(loader_asm_gen_files) endif() endif() diff --git a/loader/asm_offset.c b/loader/asm_offset.c index e8008806..aafae09f 100644 --- a/loader/asm_offset.c +++ b/loader/asm_offset.c @@ -68,7 +68,7 @@ int main(int argc, char **argv) { struct loader_dispatch_hash_entry hash; size_t func_name_offset = ((size_t) &hash.func_name) - ((size_t) &hash); - + struct loader_dev_dispatch_table dev_disp; size_t dev_disp_offset = ((size_t) &dev_disp.ext_dispatch) - ((size_t) &dev_disp); diff --git a/loader/phys_dev_chain.c b/loader/unknown_ext_chain.c index 46abc3b7..1c8560dd 100644 --- a/loader/phys_dev_chain.c +++ b/loader/unknown_ext_chain.c @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * + * Author Jon Ashburn <jon@lunarg.com> * Author: Lenny Komow <lenny@lunarg.com> */ diff --git a/loader/phys_dev_chain_gas.asm b/loader/unknown_ext_chain_gas.asm index 44171da9..e463f45b 100644 --- a/loader/phys_dev_chain_gas.asm +++ b/loader/unknown_ext_chain_gas.asm @@ -18,9 +18,10 @@ # Author: Lenny Komow <lenny@lunarg.com> # -# This code is used to pass on physical device extensions through the call chain. It must do this without creating a stack frame, -# because the actual parameters of the call are not known. Since the first parameter is known to be a VkPhysicalDevice, it can -# unwrap the physical device, overwriting the wrapped device, and then jump to the next function in the call chain +# This code is used to pass on device (including physical device) extensions through the call chain. It must do this without +# creating a stack frame, because the actual parameters of the call are not known. Since the first parameter is known to be a +# VkPhysicalDevice or a dispatchable object it can unwrap the object, possibly overwriting the wrapped physical device, and then +# jump to the next function in the call chain .intel_syntax noprefix .include "gen_defines.asm" diff --git a/loader/phys_dev_chain_masm.asm b/loader/unknown_ext_chain_masm.asm index 982e1086..34bc7c2f 100644 --- a/loader/phys_dev_chain_masm.asm +++ b/loader/unknown_ext_chain_masm.asm @@ -18,9 +18,10 @@ ; Author: Lenny Komow <lenny@lunarg.com> ; -; This code is used to pass on physical device extensions through the call chain. It must do this without creating a stack frame, -; because the actual parameters of the call are not known. Since the first parameter is known to be a VkPhysicalDevice, it can -; unwrap the physical device, overwriting the wrapped device, and then jump to the next function in the call chain +; This code is used to pass on device (including physical device) extensions through the call chain. It must do this without +; creating a stack frame, because the actual parameters of the call are not known. Since the first parameter is known to be a +; VkPhysicalDevice or a dispatchable object it can unwrap the object, possibly overwriting the wrapped physical device, and then +; jump to the next function in the call chain ; Codegen defines a number of values, chiefly offsets of members within structs and sizes of data types within gen_defines.asm. ; Struct member offsets are defined in the format "XX_OFFSET_YY" where XX indicates the member within the struct and YY indicates |
