From 64f0d01906c4534a58f30dd8f6175252687db74b Mon Sep 17 00:00:00 2001
From: Ian C <ianc@noddybox.co.uk>
Date: Wed, 28 Mar 2012 22:52:22 +0000
Subject: Finished working disassembler/tracing.

---
 WPZX81/WPZX81/BaseViewModel.cs                    |  67 ------
 WPZX81/WPZX81/DisassemblerLine.cs                 |  34 ---
 WPZX81/WPZX81/DisassemblerPage.xaml               | 138 ++++++++----
 WPZX81/WPZX81/DisassemblerPage.xaml.cs            |   3 +-
 WPZX81/WPZX81/DisassemblerViewModel.cs            | 258 ----------------------
 WPZX81/WPZX81/ViewModels/BaseViewModel.cs         |  67 ++++++
 WPZX81/WPZX81/ViewModels/DisassemblerLine.cs      |  34 +++
 WPZX81/WPZX81/ViewModels/DisassemblerViewModel.cs | 253 +++++++++++++++++++++
 WPZX81/WPZX81/WPZX81.csproj                       |  10 +-
 WPZX81/WPZX81/ZX81/Emulation.cs                   |   3 -
 10 files changed, 456 insertions(+), 411 deletions(-)
 delete mode 100644 WPZX81/WPZX81/BaseViewModel.cs
 delete mode 100644 WPZX81/WPZX81/DisassemblerLine.cs
 delete mode 100644 WPZX81/WPZX81/DisassemblerViewModel.cs
 create mode 100644 WPZX81/WPZX81/ViewModels/BaseViewModel.cs
 create mode 100644 WPZX81/WPZX81/ViewModels/DisassemblerLine.cs
 create mode 100644 WPZX81/WPZX81/ViewModels/DisassemblerViewModel.cs

