make checkstack on m68k

make checkstack on m68k

[Geert Uytterhoeven]

I tried to add m68k support to `make checkstack', but got stuck due to my
limited knowledge of complex perl expressions. I actually need to catch both
expressions (incl. the one I commented out). Anyone who can help?

Anyway, here's a first run:
  - Add half-assed m68 support.
  - Make sure `make checkstack' uses the script in the source tree directory
    (BTW, I saw a few more targets in my eye corner that may need this)
  - Fix checkstack.pl naming

--- linux-2.6.7/Makefile	2004-06-16 13:06:15.000000000 +0200
+++ linux-m68k-2.6.7/Makefile	2004-06-16 18:27:13.000000000 +0200
@@ -1070,7 +1070,7 @@ endif #ifeq ($(mixed-targets),1)
 .PHONY: checkstack
 checkstack:
 	$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
-	$(PERL) scripts/checkstack.pl $(ARCH)
+	$(PERL) $(src)/scripts/checkstack.pl $(ARCH)

 # FIXME Should go into a make.lib or something
 # ===========================================================================
--- linux-2.6.7/scripts/checkstack.pl	2004-06-09 14:51:23.000000000 +0200
+++ linux-m68k-2.6.7/scripts/checkstack.pl	2004-06-16 18:39:06.000000000 +0200
@@ -12,7 +12,7 @@
 #	Random bits by Matt Mackall <mpm@selenic.com>
 #
 #	Usage:
-#	objdump -d vmlinux | stackcheck_ppc.pl [arch]
+#	objdump -d vmlinux | stackcheck.pl [arch]
 #
 #	TODO :	Port to all architectures (one regex per arch)

@@ -40,6 +40,11 @@
 	} elsif ($arch =~ /^ia64$/) {
 		#e0000000044011fc:       01 0f fc 8c     adds r12=-384,r12
 		$re = qr/.*adds.*r12=-(([0-9]{2}|[3-9])[0-9]{2}),r12/o;
+	} elsif ($arch =~ /^m68k$/) {
+		#2b6c:       4e56 fb70       linkw %fp,#-1168
+		#$re = qr/.*linkw %fp,#-([0-9]{1,4})/o;
+		#1df770:       defc ffe4       addaw #-28,%sp
+		$re = qr/.*addaw #-([0-9]{1,4}),%sp/o;
 	} elsif ($arch =~ /^mips64$/) {
 		#8800402c:       67bdfff0        daddiu  sp,sp,-16
 		$re = qr/.*daddiu.*sp,sp,-(([0-9]{2}|[3-9])[0-9]{2})/o;

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: make checkstack on m68k

[Jörn Engel]

On Wed, 16 June 2004 18:51:03 +0200, Geert Uytterhoeven wrote:
> 
> I tried to add m68k support to `make checkstack', but got stuck due to my
> limited knowledge of complex perl expressions. I actually need to catch both
> expressions (incl. the one I commented out). Anyone who can help?
> 
> Anyway, here's a first run:
>   - Add half-assed m68 support.
>   - Make sure `make checkstack' uses the script in the source tree directory
>     (BTW, I saw a few more targets in my eye corner that may need this)
>   - Fix checkstack.pl naming
> 
> --- linux-2.6.7/Makefile	2004-06-16 13:06:15.000000000 +0200
> +++ linux-m68k-2.6.7/Makefile	2004-06-16 18:27:13.000000000 +0200
> @@ -1070,7 +1070,7 @@ endif #ifeq ($(mixed-targets),1)
>  .PHONY: checkstack
>  checkstack:
>  	$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
> -	$(PERL) scripts/checkstack.pl $(ARCH)
> +	$(PERL) $(src)/scripts/checkstack.pl $(ARCH)

Does this actually matter?  Didn't hurt me yet.

>  #	Usage:
> -#	objdump -d vmlinux | stackcheck_ppc.pl [arch]
> +#	objdump -d vmlinux | stackcheck.pl [arch]

Those were the days... :)
Good catch.

