Skip to content

Commit

Permalink
Debugger: Update to latest armips.
Browse files Browse the repository at this point in the history
  • Loading branch information
@unknownbrackets
unknownbrackets committed Jun 30, 2018
1 parent 5e6429a commit 8ae157e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions Core/Debugger/SymbolMap.cpp
View file
Expand Up @@ -29,6 +29,7 @@
#endif

#include <algorithm>
#include <memory>

#include "util/text/utf8.h"
#include "zlib.h"
Expand Down
4 changes: 2 additions & 2 deletions Core/MIPS/MIPSAsm.cpp
View file
Expand Up @@ -3,6 +3,7 @@
#endif
#include <cstdarg>
#include <cstring>
#include <memory>
#include <vector>

#include "Common/CommonTypes.h"
Expand Down Expand Up @@ -66,7 +67,6 @@ class PspAssemblerFile: public AssemblerFile

bool MipsAssembleOpcode(const char* line, DebugInterface* cpu, u32 address)
{
PspAssemblerFile file;
StringList errors;

wchar_t str[64];
Expand All @@ -76,7 +76,7 @@ bool MipsAssembleOpcode(const char* line, DebugInterface* cpu, u32 address)
args.mode = ArmipsMode::MEMORY;
args.content = str + ConvertUTF8ToWString(line);
args.silent = true;
args.memoryFile = &file;
args.memoryFile.reset(new PspAssemblerFile());

This comment has been minimized.

Sign in to view

Copy link
@hissingshark

hissingshark Jul 12, 2018

Contributor

/home/osmc/ppsspp/Core/MIPS/MIPSAsm.cpp:79:18: error: request for member ‘reset’ in ‘args.ArmipsArguments::memoryFile’, which is of pointer type ‘AssemblerFile*’ (maybe you meant to use ‘->’ ?)
args.memoryFile.reset(new PspAssemblerFile());

Builds and runs with just:
args.memoryFile = new PspAssemblerFile();
but I imagine you're really wanting to call on some memset type method to clear it before use? Sorry I couldn't find it.

This comment has been minimized.

Sign in to view

Copy link
@unknownbrackets

unknownbrackets Jul 12, 2018

Author Collaborator

You need to run git submodule update, this also updated a submodule which now uses a std::shared_ptr or similar.

-[Unknown]

This comment has been minimized.

Sign in to view

Copy link
@hissingshark

hissingshark Jul 12, 2018

Contributor

Sorry. I rebased my fork against upstream/master before starting some work, but forgot about the submodules. Many thanks. Every day's a school day.
args.errorsResult = &errors;

if (g_symbolMap) {
Expand Down
2 changes: 1 addition & 1 deletion ext/armips
Submodule armips updated 52 files
+3 −3 Archs/ARM/Arm.cpp
+2 −2 Archs/ARM/Arm.h
+1 −1 Archs/ARM/ArmElfRelocator.cpp
+1 −1 Archs/ARM/ArmElfRelocator.h
+15 −15 Archs/ARM/ArmParser.cpp
+4 −4 Archs/ARM/ArmParser.h
+2 −2 Archs/Architecture.h
+12 −0 Archs/MIPS/CMipsInstruction.cpp
+4 −4 Archs/MIPS/Mips.cpp
+2 −2 Archs/MIPS/Mips.h
+2 −4 Archs/MIPS/MipsElfFile.cpp
+1 −1 Archs/MIPS/MipsElfFile.h
+1 −1 Archs/MIPS/MipsElfRelocator.cpp
+1 −1 Archs/MIPS/MipsElfRelocator.h
+16 −21 Archs/MIPS/MipsMacros.cpp
+3 −4 Archs/MIPS/MipsMacros.h
+16 −16 Archs/MIPS/MipsParser.cpp
+3 −3 Archs/MIPS/MipsParser.h
+1 −1 Archs/MIPS/PsxRelocator.h
+2 −2 CMakeLists.txt
+1 −7 Commands/CAssemblerLabel.cpp
+4 −5 Commands/CAssemblerLabel.h
+0 −5 Commands/CDirectiveArea.cpp
+2 −3 Commands/CDirectiveArea.h
+5 −9 Commands/CDirectiveConditional.cpp
+4 −5 Commands/CDirectiveConditional.h
+13 −0 Commands/CDirectiveData.cpp
+16 −5 Commands/CDirectiveFile.cpp
+3 −3 Commands/CDirectiveFile.h
+4 −12 Commands/CommandSequence.cpp
+3 −4 Commands/CommandSequence.h
+3 −3 Core/Assembler.cpp
+1 −1 Core/Assembler.h
+1 −1 Core/Common.cpp
+1 −1 Core/Common.h
+1 −0 Core/ELF/ElfFile.cpp
+6 −6 Core/ELF/ElfRelocator.cpp
+4 −4 Core/ELF/ElfRelocator.h
+31 −1 Core/Expression.cpp
+4 −2 Core/ExpressionFunctions.cpp
+2 −2 Core/FileManager.cpp
+5 −5 Core/FileManager.h
+2 −0 Core/Misc.cpp
+3 −8 Core/SymbolTable.cpp
+2 −2 Core/SymbolTable.h
+89 −89 Parser/DirectivesParser.cpp
+2 −2 Parser/DirectivesParser.h
+23 −11 Parser/ExpressionParser.cpp
+28 −30 Parser/Parser.cpp
+12 −12 Parser/Parser.h
+3 −0 Util/FileClasses.cpp
+7 −0 stdafx.h

0 comments on commit 8ae157e

Please sign in to comment.