diff --git a/WPZX81/WPZX81/BaseViewModel.cs b/WPZX81/WPZX81/BaseViewModel.cs
deleted file mode 100644
index ae729e6..0000000
--- a/WPZX81/WPZX81/BaseViewModel.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Net;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Shapes;
-
-namespace WPZX81
-{
-    /// <summary>
-    /// Provides a base for view models.
-    /// </summary>
-    public class BaseViewModel : INotifyPropertyChanged
-    {
-
-        #region SetValue
-
-        /// <summary>
-        /// Sets a value in the model.
-        /// </summary>
-        /// <typeparam name="T">The type of the value.</typeparam>
-        /// <param name="member">A reference to the member variable.</param>
-        /// <param name="value">The new value.</param>
-        /// <param name="names">The propertys to change if the value has changed.</param>
-        protected void SetValue<T>(ref T member, T value, params string[] names)
-        {
-            if (!value.Equals(member))
-            {
-                member = value;
-
-                foreach (string name in names)
-                {
-                    NotifyPropertyChanged(name);
-                }
-            }
-        }
-
-        #endregion
-
-        #region Notify
-
-        /// <summary>
-        /// Notifies handlers of a property change.
-        /// </summary>
-        /// <param name="propertyName">The property's name.</param>
-        protected void NotifyPropertyChanged(string propertyName)
-        {
-            if (PropertyChanged != null)
-            {
-                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }  
-        
-        #endregion
-
-        #region INotifyPropertyChanged Members
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        #endregion
-    }
-}
diff --git a/WPZX81/WPZX81/DisassemblerLine.cs b/WPZX81/WPZX81/DisassemblerLine.cs
deleted file mode 100644
index 6618fc1..0000000
--- a/WPZX81/WPZX81/DisassemblerLine.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Net;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Shapes;
-
-namespace WPZX81
-{
-    /// <summary>
-    /// Represents a line of disassembly.
-    /// </summary>
-    public class DisassemblerLine
-    {
-        /// <summary>
-        /// The address part.
-        /// </summary>
-        public string Address {get; set;}
-
-        /// <summary>
-        /// The assembly opcode part.
-        /// </summary>
-        public string Opcode {get; set;}
-
-        /// <summary>
-        /// The hexdump part.
-        /// </summary>
-        public string Hexdump {get; set;}
-    }
-}
diff --git a/WPZX81/WPZX81/DisassemblerPage.xaml b/WPZX81/WPZX81/DisassemblerPage.xaml
index 3c87af6..16d7e53 100644
--- a/WPZX81/WPZX81/DisassemblerPage.xaml
+++ b/WPZX81/WPZX81/DisassemblerPage.xaml
@@ -7,6 +7,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:res="clr-namespace:WPZX81.Resources"
+    xmlns:conv="clr-namespace:WPZX81.Converters"
     FontFamily="{StaticResource PhoneFontFamilyNormal}"
     FontSize="{StaticResource PhoneFontSizeNormal}"
     Foreground="{StaticResource PhoneForegroundBrush}"
@@ -16,31 +17,49 @@
 
     <phone:PhoneApplicationPage.Resources>
         <res:Strings x:Key="Strings" />
+        <conv:ConvertFlagsToString x:Key="ConvertFlagsToString" />
+        <conv:ConvertIntToHex2 x:Key="ConvertIntToHex2" />
+        <conv:ConvertIntToHex4 x:Key="ConvertIntToHex4" />
+
         <Style x:Name="StateInfo" TargetType="TextBlock">
             <Setter Property="FontSize" Value="18" />
             <Setter Property="FontWeight" Value="Bold" />
             <Setter Property="Foreground" Value="White" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
         </Style>
         <Style x:Name="StateData" TargetType="TextBlock">
             <Setter Property="FontFamily" Value="Courier New" />
             <Setter Property="FontSize" Value="18" />
             <Setter Property="FontWeight" Value="Normal" />
-            <Setter Property="Foreground" Value="White" />
+            <Setter Property="Foreground" Value="LightGray" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
         </Style>
         <Style x:Name="DisassemMemory" TargetType="TextBlock">
             <Setter Property="FontFamily" Value="Courier New" />
             <Setter Property="FontWeight" Value="Normal" />
             <Setter Property="Foreground" Value="Yellow" />
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
         </Style>
         <Style x:Name="DisassemOpcode" TargetType="TextBlock">
-            <Setter Property="FontFamily" Value="Courier New" />
             <Setter Property="FontWeight" Value="Normal" />
             <Setter Property="Foreground" Value="White" />
+            <Setter Property="FontFamily" Value="Courier New" />
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
         </Style>
         <Style x:Name="DisassemHexdump" TargetType="TextBlock">
-            <Setter Property="FontFamily" Value="Courier New" />
             <Setter Property="FontWeight" Value="Normal" />
             <Setter Property="Foreground" Value="Red" />
+            <Setter Property="FontFamily" Value="Courier New" />
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+        </Style>
+        <Style x:Name="ButtonText" TargetType="TextBlock">
+            <Setter Property="FontWeight" Value="Normal" />
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="TextWrapping" Value="Wrap" />
         </Style>
     </phone:PhoneApplicationPage.Resources>
 
@@ -69,13 +88,9 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*" />
-                <ColumnDefinition Width="1*" />
-            </Grid.ColumnDefinitions>
             
             <!-- Z80 State -->
-            <Grid Grid.Row="0" Grid.ColumnSpan="2">
+            <Grid Grid.Row="0">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto"/>
                     <RowDefinition Height="Auto"/>
@@ -108,28 +123,24 @@
                            Grid.Row="0" Grid.Column="6" />
 
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding A, Mode=OneWay}"
+                           Text="{Binding A, Mode=OneWay, Converter={StaticResource ConvertIntToHex2}}"
                            Grid.Row="1" Grid.Column="0"/>
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding Flags, Mode=OneWay}"
+                           Text="{Binding Flags, Mode=OneWay, Converter={StaticResource ConvertFlagsToString}}"
                            Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2"/>
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding BC, Mode=OneWay}"
+                           Text="{Binding BC, Mode=OneWay, Converter={StaticResource ConvertIntToHex4}}"
                            Grid.Row="1" Grid.Column="3"/>
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding DE, Mode=OneWay}"
+                           Text="{Binding DE, Mode=OneWay, Converter={StaticResource ConvertIntToHex4}}"
                            Grid.Row="1" Grid.Column="4"/>
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding HL, Mode=OneWay}"
+                           Text="{Binding HL, Mode=OneWay, Converter={StaticResource ConvertIntToHex4}}"
                            Grid.Row="1" Grid.Column="5"/>
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding PC, Mode=OneWay}"
+                           Text="{Binding PC, Mode=OneWay, Converter={StaticResource ConvertIntToHex4}}"
                            Grid.Row="1" Grid.Column="6"/>
 
