diff --git a/scp.c b/scp.c index f6ac2b80..b6c6ed5f 100644 --- a/scp.c +++ b/scp.c @@ -2740,8 +2740,34 @@ if (vdelt) #if defined(SIM_VERSION_MODE) fprintf (st, " %s", SIM_VERSION_MODE); #endif -if (flag) - fprintf (st, "\n\t[%s, %s, %s, %s]", sim_si64, sim_sa64, sim_snet, sim_slarge_files); +if (flag) { + fprintf (st, "\n\tSimulator Framework Capabilities:"); + fprintf (st, "\n\t\t%s", sim_si64); + fprintf (st, "\n\t\t%s", sim_sa64); + fprintf (st, "\n\t\t%s", sim_snet); + fprintf (st, "\n\t\t%s", sim_taddr_64 ? "Large File (>2GB) support" : "No Large File support"); +#if defined (SIM_ASYNCH_IO) + fprintf (st, "\n\t\tAsynchronous I/O support"); +#endif +#if defined(SIM_ASYNCH_MUX) + fprintf (st, "\n\t\tAsynchronous Multiplexer support"); +#endif +#if defined(SIM_ASYNCH_CLOCKS) + fprintf (st, "\n\t\tAsynchronous Clock support"); +#endif + fprintf (st, "\n\tHost Platform:"); + fprintf (st, "\n\t\tMemory Access: %s Endian", sim_end ? "Little" : "Big"); + fprintf (st, "\n\t\tMemory Pointer Size: %d bits", (int)sizeof(dptr)*8); +#if defined(__VMS) + fprintf (st, "\n\t\tOS: VMS"); +#elif defined(_WIN32) + fprintf (st, "\n\t\tOS: Windows"); +#else + fprintf (st, "\n\t\tOS: "); + fflush (st); + system ("uname -a"); +#endif + } #if defined(SIM_GIT_COMMIT_ID) #define _xstr(a) _str(a) #define _str(a) #a diff --git a/sim_fio.c b/sim_fio.c index d5e2da40..6448c311 100644 --- a/sim_fio.c +++ b/sim_fio.c @@ -365,9 +365,3 @@ return (t_addr)(ftell (st)); uint32 sim_taddr_64 = _SIM_IO_FSEEK_EXT_; -const char *sim_slarge_files = -#if _SIM_IO_FSEEK_EXT == 1 - "Large File (>2GB) support"; -#else - "No Large File support"; -#endif diff --git a/sim_fio.h b/sim_fio.h index 1d88b858..b0440426 100644 --- a/sim_fio.h +++ b/sim_fio.h @@ -50,7 +50,6 @@ void sim_buf_swap_data (void *bptr, size_t size, size_t count); void sim_buf_copy_swapped (void *dptr, void *bptr, size_t size, size_t count); extern uint32 sim_taddr_64; -extern const char *sim_slarge_files; extern int32 sim_end; #endif