From 82be433d4188e0b3b992e463ad52ee148d3ad8de Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Tue, 9 Dec 2014 15:02:58 -0800
Subject: Decoder bugfix, .gitignore update, and delete obsolete files.

---
 upb/pb/compile_decoder_x64.dasc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'upb/pb/compile_decoder_x64.dasc')

diff --git a/upb/pb/compile_decoder_x64.dasc b/upb/pb/compile_decoder_x64.dasc
index a87b376..bac1ac2 100644
--- a/upb/pb/compile_decoder_x64.dasc
+++ b/upb/pb/compile_decoder_x64.dasc
@@ -420,13 +420,14 @@ static void emit_static_asm(jitcompiler *jc) {
   |  lea      rcx, [PTR + 10]
   |  mov      rax, PTR    // Preserve PTR in case of fallback to slow path.
   |  cmp      rcx, DATAEND
-  |  cmova    rcx, DATAEND    // rax = MIN(DATAEND, PTR + 10)
+  |  cmova    rcx, DATAEND    // rcx = MIN(DATAEND, PTR + 10)
   |2:
-  |  add      rax, 1
   |  cmp      rax, rcx
   |  je       ->decode_varint_slow
   |  test     byte [rax], 0x80
-  |  jnz      <2
+  |  jz       >3
+  |  add      rax, 1
+  |  jmp      <2
   |3:
   |  mov      PTR, rax  // PTR = varint_end - 1, as desired
   |  ret
-- 
cgit v1.2.3