Changeset 32

Timestamp:

Jul 10, 2022, 12:37:58 AM (22 months ago)

Author:

chronos

Message:

• Added: Interrupt handling.

Location:

branches/UltimatOS

Files:

• . (modified) (1 prop)
• Forms/UFormMain.lfm (modified) (4 diffs)
• Forms/UFormMain.pas (modified) (7 diffs)
• Graphics.asm (modified) (1 diff)
• IO.asm (modified) (1 diff)
• Program.asm (modified) (2 diffs)
• UAssembler.pas (moved) (moved from branches/UltimatOS/UInstructionWriter.pas ) (26 diffs)
• UCpu.pas (modified) (8 diffs)
• UMachine.pas (modified) (9 diffs)
• UltimatOS.lpi (modified) (5 diffs)
• UltimatOS.lpr (modified) (1 diff)

branches/UltimatOS

@@ -2 +2 @@
 UltimatOS.lps
 UltimatOS.res
+UltimatOS.dbg
 lib

@@ -2 +2 @@
 UltimatOS.lps
 UltimatOS.res
+UltimatOS.dbg
 lib

branches/UltimatOS/Forms/UFormMain.lfm

@@ -10 +10 @@
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnKeyUp = FormKeyUp
   OnShow = FormShow
   LCLVersion = '2.2.0.4'
@@ -17 +18 @@
     Top = 8
     Width = 640
+    OnMouseMove = PaintBox1MouseMove
     OnPaint = PaintBox1Paint
   end
-  object ButtonRun: TButton
+  object ButtonStart: TButton
     Left = 8
     Height = 33
     Top = 496
     Width = 98
-    Caption = 'Run'
-    OnClick = ButtonRunClick
+    Caption = 'Start'
+    OnClick = ButtonStartClick
     TabOrder = 0
   end
@@ -44 +46 @@
   end
   object ButtonMemory: TButton
-    Left = 128
+    Left = 550
     Height = 33
     Top = 496
@@ -51 +53 @@
     OnClick = ButtonMemoryClick
     TabOrder = 2
+  end
+  object ButtonStop: TButton
+    Left = 112
+    Height = 33
+    Top = 496
+    Width = 98
+    Caption = 'Stop'
+    OnClick = ButtonStopClick
+    TabOrder = 3
+  end
+  object ButtonRestart: TButton
+    Left = 216
+    Height = 33
+    Top = 496
+    Width = 98
+    Caption = 'Restart'
+    OnClick = ButtonRestartClick
+    TabOrder = 4
+  end
+  object ButtonCompile: TButton
+    Left = 8
+    Height = 33
+    Top = 536
+    Width = 98
+    Caption = 'Compile'
+    OnClick = ButtonCompileClick
+    TabOrder = 5
   end
   object Timer1: TTimer

branches/UltimatOS/Forms/UFormMain.pas

@@ -13 +13 @@
   TFormMain = class(TForm)
     ButtonMemory: TButton;
-    ButtonRun: TButton;
+    ButtonCompile: TButton;
+    ButtonStart: TButton;
+    ButtonStop: TButton;
+    ButtonRestart: TButton;
     Label1: TLabel;
     MemoCode: TMemo;
     PaintBox1: TPaintBox;
     Timer1: TTimer;
+    procedure ButtonCompileClick(Sender: TObject);
     procedure ButtonMemoryClick(Sender: TObject);
-    procedure ButtonRunClick(Sender: TObject);
+    procedure ButtonRestartClick(Sender: TObject);
+    procedure ButtonStartClick(Sender: TObject);
+    procedure ButtonStopClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
+    procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormShow(Sender: TObject);
+    procedure PaintBox1MouseMove(Sender: TObject; Shift: TShiftState; X,
+      Y: Integer);
     procedure PaintBox1Paint(Sender: TObject);
     procedure Timer1Timer(Sender: TObject);
   private
     procedure InitProgram;
+    procedure UpdateInterface;
   public
     Machine: TMachine;
@@ -40 +50 @@
 
 uses
-  UInstructionWriter, UFormMemory;
+  UAssembler, UFormMemory;
 
 { TFormMain }
@@ -50 +60 @@
 end;
 
-procedure TFormMain.ButtonRunClick(Sender: TObject);
+procedure TFormMain.ButtonStartClick(Sender: TObject);
 begin
   Machine.Reset;
