[kaffe] CVS kaffe (dalibor): Fixed build of arm-jit again
Kaffe CVS
cvs-commits at kaffe.org
Tue Jul 13 10:32:17 PDT 2004
PatchSet 4963
Date: 2004/07/13 16:38:10
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixed build of arm-jit again
2004-07-13 Dalibor Topic <robilad at kaffe.org>
* config/arm/jit-arm.def:
Fix 'use of compound as lvalue is deprecated' warnings for jit.
Members:
ChangeLog:1.2527->1.2528
config/arm/jit-arm.def:1.5->1.6
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2527 kaffe/ChangeLog:1.2528
--- kaffe/ChangeLog:1.2527 Tue Jul 13 16:15:16 2004
+++ kaffe/ChangeLog Tue Jul 13 16:38:10 2004
@@ -1,5 +1,10 @@
2004-07-13 Dalibor Topic <robilad at kaffe.org>
+ * config/arm/jit-arm.def:
+ Fix 'use of compound as lvalue is deprecated' warnings for jit.
+
+2004-07-13 Dalibor Topic <robilad at kaffe.org>
+
* config/alpha/jit-alpha.def:
Fix 'use of compound as lvalue is deprecated' warnings for jit.
Fixed op_* macros to use ';' after debug statements.
Index: kaffe/config/arm/jit-arm.def
diff -u kaffe/config/arm/jit-arm.def:1.5 kaffe/config/arm/jit-arm.def:1.6
--- kaffe/config/arm/jit-arm.def:1.5 Tue Mar 11 08:00:14 2003
+++ kaffe/config/arm/jit-arm.def Tue Jul 13 16:38:13 2004
@@ -288,40 +288,40 @@
*/
/* register := register x register */
#define op_rrr(CC,ALU,SFT,SFTVAL,DST,SRC1,SRC2) \
- LOUT = 0x00000000|(CC)|(ALU)|(SFT)|((SFTVAL)<<7)|((DST)<<12)|((SRC1)<<16)|(SRC2)
+ LOUT(0x00000000|(CC)|(ALU)|(SFT)|((SFTVAL)<<7)|((DST)<<12)|((SRC1)<<16)|(SRC2))
/* register := register x constant */
#define op_rrc(CC,ALU,DST,SRC1,IMM,IMMSFT) \
- LOUT = 0x02000000|(CC)|(ALU)|((DST)<<12)|((SRC1)<<16)|((IMMSFT)<<8)|((IMM)&0xFF)
+ LOUT(0x02000000|(CC)|(ALU)|((DST)<<12)|((SRC1)<<16)|((IMMSFT)<<8)|((IMM)&0xFF))
/* register := register x register */
#define op_muladd_rrr(CC,MULOP,DST,SRC1,SRC2) \
- LOUT = 0x00000090|(CC)|(MULOP)|((DST)<<16)|(SRC1)|((SRC2)<<8)
+ LOUT(0x00000090|(CC)|(MULOP)|((DST)<<16)|(SRC1)|((SRC2)<<8))
/* Not used or debugged: see 3.8.5
#define op_muladd_rrrr(CC,MULOP,DST,SRC1,SRC2,SRC3) \
- LOUT = 0x00200090|(CC)|(MULOP)|((DST)<<16)|(SRC1)|((SRC2)<<8)|((SRC3)<<12)
+ LOUT(0x00200090|(CC)|(MULOP)|((DST)<<16)|(SRC1)|((SRC2)<<8)|((SRC3)<<12))
*/
#define op_branch(CC,DST) \
- LOUT = 0x0A000000|(CC)|(((DST)>>2)&0x00FFFFFF)
+ LOUT(0x0A000000|(CC)|(((DST)>>2)&0x00FFFFFF))
#define op_branch_linked(CC,DST) \
- LOUT = 0x0B000000|(CC)|(((DST)>>2)&0x00FFFFFF)
+ LOUT(0x0B000000|(CC)|(((DST)>>2)&0x00FFFFFF))
/* Load/Store Word or Unsigned Byte, see 3.11
* ldr REG, [IDX, +/- IDX2] or
* str REG, [IDX, +/- IDX2]
*/
#define op_mem_rrr(CC,MEM,SFT,SFTVAL,REG,IDX,IDX2) \
- LOUT = 0x04000000|(CC)|(MEM)|(SFT)|((SFTVAL)<<7)|((IDX)<<16)|((REG)<<12)|(IDX2)
+ LOUT(0x04000000|(CC)|(MEM)|(SFT)|((SFTVAL)<<7)|((IDX)<<16)|((REG)<<12)|(IDX2))
/* Load/Store Word or Unsigned Byte, see 3.11
* ldr REG, [IDX +/- OFF]
* str REG, [IDX +/- OFF]
*/
#define op_mem_rrc(CC,MEM,REG,IDX,OFF) \
- LOUT = 0x04000000|(CC)|(MEM)|((REG)<<12)|((IDX)<<16)|((OFF)&0xFFF)
+ LOUT(0x04000000|(CC)|(MEM)|((REG)<<12)|((IDX)<<16)|((OFF)&0xFFF))
/* Load and Store Halfword or Load Signed Byte with an immediate 8-bit offset
* ldr{h|sh|sb} REG, [IDX +/- OFF]
@@ -331,10 +331,10 @@
* NB: you cannot use this instruction to store a byte.
*/
#define op_mem_hb_rrc(CC,MEM,SGN,SIZE,REG,IDX,OFF) \
- LOUT = 0x00400090|(CC)|(MEM)|(SGN)|(SIZE)|((IDX)<<16)|((REG)<<12)|((OFF)&0xF)|(((OFF)&0xF0)<<4)
+ LOUT(0x00400090|(CC)|(MEM)|(SGN)|(SIZE)|((IDX)<<16)|((REG)<<12)|((OFF)&0xF)|(((OFF)&0xF0)<<4))
#define op_f_rrr(CC,FALU,PREC,RND,DST,SRC1,SRC2) \
- LOUT = 0x0E000100|(CC)|(FALU)|(PREC)|(RND)|((DST)<<12)|((SRC1)<<16)|(SRC2)
+ LOUT(0x0E000100|(CC)|(FALU)|(PREC)|(RND)|((DST)<<12)|((SRC1)<<16)|(SRC2))
/*
@@ -352,16 +352,16 @@
* Floating point memory operation
*/
#define op_fmem_rrc(CC,MEM,MPREC,REG,IDX,OFF) \
- LOUT = 0x0C000100|(CC)|(MEM)|(MPREC)|((REG)<<12)|((IDX)<<16)|((OFF)&0xFF)
+ LOUT(0x0C000100|(CC)|(MEM)|(MPREC)|((REG)<<12)|((IDX)<<16)|((OFF)&0xFF))
#define op_push_m(T,BITS) \
- LOUT = 0x08000000|CC_AL|MULTI_STORE|MULTI_DB|((T)<<16)|(BITS)
+ LOUT(0x08000000|CC_AL|MULTI_STORE|MULTI_DB|((T)<<16)|(BITS))
/*
* Redefine push to use auto index & writeback (like C calling convention)
*/
#define op_push_prologue(T,BITS) \
- LOUT = 0x08000000|CC_AL|MULTI_STORE|MULTI_DB|MEM_WRTBCK|((T)<<16)|(BITS)
+ LOUT(0x08000000|CC_AL|MULTI_STORE|MULTI_DB|MEM_WRTBCK|((T)<<16)|(BITS))
/*
* Note that this generates the same opcode as used in the normal C
@@ -369,7 +369,7 @@
* this particular usage.
*/
#define op_pop_epilogue(T,BITS) \
- LOUT = 0x08000000|CC_AL|MULTI_LOAD|MULTI_DB|((T)<<16)|(BITS)
+ LOUT(0x08000000|CC_AL|MULTI_LOAD|MULTI_DB|((T)<<16)|(BITS))
/*
* A pop that decrements the SP. This would normally match an op_push
@@ -377,7 +377,7 @@
* epilogue pop.
*/
#define op_pop_m(T,BITS) \
- LOUT = 0x08000000|CC_AL| MULTI_LOAD | MULTI_IA | MEM_WRTBCK |((T)<<16)|(BITS)
+ LOUT(0x08000000|CC_AL| MULTI_LOAD | MULTI_IA | MEM_WRTBCK |((T)<<16)|(BITS))
/*
* Define the instruction macros for later use.
@@ -1399,7 +1399,7 @@
{
jint val = const_int(2);
- LOUT = val;
+ LOUT(val);
debug(("build_key %d", val));
}
@@ -1411,7 +1411,7 @@
l->type |= Llong|Labsolute;
l->at = CODEPC;
l->from = CODEPC;
- LOUT = 0;
+ LOUT(0);
debug(("build_code_ref (@0x%x from 0x%x)\n", l->at, l->from));
}
More information about the kaffe
mailing list