Attachment #53279 for bug #85016




++ grub-0.96/grub/asmstub.c

static jmp_buf env_for_exit;

/* The current color for console.  */
int console_current_color = A_NORMAL;

/* The file descriptor for a serial device.  */
static int serial_fd = -1;


  /* We need a nested function so that we get a clean stack frame,
     regardless of how the code is optimized. */
  volatile void doit ()
  {
    /* Make sure our stack lives in the simulated memory area. */
    asm volatile ("movl %%esp, %0\n\tmovl %1, %%esp\n"
++ grub-0.96/lib/device.c

static int
read_device_map (FILE *fp, char **map, const char *map_file)
{
  void show_error (int no, const char *msg)
    {
      fprintf (stderr, "%s:%d: error: %s\n", map_file, no, msg);
    }
  
  void show_warning (int no, const char *msg, ...)
    {
      va_list ap;
      
++ grub-0.96/stage2/builtins.c


  /* Collect contiguous blocks into one entry as many as possible,
     and print the blocklist notation on the screen.  */
  void disk_read_blocklist_func (int sector, int offset, int length)
    {
      if (num_sectors > 0)
	{

  };

  /* Convert the color name STR into the magical number.  */
  int color_number (char *str)
    {
      char *ptr;
      int i;

#endif /* GRUB_UTIL */
  
  /* Save the first sector of Stage2 in STAGE2_SECT.  */
  void disk_read_savesect_func (int sector, int offset, int length)
    {
      if (debug)
	printf ("[%d]", sector);


  /* Write SECTOR to INSTALLLIST, and update INSTALLADDR and
     INSTALLSECT.  */
  void disk_read_blocklist_func (int sector, int offset, int length)
    {
      if (debug)
	printf("[%d]", sector);

  int to_code, from_code;
  int map_in_interrupt = 0;
  
  int find_key_code (char *key)
    {
      int i;


      return 0;
    }
  
  int find_ascii_code (char *key)
    {
      int i;
      
++ grub-0.96/stage2/char_io.c

memcheck (int addr, int len)
{
#ifdef GRUB_UTIL
  int start_addr (void)
    {
      int ret;
# if defined(HAVE_START_SYMBOL)

      return ret;
    }

  int end_addr (void)
    {
      int ret;
# if defined(HAVE_END_SYMBOL)
++ grub-0.96/stage2/smp-imps.h

  };


/*
 *  Exported globals here.
 */

/*
 *  "imps_any_new_apics" is non-zero if any of the APICS (local or I/O)
 *  are *not* an 82489DX.  This is useful to determine if more than 15
 *  CPUs can be supported (true if zero).
 */
extern int imps_any_new_apics;

/*
 *  "imps_enabled" is non-zero if the probe sequence found IMPS
 *  information and was successful.
 */
extern int imps_enabled;

/*
 *  This contains the local APIC hardware address.
 */
extern unsigned imps_lapic_addr;

/*
 *  This represents the number of CPUs found.
 */
extern int imps_num_cpus;

/*
 *  These map from virtual cpu numbers to APIC id's and back.
 */
extern unsigned char imps_cpu_apic_map[IMPS_MAX_CPUS];
extern unsigned char imps_apic_cpu_map[IMPS_MAX_CPUS];


/*
 *  This is the primary function for probing for Intel MPS 1.1/1.4
 *  compatible hardware and BIOS information.  While probing the CPUs

Return to bug 85016

Line Link Here

(-)file_not_specified_in_diff (-51 / +17 lines)
0	-- grub-0.96.orig/grub/asmstub.c	0	++ grub-0.96/grub/asmstub.c
Lines 90-96 Link Here
90	static jmp_buf env_for_exit;	90	static jmp_buf env_for_exit;
91		91
92	/* The current color for console. */	92	/* The current color for console. */
93	static int console_current_color = A_NORMAL;	93	int console_current_color = A_NORMAL;
94		94
95	/* The file descriptor for a serial device. */	95	/* The file descriptor for a serial device. */
96	static int serial_fd = -1;	96	static int serial_fd = -1;
Lines 115-121 Link Here
115		115
116	/* We need a nested function so that we get a clean stack frame,	116	/* We need a nested function so that we get a clean stack frame,
117	regardless of how the code is optimized. */	117	regardless of how the code is optimized. */
118	static volatile void doit ()	118	volatile void doit ()
119	{	119	{
120	/* Make sure our stack lives in the simulated memory area. */	120	/* Make sure our stack lives in the simulated memory area. */
121	asm volatile ("movl %%esp, %0\n\tmovl %1, %%esp\n"	121	asm volatile ("movl %%esp, %0\n\tmovl %1, %%esp\n"
122	-- grub-0.96.orig/lib/device.c	122	++ grub-0.96/lib/device.c
Lines 493-504 Link Here
493	static int	493	static int
494	read_device_map (FILE fp, char map, const char map_file)	494	read_device_map (FILE fp, char map, const char map_file)
495	{	495	{
496	static void show_error (int no, const char *msg)	496	void show_error (int no, const char *msg)
497	{	497	{
498	fprintf (stderr, "%s:%d: error: %s\n", map_file, no, msg);	498	fprintf (stderr, "%s:%d: error: %s\n", map_file, no, msg);
499	}	499	}
500		500
501	static void show_warning (int no, const char *msg, ...)	501	void show_warning (int no, const char *msg, ...)
502	{	502	{
503	va_list ap;	503	va_list ap;
504		504
505	-- grub-0.96.orig/stage2/builtins.c	505	++ grub-0.96/stage2/builtins.c
Lines 143-149 Link Here
143		143
144	/* Collect contiguous blocks into one entry as many as possible,	144	/* Collect contiguous blocks into one entry as many as possible,
145	and print the blocklist notation on the screen. */	145	and print the blocklist notation on the screen. */
146	static void disk_read_blocklist_func (int sector, int offset, int length)	146	void disk_read_blocklist_func (int sector, int offset, int length)
147	{	147	{
148	if (num_sectors > 0)	148	if (num_sectors > 0)
149	{	149	{
Lines 590-596 Link Here
590	};	590	};
591		591
592	/* Convert the color name STR into the magical number. */	592	/* Convert the color name STR into the magical number. */
593	static int color_number (char *str)	593	int color_number (char *str)
594	{	594	{
595	char *ptr;	595	char *ptr;
596	int i;	596	int i;
Lines 1907-1913 Link Here
1907	#endif /* GRUB_UTIL */	1907	#endif /* GRUB_UTIL */
1908		1908
1909	/* Save the first sector of Stage2 in STAGE2_SECT. */	1909	/* Save the first sector of Stage2 in STAGE2_SECT. */
1910	static void disk_read_savesect_func (int sector, int offset, int length)	1910	void disk_read_savesect_func (int sector, int offset, int length)
1911	{	1911	{
1912	if (debug)	1912	if (debug)
1913	printf ("[%d]", sector);	1913	printf ("[%d]", sector);
Lines 1923-1929 Link Here
1923		1923
1924	/* Write SECTOR to INSTALLLIST, and update INSTALLADDR and	1924	/* Write SECTOR to INSTALLLIST, and update INSTALLADDR and
1925	INSTALLSECT. */	1925	INSTALLSECT. */
1926	static void disk_read_blocklist_func (int sector, int offset, int length)	1926	void disk_read_blocklist_func (int sector, int offset, int length)
1927	{	1927	{
1928	if (debug)	1928	if (debug)
1929	printf("[%d]", sector);	1929	printf("[%d]", sector);
Lines 3742-3748 Link Here
3742	int to_code, from_code;	3742	int to_code, from_code;
3743	int map_in_interrupt = 0;	3743	int map_in_interrupt = 0;
3744		3744
3745	static int find_key_code (char *key)	3745	int find_key_code (char *key)
3746	{	3746	{
3747	int i;	3747	int i;
3748		3748
Lines 3759-3765 Link Here
3759	return 0;	3759	return 0;
3760	}	3760	}
3761		3761
3762	static int find_ascii_code (char *key)	3762	int find_ascii_code (char *key)
3763	{	3763	{
3764	int i;	3764	int i;
3765		3765
3766	-- grub-0.96.orig/stage2/char_io.c	3766	++ grub-0.96/stage2/char_io.c
Lines 1206-1212 Link Here
1206	memcheck (int addr, int len)	1206	memcheck (int addr, int len)
1207	{	1207	{
1208	#ifdef GRUB_UTIL	1208	#ifdef GRUB_UTIL
1209	static int start_addr (void)	1209	int start_addr (void)
1210	{	1210	{
1211	int ret;	1211	int ret;
1212	# if defined(HAVE_START_SYMBOL)	1212	# if defined(HAVE_START_SYMBOL)
Lines 1217-1223 Link Here
1217	return ret;	1217	return ret;
1218	}	1218	}
1219		1219
1220	static int end_addr (void)	1220	int end_addr (void)
1221	{	1221	{
1222	int ret;	1222	int ret;
1223	# if defined(HAVE_END_SYMBOL)	1223	# if defined(HAVE_END_SYMBOL)
1224	-- grub-0.96.orig/stage2/smp-imps.h	1224	++ grub-0.96/stage2/smp-imps.h
Lines 178-217 Link Here
178	};	178	};
179		179
180		180
181	/*
182	* Exported globals here.
183	*/
184
185	/*
186	* "imps_any_new_apics" is non-zero if any of the APICS (local or I/O)
187	* are not an 82489DX. This is useful to determine if more than 15
188	* CPUs can be supported (true if zero).
189	*/
190	extern int imps_any_new_apics;
191
192	/*
193	* "imps_enabled" is non-zero if the probe sequence found IMPS
194	* information and was successful.
195	*/
196	extern int imps_enabled;
197
198	/*
199	* This contains the local APIC hardware address.
200	*/
201	extern unsigned imps_lapic_addr;
202
203	/*
204	* This represents the number of CPUs found.
205	*/
206	extern int imps_num_cpus;
207
208	/*
209	* These map from virtual cpu numbers to APIC id's and back.
210	*/
211	extern unsigned char imps_cpu_apic_map[IMPS_MAX_CPUS];
212	extern unsigned char imps_apic_cpu_map[IMPS_MAX_CPUS];
213
214
215	/*	181	/*
216	* This is the primary function for probing for Intel MPS 1.1/1.4	182	* This is the primary function for probing for Intel MPS 1.1/1.4
217	* compatible hardware and BIOS information. While probing the CPUs	183	* compatible hardware and BIOS information. While probing the CPUs