darcs

Issue 209 pull => bug in function reconcile_unwindings (1.0.6pre1)

Title pull => bug in function reconcile_unwindings (1.0.6pre1)
Priority bug Status resolved
Milestone Resolved in
Superseder pull => bug in function reconcile_unwindings (** minimal test case **)
View: 194
Nosy List darcs-devel, dmitry.kurochkin, erg, kowey, markstos, thorkilnaur, tommy
Assigned To droundy
Topics Conflicts

Created on 2006-07-03.20:51:53 by erg, last changed 2009-08-27.14:04:42 by admin.

Messages
msg746 (view) Author: erg Date: 2006-07-03.20:51:50
Please let me know if I can help you solve this issue or if it has
already been resolved.

-Doug

Shall I pull this patch? (51/51) [ynWvpxqadjk], or ? for help:
darcs: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./Factor/native/factor.c 52
-       char *image;
-       CELL ds_size = 128;
-       CELL cs_size = 128;
-       CELL generations = 2;
-       CELL young_size = 2 * CELLS;
-       CELL aging_size = 4 * CELLS;
-       CELL code_size = CELLS;
-       CELL literal_size = 128;
-       CELL args;
-       CELL i;
+       init_args = cons(tag_object(from_c_string(line)),init_args);
+}
hunk ./Factor/native/factor.c 52
-       char *image;
+       char *image = NULL;
)
merger 0.0 (
merger 0.0 (
hunk ./Factor/native/factor.c 68
-       //if(!image)
-               //return usage();
-       init_factor("factor.image", //image
+       if(!image)
+               return usage();
+       init_factor(image,
merger 0.0 (
hunk ./Factor/native/factor.c 111
-EXPORT void SetEnvironmentVariable(char *line)
+void SetFactorVariable(char *line)
merger 0.0 (
hunk ./Factor/native/factor.c 106
-EXPORT void SetImage(char *image_)
+void SetImage(char *image_)
merger 0.0 (
hunk ./Factor/native/factor.c 96
-       init_code_size = code_size ? code_size : init_code_size;
+       init_code_size = code_size ? *code_size : init_code_size;
+       //asm("push %esi");
+       //asm("push %ebx");
+       //asm("pop %ebx");
+       //asm("pop %esi");
+
+    //asm("mov %0, %%esi" : : "m" (esi));
+    //asm("mov %0, %%ebx" : : "m" (ebx));
merger 0.0 (
hunk ./Factor/native/factor.c 93
-       init_generations = generations ? *generations : init_generation;
+       init_generations = generations ? *generations : init_generations;
merger 0.0 (
hunk ./Factor/native/factor.c 88
+       //int ebx, esi;
+    //asm("mov %%esi, %0" : "=m" (esi));
+    //asm("mov %%ebx, %0" : "=m" (ebx));
merger 0.0 (
hunk ./Factor/native/factor.c 85
-EXPORT void InitDll(int *ds_size, int *cs_size, int *generations, int
*young_si
ze, int *aging_size, int *code_size)
+/*
+void InitDll(int *ds_size, int *cs_size, int *generations, int
*young_size, int
 *aging_size, int *code_size)
merger 0.0 (
hunk ./Factor/native/factor.c 68
-       if(!image)
-               return usage();
-       init_factor(image,
+       //if(!image)
+               //return usage();
+       init_factor("factor.image", //image
merger 0.0 (
hunk ./Factor/native/factor.c 50
-static int usage()
+int usage()
merger 0.0 (
hunk ./Factor/native/factor.c 50
-int main(int argc, char** argv)
+static int usage()
+{
+       printf("Usage: factor <image file> [ parameters ... ]\n");
+       printf("Runtime options -- n is a number:\n");
+       printf(" +Dn   Data stack size, kilobytes\n");
+       printf(" +Cn   Call stack size, kilobytes\n");
+       printf(" +Gn   Number of generations, must be >= 2\n");
+       printf(" +Yn   Size of n-1 youngest generations, megabytes\n");
+       printf(" +An   Size of tenured and semi-spaces, megabytes\n");
+       printf(" +Xn   Code heap size, megabytes\n");
+       printf("Other options are handled by the Factor library.\n");
+       printf("See the documentation for details.\n");
+       printf("Send bug reports to Slava Pestov
<slava@factorcode.org>.\n");
+       return FACTOR_ERROR_USAGE;
+}
+
+int run_main()
+{
+       if(!image)
+               return usage();
+       init_factor(image,
+               init_ds_size * 1024,
+               init_cs_size * 1024,
+               init_generations,
+               init_young_size * 1024 * 1024,
+               init_aging_size * 1024 * 1024,
+               init_code_size * 1024 * 1024,
+               init_literal_size * 1024);
+       userenv[ARGS_ENV] = init_args;
+       platform_run();
+       critical_error("run() returned due to empty callstack",0);
+       return 0; /* can't reach this */
+}
+
+#ifdef BUILD_DLL
+EXPORT void InitDll(int *ds_size, int *cs_size, int *generations, int
*young_si
ze, int *aging_size, int *code_size)
+{
+       init_ds_size = ds_size ? *ds_size : init_ds_size,
+       init_cs_size = cs_size ? *cs_size : init_cs_size;
+       init_generations = generations ? *generations : init_generation;
+       init_young_size = young_size ? *young_size : init_young_size;
+       init_aging_size = aging_size ? *aging_size : init_aging_size;
+       init_code_size = code_size ? code_size : init_code_size;
+}
+
+EXPORT void SetImage(char *image_)
+{
+       image = strdup(image_); // hidden malloc
+}
+
+EXPORT void SetEnvironmentVariable(char *line)
hunk ./Factor/native/factor.c 50
+void usage(void)
+{
+       printf("Usage: factor <image file> [ parameters ... ]\n");
+       printf("Runtime options -- n is a number:\n");
+       printf(" +Dn   Data stack size, kilobytes\n");
+       printf(" +Cn   Call stack size, kilobytes\n");
+       printf(" +Gn   Number of generations, must be >= 2\n");
+       printf(" +Yn   Size of n-1 youngest generations, megabytes\n");
+       printf(" +An   Size of tenured and semi-spaces, megabytes\n");
+       printf(" +Xn   Code heap size, megabytes\n");
+       printf("Other options are handled by the Factor library.\n");
+       printf("See the documentation for details.\n");
+       printf("Send bug reports to Slava Pestov
<slava@factorcode.org>.\n");
+}
+
)
)
)
)
)
)
)
)
)
)
hunk ./Factor/native/factor.c 84
-#ifdef BUILD_DLL
-/*
-void InitDll(int *ds_size, int *cs_size, int *generations, int
*young_size, int
 *aging_size, int *code_size)
-{
-       //int ebx, esi;
-    //asm("mov %%esi, %0" : "=m" (esi));
-    //asm("mov %%ebx, %0" : "=m" (ebx));
-       init_ds_size = ds_size ? *ds_size : init_ds_size,
-       init_cs_size = cs_size ? *cs_size : init_cs_size;
-       init_generations = generations ? *generations : init_generations;
-       init_young_size = young_size ? *young_size : init_young_size;
-       init_aging_size = aging_size ? *aging_size : init_aging_size;
-       init_code_size = code_size ? *code_size : init_code_size;
-       //asm("push %esi");
-       //asm("push %ebx");
-       //asm("pop %ebx");
-       //asm("pop %esi");
-
-    //asm("mov %0, %%esi" : : "m" (esi));
-    //asm("mov %0, %%ebx" : : "m" (ebx));
-}
-
-void SetImage(char *image_)
-{
-       image = strdup(image_); // hidden malloc
-}
-
-void SetFactorVariable(char *line)
-{
-       init_args = cons(tag_object(from_c_string(line)),init_args);
-}
-
-int Start()
-{
-       int ret;
-       if(!image)
-               return usage();
-       ret = run_main();
-       return ret;
-}
-*/
-#else
+#ifndef BUILD_DLL
)
)
merger 0.0 (
hunk ./Factor/native/factor.c 71
+*/
merger 0.0 (
hunk ./Factor/native/factor.c 65
-       run_main();
+       int ret;
+       if(!image)
+               return usage();
+       ret = run_main();
+       return ret;
merger 0.0 (
hunk ./Factor/native/factor.c 63
-EXPORT void Start()
+int Start()
merger 0.0 (
hunk ./Factor/native/factor.c 73
-               printf("Usage: factor <image file> [ parameters ... ]\n");
-               printf("Runtime options -- n is a number:\n");
-               printf(" +Dn   Data stack size, kilobytes\n");
-               printf(" +Cn   Call stack size, kilobytes\n");
-               printf(" +Gn   Number of generations, must be >= 2\n");
-               printf(" +Yn   Size of n-1 youngest generations,
megabytes\n");
-               printf(" +An   Size of tenured and semi-spaces,
megabytes\n");
-               printf(" +Xn   Code heap size, megabytes\n");
-               printf("Other options are handled by the Factor
library.\n");
-               printf("See the documentation for details.\n");
-               printf("Send bug reports to Slava Pestov
<slava@factorcode.org>.
\n");
-               return 1;
+               return usage();
merger 0.0 (
hunk ./Factor/native/factor.c 63
+EXPORT void Start()
+{
+       run_main();
+}
+#else
+static int init_main(int argc, char** argv)
+{
+       static CELL i;
hunk ./Factor/native/factor.c 63
-       if(argc == 1)
-       {
-               printf("Usage: factor <image file> [ parameters ... ]\n");
-               printf("Runtime options -- n is a number:\n");
-               printf(" +Dn   Data stack size, kilobytes\n");
-               printf(" +Cn   Call stack size, kilobytes\n");
-               printf(" +Gn   Number of generations, must be >= 2\n");
-               printf(" +Yn   Size of n-1 youngest generations,
megabytes\n");
-               printf(" +An   Size of tenured and semi-spaces,
megabytes\n");
-               printf(" +Xn   Code heap size, megabytes\n");
-               printf("Other options are handled by the Factor
library.\n");
-               printf("See the documentation for details.\n");
-               printf("Send bug reports to Slava Pestov
<slava@factorcode.org>.
\n");
-               return 1;
-       }
+       early_init();
)
)
)
)
)
)
Please report this to bugs@darcs.net
If possible include the output of 'darcs --exact-version'.

C:\repos\Factor>darcs --exact-version
darcs compiled on Dec 27 2005, at 18:20:57
# configured Tue Dec 27 18:01:38 USMST 2005
./configure --disable-mmap

Context:

[Fix mistyped /dev/null, fixes --sendmail-command in Windows
Esa Ilari Vuokko <ei@vuokko.info>**20051129160120]

[Use \ as path separator for GnuPG in Windows -- makes apply --verify work
Esa Ilari Vuokko <ei@vuokko.info>**20051129164533]

[make dangers and recommended use of "Amend" clearer in the docs.
Mark Stosberg <mark@summersault.com>**20051213140523

 I think it's important to be clearer about when it's appropriate to use
'amend'
,
 so I moved some notes into the short and mid-length help texts.
]

[update web page to reflect 1.0.5 as latest stable source.
Tommy Pettersson <ptp@lysator.liu.se>**20051213111137]

[fix handling of absolute paths containing drive letters
Will <will@glozer.net>**20051208054737
 This fixes issue 47 where paths containing drive letters (i.e. on windows)
 are not treated as absolute paths.
]

[bump version to 1.0.6pre1
Tommy Pettersson <ptp@lysator.liu.se>**20051208092839]

[TAG 1.0.5
Tommy Pettersson <ptp@lysator.liu.se>**20051207112730]
msg1991 (view) Author: kowey Date: 2007-08-03.17:57:28
Duplicate of issue194.  Thanks for the report!
msg2391 (view) Author: markstos Date: 2008-01-09.04:23:49
This bug is a duplicate one that is resolved-in-unstable.
History
Date User Action Args
2006-07-03 20:51:54ergcreate
2006-07-03 21:02:50droundysettitle: bug in darcs -> bug in darcs in function reconcile_unwindings
2006-07-04 13:01:40droundysetsuperseder: + pull => bug in function reconcile_unwindings (** minimal test case **)
2007-07-18 10:00:52koweysetnosy: + kowey, beschmi
title: bug in darcs in function reconcile_unwindings -> pull => bug in function reconcile_unwindings (1.0.5ish)
2007-07-18 10:01:27koweysettopic: + Conflicts
title: pull => bug in function reconcile_unwindings (1.0.5ish) -> pull => bug in function reconcile_unwindings (1.0.6pre1)
2007-08-03 17:57:29koweysetstatus: unread -> duplicate
messages: + msg1991
2008-01-09 04:23:50markstossetstatus: duplicate -> resolved-in-unstable
nosy: + markstos
messages: + msg2391
2008-09-04 21:28:43adminsetstatus: resolved-in-unstable -> resolved
nosy: + dagit
2009-08-06 17:35:03adminsetnosy: + jast, Serware, dmitry.kurochkin, darcs-devel, zooko, mornfall, simon, thorkilnaur, - droundy, erg
2009-08-06 20:32:15adminsetnosy: - beschmi
2009-08-10 21:53:02adminsetnosy: + erg, - darcs-devel, zooko, jast, Serware, mornfall
2009-08-10 23:54:52adminsetnosy: - dagit
2009-08-25 17:49:26adminsetnosy: + darcs-devel, - simon
2009-08-27 14:04:42adminsetnosy: tommy, kowey, markstos, darcs-devel, erg, thorkilnaur, dmitry.kurochkin