From 361dc65fd33606dab1b4b85c0135d49744cc58a4 Mon Sep 17 00:00:00 2001
From: heavyiron <heavyiron@kolibrios.org>
Date: Fri, 27 Mar 2009 22:25:44 +0000
Subject: [PATCH] fasm

version 1.67.37 (Mar 24, 2009)
[-] The .efi extension is now generated for EFI PE formats.
[-] Fixed a bug with invalid size of memory operand for SSE4 instructions.

version 1.67.36 (Mar 20, 2009)
[-] The size of section table was stored with a wrong value in symbols file, it should have the correct value now.


git-svn-id: svn://kolibrios.org@1054 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/develop/fasm/trunk/formats.inc | 7 ++++++-
 programs/develop/fasm/trunk/version.inc | 2 +-
 programs/develop/fasm/trunk/x86_64.inc  | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/programs/develop/fasm/trunk/formats.inc b/programs/develop/fasm/trunk/formats.inc
index 7026f8a531..ee976a11d7 100644
--- a/programs/develop/fasm/trunk/formats.inc
+++ b/programs/develop/fasm/trunk/formats.inc
@@ -46,6 +46,8 @@ formatter:
 	jne	no_extension
 	cmp	[subsystem],1
 	je	sys_extension
+	cmp	[subsystem],10
+	jae	efi_extension
 	bt	[format_flags],8
 	jnc	exe_extension
 	mov	eax,'.dll'
@@ -53,6 +55,9 @@ formatter:
       sys_extension:
 	mov	eax,'.sys'
 	jmp	make_extension
+      efi_extension:
+	mov	eax,'.efi'
+	jmp	make_extension
       bin_extension:
 	mov	eax,'.bin'
 	bt	[format_flags],0
@@ -4129,7 +4134,7 @@ dump_symbols:
 	add	eax,ecx
 	mov	[ebx-38h+28h],eax
 	mov	eax,[number_of_sections]
-	shl	eax,3
+	shl	eax,2
 	mov	[ebx-38h+34h],eax
 	mov	esi,[memory_start]
       prepare_preprocessed_source:
diff --git a/programs/develop/fasm/trunk/version.inc b/programs/develop/fasm/trunk/version.inc
index 7a899f5f4d..3052a9d83f 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.67.35"
+VERSION_STRING equ "1.67.37"
 
 VERSION_MAJOR = 1
 VERSION_MINOR = 67
diff --git a/programs/develop/fasm/trunk/x86_64.inc b/programs/develop/fasm/trunk/x86_64.inc
index 81c38bd328..462840641c 100644
--- a/programs/develop/fasm/trunk/x86_64.inc
+++ b/programs/develop/fasm/trunk/x86_64.inc
@@ -5411,6 +5411,7 @@ sse4_instruction_38:
 	mov	[base_code],0Fh
 	mov	[supplemental_code],al
 	mov	al,38h
+	mov	[mmx_size],16
 	jmp	sse_instruction
 sse4_instruction_3a_imm8:
 	mov	[immediate_size],8
@@ -5419,6 +5420,7 @@ sse4_instruction_3a:
 	mov	[base_code],0Fh
 	mov	[supplemental_code],al
 	mov	al,3Ah
+	mov	[mmx_size],16
 	jmp	sse_instruction
 extractps_instruction:
 	mov	[opcode_prefix],66h