Add push/pop instructions test in test harness

Commit Message

Mohammed Gamal Aug. 18, 2009, 12:51 p.m. UTC

Signed-off-by: Mohammed Gamal <[e-mail]>
---
 kvm/user/test/x86/realmode.c |   66 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 64 insertions(+), 2 deletions(-)

Comments

Avi Kivity Aug. 18, 2009, 2:43 p.m. UTC | #1

On 08/18/2009 03:51 PM, Mohammed Gamal wrote:
> Signed-off-by: Mohammed Gamal<[e-mail]>
> ---
>   kvm/user/test/x86/realmode.c |   66 ++++++++++++++++++++++++++++++++++++++++-
>    

Note: the test harness currently depends on kvmctl; if we port it to run 
with 'qemu -kernel' (should be easy with the new multiboot support), we 
can add it to kvm-autotest and get the benefit of automatic testing.

Patch

diff --git a/kvm/user/test/x86/realmode.c b/kvm/user/test/x86/realmode.c
index 755b5d1..e8d5eef 100644
--- a/kvm/user/test/x86/realmode.c
+++ b/kvm/user/test/x86/realmode.c
@@ -467,6 +467,67 @@  void test_long_jmp()
 	if(!regs_equal(&inregs, &outregs, R_AX) || outregs.eax != 0x1234)
 		print_serial("Long JMP Test: FAIL\n");
 }
+void test_push_pop()
+{
+	struct regs inregs = { 0 }, outregs;
+	MK_INSN(push32, "mov $0x12345678, %eax\n\t"
+			"push %eax\n\t"
+			"pop %ebx\n\t");
+	MK_INSN(push16, "mov $0x1234, %ax\n\t"
+			"push %ax\n\t"
+			"pop %bx\n\t");
+
+	MK_INSN(push_es, "mov $0x231, %bx\n\t" //Just write a dummy value to see if it gets overwritten
+			 "mov $0x123, %ax\n\t"
+			 "mov %ax, %es\n\t"
+			 "push %es\n\t"
+			 "pop %bx \n\t"
+			 );
+	MK_INSN(pop_es, "push %es\n\t"
+			"push %ax\n\t"
+			"pop %es\n\t"
+			"mov %es, %bx\n\t"
+			"pop %es\n\t"
+			);
+	MK_INSN(push_pop_ss, "push %ss\n\t"
+			     "push %ax\n\t"
+			     "pop %ss\n\t"
+			     "mov %ss, %bx\n\t"
+			     "pop %ss\n\t"
+			);
+	exec_in_big_real_mode(&inregs, &outregs,
+			      insn_push32,
+			      insn_push32_end - insn_push32);
+	if (!regs_equal(&inregs, &outregs, R_AX|R_BX) || outregs.eax != outregs.ebx || outregs.eax != 0x12345678)
+		print_serial("Push/Pop Test 1: FAIL\n");
+
+	exec_in_big_real_mode(&inregs, &outregs,
+			      insn_push16,
+			      insn_push16_end - insn_push16);
+
+	if (!regs_equal(&inregs, &outregs, R_AX|R_BX) || outregs.eax != outregs.ebx || outregs.eax != 0x1234)
+		print_serial("Push/Pop Test 2: FAIL\n");
+
+	exec_in_big_real_mode(&inregs, &outregs,
+			      insn_push_es,
+			      insn_push_es_end - insn_push_es);
+	if (!regs_equal(&inregs, &outregs, R_AX|R_BX) ||  outregs.ebx != outregs.eax || outregs.eax != 0x123)
+		print_serial("Push/Pop Test 3: FAIL\n");
+
+	exec_in_big_real_mode(&inregs, &outregs,
+			      insn_pop_es,
+			      insn_pop_es_end - insn_pop_es);
+
+	if (!regs_equal(&inregs, &outregs, R_AX|R_BX) || outregs.ebx != outregs.eax)
+		print_serial("Push/Pop Test 4: FAIL\n");
+
+	exec_in_big_real_mode(&inregs, &outregs,
+			      insn_push_pop_ss,
+			      insn_push_pop_ss_end - insn_push_pop_ss);
+
+	if (!regs_equal(&inregs, &outregs, R_AX|R_BX) || outregs.ebx != outregs.eax)
+		print_serial("Push/Pop Test 5: FAIL\n");
+}
 
 void test_null(void)
 {
@@ -479,8 +540,9 @@  void test_null(void)
 void start(void)
 {
 	test_null();
-
+	
 	test_shld();
+	test_push_pop();
 	test_mov_imm();
 	test_cmp_imm();
 	test_add_imm();
@@ -492,7 +554,7 @@  void start(void)
 	test_call();
 	/* long jmp test uses call near so test it after testing call */
 	test_long_jmp();
-
+	
 	exit(0);
 }