> @@ -40,6 +40,11 @@
>  	} elsif ($arch =~ /^ia64$/) {
>  		#e0000000044011fc:       01 0f fc 8c     adds r12=-384,r12
>  		$re = qr/.*adds.*r12=-(([0-9]{2}|[3-9])[0-9]{2}),r12/o;
> +	} elsif ($arch =~ /^m68k$/) {
> +		#2b6c:       4e56 fb70       linkw %fp,#-1168
> +		#$re = qr/.*linkw %fp,#-([0-9]{1,4})/o;
> +		#1df770:       defc ffe4       addaw #-28,%sp
> +		$re = qr/.*addaw #-([0-9]{1,4}),%sp/o;

For i386 I used a really ugly hack, but this needs someone with better
perl skills.  Matt, can you find a nice regex?  If it adds more
brackets, that's fine.  We'll just add empty brackets to the other
regexes and use $2 instead of $1 or so.

Jörn

-- 
To announce that there must be no criticism of the President, or that we
are to stand by the President, right or wrong, is not only unpatriotic
and servile, but is morally treasonable to the American public.
-- Theodore Roosevelt, Kansas City Star, 1918

Re: make checkstack on m68k

[Geert Uytterhoeven]

On Wed, 16 Jun 2004, [iso-8859-1] Jörn Engel wrote:
> On Wed, 16 June 2004 18:51:03 +0200, Geert Uytterhoeven wrote:
> >   - Make sure `make checkstack' uses the script in the source tree directory
> >     (BTW, I saw a few more targets in my eye corner that may need this)
> >
> > --- linux-2.6.7/Makefile	2004-06-16 13:06:15.000000000 +0200
> > +++ linux-m68k-2.6.7/Makefile	2004-06-16 18:27:13.000000000 +0200
> > @@ -1070,7 +1070,7 @@ endif #ifeq ($(mixed-targets),1)
> >  .PHONY: checkstack
> >  checkstack:
> >  	$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
> > -	$(PERL) scripts/checkstack.pl $(ARCH)
> > +	$(PERL) $(src)/scripts/checkstack.pl $(ARCH)
>
> Does this actually matter?  Didn't hurt me yet.

Do you ever use `make -C path_to_src_tree O=$(pwd) checkstack'?

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: make checkstack on m68k

[Jörn Engel]

On Thu, 17 June 2004 10:25:24 +0200, Geert Uytterhoeven wrote:
> > > -	$(PERL) scripts/checkstack.pl $(ARCH)
> > > +	$(PERL) $(src)/scripts/checkstack.pl $(ARCH)
> >
> > Does this actually matter?  Didn't hurt me yet.
> 
> Do you ever use `make -C path_to_src_tree O=$(pwd) checkstack'?

Ok, convinced.

Jörn

-- 
Eighty percent of success is showing up.
-- Woody Allen

Re: make checkstack on m68k

[Andreas Schwab]

Geert Uytterhoeven <geert@linux-m68k.org> writes:

> I tried to add m68k support to `make checkstack', but got stuck due to my
> limited knowledge of complex perl expressions. I actually need to catch both
> expressions (incl. the one I commented out). Anyone who can help?

Untested:

  $re = qr/.*(?:linkw %fp,|addw )#-([0-9]{1,4})(?:,%sp)?$/o;

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: make checkstack on m68k

[Finn Thain]

On Thu, 17 Jun 2004, Andreas Schwab wrote:

> Geert Uytterhoeven <geert@linux-m68k.org> writes:
>
> > I tried to add m68k support to `make checkstack', but got stuck due to my
> > limited knowledge of complex perl expressions. I actually need to catch both
> > expressions (incl. the one I commented out). Anyone who can help?
>
> Untested:
>
>   $re = qr/.*(?:linkw %fp,|addw )#-([0-9]{1,4})(?:,%sp)?$/o;
>
> Andreas.

I think that should be addaw, not addw. And it may be necessary to remove
the $ anchor at the end.

Your solution makes very nice use of the fact that objdump produces
exactly one comma for those opcodes :)

-F

Re: make checkstack on m68k

[Andreas Schwab]

Finn Thain <ft01@webmastery.com.au> writes:

> On Thu, 17 Jun 2004, Andreas Schwab wrote:
>
>> Geert Uytterhoeven <geert@linux-m68k.org> writes:
>>
>> > I tried to add m68k support to `make checkstack', but got stuck due to my
>> > limited knowledge of complex perl expressions. I actually need to catch both
>> > expressions (incl. the one I commented out). Anyone who can help?
>>
>> Untested:
>>
>>   $re = qr/.*(?:linkw %fp,|addw )#-([0-9]{1,4})(?:,%sp)?$/o;
>>
>> Andreas.
>
> I think that should be addaw, not addw.

Right, typo.

> And it may be necessary to remove the $ anchor at the end.

That won't work, because we must be sure to require ",%sp" when addaw is
matched since we don't want to match, say, "addaw #-1024,%a0".  We know
that this is the whole line to be matched.

> Your solution makes very nice use of the fact that objdump produces
> exactly one comma for those opcodes :)

We know exactly the format of the output produced by objdump.  So even
though the regex is able to match some random junk we know that objdump
would never produce that.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: make checkstack on m68k

