* merged changes from fixes branch

packages/gdbint/Makefile

@@ -882,8 +882,20 @@ info: fpc_info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.PHONY: localgdbverexe
+localgdbverexe : ./getver$(EXEEXT)
+./getver$(EXEEXT) : ./gdbver.pp
+	$(COMPILER) -o./getver$(EXEEXT) gdbver.pp
+ifdef GDBVER
 gdbint$(PPUEXT): gdbint.pp
+	$(ECHO) Using GDB $(GDBVER)
+	$(COMPILER) -d$(GDBVER) gdbint.pp
+else
+gdbint$(PPUEXT): localgdbverexe gdbver$(EXEEXT)
+	$(MAKE) gdbint$(PPUEXT) GDBVER=GDB_V$(strip $(shell ./gdbver$(EXEEXT) -n))
+endif
 gdbcon$(PPUEXT): gdbcon.pp gdbint$(PPUEXT)
+gdbver$(EXEEXT): gdbver.pp
 ifeq ($(OS_TARGET),go32v2)
 DBGCOM=dbgcom$(OEXT)
 else

packages/gdbint/Makefile.fpc

@@ -22,10 +22,26 @@ fpcdir=../..
 
 
 [rules]
+.PHONY: localgdbverexe
+
+localgdbverexe : ./getver$(EXEEXT)
+
+./getver$(EXEEXT) : ./gdbver.pp
+        $(COMPILER) -o./getver$(EXEEXT) gdbver.pp
+
+ifdef GDBVER
 gdbint$(PPUEXT): gdbint.pp
+        $(ECHO) Using GDB $(GDBVER)
+        $(COMPILER) -d$(GDBVER) gdbint.pp
+else
+gdbint$(PPUEXT): localgdbverexe gdbver$(EXEEXT)
+        $(MAKE) gdbint$(PPUEXT) GDBVER=GDB_V$(strip $(shell ./gdbver$(EXEEXT) -n))
+endif
 
 gdbcon$(PPUEXT): gdbcon.pp gdbint$(PPUEXT)
 
+gdbver$(EXEEXT): gdbver.pp
+
 ifeq ($(OS_TARGET),go32v2)
 DBGCOM=dbgcom$(OEXT)
 else

packages/gdbint/gdbcon.pp

@@ -36,6 +36,8 @@ type
     procedure Run;virtual;
     procedure TraceStep;virtual;
     procedure TraceNext;virtual;
+    procedure TraceStepI;virtual;
+    procedure TraceNextI;virtual;
     procedure Continue;virtual;
     { needed for dos because newlines are only #10 (PM) }
     procedure WriteErrorBuf;
@@ -122,7 +124,8 @@ begin
     strdispose(progname);
   getmem(progname,length(fn)+1);
   strpcopy(progname,fn);
-  Command('file '+fn);
+  if fn<>'' then
+    Command('file '+fn);
   LoadFile:=true;
 end;
 
@@ -174,6 +177,18 @@ begin
 end;
 
 
+procedure TGDBController.TraceStepI;
+begin
+  Command('stepi');
+end;
+
+
+procedure TGDBController.TraceNextI;
+begin
+  Command('nexti');
+end;
+
+
 procedure TGDBController.Continue;
 begin
   Command('continue');
@@ -243,7 +258,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:15  michael
+  Revision 1.3  2001-04-08 11:43:39  peter
+    * merged changes from fixes branch
+
+  Revision 1.2  2000/07/13 11:33:15  michael
   + removed logs
- 
+
 }

packages/gdbint/gdbint.pp

@@ -19,7 +19,7 @@ interface
 
 { this is not needed (PM) $output_format as}
 
-{.$define Debug}
+{.$define Verbose}
 {.$define DebugCommand}
 {$define NotImplemented}
 
@@ -45,6 +45,7 @@ interface
       {$LINKLIB opcodes}
       {$LINKLIB history}
       {$LINKLIB iberty}
