From 7ea7f75f50b906c0dd02178419b4755ccfd5644d Mon Sep 17 00:00:00 2001 From: nattthebear Date: Thu, 24 Sep 2020 14:52:16 -0400 Subject: [PATCH] Fix some arm disassembly stuff Some random code which is trying to align columns or something gets pooped up because "BLX" has no second part --- src/BizHawk.Emulation.Cores/CPUs/ARM/Darm.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BizHawk.Emulation.Cores/CPUs/ARM/Darm.cs b/src/BizHawk.Emulation.Cores/CPUs/ARM/Darm.cs index 9f0ac45a9d..2f51213b6b 100644 --- a/src/BizHawk.Emulation.Cores/CPUs/ARM/Darm.cs +++ b/src/BizHawk.Emulation.Cores/CPUs/ARM/Darm.cs @@ -101,7 +101,7 @@ namespace BizHawk.Emulation.Cores.Components.ARM string[] ret = Encoding.ASCII.GetString(s.total, 0, Array.IndexOf(s.total, (byte)0)) .ToString() .Split(new string[] {" "}, 2, StringSplitOptions.None); - return ret[0].PadRight(8) + ret[1]; + return ret[0].PadRight(8) + (ret.Length > 1 ? ret[1] : ""); } }