# HG changeset patch # User Josef 'Jeff' Sipek # Date 1564512962 14400 # Node ID 6fca4100a8869bf0630f0740b1b6b2a8b9d0b613 # Parent 7eedfe5b73c05571a4b8938e606dbc358cd50aee include: change uint64_t LP64 definition to be unsigned long This matches what is normally used in the Unix world. Signed-off-by: Josef 'Jeff' Sipek diff -r 7eedfe5b73c0 -r 6fca4100a886 cp/nucleus/mch.c --- a/cp/nucleus/mch.c Tue Jul 30 14:58:36 2019 -0400 +++ b/cp/nucleus/mch.c Tue Jul 30 14:56:02 2019 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007-2011 Josef 'Jeff' Sipek + * (C) Copyright 2007-2019 Josef 'Jeff' Sipek * * This file is released under the GPLv2. See the COPYING file for more * details. @@ -32,7 +32,7 @@ void __mch_int_handler(void) { sclp_msg("MCH INTERRUPT!"); - sclp_msg("%016llx: ", *(u64*)MCH_INT_CODE); + sclp_msg("%016lx: ", *(u64*)MCH_INT_CODE); if (MCH_INT_CODE->sd) sclp_msg("-> system damage"); if (MCH_INT_CODE->pd) diff -r 7eedfe5b73c0 -r 6fca4100a886 cp/nucleus/pgm.c --- a/cp/nucleus/pgm.c Tue Jul 30 14:58:36 2019 -0400 +++ b/cp/nucleus/pgm.c Tue Jul 30 14:56:02 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2012 Josef 'Jeff' Sipek + * Copyright (c) 2007-2019 Josef 'Jeff' Sipek * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,7 +62,7 @@ while(((u64)cur) >= start && ((u64)cur) < end) { ra = cur->gpr[12]; - sclp_msg(" %016llx %-s\n", ra, + sclp_msg(" %016lx %-s\n", ra, symtab_lookup(ra, buf, sizeof(buf))); if (!cur->back_chain) @@ -86,10 +86,10 @@ sclp_msg("PROG %04x, ILC %d\n", *PGM_INT_CODE, (*PGM_INT_ILC) >> 1); sclp_msg("\n"); for(i=0; i<8; i++) - sclp_msg("R%-2d = %016llx R%-2d = %016llx\n", + sclp_msg("R%-2d = %016lx R%-2d = %016lx\n", i, PSA_INT_GPR[i], i+8, PSA_INT_GPR[i+8]); sclp_msg("\n"); - sclp_msg("PSW = %016llx %016llx\n", + sclp_msg("PSW = %016lx %016lx\n", *((u64*) PGM_INT_OLD_PSW), *(((u64*) PGM_INT_OLD_PSW)+1)); sclp_msg("\n"); dump_stack(PSA_INT_GPR[15]); diff -r 7eedfe5b73c0 -r 6fca4100a886 cp/nucleus/symtab.c --- a/cp/nucleus/symtab.c Tue Jul 30 14:58:36 2019 -0400 +++ b/cp/nucleus/symtab.c Tue Jul 30 14:56:02 2019 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007-2011 Josef 'Jeff' Sipek + * (C) Copyright 2007-2019 Josef 'Jeff' Sipek * * This file is released under the GPLv2. See the COPYING file for more * details. @@ -122,7 +122,7 @@ if (cur->st_name > strsize) goto fail; - snprintf(buf, buflen, "%s+%#llx", + snprintf(buf, buflen, "%s+%#lx", strtab + cur->st_name, addr - cur->st_value); return buf; } diff -r 7eedfe5b73c0 -r 6fca4100a886 cp/shell/cmd_display.c --- a/cp/shell/cmd_display.c Tue Jul 30 14:58:36 2019 -0400 +++ b/cp/shell/cmd_display.c Tue Jul 30 14:56:02 2019 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007-2011 Josef 'Jeff' Sipek + * (C) Copyright 2007-2019 Josef 'Jeff' Sipek * * This file is released under the GPLv2. See the COPYING file for more * details. @@ -87,7 +87,7 @@ /* load the dword at the address, and shift it to the LSB part */ val = *((u64*)host_addr) >> 8*(sizeof(u64) - ilen); - con_printf(sys->con, "R%016llX %0*llX%*s %s\n", guest_addr, + con_printf(sys->con, "R%016lX %0*lX%*s %s\n", guest_addr, 2*ilen, val, /* inst hex dump */ 12-2*ilen, "", /* spacer */ buf); @@ -127,7 +127,7 @@ mlen -= this_len; bp = buf; - bp += snprintf(bp, 80, "R%016llX ", guest_addr); + bp += snprintf(bp, 80, "R%016lX ", guest_addr); while(this_len) { bp += snprintf(bp, 80 - (bp - buf), "%08X ", @@ -156,7 +156,7 @@ fault: if (ret) - con_printf(sys->con, "DISPLAY: The address %016llX is not part of " + con_printf(sys->con, "DISPLAY: The address %016lX is not part of " "guest configuration (RC=%d,%d)\n", guest_addr, -EFAULT, ret); } @@ -275,28 +275,28 @@ { SHELL_CMD_AUTH(sys, G); - con_printf(sys->con, "GR 0 = %016llX %016llX\n", + con_printf(sys->con, "GR 0 = %016lX %016lX\n", sys->cpu->regs.gpr[0], sys->cpu->regs.gpr[1]); - con_printf(sys->con, "GR 2 = %016llX %016llX\n", + con_printf(sys->con, "GR 2 = %016lX %016lX\n", sys->cpu->regs.gpr[2], sys->cpu->regs.gpr[3]); - con_printf(sys->con, "GR 4 = %016llX %016llX\n", + con_printf(sys->con, "GR 4 = %016lX %016lX\n", sys->cpu->regs.gpr[4], sys->cpu->regs.gpr[5]); - con_printf(sys->con, "GR 6 = %016llX %016llX\n", + con_printf(sys->con, "GR 6 = %016lX %016lX\n", sys->cpu->regs.gpr[6], sys->cpu->regs.gpr[7]); - con_printf(sys->con, "GR 8 = %016llX %016llX\n", + con_printf(sys->con, "GR 8 = %016lX %016lX\n", sys->cpu->regs.gpr[8], sys->cpu->regs.gpr[9]); - con_printf(sys->con, "GR 10 = %016llX %016llX\n", + con_printf(sys->con, "GR 10 = %016lX %016lX\n", sys->cpu->regs.gpr[10], sys->cpu->regs.gpr[11]); - con_printf(sys->con, "GR 12 = %016llX %016llX\n", + con_printf(sys->con, "GR 12 = %016lX %016lX\n", sys->cpu->regs.gpr[12], sys->cpu->regs.gpr[13]); - con_printf(sys->con, "GR 14 = %016llX %016llX\n", + con_printf(sys->con, "GR 14 = %016lX %016lX\n", sys->cpu->regs.gpr[14], sys->cpu->regs.gpr[15]); return 0; @@ -332,28 +332,28 @@ { SHELL_CMD_AUTH(sys, G); - con_printf(sys->con, "FR 0 = %016llX %016llX\n", + con_printf(sys->con, "FR 0 = %016lX %016lX\n", sys->cpu->regs.fpr[0], sys->cpu->regs.fpr[1]); - con_printf(sys->con, "FR 2 = %016llX %016llX\n", + con_printf(sys->con, "FR 2 = %016lX %016lX\n", sys->cpu->regs.fpr[2], sys->cpu->regs.fpr[3]); - con_printf(sys->con, "FR 4 = %016llX %016llX\n", + con_printf(sys->con, "FR 4 = %016lX %016lX\n", sys->cpu->regs.fpr[4], sys->cpu->regs.fpr[5]); - con_printf(sys->con, "FR 6 = %016llX %016llX\n", + con_printf(sys->con, "FR 6 = %016lX %016lX\n", sys->cpu->regs.fpr[6], sys->cpu->regs.fpr[7]); - con_printf(sys->con, "FR 8 = %016llX %016llX\n", + con_printf(sys->con, "FR 8 = %016lX %016lX\n", sys->cpu->regs.fpr[8], sys->cpu->regs.fpr[9]); - con_printf(sys->con, "FR 10 = %016llX %016llX\n", + con_printf(sys->con, "FR 10 = %016lX %016lX\n", sys->cpu->regs.fpr[10], sys->cpu->regs.fpr[11]); - con_printf(sys->con, "FR 12 = %016llX %016llX\n", + con_printf(sys->con, "FR 12 = %016lX %016lX\n", sys->cpu->regs.fpr[12], sys->cpu->regs.fpr[13]); - con_printf(sys->con, "FR 14 = %016llX %016llX\n", + con_printf(sys->con, "FR 14 = %016lX %016lX\n", sys->cpu->regs.fpr[14], sys->cpu->regs.fpr[15]); return 0; @@ -372,28 +372,28 @@ { SHELL_CMD_AUTH(sys, G); - con_printf(sys->con, "CR 0 = %016llX %016llX\n", + con_printf(sys->con, "CR 0 = %016lX %016lX\n", sys->cpu->sie_cb.gcr[0], sys->cpu->sie_cb.gcr[1]); - con_printf(sys->con, "CR 2 = %016llX %016llX\n", + con_printf(sys->con, "CR 2 = %016lX %016lX\n", sys->cpu->sie_cb.gcr[2], sys->cpu->sie_cb.gcr[3]); - con_printf(sys->con, "CR 4 = %016llX %016llX\n", + con_printf(sys->con, "CR 4 = %016lX %016lX\n", sys->cpu->sie_cb.gcr[4], sys->cpu->sie_cb.gcr[5]); - con_printf(sys->con, "CR 6 = %016llX %016llX\n", + con_printf(sys->con, "CR 6 = %016lX %016lX\n", sys->cpu->sie_cb.gcr[6], sys->cpu->sie_cb.gcr[7]); - con_printf(sys->con, "CR 8 = %016llX %016llX\n", + con_printf(sys->con, "CR 8 = %016lX %016lX\n", sys->cpu->sie_cb.gcr[8], sys->cpu->sie_cb.gcr[9]); - con_printf(sys->con, "CR 10 = %016llX %016llX\n", + con_printf(sys->con, "CR 10 = %016lX %016lX\n", sys->cpu->sie_cb.gcr[10], sys->cpu->sie_cb.gcr[11]); - con_printf(sys->con, "CR 12 = %016llX %016llX\n", + con_printf(sys->con, "CR 12 = %016lX %016lX\n", sys->cpu->sie_cb.gcr[12], sys->cpu->sie_cb.gcr[13]); - con_printf(sys->con, "CR 14 = %016llX %016llX\n", + con_printf(sys->con, "CR 14 = %016lX %016lX\n", sys->cpu->sie_cb.gcr[14], sys->cpu->sie_cb.gcr[15]); return 0; @@ -443,19 +443,19 @@ u64 obase, u64 nbase, u32 *odata, u32 *ndata, int idx) { if (zarch) { - con_printf(sys->con, "%s %04X %3llX OLD %08X %08X %08X %08X\n", + con_printf(sys->con, "%s %04X %3lX OLD %08X %08X %08X %08X\n", name, 0xffff, obase+(idx*16), odata[0+(idx*4)], odata[1+(idx*4)], odata[2+(idx*4)], odata[3+(idx*4)]); - con_printf(sys->con, " %3llX NEW %08X %08X %08X %08X\n", + con_printf(sys->con, " %3lX NEW %08X %08X %08X %08X\n", nbase+(idx*16), ndata[0+(idx*4)], ndata[1+(idx*4)], ndata[2+(idx*4)], ndata[3+(idx*4)]); } else { - con_printf(sys->con, "%s %04X %3llX OLD %08X %08X\n", + con_printf(sys->con, "%s %04X %3lX OLD %08X %08X\n", name, 0xffff, obase+(idx*8), odata[0+(idx*2)], odata[1+(idx*2)]); - con_printf(sys->con, " %3llX NEW %08X %08X\n", + con_printf(sys->con, " %3lX NEW %08X %08X\n", nbase+(idx*8), ndata[0+(idx*2)], ndata[1+(idx*2)]); } diff -r 7eedfe5b73c0 -r 6fca4100a886 cp/shell/cmd_enable.c --- a/cp/shell/cmd_enable.c Tue Jul 30 14:58:36 2019 -0400 +++ b/cp/shell/cmd_enable.c Tue Jul 30 14:56:02 2019 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007-2010 Josef 'Jeff' Sipek + * (C) Copyright 2007-2019 Josef 'Jeff' Sipek * * This file is released under the GPLv2. See the COPYING file for more * details. @@ -38,14 +38,14 @@ dev = find_device_by_ccuu(devnum); if (IS_ERR(dev)) { - con_printf(sys->con, "Device %04llX not found in configuration\n", devnum); + con_printf(sys->con, "Device %04lX not found in configuration\n", devnum); return 0; } mutex_lock(&dev->lock); if (dev->in_use) { - con_printf(sys->con, "Device %04llX is already in use\n", devnum); + con_printf(sys->con, "Device %04lX is already in use\n", devnum); goto out_err; } @@ -57,7 +57,7 @@ con = dev->dev->enable(dev); if (IS_ERR(con)) { - con_printf(sys->con, "Failed to enable %04llX: %s\n", + con_printf(sys->con, "Failed to enable %04lX: %s\n", devnum, errstrings[-PTR_ERR(con)]); goto out_err; } diff -r 7eedfe5b73c0 -r 6fca4100a886 cp/shell/cmd_query.c --- a/cp/shell/cmd_query.c Tue Jul 30 14:58:36 2019 -0400 +++ b/cp/shell/cmd_query.c Tue Jul 30 14:56:02 2019 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007-2011 Josef 'Jeff' Sipek + * (C) Copyright 2007-2019 Josef 'Jeff' Sipek * * This file is released under the GPLv2. See the COPYING file for more * details. @@ -189,10 +189,10 @@ SHELL_CMD_AUTH(sys, G); - con_printf(sys->con, "CPU 00 ID %016llX %s\n", + con_printf(sys->con, "CPU 00 ID %016lX %s\n", sys->cpu->cpuid, __guest_state_to_str(sys->cpu->state)); - con_printf(sys->con, "STORAGE = %lluM\n", sys->directory->storage_size >> 20); + con_printf(sys->con, "STORAGE = %luM\n", sys->directory->storage_size >> 20); for_each_vdev(sys, vdev) display_vdev(sys->con, vdev); @@ -202,14 +202,14 @@ static void __cmd_query_real_cpus(struct virt_sys *sys) { - con_printf(sys->con, "CPU %02d ID %016llX RUNNING\n", + con_printf(sys->con, "CPU %02d ID %016lX RUNNING\n", getcpuaddr(), getcpuid()); } static void __cmd_query_real_stor(struct virt_sys *sys) { - con_printf(sys->con, "STORAGE = %lluM\n", memsize >> 20); + con_printf(sys->con, "STORAGE = %luM\n", memsize >> 20); } enum { diff -r 7eedfe5b73c0 -r 6fca4100a886 include/types.h --- a/include/types.h Tue Jul 30 14:58:36 2019 -0400 +++ b/include/types.h Tue Jul 30 14:56:02 2019 -0400 @@ -21,11 +21,20 @@ typedef unsigned int uint32_t; typedef signed int int32_t; +#if defined(_LP64) +typedef unsigned long uint64_t; +typedef signed long int64_t; + +typedef uint64_t uintptr_t; +typedef int64_t intptr_t; +#else typedef unsigned long long uint64_t; typedef signed long long int64_t; -typedef uint64_t uintptr_t; -typedef int64_t intptr_t; +typedef uint32_t uintptr_t; +typedef int32_t intptr_t; +typedef int32_t ptrdiff_t; +#endif typedef uintptr_t size_t; typedef intptr_t ssize_t;