Add forgotten unpack.c file.

osfree-project · Jun 18, 2020 · 842b1177761bd3d5364e90b1e7ca09f9e47c15ab · 842b117
1 parent bc8d222
commit 842b1177761bd3d5364e90b1e7ca09f9e47c15ab
diff --git a/filesys/os2/ansi.exe b/filesys/os2/ansi.exe
diff --git a/filesys/os2/argenv.exe b/filesys/os2/argenv.exe
diff --git a/filesys/os2/awk.exe b/filesys/os2/awk.exe
diff --git a/filesys/os2/cat.exe b/filesys/os2/cat.exe
diff --git a/filesys/os2/cls.exe b/filesys/os2/cls.exe
diff --git a/filesys/os2/cmd.exe b/filesys/os2/cmd.exe
diff --git a/filesys/os2/comp.exe b/filesys/os2/comp.exe
diff --git a/filesys/os2/cut.exe b/filesys/os2/cut.exe
diff --git a/filesys/os2/doscalls.dll b/filesys/os2/doscalls.dll
diff --git a/filesys/os2/edtname.exe b/filesys/os2/edtname.exe
diff --git a/filesys/os2/emx.dll b/filesys/os2/emx.dll
diff --git a/filesys/os2/emxlibcs.dll b/filesys/os2/emxlibcs.dll
diff --git a/filesys/os2/fc.exe b/filesys/os2/fc.exe
diff --git a/filesys/os2/find.exe b/filesys/os2/find.exe
diff --git a/filesys/os2/fp.exe b/filesys/os2/fp.exe
diff --git a/filesys/os2/get.exe b/filesys/os2/get.exe
diff --git a/filesys/os2/get2.exe b/filesys/os2/get2.exe
diff --git a/filesys/os2/get3.exe b/filesys/os2/get3.exe
diff --git a/filesys/os2/gnuintl.dll b/filesys/os2/gnuintl.dll
diff --git a/filesys/os2/gnutu.dll b/filesys/os2/gnutu.dll
diff --git a/filesys/os2/infoblocks.exe b/filesys/os2/infoblocks.exe
diff --git a/filesys/os2/kbdcalls.dll b/filesys/os2/kbdcalls.dll
diff --git a/filesys/os2/libuni.dll b/filesys/os2/libuni.dll
diff --git a/filesys/os2/makeini.exe b/filesys/os2/makeini.exe
diff --git a/filesys/os2/mem.exe b/filesys/os2/mem.exe
diff --git a/filesys/os2/mem2.exe b/filesys/os2/mem2.exe
diff --git a/filesys/os2/mem3.exe b/filesys/os2/mem3.exe
diff --git a/filesys/os2/mini33.exe b/filesys/os2/mini33.exe
diff --git a/filesys/os2/minicmd-mini.exe b/filesys/os2/minicmd-mini.exe
diff --git a/filesys/os2/minicmd.exe b/filesys/os2/minicmd.exe
diff --git a/filesys/os2/minicmd3.exe b/filesys/os2/minicmd3.exe
diff --git a/filesys/os2/moncalls.dll b/filesys/os2/moncalls.dll
diff --git a/filesys/os2/more.exe b/filesys/os2/more.exe
diff --git a/filesys/os2/moucalls.dll b/filesys/os2/moucalls.dll
diff --git a/filesys/os2/msg.dll b/filesys/os2/msg.dll
diff --git a/filesys/os2/nls.dll b/filesys/os2/nls.dll
diff --git a/filesys/os2/pmmerge.dll b/filesys/os2/pmmerge.dll
diff --git a/filesys/os2/pmshapi.dll b/filesys/os2/pmshapi.dll
diff --git a/filesys/os2/pmwin.dll b/filesys/os2/pmwin.dll
diff --git a/filesys/os2/putmsg.exe b/filesys/os2/putmsg.exe
diff --git a/filesys/os2/quecalls.dll b/filesys/os2/quecalls.dll
diff --git a/filesys/os2/scanenv.exe b/filesys/os2/scanenv.exe
diff --git a/filesys/os2/sed.exe b/filesys/os2/sed.exe
diff --git a/filesys/os2/sesmgr.dll b/filesys/os2/sesmgr.dll
diff --git a/filesys/os2/sort.exe b/filesys/os2/sort.exe
diff --git a/filesys/os2/sub32.dll b/filesys/os2/sub32.dll
diff --git a/filesys/os2/thread.exe b/filesys/os2/thread.exe
diff --git a/filesys/os2/uconv.dll b/filesys/os2/uconv.dll
diff --git a/filesys/os2/unzip.exe b/filesys/os2/unzip.exe
diff --git a/filesys/os2/utlapi.dll b/filesys/os2/utlapi.dll
diff --git a/filesys/os2/ver.exe b/filesys/os2/ver.exe
diff --git a/filesys/os2/viocalls.dll b/filesys/os2/viocalls.dll
diff --git a/filesys/os2/wmake.exe b/filesys/os2/wmake.exe
diff --git a/filesys/os2/zip-emx.exe b/filesys/os2/zip-emx.exe
diff --git a/platform/l4env/patches/Makefile b/platform/l4env/patches/Makefile
@@ -7,7 +7,8 @@ include $(REP_DIR)/mk/osfree.mk
 # contain a Makefile. If you need to change this, uncomment the following
 # line and adapt it.
 
