Fixed some disassembler and memory browser bugs

Lameguy64 · Jan 23, 2019 · 4194896 · 4194896
1 parent c8461a2
commit 4194896
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,9 @@ nbproject/private
 build
 dist
 symtest
+scrap
 *.cfg
 *.bin
 *.map
+*.exe
 .dep.inc
diff --git a/ProjectClass.cpp b/ProjectClass.cpp
@@ -106,7 +106,7 @@ int ProjectClass::Save(const char *filename) {
 	base->InsertEndChild( o );
 
 	o = doc.NewElement( "memory_win" );
-	o->SetAttribute( "active", bmlist_ui->visible() );
+	o->SetAttribute( "active", mem_ui->visible() );
 	o->InsertEndChild( DumpWinPos( &doc, mem_ui->x(), mem_ui->y(), 
 		mem_ui->w(), mem_ui->h() ) );
 	base->InsertEndChild( o );

diff --git a/README.md b/README.md
@@ -47,5 +47,9 @@ Essential references if you wish to contribute to this project:
 [LSI L64360 datasheet (cop0 registers match the PSX's CPU)](https://www.digchip.com/datasheets/download_datasheet.php?id=488501&part-number=L64360 )
 
 ## Changelog
+**Version 0.26b (01/23/2019)**
+* Fixed memory browser appearing when loading a project when the bookmark window is shown.
+* Fixed incorrect register order in sllv, srlv and srav instructions.
+
 **Version 0.25b (12/11/2018)**
 * Initial beta release.
diff --git a/about.cpp b/about.cpp
@@ -13,7 +13,7 @@
 #include "MainUI.h"
 #include "AboutUI.h"
 
-#define VERSION "0.25b"
+#define VERSION "0.26b"
 
 extern MainUI* ui;
 

diff --git a/widgets/mips_disassembler.cpp b/widgets/mips_disassembler.cpp
@@ -242,7 +242,7 @@ void mips_Decode(unsigned int opcode, unsigned int addr, char* output, int arrow
 		nullptr		,nullptr	,"slt     "	,"sltu    "	,	//38
 	};
 
-	strcpy(output, "???");
+	strcpy( output, "???" );
 
 	if( opcode ) {
 
@@ -262,8 +262,8 @@ void mips_Decode(unsigned int opcode, unsigned int addr, char* output, int arrow
 				case 0x6:
 				case 0x7:
 					strcpy( output, sc_op[OPCODE2(opcode)] );
-					sprintf( temp, "%s, %s, %s", regs[OPREGS(opcode)],
-						regs[OPREGD(opcode)], regs[OPREGT(opcode)] );
+					sprintf( temp, "%s, %s, %s", regs[OPREGT(opcode)],
+						regs[OPREGD(opcode)], regs[OPREGS(opcode)] );
 					strcat( output, temp );
 					break;
 				case 0x8:	// jr
@@ -313,7 +313,7 @@ void mips_Decode(unsigned int opcode, unsigned int addr, char* output, int arrow
 					if( ( OPCODE2(opcode) >= 0x20 ) && ( OPCODE2(opcode) <= 0x27 ) ) {
 						strcpy( output, sc_op[OPCODE2(opcode)] );
 						sprintf( temp, "%s, %s, %s", regs[OPREGD(opcode)],
-							regs[OPREGS(opcode)], regs[OPREGT(opcode)] );
+							regs[OPREGT(opcode)], regs[OPREGS(opcode)] );
 						strcat( output, temp );
 					}