boot-132.tar.gz

[apple/boot.git] / i386 / libsa / zalloc.c

diff --git a/i386/libsa/zalloc.c b/i386/libsa/zalloc.c
index 56526655854ce474449aba87cfe998f9d612eb47..8005a010b481fafb2bf48dda1dfbcc7e8344bfd3 100644 (file)
--- a/i386/libsa/zalloc.c
+++ b/i386/libsa/zalloc.c
@@ -1,24 +1,23 @@
 /*
 /*

- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2003 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * 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.
+ * Portions 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.apple.com/publicsource and read it before using
+ * this file.

  * 
  * The Original Code and all software distributed under the License are
  * 
  * 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,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * 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.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -65,7 +64,7 @@ size_t zalloced_size;
 static void malloc_error(char *addr, size_t size)
 {
 #ifdef i386
 static void malloc_error(char *addr, size_t size)
 {
 #ifdef i386

-    asm("hlt");
+    asm volatile ("hlt");

 #endif
 }
 
 #endif
 }
 


@@ -75,7 +74,7 @@ void malloc_init(char * start, int size, int nodes, void (*malloc_err_fn)(char *
        zalloc_base         = start ? start : (char *)ZALLOC_ADDR;
        totalNodes          = nodes ? nodes : ZALLOC_NODES;
        zalloced            = (zmem *) zalloc_base;
        zalloc_base         = start ? start : (char *)ZALLOC_ADDR;
        totalNodes          = nodes ? nodes : ZALLOC_NODES;
        zalloced            = (zmem *) zalloc_base;

-       zavailable          = (zmem *) zalloc_base + sizeof(zmem) * totalNodes;;
+       zavailable          = (zmem *) zalloc_base + sizeof(zmem) * totalNodes;

        zavailable[0].start = (char *)zavailable + sizeof(zmem) * totalNodes;
         if (size == 0) size = ZALLOC_LEN;
        zavailable[0].size  = size - (zavailable[0].start - zalloc_base);
        zavailable[0].start = (char *)zavailable + sizeof(zmem) * totalNodes;
         if (size == 0) size = ZALLOC_LEN;
        zavailable[0].size  = size - (zavailable[0].start - zalloc_base);


@@ -178,7 +177,7 @@ void free(void * pointer)
 #if i386    
         // Get return address of our caller,
         // in case we have to report an error below.
 #if i386    
         // Get return address of our caller,
         // in case we have to report an error below.

-        asm("movl %%esp, %%eax\n\t"
+        asm volatile ("movl %%esp, %%eax\n\t"

             "subl $4, %%eax\n\t"
             "movl 0(%%eax), %%eax" : "=a" (rp) );
 #else
             "subl $4, %%eax\n\t"
             "movl 0(%%eax), %%eax" : "=a" (rp) );
 #else