-PATCHES = l4rm l4vfs modes modules-max
+PATCHES = l4rm l4vfs modes modules-max \
+          force-ds-es ldtsize
 
 apply:
 	@cd $(ROOT) && for file in $(PATCHES); do \

diff --git a/platform/l4env/patches/force-ds-es.patch b/platform/l4env/patches/force-ds-es.patch
@@ -0,0 +1,13 @@
+--- kernel/fiasco/src/kern/shared/entry-ia32-ux-o.S	2020-05-16 03:12:41.540635820 +0300
++++ kernel/fiasco/src/kern/shared/entry-ia32-ux.S	2020-05-16 02:55:23.784611157 +0300
+@@ -179,7 +179,9 @@
+ 	CHECK_SANITY 60(%esp)		/* scratches ecx */
+ 	RESET_USER_SEGMENTS 60(%esp),in_cli  /* scratches ecx */
+
+-	addl	$4*2,%esp		/* Pop ds, es segment registers */
++	/* addl	$4*2,%esp */		/* Pop ds, es segment registers */
++        popl	%es			/* vs */
++        popl	%ds			/* vs */
+ 	popl	REG_GS
+ 	popl	%fs			/* Restore segment registers */
+ 	popa
diff --git a/platform/l4env/patches/ldtsize.patch b/platform/l4env/patches/ldtsize.patch
@@ -0,0 +1,18 @@
+--- kernel/fiasco/src/kern/shared/thread-ia32-amd64-o.cpp	2020-05-16 03:16:31.056641275 +0300
++++ kernel/fiasco/src/kern/shared/thread-ia32-amd64.cpp	2020-05-16 03:18:36.200644249 +0300
+@@ -730,11 +730,12 @@
+   // Allocate the memory if needed
+   // LDT maximum size is one page, anything else causes too much headache
+   if (!s->ldt_addr())
+-    s->ldt_addr(Mapped_allocator::allocator()->alloc(Config::PAGE_SHIFT));
++    s->ldt_addr(Mapped_allocator::allocator()->alloc(Config::PAGE_SHIFT + 4));
+
+-  if (entry_number * Cpu::Ldt_entry_size + size > Config::PAGE_SIZE)
++  // size is hardcoded
++  if (entry_number * Cpu::Ldt_entry_size + size > Config::PAGE_SIZE * 16)
+     {
+-      WARN("set_ldt: LDT size exceeds one page, not supported.");
++      WARN("set_ldt: LDT size exceeds 65536 bytes, not supported.");
+       return 0;
+     }
+
diff --git a/platform/l4env/tools/menu.lst b/platform/l4env/tools/menu.lst
@@ -1,4 +1,4 @@
-default 4
+default 5
 
 set ROOT   = (nd)
 set T      = $(ROOT)/tftpboot
