@@ -1497,7 +1497,7 @@ void cli_sigperf_print()

     cli_infomsg (NULL, "%-*s %*s %*s %*s %*s\n", max_name_len, "=============",

 	    8, "=====", 8, "========", 12, "===========", 9, "=========");

     while (elem->run_count) {

-	cli_infomsg (NULL, "%-*s %*lu %*lu %*llu %*.2f\n", max_name_len, elem->bc_name,

+	cli_infomsg (NULL, "%-*s %*lu %*lu %*" PRIu64 " %*.2f\n", max_name_len, elem->bc_name,

 		     8, elem->run_count, 8, elem->match_count, 

 		12, elem->usecs, 9, (double)elem->usecs/elem->run_count);

 	elem++;

@@ -3238,7 +3238,7 @@ void cli_bytevalue_describe(const struct cli_bc *bc, unsigned funcid)

     printf("CID  ID    VALUE\n");

     printf("------------------------------------------------------------------------\n");

     for (i = 0; i < func->numConstants; ++i) {

-        printf("%3u [%3u]: %llu(0x%llx)\n", i, total++, func->constants[i], func->constants[i]);

+        printf("%3u [%3u]: " STDu64 "(0x" STDx64 ")\n", i, total++, func->constants[i], func->constants[i]);

     }

     printf("------------------------------------------------------------------------\n");

     printf("found a total of %u total values\n", total);

@@ -3305,13 +3305,13 @@ void cli_byteinst_describe(const struct cli_bc_inst *inst, unsigned *bbnum)

         // casting operations

     case OP_BC_TRUNC:

-        printf("%d = %d trunc %llx", inst->dest, inst->u.cast.source, inst->u.cast.mask);

+        printf("%d = %d trunc " STDx64, inst->dest, inst->u.cast.source, inst->u.cast.mask);

         break;

     case OP_BC_SEXT:

-        printf("%d = %d sext %llx", inst->dest, inst->u.cast.source, inst->u.cast.mask);

+        printf("%d = %d sext " STDx64, inst->dest, inst->u.cast.source, inst->u.cast.mask);

         break;

     case OP_BC_ZEXT:

-        printf("%d = %d zext %llx", inst->dest, inst->u.cast.source, inst->u.cast.mask);

+        printf("%d = %d zext " STDx64, inst->dest, inst->u.cast.source, inst->u.cast.mask);

         break;

         // control operations (termination instructions)

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2007-2013 Sourcefire, Inc.

  *

  *  Authors: Tomasz Kojm

@@ -370,11 +370,11 @@ static int cli_elf_ph64(cli_ctx *ctx, fmap_t *map, struct cli_exe_info *elfinfo,

             if(ctx) {

                 cli_dbgmsg("ELF: Segment #%d\n", i);

-                cli_dbgmsg("ELF: Segment type: 0x%x\n", EC32(program_hdr[i].p_type, conv));

-                cli_dbgmsg("ELF: Segment offset: 0x" STDx64 "\n", EC64(program_hdr[i].p_offset, conv));

-                cli_dbgmsg("ELF: Segment virtual address: 0x" STDx64 "\n", EC64(program_hdr[i].p_vaddr, conv));

-                cli_dbgmsg("ELF: Segment real size: 0x" STDx64 "\n", EC64(program_hdr[i].p_filesz, conv));

-                cli_dbgmsg("ELF: Segment virtual size: 0x" STDx64 "\n", EC64(program_hdr[i].p_memsz, conv));

+                cli_dbgmsg("ELF: Segment type: 0x" STDx32 "\n", (uint32_t) EC32(program_hdr[i].p_type, conv));

+                cli_dbgmsg("ELF: Segment offset: 0x" STDx64 "\n", (uint64_t) EC64(program_hdr[i].p_offset, conv));

+                cli_dbgmsg("ELF: Segment virtual address: 0x" STDx64 "\n", (uint64_t) EC64(program_hdr[i].p_vaddr, conv));

+                cli_dbgmsg("ELF: Segment real size: 0x" STDx64 "\n", (uint64_t) EC64(program_hdr[i].p_filesz, conv));

+                cli_dbgmsg("ELF: Segment virtual size: 0x" STDx64 "\n", (uint64_t) EC64(program_hdr[i].p_memsz, conv));

                 cli_dbgmsg("------------------------------------\n");

             }

         }

@@ -605,9 +605,9 @@ static int cli_elf_sh64(cli_ctx *ctx, fmap_t *map, struct cli_exe_info *elfinfo,

             elfinfo->section[i].rsz = EC64(section_hdr[i].sh_size, conv);

         }

         if(ctx) {

-	    cli_dbgmsg("ELF: Section %u\n", i);

-	    cli_dbgmsg("ELF: Section offset: " STDu64 "\n", EC64(section_hdr[i].sh_offset, conv));

-	    cli_dbgmsg("ELF: Section size: " STDu64 "\n", EC64(section_hdr[i].sh_size, conv));

+	    cli_dbgmsg("ELF: Section " STDu32 "\n", (uint32_t) i);

+	    cli_dbgmsg("ELF: Section offset: " STDu64 "\n", (uint64_t) EC64(section_hdr[i].sh_offset, conv));

+	    cli_dbgmsg("ELF: Section size: " STDu64 "\n", (uint64_t) EC64(section_hdr[i].sh_size, conv));

             sh_type = EC32(section_hdr[i].sh_type, conv);

             sh_flags = (uint32_t)(EC64(section_hdr[i].sh_flags, conv) & ELF_SHF_MASK);