Skip to content

RISCV: add skeleton infrastructure for RISCV #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 22, 2022
Merged

RISCV: add skeleton infrastructure for RISCV #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,8 @@
# Output Directories
/build/
/html/

# Generated Data
/Definitions/RISCV32.json
/Definitions/RISCV64.json
/Definitions/RISCV128.json
34 changes: 33 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID MATCHES "X86" OR
elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID MATCHES "X64" OR
CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64|x86_64")
set(DS2_ARCHITECTURE X86_64)
elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID MATCHES "RISCV32|RISCV64|RISCV128" OR
CMAKE_SYSTEM_PROCESSOR MATCHES "riscv32|riscv64|riscv128")
set(DS2_ARCHITECTURE RISCV)
else()
message(SEND_ERROR "Unknown host architecture: ${CMAKE_SYSTEM_PROCESSOR}")
endif()
Expand Down Expand Up @@ -123,7 +126,14 @@ set_target_properties(RegsGen2::RegsGen2 PROPERTIES
IMPORTED_LOCATION ${BINARY_DIR}/${RegsGen2_RELATIVE_PATH})
add_dependencies(RegsGen2::RegsGen2 RegsGen2)

foreach(ARCH ARM ARM64 X86 X86_64)
# Generate different pointer size RISC-V definitions.
# FIXME(compnerd) this assumes all targets are RISCVnnnG, which may not be true.
foreach(WORDSIZE 32 64 128)
configure_file(${PROJECT_SOURCE_DIR}/Definitions/RISCVnnn.json
Copy link

@dmlockhart dmlockhart Mar 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: More clear name than RISCVnnn? Isn't exactly clear what it represents.

Copy link
Owner Author

@compnerd compnerd Mar 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I took this name from one of the RISCV docs (ELF psABI?). The "nnn" is a placeholder for digits indicating the bitness.

${PROJECT_SOURCE_DIR}/Definitions/RISCV${WORDSIZE}.json @ONLY)
endforeach()

foreach(ARCH ARM ARM64 RISCV32 RISCV64 RISCV128 X86 X86_64)
add_custom_command(OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/Headers/DebugServer2/Architecture/${ARCH}/RegistersDescriptors.h
COMMAND
Expand Down Expand Up @@ -222,6 +232,28 @@ elseif(DS2_ARCHITECTURE MATCHES "X86|X86_64")
PROPERTIES
COMPILE_OPTIONS $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-unused-const-variable>)
endif()
elseif(DS2_ARCHITECTURE STREQUAL RISCV)
target_sources(ds2 PRIVATE
Sources/Architecture/RISCV/SoftwareSingleStep.cpp
Sources/Core/RISCV/HardwareBreakpointManager.cpp
Sources/Core/RISCV/SoftwareBreakpointManager.cpp)

if(CMAKE_CXX_COMPILER_ARCHITECTURE_ID MATCHES "RISCV32" OR
CMAKE_SYSTEM_PROCESSOR MATCHES "riscv32")
target_sources(ds2 PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/Headers/DebugServer2/Architecture/RISCV32/RegistersDescriptors.h
${CMAKE_CURRENT_BINARY_DIR}/Sources/Architecture/RISCV32/RegistersDescriptors.cpp)
elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID MATCHES "RISCV64" OR
CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64")
target_sources(ds2 PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/Headers/DebugServer2/Architecture/RISCV64/RegistersDescriptors.h
${CMAKE_CURRENT_BINARY_DIR}/Sources/Architecture/RISCV64/RegistersDescriptors.cpp)
elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID MATCHES "RISCV128" OR
CMAKE_SYSTEM_PROCESSOR MATCHES "riscv128")
target_sources(ds2 PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/Headers/DebugServer2/Architecture/RISCV128/RegistersDescriptors.h
${CMAKE_CURRENT_BINARY_DIR}/Sources/Architecture/RISCV128/RegistersDescriptors.cpp)
endif()
endif()

# OS Sources
Expand Down
Loading