-                <TextBlock Style="{StaticResource StateInfo}" Text="IY"
-                           Grid.Row="0" Grid.Column="6" />
-
-
                 <TextBlock Style="{StaticResource StateInfo}" Text="IX"
                            Grid.Row="2" Grid.Column="0" />
                 <TextBlock Style="{StaticResource StateInfo}" Text="IY"
@@ -146,25 +157,25 @@
                            Grid.Row="2" Grid.Column="6" />
 
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding IY, Mode=OneWay}"
+                           Text="{Binding IY, Mode=OneWay, Converter={StaticResource ConvertIntToHex4}}"
                            Grid.Row="3" Grid.Column="0"/>
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding IY, Mode=OneWay}"
+                           Text="{Binding IY, Mode=OneWay, Converter={StaticResource ConvertIntToHex4}}"
                            Grid.Row="3" Grid.Column="1"/>
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding SP, Mode=OneWay}"
+                           Text="{Binding SP, Mode=OneWay, Converter={StaticResource ConvertIntToHex4}}"
                            Grid.Row="3" Grid.Column="2"/>
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding AF_, Mode=OneWay}"
+                           Text="{Binding AF_, Mode=OneWay, Converter={StaticResource ConvertIntToHex4}}"
                            Grid.Row="3" Grid.Column="3"/>
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding BC_, Mode=OneWay}"
+                           Text="{Binding BC_, Mode=OneWay, Converter={StaticResource ConvertIntToHex4}}"
                            Grid.Row="3" Grid.Column="4"/>
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding DE_, Mode=OneWay}"
+                           Text="{Binding DE_, Mode=OneWay, Converter={StaticResource ConvertIntToHex4}}"
                            Grid.Row="3" Grid.Column="5"/>
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding HL_, Mode=OneWay}"
+                           Text="{Binding HL_, Mode=OneWay, Converter={StaticResource ConvertIntToHex4}}"
                            Grid.Row="3" Grid.Column="6"/>
 
                 <TextBlock Style="{StaticResource StateInfo}" Text="IM"
@@ -177,17 +188,17 @@
                            Grid.Row="4" Grid.Column="3" />
                 <TextBlock Style="{StaticResource StateInfo}" Text="IFF2"
                            Grid.Row="4" Grid.Column="4" />
-                <TextBlock Style="{StaticResource StateInfo}" Text="Executed Instructions"
+                <TextBlock Style="{StaticResource StateInfo}" Text="Opcodes"
                            Grid.Row="4" Grid.Column="5" Grid.ColumnSpan="2"/>
 
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding IM, Mode=OneWay}"
+                           Text="{Binding IM, Mode=OneWay, Converter={StaticResource ConvertIntToHex2}}"
                            Grid.Row="5" Grid.Column="0"/>
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding I, Mode=OneWay}"
+                           Text="{Binding I, Mode=OneWay, Converter={StaticResource ConvertIntToHex2}}"
                            Grid.Row="5" Grid.Column="1"/>
                 <TextBlock Style="{StaticResource StateData}"
-                           Text="{Binding R, Mode=OneWay}"
+                           Text="{Binding R, Mode=OneWay, Converter={StaticResource ConvertIntToHex2}}"
                            Grid.Row="5" Grid.Column="2"/>
                 <TextBlock Style="{StaticResource StateData}"
                            Text="{Binding IFF1, Mode=OneWay}"
@@ -202,24 +213,61 @@
             </Grid>
 
             <!-- Disassembly -->
