From 906b4b2edee27b70cb33295bfd01ef89bddc3d2c Mon Sep 17 00:00:00 2001 From: Bryce Denney Date: Wed, 20 Nov 2002 17:55:41 +0000 Subject: [PATCH] - change BX_SREG_CS to BX_SEG_REG_CS --- bochs/instrument/example0/instrument.cc | 4 ++-- bochs/instrument/example1/instrument.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bochs/instrument/example0/instrument.cc b/bochs/instrument/example0/instrument.cc index e5d9faefb..e123ac52d 100644 --- a/bochs/instrument/example0/instrument.cc +++ b/bochs/instrument/example0/instrument.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: instrument.cc,v 1.7 2002-10-25 11:44:37 bdenney Exp $ +// $Id: instrument.cc,v 1.8 2002-11-20 17:55:40 bdenney Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2001 MandrakeSoft S.A. @@ -135,7 +135,7 @@ static void branch_taken(unsigned cpu, bx_address new_eip) } // find linear address - laddr = BX_CPU(cpu)->get_segment_base(BX_SREG_CS) + new_eip; + laddr = BX_CPU(cpu)->get_segment_base(BX_SEG_REG_CS) + new_eip; instruction[cpu].is_branch = 1; instruction[cpu].is_taken = 1; diff --git a/bochs/instrument/example1/instrument.cc b/bochs/instrument/example1/instrument.cc index 159a377be..32327f02f 100644 --- a/bochs/instrument/example1/instrument.cc +++ b/bochs/instrument/example1/instrument.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: instrument.cc,v 1.4 2002-10-25 11:44:37 bdenney Exp $ +// $Id: instrument.cc,v 1.5 2002-11-20 17:55:41 bdenney Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2001 MandrakeSoft S.A. @@ -91,7 +91,7 @@ void bxInstrumentation::branch_taken(bx_address new_eip) } // find linear address - laddr = BX_CPU(cpu_id)->get_segment_base(BX_SREG_CS) + new_eip; + laddr = BX_CPU(cpu_id)->get_segment_base(BX_SEG_REG_CS) + new_eip; is_branch = 1; is_taken = 1;