From f2a9d1d50006c6d3a808ad8a58016c51ee440772 Mon Sep 17 00:00:00 2001 From: heavyiron Date: Tue, 29 Dec 2009 22:35:40 +0000 Subject: [PATCH] fasm 1.69.11 git-svn-id: svn://kolibrios.org@1342 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/develop/fasm/trunk/version.inc | 2 +- programs/develop/fasm/trunk/x86_64.inc | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/programs/develop/fasm/trunk/version.inc b/programs/develop/fasm/trunk/version.inc index 0251bd7ca5..c1af753f50 100644 --- a/programs/develop/fasm/trunk/version.inc +++ b/programs/develop/fasm/trunk/version.inc @@ -33,7 +33,7 @@ ; cannot simply be copied and put under another distribution licence ; (including the GNU Public Licence). -VERSION_STRING equ "1.69.10" +VERSION_STRING equ "1.69.11" VERSION_MAJOR = 1 VERSION_MINOR = 69 diff --git a/programs/develop/fasm/trunk/x86_64.inc b/programs/develop/fasm/trunk/x86_64.inc index c114799613..810b98dff8 100644 --- a/programs/develop/fasm/trunk/x86_64.inc +++ b/programs/develop/fasm/trunk/x86_64.inc @@ -2949,6 +2949,7 @@ jmp_instruction: jmp_reg_32bit: cmp [code_type],64 je illegal_instruction + call operand_32bit jmp nomem_instruction_ready jmp_reg_16bit: call operand_16bit @@ -4397,7 +4398,12 @@ pmovmskb_instruction: lods byte [esi] call convert_register cmp ah,4 + je pmovmskb_reg_size_ok + cmp [code_type],64 + jne invalid_operand_size + cmp ah,8 jnz invalid_operand_size + pmovmskb_reg_size_ok: mov [postbyte_register],al mov [operand_size],0 lods byte [esi] @@ -5581,6 +5587,8 @@ pextrb_instruction: ja pextrq_reg cmp ah,4 je pextr_reg_size_ok + cmp [code_type],64 + jne pextr_invalid_size cmp ah,8 je pextr_reg_size_ok pextr_invalid_size: