commit 58084f696f4940e6862b1a5daae2e233a0e75b61
author Markus Metzger <markus.t.metzger@intel.com> Wed Sep 21 10:43:46 2016 +0200
committer Markus Metzger <markus.t.metzger@intel.com> Thu Oct 13 08:42:55 2016 +0200
tree 536932e8411a79b0f7ec203c6ef6b7651df0a041
parent 1841a67b470848ce2f0dba62d82face2f3f9e866

libipt, insn: use decode_insn() for decoding instructions

Change all functions that need to decode instructions to use decode_insn() for
both reading memory and the actual instruction decode.

Change-Id: I9765780b363dd65576d1d090e39759064adbab1a
Signed-off-by: Markus Metzger <markus.t.metzger@intel.com>

libipt/src/pt_insn_decoder.c

diff --git a/libipt/src/pt_insn_decoder.c b/libipt/src/pt_insn_decoder.c
index 9825e76..f70ce73 100644
--- a/libipt/src/pt_insn_decoder.c
+++ b/libipt/src/pt_insn_decoder.c
@@ -273,34 +273,26 @@
 {
 	struct pt_insn_ext iext;
 	struct pt_insn insn;
+	struct pt_image *image;
+	const struct pt_asid *asid;
 
 	if (!decoder)
 		return 0;
 
+	image = decoder->image;
+	asid = &decoder->asid;
+
 	/* We do not expect execution mode changes. */
 	insn.mode = decoder->mode;
 	insn.ip = decoder->ip;
 
 	while (insn.ip != ip) {
-		int size, errcode;
+		int errcode;
 
 		if (!steps--)
 			return 0;
 
-		/* If we can't read the memory for the instruction, we can't
-		 * reach it.
-		 */
-		size = pt_image_read(decoder->image, &insn.isid, insn.raw,
-				     sizeof(insn.raw), &decoder->asid, insn.ip);
-		if (size < 0)
-			return 0;
-
-		/* We initialize @insn.size to the maximal possible size.  It
-		 * will be set to the actual size during instruction decode.
-		 */
-		insn.size = (uint8_t) size;
-
-		errcode = pt_ild_decode(&insn, &iext);
+		errcode = decode_insn(&insn, &iext, image, asid);
 		if (errcode < 0)
 			return 0;
 
@@ -637,7 +629,7 @@
 {
 	struct pt_insn_ext iext;
 	struct pt_insn insn;
-	int size, errcode, isid;
+	int errcode;
 
 	if (!decoder)
 		return -pte_internal;
@@ -645,17 +637,7 @@
 	insn.mode = decoder->mode;
 	insn.ip = decoder->ip;
 
-	size = pt_image_read(decoder->image, &isid, insn.raw, sizeof(insn.raw),
-			     &decoder->asid, insn.ip);
-	if (size < 0)
-		return 0;
-
-	/* We initialize @insn.size to the maximal possible size.  It will be
-	 * set to the actual size during instruction decode.
-	 */
-	insn.size = (uint8_t) size;
-
-	errcode = pt_ild_decode(&insn, &iext);
+	errcode = decode_insn(&insn, &iext, decoder->image, &decoder->asid);
 	if (errcode < 0)
 		return 0;