kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Actually remove removed patches (oops!)

Browse source 
Pointyhat to:	nox
This commit is contained in:
Juergen Lock 2008-01-21 01:00:52 +00:00
parent aaa34e41c8
commit 5eb7c371b5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=205948
6 changed files with 0 additions and 318 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
emulators/qemu/files/patch-PRId64
View file

@ -1,113 +0,0 @@
Index: qemu/vl.h
@@ -30,6 +30,12 @@
#include <stdarg.h>
#include <string.h>
#include <inttypes.h>
+#ifndef PRId64
+#define PRId64 "lld" /* int64_t */
+#define PRIo64 "llo" /* int64_t */
+#define PRIx64 "llx" /* int64_t */
+#define PRIu64 "llu" /* int64_t */
+#endif
#include <limits.h>
#include <time.h>
#include <ctype.h>
Index: qemu/dis-asm.h
@@ -13,6 +13,12 @@
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
+#ifndef PRId64
+#define PRId64 "lld" /* int64_t */
+#define PRIo64 "llo" /* int64_t */
+#define PRIx64 "llx" /* int64_t */
+#define PRIu64 "llu" /* int64_t */
+#endif
#define PARAMS(x) x
typedef void *PTR;
Index: qemu/kqemu.c
@@ -33,6 +33,12 @@
#include <errno.h>
#include <unistd.h>
#include <inttypes.h>
+#ifndef PRId64
+#define PRId64 "lld" /* int64_t */
+#define PRIo64 "llo" /* int64_t */
+#define PRIx64 "llx" /* int64_t */
+#define PRIu64 "llu" /* int64_t */
+#endif
#include "cpu.h"
#include "exec-all.h"
Index: qemu/translate-all.c
@@ -22,6 +22,12 @@
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
+#ifndef PRId64
+#define PRId64 "lld" /* int64_t */
+#define PRIo64 "llo" /* int64_t */
+#define PRIx64 "llx" /* int64_t */
+#define PRIu64 "llu" /* int64_t */
+#endif
#include "config.h"
Index: qemu/target-i386/helper.c
@@ -21,6 +21,13 @@
//#define DEBUG_PCALL
+#ifndef PRId64
+#define PRId64 "lld" /* int64_t */
+#define PRIo64 "llo" /* int64_t */
+#define PRIx64 "llx" /* int64_t */
+#define PRIu64 "llu" /* int64_t */
+#endif
+
#if 0
#define raise_exception_err(a, b)\
do {\
Index: qemu/target-i386/helper2.c
@@ -22,6 +22,12 @@
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
+#ifndef PRId64
+#define PRId64 "lld" /* int64_t */
+#define PRIo64 "llo" /* int64_t */
+#define PRIx64 "llx" /* int64_t */
+#define PRIu64 "llu" /* int64_t */
+#endif
#include <signal.h>
#include <assert.h>
Index: qemu/target-ppc/translate.c
@@ -22,6 +22,12 @@
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
+#ifndef PRId64
+#define PRId64 "lld" /* int64_t */
+#define PRIo64 "llo" /* int64_t */
+#define PRIx64 "llx" /* int64_t */
+#define PRIu64 "llu" /* int64_t */
+#endif
#include "cpu.h"
#include "exec-all.h"
Index: qemu/target-sparc/helper.c
@@ -22,6 +22,12 @@
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
+#ifndef PRId64
+#define PRId64 "lld" /* int64_t */
+#define PRIo64 "llo" /* int64_t */
+#define PRIx64 "llx" /* int64_t */
+#define PRIu64 "llu" /* int64_t */
+#endif
#include <signal.h>
#include <assert.h>

11
emulators/qemu/files/patch-audio::ossaudio.c
View file

@ -1,11 +0,0 @@
Index: qemu/audio/ossaudio.c
@@ -21,8 +21,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include <sys/mman.h>
#include <sys/types.h>
+#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/soundcard.h>
#include <assert.h>

26
emulators/qemu/files/patch-bh
View file

@ -1,26 +0,0 @@
Index: qemu/dyngen-exec.h
===================================================================
RCS file: /cvsroot/qemu/qemu/dyngen-exec.h,v
retrieving revision 1.12
diff -w -u -d -r1.12 dyngen-exec.h
--- dyngen-exec.h 12 May 2004 19:32:15 -0000 1.12
+++ dyngen-exec.h 21 May 2004 15:00:41 -0000
@@ -21,6 +21,8 @@
#define __DYNGEN_EXEC_H__
#include <stddef.h>
+#include <stdio.h>
+#include "config.h"
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
@@ -54,9 +56,6 @@
#define UINT32_MAX (4294967295U)
#define UINT64_MAX ((uint64_t)(18446744073709551615))
-typedef struct FILE FILE;
-extern int fprintf(FILE *, const char *, ...);
-extern int printf(const char *, ...);
#undef NULL
#define NULL 0
#ifdef _BSD

25
emulators/qemu/files/patch-block-qcow2.c
View file

@ -1,25 +0,0 @@
Index: qemu/block-qcow2.c
@@ -1886,6 +1886,8 @@
int64_t table_offset;
uint64_t data64;
uint32_t data32;
+ int old_table_size;
+ int64_t old_table_offset;
if (min_size <= s->refcount_table_size)
return 0;
@@ -1931,10 +1933,14 @@
&data32, sizeof(data32)) != sizeof(data32))
goto fail;
qemu_free(s->refcount_table);
+ old_table_offset = s->refcount_table_offset;
+ old_table_size = s->refcount_table_size;
s->refcount_table = new_table;
s->refcount_table_size = new_table_size;
+ s->refcount_table_offset = table_offset;
update_refcount(bs, table_offset, new_table_size2, 1);
+ free_clusters(bs, old_table_offset, old_table_size * sizeof(uint64_t));
return 0;
fail:
free_clusters(bs, table_offset, new_table_size2);

