Merge pull request #191 from simplitech/development

Relfos · web-flow · commit 8c16d79dfe68 · 2019-06-17T15:54:29.000+01:00
Development
diff --git a/.travis.yml b/.travis.yml
@@ -14,9 +14,10 @@ deploy:
   api_key:
     secure: jBINz3B7eTUpUxDCDk26+NySv3h5+cGhM0tF0Z27B3OTeSLH7nnz/F65JmSSJx28IlhtX0n6bJ6SyAn9JARWNz4pH1XhEm7KZT8Bh5o+ef1VnP8P4Yd5iHOmSPzJz0M2ZAQRciK6GEjCH+bOFGXTD3l4JiosMHy0B2kfcppb9cLwelNampHO+qIGhdTyuxaRP+5zI6YXHQdQgqTHiddlJLjwnPKNZ62lAeB06righ9vy27W80N3q84N15iVjlVamU6iV3ZAMcMy1AoBse7yi98/2VTb9xHvQth7nKignrZrC+PuFKqgbzFM8p05OlRZN9DYsJQPTf+QNyF7eFyYSCj6e89cSRMREhmE7mvVpmjkVoEtDW2ioIXG6PxUPV1q/sS7Nd91WBi5Xjqwc41QW2C+xUQBVH4UaMsniyrVG63hkmOXPaPDfmxEv2qgllxCH84mpaQbYUowKC/x+gLQ/sEtHFksXGJTpMl3J4FZDHbzgelliHNKHhTZW16Nn0n22WcG0kXH4DwTZNl+kXfztW454ThfUbMqhskaoYWjdUs6X+iYS79ce4Bv5APIoHskJyA4GlIHqb1/XIE+9o33WKFV5ppAPGJi2EkTl+HpAC1JAULrrcfQajoCHD3mWTELvTXKeg2FA2VBXWZqEzFUnLhgBzVJZZaZ99V5gZxS5lx4=
   file: 
-    - osx-x64.zip
-    - win-x64.zip
-    - linux-x64.zip
+
+    - "neo-debugger-osx-x64.zip"
+    - "neo-debugger-win-x64.zip"
+    - "neo-debugger-linux-x64.zip"
   overwrite: true
   skip_cleanup: true
   on:
diff --git a/NEO-Debugger-Core/Shell/DebugCommands.cs b/NEO-Debugger-Core/Shell/DebugCommands.cs
@@ -8,7 +8,7 @@ public static class ShellRunner
     {
         public static void UpdateState(DebuggerShell Shell, Action<ShellMessageType, string> output)
         {
-            var state = Shell.Debugger.Info;
+            var state = Shell.Debugger.State;
 
             output(ShellMessageType.Default, $"VM state: {state.state}");
             output(ShellMessageType.Default, $"Instruction pointer: {state.offset}");
@@ -65,7 +65,7 @@ public class RunCommand : Command
 
         public override void Execute(string[] args, Action<ShellMessageType, string> output)
         {
-            if (Shell.Debugger.Info.state == DebuggerState.State.Running || Shell.Debugger.Info.state == DebuggerState.State.Break)
+            if (Shell.Debugger.State.state == DebuggerState.State.Running || Shell.Debugger.State.state == DebuggerState.State.Break)
             {
                 output(ShellMessageType.Default, "Resuming invoke.");
                 Shell.Debugger.Run();
@@ -85,19 +85,19 @@ public class StepCommand : Command
 
         public override void Execute(string[] args, Action<ShellMessageType, string> output)
         {
-            if (Shell.Debugger.Info.state == DebuggerState.State.Running || Shell.Debugger.Info.state == DebuggerState.State.Break)
+            if (Shell.Debugger.State.state == DebuggerState.State.Running || Shell.Debugger.State.state == DebuggerState.State.Break)
             {
                 output(ShellMessageType.Default, "Stepping invoke.");
 
                 string startFile;
-                var startLine = Shell.Debugger.ResolveLine(Shell.Debugger.Info.offset, true, out startFile);
+                var startLine = Shell.Debugger.ResolveLine(Shell.Debugger.State.offset, true, out startFile);
 
                 string currentFile;
                 int currentLine;
                 do
                 {
                     Shell.Debugger.Step();
-                    currentLine = Shell.Debugger.ResolveLine(Shell.Debugger.Info.offset, true, out currentFile);
+                    currentLine = Shell.Debugger.ResolveLine(Shell.Debugger.State.offset, true, out currentFile);
                 } while (currentFile == startFile && currentLine == startLine);
 
                 ShellRunner.UpdateState(Shell, output);
diff --git a/NEO-Debugger-Core/Utils/DebugManager.cs b/NEO-Debugger-Core/Utils/DebugManager.cs
@@ -54,7 +54,7 @@ public bool ResetFlag
                 return _resetFlag;
             }
         }
-        public DebuggerState Info
+        public DebuggerState State
         {
             get
             {
diff --git a/NEO-Debugger-WebServices/Program.cs b/NEO-Debugger-WebServices/Program.cs
@@ -256,14 +256,14 @@ public Backend(ServerSettings serverSettings)
                 }
 
                 string filePath;
-                var curLine = _shell.Debugger.ResolveLine(_shell.Debugger.Info.offset, true, out filePath);
+                var curLine = _shell.Debugger.ResolveLine(_shell.Debugger.State.offset, true, out filePath);
 
-                output.AddField("state", _shell.Debugger.Info.state);
-                output.AddField("offset", _shell.Debugger.Info.offset);
+                output.AddField("state", _shell.Debugger.State.state);
+                output.AddField("offset", _shell.Debugger.State.offset);
                 output.AddField("line", curLine);
                 output.AddField("path", filePath);
 
-                if (_shell.Debugger.Info.state == Emulation.DebuggerState.State.Finished)
+                if (_shell.Debugger.State.state == Emulation.DebuggerState.State.Finished)
                 {
                     var val = _debugger.Emulator.GetOutput();
 
diff --git a/NEO-Emulator/Emulator.cs b/NEO-Emulator/Emulator.cs
@@ -435,7 +435,14 @@ public DebuggerState Step()
                 return lastState;
             }
 
-            lastState = new DebuggerState(DebuggerState.State.Running, lastOffset);
+            if (lastState.state == DebuggerState.State.Break) {
+                lastState = new DebuggerState(DebuggerState.State.Break, lastOffset);
+            }
+            else
+            {
+                lastState = new DebuggerState(DebuggerState.State.Running, lastOffset);
+            }
+
             return lastState;
         }
 
diff --git a/NEO-Emulator/VM/InteropService.cs b/NEO-Emulator/VM/InteropService.cs
@@ -92,7 +92,7 @@ private static bool GetEntryScriptHash(ExecutionEngine engine)
 
         public bool Invoke(byte[] method, ExecutionEngine engine)
         {
-            return Invoke(method.ToString(), engine);
+            return Invoke(System.Text.Encoding.ASCII.GetString(method), engine);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public static class ShellRunner`
`8`	`8`	`{`
`9`	`9`	`public static void UpdateState(DebuggerShell Shell, Action<ShellMessageType, string> output)`
`10`	`10`	`{`
`11`		`- var state = Shell.Debugger.Info;`
	`11`	`+ var state = Shell.Debugger.State;`
`12`	`12`
`13`	`13`	`output(ShellMessageType.Default, $"VM state: {state.state}");`
`14`	`14`	`output(ShellMessageType.Default, $"Instruction pointer: {state.offset}");`
`@@ -65,7 +65,7 @@ public class RunCommand : Command`
`65`	`65`
`66`	`66`	`public override void Execute(string[] args, Action<ShellMessageType, string> output)`
`67`	`67`	`{`
`68`		`- if (Shell.Debugger.Info.state == DebuggerState.State.Running \|\| Shell.Debugger.Info.state == DebuggerState.State.Break)`
	`68`	`+ if (Shell.Debugger.State.state == DebuggerState.State.Running \|\| Shell.Debugger.State.state == DebuggerState.State.Break)`
`69`	`69`	`{`
`70`	`70`	`output(ShellMessageType.Default, "Resuming invoke.");`
`71`	`71`	`Shell.Debugger.Run();`
`@@ -85,19 +85,19 @@ public class StepCommand : Command`
`85`	`85`
`86`	`86`	`public override void Execute(string[] args, Action<ShellMessageType, string> output)`
`87`	`87`	`{`
`88`		`- if (Shell.Debugger.Info.state == DebuggerState.State.Running \|\| Shell.Debugger.Info.state == DebuggerState.State.Break)`
	`88`	`+ if (Shell.Debugger.State.state == DebuggerState.State.Running \|\| Shell.Debugger.State.state == DebuggerState.State.Break)`
`89`	`89`	`{`
`90`	`90`	`output(ShellMessageType.Default, "Stepping invoke.");`
`91`	`91`
`92`	`92`	`string startFile;`
`93`		`- var startLine = Shell.Debugger.ResolveLine(Shell.Debugger.Info.offset, true, out startFile);`
	`93`	`+ var startLine = Shell.Debugger.ResolveLine(Shell.Debugger.State.offset, true, out startFile);`
`94`	`94`
`95`	`95`	`string currentFile;`
`96`	`96`	`int currentLine;`
`97`	`97`	`do`
`98`	`98`	`{`
`99`	`99`	`Shell.Debugger.Step();`
`100`		`- currentLine = Shell.Debugger.ResolveLine(Shell.Debugger.Info.offset, true, out currentFile);`
	`100`	`+ currentLine = Shell.Debugger.ResolveLine(Shell.Debugger.State.offset, true, out currentFile);`
`101`	`101`	`} while (currentFile == startFile && currentLine == startLine);`
`102`	`102`
`103`	`103`	`ShellRunner.UpdateState(Shell, output);`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public bool ResetFlag`
`54`	`54`	`return _resetFlag;`
`55`	`55`	`}`
`56`	`56`	`}`
`57`		`- public DebuggerState Info`
	`57`	`+ public DebuggerState State`
`58`	`58`	`{`
`59`	`59`	`get`
`60`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,14 @@ public DebuggerState Step()`
`435`	`435`	`return lastState;`
`436`	`436`	`}`
`437`	`437`
`438`		`- lastState = new DebuggerState(DebuggerState.State.Running, lastOffset);`
	`438`	`+ if (lastState.state == DebuggerState.State.Break) {`
	`439`	`+ lastState = new DebuggerState(DebuggerState.State.Break, lastOffset);`
	`440`	`+ }`
	`441`	`+ else`
	`442`	`+ {`
	`443`	`+ lastState = new DebuggerState(DebuggerState.State.Running, lastOffset);`
	`444`	`+ }`
	`445`	`+`
`439`	`446`	`return lastState;`
`440`	`447`	`}`
`441`	`448`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ private static bool GetEntryScriptHash(ExecutionEngine engine)`
`92`	`92`
`93`	`93`	`public bool Invoke(byte[] method, ExecutionEngine engine)`
`94`	`94`	`{`
`95`		`- return Invoke(method.ToString(), engine);`
	`95`	`+ return Invoke(System.Text.Encoding.ASCII.GetString(method), engine);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`}`