diff -n -r ./conf/i386-pc.mk ../../src/grub-1.93/conf/i386-pc.mk
a2 3
#COMMON_ASFLAGS = -nostdinc -fno-builtin -DREGPARM
#COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32

d4 1
a4 2
COMMON_CFLAGS = $(CFLAGS) -m32

a6 3
grub_emu_CFLAGS = $(COMMON_CFLAGS) 
grub_emu_LDFLAGS = $(COMMON_LDFLAGS) $(LIBCURSES)

d786 3
a788 4
	util/i386/pc/misc.c grub_emu_init.c				\
	symlist2.c kern/i386/dl.c
CLEANFILES += grub-emu grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_default.o grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o grub_emu-commands_timeout.o grub_emu-commands_i386_pc_halt.o grub_emu-commands_i386_pc_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_hfsplus.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_context.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-grub_emu_init.o grub_emu-symlist.o grub_emu-symlist2.o grub_emu-kern_i386_dl.o
MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_default.d grub_emu-commands_help.d grub_emu-commands_terminal.d grub_emu-commands_ls.d grub_emu-commands_test.d grub_emu-commands_search.d grub_emu-commands_timeout.d grub_emu-commands_i386_pc_halt.d grub_emu-commands_i386_pc_reboot.d grub_emu-disk_loopback.d grub_emu-fs_affs.d grub_emu-fs_ext2.d grub_emu-fs_fat.d grub_emu-fs_fshelp.d grub_emu-fs_hfs.d grub_emu-fs_iso9660.d grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d grub_emu-fs_hfsplus.d grub_emu-io_gzio.d grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d grub_emu-kern_env.d grub_emu-kern_err.d grub_emu-normal_execute.d grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-normal_lexer.d grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d grub_emu-kern_parser.d grub_emu-grub_script_tab.d grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d grub_emu-normal_function.d grub_emu-normal_completion.d grub_emu-normal_context.d grub_emu-normal_main.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d grub_emu-normal_misc.d grub_emu-normal_script.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d grub_emu-partmap_gpt.d grub_emu-util_console.d grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_i386_pc_biosdisk.d grub_emu-util_i386_pc_getroot.d grub_emu-util_i386_pc_misc.d grub_emu-grub_emu_init.d grub_emu-symlist2.d grub_emu-kern_i386_dl.d
d790 2
a791 2
grub-emu: grub_emu-symlist2.o grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_default.o grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o grub_emu-commands_timeout.o grub_emu-commands_i386_pc_halt.o grub_emu-commands_i386_pc_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_hfsplus.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_context.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-grub_emu_init.o grub_emu-kern_i386_dl.o
	$(BUILD_CC) -o $@ $^ $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $(grub_emu_LDFLAGS)
a1024 8
grub_emu-kern_i386_dl.o: kern/i386/dl.c
	$(BUILD_CC) -Ikern -I$(srcdir)/kern -I$(srcdir)/kern/i386 $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -c -o $@ $<

grub_emu-kern_i386_dl.d: kern/i386/dl.c
	set -e; 	  $(BUILD_CC) -Ikern -I$(srcdir)/kern -I$(srcdir)/kern/i386 $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -DGRUB_UTIL=1 $(grub_emu_CFLAGS) -M $< 	  | sed 's,dl\.o[ :]*,grub_emu-kern__i386_dl.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@

-include grub_emu-kern_i386_dl.d

a1336 7
grub_emu-symlist2.o: symlist2.c
	$(CC) -I. -I$(srcdir)/. $(CPPFLAGS)  $(CFLAGS) $(grub_emu_CFLAGS) -c -o $@ $<

grub_emu-symlist2.d: symlist2.c
	set -e; 	  $(CC) -I. -I$(srcdir)/. $(CPPFLAGS)  $(CFLAGS) $(grub_emu_CFLAGS) -M $< 	  | sed 's,symlist2\.o[ :]*,grub_emu-symlist2.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@