51
emulators/qemu/files/patch-block-raw.c
View file

@ -1,51 +0,0 @@
Index: qemu/block-raw.c
@@ -51,7 +51,10 @@
#include <linux/cdrom.h>
#include <linux/fd.h>
#endif
#ifdef __FreeBSD__
+#include <signal.h>
+#endif
+#if defined(__FreeBSD__) && __FreeBSD__ > 4
#include <sys/disk.h>
#endif
@@ -167,9 +167,20 @@
static int aio_sig_num = SIGUSR2;
static RawAIOCB *first_aio; /* AIO issued */
static int aio_initialized = 0;
+// FreeBSD 4.x doesn't have sigwait
+#if defined(__FreeBSD__) && __FreeBSD__ <= 4
+static int sigaio_dont = 0;
+#endif
static void aio_signal_handler(int signum)
{
+// FreeBSD 4.x doesn't have sigwait
+#if defined(__FreeBSD__) && __FreeBSD__ <= 4
+ if (sigaio_dont) {
+ --sigaio_dont;
+ return;
+ }
+#endif
#ifndef QEMU_TOOL
CPUState *env = cpu_single_env;
if (env) {
@@ -284,9 +295,17 @@
if (qemu_bh_poll())
return;
#endif
+// FreeBSD 4.x doesn't have sigwait
+#if defined(__FreeBSD__) && __FreeBSD__ <= 4
+ ++sigaio_dont;
+ do
+ sigsuspend(&wait_oset);
+ while (sigaio_dont);
+#else
sigemptyset(&set);
sigaddset(&set, aio_sig_num);
sigwait(&set, &nb_sigs);
+#endif
qemu_aio_poll();
}

92
emulators/qemu/files/patch-tlb-vuln
View file

@ -1,92 +0,0 @@
Index: qemu/cpu-exec.c
diff -u qemu/cpu-exec.c:1.128 qemu/cpu-exec.c:1.129
--- qemu/cpu-exec.c:1.128 Sun Dec 2 06:18:23 2007
+++ qemu/cpu-exec.c Tue Dec 11 19:35:45 2007
@@ -133,7 +133,7 @@
tb->tc_ptr = tc_ptr;
tb->cs_base = cs_base;
tb->flags = flags;
- cpu_gen_code(env, tb, CODE_GEN_MAX_SIZE, &code_gen_size);
+ cpu_gen_code(env, tb, &code_gen_size);
code_gen_ptr = (void *)(((unsigned long)code_gen_ptr + code_gen_size + CODE_GEN_ALIGN - 1) & ~(CODE_GEN_ALIGN - 1));
/* check next page if needed */
Index: qemu/exec-all.h
diff -u qemu/exec-all.h:1.72 qemu/exec-all.h:1.73
--- qemu/exec-all.h:1.72 Mon Nov 19 00:38:33 2007
+++ qemu/exec-all.h Tue Dec 11 19:35:45 2007
@@ -64,8 +64,9 @@
int gen_intermediate_code(CPUState *env, struct TranslationBlock *tb);
int gen_intermediate_code_pc(CPUState *env, struct TranslationBlock *tb);
void dump_ops(const uint16_t *opc_buf, const uint32_t *opparam_buf);
+unsigned long code_gen_max_block_size(void);
int cpu_gen_code(CPUState *env, struct TranslationBlock *tb,
- int max_code_size, int *gen_code_size_ptr);
+ int *gen_code_size_ptr);
int cpu_restore_state(struct TranslationBlock *tb,
CPUState *env, unsigned long searched_pc,
void *puc);
@@ -94,7 +95,6 @@
return tlb_set_page_exec(env, vaddr, paddr, prot, mmu_idx, is_softmmu);
}
-#define CODE_GEN_MAX_SIZE 65536
#define CODE_GEN_ALIGN 16 /* must be >= of the size of a icache line */
#define CODE_GEN_PHYS_HASH_BITS 15
Index: qemu/exec.c
diff -u qemu/exec.c:1.117 qemu/exec.c:1.118
--- qemu/exec.c:1.117 Sun Dec 9 02:22:56 2007
+++ qemu/exec.c Tue Dec 11 19:35:45 2007
@@ -56,7 +56,7 @@
#endif
/* threshold to flush the translated code buffer */
-#define CODE_GEN_BUFFER_MAX_SIZE (CODE_GEN_BUFFER_SIZE - CODE_GEN_MAX_SIZE)
+#define CODE_GEN_BUFFER_MAX_SIZE (CODE_GEN_BUFFER_SIZE - code_gen_max_block_size())
#define SMC_BITMAP_USE_THRESHOLD 10
@@ -622,7 +622,7 @@
tb->cs_base = cs_base;
tb->flags = flags;
tb->cflags = cflags;
- cpu_gen_code(env, tb, CODE_GEN_MAX_SIZE, &code_gen_size);
+ cpu_gen_code(env, tb, &code_gen_size);
code_gen_ptr = (void *)(((unsigned long)code_gen_ptr + code_gen_size + CODE_GEN_ALIGN - 1) & ~(CODE_GEN_ALIGN - 1));
/* check next page if needed */
Index: qemu/translate-all.c
diff -u qemu/translate-all.c:1.23 qemu/translate-all.c:1.24
--- qemu/translate-all.c:1.23 Sun Dec 2 06:10:02 2007
+++ qemu/translate-all.c Tue Dec 11 19:35:45 2007
@@ -132,14 +132,27 @@
}
}
+unsigned long code_gen_max_block_size(void)
+{
+ static unsigned long max;
+
+ if (max == 0) {
+#define DEF(s, n, copy_size) max = copy_size > max? copy_size : max;
+#include "opc.h"
+#undef DEF
+ max *= OPC_MAX_SIZE;
+ }
+
+ return max;
+}
+
/* return non zero if the very first instruction is invalid so that
the virtual CPU can trigger an exception.
'*gen_code_size_ptr' contains the size of the generated code (host
code).
*/
-int cpu_gen_code(CPUState *env, TranslationBlock *tb,
- int max_code_size, int *gen_code_size_ptr)
+int cpu_gen_code(CPUState *env, TranslationBlock *tb, int *gen_code_size_ptr)
{
uint8_t *gen_code_buf;
int gen_code_size;