From 3db03d420ca0269e0f23f6798e880d561e35b1e6 Mon Sep 17 00:00:00 2001 From: Matt Godbolt Date: Mon, 9 Mar 2020 07:47:44 -0500 Subject: [PATCH 1/3] Add a CMakeLists.txt --- .gitignore | 4 ++++ CMakeLists.txt | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 CMakeLists.txt diff --git a/.gitignore b/.gitignore index c870ef75..8b5d86f7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,7 @@ make_timing_rom perf.rom test.rom timing.rom + +# CLion/Cmake crap +cmake-* +.idea diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..a480156b --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.4) +project(beebjit) + +set_property(SOURCE .S PROPERTY LANGUAGE C) + +set(BEEBJIT_ASM_FILES asm_x64_common.S asm_x64_inturbo.S asm_x64_jit.S) + +add_compile_options(-no-pie) +add_link_options(-no-pie) + +foreach (ASM_SRC ${BEEBJIT_ASM_FILES}) + set_property(SOURCE ${ASM_SRC} PROPERTY LANGUAGE C) +endforeach () + +set(BEEBJIT_SRC_FILES main.c bbc.c jit.c defs_6502.c debug.c util.c state.c video.c via.c + emit_6502.c interp.c inturbo.c state_6502.c sound.c intel_fdc.c timing.c + jit_compiler.c cpu_driver.c asm_x64_abi.c asm_tables.c + asm_x64_common.c asm_x64_inturbo.c asm_x64_jit.c + jit_optimizer.c jit_opcode.c keyboard.c os.c + teletext.c render.c serial.c log.c test.c disc.c ibm_disc_format.c tape.c + disc_fsd.c disc_hfe.c disc_ssd.c) + + +add_executable(beebjit ${BEEBJIT_SRC_FILES} ${BEEBJIT_ASM_FILES}) +target_link_libraries(beebjit m X11 Xext pthread asound) From 6057b14a076b38861e1c602455af82f9630ba1a9 Mon Sep 17 00:00:00 2001 From: Matt Godbolt Date: Wed, 11 Mar 2020 08:14:30 -0500 Subject: [PATCH 2/3] Ignore perf files --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 8b5d86f7..d9c000c0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ timing.rom # CLion/Cmake crap cmake-* .idea + +# Linux perf profiler +perf.data* From 694b82c8aa07a86f78184e7f29b1a3d5a5133f54 Mon Sep 17 00:00:00 2001 From: Matt Godbolt Date: Tue, 16 Jun 2020 21:28:20 -0500 Subject: [PATCH 3/3] Hackily add in latest files --- CMakeLists.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a480156b..8c99044c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,13 +12,18 @@ foreach (ASM_SRC ${BEEBJIT_ASM_FILES}) set_property(SOURCE ${ASM_SRC} PROPERTY LANGUAGE C) endforeach () -set(BEEBJIT_SRC_FILES main.c bbc.c jit.c defs_6502.c debug.c util.c state.c video.c via.c - emit_6502.c interp.c inturbo.c state_6502.c sound.c intel_fdc.c timing.c +set(BEEBJIT_SRC_FILES + main.c bbc.c defs_6502.c state.c video.c via.c + emit_6502.c interp.c inturbo.c state_6502.c sound.c timing.c jit_compiler.c cpu_driver.c asm_x64_abi.c asm_tables.c asm_x64_common.c asm_x64_inturbo.c asm_x64_jit.c - jit_optimizer.c jit_opcode.c keyboard.c os.c - teletext.c render.c serial.c log.c test.c disc.c ibm_disc_format.c tape.c - disc_fsd.c disc_hfe.c disc_ssd.c) + asm_x64_common.S asm_x64_inturbo.S asm_x64_jit.S + jit_optimizer.c jit_opcode.c keyboard.c + teletext.c render.c serial.c log.c test.c tape.c + intel_fdc.c wd_fdc.c + disc_drive.c disc.c disc_fsd.c disc_hfe.c disc_ssd.c ibm_disc_format.c + debug.c jit.c util.c + os.c) add_executable(beebjit ${BEEBJIT_SRC_FILES} ${BEEBJIT_ASM_FILES})