Changeset 1673

Timestamp:

02/17/98 01:45:18 (11 years ago)

Author:

himi

Message:

Meadow--Multilingual Enhancement to GNU Emacs with ADvantages Over Windows

Files:

• branches/GNU/src/unexelf1.c (added)
• branches/GNU/src/unexencap.c (added)
• branches/GNU/src/unexenix.c (added)
• branches/GNU/src/unexfx2800.c (added)
• branches/GNU/src/unexhp9k800.c (modified) (1 diff)
• branches/GNU/src/unexmips.c (added)
• branches/GNU/src/unexnext.c (added)
• branches/GNU/src/unexsgi.c (modified) (4 diffs)
• branches/GNU/src/unexsni.c (modified) (7 diffs)
• branches/GNU/src/unexsunos4.c (modified) (3 diffs)
• branches/GNU/src/unexw32.c (modified) (24 diffs)
• branches/GNU/src/vlimit.h (added)
• branches/GNU/src/vm-limit.c (modified) (1 diff)
• branches/GNU/src/vms-pp.c (added)
• branches/GNU/src/vms-pp.trans (added)
• branches/GNU/src/vms-pwd.h (added)
• branches/GNU/src/vmsdir.h (added)
• branches/GNU/src/vmsfns.c (added)
• branches/GNU/src/vmsgmalloc.c (added)

branches/GNU/src/unexhp9k800.c

@@ -38 +38 @@
-*/
-
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <a.out.h>
+
-#ifdef emacs
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <a.out.h>
-
-#ifdef HPUX_USE_SHLIBS

branches/GNU/src/unexsgi.c

