[linuxsh-dev] [patch] ubc_set_tracing fix

[kaz K. <kk...@rr...>]

Hi,

I've committed the appended patch by Daniel Jacobowitz and its
2.4-branch version to fix GDB problem.

Regards,
	kaz
--
Index: ChangeLog
===================================================================
RCS file: /cvsroot/linuxsh/linux/ChangeLog,v
retrieving revision 1.128
diff -u -3 -p -r1.128 ChangeLog
--- ChangeLog	23 Mar 2003 15:27:58 -0000	1.128
+++ ChangeLog	24 Mar 2003 03:03:13 -0000
@@ -1,3 +1,9 @@
+2003-03-24  Daniel Jacobowitz  <dr...@fa...>
+	    Kaz Kojima  <kk...@rr...>
+
+	* arch/sh/kernel/ptrace.c (ubc_set_tracing): Break before executing
+	instruction.
+
 2003-03-24  SUGIOKA Toshinobu <su...@it...>
 
 	* arch/sh/kernel/entry.S: Call sys_pread_wrapper/sys_pwrite_wrapper
Index: arch/sh/kernel/ptrace.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/ptrace.c,v
retrieving revision 1.6
diff -u -3 -p -r1.6 ptrace.c
--- arch/sh/kernel/ptrace.c	29 Jan 2003 03:14:17 -0000	1.6
+++ arch/sh/kernel/ptrace.c	24 Mar 2003 03:03:15 -0000
@@ -123,10 +123,10 @@ ubc_set_tracing(int asid, unsigned long 
 	ctrl_outl(nextpc1, UBC_BARA);
 	ctrl_outb(asid, UBC_BASRA);
 	if(UBC_TYPE_SH7729){
-		ctrl_outl(0x0fff, UBC_BAMRA);
+		ctrl_outl(0, UBC_BAMRA);
 		ctrl_outw(BBR_INST | BBR_READ | BBR_CPU, UBC_BBRA);
 	}else{
-		ctrl_outb(BAMR_12, UBC_BAMRA);
+		ctrl_outb(0, UBC_BAMRA);
 		ctrl_outw(BBR_INST | BBR_READ, UBC_BBRA);
 	}
 
@@ -134,17 +134,17 @@ ubc_set_tracing(int asid, unsigned long 
 		ctrl_outl(nextpc2, UBC_BARB);
 		ctrl_outb(asid, UBC_BASRB);
 		if(UBC_TYPE_SH7729){
-			ctrl_outl(0x0fff, UBC_BAMRB);
+			ctrl_outl(0, UBC_BAMRB);
 			ctrl_outw(BBR_INST | BBR_READ | BBR_CPU, UBC_BBRB);
 		}else{
-			ctrl_outb(BAMR_12, UBC_BAMRB);
+			ctrl_outb(0, UBC_BAMRB);
 			ctrl_outw(BBR_INST | BBR_READ, UBC_BBRB);
 		}
 	}
 	if(UBC_TYPE_SH7729)
-		ctrl_outl(BRCR_PCBA | BRCR_PCBB | BRCR_PCTE, UBC_BRCR);
+		ctrl_outl(BRCR_PCTE, UBC_BRCR);
 	else
-		ctrl_outw(BRCR_PCBA | BRCR_PCBB, UBC_BRCR);
+		ctrl_outw(0, UBC_BRCR);
 }
 
 /*
Index: ChangeLog
===================================================================
RCS file: /cvsroot/linuxsh/linux/ChangeLog,v
retrieving revision 1.1.1.1.2.59
diff -u -3 -p -r1.1.1.1.2.59 ChangeLog
--- ChangeLog	23 Mar 2003 15:30:58 -0000	1.1.1.1.2.59
+++ ChangeLog	24 Mar 2003 03:05:25 -0000
@@ -1,3 +1,9 @@
+2003-03-24  Daniel Jacobowitz  <dr...@fa...>
+	    Kaz Kojima  <kk...@rr...>
+
+	* arch/sh/kernel/process.c (ubc_set_tracing): Break before executing
+	instruction.
+
 2003-03-24  SUGIOKA Toshinobu <su...@it...>
 
 	* arch/sh/mm/copy_page.S (__copy_user): Add missing exception handling
Index: arch/sh/kernel/process.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/process.c,v
retrieving revision 1.1.1.1.2.2
diff -u -3 -p -r1.1.1.1.2.2 process.c
--- arch/sh/kernel/process.c	12 Nov 2002 02:24:19 -0000	1.1.1.1.2.2
+++ arch/sh/kernel/process.c	24 Mar 2003 03:05:27 -0000
@@ -256,10 +256,10 @@ ubc_set_tracing(int asid, unsigned long 
 	ctrl_outl(nextpc1, UBC_BARA);
 	ctrl_outb(asid, UBC_BASRA);
 	if(UBC_TYPE_SH7729){
-		ctrl_outl(0x0fff, UBC_BAMRA);
+		ctrl_outl(0, UBC_BAMRA);
 		ctrl_outw(BBR_INST | BBR_READ | BBR_CPU, UBC_BBRA);
 	}else{
-		ctrl_outb(BAMR_12, UBC_BAMRA);
+		ctrl_outb(0, UBC_BAMRA);
 		ctrl_outw(BBR_INST | BBR_READ, UBC_BBRA);
 	}
 
@@ -267,17 +267,17 @@ ubc_set_tracing(int asid, unsigned long 
 		ctrl_outl(nextpc2, UBC_BARB);
 		ctrl_outb(asid, UBC_BASRB);
 		if(UBC_TYPE_SH7729){
-			ctrl_outl(0x0fff, UBC_BAMRB);
+			ctrl_outl(0, UBC_BAMRB);
 			ctrl_outw(BBR_INST | BBR_READ | BBR_CPU, UBC_BBRB);
 		}else{
-			ctrl_outb(BAMR_12, UBC_BAMRB);
+			ctrl_outb(0, UBC_BAMRB);
 			ctrl_outw(BBR_INST | BBR_READ, UBC_BBRB);
 		}
 	}
 	if(UBC_TYPE_SH7729)
-		ctrl_outl(BRCR_PCBA | BRCR_PCBB | BRCR_PCTE, UBC_BRCR);
+		ctrl_outl(BRCR_PCTE, UBC_BRCR);
 	else
-		ctrl_outw(BRCR_PCBA | BRCR_PCBB, UBC_BRCR);
+		ctrl_outw(0, UBC_BRCR);
 }
 
 /*