-include grub_emu-symlist2.d
d1338 1
diff -n -r ./fs/ext2.c ../../src/grub-1.93/fs/ext2.c
d174 1
a174 1
static grub_dl_t my_mod = (grub_dl_t) 0;
diff -n -r ./include/grub/dl.h ../../src/grub-1.93/include/grub/dl.h
d29 1
a29 1
static void grub_mod_init (grub_dl_t mod) __attribute__ ((used)); \
d34 1
a34 1
grub_mod_init (grub_dl_t mod)
diff -n -r ./include/grub/misc.h ../../src/grub-1.93/include/grub/misc.h
a78 1
void EXPORT_FUNC(grub_break) (const char * fct, int i);
diff -n -r ./include/grub/mm.h ../../src/grub-1.93/include/grub/mm.h
a31 1
void *EXPORT_FUNC(grub_mmap) (grub_size_t size);
diff -n -r ./include/grub/util/misc.h ../../src/grub-1.93/include/grub/util/misc.h
a47 1
void grub_break (const char * fct, int index);
diff -n -r ./kern/dl.c ../../src/grub-1.93/kern/dl.c
d319 1
a319 1
grub_err_t
a361 4
	      else {
	        grub_dprintf ("symbols",
			"%s: Resolved Symbol %s\n", mod->name, name);
	      }
d371 1
a371 3
	    if (grub_dl_register_symbol (name, (void *) sym->st_value, mod)) {
	      grub_dprintf("symbols",
		      "Err registering %s (%d)\n", name, grub_errno);
a372 4
	    } else {
	      grub_dprintf("symbols",
		      "%s: Registering %s\n", mod->name, name);
	    }
d379 1
a379 3
	    if (grub_dl_register_symbol (name, (void *) sym->st_value, mod)) {
	      grub_dprintf("symbols",
		      "Err registering %s (%d)\n", name, grub_errno);
a380 4
	    } else {
	      grub_dprintf("symbols",
		      "%s: Registering %s\n", mod->name, name);
	    }
a405 2
typedef void FINIT(void * );
typedef FINIT * PFINIT;
d410 1
a410 1
    ((PFINIT)mod->init) (mod);
a514 3
      grub_dprintf("symbols", 
	      "%s: Section %d loaded at 0x%x (size %d)\n",
	      mod->name, seg->section, seg->addr, seg->size);
d535 1
a535 1
      /* return 0; */
diff -n -r ./kern/i386/pc/startup.S ../../src/grub-1.93/kern/i386/pc/startup.S
a19 5
#ifdef REGPARM
#include "startup.S.regparm"
#else
#include "startup.S.memparm"
#endif
d21 2150
Only in ../../src/grub-1.93/kern/i386/pc: startup.S.memparm
Only in ../../src/grub-1.93/kern/i386/pc: startup.S.regparm
diff -n -r ./kern/misc.c ../../src/grub-1.93/kern/misc.c
a877 5

extern int grub_printf (const char * fmt, ...);
void grub_break (const char * fct, int index) {
    grub_printf ("%s: Break at %d\n", fct, index);
}
diff -n -r ./kern/mm.c ../../src/grub-1.93/kern/mm.c
a289 6
void *
grub_mmap (grub_size_t size)
{
  return grub_memalign (0, size);
}

diff -n -r ./normal/i386/setjmp.S ../../src/grub-1.93/normal/i386/setjmp.S
a29 3
#ifndef REGPARM
	movl	4(%esp), %eax	/* Get Param */
#endif
a44 4
#ifndef REGPARM
	movl	4(%esp), %eax	/* Get Param */
	movl	8(%esp), %edx	/* Get Param */
#endif
diff -n -r ./normal/main.c ../../src/grub-1.93/normal/main.c
d236 1
a236 1
  if (grub_setjmp (&grub_exit_env[0]) == 0)
Only in ../../src/grub-1.93/: symlist2.c
diff -n -r ./util/grub-emu.c ../../src/grub-1.93/util/grub-emu.c
d59 18
a76 1
  return 000;
diff -n -r ./util/misc.c ../../src/grub-1.93/util/misc.c
a214 14
#include <sys/mman.h>

static char * heapstart=(char*) 0x01200000;
void *
grub_mmap (grub_size_t size)
{
    void * heap;
    heap=(void *)mmap(heapstart, size,
	    	PROT_EXEC|PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, 0);
    heapstart+=size; 
    printf("Using mmap (size %d)\n", size);
    return heap;
}

d218 1
a218 1
  if (ptr) free (ptr);
d247 5
a273 7

int grub_null()
{
    return 0;
}

int grub_null_var = 0;