Skip to content

Commit

Permalink
Merge pull request CE-Programming#1 from adriweb/master
Browse files Browse the repository at this point in the history 
Fix warnings + Makefile + Handle "Extended Linear Address" field
  • Loading branch information
@adriweb
adriweb committed Nov 22, 2015
2 parents 5415369 + a6b5146 commit 49eb96b
Show file tree
Hide file tree
Showing 2 changed files with 114 additions and 88 deletions.
21 changes: 21 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
CC = gcc
CFLAGS = -Wall -Wextra -fPIE -O3
LDFLAGS = -flto
SOURCES = main.c
OBJECTS = $(SOURCES:.c=.o)
EXECUTABLE = ConvHex

.PHONY: ConvHex clean

all: ConvHex

ConvHex: $(SOURCES)

$(EXECUTABLE): $(OBJECTS)
$(CC) $(LDFLAGS) $(OBJECTS) -o $@

.cpp.o:
$(CC) $(CFLAGS) $< -o $@

clean:
rm -f $(EXECUTABLE) $(OBJECTS)
181 changes: 93 additions & 88 deletions main.c
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>

#define PGRM_TYPE 0x06
#define PGRM_TYPE 0x06
#define APPVAR_TYPE 0x15
#define ARCHIVED 0x80
#define ARCHIVED 0x80

