Merge branch 'master' into jwt27

Author: jwt27

src/libc/dpmi/api/d0507.S

@@ -15,10 +15,30 @@
 	movl	8(%eax), %ebx
 	movl	ARG2, %edx
 
-	DPMI(0x0507)
+	movw	$0x0507, %ax
+	int	$0x31
 
+	jnc	L_noerror
 	movl	ARG1, %edx
+
+	/*
+	 * Check if output ecx (number of modified pages) is valid.
+	 * It has to be less than input ecx (total number of pages)
+	 * as modification of some pages at this point failed. If
+	 * output ecx is invalid then set it to zero as in this case
+	 * probably no page was modified by DPMI host (otherwise it
+	 * would have set the valid number of modified pages).
+	 */
+	cmpl	%ecx, 4(%edx)
+	ja	L_ecxvalid
+	xorl	%ecx, %ecx
+L_ecxvalid:
+
 	movl	%ecx, 4(%edx)
+	movw	%ax, ___dpmi_error
+	movl	$-1, %eax
+	jmp	L_leave
+L_noerror:
 
 	xorl	%eax,%eax
 

src/libc/dpmi/api/d0507.txh

@@ -25,6 +25,13 @@ words which specify the new attributes.
 @xref{__dpmi_get_page_attributes}, for the definition of the page
 attribute word.
 
+On error this function changes @code{@var{info}->size} to the number
+of modified pages as reported by DPMI function AX = 0x0507.  If DPMI
+function reports that all the input pages were modified, or more pages
+than the input number of pages were modified, then that is treated as
+invalid value reported by DPMI function, and so this functions changes
+@code{@var{info}->size} to 0, as probably no page was modified.
+
 The DJGPP startup code calls this function to uncommit the so-called
 @dfn{null page}, the first 4KB of the program's address space.  This
 causes @code{NULL} pointer dereferences, a frequent programmatic error,

src/libc/dpmi/helper/mapmem.txh

@@ -60,28 +60,28 @@ DPMI server rejected the mapping request.
 @example
 void *my_page_aligned_memory = valloc (16384);
 if (!my_page_aligned_memory)
-{
+@{
   printf ("Failed to allocate page-aligned memory!\n");
   return;
-}
+@}
 
 if (__djgpp_map_physical_memory (my_page_aligned_memory, 16384,
                                  0x40000000))
-{
+@{
   printf ("Failed to map physical addresses!\n");
-}
+@}
 else
-{
+@{
   /* code which access mapped my_page_aligned_memory */
-}
+@}
 
 if (__djgpp_set_page_attributes (my_page_aligned_memory, 16384,
                                  (0<<4) | (1<<3) | 1))
-{
+@{
   printf ("Failed to unmap physical addresses!\n");
-}
+@}
 else
-{
+@{
   free (my_page_aligned_memory);
-}
+@}
 @end example

src/libc/dpmi/helper/setattr.c

@@ -28,7 +28,7 @@ __djgpp_set_page_attributes (void *_our_addr, unsigned long _num_bytes,
       || ((_attributes & 0x3) == 2))
     {
       errno = EINVAL;
-      return -1;
+      goto fail;
     }
 
   /* Set up an array of page attribute information. */
@@ -50,7 +50,17 @@ __djgpp_set_page_attributes (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 = EFAULT;
+          goto fail;
+        }
+
+      /* Base address of the memory handle must be page aligned too. */
+      if (d->address & 0xfff)
+        {
+          errno = EFAULT;
+          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
@@ -68,7 +78,10 @@ __djgpp_set_page_attributes (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 = EFAULT;
+              goto fail;
+            }
 
 	  /* Is this test byte in the same handle as the first byte? */
 	  if (d2->handle == d->handle)
@@ -81,9 +94,33 @@ __djgpp_set_page_attributes (void *_our_addr, unsigned long _num_bytes,
       meminfo.handle  = d->handle;
       meminfo.size    = num_pages2;
       meminfo.address = p - d->address;
-      if (__dpmi_set_page_attributes (&meminfo, attr)
-	  || meminfo.size != num_pages2)
-	goto fail;
+      if (__dpmi_set_page_attributes (&meminfo, attr))
+        {
+          switch (__dpmi_error)
+            {
+              case 0x0507: /* 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 0x8010: /* Resource unavailable (DPMI host cannot allocate internal resources to complete an operation) */
+              case 0x8013: /* Physical memory unavailable */
+              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 0x8023: /* Invalid handle (in ESI) */
+              case 0x8025: /* Invalid linear address (specified range is not within specified block) */
+                errno = EFAULT;
+                break;
+              default: /* Other unspecified error */
+                errno = EACCES;
+                break;
+            }
+          goto fail;
+        }
 
       /* Move on to the next memory handle. */
       p = handle_end_addr;
@@ -93,6 +130,5 @@ __djgpp_set_page_attributes (void *_our_addr, unsigned long _num_bytes,
   return 0;
 
  fail:
-  errno = EACCES;
   return -1;
 }

src/libc/pc_hw/nearptr/nearptr.c

@@ -14,7 +14,10 @@ int __djgpp_nearptr_enable(void)
 {
   if(!__dpmi_set_segment_limit(_my_ds(), 0xffffffffU)) {
     if(__dpmi_get_segment_limit(_my_ds()) != 0xffffffffU)
+    {
+      __dpmi_set_segment_limit(_my_ds(), __djgpp_selector_limit | 0xfff);
       return 0;		/* We set it but DPMI ignored/truncated it */
+    }
     __dpmi_set_segment_limit(__djgpp_ds_alias, 0xffffffffU);
     __dpmi_set_segment_limit(_my_cs(), 0xffffffffU);
     _crt0_startup_flags |= _CRT0_FLAG_NEARPTR;