-            <ListBox x:Name="AsmDisplay" Grid.ColumnSpan="2" Grid.Row="1"
+            <ListBox Grid.Row="1"
                      ItemsSource="{Binding Disassembly, Mode=OneWay}"
-                     VerticalAlignment="Top"
-                     FontFamily="Courier New"/>
+                     VerticalAlignment="Top" BorderThickness="2"
+                     BorderBrush="DarkBlue" >
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="100" />
+                                <ColumnDefinition Width="200" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Text="{Binding Path=Address}"
+                                       Grid.Column="0"
+                                       Style="{StaticResource DisassemMemory}" />
+                            <TextBlock Text="{Binding Path=Opcode}"
+                                       Grid.Column="1"
+                                       Style="{StaticResource DisassemOpcode}" />
+                            <TextBlock Text="{Binding Path=Hexdump}"
+                                       Grid.Column="2"
+                                       Style="{StaticResource DisassemHexdump}" />
+                        </Grid>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
 
-            <!-- Step -->
-            <Button Height="100"
-                    Content="{Binding DisassemblerStepButtonText, Source={StaticResource Strings}}"
-                    Grid.Row="2" Grid.Column="0"
-                    FontSize="18"
-                    Click="StepClick" />
-            
-            <!-- Run Frame -->
-            <Button Height="100"
-                    Content="{Binding DisassemblerRunFrameButtonText, Source={StaticResource Strings}}"
-                    Grid.Row="2" Grid.Column="1"
-                    FontSize="18"
-                    Click="RunClick" />
+            <Grid Grid.Row="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="3*" />
+                    <RowDefinition Height="1*" />
+                </Grid.RowDefinitions>
+                <!-- Step -->
+                <Button Grid.Column="0" Grid.RowSpan="2" Click="StepClick">
+                    <TextBlock Text="{Binding DisassemblerStepButtonText, Source={StaticResource Strings}}"
+                               Style="{StaticResource ButtonText}" />
+                </Button>
+                
+                <Slider Minimum="1" Maximum="1000" Grid.Column="1" Grid.Row="0"
+                        Value="{Binding Steps, Mode=TwoWay}"/>
+
+                <TextBlock Grid.Column="1" Grid.Row="1"
+                           Text="{Binding Steps, Mode=OneWay}"
+                           HorizontalAlignment="Center"/>
+
+                <!-- Run Frame -->
+                <Button Grid.Column="3" Grid.RowSpan="2" Click="RunClick">
+                    <TextBlock Text="{Binding DisassemblerRunFrameButtonText, Source={StaticResource Strings}}"
+                               Style="{StaticResource ButtonText}" />
+                </Button>
+            </Grid>
         </Grid>
     </Grid>
  
diff --git a/WPZX81/WPZX81/DisassemblerPage.xaml.cs b/WPZX81/WPZX81/DisassemblerPage.xaml.cs
index f5b1aa5..63717bb 100644
--- a/WPZX81/WPZX81/DisassemblerPage.xaml.cs
+++ b/WPZX81/WPZX81/DisassemblerPage.xaml.cs
@@ -1,6 +1,6 @@
 using System;
-using System.ComponentModel;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Net;
 using System.Windows;
@@ -11,6 +11,7 @@ using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Shapes;
 using Microsoft.Phone.Controls;
