vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Handle big-endian minixfs (fixes minixfs tests on bigendian).

Browse source 
* grub-core/fs/minix.c: Replace le with minix. Add necessary defines,
	modify names. Introduce MODE_BIGENDIAN.
	* grub-core/fs/minix_be.c: New file.
	* grub-core/fs/minix2_be.c: Likewise
	* grub-core/fs/minix3_be.c: Likewise.
	* Makefile.util.def (libgrubmods): Add minix_be, minix2_be and
	minix3_be.
	* grub-core/Makefile.core.def (minix_be): New module.
	(minix2_be): Likewise.
	(minix3_be): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-04-01 21:35:18 +02:00
parent f65a829e41
commit ac66b453df
7 changed files with 108 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ChangeLog
View file

@ -1,3 +1,23 @@
2012-04-01 Vladimir Serbinenko <phcoder@gmail.com>
Handle big-endian minixfs (fixes minixfs tests on bigendian).
* grub-core/fs/minix.c: Replace le with minix. Add necessary defines,
modify names. Introduce MODE_BIGENDIAN.
* grub-core/fs/minix_be.c: New file.
* grub-core/fs/minix2_be.c: Likewise
* grub-core/fs/minix3_be.c: Likewise.
* Makefile.util.def (libgrubmods): Add minix_be, minix2_be and
minix3_be.
* grub-core/Makefile.core.def (minix_be): New module.
(minix2_be): Likewise.
(minix3_be): Likewise.
2012-04-01 Felix <email@hamburg.de>
* grub-core/loader/efi/appleloader.c (devpath_7): New var.
(devs): Add MBP 2011.
2012-04-01 Vladimir Serbinenko <phcoder@gmail.com> 2012-04-01 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/font/font.c (blit_comb): Handle dagesh somewhat. * grub-core/font/font.c (blit_comb): Handle dagesh somewhat.

3
Makefile.util.def
View file

