WebSVN – Kolibri OS – Diff – /programs/develop/fasm/trunk/fasm.asm

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 NORMAL_MODE    = 8
 CONSOLE_MODE   = 32
-MAGIC1	   = 6*(text.line_size-1)+6*2+2
+MAGIC1         = 6*(text.line_size-1)+14
-MAGIC2	   = 14
+MAGIC2         = 14
-MAGIC3	   = 1
+MAGIC3         = 1
-MAGIC4	   = 7
+MAGIC4         = 7
-OUTPUTXY = (5+MAGIC4) shl 16 + MAGIC2*3+MAGIC3+MAGIC4+1+2
+OUTPUTXY       = 7 shl 16 + 53
-MAX_PATH = 100
+MAX_PATH       = 100
+APP_MEMORY     = 0x00800000
 ;; Menuet header
 APP_MEMORY = 0x00800000
 appname equ "FASM "
-;; Menuet header
+version equ "1.67.11"
 center fix true
 START:	    ; Start of execution
-   cmp	     [params],0
+   cmp    [params],0
-   jz	    noparams
+   jz	    red
-   mov	     ecx,10
+   mov    ecx,10
   @@:
-   mov	     [_mode],CONSOLE_MODE
+   mov     [_mode],CONSOLE_MODE
-   jmp	     start
+   jmp     start
   noparams:
-    call draw_window
+red:	; Redraw
-still:
+    call draw_window
-    mcall  10	  ; Wait here for event
+still:
-    dec    eax	   ; Redraw request
+    push 10          ; Wait here for event
-    jz	     red
-    dec    eax	   ; Key in buffer
-    jz	     key
+    pop eax
-    dec    eax	   ; Button in buffer
-    jz	     button
+    int 40h
-    jmp  still
     dec eax
-red:	; Redraw
+    je  red          ; Redraw request
+    dec eax
-    call draw_window
+    jne button       ; Button in buffer
     jmp  still
+key:                 ; Key
+    mov  al,2        ; Read it and ignore
+    int  0x40
+    jmp  still
+button:    ; Button in Window
+    mov  al,17
-key:	; Key
+    int  0x40
     mcall  2	 ; Read it and ignore
-    jmp  still
+    cmp     ah,1
     jne     noclose
-button:    ; Button in Window
+    or      eax,-1
     int     0x40
-    mcall  17
 noclose:
-    cmp  ah,2	 ; Start compiling
+    cmp  ah,2         ; Start compiling
-    je	   start
+    je   start
-    cmp  ah,3	 ; Start compiled file
+    cmp  ah,3         ; Start compiled file
-    jnz  norunout
     jnz  norunout
     mov  edx,outfile
-    call make_fullpaths
+    mov  edx,outfile
-    mcall  58,file_info_start
+    call make_fullpaths
-;   xor   ecx,ecx
+    mcall  70,file_info_start
-    jmp  still
+;   xor   ecx,ecx
-   norunout:
+    jmp  still
-    mov  ecx,[skinh]
+   norunout:
-    add  ecx,MAGIC3+MAGIC2/2-3
-    mov  [ya],ecx
     cmp  ah,11	   ; Infile
-    je	  f1
+    mov  ecx,5
-    cmp  ah,12	   ; Outfile
+    mov  [ya],ecx
     je	  f2
+    cmp  ah,11	   ; Infile
+    je   f1
+    cmp  ah,12	   ; Outfile
+    je   f2
+    cmp  ah,13	   ; Path
-    cmp  ah,13	   ; Path
+    je   f3
-    je	  f3
+    jmp  still
-    dec  ah   ; Close application
-    jnz  still
-    mcall -1
+draw_window:
-skinh dd ?
+    pusha
-draw_window:
+    mcall  12,1 ; Start of draw
-    pusha
     get_sys_colors 1,0
     mcall  12,1 ; Start of draw
     mov  eax,0
-    get_sys_colors 1,0
+    mov  ebx,50*65536+280
     mov  ecx,50*65536+250
-    mcall 0,<50,280>,<50,250>,[sc.work]      ; Draw Window
+    mov  edx,[sc.work]
     or   edx,0x33000000
-    draw_caption header,header.size	    ; Draw Window Label Text
+    mov  edi,header             ; Draw Window Label Text
+    int  0x40
-    mov   ecx,[skinh-2]
-    mov   cx,word[skinh]
+    mcall 9,PROCESSINFO,-1
     madd  ecx,MAGIC3,MAGIC3
-    mov   ebx,[pinfo.x_size]
+    mpack ecx,1,1
-    madd  ebx,5,-5
+    mov   ebx,[pinfo.x_size]
     sub   ebx,10
-    push  ecx
-    madd  ecx,MAGIC2*3+2,MAGIC2*3+2
+    push  ecx
-    mcall 38,,,[sc.work_graph]
-    pop   ecx
+    madd  ecx,MAGIC2*3+2,MAGIC2*3+2
     mcall 38,,,[sc.work_graph]
