Changeset 31 for branches/UltimatOS/Graphics.asm

Timestamp:

Jul 6, 2022, 1:05:27 AM (23 months ago)

Author:

chronos

Message:

• Modified: Code parsing and execution improvements.

File:

• branches/UltimatOS/Graphics.asm (modified) (10 diffs)

branches/UltimatOS/Graphics.asm

@@ +1 @@
+ColorText: .dd $ffffff 
+ColorBackground: .dd 0
+
 Rectangle: ; R0 - Color, R1 - X, R2 - Y, R3 - Width, R4 - Height   
   PUSH R5 ; loop X
@@ -17 +20 @@
   COPY R5, R3
 Line:
-  OUT  ScreenWriteData, R7
+  OUT  (ScreenWriteData), R7
   DEC  R5
   JPNZ R5, Line
@@ -34 +37 @@
 SetPixelAddr: ; R0 - X, R1 - Y
   PUSH R2
-  IN   R2, ScreenGetWidth
+  IN   R2, (ScreenGetWidth)
   SHL  R2, 2 ; multiply by 4
-  SHL  R0, 2
+  SHL  R0, 2 ; multiply by 4
   MUL  R1, R2
   ADD  R0, R1
-  OUT  ScreenSetAddr, R0
+  OUT  (ScreenSetAddr), R0
   POP  R2
   RET
@@ -57 +60 @@
   PUSH R11 ; Background color
   PUSH R12 ; temp value
-  PUSH R13 ; bit mask
   COPY R5, R1
   COPY R6, R2
@@ -63 +65 @@
   SHL  R0, 3
   ADD  R3, R0
-  IN   R8, ScreenGetWidth
+  IN   R8, (ScreenGetWidth)
   SET  R4, CharHeight
-  SET  R10, $ffffff
-  SET  R11, 5
-  SET  R13, 1
+  LDI  R10, (ColorText)
+  LDI  R11, (ColorBackground)
 WriteCharLoopY:
   COPY R0, R5
@@ -76 +77 @@
 WriteCharLoopX:
   COPY R12, R7
-  AND  R12, R13
+  ANDI R12, 1
   JPZ  R12, WriteCharNext
-  OUT  ScreenWriteData, R10
+  OUT  (ScreenWriteData), R10
   JP   WriteCharNext2
 WriteCharNext:
-  OUT  ScreenWriteData, R11
+  OUT  (ScreenWriteData), R11
 WriteCharNext2:
   DEC  R9
@@ -90 +91 @@
   INC  R3
   JPNZ R4, WriteCharLoopY
-  POP  R13
   POP  R12
   POP  R11
@@ -106 +106 @@
   PUSH R3 ; loop variable
   PUSH R4 ; character width
-  PUSH R5 ; byte mask
   PUSH R6 ; X
   PUSH R7 ; Y
@@ -115 +114 @@
   COPY R7, R2
   COPY R3, R0
-  SET  R5, $ff
   SET  R4, CharWidth  
 TextOutLoop:
   LD   R0, (R3)
-  AND  R0, R5
+  ANDI R0, $ff
   JPZ  R0, TextOutLoop2
   COPY R1, R6
@@ -133 +131 @@
   POP  R7
   POP  R6
-  POP  R5
   POP  R4
   POP  R3