@ -76,6 +76,9 @@ library = {
common = grub-core/fs/minix.c; common = grub-core/fs/minix.c;
common = grub-core/fs/minix2.c; common = grub-core/fs/minix2.c;
common = grub-core/fs/minix3.c; common = grub-core/fs/minix3.c;
common = grub-core/fs/minix_be.c;
common = grub-core/fs/minix2_be.c;
common = grub-core/fs/minix3_be.c;
common = grub-core/fs/nilfs2.c; common = grub-core/fs/nilfs2.c;
common = grub-core/fs/ntfs.c; common = grub-core/fs/ntfs.c;
common = grub-core/fs/ntfscomp.c; common = grub-core/fs/ntfscomp.c;

15
grub-core/Makefile.core.def
View file

@ -1102,6 +1102,21 @@ module = {
common = fs/minix3.c; common = fs/minix3.c;
}; };
module = {
name = minix_be;
common = fs/minix_be.c;
};
module = {
name = minix2_be;
common = fs/minix2_be.c;
};
module = {
name = minix3_be;
common = fs/minix3_be.c;
};
module = { module = {
name = nilfs2; name = nilfs2;
common = fs/nilfs2.c; common = fs/nilfs2.c;

83
grub-core/fs/minix.c
View file

@ -47,38 +47,48 @@ GRUB_MOD_LICENSE ("GPLv3+");
#define GRUB_MINIX_IFDIR 0040000U #define GRUB_MINIX_IFDIR 0040000U
#define GRUB_MINIX_IFLNK 0120000U #define GRUB_MINIX_IFLNK 0120000U
#ifdef MODE_BIGENDIAN
#define grub_cpu_to_minix16_compile_time grub_cpu_to_be16_compile_time
#define grub_minix_to_cpu16 grub_be_to_cpu16
#define grub_minix_to_cpu32 grub_be_to_cpu32
#else
#define grub_cpu_to_minix16_compile_time grub_cpu_to_le16_compile_time
#define grub_minix_to_cpu16 grub_le_to_cpu16
#define grub_minix_to_cpu32 grub_le_to_cpu32
#endif
#if defined(MODE_MINIX2) || defined(MODE_MINIX3) #if defined(MODE_MINIX2) || defined(MODE_MINIX3)
typedef grub_uint32_t grub_minix_uintn_t; typedef grub_uint32_t grub_minix_uintn_t;
#define grub_minix_le_to_cpu_n grub_le_to_cpu32 #define grub_minix_to_cpu_n grub_minix_to_cpu32
#else #else
typedef grub_uint16_t grub_minix_uintn_t; typedef grub_uint16_t grub_minix_uintn_t;
#define grub_minix_le_to_cpu_n grub_le_to_cpu16 #define grub_minix_to_cpu_n grub_minix_to_cpu16
#endif #endif
#define GRUB_MINIX_INODE_BLKSZ(data) sizeof (grub_minix_uintn_t) #define GRUB_MINIX_INODE_BLKSZ(data) sizeof (grub_minix_uintn_t)
#ifdef MODE_MINIX3 #ifdef MODE_MINIX3
typedef grub_uint32_t grub_minix_ino_t; typedef grub_uint32_t grub_minix_ino_t;
#define grub_minix_le_to_cpu_ino grub_le_to_cpu32 #define grub_minix_to_cpu_ino grub_minix_to_cpu32
#else #else
typedef grub_uint16_t grub_minix_ino_t; typedef grub_uint16_t grub_minix_ino_t;
#define grub_minix_le_to_cpu_ino grub_le_to_cpu16 #define grub_minix_to_cpu_ino grub_minix_to_cpu16
#endif #endif
#define GRUB_MINIX_INODE_SIZE(data) (grub_le_to_cpu32 (data->inode.size)) #define GRUB_MINIX_INODE_SIZE(data) (grub_minix_to_cpu32 (data->inode.size))
#define GRUB_MINIX_INODE_MODE(data) (grub_le_to_cpu16 (data->inode.mode)) #define GRUB_MINIX_INODE_MODE(data) (grub_minix_to_cpu16 (data->inode.mode))
#define GRUB_MINIX_INODE_DIR_ZONES(data,blk) (grub_minix_le_to_cpu_n \ #define GRUB_MINIX_INODE_DIR_ZONES(data,blk) (grub_minix_to_cpu_n \
(data->inode.dir_zones[blk])) (data->inode.dir_zones[blk]))
#define GRUB_MINIX_INODE_INDIR_ZONE(data) (grub_minix_le_to_cpu_n \ #define GRUB_MINIX_INODE_INDIR_ZONE(data) (grub_minix_to_cpu_n \
(data->inode.indir_zone)) (data->inode.indir_zone))
#define GRUB_MINIX_INODE_DINDIR_ZONE(data) (grub_minix_le_to_cpu_n \ #define GRUB_MINIX_INODE_DINDIR_ZONE(data) (grub_minix_to_cpu_n \
(data->inode.double_indir_zone)) (data->inode.double_indir_zone))
#ifndef MODE_MINIX3 #ifndef MODE_MINIX3
#define GRUB_MINIX_LOG2_ZONESZ (GRUB_MINIX_LOG2_BSIZE \ #define GRUB_MINIX_LOG2_ZONESZ (GRUB_MINIX_LOG2_BSIZE \
+ grub_le_to_cpu16 (data->sblock.log2_zone_size)) + grub_minix_to_cpu16 (data->sblock.log2_zone_size))
#endif #endif
#define GRUB_MINIX_ZONESZ (1 << (data->log_block_size \ #define GRUB_MINIX_ZONESZ (1 << (data->log_block_size \
+ grub_le_to_cpu16 (data->sblock.log2_zone_size))) + grub_minix_to_cpu16 (data->sblock.log2_zone_size)))
#ifdef MODE_MINIX3 #ifdef MODE_MINIX3
#define GRUB_MINIX_ZONE2SECT(zone) ((zone) << (data->log_block_size - GRUB_DISK_SECTOR_BITS)) #define GRUB_MINIX_ZONE2SECT(zone) ((zone) << (data->log_block_size - GRUB_DISK_SECTOR_BITS))
@ -187,7 +197,7 @@ grub_minix_get_file_block (struct grub_minix_data *data, unsigned int blk)
GRUB_MINIX_ZONE2SECT(zone), GRUB_MINIX_ZONE2SECT(zone),
sizeof (grub_minix_uintn_t) * num, sizeof (grub_minix_uintn_t) * num,
sizeof (grub_minix_uintn_t), (char *) &indirn); sizeof (grub_minix_uintn_t), (char *) &indirn);
return grub_minix_le_to_cpu_n (indirn); return grub_minix_to_cpu_n (indirn);
} }
/* Direct block. */ /* Direct block. */
@ -219,7 +229,7 @@ grub_minix_get_file_block (struct grub_minix_data *data, unsigned int blk)
if (blk < ((grub_uint64_t) block_per_zone * (grub_uint64_t) block_per_zone if (blk < ((grub_uint64_t) block_per_zone * (grub_uint64_t) block_per_zone
* (grub_uint64_t) block_per_zone)) * (grub_uint64_t) block_per_zone))
{ {
indir = grub_get_indir (grub_minix_le_to_cpu_n (data->inode.triple_indir_zone), indir = grub_get_indir (grub_minix_to_cpu_n (data->inode.triple_indir_zone),
(blk / block_per_zone) / block_per_zone); (blk / block_per_zone) / block_per_zone);
indir = grub_get_indir (indir, (blk / block_per_zone) % block_per_zone); indir = grub_get_indir (indir, (blk / block_per_zone) % block_per_zone);
indir = grub_get_indir (indir, blk % block_per_zone); indir = grub_get_indir (indir, blk % block_per_zone);
@ -311,8 +321,8 @@ grub_minix_read_inode (struct grub_minix_data *data, int ino)
/* The first inode in minix is inode 1. */ /* The first inode in minix is inode 1. */
ino--; ino--;
block = GRUB_MINIX_ZONE2SECT (2 + grub_le_to_cpu16 (sblock->inode_bmap_size) block = GRUB_MINIX_ZONE2SECT (2 + grub_minix_to_cpu16 (sblock->inode_bmap_size)
+ grub_le_to_cpu16 (sblock->zone_bmap_size)); + grub_minix_to_cpu16 (sblock->zone_bmap_size));
block += ino / (GRUB_DISK_SECTOR_SIZE / sizeof (struct grub_minix_inode)); block += ino / (GRUB_DISK_SECTOR_SIZE / sizeof (struct grub_minix_inode));
int offs = (ino % (GRUB_DISK_SECTOR_SIZE int offs = (ino % (GRUB_DISK_SECTOR_SIZE
/ sizeof (struct grub_minix_inode)) / sizeof (struct grub_minix_inode))
@ -406,7 +416,7 @@ grub_minix_find_file (struct grub_minix_data *data, const char *path)
if (!grub_strcmp (name, filename)) if (!grub_strcmp (name, filename))
{ {
dirino = data->ino; dirino = data->ino;
grub_minix_read_inode (data, grub_minix_le_to_cpu_ino (ino)); grub_minix_read_inode (data, grub_minix_to_cpu_ino (ino));
/* Follow the symlink. */ /* Follow the symlink. */
if ((GRUB_MINIX_INODE_MODE (data) if ((GRUB_MINIX_INODE_MODE (data)
@ -461,7 +471,7 @@ grub_minix_mount (grub_disk_t disk)
if (grub_errno) if (grub_errno)
goto fail; goto fail;
if (grub_le_to_cpu16 (data->sblock.magic) == GRUB_MINIX_MAGIC) if (data->sblock.magic == grub_cpu_to_minix16_compile_time (GRUB_MINIX_MAGIC))
{ {
#if !defined(MODE_MINIX3) #if !defined(MODE_MINIX3)
data->filename_size = 14; data->filename_size = 14;
@ -470,7 +480,8 @@ grub_minix_mount (grub_disk_t disk)
#endif #endif
} }
#if !defined(MODE_MINIX3) #if !defined(MODE_MINIX3)
else if (grub_le_to_cpu16 (data->sblock.magic) == GRUB_MINIX_MAGIC_30) else if (data->sblock.magic
== grub_cpu_to_minix16_compile_time (GRUB_MINIX_MAGIC_30))
data->filename_size = 30; data->filename_size = 30;
#endif #endif
else else
@ -488,7 +499,7 @@ grub_minix_mount (grub_disk_t disk)
|| data->sblock.block_size == 0) || data->sblock.block_size == 0)
goto fail; goto fail;
for (data->log_block_size = 0; (1 << data->log_block_size) for (data->log_block_size = 0; (1 << data->log_block_size)
< grub_le_to_cpu16 (data->sblock.block_size); < grub_minix_to_cpu16 (data->sblock.block_size);
data->log_block_size++); data->log_block_size++);
} }
#else #else
@ -559,11 +570,11 @@ grub_minix_dir (grub_device_t device, const char *path,
continue; continue;
} }
grub_minix_read_inode (data, grub_minix_le_to_cpu_ino (ino)); grub_minix_read_inode (data, grub_minix_to_cpu_ino (ino));
info.dir = ((GRUB_MINIX_INODE_MODE (data) info.dir = ((GRUB_MINIX_INODE_MODE (data)
& GRUB_MINIX_IFDIR) == GRUB_MINIX_IFDIR); & GRUB_MINIX_IFDIR) == GRUB_MINIX_IFDIR);
info.mtimeset = 1; info.mtimeset = 1;
info.mtime = grub_le_to_cpu32 (data->inode.mtime); info.mtime = grub_minix_to_cpu32 (data->inode.mtime);
if (hook (filename, &info) ? 1 : 0) if (hook (filename, &info) ? 1 : 0)
break; break;
@ -641,12 +652,22 @@ grub_minix_close (grub_file_t file)
static struct grub_fs grub_minix_fs = static struct grub_fs grub_minix_fs =
{ {
#ifdef MODE_BIGENDIAN
#if defined(MODE_MINIX3)
.name = "minix3_be",
#elif defined(MODE_MINIX2)
.name = "minix2_be",
#else
.name = "minix_be",
#endif
#else
#if defined(MODE_MINIX3) #if defined(MODE_MINIX3)
.name = "minix3", .name = "minix3",
#elif defined(MODE_MINIX2) #elif defined(MODE_MINIX2)
.name = "minix2", .name = "minix2",
#else #else
.name = "minix", .name = "minix",
#endif
#endif #endif
.dir = grub_minix_dir, .dir = grub_minix_dir,
.open = grub_minix_open, .open = grub_minix_open,
@ -659,6 +680,15 @@ static struct grub_fs grub_minix_fs =
.next = 0 .next = 0
}; };
#ifdef MODE_BIGENDIAN
#if defined(MODE_MINIX3)
GRUB_MOD_INIT(minix3_be)
#elif defined(MODE_MINIX2)
GRUB_MOD_INIT(minix2_be)
#else
GRUB_MOD_INIT(minix_be)
#endif
#else
#if defined(MODE_MINIX3) #if defined(MODE_MINIX3)
GRUB_MOD_INIT(minix3) GRUB_MOD_INIT(minix3)
#elif defined(MODE_MINIX2) #elif defined(MODE_MINIX2)
@ -666,11 +696,21 @@ GRUB_MOD_INIT(minix2)
#else #else
GRUB_MOD_INIT(minix) GRUB_MOD_INIT(minix)
#endif #endif
#endif
{ {
grub_fs_register (&grub_minix_fs); grub_fs_register (&grub_minix_fs);
my_mod = mod; my_mod = mod;
} }
#ifdef MODE_BIGENDIAN
#if defined(MODE_MINIX3)
GRUB_MOD_FINI(minix3_be)
#elif defined(MODE_MINIX2)
GRUB_MOD_FINI(minix2_be)
#else
GRUB_MOD_FINI(minix_be)
#endif
#else
#if defined(MODE_MINIX3) #if defined(MODE_MINIX3)
GRUB_MOD_FINI(minix3) GRUB_MOD_FINI(minix3)
#elif defined(MODE_MINIX2) #elif defined(MODE_MINIX2)
@ -678,6 +718,7 @@ GRUB_MOD_FINI(minix2)
#else #else
GRUB_MOD_FINI(minix) GRUB_MOD_FINI(minix)
#endif #endif
#endif
{ {
grub_fs_unregister (&grub_minix_fs); grub_fs_unregister (&grub_minix_fs);
} }

3
grub-core/fs/minix2_be.c Normal file
View file

@ -0,0 +1,3 @@
#define MODE_MINIX2 1
#define MODE_BIGENDIAN 1
#include "minix.c"

3
grub-core/fs/minix3_be.c Normal file
View file

@ -0,0 +1,3 @@
#define MODE_MINIX3 1
#define MODE_BIGENDIAN 1
#include "minix.c"

2
grub-core/fs/minix_be.c Normal file
View file

@ -0,0 +1,2 @@
#define MODE_BIGENDIAN 1
#include "minix.c"