Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Core/GL/UI] Not all fields initilize and minor code refactor

Browse Source
This commit is contained in:
Herman Semenov 2024-04-11 15:50:42 +03:00
parent 22fdf6624c
commit 0d1f7e2e6c
6 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Common/FakeEmitter.h
View File

@ -145,26 +145,26 @@ public:
return Type; return Type;
} }
Operand2() {} Operand2() {}
Operand2(u32 imm, OpType type = TYPE_IMM) Operand2(u32 imm, OpType type = TYPE_IMM) : IndexOrShift(), Shift()
{ {
Type = type; Type = type;
Value = imm; Value = imm;
Rotation = 0; Rotation = 0;
} }
Operand2(FakeReg Reg) Operand2(FakeReg Reg) : IndexOrShift(), Shift()
{ {
Type = TYPE_REG; Type = TYPE_REG;
Value = Reg; Value = Reg;
Rotation = 0; Rotation = 0;
} }
Operand2(u8 imm, u8 rotation) Operand2(u8 imm, u8 rotation) : IndexOrShift(), Shift()
{ {
Type = TYPE_IMM; Type = TYPE_IMM;
Value = imm; Value = imm;
Rotation = rotation; Rotation = rotation;
} }
Operand2(FakeReg base, ShiftType type, FakeReg shift) // RSR Operand2(FakeReg base, ShiftType type, FakeReg shift) : Rotation(0) // RSR
{ {
Type = TYPE_RSR; Type = TYPE_RSR;
_assert_msg_(type != ST_RRX, "Invalid Operand2: RRX does not take a register shift amount"); _assert_msg_(type != ST_RRX, "Invalid Operand2: RRX does not take a register shift amount");
@ -173,7 +173,7 @@ public:
Value = base; Value = base;
} }
Operand2(FakeReg base, ShiftType type, u8 shift)// For IMM shifted register Operand2(FakeReg base, ShiftType type, u8 shift) : Rotation(0) // For IMM shifted register
{ {
if(shift == 32) shift = 0; if(shift == 32) shift = 0;
switch (type) switch (type)

2
Common/GPU/OpenGL/GLQueueRunner.h
View File

@ -298,7 +298,7 @@ enum GLRAspect {
const char *GLRAspectToString(GLRAspect aspect); const char *GLRAspectToString(GLRAspect aspect);
struct GLRStep { struct GLRStep {
GLRStep(GLRStepType _type) : stepType(_type) {} GLRStep(GLRStepType _type) : stepType(_type), tag() {}
GLRStepType stepType; GLRStepType stepType;
FastVec<GLRRenderData> commands; FastVec<GLRRenderData> commands;
TinySet<const GLRFramebuffer *, 8> dependencies; TinySet<const GLRFramebuffer *, 8> dependencies;

2
Core/MIPS/fake/FakeJit.cpp
View File

@ -40,7 +40,7 @@ void DisassembleFake(const u8 *data, int size) {
namespace MIPSComp namespace MIPSComp
{ {
FakeJit::FakeJit(MIPSState *mipsState) : blocks(mipsState, this), mips_(mipsState) FakeJit::FakeJit(MIPSState *mipsState) : blocks(mipsState, this), mips_(mipsState), js()
{ {
logBlocks = 0; logBlocks = 0;
dontLogBlocks = 0; dontLogBlocks = 0;

12
Core/Util/DisArm64.cpp
View File

@ -749,15 +749,21 @@ static void FPandASIMD1(uint32_t w, uint64_t addr, Instruction *instr) {
int dst_index = imm5 >> (size + 1); int dst_index = imm5 >> (size + 1);
int src_index = imm4 >> size; int src_index = imm4 >> size;
int op = (w >> 29) & 1; int op = (w >> 29) & 1;
char s = "bhsd"[size]; char s;
switch (size) {
case 0x00: s = 'b'; break;
case 0x01: s = 'h'; break;
case 0x02: s = 's'; break;
case 0x03: s = 'd'; break;
}
if (op == 0 && imm4 == 0) { if (op == 0 && imm4 == 0) {
// DUP (element) // DUP (element)
int idxdsize = (imm5 & 8) ? 128 : 64; int idxdsize = (imm5 & 8) ? 128 : 64;
char r = "dq"[idxdsize == 128]; char r = (idxdsize == 128) ? 'q' : 'd';
snprintf(instr->text, sizeof(instr->text), "dup %c%d, %c%d.%c[%d]", r, Rd, r, Rn, s, dst_index); snprintf(instr->text, sizeof(instr->text), "dup %c%d, %c%d.%c[%d]", r, Rd, r, Rn, s, dst_index);
} else { } else {
int idxdsize = (imm4 & 8) ? 128 : 64; int idxdsize = (imm4 & 8) ? 128 : 64;
char r = "dq"[idxdsize == 128]; char r = (idxdsize == 128) ? 'q' : 'd';
snprintf(instr->text, sizeof(instr->text), "ins %c%d.%c[%d], %c%d.%c[%d]", r, Rd, s, dst_index, r, Rn, s, src_index); snprintf(instr->text, sizeof(instr->text), "ins %c%d.%c[%d], %c%d.%c[%d]", r, Rd, s, dst_index, r, Rn, s, src_index);
} }
} }

19
UI/ControlMappingScreen.cpp
View File

@ -97,15 +97,16 @@ void SingleControlMapper::Refresh() {
Clear(); Clear();
auto mc = GetI18NCategory(I18NCat::MAPPABLECONTROLS); auto mc = GetI18NCategory(I18NCat::MAPPABLECONTROLS);
std::map<std::string, ImageID> keyImages; std::map<std::string, ImageID> keyImages = {
keyImages["Circle"] = ImageID("I_CIRCLE"); { "Circle", ImageID("I_CIRCLE") },
keyImages["Cross"] = ImageID("I_CROSS"); { "Cross", ImageID("I_CROSS") },
keyImages["Square"] = ImageID("I_SQUARE"); { "Square", ImageID("I_SQUARE") },
keyImages["Triangle"] = ImageID("I_TRIANGLE"); { "Triangle", ImageID("I_TRIANGLE") },
keyImages["Start"] = ImageID("I_START"); { "Start", ImageID("I_START") },
keyImages["Select"] = ImageID("I_SELECT"); { "Select", ImageID("I_SELECT") },
keyImages["L"] = ImageID("I_L"); { "L", ImageID("I_L") },
keyImages["R"] = ImageID("I_R"); { "R", ImageID("I_R") }
};
using namespace UI; using namespace UI;

2
UI/MemStickScreen.cpp
View File

@ -456,7 +456,7 @@ void MemStickScreen::update() {
} }
ConfirmMemstickMoveScreen::ConfirmMemstickMoveScreen(Path newMemstickFolder, bool initialSetup) ConfirmMemstickMoveScreen::ConfirmMemstickMoveScreen(Path newMemstickFolder, bool initialSetup)
: newMemstickFolder_(newMemstickFolder), initialSetup_(initialSetup) { : newMemstickFolder_(newMemstickFolder), initialSetup_(initialSetup), progressReporter_() {
existingFilesInNewFolder_ = FolderSeemsToBeUsed(newMemstickFolder); existingFilesInNewFolder_ = FolderSeemsToBeUsed(newMemstickFolder);
if (initialSetup_) { if (initialSetup_) {
moveData_ = false; moveData_ = false;