diff options
| author | Bo Hu <bohu@google.com> | 2015-06-02 22:55:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-02 22:55:02 +0000 |
| commit | c1b2e02c8b566deaf0a591a48ff7fad66250b356 (patch) | |
| tree | a7d9c6e2466fcb0f914c4556ca1b6a5498fb914d | |
| parent | 63782ac9f6a57a903f8496fc6c026551b01926db (diff) | |
| parent | b4cda1b8c90b36bcecd7170cf99a9e269cab1a10 (diff) | |
| download | qemu-android-c1b2e02c8b566deaf0a591a48ff7fad66250b356.tar.gz | |
Merge "hw/char/goldfish_tty.c: Sign extend addresses for mips" into studio-master-dev
| -rw-r--r-- | hw/char/goldfish_tty.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/char/goldfish_tty.c b/hw/char/goldfish_tty.c index a7aee8c1d2..5525e3f3d6 100644 --- a/hw/char/goldfish_tty.c +++ b/hw/char/goldfish_tty.c @@ -172,7 +172,11 @@ static void goldfish_tty_write(void *opaque, hwaddr offset, uint64_t value, unsi break; case TTY_DATA_PTR: +#if defined(TARGET_MIPS64) + s->ptr = (int32_t)deposit64(s->ptr, 0, 32, value); +#else s->ptr = deposit64(s->ptr, 0, 32, value); +#endif break; case TTY_DATA_PTR_HIGH: |