Browse Source

* removed warnings

Jonas Maebe 25 years ago
parent
commit
2a6e63f2dd
5 changed files with 87 additions and 67 deletions
  1. 43 36
      rtl/os2/crt.pas
  2. 20 18
      rtl/os2/dos.pas
  3. 8 5
      rtl/os2/objinc.inc
  4. 9 4
      rtl/os2/sysos2.pas
  5. 7 4
      rtl/os2/sysutils.pp

+ 43 - 36
rtl/os2/crt.pas

@@ -248,11 +248,14 @@ begin
             int $0x10
             movl y,%eax
             movl x,%ebx
-            movb %dh,(%eax)
-            movb %dl,(%ebx)
+            movzbl %dh,%edi
+            andw $255,%dx
+            movw %di,(%eax)
+            movw %dx,(%ebx)
         end;
 end;
 
+{$asmmode intel}
 procedure setcursor(y,x:word);
 
 {Set the cursor position.}
@@ -262,11 +265,11 @@ begin
         viosetcurpos(y,x,0)
     else
         asm
-            movb $2,%ah
-            movb $0,%bh
-            movb y,%dh
-            movb x,%dl
-            int $0x10
+            mov  ah, 2
+            mov  bl, 0
+            mov  dh, byte ptr y
+            mov  dl, byte ptr x
+            int  010h
         end;
 end;
 
@@ -277,15 +280,15 @@ begin
         vioscrollup(top,left,bottom,right,lines,screl,0)
     else
         asm
-            movb $6,%ah
-            movb lines,%al
-            movl screl,%edi
-            movb 1(%edi),%bh
-            movb top,%ch
-            movb left,%cl
-            movb bottom,%dh
-            movb right,%dl
-            int $0x10
+            mov  ah, 6
+            mov  al, byte ptr lines
+            mov  edi, screl
+            mov  bl, byte ptr [edi+1]
+            mov  ch, byte ptr top
+            mov  cl, byte ptr left
+            mov  dh, byte ptr bottom
+            mov  dl, byte ptr right
+            int  010h
         end;
 end;
 
@@ -296,18 +299,20 @@ begin
         vioscrolldn(top,left,bottom,right,lines,screl,0)
     else
         asm
-            movb $7,%ah
-            movb lines,%al
-            movl screl,%edi
-            movb 1(%edi),%bh
-            movb top,%ch
-            movb left,%cl
-            movb bottom,%dh
-            movb right,%dl
-            int $0x10
+            mov  ah, 7
+            mov  al, byte ptr lines
+            mov  edi, screl
+            mov  bh, byte ptr [edi+1]
+            mov  ch, byte ptr top
+            mov  cl, byte ptr left
+            mov  dh, byte ptr bottom
+            mov  dl, byte ptr right
+            int  010h
         end;
 end;
 
+{$asmmode att}
+
 function keypressed:boolean;
 
 {Checks if a key is pressed.}
@@ -607,19 +612,21 @@ begin
                         if os_mode=osOS2 then
                             viowrtcharstratt(ca,n,y,x,textattr,0)
                         else
+{$asmmode intel}
                             asm
-                                movw $0x1300,%ax
-                                movb $0,%bh
-                                movb TEXTATTR,%bl
-{                                movb U_CRT_TEXTATTR,%bl }
-                                movb y,%dh
-                                movb x,%dl
-                                movw n,%cx
-                                pushl %ebp
-                                movl ca,%ebp
-                                int $0x10
-                                popl %ebp
+                                mov  ax, 01300h
+                                mov  bh, 0
+                                mov  bl, TEXTATTR
+{                                mov  bl, U_CRT_TEXTATTR }
+                                mov  dh, byte ptr y
+                                mov  dl, byte ptr x
+                                mov  cx, n
+                                push ebp
+                                mov  ebp, ca
+                                int  010h
+                                pop  ebp
                             end;
+{$asmmode att}
                         x:=x+n;
                     end;
             end;

+ 20 - 18
rtl/os2/dos.pas

@@ -555,6 +555,8 @@ begin
     end;
 end;
 
+{$asmmode intel}
+
 procedure SetDate (Year, Month, Day: word);
 var DT: TDateTime;
 begin
@@ -568,18 +570,16 @@ begin
         end
     else
         asm
-            movw Year, %cx
-            movb Month, %dh
-            movb Day, %dl
-            movb $0x2b, %ah
+            mov  cx, Year
+            mov  dh, byte ptr Month
+            mov  dl, byte ptr Day
+            mov  ah, $2b
             call syscall
-(* SetDate isn't supposed to change DosError!!!
-            xorb %ah,%ah
-            movw %ax,doserror
-*)
         end;
 end;
 
