9os

commit cacbb76201a4151eeb31ea1054cd945fbd358c69
parent 17dee06d34846c958cb41c3b5cf09d055441f539
Author: Dimitris Papastamos <dimitris.papastamos@arm.com>
Date:   Sat, 13 Oct 2018 10:17:20 +0100

Rmucmd already contains imm1 and imm2, no need to pass them separately

Change-Id: Idfb8fcae4bd4eea51868943b8612ee0a1f70490c
Signed-off-by: Dimitris Papastamos <dimitris.papastamos@arm.com>

Diffstat:
M
arch/arm64/rom.c
 | 
2
+-
M
include/rcode.h
 | 
2
+-
M
src/rmc.c
 | 
10
+++++-----
M
test/test1/test.c
 | 
2
+-

4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/rom.c b/arch/arm64/rom.c
@@ -16,7 +16,7 @@ synchdl(struct trapframe *fp)
 		panic("wrong exception");
 
 	if (!setjmp(cmd.recover))
-		rmc(cmd.imm1, cmd.imm2, &cmd);
+		rmc(&cmd);
 
 	swtch(fp);
 }
diff --git a/include/rcode.h b/include/rcode.h
@@ -55,7 +55,7 @@ bss(void)
 extern void badrmc(Rmucmd *cmd, int error);
 extern void panic(const char *msg);
 extern void printk(const char * restrict fmt, ...);
-extern void rmc(unsigned imm1, unsigned imm2, Rmucmd *cmd);
+extern void rmc(Rmucmd *cmd);
 extern void swtch(struct trapframe *fp);
 
 /* architectural functions */
diff --git a/src/rmc.c b/src/rmc.c
@@ -21,18 +21,18 @@
  *                ...                                ...
  */
 void
-rmc(unsigned imm1, unsigned imm2, Rmucmd *cmd)
+rmc(Rmucmd *cmd)
 {
 	const struct rowidx *idx;
 
-	if (imm1 > 255 || imm2 > 255)
+	if (cmd->imm1 > 255 || cmd->imm2 > 255)
 		panic("rmc");
 
-	idx = &rowidx[imm1];
-	if (imm2 >= idx->cnt)
+	idx = &rowidx[cmd->imm1];
+	if (cmd->imm2 >= idx->cnt)
 		badrmc(cmd, 1); /* TODO: put the correct code */
 
-	(*handler[idx->off + imm2])(cmd);
+	(*handler[idx->off + cmd->imm2])(cmd);
 
 	cmd->fp->x0 = 0;   /* TODO: 0 means success */
 }
diff --git a/test/test1/test.c b/test/test1/test.c
@@ -17,7 +17,7 @@ main(int argc, char *argv[])
 			cmd.imm2 = j;
 			dbg("%u\t%u\t", i, j);
 			if (!setjmp(cmd.recover))
-				rmc(i, j, &cmd);
+				rmc(&cmd);
 		}
 	}
 	return 0;