-  with TInstructionWriter.Create do
-  try
-    Memory := Machine.Cpu.Memory;
-    Parse(MemoCode.Lines);
-  finally
-    Free;
-  end;
-  Machine.Cpu.Run;
-  Label1.Caption := 'Executed instructions: ' + IntToStr(Machine.Cpu.ExecutedCount);
+  ButtonCompile.Click;
+  Machine.Running := True;
+  UpdateInterface;
+end;
+
+procedure TFormMain.ButtonStopClick(Sender: TObject);
+begin
+  Machine.Running := False;
+  UpdateInterface;
 end;
 
@@ -70 +80 @@
 end;
 
+procedure TFormMain.ButtonCompileClick(Sender: TObject);
+begin
+  with TAssembler.Create do
+  try
+    Memory := Machine.Cpu.Memory;
+    Parse(MemoCode.Lines);
+  finally
+    Free;
+  end;
+end;
+
+procedure TFormMain.ButtonRestartClick(Sender: TObject);
+begin
+  ButtonStop.Click;
+  ButtonStart.Click;
+end;
+
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
@@ -75 +102 @@
 end;
 
+procedure TFormMain.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState
+  );
+begin
+  Machine.Keyboard.Press(Key);
+end;
+
 procedure TFormMain.FormShow(Sender: TObject);
 begin
+  UpdateInterface;
+end;
+
+procedure TFormMain.PaintBox1MouseMove(Sender: TObject; Shift: TShiftState; X,
+  Y: Integer);
+begin
+  Machine.Mouse.Move(X, Y);
 end;
 
@@ -99 +139 @@
     PaintBox1.Repaint;
   end;
+  Label1.Caption := 'Executed instructions: ' + IntToStr(Machine.Cpu.ExecutedCount) + LineEnding +
+    'Interrupts: ' + IntToStr(Machine.Cpu.InterruptCount);
 end;
 
@@ -106 +148 @@
 end;
 
+procedure TFormMain.UpdateInterface;
+begin
+  ButtonStart.Enabled := not Machine.Running;
+  ButtonStop.Enabled := Machine.Running;
+  ButtonRestart.Enabled := not Machine.Running;
+end;
+
 end.
 

branches/UltimatOS/Graphics.asm

@@ -14 +14 @@
   PUSH R0
   PUSH R1
-Start:
+RectangleStart:
   COPY R0, R8
   COPY R1, R9
   CALL SetPixelAddr  
   COPY R5, R3
-Line:
+RectangleLine:
   OUT  (ScreenWriteData), R7
   DEC  R5
-  JPNZ R5, Line
+  JPNZ R5, RectangleLine
   DEC  R6
   INC  R9
-  JPNZ R6, Start
+  JPNZ R6, RectangleStart
   POP  R1
   POP  R0

branches/UltimatOS/IO.asm

@@ -10 +10 @@
   .const ScreenSetAddr 0
   .const ScreenWriteData 1
+  .const CounterSetInterval 2
+  .const CounterSetState 3
   
+  ; Interrupt vectors
+  .const InterruptVectorCounter 2
+  .const InterruptVectorMouse 3
+  .const InterruptVectorKeyboard 4
+  

branches/UltimatOS/Program.asm

@@ -1 +1 @@
   .include IO.asm
   
+  CALL Start
+  .org 8
+  .dd  InterruptHandlerCounter
+  .dd  InterruptHandlerMouse
+  .dd  InterruptHandlerKeyboard
+  
+  .org $100
+Start:  
   ;SET  R0, $ff7700 ; Color
   ;SET  R1, 100     ; X
@@ -22 +30 @@
   ;CALL WriteChar
   
-  HALT
+StartLoop:
+  JP   StartLoop
+  ;HALT
+  
+InterruptHandlerCounter:
+  RETI
+  
+MousePosX:
+  .dd 0  
+MousePosY:
+  .dd 0  
+  
+InterruptHandlerMouse:
+  PUSH R0
+  PUSH R1
+  IN   R0, (MouseGetPosX)
+  SET  R1, MousePosX
+  ST   (R1), R0
+  IN   R0, (MouseGetPosY)
+  SET  R1, MousePosY
+  ST   (R1), R0
+  POP  R1
+  POP  R0
+  RETI
+
+InterruptHandlerKeyboard:
+  RETI
   
 HelloWorld: .db "Hello world", 0