-    sub   ebx,MAGIC1+3
+    pop   ecx
-    mcall
+    sub   ebx,MAGIC1+3
-    madd  ecx,MAGIC2,MAGIC2
+    mcall
-    mcall
+    madd  ecx,MAGIC2,MAGIC2
-    madd  ecx,MAGIC2,MAGIC2
+    mcall
-    mcall
+    madd  ecx,MAGIC2,MAGIC2
-    madd  ecx,MAGIC2,MAGIC2
+    mcall
-    mcall
+    madd  ecx,MAGIC2,MAGIC2
-    push  ebx
+    mcall
-    mpack ebx,MAGIC1+5,MAGIC1+5
+    push  ebx
-    sub   cx,MAGIC2*3
+    mpack ebx,MAGIC1,MAGIC1
-    mcall
+    sub   ecx,MAGIC2*3
-    mov   ebx,[esp-2]
+    mcall
-    pop   bx
+    mov   ebx,[esp-2]
-    mcall
+    pop   bx
-    add   esp,2
+    mcall
+    add   esp,2
     mpack ebx,5,MAGIC1-1
-    mpack ecx,[skinh],MAGIC2-2
+    mpack ebx,0,MAGIC1-1
-    madd  ecx,MAGIC3+1,0
+    mpack ecx,MAGIC3+1,MAGIC2-2
     mcall 8,,,0x4000000B       ; Button: Enter Infile
     madd  ecx,MAGIC2,0
     mcall  ,,,0x4000000C       ; Button: Enter Outfile
     madd  ecx,MAGIC2,0
-    mcall  ,,,0x4000000D       ; Button: Enter Path
+    mcall  ,,,0x4000000D       ; Button: Enter Path
     mpack ebx,[pinfo.x_size],MAGIC1
-    msub  ebx,MAGIC1+5+1,0
+    mpack ebx,[pinfo.x_size],MAGIC1
-    mpack ecx,[skinh],MAGIC2*3/2-1
+    msub  ebx,MAGIC1+10+1,0
-    madd  ecx,MAGIC3,0
+    mpack ecx,0,MAGIC2*3/2-1
-    mcall  ,,,0x00000002,[sc.work_button]
+    madd  ecx,MAGIC3,0
-    madd  ecx,MAGIC2*3/2+1,0
+    mcall  ,,,0x00000002,[sc.work_button]
-    mcall  ,,,0x00000003
+    madd  ecx,MAGIC2*3/2+1,0
     mcall  ,,,0x00000003
     mpack ebx,5+6,[skinh]    ; Draw Window Text
 bottom_right dd ?
 draw_messages:
     mov    eax,13      ; clear work area
-    mpack  ebx,5+MAGIC4-2,[pinfo.x_size]
+    mpack  ebx,MAGIC4-2,[pinfo.x_size]
     sub    ebx,5*2+MAGIC4*2-1-2*2
-    mpack  ecx,[skinh],[pinfo.y_size]
+    mpack  ecx,0,[pinfo.y_size]
-    madd   ecx,MAGIC2*3+MAGIC3+MAGIC4+1,-(MAGIC2*3+MAGIC3+MAGIC4*2+5)+2
+    madd   ecx,MAGIC2*3+MAGIC3+MAGIC4+1,-(MAGIC2*3+MAGIC3+MAGIC4*2+25)
     mov    word[bottom_right+2],bx
     mov    word[bottom_right],cx
-    msub   [bottom_right],7,11
-    add    [bottom_right],OUTPUTXY
+    msub   [bottom_right],7,11
-    sub    ecx,[skinh]
+    add    [bottom_right],OUTPUTXY
     mov    edx,[sc.work]
     int    0x40
 _cy = 0
 _sy = 2
 _cx = 4
 _sx = 6
     push   ebx ecx
-    mpack  ebx,5+MAGIC4-3,5+MAGIC4-2
+    mpack  ebx,MAGIC4-3,MAGIC4-2
     add    bx,[esp+_cx]
     mov    ecx,[esp+_sy-2]
     mov    cx,[esp+_sy]
     add    cx,si
     shl    esi,16
     add    ecx,esi
     madd   ecx,1,1
     mcall
-    mpack  ebx,5+MAGIC4-3,5+MAGIC4-3
+    mpack  ebx,MAGIC4-3,MAGIC4-3
     mov    esi,[esp+_sy-2]
     mov    si,cx
     mov    ecx,esi
     mcall
     mov    si,[esp+_cx]
     jmp    still
 print_text:
-    mpack ebx,MAGIC1+5+6,[pinfo.x_size]
+    mpack ebx,MAGIC1+6,[pinfo.x_size]
     sub   ebx,MAGIC1*2+5*2+6+3
     movzx esi,bx
     mov   ecx,[ya-2]
     mov   cx,8
     mcall 13,,,[sc.work]
-    mpack ebx,MAGIC1+5+6,[ya]
+    mpack ebx,MAGIC1+6,[ya]
     mov   eax,esi
     ret
 ; DATA
-sz header,'FASM FOR MENUET'
+header db appname,version,0
 start:
     cmp    [_mode],NORMAL_MODE
     jne    @f
     call   draw_messages
-    push   [skinh]
+    push   0
     pop    [textxy]
     add    [textxy],OUTPUTXY
 @@:
     mov    esi,_logo
     cmp    [_run_outfile],0
     je	     @f
     mov    edx,outfile
     call   make_fullpaths
-    mov    eax,58
+    mov    eax,70
     mov    ebx,file_info_start
     xor    ecx,ecx
     int    0x40
 @@:

Subversion Repositories Kolibri OS

(root)/programs/develop/fasm/trunk/fasm.asm – Rev 109 → 174