11;
22; PROJECT: Mobility
3- ; FILE: Mobility.Runtime .x64.Assembly.asm
3+ ; FILE: Mobility.Platform .x64.Assembly.asm
44; PURPOSE: Implementation for Mobility Runtime x64 Specific Assembly Parts
55;
66; LICENSE: The MIT License
@@ -100,7 +100,7 @@ MoPlatformWriteCr3 ENDP
100100
101101; -----------------------------------------------------------------------------
102102; EXTERN_C VOID MOAPI MoPlatformLoadGlobalDescriptorTable(
103- ; _In_ PMO_RUNTIME_X64_PSEUDO_DESCRIPTOR Descriptor);
103+ ; _In_ PMO_PLATFORM_X64_PSEUDO_DESCRIPTOR Descriptor);
104104; -----------------------------------------------------------------------------
105105MoPlatformLoadGlobalDescriptorTable PROC
106106 ; RCX = Descriptor
@@ -111,7 +111,7 @@ MoPlatformLoadGlobalDescriptorTable ENDP
111111
112112; -----------------------------------------------------------------------------
113113; EXTERN_C VOID MOAPI MoPlatformLoadInterruptDescriptorTable(
114- ; _In_ PMO_RUNTIME_X64_PSEUDO_DESCRIPTOR Descriptor);
114+ ; _In_ PMO_PLATFORM_X64_PSEUDO_DESCRIPTOR Descriptor);
115115; -----------------------------------------------------------------------------
116116MoPlatformLoadInterruptDescriptorTable PROC
117117 ; RCX = Descriptor
@@ -188,7 +188,7 @@ MoPlatformSwitchToNewStack PROC
188188 ; Call the function.
189189 call rdx
190190
191- ; If the function returns, we halt because the stack has been switched
191+ ; If the function returns, we halt because the stack has been switched
192192 ; and we cannot return to the original caller.
193193 cli
194194HaltLoop:
@@ -197,7 +197,7 @@ HaltLoop:
197197MoPlatformSwitchToNewStack ENDP
198198
199199; -----------------------------------------------------------------------------
200- ; EXTERN_C PMO_RUNTIME_X64_INTERRUPT_HANDLER MoPlatformInterruptHandlers[256];
200+ ; EXTERN_C PMO_PLATFORM_X64_INTERRUPT_HANDLER MoPlatformInterruptHandlers[256];
201201; -----------------------------------------------------------------------------
202202; The external array of interrupt handlers.
203203EXTRN MoPlatformInterruptHandlers: QWORD
@@ -240,7 +240,7 @@ MoPlatformInterruptCommonEntry PROC PUBLIC FRAME
240240 ; +---------------------+ <-- RBP, 16-byte aligned
241241
242242 ; Since here the stack pointer is 16-byte aligned, so
243- ; MO_RUNTIME_X64_FXSAVE_AREA of PMO_RUNTIME_X64_INTERRUPT_CONTEXT
243+ ; MO_PLATFORM_X64_FXSAVE_AREA of PMO_PLATFORM_X64_INTERRUPT_CONTEXT
244244 ; is 16-byte aligned
245245
246246 ; MO_UINT64 Rdi, Rsi, Rbp, Rsp, Rbx, Rdx, Rcx, Rax;
@@ -343,7 +343,7 @@ MoPlatformInterruptCommonEntry PROC PUBLIC FRAME
343343 mov rax , dr0
344344 push rax
345345
346- ; MO_RUNTIME_X64_FXSAVE_AREA FxSaveState;
346+ ; MO_PLATFORM_X64_FXSAVE_AREA FxSaveState;
347347
348348 sub rsp , 512
349349 mov rcx , rsp
@@ -376,11 +376,11 @@ MoPlatformInterruptCommonEntry PROC PUBLIC FRAME
376376NonNullValue:
377377 ; BUGBUG: This should not be necessary, but it's currently true that
378378 ; interrupt handlers enable interrupts
379- cli
379+ cli
380380 ; MO_UINT64 ExceptionData;
381381 add rsp , 8
382382
383- ; MO_RUNTIME_X64_FXSAVE_AREA FxSaveState;
383+ ; MO_PLATFORM_X64_FXSAVE_AREA FxSaveState;
384384
385385 mov rcx , rsp
386386 fxrstor [ rcx ]
@@ -504,7 +504,7 @@ ALIGN 8
504504
505505 IF DummyCodeNeeded
506506 ; Push a dummy error code. Use rax to get a 1-byte instruction to fit.
507- push rax
507+ push rax
508508 ENDIF
509509
510510 ; Must use LOW(Vector) to ensure only use 2-byte instruction to push vector
0 commit comments