+using WPZX81.ViewModels;
 
 namespace WPZX81
 {
diff --git a/WPZX81/WPZX81/DisassemblerViewModel.cs b/WPZX81/WPZX81/DisassemblerViewModel.cs
deleted file mode 100644
index b0ff2f7..0000000
--- a/WPZX81/WPZX81/DisassemblerViewModel.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-using System;
-using System.Net;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Shapes;
-using Noddybox.Emulation.EightBit.Z80;
-using System.Collections.Generic;
-
-namespace WPZX81
-{
-    /// <summary>
-    /// Implements a view model for the diassembler page.
-    /// </summary>
-    public class DisassemblerViewModel : BaseViewModel
-    {
-        #region Private data
-
-        private Z80Cpu z80;
-        private int a;
-        private string flags;
-        private int bc;
-        private int de;
-        private int hl;
-        private int af_;
-        private int bc_;
-        private int de_;
-        private int hl_;
-        private int ix;
-        private int iy;
-        private int sp;
-        private int pc;
-        private int i;
-        private int r;
-        private int im;
-        private string iff1;
-        private string iff2;
-        private uint executedInstructions;
-
-        #endregion
-
-        #region Private methods
-
-        private void Update()
-        {
-            Z80Cpu z80 = Shared.ZX81.Z80;
-
-            A = z80.Acummulator;
-            BC = z80.BC_Register.reg;
-            DE = z80.DE_Register.reg;
-            HL = z80.HL_Register.reg;
-            IX = z80.IX_Register.reg;
-            IY = z80.IY_Register.reg;
-            AF_ = z80.AF_Alternate.reg;
-            BC_ = z80.BC_Alternate.reg;
-            DE_ = z80.DE_Alternate.reg;
-            HL_ = z80.HL_Alternate.reg;
-            PC = z80.ProgramCounter;
-            SP = z80.StackPointer;
-            ExecutedInstructions = z80.ExecutedInstructions;
-            I = z80.InterruptVector;
-            R = z80.Refresh;
-            IFF1 = z80.IFF1_Register ? "ON":"OFF";
-            IFF2 = z80.IFF2_Register ? "ON":"OFF";
-
-            char[] names = new char[8] {'C', 'N', 'P', '3', 'H', '5', 'Z', 'S'};
-            char[] flags = new char[8];
-            int f;
-
-            for(f = 0; f < 8; f++)
-            {
-                if (((int)z80.StatusFlags & (1 << f)) == (1 << f))
-                {
-                    flags[7-f] = names[7-f];
-                }
-                else
-                {
-                    flags[7-f] = '-';
-                }
-            }
-
-            Flags = new String(flags);
-        }
-
-        #endregion
-
-        #region Properties
-
-        public int A
-        {
-            get {return a;}
-            set {SetValue(ref a, value, "A");}
-        }
-
-        public string Flags
-        {
-            get {return flags;}
-            set {SetValue(ref flags, value, "Flags");}
-        }
-
-        public int BC
-        {
-            get {return bc;}
-            set {SetValue(ref bc, value, "BC");}
-        }
-
-        public int DE
-        {
-            get {return de;}
-            set {SetValue(ref de, value, "DE");}
-        }
-
-        public int HL
-        {
-            get {return hl;}
-            set {SetValue(ref hl, value, "HL");}
-        }
-
-        public int AF_
-        {
-            get {return af_;}
-            set {SetValue(ref af_, value, "AF_");}
-        }
-
-        public int BC_
-        {
-            get {return bc_;}
-            set {SetValue(ref bc_, value, "BC_");}
-        }
-
-        public int DE_
-        {
-            get {return de_;}
-            set {SetValue(ref de_, value, "DE_");}
-        }
-
-        public int HL_
-        {
-            get {return hl_;}
-            set {SetValue(ref hl_, value, "HL_");}
-        }
-
-        public int IX
-        {
-            get {return ix;}
-            set {SetValue(ref ix, value, "IX");}
-        }
-
-        public int IY
-        {
-            get {return iy;}
-            set {SetValue(ref iy, value, "IY");}
-        }
-
-        public int SP
-        {
-            get {return sp;}
-            set {SetValue(ref sp, value, "SP");}
-        }
-
-        public int PC
-        {
-            get {return pc;}
-            set {SetValue(ref pc, value, "PC", "Disassembly");}
-        }
-
-        public uint ExecutedInstructions
-        {
-            get {return executedInstructions;}
-            set {SetValue(ref executedInstructions, value, "ExecutedInstructions");}
-        }
-
-        public int I
-        {
-            get {return i;}
-            set {SetValue(ref i, value, "I");}
-        }
-
-        public int R
-        {
-            get {return r;}
-            set {SetValue(ref r, value, "R");}
-        }
-        public int IM
-        {
-            get {return im;}
-            set {SetValue(ref im, value, "IM");}
-        }
-        public string IFF1
-        {
-            get {return iff1;}
-            set {SetValue(ref iff1, value, "ExecutedInstructions");}
-        }
-        public string IFF2
-        {
-            get {return iff2;}
-            set {SetValue(ref iff2, value, "ExecutedInstructions");}
-        }
-
-        public IEnumerable<DisassemblerLine> Disassembly
-        {
-            get
-            {
-                List<DisassemblerLine> list = new List<DisassemblerLine>();
-
-                ushort pc = Shared.ZX81.Z80.ProgramCounter;
-                string address;
-                string opcode;
-                string hexdump;
-
-                for(int f = 0 ; f < 15; f++)
-                {
-                    pc = Shared.ZX81.Disassembler.Disassemble(pc, out address, out opcode, out hexdump);
-                    list.Add(new DisassemblerLine() {Address = address, Opcode = opcode, Hexdump = hexdump});
-                }
-
-                return list;
-            }
-        }
-
-        #endregion
-
-        #region Public methods
-
-        /// <summary>
-        /// Run the ZX81 for a step.
-        /// </summary>
-        public void Step()
-        {
-            Shared.ZX81.Step();
-            Update();
-        }
-
-        /// <summary>
-        /// Run the ZX81 for a frame.
-        /// </summary>
-        public void Run()
-        {
-            Shared.ZX81.Run();
-            Update();
-        }
-
-        #endregion
-
-        #region Constructors
-
-        public DisassemblerViewModel()
-        {
-            Update();
-        }
-
-        #endregion
-    }
-}
diff --git a/WPZX81/WPZX81/ViewModels/BaseViewModel.cs b/WPZX81/WPZX81/ViewModels/BaseViewModel.cs
new file mode 100644
index 0000000..6a96d0b
--- /dev/null
+++ b/WPZX81/WPZX81/ViewModels/BaseViewModel.cs
@@ -0,0 +1,67 @@
+using System;
+using System.ComponentModel;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace WPZX81.ViewModels
+{
+    /// <summary>
+    /// Provides a base for view models.
+    /// </summary>
+    public class BaseViewModel : INotifyPropertyChanged
+    {
+
+        #region SetValue
+
+        /// <summary>
+        /// Sets a value in the model.
+        /// </summary>
+        /// <typeparam name="T">The type of the value.</typeparam>
+        /// <param name="member">A reference to the member variable.</param>
+        /// <param name="value">The new value.</param>
+        /// <param name="names">The propertys to change if the value has changed.</param>
+        protected void SetValue<T>(ref T member, T value, params string[] names)
+        {
+            if (!value.Equals(member))
+            {
+                member = value;
+
+                foreach (string name in names)
+                {
+                    NotifyPropertyChanged(name);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Notify
+
+        /// <summary>
+        /// Notifies handlers of a property change.
+        /// </summary>
+        /// <param name="propertyName">The property's name.</param>
+        protected void NotifyPropertyChanged(string propertyName)
+        {
+            if (PropertyChanged != null)
+            {
+                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }  
+        
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #endregion
+    }
+}
diff --git a/WPZX81/WPZX81/ViewModels/DisassemblerLine.cs b/WPZX81/WPZX81/ViewModels/DisassemblerLine.cs
new file mode 100644
index 0000000..f493b85
--- /dev/null
+++ b/WPZX81/WPZX81/ViewModels/DisassemblerLine.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace WPZX81.ViewModels
+{
+    /// <summary>
+    /// Represents a line of disassembly.
+    /// </summary>
+    public class DisassemblerLine
+    {
+        /// <summary>
+        /// The address part.
+        /// </summary>
+        public string Address {get; set;}
+
+        /// <summary>
+        /// The assembly opcode part.
+        /// </summary>
+        public string Opcode {get; set;}
+
+        /// <summary>
+        /// The hexdump part.
+        /// </summary>
+        public string Hexdump {get; set;}
+    }
+}
diff --git a/WPZX81/WPZX81/ViewModels/DisassemblerViewModel.cs b/WPZX81/WPZX81/ViewModels/DisassemblerViewModel.cs
new file mode 100644
index 0000000..cbf5dbb
--- /dev/null
+++ b/WPZX81/WPZX81/ViewModels/DisassemblerViewModel.cs
@@ -0,0 +1,253 @@
+using System;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+using Noddybox.Emulation.EightBit.Z80;
+using System.Collections.Generic;
+
+namespace WPZX81.ViewModels
+{
+    /// <summary>
+    /// Implements a view model for the diassembler page.
+    /// </summary>
+    public class DisassemblerViewModel : BaseViewModel
+    {
+        #region Private data
+
+        private Z80Cpu z80;
+        private int a;
+        private Z80Flags flags;
+        private int bc;
+        private int de;
+        private int hl;
+        private int af_;
+        private int bc_;
+        private int de_;
+        private int hl_;
+        private int ix;
+        private int iy;
+        private int sp;
+        private int pc;
+        private int i;
+        private int r;
+        private int im;
+        private string iff1;
+        private string iff2;
+        private uint executedInstructions;
+        private int steps;
+
+        #endregion
+
+        #region Private methods
+
+        private void Update()
+        {
+            Z80Cpu z80 = Shared.ZX81.Z80;
+
+            A = z80.Acummulator;
+            Flags = z80.StatusFlags;
+            BC = z80.BC_Register.reg;
+            DE = z80.DE_Register.reg;
+            HL = z80.HL_Register.reg;
+            IX = z80.IX_Register.reg;
+            IY = z80.IY_Register.reg;
+            AF_ = z80.AF_Alternate.reg;
+            BC_ = z80.BC_Alternate.reg;
+            DE_ = z80.DE_Alternate.reg;
+            HL_ = z80.HL_Alternate.reg;
+            PC = z80.ProgramCounter;
+            SP = z80.StackPointer;
+            ExecutedInstructions = z80.ExecutedInstructions;
+            I = z80.InterruptVector;
+            R = z80.Refresh;
+            IFF1 = z80.IFF1_Register ? "On":"Off";
+            IFF2 = z80.IFF2_Register ? "On":"Off";
+        }
+
+        #endregion
+
+        #region Properties
+
+        public int A
+        {
+            get {return a;}
+            set {SetValue(ref a, value, "A");}
+        }
+
+        public Z80Flags Flags
+        {
+            get {return flags;}
+            set {SetValue(ref flags, value, "Flags");}
+        }
+
+        public int BC
+        {
+            get {return bc;}
+            set {SetValue(ref bc, value, "BC");}
+        }
+
+        public int DE
+        {
+            get {return de;}
+            set {SetValue(ref de, value, "DE");}
+        }
+
+        public int HL
+        {
+            get {return hl;}
+            set {SetValue(ref hl, value, "HL");}
+        }
+
+        public int AF_
+        {
+            get {return af_;}
+            set {SetValue(ref af_, value, "AF_");}
+        }
+
+        public int BC_
+        {
+            get {return bc_;}
+            set {SetValue(ref bc_, value, "BC_");}
+        }
+
+        public int DE_
+        {
+            get {return de_;}
+            set {SetValue(ref de_, value, "DE_");}
+        }
+
+        public int HL_
+        {
+            get {return hl_;}
+            set {SetValue(ref hl_, value, "HL_");}
+        }
+
+        public int IX
+        {
+            get {return ix;}
+            set {SetValue(ref ix, value, "IX");}
+        }
+
+        public int IY
+        {
+            get {return iy;}
+            set {SetValue(ref iy, value, "IY");}
+        }
+
+        public int SP
+        {
+            get {return sp;}
+            set {SetValue(ref sp, value, "SP");}
+        }
+
+        public int PC
+        {
+            get {return pc;}
+            set {SetValue(ref pc, value, "PC", "Disassembly");}
+        }
+
+        public uint ExecutedInstructions
+        {
+            get {return executedInstructions;}
+            set {SetValue(ref executedInstructions, value, "ExecutedInstructions");}
+        }
+
+        public int I
+        {
+            get {return i;}
+            set {SetValue(ref i, value, "I");}
+        }
+
+        public int R
+        {
+            get {return r;}
+            set {SetValue(ref r, value, "R");}
+        }
+        public int IM
+        {
+            get {return im;}
+            set {SetValue(ref im, value, "IM");}
+        }
+        public string IFF1
+        {
+            get {return iff1;}
+            set {SetValue(ref iff1, value, "ExecutedInstructions");}
+        }
+        public string IFF2
+        {
+            get {return iff2;}
+            set {SetValue(ref iff2, value, "ExecutedInstructions");}
+        }
+
+        public IEnumerable<DisassemblerLine> Disassembly
+        {
+            get
+            {
+                List<DisassemblerLine> list = new List<DisassemblerLine>();
+
+                ushort pc = Shared.ZX81.Z80.ProgramCounter;
+                string address;
+                string opcode;
+                string hexdump;
+
+                for(int f = 0 ; f < 15; f++)
+                {
+                    pc = Shared.ZX81.Disassembler.Disassemble(pc, out address, out opcode, out hexdump);
+                    list.Add(new DisassemblerLine() {Address = address, Opcode = opcode, Hexdump = hexdump});
+                }
+
+                return list;
+            }
+        }
+
+        public int Steps
+        {
+            get {return steps;}
+            set {SetValue(ref steps, value, "Steps");}
+        }
+
+        #endregion
+
+        #region Public methods
+
+        /// <summary>
+        /// Run the ZX81 for a step.
+        /// </summary>
+        public void Step()
+        {
+            for(int f = 0; f < steps; f++)
+            {
+                Shared.ZX81.Step();
+            }
+
+            Update();
+        }
+
+        /// <summary>
+        /// Run the ZX81 for a frame.
+        /// </summary>
+        public void Run()
+        {
+            Shared.ZX81.Run();
+            Update();
+        }
+
+        #endregion
+
+        #region Constructors
+
+        public DisassemblerViewModel()
+        {
+            Steps = 1;
+            Update();
+        }
+
+        #endregion
+    }
+}
diff --git a/WPZX81/WPZX81/WPZX81.csproj b/WPZX81/WPZX81/WPZX81.csproj
index 9c8122c..40b1311 100644
--- a/WPZX81/WPZX81/WPZX81.csproj
+++ b/WPZX81/WPZX81/WPZX81.csproj
@@ -69,12 +69,12 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="BaseViewModel.cs" />
-    <Compile Include="DisassemblerLine.cs" />
+    <Compile Include="Converters\ConvertFlagsToString.cs" />
+    <Compile Include="Converters\ConvertIntToHex2.cs" />
+    <Compile Include="Converters\ConvertIntToHex4.cs" />
     <Compile Include="DisassemblerPage.xaml.cs">
       <DependentUpon>DisassemblerPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="DisassemblerViewModel.cs" />
     <Compile Include="GamePage.xaml.cs">
       <DependentUpon>GamePage.xaml</DependentUpon>
     </Compile>
@@ -93,6 +93,9 @@
       <DependentUpon>SettingsPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Shared.cs" />
+    <Compile Include="ViewModels\BaseViewModel.cs" />
+    <Compile Include="ViewModels\DisassemblerLine.cs" />
+    <Compile Include="ViewModels\DisassemblerViewModel.cs" />
     <Compile Include="ZX81\Emulation.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -162,6 +165,7 @@
       <LastGenOutput>Strings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/WPZX81/WPZX81/ZX81/Emulation.cs b/WPZX81/WPZX81/ZX81/Emulation.cs
index d328e72..0f56e4b 100644
--- a/WPZX81/WPZX81/ZX81/Emulation.cs
+++ b/WPZX81/WPZX81/ZX81/Emulation.cs
@@ -345,8 +345,6 @@ namespace WPZX81.ZX81
         {
             Stopwatch s = Stopwatch.StartNew();
 
-            Z80.ExecutedInstructions = 0;
-
             if (fast)
             {
                 clock.StartFrame();
@@ -380,7 +378,6 @@ namespace WPZX81.ZX81
             if (clock.FrameDone)
             {
                 clock.StartFrame();
-                Z80.ExecutedInstructions = 0;
                 Z80.MaskableInterrupt(0);
 
                 if (Z80.StackPointer < 0x8000)
-- 
cgit v1.2.3