Skip to content

Commit

Permalink
Merge pull request #11497 from vyuuui/debugger_assembler_ui
Browse files Browse the repository at this point in the history
Built-in assembler for debugger interface
  • Loading branch information
Tilka committed Dec 16, 2023
2 parents 190c4e8 + c8c9928 commit 773ffd0
Show file tree
Hide file tree
Showing 120 changed files with 9,774 additions and 11 deletions.
Binary file added Data/Sys/Themes/Clean Blue/assembler_assemble.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Data/Sys/Themes/Clean Blue/assembler_inject.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Data/Sys/Themes/Clean Blue/assembler_new.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Data/Sys/Themes/Clean Blue/assembler_new@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Data/Sys/Themes/Clean Blue/assembler_new@4x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Data/Sys/Themes/Clean Blue/assembler_openasm.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Data/Sys/Themes/Clean Blue/assembler_save.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Data/Sys/Themes/Clean Blue/assembler_save@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Data/Sys/Themes/Clean Blue/assembler_save@4x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Data/Sys/Themes/Clean Emerald/assembler_new.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Data/Sys/Themes/Clean Emerald/assembler_save.png
Binary file added Data/Sys/Themes/Clean Lite/assembler_assemble.png
Binary file added Data/Sys/Themes/Clean Lite/assembler_inject.png
Binary file added Data/Sys/Themes/Clean Lite/assembler_new.png
Binary file added Data/Sys/Themes/Clean Lite/assembler_new@2x.png
Binary file added Data/Sys/Themes/Clean Lite/assembler_new@4x.png
Binary file added Data/Sys/Themes/Clean Lite/assembler_openasm.png
Binary file added Data/Sys/Themes/Clean Lite/assembler_save.png
Binary file added Data/Sys/Themes/Clean Lite/assembler_save@2x.png
Binary file added Data/Sys/Themes/Clean Lite/assembler_save@4x.png
Binary file added Data/Sys/Themes/Clean Pink/assembler_assemble.png
Binary file added Data/Sys/Themes/Clean Pink/assembler_inject.png
Binary file added Data/Sys/Themes/Clean Pink/assembler_new.png
Binary file added Data/Sys/Themes/Clean Pink/assembler_new@2x.png
Binary file added Data/Sys/Themes/Clean Pink/assembler_new@4x.png
Binary file added Data/Sys/Themes/Clean Pink/assembler_openasm.png
Binary file added Data/Sys/Themes/Clean Pink/assembler_save.png
Binary file added Data/Sys/Themes/Clean Pink/assembler_save@2x.png
Binary file added Data/Sys/Themes/Clean Pink/assembler_save@4x.png
Binary file added Data/Sys/Themes/Clean/assembler_assemble.png
Binary file added Data/Sys/Themes/Clean/assembler_assemble@2x.png
Binary file added Data/Sys/Themes/Clean/assembler_assemble@4x.png
Binary file added Data/Sys/Themes/Clean/assembler_clipboard.png
Binary file added Data/Sys/Themes/Clean/assembler_inject.png
Binary file added Data/Sys/Themes/Clean/assembler_inject@2x.png
Binary file added Data/Sys/Themes/Clean/assembler_inject@4x.png
Binary file added Data/Sys/Themes/Clean/assembler_new.png
Binary file added Data/Sys/Themes/Clean/assembler_new@2x.png
Binary file added Data/Sys/Themes/Clean/assembler_new@4x.png
Binary file added Data/Sys/Themes/Clean/assembler_openasm.png
Binary file added Data/Sys/Themes/Clean/assembler_openasm@2x.png
Binary file added Data/Sys/Themes/Clean/assembler_openasm@4x.png
Binary file added Data/Sys/Themes/Clean/assembler_save.png
Binary file added Data/Sys/Themes/Clean/assembler_save@2x.png
Binary file added Data/Sys/Themes/Clean/assembler_save@4x.png
26 changes: 26 additions & 0 deletions Source/Core/Common/Assembler/AssemblerShared.cpp
@@ -0,0 +1,26 @@
// Copyright 2023 Dolphin Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later

#include "Common/Assembler/AssemblerShared.h"

#include <fmt/format.h>

namespace Common::GekkoAssembler
{
std::string AssemblerError::FormatError() const
{
const char* space_char = col == 0 ? "" : " ";

std::string_view line_str = error_line;
if (line_str.back() == '\n')
{
line_str = line_str.substr(0, line_str.length() - 1);
}

return fmt::format("Error on line {0} col {1}:\n"
" {2}\n"
" {3:{4}}{5:^^{6}}\n"
"{7}",
line + 1, col + 1, line_str, space_char, col, '^', len, message);
}
} // namespace Common::GekkoAssembler

0 comments on commit 773ffd0

Please sign in to comment.