diff --git a/CMakeLists.txt b/CMakeLists.txt index 34a9146..19d2a95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -240,7 +240,7 @@ elseif (IS_OS_LINUX) include/ehs/io/socket/ICMP_LNX.h src/io/socket/ICMP_LNX.cpp ) - #set(LINUX_WINDOW_SYSTEM "Wayland" CACHE STRING "Linux Window System") + set(LINUX_WINDOW_SYSTEM "XCB" CACHE STRING "Linux Window System") if (LINUX_WINDOW_SYSTEM STREQUAL "Wayland") add_compile_definitions(EHS_WS_WAYLAND) @@ -258,7 +258,7 @@ elseif (IS_OS_LINUX) if (IS_ARCH_AMD64) list(APPEND EHS_SOURCES src/system/CPU_GCC_AMD64.asm src/HRNG_GCC.asm src/Math_GCC_AMD64.asm src/system/AVX2_GCC_AMD64.asm src/system/AVX512_GCC_AMD64.asm) elseif (IS_ARCH_ARM64) - list(APPEND EHS_SOURCES src/system/CPU_ARM64.cpp src/HRNG_ARM64.cpp src/Math_GCC_ARM64.s src/system/AVX2_AARCH64.cpp src/system/AVX512_AARCH64.cpp) + list(APPEND EHS_SOURCES src/system/CPU_ARM64.cpp src/system/CPU_GCC_AARCH64.s src/HRNG_ARM64.cpp src/Math_GCC_ARM64.s src/system/AVX2_AARCH64.cpp src/system/AVX512_AARCH64.cpp) endif () endif() diff --git a/src/system/CPU_ARM64.cpp b/src/system/CPU_ARM64.cpp index ba140bf..33b6561 100644 --- a/src/system/CPU_ARM64.cpp +++ b/src/system/CPU_ARM64.cpp @@ -2,10 +2,6 @@ namespace ehs { - void CPU::RDTSCP(TSC* tsc) - { - } - void CPU::GetManufacturer(Char_8* input) { } diff --git a/src/system/CPU_GCC_AARCH64.s b/src/system/CPU_GCC_AARCH64.s new file mode 100644 index 0000000..4ec99ac --- /dev/null +++ b/src/system/CPU_GCC_AARCH64.s @@ -0,0 +1,7 @@ +.global _ZN3ehs3CPU6RDTSCPEPNS_3TSCE + +.section .text + _ZN3ehs3CPU6RDTSCPEPNS_3TSCE: + MRS X1, CNTVCT_EL0 + STR X1, [X0, #4] + RET \ No newline at end of file