branches/UltimatOS/UAssembler.pas

@@ -1 @@
-unit UInstructionWriter;
+unit UAssembler;
 
 interface
@@ -25 +25 @@
   end;
 
+  { TLabel }
+
   TLabel = class
     Name: string;
     Address: TAddress;
     ForwardRefs: array of TAddress;
+    procedure AddForwardRef(Address: TAddress);
   end;
 
@@ -50 +53 @@
   end;
 
-  { TInstructionWriter }
-
-  TInstructionWriter = class
+  { TAssembler }
+
+  TAssembler = class
   private
     InstructionDefs: TInstructionDefs;
@@ -59 +62 @@
     LineNumber: Integer;
     function ParseText(var Text: string; Separator: Char): string;
+    function ParseConst(Text: string; out Value: Integer): Boolean;
+    function ParseLabel(Text: string; out Value: Integer): Boolean;
+    function ParseNumber(Text: string; out Value: Integer): Boolean;
     procedure WriteParam(Param: TInstructionParam; var Text: string);
     procedure Error(Text: string);
@@ -65 +71 @@
     IP: Integer;
     procedure Parse(Lines: TStrings);
-    procedure Write(Text: string);
+    procedure ParseLine(Text: string);
     procedure WriteInstruction(Instruction: TInstruction);
     procedure WriteAddress(Address: TAddress);
@@ -80 +86 @@
 implementation
 
+{ TLabel }
+
+procedure TLabel.AddForwardRef(Address: TAddress);
+begin
+  SetLength(ForwardRefs, Length(ForwardRefs) + 1);
+  ForwardRefs[Length(ForwardRefs) - 1] := Address;
+end;
+
 { TConstants }
 