@@ -92,10 +92,10 @@ module $(B)/simple_file_server -v 14
 #  module $(B)/os2/libuni.dll
   module $(B)/os2/utlapi.dll
 #  module $(B)/os2/pmwin.dll
-#  module $(B)/os2/pmmerge.dll
-#  module $(B)/os2/pmshapi.dll
+  module $(B)/os2/pmmerge.dll
+  module $(B)/os2/pmshapi.dll
   module $(B)/os2/cat.exe
-  module $(B)/os2/cut.exe
+#  module $(B)/os2/cut.exe
 #  module $(B)/os2/putmsg.exe
 #  module $(B)/os2/ansi.exe
 #  module $(B)/os2/sed.exe
@@ -114,7 +114,7 @@ module $(B)/simple_file_server -v 14
 #  module $(B)/os2/unzip.exe
   module $(B)/os2/minicmd.exe
   module $(B)/os2/mini33.exe
-  module $(B)/os2/argenv.exe
+#  module $(B)/os2/argenv.exe
 #  module $(B)/os2/scanenv.exe
 #  module $(B)/os2/edtname.exe
   module $(B)/os2/sort.exe

diff --git a/platform/l4re/build.cfg b/platform/l4re/build.cfg
@@ -19,7 +19,7 @@ l4api = l4f
 MEM = 64
 # VNC display to connect to qemu VM
 # DISP = -display vnc=172.30.0.101:2
-DISP = -display sdl
+DISP = -display gtk
 
 # virtualization acceleration
 ACCEL=-no-kvm

diff --git a/shared/app/os2app/kal/kal.c b/shared/app/os2app/kal/kal.c
@@ -621,10 +621,10 @@ long attach_module (ULONG hmod, unsigned long long area)
   //l4_threadid_t pager;
   unsigned short type;
   unsigned long index;
-  unsigned char acc;
+  unsigned char acc, acc2;
   unsigned long base, size;
   struct desc    desc;
-  int            i;
+  int            i = 0, j = 0, l;
   ULONG rc;
 
   io_log("attach_module: area=%llx, hmod=%lx\n", area, hmod);
@@ -664,37 +664,50 @@ long attach_module (ULONG hmod, unsigned long long area)
       rc = attach_ds_area (ds, area, flags, addr);
 
       // object requires 16:16 alias or is a data segment
-      if ( (sect.flags & OBJALIAS16) || (type & SECTYPE_WRITE) )
+      //if ( (sect.flags & OBJALIAS16) || (sect.flags & OBJBIGDEF) )
       {
         // descriptor access bits
         if (type & SECTYPE_EXECUTE)
           acc = 0xfa;
         else
-          acc = 0xf3;
+          acc = 0xf2;
+
+        if (sect.flags & OBJBIGDEF)
+          acc2 = 0x04;
+        else
+          acc2 = 0;
 
         io_log("type=%x, sect.flags=%lx\n", type, sect.flags);
         io_log("acc=%x\n", acc);
 
+        j = i;
         i = (unsigned long)addr >> 16;
 
         base = i << 16;
         io_log("ds %x @ %x, size %u\n", ds.ds.id, addr, size);
         io_log("base=%x\n", base);
 
         desc.limit_lo = (size - 1) & 0xffff; desc.limit_hi = (size - 1) >> 16;
-        desc.acc_lo   = acc;           desc.acc_hi   = 0;
+        desc.acc_lo   = acc;           desc.acc_hi   = acc2;
         desc.base_lo1 = base & 0xffff;
         desc.base_lo2 = (base >> 16) & 0xff;
         desc.base_hi  = base >> 24;
 
-        segment_ldt_set(&desc, sizeof(struct desc), i, me);
+        io_log("size - 1=%x\n", size - 1);
+        io_log("desc.limit_lo=%x\n", desc.limit_lo);
+        io_log("i=%x, j=%x\n", i, j);
+
+        if (i > j) // if we have a new 16-bit seg
+        {
+            segment_ldt_set(&desc, sizeof(struct desc), i, me);
+        }
 
         // touch page ro
-        if (sect.flags & OBJALIAS16)
+        //if ( (sect.flags & OBJALIAS16) || (sect.flags & OBJBIGDEF) )
         {
             volatile char *p = base;
 
-            for (i = 0, p = (char *)base; i < size; i++, p++)
+            for (l = 0, p = (char *)base; l < size; l++, p++)
                 *p;
         }
       }

