cvsuser 03/11/22 01:55:49
Modified: config/init/hints mswin32.pl
src exceptions.c interpreter.c packfile.c pmc_freeze.c
runops_cores.c smallobject.c string.c utils.c
Log:
warning patrol win32 fixes courtesy of Jonathan Worthington
Revision Changes Path
1.17 +7 -0 parrot/config/init/hints/mswin32.pl
Index: mswin32.pl
===================================================================
RCS file: /cvs/public/parrot/config/init/hints/mswin32.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- mswin32.pl 15 Oct 2003 12:06:24 -0000 1.16
+++ mswin32.pl 22 Nov 2003 09:55:45 -0000 1.17
@@ -56,6 +56,13 @@
# 'link' needs to be link.exe, not cl.exe.
# This makes 'link' and 'ld' the same.
Configure::Data->set('link', Configure::Data->get('ld'));
+
+ # We can't use -opt: and -debug together.
+ if (Configure::Data->get('ld_debug') =~ /-debug/) {
+ my $linkflags = Configure::Data->get('linkflags');
+ $linkflags =~ s/-opt:\S+//;
+ Configure::Data->set('linkflags', $linkflags);
+ }
}
if( $is_bcc ) {
Configure::Data->set(
1.42 +1 -4 parrot/src/exceptions.c
Index: exceptions.c
===================================================================
RCS file: /cvs/public/parrot/src/exceptions.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -w -r1.41 -r1.42
--- exceptions.c 12 Nov 2003 11:02:33 -0000 1.41
+++ exceptions.c 22 Nov 2003 09:55:49 -0000 1.42
@@ -1,7 +1,7 @@
/* exceptions.c
* Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
* CVS Info
- * $Id: exceptions.c,v 1.41 2003/11/12 11:02:33 leo Exp $
+ * $Id: exceptions.c,v 1.42 2003/11/22 09:55:49 leo Exp $
* Overview:
* define the internal interpreter exceptions
* Data Structure and Algorithms:
@@ -100,7 +100,6 @@
find_exception_handler(Parrot_Interp interpreter, PMC *exception)
{
PMC *handler;
- Stack_entry_type type;
STRING *message;
char *m;
int exit_status;
@@ -294,7 +293,6 @@
create_exception(Parrot_Interp interpreter)
{
PMC *exception; /* exception object */
- size_t offset; /* resume offset of handler */
opcode_t *dest; /* absolute address of handler */
@@ -353,7 +351,6 @@
{
#ifdef PARROT_HAS_HEADER_SETJMP
STRING *msg;
- opcode_t *dest; /* absolute address of handler */
/*
1.230 +1 -2 parrot/src/interpreter.c
Index: interpreter.c
===================================================================
RCS file: /cvs/public/parrot/src/interpreter.c,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -w -r1.229 -r1.230
--- interpreter.c 19 Nov 2003 15:29:21 -0000 1.229
+++ interpreter.c 22 Nov 2003 09:55:49 -0000 1.230
@@ -1,7 +1,7 @@
/* interpreter.c
* Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
* CVS Info
- * $Id: interpreter.c,v 1.229 2003/11/19 15:29:21 leo Exp $
+ * $Id: interpreter.c,v 1.230 2003/11/22 09:55:49 leo Exp $
* Overview:
* The interpreter api handles running the operations
* Data Structure and Algorithms:
@@ -481,7 +481,6 @@
interpreter->resume_flag = 1;
while (interpreter->resume_flag & 1) {
- unsigned int slow;
opcode_t *pc = (opcode_t *)
interpreter->code->byte_code + interpreter->resume_offset;
1.121 +2 -3 parrot/src/packfile.c
Index: packfile.c
===================================================================
RCS file: /cvs/public/parrot/src/packfile.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -w -r1.120 -r1.121
--- packfile.c 21 Nov 2003 16:28:30 -0000 1.120
+++ packfile.c 22 Nov 2003 09:55:49 -0000 1.121
@@ -7,7 +7,7 @@
** This program is free software. It is subject to the same
** license as Parrot itself.
**
-** $Id: packfile.c,v 1.120 2003/11/21 16:28:30 leo Exp $
+** $Id: packfile.c,v 1.121 2003/11/22 09:55:49 leo Exp $
**
** History:
** Rework by Melvin; new bytecode format, make bytecode portable.
@@ -158,7 +158,6 @@
static void
make_code_pointers(struct PackFile_Segment *seg)
{
- size_t i;
struct PackFile *pf = seg->pf;
switch (seg->type) {
@@ -997,7 +996,7 @@
static void
sort_segs(struct PackFile_Directory *dir)
{
- size_t i, j, num_segs = dir->num_segments;
+ size_t i, num_segs = dir->num_segments;
struct PackFile_Segment *seg = dir->segments[0], *s2;
if (seg->type != PF_BYTEC_SEG) {
1.7 +3 -3 parrot/src/pmc_freeze.c
Index: pmc_freeze.c
===================================================================
RCS file: /cvs/public/parrot/src/pmc_freeze.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- pmc_freeze.c 21 Nov 2003 10:49:31 -0000 1.6
+++ pmc_freeze.c 22 Nov 2003 09:55:49 -0000 1.7
@@ -1,7 +1,7 @@
/* pmc_freeze.c
* Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
* CVS Info
- * $Id: pmc_freeze.c,v 1.6 2003/11/21 10:49:31 leo Exp $
+ * $Id: pmc_freeze.c,v 1.7 2003/11/22 09:55:49 leo Exp $
* Overview:
* Freeze and thaw functionality
* Data Structure and Algorithms:
@@ -78,7 +78,7 @@
* grow by factor 1.5 or such
*/
if (need_free <= 16) {
- size_t new_size = s->buflen * 1.5;
+ size_t new_size = (size_t) (s->buflen * 1.5);
if (new_size < s->buflen - need_free + 512)
new_size = s->buflen - need_free + 512;
Parrot_reallocate_string(interpreter, s, new_size);
@@ -150,7 +150,7 @@
* grow by factor 1.5 or such
*/
if (need_free <= 16) {
- size_t new_size = s->buflen * 1.5;
+ size_t new_size = (size_t) (s->buflen * 1.5);
if (new_size < s->buflen - need_free + 512)
new_size = s->buflen - need_free + 512;
Parrot_reallocate_string(interpreter, s, new_size);
1.39 +2 -4 parrot/src/runops_cores.c
Index: runops_cores.c
===================================================================
RCS file: /cvs/public/parrot/src/runops_cores.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -w -r1.38 -r1.39
--- runops_cores.c 12 Nov 2003 11:02:34 -0000 1.38
+++ runops_cores.c 22 Nov 2003 09:55:49 -0000 1.39
@@ -1,7 +1,7 @@
/* runops_cores.c
* Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
* CVS Info
- * $Id: runops_cores.c,v 1.38 2003/11/12 11:02:34 leo Exp $
+ * $Id: runops_cores.c,v 1.39 2003/11/22 09:55:49 leo Exp $
* Overview:
* The switchable runops cores.
* Data Structure and Algorithms:
@@ -72,8 +72,6 @@
opcode_t *
runops_slow_core(struct Parrot_Interp *interpreter, opcode_t *pc)
{
- opcode_t *code_start;
- opcode_t *code_end;
#ifdef USE_TRACE_INTERP
Interp * trace_i;
struct Parrot_Context *trace_ctx;
@@ -148,7 +146,7 @@
opcode_t *
runops_profile_core(struct Parrot_Interp *interpreter, opcode_t *pc)
{
- opcode_t *code_start, *code_end, cur_op;
+ opcode_t cur_op;
RunProfile *profile = interpreter->profile;
while (pc) {/* && pc >= code_start && pc < code_end) */
1.29 +2 -2 parrot/src/smallobject.c
Index: smallobject.c
===================================================================
RCS file: /cvs/public/parrot/src/smallobject.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -w -r1.28 -r1.29
--- smallobject.c 27 Oct 2003 15:14:35 -0000 1.28
+++ smallobject.c 22 Nov 2003 09:55:49 -0000 1.29
@@ -1,7 +1,7 @@
/* resources.c
* Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
* CVS Info
- * $Id: smallobject.c,v 1.28 2003/10/27 15:14:35 leo Exp $
+ * $Id: smallobject.c,v 1.29 2003/11/22 09:55:49 leo Exp $
* Overview:
* Handles the accessing of small object pools (header pools)
* Data Structure and Algorithms:
@@ -330,7 +330,7 @@
GC_DEBUG_REPLENISH_LEVEL_FACTOR);
}
else {
- pool->objects_per_alloc *= UNITS_PER_ALLOC_GROWTH_FACTOR;
+ pool->objects_per_alloc = (size_t) pool->objects_per_alloc *
UNITS_PER_ALLOC_GROWTH_FACTOR;
pool->replenish_level =
(size_t)(pool->total_objects * REPLENISH_LEVEL_FACTOR);
}
1.161 +1 -6 parrot/src/string.c
Index: string.c
===================================================================
RCS file: /cvs/public/parrot/src/string.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -w -r1.160 -r1.161
--- string.c 15 Nov 2003 15:30:46 -0000 1.160
+++ string.c 22 Nov 2003 09:55:49 -0000 1.161
@@ -1,7 +1,7 @@
/* string.c
* Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
* CVS Info
- * $Id: string.c,v 1.160 2003/11/15 15:30:46 petergibbs Exp $
+ * $Id: string.c,v 1.161 2003/11/22 09:55:49 leo Exp $
* Overview:
* This is the api definitions for the string subsystem
* Data Structure and Algorithms:
@@ -1049,11 +1049,6 @@
INTVAL
string_equal(struct Parrot_Interp *interpreter, STRING *s1, STRING *s2)
{
- const char *s1start;
- const char *s1end;
- const char *s2start;
- const char *s2end;
-
if (!s1 && !s2) {
return 0;
}
1.4 +2 -2 parrot/src/utils.c
Index: utils.c
===================================================================
RCS file: /cvs/public/parrot/src/utils.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- utils.c 11 Nov 2003 15:17:20 -0000 1.3
+++ utils.c 22 Nov 2003 09:55:49 -0000 1.4
@@ -1,7 +1,7 @@
/* utils.c
* Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
* CVS Info
- * $Id: utils.c,v 1.3 2003/11/11 15:17:20 leo Exp $
+ * $Id: utils.c,v 1.4 2003/11/22 09:55:49 leo Exp $
* Overview:
* Some utility functions
* Data Structure and Algorithms:
@@ -204,7 +204,7 @@
INTVAL
Parrot_range_rand(INTVAL from, INTVAL to, INTVAL how_random)
{
- return from + ((double)(to - from)) * Parrot_float_rand(how_random);
+ return (INTVAL) from + ((double)(to - from)) * Parrot_float_rand(how_random);
}
void
