Re: frysk-imports/include frysk-asm.h

Re: frysk-imports/include frysk-asm.h

[Mark Wielaard]

Hi Jose,

Hi On Wed, 2007-06-27 at 02:22 +0000, jflavio@sourceware.org wrote:
> Log message:
> 	Adding basic frysk-assembler macros for PowerPC64.
> 
> Patches:
> http://sourceware.org/cgi-bin/cvsweb.cgi/frysk-imports/include/frysk-asm.h.diff?cvsroot=frysk&r1=1.5&r2=1.6

This also removed some of the defines for other architectures, which
broke the build:

> --- frysk-imports/include/frysk-asm.h	2007/06/21 19:34:17	1.5
> +++ frysk-imports/include/frysk-asm.h	2007/06/27 02:22:46	1.6
> @@ -83,9 +83,6 @@
>  #define REG2 %rdi
>  #define REG3 %rsi
>  #define REG4 %rdx
> -#define BASEP %rbp
> -#define STACKP %rsp
> -#define IPREG %rip
>  
>  #define NO_OP nop
>  #define ENTER pushq %rbp; movq %rsp, %rbp
> @@ -96,15 +93,6 @@
>  #define LOAD_IMMED(DEST_REG,CONST) mov $CONST, DEST_REG
>  #define STORE(SOURCE_REG,BASE_REG) mov SOURCE_REG, (BASE_REG)
>  #define COMPARE_IMMED(REG,CONST) cmp $CONST, REG
> -#define PUSHQ(REG) pushq REG
> -#define MOVQ(A, B) movq A, B
> -#define MOVL(A, B) movl A, B
> -#define ADDL(A, B) addl $A, B
> -#define SUBQ(A, B) subq $A, B
> -#define TESTL(A, B) testl A, B
> -#define PUSHQ_BASE pushq %rbp
> -#define MOVQ_STACK movq %rsp, %rbp
> -#define LEAVE leave; ret

Please be careful when changing files and use cvs diff first to check
whether it only contains specific changes you intend to commit. I fixed
it by putting these defines back:

2007-06-27  Mark Wielaard  <mwielaard@redhat.com>

    * frysk-asm.h: Various x86 defines back.

Also added a ChangeLog entry for your original change:

2007-06-26  Jose Flavio Aguilar Paulino <jflavio@br.ibm.com>

    * frysk-asm.h: Adding basic frysk-assembler macros for PowerPC64.

Cheers,

Mark

diff -u -r1.6 frysk-asm.h
--- frysk-imports/include/frysk-asm.h   27 Jun 2007 02:22:46 -0000
1.6
+++ frysk-imports/include/frysk-asm.h   27 Jun 2007 08:40:36 -0000
@@ -83,6 +83,10 @@
 #define REG2 %rdi
 #define REG3 %rsi
 #define REG4 %rdx
+#define BASEP %rbp
+#define STACKP %rsp
+#define IPREG %rip
+
 
 #define NO_OP nop
 #define ENTER pushq %rbp; movq %rsp, %rbp
@@ -93,6 +97,15 @@
 #define LOAD_IMMED(DEST_REG,CONST) mov $CONST, DEST_REG
 #define STORE(SOURCE_REG,BASE_REG) mov SOURCE_REG, (BASE_REG)
 #define COMPARE_IMMED(REG,CONST) cmp $CONST, REG
+#define PUSHQ(REG) pushq REG
+#define MOVQ(A, B) movq A, B
+#define MOVL(A, B) movl A, B
+#define ADDL(A, B) addl $A, B
+#define SUBQ(A, B) subq $A, B
+#define TESTL(A, B) testl A, B
+#define PUSHQ_BASE pushq %rbp
+#define MOVQ_STACK movq %rsp, %rbp
+#define LEAVE leave; ret
 
 //XXX: Need the following to be defined in order to compile. See Bug
#3968
 //Intel moves from right to left.