@@ -144 +158 @@
 
 
-{ TInstructionWriter }
-
-function TInstructionWriter.ParseText(var Text: string; Separator: Char
+{ TAssembler }
+
+function TAssembler.ParseText(var Text: string; Separator: Char
   ): string;
 var
@@ -161 +175 @@
 end;
 
-procedure TInstructionWriter.WriteParam(Param: TInstructionParam; var Text: string);
+function TAssembler.ParseConst(Text: string; out Value: Integer): Boolean;
+var
+  FoundConstant: TConstant;
+begin
+  FoundConstant := Constants.SearchByName(UpperCase(Text));
+  if Assigned(FoundConstant) then begin
+    Result := True;
+    Value := FoundConstant.Value;
+  end;
+  Result := False;
+end;
+
+function TAssembler.ParseLabel(Text: string; out Value: Integer): Boolean;
+var
+  FoundLabel: TLabel;
+begin
+  Result := True;
+  FoundLabel := Labels.SearchByName(UpperCase(Text));
+  if Assigned(FoundLabel) then begin
+    // Existing label
+    if FoundLabel.Address = -1 then begin
+      FoundLabel.AddForwardRef(IP);
+      Value := 0;
+    end else
+      Value := FoundLabel.Address;
+  end else begin
+    // Forward label reference
+    with Labels.AddNew(UpperCase(Text), -1) do begin
+      AddForwardRef(IP);
+    end;
+    Value := 0;
+  end;
+end;
+
+function TAssembler.ParseNumber(Text: string; out Value: Integer): Boolean;
+begin
+  if TryStrToInt(Text, Value) then begin
+    Result := True;
+  end else
+    Result := False;
+end;
+
+procedure TAssembler.WriteParam(Param: TInstructionParam; var Text: string);
 var
   Address: string;
@@ -179 +235 @@
           Exit;
         end;
-        FoundLabel := Labels.SearchByName(UpperCase(Address));
-        if Assigned(FoundLabel) then begin
-          // Existing label
-          WriteAddress(FoundLabel.Address);
-        end else begin
-          // Forward label reference
-          with Labels.AddNew(UpperCase(Address), -1) do begin
-            SetLength(ForwardRefs, Length(ForwardRefs) + 1);
-            ForwardRefs[Length(ForwardRefs) - 1] := IP;
-          end;
-          WriteAddress(0);
-        end;
+        ParseLabel(Address, Value);
+        WriteAddress(Value);
       end;
     end;
@@ -205 +251 @@
             Exit;
           end;
-          FoundLabel := Labels.SearchByName(UpperCase(Address));
-          if Assigned(FoundLabel) then begin
-            // Existing label
-            WriteAddress(FoundLabel.Address);
-          end else begin
-            // Forward label reference
-            with Labels.AddNew(UpperCase(Address), -1) do begin
-              SetLength(ForwardRefs, Length(ForwardRefs) + 1);
-              ForwardRefs[Length(ForwardRefs) - 1] := IP;
-            end;
-            WriteAddress(0);
-          end;
+          ParseLabel(Address, Value);
+          WriteAddress(Value);
         end;
       end else Error('Expected indirect address ' + Address);
@@ -245 +281 @@
           Exit;
         end;
-        FoundLabel := Labels.SearchByName(UpperCase(Address));
-        if Assigned(FoundLabel) then begin
-          // Existing label
-          WriteData(FoundLabel.Address);
-        end else begin
-          // Forward label reference
-          with Labels.AddNew(UpperCase(Address), -1) do begin
-            SetLength(ForwardRefs, Length(ForwardRefs) + 1);
-            ForwardRefs[Length(ForwardRefs) - 1] := IP;
-          end;
-          WriteData(0);
-        end;
+        ParseLabel(Address, Value);
+        WriteData(Value);
       end;
     end;
@@ -273 +299 @@
 end;
 
-procedure TInstructionWriter.Error(Text: string);
+procedure TAssembler.Error(Text: string);
 begin
   raise Exception.Create(IntToStr(LineNumber) + ': ' + Text);
 end;
 
-procedure TInstructionWriter.Parse(Lines: TStrings);
+procedure TAssembler.Parse(Lines: TStrings);
 var
   I: Integer;
@@ -284 +310 @@
   for I := 0 to Lines.Count - 1 do begin
     LineNumber := I + 1;
-    Write(Lines[I]);
+    ParseLine(Lines[I]);
   end;
   for I := 0 to Labels.Count - 1 do begin
@@ -292 +318 @@
 end;
 
-procedure TInstructionWriter.Write(Text: string);
+procedure TAssembler.ParseLine(Text: string);
 var
   FoundLabel: TLabel;
@@ -304 +330 @@
   Lines: TStringList;
   Param: string;
+  Num: Integer;
 begin
   // Remove comments
@@ -375 +402 @@
     if InstructionName = 'dd' then begin
       while Text <> '' do begin
-        Param := ParseText(Text, ',');
+        Param := Trim(ParseText(Text, ','));
         if Param.StartsWith('"') and Param.EndsWith('"') then begin
           Param := Copy(Param, 2, Length(Param) - 2);
           for I := 1 to Length(Param) do
             WriteCardinal(Ord(Param[I]));
-        end else WriteCardinal(StrToInt(Param));
-      end;
+        end else begin
+          if ParseNumber(Param, Num) then
+            WriteCardinal(Num)
+          else if ParseConst(Param, Num) then
+            WriteCardinal(Num)
+          else if ParseLabel(Param, Num) then
+            WriteCardinal(Num);
+        end;
+      end;
+    end else
+    if InstructionName = 'org' then begin
+      IP := StrToInt(Text);
     end else Error('Unsupported directive name ' + InstructionName);
   end else begin
@@ -396 +433 @@
 end;
 
-procedure TInstructionWriter.WriteInstruction(Instruction: TInstruction);
+procedure TAssembler.WriteInstruction(Instruction: TInstruction);
 begin
   Memory.Data[IP] := Byte(Instruction);
@@ -402 +439 @@
 end;
 
-procedure TInstructionWriter.WriteAddress(Address: TAddress);
+procedure TAssembler.WriteAddress(Address: TAddress);
 begin
   PAddress(@Memory.Data[IP])^ := Address;
@@ -408 +445 @@
 end;
 
-procedure TInstructionWriter.WriteData(Data: TData);
+procedure TAssembler.WriteData(Data: TData);
 begin
   PData(@Memory.Data[IP])^ := Data;
@@ -414 +451 @@
 end;
 
-procedure TInstructionWriter.WriteIndex(Index: Byte);
+procedure TAssembler.WriteIndex(Index: Byte);
 begin
   Memory.Data[IP] := Index;
@@ -420 +457 @@
 end;
 
-procedure TInstructionWriter.WriteReg(Index: Byte);
+procedure TAssembler.WriteReg(Index: Byte);
 begin
   Memory.Data[IP] := Index;
@@ -426 +463 @@
 end;
 
-procedure TInstructionWriter.WriteByte(Value: Byte);
+procedure TAssembler.WriteByte(Value: Byte);
 begin
   Memory.Data[IP] := Value;
@@ -432 +469 @@
 end;
 
-procedure TInstructionWriter.WriteWord(Value: Word);
+procedure TAssembler.WriteWord(Value: Word);
 begin
   PWord(@Memory.Data[IP])^ := Value;
@@ -438 +475 @@
 end;
 
-procedure TInstructionWriter.WriteCardinal(Value: Cardinal);
+procedure TAssembler.WriteCardinal(Value: Cardinal);
 begin
   PCardinal(@Memory.Data[IP])^ := Value;
@@ -444 +481 @@
 end;
 
-constructor TInstructionWriter.Create;
+constructor TAssembler.Create;
 begin
   Labels := TLabels.Create;
@@ -477 +514 @@
     AddNew(inOr, 'OR', ipRegIndex, ipRegIndex);
     AddNew(inXor, 'XOR', ipRegIndex, ipRegIndex);
-  end;
-end;
-
-destructor TInstructionWriter.Destroy;
+    AddNew(inInt, 'INT', ipIndex);
+    AddNew(inReti, 'RETI');
+    AddNew(inEnableInt, 'EI');
+    AddNew(inDisableInt, 'DI');
+  end;
+end;
+
+destructor TAssembler.Destroy;
 begin
   FreeAndNil(InstructionDefs);

branches/UltimatOS/UCpu.pas

@@ -9 +9 @@
   TInstruction = (inNop, inHalt, inSet, inInput, inOutput, inInc, inDec, inJp,
     inJpz, inJpnz, inAdd, inSub, inCall, inRet, inPush, inPop, inCopy,
-    inShl, inShr, inLoad, inLoadi, inStore, inMul, inAnd, inAndi, inOr, inXor);
+    inShl, inShr, inLoad, inLoadi, inStore, inMul, inAnd, inAndi, inOr, inXor,
+    inInt, inReti, inEnableInt, inDisableInt);
   TAddress = Integer;
   PAddress = ^TAddress;
