[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 ec62f2f: Fix last change
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 ec62f2f: Fix last change |
Date: |
Mon, 30 Nov 2015 20:47:35 +0000 |
branch: emacs-25
commit ec62f2f5ad37ff5fc7ba77f57e2fc81ac7cdcc9d
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix last change
* src/emacs-module.c (lisp_to_value, value_to_lisp)
[WIDE_EMACS_INT]: Avoid compiler warnings.
---
src/emacs-module.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/emacs-module.c b/src/emacs-module.c
index 69649b2..67e5eab 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -850,15 +850,15 @@ static Lisp_Object
value_to_lisp (emacs_value v)
{
#ifdef WIDE_EMACS_INT
- EMACS_INT tmp = (EMACS_INT)v;
+ ptrdiff_t tmp = (ptrdiff_t)v;
int tag = tmp & ((1 << GCTYPEBITS) - 1);
Lisp_Object o;
switch (tag)
{
case_Lisp_Int:
- o = make_lisp_ptr ((tmp - tag) >> GCTYPEBITS, tag); break;
+ o = make_lisp_ptr ((void *)((tmp - tag) >> GCTYPEBITS), tag); break;
default:
- o = make_lisp_ptr ((void*)(tmp - tag), tag);
+ o = make_lisp_ptr ((void *)(tmp - tag), tag);
}
/* eassert (lisp_to_value (o) == v); */
if (CONSP (o) && EQ (XCDR (o), ltv_mark))
@@ -892,9 +892,10 @@ lisp_to_value (Lisp_Object o)
case_Lisp_Int:
{
EMACS_UINT val = i & VALMASK;
- if (val == (EMACS_UINT)(emacs_value)val)
+ if (val <= (SIZE_MAX >> GCTYPEBITS))
{
- emacs_value v = (emacs_value) ((val << GCTYPEBITS) | tag);
+ size_t tv = (size_t)val;
+ emacs_value v = (emacs_value) ((tv << GCTYPEBITS) | tag);
eassert (EQ (value_to_lisp (v), o));
return v;
}
@@ -904,13 +905,13 @@ lisp_to_value (Lisp_Object o)
default:
{
void *ptr = XUNTAG (o, tag);
- if (((EMACS_UINT)ptr) & ((1 << GCTYPEBITS) - 1))
+ if (((size_t)ptr) & ((1 << GCTYPEBITS) - 1))
{ /* Pointer is not properly aligned! */
eassert (!CONSP (o)); /* Cons cells have to always be aligned! */
o = Fcons (o, ltv_mark);
ptr = XUNTAG (o, tag);
}
- emacs_value v = (emacs_value)(((EMACS_UINT) ptr) | tag);
+ emacs_value v = (emacs_value)(((size_t) ptr) | tag);
eassert (EQ (value_to_lisp (v), o));
return v;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 ec62f2f: Fix last change,
Eli Zaretskii <=