+{$asmmode att}
+
 procedure GetTime (var Hour, Minute, Second, Sec100: word); assembler;
 asm
     movb $0x2c, %ah
@@ -599,6 +599,7 @@ asm
     stosw
 end;
 
+{$asmmode intel}
 procedure SetTime (Hour, Minute, Second, Sec100: word);
 var DT: TDateTime;
 begin
@@ -613,19 +614,17 @@ begin
         end
     else
         asm
-            movb Hour, %ch
-            movb Minute ,%cl
-            movb Second, %dh
-            movb Sec100, %dl
-            movb $0x2d, %ah
+            mov  ch, byte ptr Hour
+            mov  cl, byte ptr Minute
+            mov  dh, byte ptr Second
+            mov  dl, byte ptr Sec100
+            mov  ah, $2d
             call syscall
-(* SetTime isn't supposed to change DosError!!!
-            xorb %ah, %ah
-            movw %ax, DosError
-*)
         end;
 end;
 
+{$asmmode att}
+
 procedure getcbreak(var breakvalue:boolean);
 
 begin
@@ -1123,7 +1122,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.2  2000-07-14 10:33:10  michael
+  Revision 1.3  2000-09-29 21:49:41  jonas
+    * removed warnings
+
+  Revision 1.2  2000/07/14 10:33:10  michael
   + Conditionals fixed
 
   Revision 1.1  2000/07/13 06:31:04  michael

+ 8 - 5
rtl/os2/objinc.inc

@@ -54,8 +54,8 @@ begin
         xorl %eax, %eax
         movw %ax, DosStreamError
         movl FileName, %edx
-        movw $0x7f0b, %eax
-        movw AMode, %ecx
+        movl $0x7f0b, %eax
+        movl AMode, %ecx
         call syscall
         cmpl $0xffffffff, %eax
         jnz .Lexit1
@@ -132,12 +132,12 @@ end;
 function SetFileSize (Handle: THandle; FileSize: longint): word; assembler;
 asm
     movl $0x7F18, %eax
-    movl Handle, %ebx
+    movzwl Handle, %ebx
     movl FileSize,%edx
     call syscall
     jc .LSetFSize1
     movl $0x4202, %eax
-    movl Handle, %ebx
+    movzwl Handle, %ebx
     movl $0, %edx
     call syscall
     movl $0, %eax
@@ -148,7 +148,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:52  michael
+  Revision 1.3  2000-09-29 21:49:41  jonas
+    * removed warnings
+
+  Revision 1.2  2000/07/13 11:33:52  michael
   + removed logs
  
 }

+ 9 - 4
rtl/os2/sysos2.pas

@@ -172,13 +172,15 @@ end;
 
 ****************************************************************************}
 
+{$asmmode intel}
 procedure system_exit; assembler;
 asm
-    movb $0x4c,%ah
-    movb exitcode,%al
+    mov  ah, 04ch
+    mov  al, byte ptr exitcode
     call syscall
 end;
 
+{$asmmode att}
 
 {$asmmode direct}
 function paramcount:longint;assembler;
@@ -281,7 +283,7 @@ begin
    begin
      asm
         movb $0x3e,%ah
-        mov h,%ebx
+        movl h,%ebx
         call syscall
      end;
    end;
@@ -806,7 +808,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.2  2000-07-14 10:33:11  michael
+  Revision 1.3  2000-09-29 21:49:41  jonas
+    * removed warnings
+
+  Revision 1.2  2000/07/14 10:33:11  michael
   + Conditionals fixed
 
   Revision 1.1  2000/07/13 06:31:07  michael

+ 7 - 4
rtl/os2/sysutils.pp

@@ -320,18 +320,18 @@ end;
 
 procedure FindClose (var F: TSearchrec);
 
-var SR: PSearchRec;
+{ var SR: PSearchRec; }
 
 begin
     if os_mode = osOS2 then
         begin
             DosFindClose (F.FindHandle);
         end
-    else
+{    else
         begin
             DOS.FindClose (SR^);
             FreeMem (SR, SizeOf (SearchRec));
-        end;
+        end};
     F.FindHandle := 0;
 end;
 
@@ -756,7 +756,10 @@ Finalization
 end.
 {
   $Log$
-  Revision 1.4  2000-08-30 06:30:55  michael
+  Revision 1.5  2000-09-29 21:49:41  jonas
+    * removed warnings
+
+  Revision 1.4  2000/08/30 06:30:55  michael
   + Merged syserrormsg fix
 
   Revision 1.3  2000/08/25 17:23:56  hajny