From owner-p4-projects@FreeBSD.ORG Thu May 29 15:46:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFE2337B405; Thu, 29 May 2003 15:46:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 256F437B404 for ; Thu, 29 May 2003 15:46:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C73F43F93 for ; Thu, 29 May 2003 15:46:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4TMku0U068516 for ; Thu, 29 May 2003 15:46:56 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4TMkuBW068513 for perforce@freebsd.org; Thu, 29 May 2003 15:46:56 -0700 (PDT) Date: Thu, 29 May 2003 15:46:56 -0700 (PDT) Message-Id: <200305292246.h4TMkuBW068513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 32068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 May 2003 22:47:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=32068 Change 32068 by peter@peter_hammer on 2003/05/29 15:46:02 brutal partial conversion Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/amd64-gdbstub.c#2 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/amd64-gdbstub.c#2 (text+ko) ==== @@ -420,16 +420,16 @@ int addr, length; char * ptr; struct i386regs { - unsigned int eax; - unsigned int ecx; - unsigned int edx; - unsigned int ebx; - unsigned int esp; - unsigned int ebp; - unsigned int esi; - unsigned int edi; - unsigned int eip; - unsigned int eflags; + unsigned int rax; + unsigned int rcx; + unsigned int rdx; + unsigned int rbx; + unsigned int rsp; + unsigned int rbp; + unsigned int rsi; + unsigned int rdi; + unsigned int rip; + unsigned int rflags; unsigned int cs; unsigned int ss; unsigned int ds; @@ -437,23 +437,23 @@ }; struct i386regs registers; - registers.eax = raw_regs->tf_eax; - registers.ebx = raw_regs->tf_ebx; - registers.ecx = raw_regs->tf_ecx; - registers.edx = raw_regs->tf_edx; + registers.rax = raw_regs->tf_rax; + registers.rbx = raw_regs->tf_rbx; + registers.rcx = raw_regs->tf_rcx; + registers.rdx = raw_regs->tf_rdx; - registers.esp = raw_regs->tf_esp; - registers.ebp = raw_regs->tf_ebp; - registers.esi = raw_regs->tf_esi; - registers.edi = raw_regs->tf_edi; + registers.rsp = raw_regs->tf_rsp; + registers.rbp = raw_regs->tf_rbp; + registers.rsi = raw_regs->tf_rsi; + registers.rdi = raw_regs->tf_rdi; - registers.eip = raw_regs->tf_eip; - registers.eflags = raw_regs->tf_eflags; + registers.rip = raw_regs->tf_rip; + registers.rflags = raw_regs->tf_rflags; registers.cs = raw_regs->tf_cs; registers.ss = raw_regs->tf_ss; - registers.ds = raw_regs->tf_ds; - registers.es = raw_regs->tf_es; + registers.ds = 0; /* XXX rds() */ + registers.es = 0; /* XXX res() */ /* reply to host that an exception has occurred */ sigval = computeSignal (type); @@ -466,19 +466,19 @@ *ptr++ = hexchars[PC >> 4]; *ptr++ = hexchars[PC & 0xf]; *ptr++ = ':'; - ptr = mem2hex ((vm_offset_t)®isters.eip, ptr, 4); + ptr = mem2hex ((vm_offset_t)®isters.rip, ptr, 4); *ptr++ = ';'; *ptr++ = hexchars[FP >> 4]; *ptr++ = hexchars[FP & 0xf]; *ptr++ = ':'; - ptr = mem2hex ((vm_offset_t)®isters.ebp, ptr, 4); + ptr = mem2hex ((vm_offset_t)®isters.rbp, ptr, 4); *ptr++ = ';'; *ptr++ = hexchars[SP >> 4]; *ptr++ = hexchars[SP & 0xf]; *ptr++ = ':'; - ptr = mem2hex ((vm_offset_t)®isters.esp, ptr, 4); + ptr = mem2hex ((vm_offset_t)®isters.rsp, ptr, 4); *ptr++ = ';'; *ptr++ = 0; @@ -577,32 +577,34 @@ ptr = &remcomInBuffer[1]; if (hexToInt(&ptr,&addr)) - registers.eip = addr; + registers.rip = addr; /* set the trace bit if we're stepping */ if (remcomInBuffer[0] == 's') - registers.eflags |= PSL_T; + registers.rflags |= PSL_T; else - registers.eflags &= ~PSL_T; + registers.rflags &= ~PSL_T; - raw_regs->tf_eax = registers.eax; - raw_regs->tf_ebx = registers.ebx; - raw_regs->tf_ecx = registers.ecx; - raw_regs->tf_edx = registers.edx; + raw_regs->tf_rax = registers.rax; + raw_regs->tf_rbx = registers.rbx; + raw_regs->tf_rcx = registers.rcx; + raw_regs->tf_rdx = registers.rdx; - raw_regs->tf_esp = registers.esp; - raw_regs->tf_ebp = registers.ebp; - raw_regs->tf_esi = registers.esi; - raw_regs->tf_edi = registers.edi; + raw_regs->tf_rsp = registers.rsp; + raw_regs->tf_rbp = registers.rbp; + raw_regs->tf_rsi = registers.rsi; + raw_regs->tf_rdi = registers.rdi; - raw_regs->tf_eip = registers.eip; - raw_regs->tf_eflags = registers.eflags; + raw_regs->tf_rip = registers.rip; + raw_regs->tf_rflags = registers.rflags; raw_regs->tf_cs = registers.cs; raw_regs->tf_ss = registers.ss; +#if 0 raw_regs->tf_ds = registers.ds; raw_regs->tf_es = registers.es; +#endif return 0; } /* switch */