From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id kXPGKyXzw2qCRT4AWB0awg (envelope-from ) for ; Mon, 05 Oct 2026 14:57:41 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=nyPObpvY; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id AB6C11E051; Mon, 05 Oct 2026 14:57:41 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id B768A1E047 for ; Mon, 05 Oct 2026 14:57:38 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5063F4B9DB6B for ; Mon, 5 Oct 2026 18:57:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5063F4B9DB6B Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=nyPObpvY Received: from mail-pj2-x2a.google.com (mail-pj2-x2a.google.com [IPv6:2607:f8b0:4864:39::2a]) by sourceware.org (Postfix) with ESMTPS id B15C94B9DB73 for ; Mon, 5 Oct 2026 18:56:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B15C94B9DB73 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B15C94B9DB73 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:39::2a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1791226587; cv=none; b=cE3fHgSiMjRkPU+bG4j5T36VgUXP8rkkMb8e9blcwV4LTWUTY8gwW66bjCT/4MYLTdCcHGvbdey3WV3GECFuHbAKHtpXu1v/70SyFduFp5CoIVce3PzOE8IeS7miW9p0mHlXf0R6Zzx/+kuipGWSgSOWbiqdQ+uXx4YDvwD5lLQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1791226587; c=relaxed/simple; bh=LsoJlT8C2JCtvLEGce6nrRHbg1LzUA3HxPkbj3UeUpM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=OPGMxPxyh1EQi8tWYhV5TbYYLaQJCRKQS9d9Jw4RhgKeb7LXAprUkcQ+PW5envAYuuZs4/urMRGSmNAMxF6vap68LksHu0CErDpMGCzBUGXioU3dYukFX1y+EE+e3D4wybDpxIXEI677/F9xR9LGDJlogPK9RtCaviJUyqm0d40= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=nyPObpvY DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B15C94B9DB73 Received: by mail-pj2-x2a.google.com with SMTP id 98e67ed59e1d1-3a81335d54cso380750a91.0 for ; Mon, 05 Oct 2026 11:56:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791226586; x=1791831386; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=28YGm+4k6fZ4vkllKjiiOdHQWOL0s8zko5VTlXFqiDM=; b=nyPObpvYU3K/sLkCmSEpQOc3/2aEgshXSAyIFE8TKnXmmlb//O9Aaczlt0QmD0+g/1 Ozyqe6ZfmU/Rto/BJbU3gMR8J34x9r9i2GComByN7cfNI4py51IVsR/+0hfx1xNCbukE LrpQfsLrTWKWmehwzteM0zmhU8T3KKvDCjdXtL5oy18oZDk0vOrDYO13CGfkNGHEgy8T Dx/3h3nhhsCr5eEB/SzIVUfYEILoEHT74LU9bMQOzLssJlHXoZpmjnkbAPHzllicfIm4 CZWw+eTYd8L9hcwx+M/Vigi457MM0bE29KzgBUhJFYhB/hXND82/ZtllL5mKY47euwOG AOnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791226586; x=1791831386; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=28YGm+4k6fZ4vkllKjiiOdHQWOL0s8zko5VTlXFqiDM=; b=rBIsGZFlc0u3Ga9oTJ0Eks180UORNIfQMl4ubgCnLmdX4BxNKwa7BRuOGxKp+UnZkM Vkgk6ipN8Uam+kTZcKKVMlrV3A7L6Mavlh2tjukdwGWUjBptXS8ceirGspggXu86d/kf wHQz6ThRshPZO7bfWK2N9Fd8WPofbo93SSwdioWPGZabfTwLb5N4fWFDkxYLw36p3rfj cwfY3/ebIfvF/DlN0SMmhyv9AWG4t4pjFjuG5ftTcYKTvDYzsjucsQFtplnujZlnSUFL K5w1D3CRxGXjlNy5CB6ZcXnCC48mHzJx07kP8kXptP/rTbdQy7HKZMZDuEB2L6x2ILah VbWg== X-Gm-Message-State: AFq9FYKk3N2TZe5ZuJHaTwYyK9deluELAgZ0KFchkugxEWPUT7MgmG9i pg4DIfvZa5Xu+sVEhmZlGTYianmUk78I/FaLYzjihpoGY+V2D8uJIadMZoB9yOvc X-Gm-Gg: AYBFou1jN9hSnmPIG9wnYA+1AdSJpyiLxEARn9Wl42icA5hpg5WlQ/TsoDJV580gEI9 G5yjZY0L3HceCPKEZhAYK7Piz2RmJIViTbSkXD7B1a7k4XV/64kFZDajdHwislT5qOCBszHpn7p d9lUN5pDZhQicWvPAd3Riu3JZeyCAbGrldU/QukEWRFSErbnl/eTWtAbhwr1XOlFyOQ8ZVSm3hp X/Qp1DOTprdDkfYoixa/IkC04FtCmxKnIsoUTKp09jIDkxw5gE36yKTlNaGz+BbDLh5QqDLqF32 VOkkg+VQdA7uJJME0LOdzOPWQsLfOlMnBh92hjBCJtIbf3Z0dpZRH59hmdMLQQOFGDtIoYuZBoB k8CLDZM31ahVNxBAyvqKHfxTtJ8/OBnXYrJME4hpa5jp9bH4Yzarkn/C4wtIka0B7blzBPNmXiE VP4zkcXkRUEBnIg9N18tGNkTv+i5NRjRqRZ1fCriWekoM78vMQJ/JtmvlCU16GDnnZQecL4hv6k TnozVcaEmOJCEexFxiIDE8Wraw= X-Received: by 2002:a17:90b:4f4a:b0:3a6:e9bf:f244 with SMTP id 98e67ed59e1d1-3a853cdb462mr218288a91.1.1791226585510; Mon, 05 Oct 2026 11:56:25 -0700 (PDT) Received: from localhost.localdomain ([122.171.21.153]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a853e662a5sm723676a91.4.2026.10.05.11.56.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 05 Oct 2026 11:56:25 -0700 (PDT) From: Aditya Vidyadhar Kamath To: ulrich.weigand@de.ibm.com, simon.marchi@polymtl.ca, tom@tromey.com Cc: gdb-patches@sourceware.org, Aditya.Kamath1@ibm.com, sangamesh.swamy@in.ibm.com, Aditya Vidyadhar Kamath Subject: [PATCH v5] Fix styles in aix-thread.c to follow GNU style code. Date: Tue, 6 Oct 2026 00:25:49 +0530 Message-ID: <20261005185548.35872-2-akamath996@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org From: Aditya Vidyadhar Kamath This patch makes changes in aix-thread.c to follow style in https://sourceware.org/gdb/wiki/Internals%20GDB-C-Coding-Standards I ran clang-format with GNU style as a starting point: /home/clang+llvm-23.1.2-powerpc64-ibm-aix-7.2/bin/clang-format \ -style=GNU -i gdb/aix-thread.c and then manually kept only the changes that match GDB's coding standards. The resulting changes include: 1: wrapping lines exceeding 80 columns, 2: adding spaces before '(' where required, 3: converting one-line switch cases to the preferred GNU style, 4: fixing a few indentation issues, 5: Remove tab-alignment in #define's 6: Add space in sizeof() calls throughout. 7: Some double spaces removed. 8: Correct genuine misindents like in sync_threadlists (), add_thread_with_info (). A few clang-format changes were not kept: 1: brace placement changes for struct definitions, 2: #include reordering alphabetically, 3: removal of blank lines separating logical sections, 4: some cast formatting changes. --- gdb/aix-thread.c | 289 ++++++++++++++++++++++++++--------------------- 1 file changed, 163 insertions(+), 126 deletions(-) diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c index 647ed063671..632b46bdacb 100644 --- a/gdb/aix-thread.c +++ b/gdb/aix-thread.c @@ -65,19 +65,19 @@ static bool debug_aix_thread; /* In AIX 5.1, functions use pthdb_tid_t instead of tid_t. */ #ifndef PTHDB_VERSION_3 -#define pthdb_tid_t tid_t +#define pthdb_tid_t tid_t #endif /* Success and failure values returned by pthdb callbacks. */ -#define PDC_SUCCESS PTHDB_SUCCESS -#define PDC_FAILURE PTHDB_CALLBACK +#define PDC_SUCCESS PTHDB_SUCCESS +#define PDC_FAILURE PTHDB_CALLBACK /* Private data attached to each element in GDB's thread list. */ struct aix_thread_info : public private_thread_info { - pthdb_pthread_t pdtid; /* thread's libpthdebug id */ + pthdb_pthread_t pdtid; /* thread's libpthdebug id */ }; /* Return the aix_thread_info attached to THREAD. */ @@ -236,38 +236,70 @@ pd_status2str (int status) { switch (status) { - case PTHDB_SUCCESS: return "SUCCESS"; - case PTHDB_NOSYS: return "NOSYS"; - case PTHDB_NOTSUP: return "NOTSUP"; - case PTHDB_BAD_VERSION: return "BAD_VERSION"; - case PTHDB_BAD_USER: return "BAD_USER"; - case PTHDB_BAD_SESSION: return "BAD_SESSION"; - case PTHDB_BAD_MODE: return "BAD_MODE"; - case PTHDB_BAD_FLAGS: return "BAD_FLAGS"; - case PTHDB_BAD_CALLBACK: return "BAD_CALLBACK"; - case PTHDB_BAD_POINTER: return "BAD_POINTER"; - case PTHDB_BAD_CMD: return "BAD_CMD"; - case PTHDB_BAD_PTHREAD: return "BAD_PTHREAD"; - case PTHDB_BAD_ATTR: return "BAD_ATTR"; - case PTHDB_BAD_MUTEX: return "BAD_MUTEX"; - case PTHDB_BAD_MUTEXATTR: return "BAD_MUTEXATTR"; - case PTHDB_BAD_COND: return "BAD_COND"; - case PTHDB_BAD_CONDATTR: return "BAD_CONDATTR"; - case PTHDB_BAD_RWLOCK: return "BAD_RWLOCK"; - case PTHDB_BAD_RWLOCKATTR: return "BAD_RWLOCKATTR"; - case PTHDB_BAD_KEY: return "BAD_KEY"; - case PTHDB_BAD_PTID: return "BAD_PTID"; - case PTHDB_BAD_TID: return "BAD_TID"; - case PTHDB_CALLBACK: return "CALLBACK"; - case PTHDB_CONTEXT: return "CONTEXT"; - case PTHDB_HELD: return "HELD"; - case PTHDB_NOT_HELD: return "NOT_HELD"; - case PTHDB_MEMORY: return "MEMORY"; - case PTHDB_NOT_PTHREADED: return "NOT_PTHREADED"; - case PTHDB_SYMBOL: return "SYMBOL"; - case PTHDB_NOT_AVAIL: return "NOT_AVAIL"; - case PTHDB_INTERNAL: return "INTERNAL"; - default: return "UNKNOWN"; + case PTHDB_SUCCESS: + return "SUCCESS"; + case PTHDB_NOSYS: + return "NOSYS"; + case PTHDB_NOTSUP: + return "NOTSUP"; + case PTHDB_BAD_VERSION: + return "BAD_VERSION"; + case PTHDB_BAD_USER: + return "BAD_USER"; + case PTHDB_BAD_SESSION: + return "BAD_SESSION"; + case PTHDB_BAD_MODE: + return "BAD_MODE"; + case PTHDB_BAD_FLAGS: + return "BAD_FLAGS"; + case PTHDB_BAD_CALLBACK: + return "BAD_CALLBACK"; + case PTHDB_BAD_POINTER: + return "BAD_POINTER"; + case PTHDB_BAD_CMD: + return "BAD_CMD"; + case PTHDB_BAD_PTHREAD: + return "BAD_PTHREAD"; + case PTHDB_BAD_ATTR: + return "BAD_ATTR"; + case PTHDB_BAD_MUTEX: + return "BAD_MUTEX"; + case PTHDB_BAD_MUTEXATTR: + return "BAD_MUTEXATTR"; + case PTHDB_BAD_COND: + return "BAD_COND"; + case PTHDB_BAD_CONDATTR: + return "BAD_CONDATTR"; + case PTHDB_BAD_RWLOCK: + return "BAD_RWLOCK"; + case PTHDB_BAD_RWLOCKATTR: + return "BAD_RWLOCKATTR"; + case PTHDB_BAD_KEY: + return "BAD_KEY"; + case PTHDB_BAD_PTID: + return "BAD_PTID"; + case PTHDB_BAD_TID: + return "BAD_TID"; + case PTHDB_CALLBACK: + return "CALLBACK"; + case PTHDB_CONTEXT: + return "CONTEXT"; + case PTHDB_HELD: + return "HELD"; + case PTHDB_NOT_HELD: + return "NOT_HELD"; + case PTHDB_MEMORY: + return "MEMORY"; + case PTHDB_NOT_PTHREADED: + return "NOT_PTHREADED"; + case PTHDB_SYMBOL: + return "SYMBOL"; + case PTHDB_NOT_AVAIL: + return "NOT_AVAIL"; + case PTHDB_INTERNAL: + return "INTERNAL"; + default: + return "UNKNOWN"; } } @@ -299,16 +331,16 @@ ptrace_check (int req, int id, int ret) req, id, ret, errno); return ret == -1 ? 0 : 1; } - break; - case PTT_READ_VEC: - case PTT_READ_VSX: - if (debug_aix_thread) - gdb_printf (gdb_stdlog, - "ptrace (%d, %d) = %d (errno = %d)\n", - req, id, ret, errno); - if (ret == -1) - return -1; - break; + break; + case PTT_READ_VEC: + case PTT_READ_VSX: + if (debug_aix_thread) + gdb_printf (gdb_stdlog, + "ptrace (%d, %d) = %d (errno = %d)\n", + req, id, ret, errno); + if (ret == -1) + return -1; + break; } error (_("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)"), req, id, ret, errno, safe_strerror (errno)); @@ -368,7 +400,8 @@ pid_to_prc (ptid_t *ptidp) the address of SYMBOLS[].name. */ static int -pdc_symbol_addrs (pthdb_user_t user_current_pid, pthdb_symbol_t *symbols, int count) +pdc_symbol_addrs (pthdb_user_t user_current_pid, pthdb_symbol_t *symbols, + int count) { int i; char *name; @@ -447,13 +480,13 @@ pdc_read_regs (pthdb_user_t user_current_pid, if (!ptrace64aix (PTT_READ_GPRS, tid, (unsigned long) gprs64, 0, NULL)) memset (gprs64, 0, sizeof (gprs64)); - memcpy (context->gpr, gprs64, sizeof(gprs64)); + memcpy (context->gpr, gprs64, sizeof (gprs64)); } else { if (!ptrace32 (PTT_READ_GPRS, tid, (uintptr_t) gprs32, 0, NULL)) memset (gprs32, 0, sizeof (gprs32)); - memcpy (context->gpr, gprs32, sizeof(gprs32)); + memcpy (context->gpr, gprs32, sizeof (gprs32)); } } @@ -462,7 +495,7 @@ pdc_read_regs (pthdb_user_t user_current_pid, { if (!ptrace32 (PTT_READ_FPRS, tid, (uintptr_t) fprs, 0, NULL)) memset (fprs, 0, sizeof (fprs)); - memcpy (context->fpr, fprs, sizeof(fprs)); + memcpy (context->fpr, fprs, sizeof (fprs)); } /* Special-purpose registers. */ @@ -473,49 +506,49 @@ pdc_read_regs (pthdb_user_t user_current_pid, if (!ptrace64aix (PTT_READ_SPRS, tid, (unsigned long) &sprs64, 0, NULL)) memset (&sprs64, 0, sizeof (sprs64)); - memcpy (&context->msr, &sprs64, sizeof(sprs64)); + memcpy (&context->msr, &sprs64, sizeof (sprs64)); } else { if (!ptrace32 (PTT_READ_SPRS, tid, (uintptr_t) &sprs32, 0, NULL)) memset (&sprs32, 0, sizeof (sprs32)); - memcpy (&context->msr, &sprs32, sizeof(sprs32)); + memcpy (&context->msr, &sprs32, sizeof (sprs32)); } } /* vector registers. */ __vmx_context_t vmx; - if (__power_vmx() && (flags & PTHDB_FLAG_REGS)) + if (__power_vmx () && (flags & PTHDB_FLAG_REGS)) { if (data->arch64) { if (!ptrace64aix (PTT_READ_VEC, tid, (long long) &vmx, 0, 0)) memset (&vmx, 0, sizeof (vmx)); - memcpy (&context->vmx, &vmx, sizeof(__vmx_context_t)); + memcpy (&context->vmx, &vmx, sizeof (__vmx_context_t)); } else { if (!ptrace32 (PTT_READ_VEC, tid, (long long) &vmx, 0, 0)) memset (&vmx, 0, sizeof (vmx)); - memcpy (&context->vmx, &vmx, sizeof(__vmx_context_t)); + memcpy (&context->vmx, &vmx, sizeof (__vmx_context_t)); } } /* vsx registers. */ __vsx_context_t vsx; - if (__power_vsx() && (flags & PTHDB_FLAG_REGS)) + if (__power_vsx () && (flags & PTHDB_FLAG_REGS)) { if (data->arch64) { if (!ptrace64aix (PTT_READ_VSX, tid, (long long) &vsx, 0, 0)) memset (&vsx, 0, sizeof (vsx)); - memcpy (&context->vsx, &vsx, sizeof(__vsx_context_t)); + memcpy (&context->vsx, &vsx, sizeof (__vsx_context_t)); } else { if (!ptrace32 (PTT_READ_VSX, tid, (long long) &vsx, 0, 0)) memset (&vsx, 0, sizeof (vsx)); - memcpy (&context->vsx, &vsx, sizeof(__vsx_context_t)); + memcpy (&context->vsx, &vsx, sizeof (__vsx_context_t)); } } return 0; @@ -576,7 +609,7 @@ pdc_write_regs (pthdb_user_t user_current_pid, } /* vector registers. */ - if (__power_vmx() && (flags & PTHDB_FLAG_REGS)) + if (__power_vmx () && (flags & PTHDB_FLAG_REGS)) { if (data->arch64) ptrace64aix (PTT_WRITE_VEC, tid, (unsigned long) &context->vmx, 0, 0); @@ -585,7 +618,7 @@ pdc_write_regs (pthdb_user_t user_current_pid, } /* vsx registers. */ - if (__power_vsx() && (flags & PTHDB_FLAG_REGS)) + if (__power_vsx () && (flags & PTHDB_FLAG_REGS)) { if (data->arch64) ptrace64aix (PTT_WRITE_VSX, tid, (unsigned long) &context->vsx, 0, 0); @@ -636,7 +669,8 @@ pdc_write_data (pthdb_user_t user_current_pid, void *buf, if (debug_aix_thread) gdb_printf (gdb_stdlog, - "pdc_write_data (user_current_pid = %ld, buf = 0x%lx, addr = %s, len = %ld)\n", + "pdc_write_data (user_current_pid = %ld, buf = 0x%lx," + " addr = %s, len = %ld)\n", user_current_pid, (long) buf, hex_string (addr), len); { @@ -682,7 +716,8 @@ pdc_realloc (pthdb_user_t user_current_pid, void *buf, size_t len, void **bufp) { if (debug_aix_thread) gdb_printf (gdb_stdlog, - "pdc_realloc (user_current_pid = %ld, buf = 0x%lx, len = %ld, bufp = 0x%lx)\n", + "pdc_realloc (user_current_pid = %ld, buf = 0x%lx," + " len = %ld, bufp = 0x%lx)\n", user_current_pid, (long) buf, len, (long) bufp); *bufp = xrealloc (buf, len); if (debug_aix_thread) @@ -808,7 +843,7 @@ sync_threadlists (pid_t pid) if (state == PST_TERM) { if (data->exited_threads.count (pdtid) != 0) - continue; + continue; } /* If this thread has never been reported to GDB, add it. */ @@ -827,7 +862,7 @@ sync_threadlists (pid_t pid) } else add_thread_with_info (proc_target, ptid, - private_thread_info_up (priv)); + private_thread_info_up (priv)); } /* The thread is terminated. Remove it. */ @@ -1381,7 +1416,7 @@ fetch_regs_kernel_thread (struct regcache *regcache, int regno, else ret = ptrace32 (PTT_READ_VEC, tid, (uintptr_t) &vmx, 0, 0); if (ret < 0) - memset(&vmx, 0, sizeof(__vmx_context_t)); + memset (&vmx, 0, sizeof (__vmx_context_t)); for (i = 0; i < ppc_num_vrs; i++) regcache->raw_supply (tdep->ppc_vr0_regnum + i, &(vmx.__vr[i])); regcache->raw_supply (tdep->ppc_vrsave_regnum, &(vmx.__vrsave)); @@ -1398,7 +1433,7 @@ fetch_regs_kernel_thread (struct regcache *regcache, int regno, else ret = ptrace32 (PTT_READ_VSX, tid, (long long) &vsx, 0, 0); if (ret < 0) - memset(&vsx, 0, sizeof(__vsx_context_t)); + memset (&vsx, 0, sizeof (__vsx_context_t)); for (i = 0; i < ppc_num_vshrs; i++) regcache->raw_supply (tdep->ppc_vsr0_upper_regnum + i, &(vsx.__vsr_dw1[i])); } @@ -1461,7 +1496,7 @@ aix_thread_target::fetch_registers (struct regcache *regcache, int regno) { thread = current_inferior ()->find_thread (regcache->ptid ()); aix_thread_info *priv = get_aix_thread_info (thread); - tid = regcache->ptid().lwp (); + tid = regcache->ptid ().lwp (); if (tid == PTHDB_INVALID_TID) fetch_regs_user_thread (regcache, priv->pdtid); @@ -1480,9 +1515,10 @@ fill_altivec (const struct regcache *regcache, __vmx_context_t *vmx) int regno; for (regno = 0; regno < ppc_num_vrs; regno++) - if (REG_VALID == regcache->get_register_status (tdep->ppc_vr0_regnum + regno)) + if (REG_VALID == regcache->get_register_status + (tdep->ppc_vr0_regnum + regno)) regcache->raw_collect (tdep->ppc_vr0_regnum + regno, - &(vmx->__vr[regno])); + &(vmx->__vr[regno])); if (REG_VALID == regcache->get_register_status (tdep->ppc_vrsave_regnum)) regcache->raw_collect (tdep->ppc_vrsave_regnum, &(vmx->__vrsave)); @@ -1493,14 +1529,15 @@ fill_altivec (const struct regcache *regcache, __vmx_context_t *vmx) /* Fill vsx registers. */ static void -fill_vsx (const struct regcache *regcache, __vsx_context_t *vsx) +fill_vsx (const struct regcache *regcache, __vsx_context_t *vsx) { struct gdbarch *gdbarch = regcache->arch (); ppc_gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); int regno; for (regno = 0; regno < ppc_num_vshrs; regno++) - if (REG_VALID == regcache->get_register_status ( tdep->ppc_vsr0_upper_regnum + regno)) + if (REG_VALID == regcache->get_register_status + (tdep->ppc_vsr0_upper_regnum + regno)) regcache->raw_collect (tdep->ppc_vsr0_upper_regnum + regno, &(vsx->__vsr_dw1[0]) + regno); } @@ -1641,7 +1678,7 @@ store_regs_user_thread (const struct regcache *regcache, pthdb_pthread_t pdtid) struct aix_thread_variables *data; data = get_thread_data_helper_for_ptid (inferior_ptid); __vmx_context_t vmx; - __vsx_context_t vsx; + __vsx_context_t vsx; if (debug_aix_thread) gdb_printf (gdb_stdlog, @@ -1656,9 +1693,9 @@ store_regs_user_thread (const struct regcache *regcache, pthdb_pthread_t pdtid) /* Fill altivec-registers. */ - if (__power_vmx()) + if (__power_vmx ()) { - memset(&vmx, 0, sizeof(__vmx_context_t)); + memset (&vmx, 0, sizeof (__vmx_context_t)); for (i = 0; i < ppc_num_vrs; i++) if (REG_VALID == regcache->get_register_status (tdep->ppc_vr0_regnum + i)) { @@ -1674,9 +1711,9 @@ store_regs_user_thread (const struct regcache *regcache, pthdb_pthread_t pdtid) /* Fill vsx registers. */ - if (__power_vsx()) + if (__power_vsx ()) { - memset(&vsx, 0, sizeof(__vsx_context_t)); + memset (&vsx, 0, sizeof (__vsx_context_t)); for (i = 0; i < ppc_num_vshrs; i++) if (REG_VALID == regcache->get_register_status (tdep->ppc_vsr0_regnum + i)) { @@ -1764,7 +1801,7 @@ store_regs_kernel_thread (const struct regcache *regcache, int regno, uint32_t gprs32[ppc_num_gprs]; double fprs[ppc_num_fprs]; struct ptxsprs sprs64; - struct ptsprs sprs32; + struct ptsprs sprs32; struct aix_thread_variables *data; int ret = 0; @@ -1860,55 +1897,55 @@ store_regs_kernel_thread (const struct regcache *regcache, int regno, } } - /* Vector registers. */ - if (tdep->ppc_vr0_regnum != -1 && tdep->ppc_vrsave_regnum != -1 - && (regno == -1 || (regno >= tdep->ppc_vr0_regnum - && regno <= tdep->ppc_vrsave_regnum))) - { - __vmx_context_t vmx; - if (__power_vmx()) - { - if (data->arch64) - ret = ptrace64aix (PTT_READ_VEC, tid, (long long) &vmx, 0, 0); - else - ret = ptrace32 (PTT_READ_VEC, tid, (long long) &vmx, 0, 0); - if (ret > 0) - { - fill_altivec(regcache, &vmx); - if (data->arch64) - ret = ptrace64aix (PTT_WRITE_VEC, tid, (long long) &vmx, 0, 0); - else - ret = ptrace32 (PTT_WRITE_VEC, tid, (long long) &vmx, 0, 0); - if (ret < 0) - perror_with_name (_("Unable to store AltiVec register after read")); - } - } - } + /* Vector registers. */ + if (tdep->ppc_vr0_regnum != -1 && tdep->ppc_vrsave_regnum != -1 + && (regno == -1 || (regno >= tdep->ppc_vr0_regnum + && regno <= tdep->ppc_vrsave_regnum))) + { + __vmx_context_t vmx; + if (__power_vmx ()) + { + if (data->arch64) + ret = ptrace64aix (PTT_READ_VEC, tid, (long long) &vmx, 0, 0); + else + ret = ptrace32 (PTT_READ_VEC, tid, (long long) &vmx, 0, 0); + if (ret > 0) + { + fill_altivec (regcache, &vmx); + if (data->arch64) + ret = ptrace64aix (PTT_WRITE_VEC, tid, (long long) &vmx, 0, 0); + else + ret = ptrace32 (PTT_WRITE_VEC, tid, (long long) &vmx, 0, 0); + if (ret < 0) + perror_with_name (_("Unable to store AltiVec register after read")); + } + } + } - /* VSX registers. */ - if (tdep->ppc_vsr0_upper_regnum != -1 && (regno == -1 - || (regno >=tdep->ppc_vsr0_upper_regnum - && regno < tdep->ppc_vsr0_upper_regnum + ppc_num_vshrs))) - { - __vsx_context_t vsx; - if (__power_vsx()) - { - if (data->arch64) - ret = ptrace64aix (PTT_READ_VSX, tid, (long long) &vsx, 0, 0); - else - ret = ptrace32 (PTT_READ_VSX, tid, (long long) &vsx, 0, 0); - if (ret > 0) - { - fill_vsx (regcache, &vsx); - if (data->arch64) - ret = ptrace64aix (PTT_WRITE_VSX, tid, (long long) &vsx, 0, 0); - else - ret = ptrace32 (PTT_WRITE_VSX, tid, (long long) &vsx, 0, 0); - if (ret < 0) - perror_with_name (_("Unable to store VSX register after read")); - } - } - } + /* VSX registers. */ + if (tdep->ppc_vsr0_upper_regnum != -1 + && (regno == -1 || (regno >= tdep->ppc_vsr0_upper_regnum + && regno < tdep->ppc_vsr0_upper_regnum + ppc_num_vshrs))) + { + __vsx_context_t vsx; + if (__power_vsx ()) + { + if (data->arch64) + ret = ptrace64aix (PTT_READ_VSX, tid, (long long) &vsx, 0, 0); + else + ret = ptrace32 (PTT_READ_VSX, tid, (long long) &vsx, 0, 0); + if (ret > 0) + { + fill_vsx (regcache, &vsx); + if (data->arch64) + ret = ptrace64aix (PTT_WRITE_VSX, tid, (long long) &vsx, 0, 0); + else + ret = ptrace32 (PTT_WRITE_VSX, tid, (long long) &vsx, 0, 0); + if (ret < 0) + perror_with_name (_("Unable to store VSX register after read")); + } + } + } } /* Store gdb's current view of the register set into the @@ -2048,7 +2085,7 @@ aix_thread_target::extra_thread_info (struct thread_info *thread) buf.write ("", 1); - xfree (ret); /* Free old buffer. */ + xfree (ret); /* Free old buffer. */ ret = xstrdup (buf.c_str ()); -- 2.51.2