From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:42615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldJB-0003Vo-2M for qemu-devel@nongnu.org; Mon, 21 Jan 2019 12:24:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gldJ9-0007iF-Ga for qemu-devel@nongnu.org; Mon, 21 Jan 2019 12:24:24 -0500 Received: from mail-oi1-x244.google.com ([2607:f8b0:4864:20::244]:40660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gldJ9-0007hZ-BH for qemu-devel@nongnu.org; Mon, 21 Jan 2019 12:24:23 -0500 Received: by mail-oi1-x244.google.com with SMTP id t204so15123557oie.7 for ; Mon, 21 Jan 2019 09:24:22 -0800 (PST) MIME-Version: 1.0 References: <20190115143650.15725-1-jusual@mail.ru> <797be79d-7ffc-222a-6acd-b01ff7269a63@mail.ru> <20190117101309.GA27840@stefanha-x1.localdomain> <960bbd92-a160-a65c-22c7-9e899dc3fa78@mail.ru> In-Reply-To: From: Peter Maydell Date: Mon, 21 Jan 2019 17:24:10 +0000 Message-ID: Content-Type: text/plain; charset="UTF-8" Subject: Re: [Qemu-devel] [PATCH] hw/core/generic-loader: Fix PC overwriting List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Julia Suvorova Cc: Stefan Hajnoczi , Alistair Francis , Alistair Francis , "qemu-devel@nongnu.org Developers" , Richard Henderson On Thu, 17 Jan 2019 at 19:27, Peter Maydell wrote: > > On Thu, 17 Jan 2019 at 10:58, Julia Suvorova wrote: > > > > On 17.01.2019 13:13, Stefan Hajnoczi wrote: > > > generic_loader_reset() calls cpu_reset(s->cpu) followed by > > > CPUClass->set_pc(s->cpu, s->addr). > > > > > > ARM's arm_cpu_set_pc() doesn't special-case the Thumb bit (that's only > > > done in arm_cpu_reset()) so we end up with an invalid PC for Thumb mode > > > addresses. > > > > > > Maybe the following arm_cpu_reset() code should be moved to > > > arm_cpu_set_pc(): > > > > > > env->regs[15] = initial_pc & ~1; > > > env->thumb = initial_pc & 1; > > > > > > Then arm_cpu_reset() can call arm_cpu_set_pc() instead of duplicating > > > this code. > > > > No, set_pc() is called in cpu_tb_exec() to restore the PC value and > > therefore should not be changed. > > The set_pc hook is also called for the gdbstub 'c' and 's' packets > if they supply an address. I am not sure what the correct behaviour > there is (it might be tricky to find out or test, because the > 'c' and 's' packets are deprecated in favour of vCont which doesn't > allow the address argument at all, and recent gdb neither emits > 'c addr' nor supports it in its gdbserver implementation). I asked Linaro's gdb developer, and they thought that the gdb 'c addr' behaviour ought to be "look at bit 0 and switch to Thumb or Arm mode accordingly". thanks -- PMM