@@ -19 +20 @@
   TOnOutput = procedure (Address: Integer; Value: TData) of object;
 
+  TCpu = class;
+
+  { TCpuThread }
+
+  TCpuThread = class(TThread)
+    Cpu: TCpu;
+    procedure Execute; override;
+    destructor Destroy; override;
+  end;
+
   { TCpu }
 
   TCpu = class
   private
+    FCpuThread: TCpuThread;
     FOnInput: TOnInput;
     FOnOutput: TOnOutput;
+    InterruptPending: Boolean;
+    InterruptVector: Integer;
+    InterruptEnabled: Boolean;
+    function GetRunning: Boolean;
     function ReadByte: Byte;
     function ReadAddress: TAddress;
@@ -30 +46 @@
     procedure Push(Value: Integer);
     function Pop: Integer;
+    procedure SetRunning(AValue: Boolean);
   public
     ExecutedCount: Integer;
+    InterruptCount: Integer;
     Terminated: Boolean;
     Memory: TMemory;
@@ -38 +56 @@
     SP: TAddress;
     procedure Run;
+    procedure Start;
+    procedure Stop;
     procedure Step;
     procedure Reset;
+    procedure Interrupt(Vector: Integer);
+    constructor Create;
+    destructor Destroy; override;
     property OnInput: TOnInput read FOnInput write FOnInput;
     property OnOutput: TOnOutput read FOnOutput write FOnOutput;
+    property Running: Boolean read GetRunning write SetRunning;
   end;
 
 
 implementation
+
+{ TCpuThread }
+
+procedure TCpuThread.Execute;
+begin
+  Cpu.Run;
+end;
+
+destructor TCpuThread.Destroy;
+begin
+  Cpu.FCpuThread := nil;
+  inherited;
+end;
 
 { TCpu }
@@ -55 +92 @@
 end;
 
