RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 07:07:34 +00:00
Code Issues Activity Actions

Applications: Port Debugger to LibMain

Browse source
This commit is contained in:
Lenny Maiorani 2022-02-09 15:38:36 -07:00 • committed by Linus Groh
parent e5d178528d
commit ed971f1134
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/Debugger/CMakeLists.txt
View file

@ -8,4 +8,4 @@ set(SOURCES
) )
serenity_bin(Debugger) serenity_bin(Debugger)
target_link_libraries(Debugger LibCore LibDebug LibX86 LibLine) target_link_libraries(Debugger LibCore LibDebug LibLine LibMain LibX86)

17
Userland/Applications/Debugger/main.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2020, Itamar S. <itamar8910@gmail.com> * Copyright (c) 2020, Itamar S. <itamar8910@gmail.com>
* Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -9,11 +10,14 @@
#include <AK/OwnPtr.h> #include <AK/OwnPtr.h>
#include <AK/Platform.h> #include <AK/Platform.h>
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <AK/Try.h>
#include <LibC/sys/arch/i386/regs.h> #include <LibC/sys/arch/i386/regs.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/System.h>
#include <LibDebug/DebugInfo.h> #include <LibDebug/DebugInfo.h>
#include <LibDebug/DebugSession.h> #include <LibDebug/DebugSession.h>
#include <LibLine/Editor.h> #include <LibLine/Editor.h>
#include <LibMain/Main.h>
#include <LibX86/Disassembler.h> #include <LibX86/Disassembler.h>
#include <LibX86/Instruction.h> #include <LibX86/Instruction.h>
#include <signal.h> #include <signal.h>
@ -204,21 +208,18 @@ static void print_help()
"x <address> - examine dword in memory\n"); "x <address> - examine dword in memory\n");
} }
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
editor = Line::Editor::construct(); editor = Line::Editor::construct();
if (pledge("stdio proc ptrace exec rpath tty sigaction cpath unix", nullptr) < 0) { TRY(Core::System::pledge("stdio proc ptrace exec rpath tty sigaction cpath unix", nullptr));
perror("pledge");
return 1;
}
const char* command = nullptr; const char* command = nullptr;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.add_positional_argument(command, args_parser.add_positional_argument(command,
"The program to be debugged, along with its arguments", "The program to be debugged, along with its arguments",
"program", Core::ArgsParser::Required::Yes); "program", Core::ArgsParser::Required::Yes);
args_parser.parse(argc, argv); args_parser.parse(arguments);
auto result = Debug::DebugSession::exec_and_attach(command); auto result = Debug::DebugSession::exec_and_attach(command);
if (!result) { if (!result) {
@ -230,7 +231,7 @@ int main(int argc, char** argv)
struct sigaction sa { struct sigaction sa {
}; };
sa.sa_handler = handle_sigint; sa.sa_handler = handle_sigint;
sigaction(SIGINT, &sa, nullptr); TRY(Core::System::sigaction(SIGINT, &sa, nullptr));
Debug::DebugInfo::SourcePosition previous_source_position; Debug::DebugInfo::SourcePosition previous_source_position;
bool in_step_line = false; bool in_step_line = false;
@ -331,4 +332,6 @@ int main(int argc, char** argv)
return decision.value(); return decision.value();
} }
}); });
return 0;
} }