@@ -413 +413 @@
- */
-
-#include <config.h>
-#include <sys/types.h>
-#include <stdio.h>
@@ -760 +759 @@
-        }
-      else
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-      /* If any section hdr refers to the section after the new .data
-         section, make it refer to next one because we have inserted 
@@ -790 +787 @@
-         ".data" in the strings table) get copied from the current process
-         instead of the old file.  */
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        src = (caddr_t) OLD_SECTION_H (n).sh_addr;
-      else
@@ -872 +860 @@
-          for (; num--; sym++)
-            {
-              /* don't patch special section indices. */
-              if (sym->st_shndx == SHN_UNDEF
-
+
+
-                continue;
-        

branches/GNU/src/unexsni.c

@@ -23 +23 @@
-You are forbidden to forbid anyone else to use, share and improve
-what you give them.   Help stamp out software-hoarding!  */
+
-
-/*
@@ -117 +118 @@
- * New modifications for Siemens Nixdorf's MIPS-based machines.
- * Marco.Walther@mch.sni.de
- * marco@inreach.com
- *
- * The problem: Before the bss segment we have a so called sbss segment
@@ -306 +306 @@
-#include <elf.h>
-#include <sys/mman.h>
-#include <assert.h>
-
-/* #define DEBUG */
-
-#ifndef emacs
@@ -387 +384 @@
-  Elf32_Addr new_data3_addr;
-
-
-  Elf32_Addr old_rel_dyn_addr;
-  Elf32_Word old_rel_dyn_size;
-  int old_rel_dyn_index;
-
-  Elf32_Word old_sdata_size, new_sdata_size;
-  int old_sdata_index = 0;
@@ -471 +463 @@
-  if (old_sbss_index != (old_bss_index - 1))
-    fatal (".sbss should come immediately before .bss in %s.\n", old_name, 0);
-
-  /* Find the old .rel.dyn section.
-   */
-
-  for (old_rel_dyn_index = 1; old_rel_dyn_index < old_file_h->e_shnum;
-       old_rel_dyn_index++)
-    {
-#ifdef DEBUG
-      fprintf (stderr, "Looking for .rel.dyn - found %s\n",
-               old_section_names + OLD_SECTION_H(old_rel_dyn_index).sh_name);
-#endif
-      if (!strcmp (old_section_names + OLD_SECTION_H(old_rel_dyn_index).sh_name,
-                   ".rel.dyn"))
-        break;
-    }
-  if (old_rel_dyn_index == old_file_h->e_shnum)
-    fatal ("Can't find .rel_dyn in %s.\n", old_name, 0);
-
-  old_rel_dyn_addr = OLD_SECTION_H(old_rel_dyn_index).sh_addr;
-  old_rel_dyn_size = OLD_SECTION_H(old_rel_dyn_index).sh_size;
-
-  /* Figure out parameters of the new data3 and data2 sections.
@@ -545 +517 @@
-  fprintf (stderr, "old_sbss_addr %x\n", old_sbss_addr);
-  fprintf (stderr, "old_sbss_size %x\n", old_sbss_size);
-  fprintf (stderr, "old_rel_dyn_addr %x\n", old_rel_dyn_addr);
-  fprintf (stderr, "old_rel_dyn_size %x\n", old_rel_dyn_size);
-  if (old_sdata_index)
-    {
@@ -847 +817 @@
-        }
-    }
-  {
-    Elf32_Rel *rel_p;
-    unsigned int old_data_addr_start;
-    unsigned int old_data_addr_end;
-    unsigned int old_data_offset;
-    unsigned int new_data_offset;
-    int i;
-
-    rel_p = (Elf32_Rel *)OLD_SECTION_H(old_rel_dyn_index).sh_addr;
-    old_data_addr_start = OLD_SECTION_H(old_data_index).sh_addr;
-    old_data_addr_end = old_data_addr_start +
-      OLD_SECTION_H(old_data_index).sh_size;
-    old_data_offset = (int)OLD_SECTION_H(old_data_index).sh_offset +
-      (unsigned int)old_base;
-    new_data_offset = (int)NEW_SECTION_H(old_data_index).sh_offset +
-      (unsigned int)new_base;
-
-#ifdef DEBUG
-    fprintf(stderr, "old_data.sh_addr= 0x%08x ... 0x%08x\n", old_data_addr_start,
-            old_data_addr_end);
-#endif /* DEBUG */
-
-    for (i = 0; i < old_rel_dyn_size/sizeof(Elf32_Rel); i++)
-      {
-#ifdef DEBUG
-        fprintf(stderr, ".rel.dyn offset= 0x%08x  type= %d  sym= %d\n",
-                rel_p->r_offset, ELF32_R_TYPE(rel_p->r_info), ELF32_R_SYM(rel_p->r_info));
-#endif /* DEBUG */
-
-        if (rel_p->r_offset)
-          {
-            unsigned int offset;
-
-            assert(old_data_addr_start <= rel_p->r_offset &&
-                   rel_p->r_offset <= old_data_addr_end);
-
-            offset = rel_p->r_offset - old_data_addr_start;
-
-#ifdef DEBUG
-            fprintf(stderr, "r_offset= 0x%08x  *r_offset= 0x%08x\n",
-                    rel_p->r_offset, *((int *)(rel_p->r_offset)));
-            fprintf(stderr, "old     = 0x%08x  *old     =0x%08x\n",
-                    (old_data_offset + offset - (unsigned int)old_base),
-                    *((int *)(old_data_offset + offset)));
-            fprintf(stderr, "new     = 0x%08x  *new     =0x%08x\n",
-                    (new_data_offset + offset - (unsigned int)new_base),
-                    *((int *)(new_data_offset + offset)));
-#endif /* DEBUG */
-
-            *((int *)(new_data_offset + offset)) = *((int *)(old_data_offset + offset));
-          }
-
-        rel_p++;
-      }
-  }
-
-  /* Close the files and make the new file executable */

branches/GNU/src/unexsunos4.c

@@ -1 +1 @@
-/* Unexec for Sunos 4 using shared libraries.
-, 1999
+
-
-This file is part of GNU Emacs.
@@ -44 +44 @@
- *
- */
-
-#ifdef emacs
-#include <config.h>
-#endif
-
-#include <sys/param.h>
-#include <sys/mman.h>
@@ -56 +51 @@
-#include <stdio.h>
-#include <a.out.h>
+
+/* Do this after the above #include's in case a configuration file wants
+   to define things for this file based on what <a.out.h> defines.  */
+#ifdef emacs
+#include <config.h>
+#endif
-
-#if defined (SUNOS4) || defined (__FreeBSD__) || defined (__NetBSD__)

branches/GNU/src/unexw32.c

@@ -22 +22 @@
-*/
-
-#include <config.h>
-
-#include <stdlib.h>     /* _fmode */
-#include <stdio.h>
-#include <fcntl.h>
-#include <time.h>
-#include <windows.h>
-
-
-
-
-
-
-
-
-
-
+
-extern BOOL ctrl_c_handler (unsigned long type);
-
-extern char my_begdata[];
-extern char my_edata[];
-extern char my_begbss[];
-extern char my_endbss[];
-extern char *my_begbss_static;
-extern char *my_endbss_static;
-
-#include "w32heap.h"
-
-#undef min
-#undef max
-#define min(x, y) (((x) < (y)) ? (x) : (y))
-#define max(x, y) (((x) > (y)) ? (x) : (y))
-
-/* Basically, our "initialized" flag.  */
@@ -78 +55 @@
-DWORD  bss_size = 0;
-
-#ifdef HAVE_NTGUI
-HINSTANCE hinst = NULL;
-HINSTANCE hprevinst = NULL;
-LPSTR lpCmdLine = "";
-int nCmdShow = 0;
-#endif /* HAVE_NTGUI */
-
-/* Startup code for running on NT.  When we are running as the dumped
@@ -92 +67 @@
-_start (void)
-{
+#ifndef __BORLANDC__ /* 97/01/13 by Y.Matsushima */
-  extern void mainCRTStartup (void);
+  extern BOOL dump_memmap(void);
+#endif
-
-#if 0
@@ -131 +109 @@
-          p[1] = 'e';
-      }
-
+
-      /* Using HiProf profiler, exe name is different still. */
-      {
@@ -138 +116 @@
-      }
-#endif
+#endif
-
-      recreate_heap (executable_path);
@@ -158 +137 @@
-  /* Invoke the NT CRT startup routine now that our housecleaning
-     is finished.  */
-#ifdef HAVE_NTGUI
-  /* determine WinMain args like crt0.c does */
-  hinst = GetModuleHandle(NULL);
-  lpCmdLine = GetCommandLine();
-  nCmdShow = SW_SHOWDEFAULT;
-
+
+
+
+
+
-  mainCRTStartup ();
-
+
+
+
+
+
+
+
-
-/* Dump out .data and .bss sections into a new executable.  */
@@ -206 +194 @@
-  get_section_info (&in_file);
-
+#ifndef __BORLANDC__ /* 97/01/17 by Y.Matsushima */
-  /* The size of the dumped executable is the size of the original
-     executable plus the size of the heap and the size of the .bss section.  */
@@ -223 +212 @@
-  copy_executable_and_dump_data_section (&in_file, &out_file);
-  dump_bss_and_heap (&in_file, &out_file);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-  }
-
+
+
+
+
+
+
+
+
+
+
+
-  close_file_data (&in_file);
-  close_file_data (&out_file);
@@ -334 +313 @@
-
-/* Routines to manipulate NT executable file sections.  */
-
-
+
-static void
-get_bss_info_from_map_file (file_data *p_infile, PUCHAR *p_bss_start, 
@@ -376 +354 @@
-#endif
-
-
+
+
+
+
-get_section_size (PIMAGE_SECTION_HEADER p_section)
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-/* Return pointer to section header for named section. */
-IMAGE_SECTION_HEADER *
@@ -422 +407 @@
-  return NULL;
-}
-
-
-/* Flip through the executable and cache the info necessary for dumping.  */
@@ -434 +418 @@
-  int i;
-  
+#ifndef __BORLANDC__ /* 97/01/13 by Y.Matsushima */
+  const char *SectionNameData = ".emdata";
+  const char *SectionNameBss  = ".embss";
+#else
+  const char *SectionNameData = "DATA";
+  const char *SectionNameBss  = "BSS--> UnUsed";
+  const char *SectionNameDebug= ".debug";
+  extern char my_sdata, my_sbss;
+  extern char my_edata, my_ebss;
+#endif
+
-  dos_header = (PIMAGE_DOS_HEADER) p_infile->file_base;
-  if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) 
@@ -460 +455 @@
-  for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++) 
-    {
-
-
+
-        {
-
+em
-          ptr = (char *) nt_header->OptionalHeader.ImageBase +
-            section->VirtualAddress;
-          bss_start = ptr;
+#if 0
-          bss_size = get_section_size (section);
+#else
+          bss_size = section->Misc.VirtualSize;
+#endif
-        }
-
-
-
+
-        {
-          /* From lastfile.c  */
-          extern char my_edata[];
-
-          /* The .data section.  */
-          data_section = section;
-          ptr = (char *) nt_header->OptionalHeader.ImageBase +
-            section->VirtualAddress;
+#ifndef __BORLANDC__ /* 97/01/13 by Y.Matsushima */
-          data_start_va = ptr;
-          data_start_file = section->PointerToRawData;
-
+#if 0
-          /* We want to only write Emacs data back to the executable,
-             not any of the library data (if library data is included,
@@ -488 +483 @@
-             than the one Emacs was dumped on).  */
-          data_size = my_edata - data_start_va;
+#endif
+          data_size = section -> SizeOfRawData;
+#else /* for BORLANDC */
+          /* INIT DATA */
+          data_start_file = section->PointerToRawData +
+            ((DWORD)&my_sdata - (DWORD)ptr); /* seek to &my_sdata */
+          data_start_va = &my_sdata;
+          data_size = (DWORD)&my_edata - (DWORD)&my_sdata;
+          /* BSS */
+          bss_start = &my_sbss;
+          bss_size  = (DWORD)&my_ebss - (DWORD)&my_sbss;
+#endif
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-#endif
-      section++;
-    }
-
-def SEPARATE_BSS_SECTION
-bss_start == UNINIT_PTR && bss_size == UNINIT_LONG
+ 0
+!bss_start && !bss_size
-    {
-      /* Starting with MSVC 4.0, the .bss section has been eliminated
@@ -521 +518 @@
-        + data_section->VirtualAddress;
-    }
-#else
-/* As noted in lastfile.c, the Alpha (but not the Intel) MSVC linker
-   globally segregates all static and public bss data (ie. across all
-   linked modules, not just per module), so we must take both static and
-   public bss areas into account to determine the true extent of the bss
-   area used by Emacs.
-
-   To be strictly correct, we should dump the static and public bss
-   areas used by Emacs separately if non-overlapping (since otherwise we
-   are dumping bss data belonging to system libraries, eg. the static
-   bss system data on the Alpha).  However, in practice this doesn't
-   seem to matter, since presumably the system libraries always
-   reinitialize their bss variables.  */
-  bss_start = min (my_begbss, my_begbss_static);
-  bss_size = max (my_endbss, my_endbss_static) - bss_start;
-#endif
-}
@@ -548 +530 @@
-  unsigned char *data_file, *data_va;
-  unsigned long size, index;
- 
+
-  /* Get a pointer to where the raw data should go in the executable file.  */
-  data_file = (char *) p_outfile->file_base + data_start_file;
@@ -563 +545 @@
-  
-  size = data_size;
-
+em
-  printf ("\t0x%08x Address in process.\n", data_va);
-  printf ("\t0x%08x Offset in output file.\n", 
@@ -598 +580 @@
-    memcpy ((PUCHAR) p_outfile->file_base + index, heap_data, size);
-
-
+
+
-    
-    index += size;
@@ -604 +587 @@
-    bss_data = bss_start;
-    
-
-
-
+EMACS 
+EMACS 
+EMACS 
-    memcpy ((char *) p_outfile->file_base + index, bss_data, size);
-}
@@ -613 +596 @@
-/* Reload and remap routines.  */
-
-void
-w32_fatal_reload_error (char *step)
-{
-  int error = GetLastError ();
-  char *buffer = alloca (4096);
-
-  sprintf (buffer, 
-           "Emacs failed to load its dumped heap back into its address space.\n"
-           "The error occurred during the following step:\n\n"
-           "%s\n\n"
-           "GetLastError = %d\n\n"
-           "Heap start:  0x%08x\n"
-           "Heap commit:  0x%08x\n"
-           "Heap end:  0x%08x\n\n"
-           "This error typically happens when the system loads a DLL into\n"
-           "the middle of Emacs' address space, preventing Emacs from\n"
-           "loading its heap there.  If this happens only occasionally, then\n"
-           "you can probably ignore it.  But if it happens so often that\n"
-           "you cannot get Emacs to start reliably, and you think that Emacs\n"
-           "is installed correctly, then you have a couple of options:\n\n"
-           "Emacs correctly, then you have two options:\n\n"
-           "1) You can dump Emacs yourself.  By doing this, you ensure that\n"
-           "Emacs' heap fits around the DLLs in your system.  To dump Emacs,\n"
-           "download the emacs-(version)-undump-(arch) distribution file\n"
-           "from the site where you downloaded the executable distribution.\n\n"
-           "2) You can build Emacs from source.  This is just another way\n"
-           "to dump Emacs on your system.",
-           step, 
-           error,
-           get_heap_start (), 
-           get_heap_start () + get_committed_heap_size (),
-           get_heap_end ());
-
-  MessageBox (NULL,
-              buffer,
-              "Emacs Abort Dialog",
-              MB_OK | MB_ICONEXCLAMATION | MB_TASKMODAL);
-
-  exit (-1);
-}
-
-/* Load the dumped .bss section into the .bss area of our address space.  */
@@ -662 +605 @@
-  char   buffer[512], *bss;
-  int    i;
-
+
+
+
+
+
+
+
+
+
-  file = CreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
-                     OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-  if (file == INVALID_HANDLE_VALUE) 
-
+
+
+
+
-
-  /* Seek to where the .bss section is tucked away after the heap...  */
-  index = heap_index_in_executable + get_committed_heap_size ();
-  if (SetFilePointer (file, index, NULL, FILE_BEGIN) == 0xFFFFFFFF) 
-
+
+
+
+
+
-  
-  /* Ok, read in the saved .bss section and initialize all 
-     uninitialized variables.  */
-  if (!ReadFile (file, bss_start, bss_size, &n_read, NULL))
-
+
+
+
+
-
-  CloseHandle (file);
@@ -690 +651 @@
-  unsigned long size, upper_size, n_read;
-  int    i;
-
+
+
+
+
+
+
+
+
+
-  file = CreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
-                     OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-  if (file == INVALID_HANDLE_VALUE) 
-
+
+
+
+
-  
-  size = GetFileSize (file, &upper_size);
@@ -700 +672 @@
-                                    0, size, NULL);
-  if (!file_mapping) 
-
+
+
+
+
-    
-  size = get_committed_heap_size ();
@@ -718 +693 @@
-  if (VirtualAlloc (get_heap_start (), get_committed_heap_size (),
-                    MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE) == NULL)
-
+
+
+
+
-
-  /* Seek to the location of the heap data in the executable.  */
-  i = heap_index_in_executable;
-  if (SetFilePointer (file, i, NULL, FILE_BEGIN) == 0xFFFFFFFF)
-
+
+
+
+
-
-  /* Read in the data.  */
-  if (!ReadFile (file, get_heap_start (), 
-                 get_committed_heap_size (), &n_read, NULL))
-
+
+
+
+
-
-  CloseHandle (file);

branches/GNU/src/vm-limit.c

@@ -131 +131 @@
-  warn_function = warnfun;
-  __after_morecore_hook = check_memory_limits;
-
-#ifdef WINDOWSNT
-  /* Force data limit to be recalculated on each run.  */
-  lim_data = 0;
-#endif
-}