Message-ID: From: "Andris Pavenis" To: Robert Hoehne Date: Fri, 8 Jan 1999 16:24:30 +0200 MIME-Version: 1.0 Content-type: Multipart/Mixed; boundary=Message-Boundary-5814 Subject: Modified version of dbgcom.c CC: djgpp-workers AT delorie DOT com, Pierre Muller In-reply-to: <369152E3.73EBA101@gmx.net> X-mailer: Pegasus Mail for Win32 (v3.01d) Reply-To: djgpp-workers AT delorie DOT com --Message-Boundary-5814 Content-type: text/plain; charset=US-ASCII Content-transfer-encoding: 7BIT Content-description: Mail message body I'm sending modified version of dbgcom.c that allows debugee to be interrupted with SIGINT and to resume debugging after that. I removed saving FPU state into structure fpue added by Pierre as there were problems with it and used fnsave instead. I currently did it simply to memory area but it can be replaced by some structure (e.g see sources of FSDB). Such way provides protection against possible FPU status saving bugs in debugger (or forgetting to do it). Somebody may treat this as paranoid, but I think it's better to be sure FPU status is restored correctly. Andris --Message-Boundary-5814 Content-type: text/plain; charset=US-ASCII Content-disposition: inline Content-description: Attachment information. The following section of this message contains a file attachment prepared for transmission using the Internet MIME message format. If you are using Pegasus Mail, or any another MIME-compliant system, you should be able to save it or view it from within your mailer. If you cannot, please ask your system administrator for assistance. ---- File information ----------- File: dbgcom.c Date: 8 Jan 1999, 12:52 Size: 41282 bytes. Type: Text --Message-Boundary-5814 Content-type: Application/Octet-stream; name="dbgcom.c"; type=Text Content-disposition: attachment; filename="dbgcom.c" #include /* $Id: dbgcom.c,v 1.3 1998/12/21 11:03:01 pierre Exp $ */ /* modified for use with FPC and */ /* exception handling support by Pierre Muller */ /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1997 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include extern char __libdbg_ident_string[]; static char *id = __libdbg_ident_string; #define MEM_HANDLE_COUNT 256 #define DESCRIPTOR_COUNT 128 #define DOS_DESCRIPTOR_COUNT 128 #define DPMI_EXCEPTION_COUNT 18 #define USE_FSEXT #define CLOSE_UNREGISTERED_FILES #ifdef FPC #undef CLOSE_UNREGISTERED_FILES #endif /* debug splitted into 3 parts */ //#define DEBUG_ALL_DBGCOM #ifdef DEBUG_ALL_DBGCOM /* general debug infos */ #define DEBUG_DBGCOM /* files open/close infos */ #define DEBUG_DBGCOM_FILES /* exceptions infos */ #define DEBUG_EXCEPTIONS #endif /* DEBUG_ALL_DBGCOM */ long mem_handles[MEM_HANDLE_COUNT]; unsigned short descriptors[DESCRIPTOR_COUNT]; unsigned short dos_descriptors[DOS_DESCRIPTOR_COUNT]; static void dbgsig(int sig); /* these all need to be static because ss can be different from ds in dbgsig !! */ static int excep_stack[1000]; static int errcode,cs,eflags,eip,ss,esp,ret_cs,ret_eip; static void *cur_pos; static int child_exception_level; ExternalDebuggerInfo edi; TSS a_tss; static char fp_save[128]; static jmp_buf jumper; static int my_ds,my_cs,app_cs,app_exit_cs,app_ds; static jmp_buf load_state; static int nset, breakhandle[4]; static __dpmi_paddr our_handler[DPMI_EXCEPTION_COUNT],app_handler[DPMI_EXCEPTION_COUNT]; #ifdef DEBUG_EXCEPTIONS typedef struct { short excp_cs; int excp_eip; short excp_nb; } texcp_info; static texcp_info excp_info[20]; static int excp_index; static int excp_count; static int redir_excp_count; #endif /* ARGSUSED */ char ** __crt0_glob_function(char *foo) { id = 0; return 0; } static void store_fpu_env (void) { asm ("fnsave _fp_save"); /* Save full FPU status for later restoring */ asm ("fwait"); /* It's slightly paranoid to do this here */ /* but let's avoid possible user bugs */ asm ("frstor _fp_save"); /* Seems this is needed */ asm ("fwait"); } static void restore_fpu_env (void) { asm ("frstor _fp_save"); asm ("fwait"); } static int _DPMIsetBreak(unsigned short sizetype, unsigned vaddr) { int handle; asm volatile( "\n\ movw %1,%%dx \n\ movl %2,%%ecx \n\ movl %%ecx,%%ebx \n\ shrl $16,%%ebx \n\ movw $0x0b00,%%ax \n\ int $0x31 \n\ jnc 3f \n\ xorl %%ebx,%%ebx \n\ decl %%ebx \n\ jmp 1f \n\ 3: movzwl %%bx,%%ebx \n\ 1: movl %%ebx,%0 \n\ " : "=g" (handle) /* outputs */ : "g" (sizetype), "g" (vaddr) /* inputs */ : "ax", "bx", "cx", "dx" /* regs used */ ); return handle; } static int _DPMIcancelBreak(int handle) { unsigned state; asm volatile( "\n\ movl %1,%%ebx \n\ movw $0x0b02,%%ax \n\ int $0x31 \n\ jnc 2f \n\ xorl %%eax,%%eax \n\ 2: andl $1,%%eax \n\ pushl %%eax \n\ movw $0x0b01,%%ax \n\ int $0x31 \n\ popl %0 \n\ " : "=g" (state) /* outputs */ : "g" (handle) /* inputs */ : "ax", "bx" /* regs used */ ); return state; } /* Can't be static because called in asm below; -O3 inlines if static */ void _set_break_DPMI(void); void _set_break_DPMI(void) { int i; unsigned extract; unsigned short sizetype; unsigned long vbase; if(__dpmi_get_segment_base_address(__djgpp_app_DS, &vbase) == -1) return; extract = edi.dr[7] >> 16; nset = 0; for(i=0;i<4;i++) if( (edi.dr[7] >> (i*2))&3 ) { /* enabled? */ sizetype = (extract >> (i*4)) & 3; /* extract the type */ if(sizetype == 3) sizetype = 2; /* convert for DPMI brain damage */ sizetype = (sizetype << 8) + ((extract >> (i*4+2)) & 3) + 1; /* & size */ breakhandle[i] = _DPMIsetBreak(sizetype, edi.dr[i]+vbase); if(breakhandle[i] == -1) printf("Error allocating DPMI breakpoint at address 0x%08lx\n",edi.dr[i]); else nset++; } else breakhandle[i] = -1; return; } /* Can't be static because called in asm below; -O3 inlines if static */ void _clear_break_DPMI(void); void _clear_break_DPMI(void) { int i,bt; if(!nset) { edi.dr[6] = 0; return; } bt = 0; for(i=3;i>=0;i--) { bt = bt << 1; /* Shift for next bit */ if(breakhandle[i] != -1) bt |= _DPMIcancelBreak(breakhandle[i]); /* Set low bit if active */ } edi.dr[6] = bt; } static __dpmi_paddr old_i31,old_i21,user_i31,user_i21; static int user_int_set = 0; static __dpmi_paddr my_i9,user_i9,my_i8,user_i8; static void hook_dpmi(void) { int i; __dpmi_paddr new_int; extern void i21_hook(void),i31_hook(void); __dpmi_get_protected_mode_interrupt_vector(0x21, &old_i21); __dpmi_get_protected_mode_interrupt_vector(0x31, &old_i31); /* Save our current interrupt vectors for the keyboard and the timer */ __dpmi_get_protected_mode_interrupt_vector(0x09, &my_i9); __dpmi_get_protected_mode_interrupt_vector(0x08, &my_i8); for (i=0;i__eip; excp_info[excp_index].excp_cs=__djgpp_exception_state->__cs; excp_info[excp_index].excp_nb=__djgpp_exception_state->__signum; excp_index++; excp_count++; if (excp_index==20) excp_index=0; #endif if(__djgpp_exception_state->__cs == app_cs /* || sig == SIGTRAP */) { *load_state = *__djgpp_exception_state; /* exception was in other process */ longjmp(jumper, 1); } else { extern int invalid_sel_addr(short sel, unsigned a, unsigned len, char for_write); int signum = __djgpp_exception_state->__signum; if ( (app_handler[signum].offset32) && (app_handler[signum].selector) && !invalid_sel_addr(app_handler[signum].selector, app_handler[signum].offset32,1,0) && ((app_handler[signum].offset32 != our_handler[signum].offset32) || (app_handler[signum].selector != our_handler[signum].selector))) { extern void exception_return(void); #ifdef DEBUG_EXCEPTIONS redir_excp_count++; #endif *load_state = *__djgpp_exception_state; /* exception was in other process */ eip = load_state->__eip; cs = load_state->__cs; esp = load_state->__esp; /* reset the debug trace bit */ /* we should only do this under certain specific conditions but which ones ?? */ eflags = load_state->__eflags; /* if (signum!=1) eflags &= 0xfffffeff; */ /* we don't want to step inside the exception_table code */ load_state->__eflags &= 0xfffffeff; ss = load_state->__ss; errcode = load_state->__sigmask; load_state->__eip=app_handler[signum].offset32; load_state->__cs=app_handler[signum].selector; /* use our own exception stack */ child_exception_level++; memset(&excep_stack,0xAB,sizeof(excep_stack)); cur_pos = &excep_stack[1000-40]; cur_pos -= 8*4; load_state->__ss = my_ds; load_state->__esp= (int) cur_pos; /* where to return */ ret_cs = my_cs; ret_eip = (int) &exception_return; memcpy(cur_pos,&ret_eip,4); cur_pos+=4; memcpy(cur_pos,&ret_cs,4); cur_pos+=4; memcpy(cur_pos,&errcode,4); cur_pos+=4; memcpy(cur_pos,&eip,4); cur_pos+=4; memcpy(cur_pos,&cs,4); cur_pos+=4; memcpy(cur_pos,&eflags,4); cur_pos+=4; memcpy(cur_pos,&esp,4); cur_pos+=4; memcpy(cur_pos,&ss,4); cur_pos+=4; longjmp(load_state, load_state->__eax); } else { *load_state = *__djgpp_exception_state; longjmp(jumper, 1); } } } void run_child(void) { load_state->__cs = a_tss.tss_cs; load_state->__ss = a_tss.tss_ss; load_state->__ds = a_tss.tss_ds; load_state->__es = a_tss.tss_es; load_state->__fs = a_tss.tss_fs; load_state->__gs = a_tss.tss_gs; load_state->__eip = a_tss.tss_eip; load_state->__eflags = a_tss.tss_eflags; load_state->__eax = a_tss.tss_eax; load_state->__ebx = a_tss.tss_ebx; load_state->__ecx = a_tss.tss_ecx; load_state->__edx = a_tss.tss_edx; load_state->__esp = a_tss.tss_esp; load_state->__ebp = a_tss.tss_ebp; load_state->__esi = a_tss.tss_esi; load_state->__edi = a_tss.tss_edi; if(!setjmp(jumper)){ /* jump to tss */ _set_break_DPMI(); hook_dpmi(); restore_fpu_env(); longjmp(load_state, load_state->__eax); /* we never return here, execption routine will longjump */ } /* exception routine: save state, copy to tss, return */ a_tss.tss_cs = load_state->__cs; a_tss.tss_ss = load_state->__ss; a_tss.tss_ds = load_state->__ds; a_tss.tss_es = load_state->__es; a_tss.tss_fs = load_state->__fs; a_tss.tss_gs = load_state->__gs; a_tss.tss_eip = load_state->__eip; a_tss.tss_esp = load_state->__esp; a_tss.tss_eflags = load_state->__eflags; a_tss.tss_eax = load_state->__eax; a_tss.tss_ebx = load_state->__ebx; a_tss.tss_ecx = load_state->__ecx; a_tss.tss_edx = load_state->__edx; a_tss.tss_esi = load_state->__esi; a_tss.tss_edi = load_state->__edi; a_tss.tss_ebp = load_state->__ebp; a_tss.tss_irqn = load_state->__signum; a_tss.tss_error = load_state->__sigmask; store_fpu_env(); unhook_dpmi(); _clear_break_DPMI(); } static int invalid_addr(unsigned a, unsigned len) { /* Here we assume expand up writable code. We could check the rights to be sure, but that's a waste unless *_child routines fixed to know about different selectors. */ unsigned limit; limit = __dpmi_get_segment_limit(__djgpp_app_DS); if(4096 <= a /* First page is used for NULL pointer detection. */ && a <= limit /* To guard against limit < len. */ && a - 1 <= limit - len /* To guard against limit <= a + len - 1. */ ) return 0; /* printf("Invalid access to child, address %#x length %#x limit: %#x\n", a, len, limit); if (can_longjmp) longjmp(debugger_jmpbuf, 1); */ return 1; } int read_child(unsigned child_addr, void *buf, unsigned len) { if (invalid_addr(child_addr, len)) return 1; movedata(__djgpp_app_DS, child_addr, my_ds, (int)buf, len); return 0; } int write_child(unsigned child_addr, void *buf, unsigned len) { if (invalid_addr(child_addr, len)) return 1; movedata(my_ds, (int)buf, __djgpp_app_DS, child_addr, len); return 0; } int invalid_sel_addr(short sel, unsigned a, unsigned len, char for_write) { /* Here we assume expand up writable code. We could check the rights to be sure, but that's a waste unless *_child routines fixed to know about different selectors. */ unsigned limit; char read_allowed = 0; char write_allowed = 0; asm(" movw %2,%%ax verr %%ax jnz .Ldoes_not_has_read_right movb $1,%0 .Ldoes_not_has_read_right: verrw %%ax jnz .Ldoes_not_has_write_right movb $1,%1 .Ldoes_not_has_write_right: " : "=g" (read_allowed), "=g" (write_allowed) : "g" (sel) ); if (for_write) { if (!write_allowed) return 1; } else if (!read_allowed) return 1; limit = __dpmi_get_segment_limit(sel); /* some selectors don't have zero page protection like the protected interrupt stack */ if(/*a >= 4096 && */ (a+len-1) <= limit) return 0; /* printf("Invalid access to child, address %#x length %#x limit: %#x\n", a, len, limit); if (can_longjmp) longjmp(debugger_jmpbuf, 1); */ return 1; } int read_sel_addr(unsigned child_addr, void *buf, unsigned len, unsigned sel) { /* first clear memory */ memcpy(buf,0,len); if (invalid_sel_addr(sel, child_addr, len, 0)) return 1; movedata(sel, child_addr, my_ds, (int)buf, len); return 0; } int write_sel_addr(unsigned sel, unsigned child_addr, void *buf, unsigned len) { if (invalid_sel_addr(sel, child_addr, len, 1)) return 1; movedata(my_ds, (int)buf, sel, child_addr, len); return 0; } static _GO32_StubInfo si; static void (*oldTRAP)(int); static void (*oldSEGV)(int); static void (*oldFPE)(int); static void (*oldINT)(int); void edi_init(jmp_buf start_state) { int i; my_ds = 0; asm("mov %%ds,%0" : "=g" (my_ds) ); my_cs = 0; asm("mov %%cs,%0" : "=g" (my_cs) ); for (i=0;i__cs; a_tss.tss_ss = load_state->__ss; a_tss.tss_ds = load_state->__ds; a_tss.tss_es = load_state->__es; a_tss.tss_fs = load_state->__fs; a_tss.tss_gs = load_state->__gs; a_tss.tss_eip = load_state->__eip; a_tss.tss_esp = load_state->__esp; a_tss.tss_eflags = load_state->__eflags; __djgpp_app_DS = a_tss.tss_ds; app_cs = a_tss.tss_cs; edi.app_base = 0; /* Save all the changed signal handlers */ oldTRAP = signal(SIGTRAP, dbgsig); oldSEGV = signal(SIGSEGV, dbgsig); oldFPE = signal(SIGFPE, dbgsig); oldINT = signal(SIGINT, dbgsig); movedata(a_tss.tss_fs,0,my_ds,(unsigned)&si,sizeof(si)); memset(mem_handles,0,sizeof(mem_handles)); mem_handles[0] = si.memory_handle; memset(descriptors,0,sizeof(descriptors)); descriptors[0] = si.cs_selector; descriptors[1] = si.ds_selector; descriptors[2] = __djgpp_app_DS; descriptors[3] = app_cs; app_exit_cs=si.cs_selector; memset(dos_descriptors,0,sizeof(dos_descriptors)); dos_descriptors[0] = _farpeekw(si.psp_selector,0x2c); dos_descriptors[1] = si.psp_selector; } static void close_handles(void); /* Forward declaration */ void cleanup_client(void) { int i; /* restore __djgpp_app_DS for Ctrl-C !! */ __djgpp_app_DS = __djgpp_our_DS; #ifdef DEBUG_EXCEPTIONS fprintf(stderr,"excp_count = %d\n",excp_count); fprintf(stderr,"redir_excp_count = %d\n",redir_excp_count); fprintf(stderr,"excp_index = %d\n",excp_index); fprintf(stderr,"app_cs %04x\tapp_ds %04x\n",app_cs,app_ds); fprintf(stderr,"my_cs %04x\tmy_ds %04x\n",my_cs,my_ds); for (i=0;i %d\n",filename,retval); #endif in_dbg_fsext--; if (retval != -1) { handles[retval] = retval; __FSEXT_set_function(retval,dbg_fsext); } break; case __FSEXT_open: filename = va_arg(_args,const char *); oflag = va_arg(_args,int); in_dbg_fsext++; retval = _open(filename,oflag); #ifdef DEBUG_DBGCOM_FILES fprintf(stderr,"_open(%s) => %d\n",filename,retval); #endif in_dbg_fsext--; if (retval != -1) { handles[retval] = retval; __FSEXT_set_function(retval,dbg_fsext); } break; case __FSEXT_close: handle = va_arg(_args,int); in_dbg_fsext++; #ifdef DEBUG_DBGCOM_FILES fprintf(stderr,"_close(%d)\n",handle); #endif retval = _close(handle); in_dbg_fsext--; if (retval == 0) { handles[handle] = 0xff; __FSEXT_set_function(handle,NULL); } break; } *_rv = retval; return 1; } /* With attribute constructor to be called automaticaly before main */ static void __attribute__((__constructor__)) _init_dbg_fsext(void) { __dpmi_regs r; int psp_la; int jft_ofs; int jft_count; /* Get our PSP address. */ r.x.ax = 0x6200; __dpmi_int (0x21, &r); psp_la = ( (int)r.x.bx ) << 4; /* Get the offset of the JFT table by (seg << 4) + offset */ jft_ofs = (_farpeekw(_dos_ds, psp_la + 0x36) << 4) + _farpeekw(_dos_ds, psp_la + 0x34); /* Number of used entries in the JFT table */ jft_count = _farpeekw(_dos_ds, psp_la + 0x32); /* Add the handler for opening/creating files */ __FSEXT_add_open_handler(dbg_fsext); /* Initialize all the handles to 0xff */ memset(handles,0xff,sizeof(handles)); /* Get a copy of all already opened handles */ movedata(_dos_ds,jft_ofs,_my_ds(),(int)handles,jft_count); /* enable the fsext function */ in_dbg_fsext = 0; } #endif /* def USE_FSEXT */ /* $Log: dbgcom.c,v $ Revision 1.3 1998/12/21 11:03:01 pierre * problems of FSEXT_dbg solved */ --Message-Boundary-5814--