+function TCpu.GetRunning: Boolean;
+begin
+  Result := Assigned(FCpuThread);
+end;
+
 function TCpu.ReadAddress: TAddress;
 begin
@@ -79 +121 @@
 end;
 
+procedure TCpu.SetRunning(AValue: Boolean);
+begin
+  if AValue and not Assigned(FCpuThread) then begin
+    FCpuThread := TCpuThread.Create(True);
+    FCpuThread.FreeOnTerminate := True;
+    FCpuThread.Cpu := Self;
+    FCpuThread.Start;
+  end else
+  if not AValue and Assigned(FCpuThread) then begin
+    Terminated := True;
+    FreeAndNil(FCpuThread);
+  end;
+end;
+
 procedure TCpu.Run;
 begin
-  while not Terminated do
+  while not Terminated do begin
+    if InterruptEnabled and InterruptPending then begin
+      InterruptEnabled := False;
+      InterruptPending := False;
+      Push(IP);
+      IP := PAddress(@Memory.Data[InterruptVector * SizeOf(TAddress)])^;
+    end;
     Step;
+  end;
+end;
+
+procedure TCpu.Start;
+begin
+  Running := True;
+end;
+
+procedure TCpu.Stop;
+begin
+  Running := False;
 end;
 
@@ -214 +287 @@
       R[RegIndex] := R[RegIndex] xor R[RegIndex2];
     end;
+    inInt: begin
+      Interrupt(ReadByte);
+    end;
+    inReti: begin
+      IP := Pop;
+      InterruptEnabled := True;
+    end;
+    inEnableInt: InterruptEnabled := True;
+    inDisableInt: InterruptEnabled := False;
   end;
 end;
@@ -223 +305 @@
   SP := 0;
   ExecutedCount := 0;
+  InterruptEnabled := True;
+  InterruptPending := False;
+  InterruptCount := 0;
+end;
+
+procedure TCpu.Interrupt(Vector: Integer);
+begin
+  InterruptPending := True;
+  InterruptVector := Vector;
+  Inc(InterruptCount);
+end;
+
+constructor TCpu.Create;
+begin
+end;
+
+destructor TCpu.Destroy;
+begin
+  Running := False;
+  inherited;
 end;
 

branches/UltimatOS/UMachine.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, UCpu, UMemory;
+  Classes, SysUtils, UCpu, UMemory, ExtCtrls;
 
 type
+  TMachine = class;
 
   { TDevice }
 
   TDevice = class
+    Machine: TMachine;
     procedure Reset; virtual;
   end;
+
+  { TMouse }
 
   TMouse = class(TDevice)
     Position: TPoint;
+    InterruptVector: Integer;
+    procedure Move(X, Y: Integer);
   end;
 
@@ -54 +60 @@
   TKeyboard = class(TDevice)
     Buffer: TFifo;
+    InterruptVector: Integer;
     function ReadKey: Integer;
     function KeyReady: Integer;
@@ -59 +66 @@
     destructor Destroy; override;
     procedure Reset; override;
+    procedure Press(KeyCode: Integer);
+  end;
+
+  { TCounter }
+
+  TCounter = class(TDevice)
+  private
+    Timer: TTimer;
+    function GetEnabled: Boolean;
+    function GetInterval: Integer;
+    procedure SetEnabled(AValue: Boolean);
+    procedure SetInterval(AValue: Integer);
+    procedure DoTimer(Sender: TObject);
+  public
+    InterruptVector: Integer;
+    constructor Create;
+    destructor Destroy; override;
+    property Enabled: Boolean read GetEnabled write SetEnabled;
+    property Interval: Integer read GetInterval write SetInterval;
   end;
 
@@ -67 +93 @@
     function CpuInput(Address: TAddress): TData;
     procedure CpuOutput(Address: TAddress; Value: TData);
+    function GetRunning: Boolean;
+    procedure SetRunning(AValue: Boolean);
   public
     Cpu: TCpu;
@@ -73 +101 @@
     Mouse: TMouse;
     Screen: TScreen;
+    Counter: TCounter;
     procedure Reset;
     constructor Create;
     destructor Destroy; override;
+    property Running: Boolean read GetRunning write SetRunning;
   end;
 
 
 implementation
