Attachment 872588 Details for Bug 1219733

patch for assembly files

qemu-fix-asm.patch (text/plain), 10.87 KB, created by Michael Matz on 2024-02-08 13:19:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Matz

Created: 2024-02-08 13:19:46 UTC

Size: 10.87 KB

patch

obsolete

>Index: qemu-8.2.0/roms/ipxe/src/arch/i386/core/setjmp.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/i386/core/setjmp.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/i386/core/setjmp.S	2024-02-07 14:21:38.167062953 +0100
>@@ -1,8 +1,8 @@
> FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> 
> 	.text
>-	.arch i386
> 	.code32
>+	.arch i386
> 
> 	/* Must match jmp_buf structure layout */
> 	.struct	0
>Index: qemu-8.2.0/roms/ipxe/src/arch/i386/tests/gdbstub_test.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/i386/tests/gdbstub_test.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/i386/tests/gdbstub_test.S	2024-02-07 14:21:54.240658681 +0100
>@@ -1,3 +1,4 @@
>+	.code32
> 	.arch i386
> 
> 	.section ".data", "aw", @progbits
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/core/patch_cf.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/core/patch_cf.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/core/patch_cf.S	2024-02-07 14:22:03.960817353 +0100
>@@ -23,8 +23,8 @@
> FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> 
> 	.text
>-	.arch i386
> 	.code16
>+	.arch i386
> 
> /****************************************************************************
>  * Set/clear CF on the stack as appropriate, assumes stack is as it should
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/core/stack.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/core/stack.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/core/stack.S	2024-02-07 14:22:20.331084589 +0100
>@@ -1,5 +1,6 @@
> FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> 
>+	.code32
> 	.arch i386
> 
> #ifdef __x86_64__
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/core/stack16.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/core/stack16.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/core/stack16.S	2024-02-07 14:22:28.184546140 +0100
>@@ -1,5 +1,6 @@
> FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> 
>+	.code32
> 	.arch i386
> 
> /****************************************************************************
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/drivers/net/undiisr.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/drivers/net/undiisr.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/drivers/net/undiisr.S	2024-02-07 14:22:37.114691931 +0100
>@@ -11,8 +11,8 @@ FILE_LICENCE ( GPL2_OR_LATER )
> #define PIC2_ICR 0xa0
> 	
> 	.text
>-	.arch i386
> 	.code16
>+	.arch i386
> 
> 	.section ".text16", "ax", @progbits
> 	.globl undiisr
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/interface/pcbios/e820mangler.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/interface/pcbios/e820mangler.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/interface/pcbios/e820mangler.S	2024-02-07 14:23:09.898560450 +0100
>@@ -24,8 +24,8 @@
> FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> 
> 	.text
>-	.arch i386
> 	.code16
>+	.arch i386
> 
> #define SMAP 0x534d4150
> 
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/interface/pxe/pxe_entry.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/interface/pxe/pxe_entry.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/interface/pxe/pxe_entry.S	2024-02-07 14:23:31.458912392 +0100
>@@ -26,6 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> 
> #include <librm.h>
> 
>+	.code32
> 	.arch i386
> 
> /****************************************************************************
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/bootpart.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/prefix/bootpart.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/bootpart.S	2024-02-07 14:23:45.995816355 +0100
>@@ -6,6 +6,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> #define STACK_SIZE	0x2000
> 	
> 	.text
>+	.code16
> 	.arch i386
> 	.section ".prefix", "awx", @progbits
> 	.code16
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/dskprefix.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/prefix/dskprefix.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/dskprefix.S	2024-02-07 14:23:58.532687644 +0100
>@@ -25,6 +25,7 @@ FILE_LICENCE ( GPL2_ONLY )
> .equ	SYSSEG, 0x1000			/* system loaded at SYSSEG<<4 */
> 
> 	.org	0
>+	.code16
> 	.arch i386
> 	.text
> 	.section ".prefix", "ax", @progbits
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/exeprefix.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/prefix/exeprefix.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/exeprefix.S	2024-02-07 14:24:12.339579717 +0100
>@@ -37,6 +37,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> #define PSP_CMDLINE_START 0x81
> 
> 	.text
>+	.code16
> 	.arch i386
> 	.org 0
> 	.code16
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/hdprefix.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/prefix/hdprefix.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/hdprefix.S	2024-02-07 14:24:26.866483542 +0100
>@@ -3,6 +3,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> #include <librm.h>
> 
> 	.text
>+	.code16
> 	.arch i386
> 	.section ".prefix", "awx", @progbits
> 	.code16
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/libprefix.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/prefix/libprefix.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/libprefix.S	2024-02-07 14:25:25.654109895 +0100
>@@ -26,6 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> 
> #include <librm.h>
> 
>+	.code32
> 	.arch i386
> 
> /* Image compression enabled */
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/lkrnprefix.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/prefix/lkrnprefix.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/lkrnprefix.S	2024-02-07 14:25:38.437651935 +0100
>@@ -5,8 +5,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> #define BZI_LOAD_HIGH_ADDR 0x100000
> 
> 	.text
>-	.arch i386
> 	.code16
>+	.arch i386
> 	.section ".prefix", "ax", @progbits
> 	.globl	_lkrn_start
> _lkrn_start:
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/mbr.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/prefix/mbr.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/mbr.S	2024-02-07 14:25:48.237811915 +0100
>@@ -1,6 +1,7 @@
> FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> 
> 	.text
>+	.code16
> 	.arch i386
> 	.section ".prefix", "awx", @progbits
> 	.code16
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/mromprefix.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/prefix/mromprefix.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/mromprefix.S	2024-02-07 14:25:59.037988218 +0100
>@@ -42,8 +42,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> #include "pciromprefix.S"
> 
> 	.text
>-	.arch i386
> 	.code16
>+	.arch i386
> 
> /* Obtain access to payload by exposing the expansion ROM BAR at the
>  * address currently used by a suitably large memory BAR on the same
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/nbiprefix.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/prefix/nbiprefix.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/nbiprefix.S	2024-02-07 14:26:07.341457120 +0100
>@@ -3,8 +3,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> #include <librm.h>
> 
> 	.text
>-	.arch i386
> 	.code16
>+	.arch i386
> 	.section ".prefix", "ax", @progbits
> 	.org 0
> 
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/nullprefix.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/prefix/nullprefix.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/nullprefix.S	2024-02-07 14:26:21.061681098 +0100
>@@ -2,6 +2,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> 
> 	.org	0
> 	.text
>+	.code16
> 	.arch i386
> 
> 	.section ".prefix", "ax", @progbits
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/pxeprefix.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/prefix/pxeprefix.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/pxeprefix.S	2024-02-07 14:26:33.998558960 +0100
>@@ -12,9 +12,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> #define PXE_HACK_EB54			0x0001
> 
> 	.text
>+	.code16
> 	.arch i386
> 	.org 0
>-	.code16
> 
> #include <librm.h>
> #include <undi.h>
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/usbdisk.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/prefix/usbdisk.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/usbdisk.S	2024-02-07 14:27:14.559221038 +0100
>@@ -3,6 +3,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> #include <config/console.h>
> 
> 	.text
>+	.code16
> 	.arch i386
> 	.section ".prefix", "awx", @progbits
> 	.code16
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/transitions/liba20.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/transitions/liba20.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/transitions/liba20.S	2024-02-07 14:29:01.497633486 +0100
>@@ -24,6 +24,7 @@
> 
> FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> 
>+	.code16
> 	.arch i386
> 
> /****************************************************************************
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/transitions/libkir.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/transitions/libkir.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/transitions/libkir.S	2024-02-07 14:29:23.394657606 +0100
>@@ -32,6 +32,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
> #define BOCHSBP xchgw %bx, %bx
> 
> 	.text
>+	.code16
> 	.arch i386
> 	.section ".text16", "awx", @progbits
> 	.code16
>Index: qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/unlzma.S
>===================================================================
>--- qemu-8.2.0.orig/roms/ipxe/src/arch/x86/prefix/unlzma.S	2024-01-12 13:52:51.000000000 +0100
>+++ qemu-8.2.0/roms/ipxe/src/arch/x86/prefix/unlzma.S	2024-02-07 18:42:31.162361876 +0100
>@@ -44,6 +44,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
>  */
> 
> 	.text
>+	.code32
> 	.arch i586
> 	.section ".prefix.lib", "ax", @progbits
>

Actions: View

Attachments on bug 1219733: 872588