diff --git a/shared/app/os2app/kal/start.c b/shared/app/os2app/kal/start.c
@@ -61,7 +61,7 @@ trampoline(struct param *param)
 
   /* Prepare TIB GDT descriptor */
   desc.limit_lo = 0x30; desc.limit_hi = 0;
-  desc.acc_lo   = 0xF3; desc.acc_hi   = 0;
+  desc.acc_lo   = 0xf2; desc.acc_hi   = 0x04; // 32-bit
   desc.base_lo1 = base & 0xffff;
   desc.base_lo2 = (base >> 16) & 0xff;
   desc.base_hi  = base >> 24;
@@ -83,7 +83,7 @@ trampoline(struct param *param)
   io_log("stack top: %x\n", param->esp);
 
   /* We have changed the stack so it now points to our LX image. */
-  //enter_kdebug("debug");
+  enter_kdebug("debug");
   old_sel = tramp(argv, envp, hmod, tib_sel, param->eip);
 
   STKOUT
@@ -126,6 +126,18 @@ unsigned long ulActual;
 char *p = buf;
 int i;
 
+#pragma pack(1)
+
+typedef struct
+{
+    unsigned short limit;
+    unsigned long  base;
+} ldtr;
+
+ldtr ldt = {0};
+
+#pragma pack()
+
 APIRET CDECL KalStartApp(struct options *opts, char *pszLoadError, ULONG cbLoadError)
 {
   // create LDT for tiled area
@@ -135,8 +147,8 @@ APIRET CDECL KalStartApp(struct options *opts, char *pszLoadError, ULONG cbLoadE
 
       base = i * size;
 
-      desc.limit_lo = size & 0xffff; desc.limit_hi = size >> 16;
-      desc.acc_lo   = 0xF3;          desc.acc_hi   = 0;
+      desc.limit_lo = (size - 1) & 0xffff; desc.limit_hi = (size - 1) >> 16;
+      desc.acc_lo   = 0xf2;                desc.acc_hi   = 0;
       desc.base_lo1 = base & 0xffff;
       desc.base_lo2 = (base >> 16) & 0xff;
       desc.base_hi  = base >> 24;
@@ -163,6 +175,12 @@ APIRET CDECL KalStartApp(struct options *opts, char *pszLoadError, ULONG cbLoadE
   io_log("eip: %x\n", s.ip);
   io_log("esp: %x\n", s.sp);
 
+  //asm volatile("sldt  %[ldt]\n\t"
+    //           ::[ldt] "m" (ldt));
+
+  //io_log("ldt.base=%lx\n", ldt.base);
+  //io_log("ldt.limit=%x\n", ldt.limit);
+
   param.eip = s.ip;
   param.esp = s.sp;
 

diff --git a/shared/lib/ixf/lx/allocmem.c b/shared/lib/ixf/lx/allocmem.c
@@ -1,5 +1,5 @@
 //
-// Memory allocation work in following logic:
+// Memory allocation works in the following logic:
 //   1. Get region of memory using l4dm_mem_open
 //   2. After memory opened we need to map pages
 // Map can be done page by page. Whole region can't be mapped if it large of L4_PAGESIZE

diff --git a/shared/lib/ixf/lx/loadobj.c b/shared/lib/ixf/lx/loadobj.c
@@ -159,7 +159,7 @@ void *vm_alloc_obj_lx(IXFModule *ixfModule, struct o32_obj *lx_obj)
         #ifndef __OS2__
             #include <os3/allocmem.h>
 
-            if (lx_obj->o32_flags & OBJALIAS16)
+            //if (lx_obj->o32_flags & OBJALIAS16)
             {
                 align = 16; // align 16-bit segments to 64k boundary
             }
@@ -336,6 +336,8 @@ void apply_internal_fixup(struct LX_module *lx_exe_mod, struct r32_rlc *min_rlc,
     unsigned long vm_start_target_obj;
     unsigned long vm_source;
     unsigned long vm_target;
+    int trg_off_size = 0;
+    int object_size = 0;
     int i, cnt;
 
     if (min_rlc->nr_flags & 0x04) // additive present
@@ -347,24 +349,21 @@ void apply_internal_fixup(struct LX_module *lx_exe_mod, struct r32_rlc *min_rlc,
     if (additive_size)
         addit = get_additive_rlc(min_rlc);
 
-    if (min_rlc->nr_stype & NRCHAIN)
-    {
-        int trg_off_size = 0;
-        int object_size = 0;
-
-        if (min_rlc->nr_flags & 0x10) // 32-bit target offset flag
-            trg_off_size = 4;
-        else
-            trg_off_size = 2;
+    if (min_rlc->nr_flags & 0x10) // 32-bit target offset flag
+        trg_off_size = 4;
+    else
+        trg_off_size = 2;
 
-        if ( (min_rlc->nr_stype & NRSRCMASK) == 0x02) // 16-bit selector fixup
-            trg_off_size = 0;
+    if ( (min_rlc->nr_stype & NRSRCMASK) == 0x02) // 16-bit selector fixup
+        trg_off_size = 0;
 
-        if (min_rlc->nr_flags & 0x40) // 16-bit object number/module ordinal flag
-            object_size = 2;
-        else
-            object_size = 1;
+    if (min_rlc->nr_flags & 0x40) // 16-bit object number/module ordinal flag
+        object_size = 2;
+    else
+        object_size = 1;
 
+    if (min_rlc->nr_stype & NRCHAIN)
+    {
         short *srcoff = (short *)
             ((char *)min_rlc + 3 * 1 + object_size + trg_off_size + additive_size);
 
@@ -376,7 +375,14 @@ void apply_internal_fixup(struct LX_module *lx_exe_mod, struct r32_rlc *min_rlc,
         vm_start_target_obj = target_object->o32_base;
 
         /* Get address of target offset and put in source offset. */
-        vm_target = vm_start_target_obj + get_imp_ord1_rlc(min_rlc) + addit;
+        vm_target = vm_start_target_obj + addit;
+
+        if (trg_off_size)
+        {
+            // 16-bit selector fixup has target offset missing
+            vm_target += get_imp_ord1_rlc(min_rlc);
+        }
+
         cnt = get_srcoff_cnt1_rlc(min_rlc);
 
         //io_log("!src=%02x, trg=%02x, cnt=%02x, obj#=%02x, trgoff=%04x, addit=%d\nsrcoffs = ",
@@ -404,9 +410,17 @@ void apply_internal_fixup(struct LX_module *lx_exe_mod, struct r32_rlc *min_rlc,
         vm_start_target_obj = target_object->o32_base;
 
         /* Get address of target offset and put in source offset. */
-        vm_target = vm_start_target_obj + get_imp_ord1_rlc(min_rlc) + addit;
+        vm_target = vm_start_target_obj + addit;
+
+        if (trg_off_size)
+        {
+            // 16-bit selector fixup has target offset missing
+            vm_target += get_imp_ord1_rlc(min_rlc);
+        }
+
         vm_source = vm_start_of_page + srcoff_cnt1;
 
+        //io_log("vm_target=%x, vm_start_target_obj=%x, get_imp_ord1_rlc(min_rlc)=%x, addit=%x\n", vm_target, vm_start_target_obj, get_imp_ord1_rlc(min_rlc), addit);
         //io_log("!src=%02x, trg=%02x, srcoff=%04x, obj#=%02x, trgoff=%04x, addit=%d\n",
         //        min_rlc->nr_stype, min_rlc->nr_flags, srcoff_cnt1,
         //        min_rlc->r32_objmod, get_imp_ord1_rlc(min_rlc), addit);
@@ -606,8 +620,14 @@ void apply_internal_entry_table_fixup(struct LX_module *lx_exe_mod, struct r32_r
     }
 }
 
+
 void apply_fixup(int type, unsigned long vm_source, unsigned long vm_target)
 {
+    unsigned short flat_cs;
+
+    asm volatile("movw %%cs, %%ax\n\t"
+                 "movw %%ax, %[flat_cs]\n\t"::[flat_cs] "m" (flat_cs));
+
     switch (type)
     {
         case 0x00: // 8-bit fixup
@@ -624,6 +644,8 @@ void apply_fixup(int type, unsigned long vm_source, unsigned long vm_target)
                 unsigned short *ptr_source;
                 unsigned long ptr = flat2sel(vm_target);
 
+                //io_log("^^^ vm_target=%x\n", vm_target);
+
                 ptr_source = (unsigned short *)vm_source;
                 *ptr_source = (unsigned short)(ptr >> 16);
             }
@@ -652,11 +674,11 @@ void apply_fixup(int type, unsigned long vm_source, unsigned long vm_target)
         case 0x06: // 16:32 pointer fixup
             {
                 unsigned short *ptr_source;
-                unsigned long ptr = flat2sel(vm_target);
 
                 ptr_source = (unsigned short *)vm_source;
-                *ptr_source++ = (unsigned short)(ptr >> 16);
                 *(unsigned long *)ptr_source = vm_target;
+                ptr_source += 2;
+                *ptr_source = flat_cs;
             }
             break;
 

diff --git a/shared/lib/ixf/lx/lx.c b/shared/lib/ixf/lx/lx.c
@@ -644,7 +644,7 @@ int convert_imp_fixup_obj_lx(IXFModule *ixfModule,
     //int object1;
     int addit = 0;
     int additive_size = 0;
-    int srcoff_cnt1;
+    short srcoff_cnt1;
     //int fixup_source_flag;
     int fixup_source;
     int fixup_offset;
@@ -701,6 +701,9 @@ int convert_imp_fixup_obj_lx(IXFModule *ixfModule,
         */
         while (fixup_offset < pg_end_offs_fix)
         {
+            addit = 0;
+            additive_size = 0;
+
             //io_log("fixup_offset=%lx\n", fixup_offset);
             min_rlc = get_fixup_rec_tbl_obj(lx_exe_mod, fixup_offset);
             //io_log("min_rlc=%lx\n", min_rlc);
@@ -755,7 +758,7 @@ int convert_imp_fixup_obj_lx(IXFModule *ixfModule,
 
                     if (min_rlc->nr_stype & NRCHAIN)
                     {
-                        unsigned short *srcoff = (unsigned short *)
+                        short *srcoff = (short *)
                             ((char *)min_rlc + 3 * 1 + mod_ord_size +
                             import_ord_size + additive_size);
 
@@ -764,7 +767,7 @@ int convert_imp_fixup_obj_lx(IXFModule *ixfModule,
                             srcoff_cnt1 = srcoff[i];
                             io_log("mod_ord_size=%u, import_ord_size=%u, additive_size=%u\n",
                                    mod_ord_size, import_ord_size, additive_size);
-                            io_log("srcoff[%i]=%x, \n", i, srcoff[i]);
+                            io_log("srcoff[%i]=%x\n", i, srcoff[i]);
 
                             ixfModule->Fixups[*fixup_counter].flags = min_rlc->nr_stype & 0xf;
                             ixfModule->Fixups[*fixup_counter].SrcVmAddress = (void *)(vm_start_of_page + srcoff_cnt1);
@@ -832,7 +835,7 @@ int convert_imp_fixup_obj_lx(IXFModule *ixfModule,
 
                     if (min_rlc->nr_stype & NRCHAIN)
                     {
-                        unsigned short *srcoff = (unsigned short *)
+                        short *srcoff = (short *)
                             ((char *)min_rlc + 3 * 1 + mod_ord_size +
                             proc_name_off_size + additive_size);