+
+{ TMouse }
+
+procedure TMouse.Move(X, Y: Integer);
+begin
+  Position := Point(X, Y);
+  Machine.Cpu.Interrupt(InterruptVector);
+end;
+
+{ TCounter }
+
+function TCounter.GetEnabled: Boolean;
+begin
+  Result := Timer.Enabled;
+end;
+
+function TCounter.GetInterval: Integer;
+begin
+  Result := Timer.Interval;
+end;
+
+procedure TCounter.SetEnabled(AValue: Boolean);
+begin
+  Timer.Enabled := AValue;
+end;
+
+procedure TCounter.SetInterval(AValue: Integer);
+begin
+  Timer.Interval := AValue;
+end;
+
+procedure TCounter.DoTimer(Sender: TObject);
+begin
+  Machine.Cpu.Interrupt(InterruptVector);
+end;
+
+constructor TCounter.Create;
+begin
+  Timer := TTimer.Create(nil);
+  Timer.OnTimer := DoTimer;
+  Enabled := False;
+end;
+
+destructor TCounter.Destroy;
+begin
+  FreeAndNil(Timer);
+  inherited;
+end;
 
 { TDevice }
@@ -183 +261 @@
 begin
   Buffer.Clear;
+end;
+
+procedure TKeyboard.Press(KeyCode: Integer);
+begin
+  Buffer.Put(KeyCode);
+  Machine.Cpu.Interrupt(InterruptVector);
 end;
 
@@ -201 +285 @@
 begin
   if Address = 0 then Screen.SetPointer(Value)
-  else if Address = 1 then Screen.WriteData(Value);
+  else if Address = 1 then Screen.WriteData(Value)
+  else if Address = 2 then Counter.Interval := Value
+  else if Address = 3 then Counter.Enabled := Value = 1;
+end;
+
+function TMachine.GetRunning: Boolean;
+begin
+  Result := Cpu.Running;
+end;
+
+procedure TMachine.SetRunning(AValue: Boolean);
+begin
+  Cpu.Running := AValue;
 end;
 
@@ -213 +309 @@
 constructor TMachine.Create;
 begin
+  Counter := TCounter.Create;
+  Counter.Machine := Self;
+  Counter.InterruptVector := 2;
   Memory := TMemory.Create;
   Memory.Size := 200000;
   Keyboard := TKeyboard.Create;
+  Keyboard.Machine := Self;
+  Keyboard.InterruptVector := 4;
   Mouse := TMouse.Create;
+  Mouse.Machine := Self;
+  Mouse.InterruptVector := 3;
   Screen := TScreen.Create;
   Screen.Size := Point(640, 480);
@@ -232 +335 @@
   FreeAndNil(Screen);
   FreeAndNil(Memory);
+  FreeAndNil(Counter);
   inherited;
 end;

branches/UltimatOS/UltimatOS.lpi

@@ -52 +52 @@
             </Options>
           </Linking>
+          <Other>
+            <CompilerMessages>
+              <IgnoredMessages idx6058="True" idx3124="True" idx3123="True"/>
+            </CompilerMessages>
+          </Other>
         </CompilerOptions>
       </Item>
@@ -92 +97 @@
       </Unit>
       <Unit>
-        <Filename Value="UInstructionWriter.pas"/>
+        <Filename Value="UAssembler.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit>
@@ -99 +104 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormMemory"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit>
@@ -132 +138 @@
     </CodeGeneration>
     <Linking>
+      <Debugging>
+        <UseExternalDbgSyms Value="True"/>
+      </Debugging>
       <Options>
         <Win32>
@@ -138 +147 @@
       </Options>
     </Linking>
+    <Other>
+      <CompilerMessages>
+        <IgnoredMessages idx6058="True" idx3124="True" idx3123="True"/>
+      </CompilerMessages>
+    </Other>
   </CompilerOptions>
   <Debugging>

branches/UltimatOS/UltimatOS.lpr

@@ -11 +11 @@
   {$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UFormMain, UMachine, UCpu, UMemory, UInstructionWriter, UFormMemory
+  Forms, UFormMain, UMachine, UCpu, UMemory, UAssembler, UFormMemory
   { you can add units after this };
 

@@ -2 +2 @@
 UltimatOS.lps
 UltimatOS.res
+UltimatOS.dbg
 lib