+      {$LINKLIB intl}
     {$endif GDB_V5}
   {$endif ndef USE_GDB_OBJS}
   {$LINKLIB dbg}
@@ -59,15 +60,14 @@ interface
   {$LINKLIB gdb}
     {$ifdef GDB_V5}
       {$LINKLIB bfd}
-      {$LINKLIB intl}
       {$LINKLIB readline}
       {$LINKLIB opcodes}
       {$LINKLIB history}
       {$LINKLIB iberty}
       {$LINKLIB ncurses}
       {$LINKLIB m}
-      {$LINKLIB intl}
       {$LINKLIB iberty}
+      {$LINKLIB dl}
     {$endif GDB_V5}
   {$LINKLIB c}
   {$LINKLIB gcc}
@@ -153,6 +153,7 @@ type
 
 
 type
+  CORE_ADDR = cardinal; { might be target dependent PM }
   streamtype = (afile,astring);
   C_FILE     = longint; { at least under DJGPP }
   P_C_FILE   = ^C_FILE;
@@ -278,6 +279,7 @@ type
     file_end,
     line_start,
     line_end : longint;
+    current_pc      : CORE_ADDR;
     { breakpoint }
     last_breakpoint_number,
     last_breakpoint_address,
@@ -344,7 +346,18 @@ uses
   initc,
 {$endif win32}
 {$ifdef linux}
-  Unix,
+  {$ifdef ver1_0}
+    linux,
+  {$else}
+    unix,
+  {$endif}
+{$endif}
+{$ifdef freebsd}
+  {$ifdef ver1_0}
+    linux,
+  {$else}
+    unix,
+  {$endif}
 {$endif}
 {$ifdef go32v2}
   go32,
@@ -403,7 +416,6 @@ type
 {$endif win32}
 
   type
-     CORE_ADDR = longint;
      pCORE_ADDR = ^CORE_ADDR;
      pblock = ^block;
 
@@ -515,7 +527,7 @@ type
      value : record
        case integer of
       (* The fact that this is a long not a LONGEST mainly limits the
-         range of a LOC_CONST.  Since LOC_CONST_BYTES exists, I am not
+         range of a LOC_CONST.  Since LOC_CONST_BYTES exists, I'm not
          sure that is a big deal.  *)
        0 : (ivalue : longint;);
 
@@ -556,7 +568,7 @@ type
   (* Which section is this symbol in?  This is an index into
      section_offsets for this objfile.  Negative means that the symbol
      does not get relocated relative to a section.
-     Disclaimer: currently this is just used for xcoff, so do not
+     Disclaimer: currently this is just used for xcoff, so don't
      expect all symbol-reading code to set it correctly (the ELF code
      also tries to set it correctly).  *)
 
