diff options
| author | tsutsui <tsutsui> | 2010-08-09 21:19:09 +0000 |
|---|---|---|
| committer | tsutsui <tsutsui> | 2010-08-09 21:19:09 +0000 |
| commit | f920c9bf69d6ded851b67ed574bb7f4ae7d9e76e (patch) | |
| tree | b0cffdcbbb47d88631cdabf441fcf4fca23543a8 /emulators | |
| parent | 1f5626db079809a0ab897531369d8e822baddfb5 (diff) | |
| download | pkgsrc-f920c9bf69d6ded851b67ed574bb7f4ae7d9e76e.tar.gz | |
Use common style comment and cleanup whitespace/TAB nits in pkgsrc patch.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/qemu/distinfo | 4 | ||||
| -rw-r--r-- | emulators/qemu/patches/patch-ed | 20 |
2 files changed, 11 insertions, 13 deletions
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index c614aa98664..622e2d84076 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.56 2010/08/09 11:46:39 tsutsui Exp $ +$NetBSD: distinfo,v 1.57 2010/08/09 21:19:09 tsutsui Exp $ SHA1 (qemu-0.12.4.tar.gz) = 1cc3200bf496c836f7c4256c1d12143dab9b82dc RMD160 (qemu-0.12.4.tar.gz) = dbf5e02812b0df076e4ec8c20b7c382f7507645e @@ -9,5 +9,5 @@ SHA1 (patch-ba) = f317a580e849aa368f904137d4fb7ce44701a231 SHA1 (patch-dd) = 32661203ba023bea67cd7cde1f4088f4d0e5c582 SHA1 (patch-de) = 225eaa996fccc02b17be0099d943c75302600ada SHA1 (patch-dk) = 5538bebc08b0047e501469f9cb306cb798d0eb00 -SHA1 (patch-ed) = ef1871b82dac9c89dc3c3d28c97805fabeea43ab +SHA1 (patch-ed) = c30e147005e41fbf6d08457634d94cd90545cbb5 SHA1 (patch-ee) = 98081c9468d25564711f37cdff3958037f41b17d diff --git a/emulators/qemu/patches/patch-ed b/emulators/qemu/patches/patch-ed index 5fb2c680501..561f93bded6 100644 --- a/emulators/qemu/patches/patch-ed +++ b/emulators/qemu/patches/patch-ed @@ -1,12 +1,12 @@ -$NetBSD: patch-ed,v 1.1 2010/04/25 12:55:41 gson Exp $ +$NetBSD: patch-ed,v 1.2 2010/08/09 21:19:09 tsutsui Exp $ ---- target-i386/translate.c.orig 2010-02-23 22:54:38.000000000 +0200 +--- target-i386/translate.c.orig 2010-05-04 15:27:48.000000000 +0000 +++ target-i386/translate.c -@@ -4876,20 +4876,24 @@ static target_ulong disas_insn(DisasCont +@@ -4879,20 +4879,23 @@ static target_ulong disas_insn(DisasCont tcg_gen_sub_tl(t2, cpu_regs[R_EAX], t0); gen_extu(ot, t2); tcg_gen_brcondi_tl(TCG_COND_EQ, t2, 0, label1); -+ label2 = gen_new_label(); ++ label2 = gen_new_label(); if (mod == 3) { - label2 = gen_new_label(); gen_op_mov_reg_v(ot, R_EAX, t0); @@ -17,18 +17,16 @@ $NetBSD: patch-ed,v 1.1 2010/04/25 12:55:41 gson Exp $ } else { - tcg_gen_mov_tl(t1, t0); + /* perform no-op store cycle like physical cpu; must be -+ before changing accumulator to ensure idempotency if -+ the store faults and the instruction is restarted -+ */ ++ before changing accumulator to ensure idempotency if ++ the store faults and the instruction is restarted */ + gen_op_st_v(ot + s->mem_index, t0, a0); gen_op_mov_reg_v(ot, R_EAX, t0); -+ tcg_gen_br(label2); ++ tcg_gen_br(label2); gen_set_label(label1); - /* always store */ -- gen_op_st_v(ot + s->mem_index, t1, a0); -+ gen_op_st_v(ot + s->mem_index, t1, a0); + gen_op_st_v(ot + s->mem_index, t1, a0); } -+ gen_set_label(label2); ++ gen_set_label(label2); tcg_gen_mov_tl(cpu_cc_src, t0); tcg_gen_mov_tl(cpu_cc_dst, t2); s->cc_op = CC_OP_SUBB + ot; |