Merge branch 'master' into jwt27

Author: jwt27

src/libc/dpmi/helper/mapmem.c

@@ -22,7 +22,7 @@ __djgpp_map_physical_memory (void *_our_addr, unsigned long _num_bytes,
       || (_num_bytes & 0xfff))
     {
       errno = EINVAL;
-      return -1;
+      goto fail;
     }
 
   /* Loop through the memory range, identify individual handles
@@ -38,7 +38,17 @@ __djgpp_map_physical_memory (void *_our_addr, unsigned long _num_bytes,
       /* Find the memory handle corresponding to the first byte. */
       d = __djgpp_memory_handle (p);
       if (d == NULL)
-	goto fail;
+        {
+          errno = EINVAL;
+          goto fail;
+        }
+
+      /* Base address of the memory handle must be page aligned too. */
+      if (d->address & 0xfff)
+        {
+          errno = EINVAL;
+          goto fail;
+        }
 
       /* Find the last byte in the range that's also in the same
        * memory handle as our current starting byte.  We start with
@@ -56,7 +66,10 @@ __djgpp_map_physical_memory (void *_our_addr, unsigned long _num_bytes,
 	  /* Find the memory handle corresponding to this test byte. */
 	  d2 = __djgpp_memory_handle (handle_end_addr);
 	  if (d2 == NULL)
-	    goto fail;
+            {
+              errno = EINVAL;
+              goto fail;
+            }
 
 	  /* Is this test byte in the same handle as the first byte? */
 	  if (d2->handle == d->handle)
@@ -72,7 +85,29 @@ __djgpp_map_physical_memory (void *_our_addr, unsigned long _num_bytes,
       if (__dpmi_map_device_in_memory_block (&meminfo,
 					     (_phys_addr
 					      + (p - (unsigned) _our_addr))))
-	goto fail;
+        {
+          switch (__dpmi_error)
+            {
+              case 0x0508: /* Unsupported function (returned by DPMI 0.9 host, error number is same as DPMI function number) */
+              case 0x8001: /* Unsupported function (returned by DPMI 1.0 host) */
+                errno = ENOSYS;
+                break;
+              case 0x8003: /* System integrity (invalid device address) */
+                errno = ENXIO;
+                break;
+              case 0x8010: /* Resource unavailable (DPMI host cannot allocate internal resources to complete an operation) */
+                errno = ENOMEM;
+                break;
+              case 0x8023: /* Invalid handle (in ESI) */
+              case 0x8025: /* Invalid linear address (specified range is not within specified block or EBX/EDX is not page-aligned) */
+                errno = EINVAL;
+                break;
+              default: /* Other unspecified error */
+                errno = EACCES;
+                break;
+            }
+          goto fail;
+        }
 
       /* Move on to the next memory handle. */
       p = handle_end_addr;
@@ -82,6 +117,5 @@ __djgpp_map_physical_memory (void *_our_addr, unsigned long _num_bytes,
   return 0;
 
  fail:
-  errno = EACCES;
   return -1;
 }

src/libc/dpmi/helper/mapmem.txh

@@ -48,8 +48,7 @@ Even on failure, this routine may affect a subset of the pages specified.
 @subheading Return Value
 
 0 on success, -1 on failure.  On failure, @code{errno} will be set to
-@code{EINVAL} for illegal input parameters, or @code{EACCES} if the
-DPMI server rejected the mapping request.
+appropriate errno code and @code{__dpmi_error} to DPMI error code.
 
 @subheading Portability
 

src/libc/dpmi/helper/setattr.c

@@ -51,14 +51,14 @@ __djgpp_set_page_attributes (void *_our_addr, unsigned long _num_bytes,
       d = __djgpp_memory_handle (p);
       if (d == NULL)
         {
-          errno = EFAULT;
+          errno = EINVAL;
           goto fail;
         }
 
       /* Base address of the memory handle must be page aligned too. */
       if (d->address & 0xfff)
         {
-          errno = EFAULT;
+          errno = EINVAL;
           goto fail;
         }
 
@@ -79,7 +79,7 @@ __djgpp_set_page_attributes (void *_our_addr, unsigned long _num_bytes,
 	  d2 = __djgpp_memory_handle (handle_end_addr);
 	  if (d2 == NULL)
             {
-              errno = EFAULT;
+              errno = EINVAL;
               goto fail;
             }
 
@@ -107,13 +107,11 @@ __djgpp_set_page_attributes (void *_our_addr, unsigned long _num_bytes,
               case 0x8014: /* Backing store unavailable */
                 errno = ENOMEM;
                 break;
-              case 0x8021: /* Invalid value (illegal request in bits 0-2 of one or more page attribute words) */
-                errno = EINVAL;
-                break;
               case 0x8002: /* Invalid state (page in wrong state for request) */
+              case 0x8021: /* Invalid value (illegal request in bits 0-2 of one or more page attribute words) */
               case 0x8023: /* Invalid handle (in ESI) */
               case 0x8025: /* Invalid linear address (specified range is not within specified block) */
-                errno = EFAULT;
+                errno = EINVAL;
                 break;
               default: /* Other unspecified error */
                 errno = EACCES;

src/libc/dpmi/helper/setattr.txh

@@ -20,7 +20,7 @@ Every page in the specified address range that begins at @var{out_addr}
 must belong to some DPMI handle in @code{__djgpp_memory_handle_list} which
 is managed by @code{sbrk} allocator (memory pointer can be obtained by
 e.g.@: @code{valloc}).  If some page does not belong to some DJGPP DPMI
-handle, @code{errno} will be set to @code{EFAULT} and the routine will fail.
+handle, @code{errno} will be set to @code{EINVAL} and the routine will fail.
 
 Consult DPMI documentation on function 0507H for the meaning of the
 @var{attributes} argument.  Note: since 0507H is a DPMI service new