[Jörn Engel]

On Fri, 18 June 2004 01:17:31 +1000, Finn Thain wrote:
> To:	Andreas Schwab <schwab@suse.de>
> cc:	Geert Uytterhoeven <geert@linux-m68k.org>,
> 	Linux/m68k <linux-m68k@lists.linux-m68k.org>,
> 	Linux Kernel Development <linux-kernel@vger.kernel.org>

Could you *please* *not* shorten the CC list?  Looks like I'm the
checkstack maintainer, so I like to read your comments.  Especially,
since they are useful ;)

> On Thu, 17 Jun 2004, Andreas Schwab wrote:
> >
> >   $re = qr/.*(?:linkw %fp,|addw )#-([0-9]{1,4})(?:,%sp)?$/o;
> 
> I think that should be addaw, not addw. And it may be necessary to remove
> the $ anchor at the end.

Changed, updated patch below.  Thanks.

Can anyone test?

Jörn

-- 
Don't patch bad code, rewrite it.
-- Kernigham and Pike, according to Rusty


 checkstack.pl |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- linux-2.6.7cow/scripts/checkstack.pl~cs_m68k	2004-06-17 14:58:25.000000000 +0200
+++ linux-2.6.7cow/scripts/checkstack.pl	2004-06-17 20:25:30.000000000 +0200
@@ -40,6 +40,10 @@
 	} elsif ($arch =~ /^ia64$/) {
 		#e0000000044011fc:       01 0f fc 8c     adds r12=-384,r12
 		$re = qr/.*adds.*r12=-(([0-9]{2}|[3-9])[0-9]{2}),r12/o;
+	 } elsif ($arch =~ /^m68k$/) {
+		#2b6c:       4e56 fb70       linkw %fp,#-1168
+		#1df770:       defc ffe4       addaw #-28,%sp
+		$re = qr/.*(?:linkw %fp,|addaw )#-[0-9]{1,4}(?:,%sp)?/o;
 	} elsif ($arch =~ /^mips64$/) {
 		#8800402c:       67bdfff0        daddiu  sp,sp,-16
 		$re = qr/.*daddiu.*sp,sp,-(([0-9]{2}|[3-9])[0-9]{2})/o;
@@ -76,7 +80,7 @@
 		$func = $1;
 	}
 	if ($line =~ m/$re/) {
-		my $size = $1;
+		my $size = $2;
 		$size = hex($size) if ($size =~ /^0x/);
 
 		if ($size > 0x80000000) {

Re: make checkstack on m68k

[Geert Uytterhoeven]

On Thu, 17 Jun 2004, [iso-8859-1] Jörn Engel wrote:
> On Fri, 18 June 2004 01:17:31 +1000, Finn Thain wrote:
> > On Thu, 17 Jun 2004, Andreas Schwab wrote:
> > >
> > >   $re = qr/.*(?:linkw %fp,|addw )#-([0-9]{1,4})(?:,%sp)?$/o;
> >
> > I think that should be addaw, not addw. And it may be necessary to remove
> > the $ anchor at the end.
>
> Changed, updated patch below.  Thanks.
>
> Can anyone test?

Doesn't work ;-(

I also tried with

    $re = qr/.*(?:linkw %fp,|addaw )#-([0-9]{1,4})(?:,%sp)?$/o;

but still didn't work ;-(

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: make checkstack on m68k

[Geert Uytterhoeven]

On Thu, 17 Jun 2004, Geert Uytterhoeven wrote:
> On Thu, 17 Jun 2004, [iso-8859-1] Jörn Engel wrote:
> > On Fri, 18 June 2004 01:17:31 +1000, Finn Thain wrote:
> > > On Thu, 17 Jun 2004, Andreas Schwab wrote:
> > > >
> > > >   $re = qr/.*(?:linkw %fp,|addw )#-([0-9]{1,4})(?:,%sp)?$/o;
> > >
> > > I think that should be addaw, not addw. And it may be necessary to remove
> > > the $ anchor at the end.
> >
> > Changed, updated patch below.  Thanks.
> >
> > Can anyone test?
>
> Doesn't work ;-(
>
> I also tried with
>
>     $re = qr/.*(?:linkw %fp,|addaw )#-([0-9]{1,4})(?:,%sp)?$/o;
>
> but still didn't work ;-(

*bummer*

why doesn't checkstack.pl complain if I forget to specify `m68k'?!?

So it works with the above regex, if I undo the `my $size = $2;' change as
well.

To avoid mistakes/confusion, here is a patch against pristine 2.6.7:

--- linux-2.6.7/scripts/checkstack.pl	2004-06-09 14:51:23.000000000 +0200
+++ linux-m68k-2.6.7/checkstack.pl	2004-06-17 21:31:45.000000000 +0200
@@ -40,6 +40,10 @@
 	} elsif ($arch =~ /^ia64$/) {
 		#e0000000044011fc:       01 0f fc 8c     adds r12=-384,r12
 		$re = qr/.*adds.*r12=-(([0-9]{2}|[3-9])[0-9]{2}),r12/o;
+	} elsif ($arch =~ /^m68k$/) {
+		#    2b6c:       4e56 fb70       linkw %fp,#-1168
+		#  1df770:       defc ffe4       addaw #-28,%sp
+		$re = qr/.*(?:linkw %fp,|addaw )#-([0-9]{1,4})(?:,%sp)?$/o;
 	} elsif ($arch =~ /^mips64$/) {
 		#8800402c:       67bdfff0        daddiu  sp,sp,-16
 		$re = qr/.*daddiu.*sp,sp,-(([0-9]{2}|[3-9])[0-9]{2})/o;


Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: make checkstack on m68k

[Jörn Engel]

On Thu, 17 June 2004 21:36:11 +0200, Geert Uytterhoeven wrote:
> 
> *bummer*
> 
> why doesn't checkstack.pl complain if I forget to specify `m68k'?!?

It tries to guess the architecture on it's own.  Guessing is not
working for m68k, aparently.

What does "uname -m" tell you?

[ Yes, this breaks for cross compilation.  If anyone really cares,
please send patches. ]

Jörn

-- 
The strong give up and move away, while the weak give up and stay.
-- unknown

Re: make checkstack on m68k

[Geert Uytterhoeven]

On Fri, 18 Jun 2004, [iso-8859-1] Jörn Engel wrote:
> On Thu, 17 June 2004 21:36:11 +0200, Geert Uytterhoeven wrote:
> > *bummer*
> >
> > why doesn't checkstack.pl complain if I forget to specify `m68k'?!?
>
> It tries to guess the architecture on it's own.  Guessing is not
> working for m68k, aparently.
>
> What does "uname -m" tell you?

That I'm cross-compiling on an ia32 box ;-)

> [ Yes, this breaks for cross compilation.  If anyone really cares,
> please send patches. ]

Not needed, it was my own fault, running it by hand...

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: make checkstack on m68k

[Jörn Engel]

On Thu, 17 June 2004 13:41:59 +0200, Andreas Schwab wrote:
> Geert Uytterhoeven <geert@linux-m68k.org> writes:
> 
> > I tried to add m68k support to `make checkstack', but got stuck due to my
> > limited knowledge of complex perl expressions. I actually need to catch both
> > expressions (incl. the one I commented out). Anyone who can help?
> 
> Untested:
> 
>   $re = qr/.*(?:linkw %fp,|addw )#-([0-9]{1,4})(?:,%sp)?$/o;

Thanks!  Geert, can you test the patch below?

[ It will break all platforms except m68k, but I don't want to touch
those REs before someone confirms it to work. ]

Jörn

-- 
Simplicity is prerequisite for reliability.
-- Edsger W. Dijkstra



 checkstack.pl |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- linux-2.6.7cow/scripts/checkstack.pl~cs_m68k	2004-06-17 14:58:25.000000000 +0200
+++ linux-2.6.7cow/scripts/checkstack.pl	2004-06-17 19:39:15.000000000 +0200
@@ -40,6 +40,11 @@
 	} elsif ($arch =~ /^ia64$/) {
 		#e0000000044011fc:       01 0f fc 8c     adds r12=-384,r12
 		$re = qr/.*adds.*r12=-(([0-9]{2}|[3-9])[0-9]{2}),r12/o;
+	 } elsif ($arch =~ /^m68k$/) {
+		#2b6c:       4e56 fb70       linkw %fp,#-1168
+		#1df770:       defc ffe4       addaw #-28,%sp
+		#$re = qr/.*linkw %fp,#-([0-9]{1,4})/o;
+		$re = qr/.*(?:linkw %fp,|addw )#-[0-9]{1,4}(?:,%sp)?$/o;
 	} elsif ($arch =~ /^mips64$/) {
 		#8800402c:       67bdfff0        daddiu  sp,sp,-16
 		$re = qr/.*daddiu.*sp,sp,-(([0-9]{2}|[3-9])[0-9]{2})/o;
@@ -76,7 +81,7 @@
 		$func = $1;
 	}
 	if ($line =~ m/$re/) {
-		my $size = $1;
+		my $size = $2;
 		$size = hex($size) if ($size =~ /^0x/);
 
 		if ($size > 0x80000000) {