@@ -593,7 +605,7 @@ type
   namespace_enum = (
   (* UNDEF_NAMESPACE is used when a namespace has not been discovered or
      none of the following apply.  This usually indicates an error either
-     in the symbol information or in gdbs handling of symbols. *)
+     in the symbol information or in gdb's handling of symbols. *)
   UNDEF_NAMESPACE,
 
   (* VAR_NAMESPACE is the usual namespace.  In C, this contains variables,
@@ -638,7 +650,7 @@ type
   (* Value is in register.  SYMBOL_VALUE is the register number.  *)
   LOC_REGISTER,
 
-  (* It is an argument; the value is at SYMBOL_VALUE offset in arglist.  *)
+  (* It's an argument; the value is at SYMBOL_VALUE offset in arglist.  *)
   LOC_ARG,
 
   (* Value address is at SYMBOL_VALUE offset in arglist.  *)
@@ -1154,7 +1166,7 @@ end;
 
 procedure annotate_signalled;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|signalled|');
 {$endif}
 end;
@@ -1162,7 +1174,7 @@ end;
 
 procedure annotate_signal_name;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|signal_name|');
   with curr_gdb^ do
    signal_start:=gdboutputbuf.idx;
@@ -1172,7 +1184,7 @@ end;
 
 procedure annotate_signal_name_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|signal_name_end|');
 {$endif}
 end;
@@ -1180,7 +1192,7 @@ end;
 
 procedure annotate_signal_string;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|signal_string|');
 {$endif}
 end;
@@ -1188,7 +1200,7 @@ end;
 
 procedure annotate_signal_string_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|signal_string_end|');
 {$endif}
   with curr_gdb^ do
@@ -1211,7 +1223,7 @@ end;
 
 procedure annotate_signal;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|signal|');
 {$endif}
 end;
@@ -1219,7 +1231,7 @@ end;
 
 procedure annotate_exited(exitstatus:longint);cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|exited|');
 {$endif}
 {#ifdef __DJGPP__
@@ -1246,7 +1258,7 @@ end;
 
 procedure annotate_error;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|error|');
 {$endif}
 end;
@@ -1254,7 +1266,7 @@ end;
 
 procedure annotate_error_begin;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|error begin|');
 {$endif}
   with curr_gdb^ do
@@ -1262,7 +1274,7 @@ begin
      error_start:=gdboutputbuf.idx+strlen(gdboutputbuf.buf);
      got_error:=true;
    end;
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|end of error begin|');
 {$endif}
 end;
@@ -1270,7 +1282,7 @@ end;
 
 procedure annotate_starting;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|starting|');
 {$endif}
 {$ifdef go32v2}
@@ -1285,7 +1297,7 @@ var
   sym : symtab_and_line;
   fname : pchar;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|stopped|');
 {$endif}
   with curr_gdb^ do
@@ -1294,6 +1306,7 @@ begin
      reload_fs;
 {$endif go32v2}
      DebuggerScreen;
+     current_pc:=stop_pc;
      Debuggee_started:=inferior_pid<>0;
      if not Debuggee_started then exit;
      if reset_command then exit;
@@ -1314,7 +1327,7 @@ end;
 
 procedure breakpoints_changed;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|breakpoints_changed|');
 {$endif}
 end;
@@ -1322,7 +1335,7 @@ end;
 { only from version 5.0 }
 procedure annotate_ignore_count_change;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|annotate_ignore_count_change()|');
 {$endif}
 end;
@@ -1330,7 +1343,7 @@ end;
 
 procedure annotate_breakpoint(num:longint);cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|breakpoint(%d)|');
 {$endif}
   With Curr_gdb^ do
@@ -1340,7 +1353,7 @@ end;
 
 procedure annotate_watchpoint(num:longint);cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|watchpoint(%d)|');
 {$endif}
   With Curr_gdb^ do
@@ -1349,7 +1362,7 @@ end;
 
 procedure annotate_catchpoint(num:longint);cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|catchpoint(%d)|');
 {$endif}
   With Curr_gdb^ do
@@ -1359,7 +1372,7 @@ end;
 
 procedure annotate_breakpoints_headers;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|breakpoints_headers|');
 {$endif}
 end;
@@ -1367,7 +1380,7 @@ end;
 
 procedure annotate_breakpoints_table;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|breakpoints_table|');
 {$endif}
 end;
@@ -1375,7 +1388,7 @@ end;
 
 procedure annotate_record;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|record|');
 {$endif}
 end;
@@ -1383,7 +1396,7 @@ end;
 
 procedure annotate_breakpoints_table_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|breakpoints_table_end|');
 {$endif}
 end;
@@ -1391,7 +1404,7 @@ end;
 
 procedure annotate_frames_invalid;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|frames_invalid|');
 {$endif}
 end;
@@ -1399,7 +1412,7 @@ end;
 
 procedure annotate_frame_begin(level:longint;pc:CORE_ADDR);cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|frame_begin(%d,%ld)|');
 {$endif}
   with curr_gdb^ do
@@ -1422,7 +1435,7 @@ end;
 
 procedure annotate_frame_address;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|frame_address|');
 {$endif}
 end;
@@ -1430,14 +1443,14 @@ end;
 
 procedure annotate_frame_address_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|frame_address_end|');
 {$endif}
 end;
 
 procedure annotate_frame_function_name;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|frame_function_name|');
 {$endif}
   with curr_gdb^ do
@@ -1447,7 +1460,7 @@ end;
 
 procedure annotate_frame_args;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|frame_args|');
 {$endif}
   with curr_gdb^ do
@@ -1459,7 +1472,7 @@ end;
 
 procedure annotate_frame_source_begin;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|frame_source_begin|');
 {$endif}
   with curr_gdb^ do
@@ -1469,7 +1482,7 @@ end;
 
 procedure annotate_frame_source_file;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|frame_source_file|');
 {$endif}
   with curr_gdb^ do
@@ -1478,7 +1491,7 @@ end;
 
 procedure annotate_frame_source_file_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|frame_source_file_end|');
 {$endif}
   with curr_gdb^ do
@@ -1488,7 +1501,7 @@ end;
 
 procedure annotate_frame_source_line;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|frame_source_line|');
 {$endif}
   with curr_gdb^ do
@@ -1498,7 +1511,7 @@ end;
 
 procedure annotate_frame_source_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|frame_source_end|');
 {$endif}
   with curr_gdb^ do
@@ -1508,7 +1521,7 @@ end;
 
 procedure annotate_frame_where;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|frame_where|');
 {$endif}
 end;
@@ -1520,7 +1533,7 @@ var
   c  : char;
   err : integer;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|frame_end|');
 {$endif}
   with curr_gdb^ do
@@ -1571,7 +1584,7 @@ end;
 
 procedure annotate_quit;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|quit|');
 {$endif}
 end;
@@ -1579,7 +1592,7 @@ end;
 
 procedure annotate_arg_begin;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|arg_begin|');
 {$endif}
 end;
@@ -1587,7 +1600,7 @@ end;
 
 procedure annotate_arg_name_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|arg_name_end|');
 {$endif}
 end;
@@ -1595,7 +1608,7 @@ end;
 
 procedure annotate_arg_value(typ:pointer);cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|arg_value|');
 {$endif}
 end;
@@ -1603,14 +1616,14 @@ end;
 
 procedure annotate_arg_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|arg_end|');
 {$endif}
 end;
 
 procedure annotate_source(filename:pchar;line,character,mid:longint;pc:CORE_ADDR);cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|source|');
 {$endif}
 end;
@@ -1618,7 +1631,7 @@ end;
 
 procedure annotate_function_call;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|function_call|');
 {$endif}
 end;
@@ -1626,7 +1639,7 @@ end;
 
 procedure annotate_signal_handler_caller;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|signal_handler_caller|');
 {$endif}
 end;
@@ -1634,7 +1647,7 @@ end;
 
 procedure annotate_array_section_begin(index:longint;elttype:pointer);cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|array_section_begin()|');
 {$endif}
 end;
@@ -1642,14 +1655,14 @@ end;
 
 procedure annotate_elt_rep(repcount:longint);cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|elt_rep()|');
 {$endif}
 end;
 
 procedure annotate_elt_rep_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|elt_rep_end|');
 {$endif}
 end;
@@ -1657,7 +1670,7 @@ end;
 
 procedure annotate_elt;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|elt|');
 {$endif}
 end;
@@ -1665,14 +1678,14 @@ end;
 
 procedure annotate_array_section_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|array_section_end|');
 {$endif}
 end;
 
 procedure annotate_display_begin;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|display_begin|');
 {$endif}
 end;
@@ -1680,7 +1693,7 @@ end;
 
 procedure annotate_display_number_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|display_number_end|');
 {$endif}
 end;
@@ -1688,14 +1701,14 @@ end;
 
 procedure annotate_display_format;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|display_format|');
 {$endif}
 end;
 
 procedure annotate_display_expression;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|display_expression|');
 {$endif}
 end;
@@ -1703,7 +1716,7 @@ end;
 
 procedure annotate_display_expression_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|display_expression_end|');
 {$endif}
 end;
@@ -1711,7 +1724,7 @@ end;
 
 procedure annotate_display_value;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|display_value|');
 {$endif}
 end;
@@ -1719,7 +1732,7 @@ end;
 
 procedure annotate_display_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|display_end|');
 {$endif}
 end;
@@ -1727,7 +1740,7 @@ end;
 
 procedure annotate_field (num:longint);cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('a_field(%d)');
 {$endif}
 end;
@@ -1735,7 +1748,7 @@ end;
 
 procedure annotate_field_begin(typ:pointer);cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('a_field_begin\n');
 {$endif}
 end;
@@ -1743,7 +1756,7 @@ end;
 
 procedure annotate_field_name_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('a_field_name_end\n');
 {$endif}
 end;
@@ -1751,7 +1764,7 @@ end;
 
 procedure annotate_field_value;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('a_field_value\n');
 {$endif}
 end;
@@ -1759,7 +1772,7 @@ end;
 
 procedure annotate_field_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('a_field_end\n');
 {$endif}
 end;
@@ -1767,7 +1780,7 @@ end;
 
 procedure annotate_value_history_begin (histindex:longint;typ:pointer);cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('a_value_history_begin(%d)\n');
 {$endif}
 end;
@@ -1775,7 +1788,7 @@ end;
 
 procedure annotate_value_begin (typ:pointer);cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('a_value_begin\n');
 {$endif}
 end;
@@ -1783,7 +1796,7 @@ end;
 
 procedure annotate_value_history_value;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('a_value_history_value\n');
 {$endif}
 end;
@@ -1791,7 +1804,7 @@ end;
 
 procedure annotate_value_history_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('a_value_history_end\n');
 {$endif}
 end;
@@ -1799,7 +1812,7 @@ end;
 
 procedure annotate_value_end;cdecl;public;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('a_value_end\n');
 {$endif}
 end;
@@ -2032,7 +2045,7 @@ begin
 {$endif go32v2}
    end
   else
-{$ifdef Debug}
+{$ifdef Verbose}
     Debug('error longjmp in handle_gdb_command ('+s+')');
 {$endif}
    ;
@@ -2177,7 +2190,7 @@ end;
 
 procedure tgdbinterface.DebuggerScreen;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|DebuggerScreen|');
 {$endif}
   if user_screen_shown then
@@ -2188,7 +2201,7 @@ end;
 
 procedure tgdbinterface.UserScreen;
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Debug('|UserScreen|');
 {$endif}
   if switch_to_user then
@@ -2206,12 +2219,12 @@ end;
 ---------------------------------------}
 
 procedure tgdbinterface.DoSelectSourceLine(const fn:string;line:longint);
-{$ifdef Debug}
+{$ifdef Verbose}
 var
   s : string;
 {$endif}
 begin
-{$ifdef Debug}
+{$ifdef Verbose}
   Str(line,S);
   Debug('|SelectSource '+fn+':'+s+'|');
 {$endif}
@@ -2375,7 +2388,7 @@ begin
     end
   else
     begin
-{$ifdef Debug}
+{$ifdef Verbose}
        Debug('|LongJump to Init|');
 {$endif}
 {$ifdef go32v2}
@@ -2391,7 +2404,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.4  2001-01-21 21:38:52  marco
+  Revision 1.5  2001-04-08 11:43:39  peter
+    * merged changes from fixes branch
+
+  Revision 1.4  2001/01/21 21:38:52  marco
    * renamefest in packages
 
   Revision 1.3  2000/10/08 10:07:22  peter