Release 941210
Wed Dec 7 14:52:25 1994 Alexandre Julliard (julliard@lamisun.epfl.ch)
* [controls/listbox.c]
Fixed problems due to new scroll-bar code.
* [loader/signal.c] [miscemu/ioports.c]
Handle I/O opcodes that use an absolute address.
* [objects/text.c]
Implemented TabbedTextOut().
Sat Dec 3 18:53:08 1994 Kenneth MacDonald <K.MacDonald@ed.ac.uk>
* [objects/metafile.c]
Implemented GetMetafile().
Fixed bug in PlayMetaFile() when reading disc based metafile records.
Added META_POLYPOLYGON, META_DELETEOBJECT and META_EOF to
PlayMetaFileRecord().
Wed Nov 30 06:32:25 1994 Martin von Loewis (martin@cs.csufresno.edu)
* [Imakefile]
wine.sym: Remove gcc2_compiled and friends
* [controls/listbox.c][if1632/relay.c][if1632/relay.c]
[loader/resource.c][memory/heap.c][objects/dib.c][windows/dialog.c]
Replace #ifdef DEBUG_XXX with if(debugging_xxx){
* [if1632/call.S]
CallToLibMain: New function
* [if1632/relay.c][include/options.h][misc/main.c]
[miscemu/int1a.c][miscemu/int21.c][miscemu/kernel.c]
removed Options.relay_debug
* [include/heap.h]
HEAP_OWNER: Use ds instead of cs:ip
* [loader/ne_image.c]
LoadNEImage: Remember current exe, handle nodata dlls
InitNEDLL: handle nodata dlls, call CallToLibMain
* [loader/selector.c]
CreateSelectors: Initialize auto_data_sel with 0
* [memory/heap.c]
HEAP_CheckHeap: Check prev
HEAP_CheckLocalHeaps: new function
* [misc/profile]
Remember and dump only changed profiles
* [tools/makedebug]
Introduce debugging_xxx flags
Sun Nov 27 23:13:22 MET 1994 <erik@xs4all.nl>
* [clipboard.h color.h dc.h dos_fs.h event.h font.h graphics.h
if1632.h kernel.h library.h miscemu.h ne_image.h nonclient.h
pe_image.h selectors.h wintypes.h]
Added.
* [*/*]
- Commented all 'static char copyright statements', see misc/main.c
- moved prototypes to headers files, fixed wrong prototypes.
- *please* add a header file for each .c if you need to export
things.
* [misc/main.c]
Added one static string which list the names of the contributors.
Fri Nov 25 16:24:27 MET 1994 Dag Asheim (dash@ifi.uio.no)
* [Configure]
Made the support for multiple languages more automatic. Added
a [fonts] section to the wine.conf file. Made the defaults
better. Generally cleaned it up.
* [rc/sysres_No.rc] [rc/sysres_De.rc] [rc/sysres.c]
Norwegian resources and small fixes to the german resources.
Wed Nov 23 20:28:59 1994 Martin von Loewis (martin@cs.csufresno.edu)
* [debugger/break.c]
bark(), toggle_next(), should_continue(): New functions
insert_break(): Fixed, adds write access to page before writing
wine_bp.next_addr: new structure field
* [debugger/dbg.y]
Changed symbol's value to be it's value instead of the value
pointed to by the symbol.
Changed SIGTRAP handling to allow continuation after break point
* [misc/shell.c]
ShellAbout(): Load resource from memory
diff --git a/debugger/break.c b/debugger/break.c
index 705528c..2c276da 100644
--- a/debugger/break.c
+++ b/debugger/break.c
@@ -1,11 +1,19 @@
#include <stdio.h>
#include <stdlib.h>
+#include <sys/mman.h>
+#ifdef linux
+#include <sys/utsname.h>
+#endif
+#include <windows.h>
#define N_BP 25
+extern int dbg_mode;
+
struct wine_bp{
unsigned long addr;
+ unsigned long next_addr;
char in_use;
char enabled;
unsigned char databyte;
@@ -13,13 +21,19 @@
static struct wine_bp wbp[N_BP] = {{0,},};
-void info_break()
+static int current_bp = -1;
+static int cont_mode=0; /* 0 - continuous execution
+ 1 - advancing after breakpoint
+ 2 - single step - not implemented
+ */
+
+void info_break(void)
{
int j;
fprintf(stderr,"Breakpoint status\n");
for(j=0; j<N_BP; j++)
if(wbp[j].in_use)
- fprintf(stderr,"%d: %c %8.8x\n", j, (wbp[j].enabled ? 'y' : 'n'),
+ fprintf(stderr,"%d: %c %8lx\n", j, (wbp[j].enabled ? 'y' : 'n'),
wbp[j].addr);
}
@@ -48,11 +62,34 @@
wbp[j].in_use = 1;
wbp[j].enabled = 1;
wbp[j].addr = addr;
+ wbp[j].next_addr = 0;
return;
}
fprintf(stderr,"No more breakpoints\n");
}
+static void bark()
+{
+ static int barked=0;
+ if(barked)return;
+ barked=1;
+ perror("Sorry, can't set break point");
+#ifdef linux
+ {struct utsname buf;
+ uname(&buf);
+ if(strcmp(buf.sysname,"Linux")==0)
+ { if(strcmp(buf.release,"1.1.62")<0)
+ fprintf(stderr,"Your current Linux release is %s. "
+ "You should upgrade to 1.1.62 or higher\n"
+ "Alternatively, in /usr/src/linux/fs/exec.c,"
+ " change MAP_SHARED to MAP_PRIVATE.\n", buf.release);
+ } else
+ fprintf(stderr,"Why did you compile for Linux, while your system is"
+ " actually %s?\n",buf.sysname);
+ }
+#endif
+}
+
void insert_break(int flag)
{
unsigned char * pnt;
@@ -61,6 +98,20 @@
for(j=0; j<N_BP; j++)
if(wbp[j].enabled)
{
+ /* There are a couple of problems with this. On Linux prior to
+ 1.1.62, this call fails (ENOACCESS) due to a bug in fs/exec.c.
+ This code is currently not tested at all on BSD.
+ How do I determine the page size in a more symbolic manner?
+ And why does mprotect need that start address of the page
+ in the first place?
+ Not that portability matters, this code is i386 only anyways...
+ How do I get the old protection in order to restore it later on?
+ */
+ if(mprotect((caddr_t)(wbp[j].addr & (~4095)), 4096,
+ PROT_READ|PROT_WRITE|PROT_EXEC) == -1){
+ bark();
+ return;
+ }
pnt = (unsigned char *) wbp[j].addr;
if(flag) {
wbp[j].databyte = *pnt;
@@ -68,6 +119,7 @@
} else {
*pnt = wbp[j].databyte;
}
+ mprotect((caddr_t)(wbp[j].addr & ~4095), 4096, PROT_READ|PROT_EXEC);
}
}
@@ -82,3 +134,27 @@
return -1;
}
+
+void toggle_next(int num)
+{
+ unsigned int addr;
+ addr=wbp[num].addr;
+ if(wbp[num].next_addr == 0)
+ wbp[num].next_addr=addr+print_insn(addr,addr,stderr,dbg_mode);
+ wbp[num].addr=wbp[num].next_addr;
+ wbp[num].next_addr=addr;
+}
+
+int should_continue(int bpnum)
+{
+ if(bpnum<0)return 0;
+ toggle_next(bpnum);
+ if(bpnum==current_bp){
+ current_bp=-1;
+ cont_mode=0;
+ return 1;
+ }
+ cont_mode=1;
+ current_bp=bpnum;
+ return 0;
+}
