Skip to content

Commit 51cebe6

Browse files
committed
Version 0.5
1 parent 2f23944 commit 51cebe6

File tree

6 files changed

+34
-14
lines changed

6 files changed

+34
-14
lines changed

GenOpCodes/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("2018.9.8.248")>
35-
<Assembly: AssemblyFileVersion("2018.9.8.248")>
34+
<Assembly: AssemblyVersion("2018.9.13.253")>
35+
<Assembly: AssemblyFileVersion("2018.9.13.253")>

RunTests/ModuleMain.vb

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Imports System.Threading
44
Module ModuleMain
55
Private cpu As X8086
66
Private validData() As Byte = Nothing
7+
Private testsTotal As Integer = 0
8+
Private failedTotal As Integer = 0
9+
Private prefix As String
710

811
Sub Main()
912
Dim waiter As New AutoResetEvent(False)
@@ -27,7 +30,8 @@ Module ModuleMain
2730
If Not IO.File.Exists(dataFileName) Then Continue For
2831
validData = IO.File.ReadAllBytes(dataFileName)
2932

30-
Console.Write($"Running: {fileName}")
33+
prefix = $"Running: {fileName}"
34+
Console.Write(prefix)
3135

3236
If cpu.IsHalted Then cpu.HardReset()
3337
cpu.LoadBIN(f.FullName, &HF000, &H0)
@@ -37,23 +41,37 @@ Module ModuleMain
3741
Next
3842
cpu.Close()
3943

44+
Dim passedTotal As Integer = testsTotal - failedTotal
45+
Console.ForegroundColor = ConsoleColor.Magenta
46+
Console.WriteLine($"Score: {passedTotal}/{testsTotal} [{passedTotal / testsTotal * 100:N2}%]")
47+
Console.ForegroundColor = ConsoleColor.Gray
48+
Console.WriteLine()
49+
4050
Console.WriteLine("Press any key to exit")
4151
Console.ReadKey()
4252
End Sub
4353

4454
Private Sub Compare()
55+
Const p As Integer = 28
56+
57+
Dim txt As String = ""
4558
Dim v1 As String
4659
Dim v2 As String
4760
Dim invalidData As New List(Of String)
48-
For i As Integer = 0 To validData.Length / 2 - 1 Step 2
61+
Dim dataLen As Integer = validData.Length / 2
62+
63+
testsTotal += dataLen
64+
65+
For i As Integer = 0 To dataLen - 1 Step 2
4966
v1 = cpu.RAM16(0, i).ToString("X4")
5067
v2 = BitConverter.ToInt16(validData, i).ToString("X4")
5168
If v1 <> v2 Then
5269
invalidData.Add($"0000:{i:X4} {v1} <> {v2}")
5370
End If
5471
Next
5572
If invalidData.Any() Then
56-
Console.WriteLine($" > FAILED [{invalidData.Count}]")
73+
txt = $" > FAILED [{invalidData.Count}/{dataLen}]"
74+
Console.WriteLine(txt.PadLeft(p - prefix.Length + txt.Length))
5775
invalidData.ForEach(Sub(id)
5876
Dim t() As String = id.Split(" "c)
5977
Console.ForegroundColor = ConsoleColor.White
@@ -67,8 +85,10 @@ Module ModuleMain
6785
Console.ForegroundColor = ConsoleColor.Gray
6886
'Console.WriteLine($" {id}")
6987
End Sub)
88+
failedTotal += invalidData.Count
7089
Else
71-
Console.WriteLine(" > PASSED")
90+
txt = $" > PASSED [{dataLen}]"
91+
Console.WriteLine(txt.PadLeft(p - prefix.Length + txt.Length))
7292
End If
7393
End Sub
7494
End Module

RunTests/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("2018.9.8.432")>
35-
<Assembly: AssemblyFileVersion("2018.9.8.432")>
34+
<Assembly: AssemblyVersion("2018.9.13.480")>
35+
<Assembly: AssemblyFileVersion("2018.9.13.480")>

x8086NetEmu/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("2018.9.8.4964")>
35-
<Assembly: AssemblyFileVersion("2018.9.8.4957")>
34+
<Assembly: AssemblyVersion("2018.9.13.4969")>
35+
<Assembly: AssemblyFileVersion("2018.9.13.4962")>

x8086NetEmuConsole/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("2018.9.8.560")>
35-
<Assembly: AssemblyFileVersion("2018.9.8.555")>
34+
<Assembly: AssemblyVersion("2018.9.13.565")>
35+
<Assembly: AssemblyFileVersion("2018.9.13.560")>

x8086NetEmuWinForms/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("2018.9.8.4945")>
35-
<Assembly: AssemblyFileVersion("2018.9.8.4943")>
34+
<Assembly: AssemblyVersion("2018.9.13.4952")>
35+
<Assembly: AssemblyFileVersion("2018.9.13.4950")>

0 commit comments

Comments
 (0)