boot-111.tar.gz

[apple/boot.git] / i386 / nasm / assemble.c

diff --git a/i386/nasm/assemble.c b/i386/nasm/assemble.c
index 7d0017666067a55cc7244431361593dcf3a011d8..059c0805ee9630327d28eb047377711dfeba291e 100644 (file)
--- a/i386/nasm/assemble.c
+++ b/i386/nasm/assemble.c
@@ -3,21 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Portions Copyright (c) 1999 Apple Computer, Inc.  All Rights
- * Reserved.  This file contains Original Code and/or Modifications of
- * Original Code as defined in and that are subject to the Apple Public
- * Source License Version 1.1 (the "License").  You may not use this file
- * except in compliance with the License.  Please obtain a copy of the
- * License at http://www.apple.com/publicsource and read it before using
- * this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
  * 
  * The Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -260,7 +261,7 @@ long assemble (long segment, long offset, int bits,
                       SEEK_SET);               
                l = len;
                while (l > 0) {
-                   long m = fread (buf, 1, (l>sizeof(buf)?sizeof(buf):l),
+                   long m = fread (buf, 1, (l>(long)sizeof(buf)?(long)sizeof(buf):l),
                                    fp);
                    if (!m) {
                        /*
@@ -972,9 +973,9 @@ static ea *process_ea (operand *input, ea *output, int addrbits, int rfield,
        };
        int i;
 
-       for (i=0; i<elements(regs); i++)
+       for (i=0; i<(int)elements(regs); i++)
            if (input->basereg == regs[i]) break;
-       if (i<elements(regs)) {
+       if (i<(int)elements(regs)) {
            output->sib_present = FALSE;/* no SIB necessary */
            output->bytes = 0;         /* no offset necessary either */
            output->modrm = 0xC0 | (rfield << 3) | (i/4);