/* useful functions */
static inline unsigned char charToHexDigit(char c) {
Expand All @@ -21,16 +22,18 @@ static inline unsigned char ascii2HexToByte(char *ptr) {

static inline void str2hex(char *string, unsigned char *result, int len) {
int i, k=0;

for( i=0; i<len; i+=2) {
result[k++] = ascii2HexToByte( string+i );
}
}

static inline void strtoupper(char *sPtr) {
while(*sPtr != '\0') {
if (islower(*sPtr)) { *sPtr = toupper(*sPtr); }
++sPtr;
if (islower(*sPtr)) {
*sPtr = toupper(*sPtr);
}
++sPtr;
}
}

Expand All @@ -44,94 +47,93 @@ int main(int argc, char* argv[]) {
char *ext;
char *tmp;
char *options;

/* temporary buffer for reading files */
char tmp_buf[0x300];

size_t len;
size_t name_length;
size_t data_length;
size_t output_size;

/* header for TI files */
unsigned char header[] = { 0x2A,0x2A,0x54,0x49,0x38,0x33,0x46,0x2A,0x1A,0x0A };
unsigned char archived = 0x00;
unsigned char file_type = 0x06;
unsigned char *output;
unsigned char len_high;
unsigned char len_low;
int i,j;

int i, j;
int offset;
int checksum;
int line_size;
int arg_offset;


/* separate ouput a bit */
printf("\n");

/* execute checks to make sure input is valid */
j = 1;
if(argc > 1) {
while( j < argc ) {
options = argv[j];
if(options[0] == '-') {
i = 1;
while( options[i] != '\0' ) {
switch( toupper(options[i++]) ) {
case 'A': /* archive output */
archived = ARCHIVED;
break;
case 'V': /* write output to appvar */
file_type = APPVAR_TYPE;
break;
case 'H': /* show help */
goto show_help;
default:
printf("Unrecognized option: '%c'\n", options[i-1]);
break;
}
}
}
j++;
}
} else {
show_help:
while( j < argc ) {
options = argv[j];
if(options[0] == '-') {
i = 1;
while( options[i] != '\0' ) {
switch( toupper(options[i++]) ) {
case 'A': /* archive output */
archived = ARCHIVED;
break;
case 'V': /* write output to appvar */
file_type = APPVAR_TYPE;
break;
case 'H': /* show help */
goto show_help;
default:
printf("Unrecognized option: '%c'\n", options[i-1]);
break;
}
}
}
j++;
}
} else {
show_help:
printf("ConvHex Utility v1.21 - by M.Waltz\n");
printf("\nGenerates a formatted TI calculator file from ZDS-generated Intel hex.\n");
printf("\nUsage:\n\tconvhex [-options] <filename>");
printf("\nOptions:\n");
printf("\tA: Mark output binary as archived (Default is unarchived)\n");
printf("\tV: Write output to Appvar (Default is program)\n");
printf("\tH: Show this message\n");
printf("\nOptions:\n");
printf("\tA: Mark output binary as archived (Default is unarchived)\n");
printf("\tV: Write output to Appvar (Default is program)\n");
printf("\tH: Show this message\n");
return 1;
}

/* get the filenames for both out and in files */
in_name = malloc( strlen( argv[argc-1] )+5 );
strcpy(in_name, argv[argc-1]);

/* change the extension if it exists; otherwise create a new one */
ext = strrchr( in_name, '.' );
ext = strrchr( in_name, '.' );
if( ext == NULL ) {
strcat( in_name, ".hex" );
ext = strrchr( in_name, '.' );
strcat( in_name, ".hex" );
ext = strrchr( in_name, '.' );
}

/* check if the name is too long */
tmp = strrchr( in_name, '\\' );
if( tmp != NULL ) {
name_length = ext-tmp-1;
prgm_name = tmp+1;
} else {
tmp = strrchr( in_name, '/' );
if( tmp != NULL ) {
name_length = ext-tmp-1;
prgm_name = tmp+1;
name_length = ext-tmp-1;
prgm_name = tmp+1;
} else {
tmp = strrchr( in_name, '/' );
if( tmp != NULL ) {
name_length = ext-tmp-1;
prgm_name = tmp+1;
} else {
name_length = ext-in_name;
prgm_name = in_name;
}
prgm_name = in_name;
}
}

if( name_length > 8 ) { name_length = 8; }
Expand All @@ -142,7 +144,7 @@ int main(int argc, char* argv[]) {
strcpy( out_name, in_name );
strcpy( out_name+(ext-in_name), ".8x");
strcat( out_name, (file_type == PGRM_TYPE) ? "p" : "v" );

/* open the specified files */
in_file = fopen( in_name, "r" );
if ( !in_file ) {
Expand All @@ -164,84 +166,87 @@ int main(int argc, char* argv[]) {
}

/* print out some debug things */
printf("Input File: %s\nOutput File: %s\n",
in_name, out_name);
printf("Input File: %s\nOutput File: %s\n", in_name, out_name);

/* Write program name */
*(prgm_name+name_length) = '\0';
strtoupper(prgm_name);

/* print out some more debug things */
printf("Output Calculator Name: %s\n",
prgm_name);
printf("Mark archived: %s\n",
(archived == ARCHIVED) ? "Yes" : "No");

printf("Output Calculator Name: %s\n", prgm_name);
printf("Mark archived: %s\n", (archived == ARCHIVED) ? "Yes" : "No");

offset = 0x3C;
for ( i=0; i<name_length; ++i) {
output[offset++] = prgm_name[i];
for ( i=0; i<(int)name_length; ++i) {
output[offset++] = prgm_name[i];
}

/* parse the Intel Hex file, and store it into the data array */
/* note fgets() basically can be used to get each line really quick */
offset = 0x4A;

fgets( tmp_buf, 0x300, in_file );


/* Ignore initial "Extended Linear Address" line if present */
if ( tmp_buf[8] == '4' ) {
fgets( tmp_buf, 0x300, in_file );
}

while( tmp_buf[8] == '0' ) {

if( tmp_buf[0] != ':' ) {
printf("ERROR: Invalid Intel Hex format.\n");
return 2;
return 2;
}

/* get the size of the line to convert */
line_size = ascii2HexToByte( tmp_buf+1 );

str2hex( tmp_buf+9, output+offset, line_size<<1 );
offset += line_size;
fgets( tmp_buf, 0x300, in_file );

fgets( tmp_buf, 0x300, in_file );
}

output[0x37] = 0x0D; /* nessasary */
output[0x3B] = file_type; /* write file type */
output[0x37] = 0x0D; /* nessasary */
output[0x3B] = file_type; /* write file type */
output[0x45] = archived; /* write archive status */

data_length = (offset - 0x37);
len_high = (data_length>>8)&0xFF;
len_low = (data_length&0xFF);
output[0x35] = len_low;
output[0x36] = len_high;

data_length = (offset-0x4A);
len_high = (data_length>>8)&0xFF;
len_high = (data_length>>8)&0xFF;
len_low = (data_length&0xFF);
output[0x48] = len_low;
output[0x48] = len_low;
output[0x49] = len_high;
data_length += 2; /* for size bytes */
len_high = (data_length>>8)&0xFF;
len_low = (data_length&0xFF);

data_length += 2; /* for size bytes */
len_high = (data_length>>8)&0xFF;
len_low = (data_length&0xFF);
output[0x39] = len_low;
output[0x3A] = len_high;
output[0x46] = len_low;
output[0x47] = len_high;

/* Calculate checksum */
checksum = 0;
for( i=0x37; i<offset; ++i) { checksum = (checksum + output[i]) % 65536; }

output[offset++] = (checksum&0xFF);
output[offset++] = (checksum>>8)&0xFF;

output_size = data_length+name_length+7;

/* make sure our output file isn't too big */
if(output_size > 0x10000) {
printf("ERROR: Input file too large.");
return 3;
return 3;
}

/* write the buffer to the file */
fwrite( output, 1, offset, out_file );

Expand All @@ -252,7 +257,7 @@ int main(int argc, char* argv[]) {
/* free the out_name buffer */
free( in_name );
free( out_name );
printf("Success!\n\nProgram Size: %d\n", output_size);

printf("Success!\n\nProgram Size: %zu bytes\n", output_size);
return 0;
}

0 comments on commit 49eb96b

Please sign in to comment.