This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository ioquake3.
commit 7c252066a3bb3b33e0a9f514a1085333c1fca9f5
Author: Zack Middleton <z...@cloemail.com>
Date: Sat Jul 8 16:46:41 2017 -0500
Fix set-but-not-used variable warnings in vm_armv7l.c
offsidx and const_value were set but not used.
---
code/qcommon/vm_armv7l.c | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/code/qcommon/vm_armv7l.c b/code/qcommon/vm_armv7l.c
index dd63f5c..8f2bd8c 100644
--- a/code/qcommon/vm_armv7l.c
+++ b/code/qcommon/vm_armv7l.c
@@ -599,11 +599,11 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
unsigned char *code;
int i_count, pc = 0;
int pass;
- int codeoffsets[1024];
+ int codeoffsets[2]; // was 1024 but it's only used for OFF_CODE and
OFF_IMMEDIATES
#define j_rel(x) (pass?_j_rel(x, pc):0xBAD)
#define OFFSET(i) (pass?(j_rel(codeoffsets[i]-vm->codeLength)):(0xF000000F))
-#define new_offset() (offsidx++)
+//#define new_offset() (offsidx++)
#define get_offset(i) (codeoffsets[i])
#define save_offset(i) (codeoffsets[i] = vm->codeLength)
#define OFF_CODE 0
@@ -616,10 +616,12 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
for (pass = 0; pass < 2; ++pass) {
- int offsidx = 0;
+// int offsidx = 0;
+#ifdef CONST_OPTIMIZE
// const optimization
unsigned got_const = 0, const_value = 0;
+#endif
if(pass)
{
@@ -656,7 +658,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
emit(BKPT(0));
save_offset(OFF_CODE);
- offsidx = OFF_IMMEDIATES+1;
+// offsidx = OFF_IMMEDIATES+1;
code = (unsigned char *) header + header->codeOffset;
pc = 0;
@@ -744,9 +746,14 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
emit_MOVR0i(i_count);
emit(STRa(R0, rDATABASE, rPSTACK)); //
dataBase[pstack] = r0
#endif
- if (got_const) {
+#ifdef CONST_OPTIMIZE
+ if (got_const)
+ {
NOTIMPL(op);
- } else {
+ }
+ else
+#endif
+ {
static int bytes_to_skip = -1;
static unsigned start_block = -1;
MAYBE_EMIT_CONST();
@@ -803,9 +810,14 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
break;
case OP_JUMP:
- if(got_const) {
+#ifdef CONST_OPTIMIZE
+ if (got_const)
+ {
NOTIMPL(op);
- } else {
+ }
+ else
+#endif
+ {
emit(LDRTxi(R0, rOPSTACK, 4)); // r0 =
*opstack; rOPSTACK -= 4
CHECK_JUMP;
emit_MOVRxi(R1,
(unsigned)vm->instructionPointers);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
