[L4alpha-cvscommit] CVS: dite/src dit.c,1.10,1.11 edit.c,1.31,1.32 elf_generic.c,1.6,1.7
Status: Beta
Brought to you by:
dpotts
Menu
▾
▴
[L4alpha-cvscommit] CVS: dite/src dit.c,1.10,1.11 edit.c,1.31,1.32 elf_generic.c,1.6,1.7
|
From: Simon W. <sj...@us...> - 2002-09-06 07:06:30
|
Update of /cvsroot/l4alpha/dite/src
In directory usw-pr-cvs1:/tmp/cvs-serv7083/src
Modified Files:
dit.c edit.c elf_generic.c
Log Message:
Added IA64 support, and --name flag
Index: dit.c
===================================================================
RCS file: /cvsroot/l4alpha/dite/src/dit.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dit.c 3 Jun 2002 08:44:47 -0000 1.10
--- dit.c 6 Sep 2002 07:06:24 -0000 1.11
***************
*** 2,6 ****
* Project: EDIT --- Extended DIT.
* Created: 21/07/2000 07:47:23 by Simon Winwood (sjw)
! * Last Modified: 03/06/2002 18:20:58 by Simon Winwood (sjw)
* Version info: $Revision$
* Description:
--- 2,6 ----
* Project: EDIT --- Extended DIT.
* Created: 21/07/2000 07:47:23 by Simon Winwood (sjw)
! * Last Modified: 06/09/2002 16:42:05 by Simon Winwood (sjw)
* Version info: $Revision$
* Description:
***************
*** 16,19 ****
--- 16,22 ----
*
* $Log$
+ * Revision 1.11 2002/09/06 07:06:24 sjw_
+ * Added IA64 support, and --name flag
+ *
* Revision 1.10 2002/06/03 08:44:47 sjw_
* MIPS changes
***************
*** 161,165 ****
phdr.p_flags = (entry->flags & FL_EXEC ? DIT_RUN : 0) | (entry->flags & FL_RESOURCE ? DIT_RMNG : 0);
! memcpy(phdr.p_name, entry->filename, DIT_NPNAME);
target->phdrs = realloc(target->phdrs, (target->ndit + 1) * sizeof(Dit_Phdr));
--- 164,168 ----
phdr.p_flags = (entry->flags & FL_EXEC ? DIT_RUN : 0) | (entry->flags & FL_RESOURCE ? DIT_RMNG : 0);
! memcpy(phdr.p_name, entry->ditname, DIT_NPNAME);
target->phdrs = realloc(target->phdrs, (target->ndit + 1) * sizeof(Dit_Phdr));
Index: edit.c
===================================================================
RCS file: /cvsroot/l4alpha/dite/src/edit.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** edit.c 7 Jun 2002 04:48:50 -0000 1.31
--- edit.c 6 Sep 2002 07:06:24 -0000 1.32
***************
*** 2,6 ****
* Project: EDIT --- Extended DIT
* Created: 12/07/2000 19:46:03 by Simon Winwood (sjw)
! * Last Modified: 07/06/2002 14:47:49 by (sjw)
* Version info: $Revision$
* Description:
--- 2,6 ----
* Project: EDIT --- Extended DIT
* Created: 12/07/2000 19:46:03 by Simon Winwood (sjw)
! * Last Modified: 06/09/2002 16:46:36 by Simon Winwood (sjw)
* Version info: $Revision$
* Description:
***************
*** 18,21 ****
--- 18,24 ----
*
* $Log$
+ * Revision 1.32 2002/09/06 07:06:24 sjw_
+ * Added IA64 support, and --name flag
+ *
* Revision 1.31 2002/06/07 04:48:50 sjw_
* OBJ_RAW, not FL_RAW. Sigh.
***************
*** 163,166 ****
--- 166,170 ----
[ARCH_SPARC64] = "sparc64",
[ARCH_ALPHA] = "alpha",
+ [ARCH_IA64] = "ia64",
};
***************
*** 229,233 ****
{"raw", no_argument, NULL, 'R'},
{"entry", required_argument, NULL, 'E'},
! {"base", required_argument, NULL, 'b'},
{"execute", no_argument, NULL, 'x'},
{"resource", no_argument, NULL, 'r'},
--- 233,238 ----
{"raw", no_argument, NULL, 'R'},
{"entry", required_argument, NULL, 'E'},
! {"base", required_argument, NULL, 'b'},
! {"name", required_argument, NULL, 'N'},
{"execute", no_argument, NULL, 'x'},
{"resource", no_argument, NULL, 'r'},
***************
*** 239,243 ****
print_version(file, name);
fprintf(file, "\n"
! "Usage: %1$s [-hVvqdl] [[-Rxr] [-b <address>] [-E <address>] <filename>] [-D segment] [-t format] -o <target>\n"
" Flags:\n"
" General\n"
--- 244,248 ----
print_version(file, name);
fprintf(file, "\n"
! "Usage: %1$s [-hVvqdl] [[-Rxr] [-b <address>] [-N name] [-E <address>] <filename>] [-D segment] [-t format] -o <target>\n"
" Flags:\n"
" General\n"
***************
*** 262,265 ****
--- 267,271 ----
" -e --entry=<address> : Entry point\n"
" -b --base=<address> : Base address --- all internal file addresses are added to this\n"
+ " -N --name=<name> : The name of the file to use in the DIT header\n"
" -x --execute : Set execute flag\n"
" -r --resource : Set as resource manager\n\n", name);
***************
*** 379,382 ****
--- 385,392 ----
efile->mmap = file_map(fptr, 0, efile->size, FALSE);
+
+ if(efile->ditname == NULL)
+ efile->ditname = efile->filename;
+
return 0;
}
***************
*** 518,521 ****
--- 528,534 ----
sources[num_sources].base_address = strtoul(optarg, NULL, 0);
break;
+
+ case 'N': /* name */
+ sources[num_sources].ditname = optarg;
case 'x': /* exec flag */
Index: elf_generic.c
===================================================================
RCS file: /cvsroot/l4alpha/dite/src/elf_generic.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** elf_generic.c 27 Mar 2001 07:06:36 -0000 1.6
--- elf_generic.c 6 Sep 2002 07:06:24 -0000 1.7
***************
*** 2,6 ****
* Project:
* Created: 19/07/2000 14:07:48 by Simon Winwood (sjw)
! * Last Modified: 27/03/2001 16:57:57 by (sjw)
* Version info: $Revision$
* Description:
--- 2,6 ----
* Project:
* Created: 19/07/2000 14:07:48 by Simon Winwood (sjw)
! * Last Modified: 06/09/2002 17:02:50 by Simon Winwood (sjw)
* Version info: $Revision$
* Description:
***************
*** 16,19 ****
--- 16,22 ----
*
* $Log$
+ * Revision 1.7 2002/09/06 07:06:24 sjw_
+ * Added IA64 support, and --name flag
+ *
* Revision 1.6 2001/03/27 07:06:36 sjw
* Added copyright notices to all of my files.
***************
*** 54,57 ****
--- 57,61 ----
[ARCH_MIPS32] = 0x1000,
[ARCH_ALPHA] = 0x2000,
+ [ARCH_IA64] = 0x3000,
};
***************
*** 78,81 ****
--- 82,87 ----
case EM_SPARCV9:
return ARCH_SPARC64;
+ case EM_IA_64:
+ return ARCH_IA64;
default:
return ARCH_INVALID;
***************
*** 105,108 ****
--- 111,116 ----
case ARCH_ARM:
return EM_ARM;
+ case ARCH_IA64:
+ return EM_IA_64;
default:
return EM_NONE;
|
