Fix some warnings
This commit is contained in:
parent
96e34542a1
commit
f8149dfee8
|
@ -1,3 +1,17 @@
|
|||
Fri Nov 15 15:23:39 1996 Michael Meissner <meissner@tiktok.cygnus.com>
|
||||
|
||||
* pk_disklabel.c (pk_disklabel_create_instance): Fix up some
|
||||
warnings generated by GCC.
|
||||
|
||||
Fri Nov 1 14:42:57 1996 Michael Meissner <meissner@tiktok.cygnus.com>
|
||||
|
||||
* mon.c (_cpu_mon): Add fields for counting 1, 2, 4, and 8 byte
|
||||
reads and writes.
|
||||
(mon_{read,write}): Count 1, 2, 4, and 8 byte reads/writes.
|
||||
(mon_print_info): Correct typo regarding # of unaligned reads and
|
||||
writes. Print out how many 1, 2, 4, and 8 byte reads/writes there
|
||||
are.
|
||||
|
||||
Tue Oct 29 17:55:43 1996 Michael Meissner <meissner@tiktok.cygnus.com>
|
||||
|
||||
* configure.in (AC_CHECK_FUNCS): Add access.
|
||||
|
|
|
@ -0,0 +1,335 @@
|
|||
/* This file is part of the program psim.
|
||||
|
||||
Copyright (C) 1994-1996, Andrew Cagney <cagney@highland.com.au>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _PK_DISKLABEL_C_
|
||||
#define _PK_DISKLABEL_C_
|
||||
|
||||
#ifndef STATIC_INLINE_PK_DISKLABEL
|
||||
#define STATIC_INLINE_PK_DISKLABEL STATIC_INLINE
|
||||
#endif
|
||||
|
||||
#include "device_table.h"
|
||||
|
||||
#include "pk.h"
|
||||
|
||||
#ifdef HAVE_STDLIB_H
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/* PACKAGE
|
||||
|
||||
disk-label - all knowing disk I/O package
|
||||
|
||||
DESCRIPTION
|
||||
|
||||
The disk-label package provides a generic interface to disk
|
||||
devices. It uses the arguments specified when an instance is being
|
||||
created to determine if the raw disk, a partition, or a file within
|
||||
a partition should be opened.
|
||||
|
||||
An instance create call to disk-label could result, for instance,
|
||||
in the opening of a DOS file system contained within a dos
|
||||
partition contained within a physical disk.
|
||||
|
||||
*/
|
||||
|
||||
/* taken from bfd/ppcboot.c by Michael Meissner */
|
||||
|
||||
/* PPCbug location structure */
|
||||
typedef struct ppcboot_location {
|
||||
unsigned8 ind;
|
||||
unsigned8 head;
|
||||
unsigned8 sector;
|
||||
unsigned8 cylinder;
|
||||
} ppcboot_location_t;
|
||||
|
||||
/* PPCbug partition table layout */
|
||||
typedef struct ppcboot_partition {
|
||||
ppcboot_location_t partition_begin; /* partition begin */
|
||||
ppcboot_location_t partition_end; /* partition end */
|
||||
unsigned8 sector_begin[4]; /* 32-bit start RBA (zero-based), little endian */
|
||||
unsigned8 sector_length[4]; /* 32-bit RBA count (one-based), little endian */
|
||||
} ppcboot_partition_t;
|
||||
|
||||
#if 0
|
||||
/* PPCbug boot layout. */
|
||||
typedef struct ppcboot_hdr {
|
||||
unsigned8 pc_compatibility[446]; /* x86 instruction field */
|
||||
ppcboot_partition_t partition[4]; /* partition information */
|
||||
unsigned8 signature[2]; /* 0x55 and 0xaa */
|
||||
unsigned8 entry_offset[4]; /* entry point offset, little endian */
|
||||
unsigned8 length[4]; /* load image length, little endian */
|
||||
unsigned8 flags; /* flag field */
|
||||
unsigned8 os_id; /* OS_ID */
|
||||
char partition_name[32]; /* partition name */
|
||||
unsigned8 reserved1[470]; /* reserved */
|
||||
} ppcboot_hdr_t;
|
||||
#endif
|
||||
|
||||
|
||||
typedef struct _disklabel {
|
||||
device_instance *parent;
|
||||
device_instance *raw_disk;
|
||||
unsigned_word pos;
|
||||
unsigned_word sector_begin;
|
||||
unsigned_word sector_length;
|
||||
} disklabel;
|
||||
|
||||
|
||||
static unsigned_word
|
||||
sector2uw(unsigned8 s[4])
|
||||
{
|
||||
return ((s[3] << 24)
|
||||
+ (s[2] << 16)
|
||||
+ (s[1] << 8)
|
||||
+ (s[0] << 0));
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
disklabel_delete(device_instance *instance)
|
||||
{
|
||||
disklabel *label = device_instance_data(instance);
|
||||
device_instance_delete(label->raw_disk);
|
||||
zfree(label);
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
disklabel_read(device_instance *instance,
|
||||
void *buf,
|
||||
unsigned_word len)
|
||||
{
|
||||
disklabel *label = device_instance_data(instance);
|
||||
int nr_read;
|
||||
if (label->pos + len > label->sector_length)
|
||||
len = label->sector_length - label->pos;
|
||||
if (device_instance_seek(label->raw_disk, 0,
|
||||
label->sector_begin + label->pos) < 0)
|
||||
return -1;
|
||||
nr_read = device_instance_read(label->raw_disk, buf, len);
|
||||
if (nr_read > 0)
|
||||
label->pos += nr_read;
|
||||
return nr_read;
|
||||
}
|
||||
|
||||
static int
|
||||
disklabel_write(device_instance *instance,
|
||||
const void *buf,
|
||||
unsigned_word len)
|
||||
{
|
||||
disklabel *label = device_instance_data(instance);
|
||||
int nr_written;
|
||||
if (label->pos + len > label->sector_length)
|
||||
len = label->sector_length - label->pos;
|
||||
if (device_instance_seek(label->raw_disk, 0,
|
||||
label->sector_begin + label->pos) < 0)
|
||||
return -1;
|
||||
nr_written = device_instance_write(label->raw_disk, buf, len);
|
||||
if (nr_written > 0)
|
||||
label->pos += nr_written;
|
||||
return nr_written;
|
||||
}
|
||||
|
||||
static int
|
||||
disklabel_seek(device_instance *instance,
|
||||
unsigned_word pos_hi,
|
||||
unsigned_word pos_lo)
|
||||
{
|
||||
disklabel *label = device_instance_data(instance);
|
||||
if (pos_lo >= label->sector_length || pos_hi != 0)
|
||||
return -1;
|
||||
label->pos = pos_lo;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static const device_instance_callbacks package_disklabel_callbacks = {
|
||||
disklabel_delete,
|
||||
disklabel_read,
|
||||
disklabel_write,
|
||||
disklabel_seek,
|
||||
};
|
||||
|
||||
/* Reconize different types of boot block */
|
||||
|
||||
static int
|
||||
block_is_bpb(const unsigned8 block[])
|
||||
{
|
||||
const char ebdic_ibma[] = { 0xc9, 0xc2, 0xd4, 0xc1 };
|
||||
/* ref PowerPC Microprocessor CHRP bindings 1.2b - page 47 */
|
||||
/* can't start with IBMA */
|
||||
if (memcmp(block, ebdic_ibma, sizeof(ebdic_ibma)) == 0)
|
||||
return 0;
|
||||
/* must have LE 0xAA55 signature at offset 510 */
|
||||
if (block[511] != 0xAA && block[510] != 0x55)
|
||||
return 0;
|
||||
/* valid 16 bit LE bytes per sector - 256, 512, 1024 */
|
||||
if (block[11] != 0
|
||||
|| (block[12] != 1 && block[12] != 2 && block[12] != 4))
|
||||
return 0;
|
||||
/* nr fats is 1 or 2 */
|
||||
if (block[16] != 1 && block[16] != 2)
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* is_iso9660() later ... */
|
||||
|
||||
static int
|
||||
block_is_fdisk(const unsigned8 block[])
|
||||
{
|
||||
const int partition_type_fields[] = { 0x1c2, 0x1d2, 0x1e2, 0x1f2, 0 };
|
||||
int partition;
|
||||
/* ref PowerPC Microprocessor CHRP bindings 1.2b - page 47 */
|
||||
/* must have LE 0xAA55 signature at offset 510 */
|
||||
if (block[511] != 0xAA && block[510] != 0x55)
|
||||
return 0;
|
||||
/* must contain valid partition types */
|
||||
for (partition = 0;
|
||||
partition_type_fields[partition] != 0;
|
||||
partition++) {
|
||||
switch (block[partition_type_fields[partition]]) {
|
||||
case 4: case 0x41: case 0x96:
|
||||
break;
|
||||
case 5: case 6:
|
||||
PTRACE(disklabel, ("extended partition types not supported\n"));
|
||||
return 0;
|
||||
case 0x82:
|
||||
PTRACE(disklabel, ("warning - partition %d of type 0x82 - Solaris?\n", partition));
|
||||
break;
|
||||
case 0x1:
|
||||
PTRACE(disklabel, ("warning - partition %d of type 1 - DOS12\n", partition));
|
||||
break;
|
||||
case 0:
|
||||
break;
|
||||
default:
|
||||
PTRACE(disklabel, ("rejecting partition %d of type 0x%x\n", partition,
|
||||
block[partition_type_fields[partition]]));
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int
|
||||
block_is_mac_disk(const unsigned8 block[])
|
||||
{
|
||||
/* ref PowerPC Microprocessor CHRP bindings 1.2b - page 47 */
|
||||
/* signature - BEx4552 at offset 0 */
|
||||
if (block[0] != 0x45 || block[1] != 0x52)
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
/* Open a logical disk/file */
|
||||
|
||||
device_instance *
|
||||
pk_disklabel_create_instance(device_instance *raw_disk,
|
||||
const char *args)
|
||||
{
|
||||
int partition;
|
||||
char *filename;
|
||||
unsigned8 boot_block[512];
|
||||
|
||||
/* parse the arguments */
|
||||
if (args == NULL) {
|
||||
partition = 0;
|
||||
filename = NULL;
|
||||
}
|
||||
else {
|
||||
partition = strtoul((char*)args, &filename, 0);
|
||||
if (filename == args)
|
||||
partition = -1; /* not specified */
|
||||
if (*filename == ',')
|
||||
filename++;
|
||||
if (*filename == '\0')
|
||||
filename = NULL; /* easier */
|
||||
}
|
||||
|
||||
if (device_instance_seek(raw_disk, 0, 0) < 0)
|
||||
device_error(device_instance_device(raw_disk),
|
||||
"Problem seeking on raw disk\n");
|
||||
|
||||
if (partition < 0) {
|
||||
/* select the active partition */
|
||||
if (device_instance_read(raw_disk, &boot_block, sizeof(boot_block))
|
||||
!= sizeof(boot_block))
|
||||
return raw_disk;
|
||||
device_error(device_instance_device(raw_disk),
|
||||
"selection of the active partition unimplemented\n");
|
||||
return (device_instance *)0; /* silence warnings */
|
||||
}
|
||||
else if (partition == 0) {
|
||||
/* select the raw disk */
|
||||
return raw_disk;
|
||||
}
|
||||
else {
|
||||
/* select the specified disk partition */
|
||||
/* read in the boot record */
|
||||
if (device_instance_read(raw_disk, &boot_block, sizeof(boot_block))
|
||||
!= sizeof(boot_block))
|
||||
return raw_disk;
|
||||
if (block_is_bpb(boot_block)) {
|
||||
device_error(device_instance_device(raw_disk), "Unimplemented\n");
|
||||
}
|
||||
else if (block_is_fdisk(boot_block)) {
|
||||
/* return an instance */
|
||||
ppcboot_partition_t *partition_table = (ppcboot_partition_t*) &boot_block[446];
|
||||
ppcboot_partition_t *partition_entry;
|
||||
disklabel *label;
|
||||
if (partition > 3)
|
||||
device_error(device_instance_device(raw_disk),
|
||||
"Invalid fdisk partition number %d\n", partition);
|
||||
partition_entry = &partition_table[partition-1];
|
||||
label = ZALLOC(disklabel);
|
||||
label->raw_disk = raw_disk;
|
||||
label->pos = 0;
|
||||
label->sector_begin = 512 * sector2uw(partition_entry->sector_begin);
|
||||
label->sector_length = 512 * sector2uw(partition_entry->sector_length);
|
||||
PTRACE(disklabel, ("partition %ld, sector-begin %ld, length %ld\n",
|
||||
(long)partition, (long)label->sector_begin, (long)label->sector_length));
|
||||
if (filename != NULL)
|
||||
device_error(device_instance_device(raw_disk),
|
||||
"File names not yet supported\n");
|
||||
return device_create_instance_from(NULL, raw_disk,
|
||||
label,
|
||||
NULL, args,
|
||||
&package_disklabel_callbacks);
|
||||
}
|
||||
else if (block_is_mac_disk(boot_block)) {
|
||||
device_error(device_instance_device(raw_disk), "Unimplemented\n");
|
||||
}
|
||||
else {
|
||||
device_error(device_instance_device(raw_disk),
|
||||
"Unreconized bootblock\n");
|
||||
}
|
||||
return raw_disk;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif /* _PK_DISKLABEL_C_ */
|
||||
|
Loading…
Reference in New Issue