diff --git a/pinpoint/final/on_finish_unit.cpp b/pinpoint/final/on_finish_unit.cpp index f8ffad7..f7b638e 100644 --- a/pinpoint/final/on_finish_unit.cpp +++ b/pinpoint/final/on_finish_unit.cpp @@ -28,7 +28,7 @@ void on_finish_unit(void* plugin_data, void* user_data) { } for (const auto& [uid, ipin] : S1InstructionPin::all()) { - std::cout << " Instruction pin at symbol \"" << SPSLR_PINPOINT_STAGE1_SEPARATOR - << "_" << uid << "\" -> target " << ipin.target << ", offset " << ipin.offset << std::endl; + std::cout << " Instruction pin at symbol \"" << SPSLR_PINPOINT_STAGE1_PIN + << uid << "\" -> target " << ipin.target << ", offset " << ipin.offset << std::endl; } } diff --git a/pinpoint/pinpoint_config.h b/pinpoint/pinpoint_config.h index e73004a..2ccbaf1 100644 --- a/pinpoint/pinpoint_config.h +++ b/pinpoint/pinpoint_config.h @@ -2,4 +2,4 @@ #define SPSLR_ATTRIBUTE "spslr" #define SPSLR_PINPOINT_STAGE0_SEPARATOR "__spslr_offsetof" -#define SPSLR_PINPOINT_STAGE1_SEPARATOR "__spslr_pin" /* suffixed with "_" */ +#define SPSLR_PINPOINT_STAGE1_PIN "__spslr_ipin_" /* suffixed with "" */ diff --git a/pinpoint/stage1/asm_offset_pass.cpp b/pinpoint/stage1/asm_offset_pass.cpp index d790142..3b529b4 100644 --- a/pinpoint/stage1/asm_offset_pass.cpp +++ b/pinpoint/stage1/asm_offset_pass.cpp @@ -19,13 +19,13 @@ void S1InstructionPin::reset() { static char asm_str_buf[1024]; static const char* make_asm_noarch(UID uid) { - snprintf(asm_str_buf, sizeof(asm_str_buf), SPSLR_PINPOINT_STAGE1_SEPARATOR "_%lu:", uid); + snprintf(asm_str_buf, sizeof(asm_str_buf), SPSLR_PINPOINT_STAGE1_PIN "%lu:", uid); return nullptr; } static const char* make_asm_x86_64(UID uid) { // Asm has 1 output (%0) and 2 inputs for target (%1) and offset (%2) - snprintf(asm_str_buf, sizeof(asm_str_buf), SPSLR_PINPOINT_STAGE1_SEPARATOR "_%lu: mov %2, %0", uid); + snprintf(asm_str_buf, sizeof(asm_str_buf), SPSLR_PINPOINT_STAGE1_PIN "%lu: mov %2, %0", uid); return asm_str_buf; }