--- deliantra/server/common/loader.C 2009/10/12 14:00:57 1.134 +++ deliantra/server/common/loader.C 2012/01/27 22:00:39 1.173 @@ -1,9 +1,9 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team - * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team - * Copyright (©) 1992,2007 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992 Frank Tore Johansen * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the @@ -23,13 +23,14 @@ */ #include -#include #include ///////////////////////////////////////////////////////////////////////////// extern archetype *loading_arch; +//+GPL + /* This table is only necessary to convert objects that existed before the * spell object conversion to the new object. It was not practical * to go through every mapping looking for every potion, rod, wand, etc @@ -266,6 +267,7 @@ switch (type) { + case RANGED: case BOW: case WAND: case ROD: @@ -330,8 +332,15 @@ name_pl = name; /* objects now have a materialname. try to patch it in */ - if (!(is_weapon () && level > 0)) - set_materialname (this, map ? map->difficulty : 5, 0); + if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) + select_material (this, map ? map->difficulty : 5); + + if (speed < 0.) + { + flag [FLAG_RANDOM_SPEED] = true; + speed = -speed; + // speed_left will be randomised in instantiate () and copy_to () + } /* only do these when program is first run - a bit * excessive to do this at every run - most of this is @@ -388,7 +397,7 @@ #endif } - /* old style spellcasting object (pretty common) - need to load in the appropiate object */ + /* old style spellcasting object (pretty common) - need to load in the appropriate object */ /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ if ((type == ROD || type == WAND @@ -407,7 +416,7 @@ * in that spell was stored in sp. */ //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); - object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); + object *tmp = archetype::get (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); insert_ob_in_ob (tmp, this); randomitems = 0; } @@ -423,7 +432,7 @@ value = arch->value * inv->value; } - if (QUERY_FLAG (this, FLAG_MONSTER)) + if (this->flag [FLAG_MONSTER]) { if (stats.hp > stats.maxhp) { @@ -436,7 +445,7 @@ move_type = MOVE_WALK; } - if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) + if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER) /* Object will duplicate it's content as part of the * generation process. To do this, we must flag inventory * so it remains unevaluated concerning the randomitems and @@ -480,7 +489,7 @@ } static void -set_move (MoveType &mt, const char *str) +set_move (MoveType &mt, object_thawer &f) { static const struct flagstr { const char *name; @@ -496,13 +505,9 @@ { "all" , MOVE_ALL }, }; - if (!str) - { - mt = 0; - return; - } + const char *str = f.get_str (); - if (isdigit (*str)) + if (!*str || isdigit (*str)) { mt = atoi (str); return; @@ -510,7 +515,7 @@ mt = 0; - for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) + for (str = strtok ((char *)str, " "); str; str = strtok (0, " ")) { bool negate = 0; @@ -520,7 +525,7 @@ str++; } - for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) + for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f) { if (!strcmp (f->name, str)) { @@ -539,25 +544,25 @@ } } +//-GPL + #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () bool object::parse_kv (object_thawer &f) { object *op_inv = inv; - key_value *last_kv = key_values; for (;;) { switch (f.kw) { case KW_uuid: - if (const char *s = f.get_str ()) - if (!uuid.parse (s)) - { - f.parse_warn ("unparseable uuid"); - uuid = UUID::gen (); - } + if (!uuid.parse (f.get_str ())) + { + f.parse_warn ("unparseable uuid"); + uuid = UUID::gen (); + } break; case KW_oid: @@ -585,8 +590,8 @@ // also, appending instead of prepending keeps the // save ordering the same between repeated load/saves. // and finally we do not want any funny effects - CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); - CLEAR_FLAG (tmp, FLAG_REMOVED); + tmp->clr_flag (FLAG_OBJ_ORIGINAL); + tmp->clr_flag (FLAG_REMOVED); if (!op_inv) { @@ -629,12 +634,11 @@ case KW_animation: { - CLEAR_FLAG (this, FLAG_ANIMATE); + this->clr_flag (FLAG_ANIMATE); animation_id = 0; - const char *str = f.get_str (); - if (str && (animation_id = find_animation (str))) - SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here + if (f.has_value () && (animation_id = find_animation (f.get_str ()))) + this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here } break; @@ -642,6 +646,7 @@ case KW_last_sp: f.get (last_sp); break; case KW_last_grace: f.get (last_grace); break; case KW_last_eat: f.get (last_eat); break; + case KW_sl: case KW_speed_left: f.get (speed_left); break; case KW_speed: @@ -660,19 +665,29 @@ break; case KW_face: - face = face_find (f.get_str ()); + face = f.has_value () ? face_find (f.get_str ()) : blank_face; break; case KW_sound: - sound = sound_find (f.get_str ()); - if (!sound) - f.parse_warn ("sound not found"); + if (f.has_value ()) + { + sound = sound_find (f.get_str ()); + if (!sound) + f.parse_warn (format ("sound '%s' not found", f.get_str ())); + } + else + sound = 0; break; case KW_sound_destroy: - sound_destroy = sound_find (f.get_str ()); - if (!sound_destroy) - f.parse_warn ("sound not found"); + if (f.has_value ()) + { + sound_destroy = sound_find (f.get_str ()); + if (!sound_destroy) + f.parse_warn (format ("sound '%s' not found", f.get_str ())); + } + else + sound_destroy = 0; break; case KW_x: f.get (x); break; @@ -723,89 +738,26 @@ case KW_state: f.get (state); break; case KW_move_slow_penalty: f.get (move_slow_penalty); break; case KW_material: f.get (materials); break; //TODO: nuke - case KW_materialname: f.get (materialname); break; + case KW_materialname: f.get (material); break; /* These are the new values */ - case KW_move_block: set_move (move_block, f.get_str ()); break; - case KW_move_allow: set_move (move_allow, f.get_str ()); break; - case KW_move_type: set_move (move_type, f.get_str ()); break; - case KW_move_on: set_move (move_on, f.get_str ()); break; - case KW_move_off: set_move (move_off, f.get_str ()); break; - case KW_move_slow: set_move (move_slow, f.get_str ()); break; - - /* These are all legacy - any new objects should use the move_ .. values */ - case KW_no_pass: - { - if (f.get_sint32 ()) - move_block = MOVE_ALL; - else - move_block = 0; - } - - break; - - /* These are all legacy - any new objects should use the move_ .. values */ - case KW_walk_on: - { - if (f.get_sint32 ()) - move_on |= MOVE_WALK; - else - move_on &= ~MOVE_WALK; - } - - break; - - /* These are all legacy - any new objects should use the move_ .. values */ - case KW_walk_off: - { - if (f.get_sint32 ()) - move_off |= MOVE_WALK; - else - move_off &= ~MOVE_WALK; - } - break; - - /* These are all legacy - any new objects should use the move_ .. values */ - case KW_fly_on: - { - if (f.get_sint32 ()) - move_on |= MOVE_FLY_LOW; - else - move_on &= ~MOVE_FLY_LOW; - } - break; - - /* These are all legacy - any new objects should use the move_ .. values */ - case KW_fly_off: - { - if (f.get_sint32 ()) - move_off |= MOVE_FLY_LOW; - else - move_off &= ~MOVE_FLY_LOW; - } - break; + case KW_move_block: set_move (move_block, f); break; + case KW_move_allow: set_move (move_allow, f); break; + case KW_move_type: set_move (move_type , f); break; + case KW_move_on: set_move (move_on , f); break; + case KW_move_off: set_move (move_off , f); break; + case KW_move_slow: set_move (move_slow , f); break; //TODO: remove these after converting archetypes case KW_can_use_wand: GET_FLAG (this, FLAG_USE_RANGE); break; - /* These are all legacy - any new objects should use the move_ .. values */ - case KW_flying: - { - if (f.get_sint32 ()) - move_type |= MOVE_FLY_LOW; - else - move_type &= ~MOVE_FLY_LOW; - } - break; - - case KW_identified: GET_FLAG (this, FLAG_IDENTIFIED); //TODO: move to check_object or so - if (QUERY_FLAG (this, FLAG_IDENTIFIED)) - CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); + if (this->flag [FLAG_IDENTIFIED]) + this->clr_flag (FLAG_KNOWN_MAGICAL); break; @@ -842,6 +794,7 @@ case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; + case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break; case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; case KW_scared: GET_FLAG (this, FLAG_SCARED); break; case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; @@ -850,7 +803,6 @@ case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; - case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; @@ -904,6 +856,8 @@ case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; + case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break; + case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break; case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; @@ -988,7 +942,7 @@ break; case KW_randomitems: - if (f.get_str ()) + if (f.has_value ()) { randomitems = loading_arch @@ -996,7 +950,10 @@ : treasurelist::find (f.get_str ()); if (!randomitems) - LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); + { + LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); + randomitems = treasurelist::get (shstr_none); // avoid crashes + } } else randomitems = 0; @@ -1022,27 +979,9 @@ return true; case KW_ERROR: - // append as key value pair (do not use kv_set as it prepends) - // we also do not even try to find old values, duplicate keys stay duplicate - { - key_value *kv = new key_value; - - kv->next = 0; - kv->key = shstr (f.kw_str); - kv->value = shstr (f.value); - - if (!last_kv) - key_values = last_kv = kv; - else - { - while (last_kv->next) - last_kv = last_kv->next; - - last_kv->next = kv; - last_kv = kv; - } - } - //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D + // we do not even try to find old values, duplicate keys stay duplicate + // the list gets reversed after loading + kv.add (shstr (f.kw_str), shstr (f.value)); break; default: @@ -1064,8 +1003,8 @@ if (!arch) { - LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); - arch = archetype::find ("earthwall"); + LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ()); + arch = archetype::find (shstr_earthwall); } assert (arch); //D maybe use exception handling of sorts? @@ -1083,6 +1022,10 @@ return 0; } + // the loader reverses the ordering of kv-pairs, so we reverse it again after loading + // that greatly simplifies the loading code. + op->kv.reverse (); + op->post_load_check (); return op; } @@ -1096,65 +1039,14 @@ int set_variable (object *op, char *buf) { - object_thawer f (buf, (AV *)0); + object_thawer f (format ("%s\nend", buf), (AV *)0); return op->parse_kv (f); } -/* This returns a string of the integer movement type */ -#if 0 -// unused function -static char * -get_string_move_type (MoveType mt) -{ - static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; - int i, all_count = 0, count; - - strcpy (retbuf, ""); - strcpy (retbuf_all, " all"); - - /* Quick check, and probably fairly common */ - if (mt == MOVE_ALL) - return retbuf_all + 1; - if (mt == 0) - { - strcpy (retbuf, "0"); - return retbuf; - } - - /* We basically slide the bits down. Why look at MOVE_ALL? - * because we may want to return a string like 'all -swim', - * and if we just looked at mt, we couldn't get that. - */ - for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++) - { - if (mt & (1 << count)) - { - strcat (retbuf, " "); - strcat (retbuf, move_name[count]); - } - else - { - strcat (retbuf_all, " -"); - strcat (retbuf_all, move_name[count]); - all_count++; - } - } - /* Basically, if there is a single negation, return it, eg - * 'all -swim'. But more than that, just return the - * enumerated values. It doesn't make sense to return - * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' - */ - if (all_count <= 1) - return retbuf_all + 1; - else - return retbuf + 1; -} -#endif - -// compare *op against *tmp and output differences +// compare *op against *arch and output differences static void -write_diff (object_freezer &f, object *op, object *tmp) +write_diff (object_freezer &f, object *op, object *arch) { static const keyword resist_save[NROFATTACKS] = { # define def(uc, lc, name, plus, change) KW_resist_ ## lc, @@ -1177,9 +1069,9 @@ KW_unpaid, KW_can_use_shield, KW_no_pick, - KW_NULL, // walk_on - KW_NULL, // no_pass + KW_is_transparent_floor, /* 10 */ + KW_NULL, // no_pass KW_is_animated, KW_NULL, // slow_move KW_NULL, // flying @@ -1189,8 +1081,8 @@ KW_is_thrown, KW_auto_apply, KW_treasure_env, - KW_player_sold, /* 20 */ + KW_player_sold, KW_see_invisible, KW_can_roll, KW_overlay_floor, @@ -1200,8 +1092,8 @@ KW_NULL, // fly_off KW_is_used_up, KW_identified, - KW_reflecting, /* 30 */ + KW_reflecting, KW_changing, KW_splitting, KW_hitback, @@ -1211,10 +1103,10 @@ KW_scared, KW_unaggressive, KW_reflect_missile, - KW_reflect_spell, /* 40 */ + KW_reflect_spell, KW_no_magic, - KW_no_fix_player, + KW_NULL, KW_is_lightable, KW_tear_down, KW_run_away, @@ -1222,8 +1114,8 @@ KW_NULL, // an_pass_thru KW_pick_up, KW_unique, - KW_no_drop, /* 50 */ + KW_no_drop, KW_NULL, // wizcast KW_can_cast_spell, KW_can_use_scroll, @@ -1233,8 +1125,8 @@ KW_can_use_weapon, KW_can_use_ring, KW_has_ready_range, - KW_has_ready_bow, /* 60 */ + KW_has_ready_bow, KW_xrays, KW_NULL, KW_is_floor, @@ -1244,8 +1136,8 @@ KW_stand_still, KW_random_move, KW_only_attack, - KW_confused, /* 70 */ + KW_confused, KW_stealth, KW_NULL, KW_NULL, @@ -1255,8 +1147,8 @@ KW_known_magical, KW_known_cursed, KW_can_use_skill, - KW_been_applied, /* 80 */ + KW_been_applied, KW_has_ready_scroll, KW_can_use_rod, KW_precious, @@ -1266,8 +1158,8 @@ KW_is_wooded, KW_is_hilly, KW_has_ready_skill, - KW_has_ready_weapon, /* 90 */ + KW_has_ready_weapon, KW_no_skill_ident, KW_is_blind, KW_can_see_in_dark, @@ -1277,66 +1169,117 @@ KW_one_hit, KW_NULL, KW_berserk, - KW_neutral, /* 100 */ + KW_neutral, KW_no_attack, KW_no_damage, KW_obj_original, - KW_NULL, + KW_random_speed, KW_activate_on_push, KW_activate_on_release, KW_is_water, KW_use_content_on_gen, KW_NULL, - KW_is_buildable, /* 110 */ + KW_is_buildable, KW_destroy_on_death, KW_NULL, }; + // obj_original is the only commonly differing flag between archetype + // and object, so special-case it here to be able to skip the loop + static const struct flagmask : object::flags_t + { + flagmask () + { + for (int i = 0; i < NUM_FLAGS; i++) + if (flag_names [i]) + set (i); + } + } flagmask; + /* This saves the key/value lists. We do it first so that any * keys that match field names will be overwritten by the loader. */ - for (key_value *kv = op->key_values; kv; kv = kv->next) - if (!tmp->key_values || tmp->kv (kv->key) != kv->value) + for (key_value *kv = op->kv.first; kv; kv = kv->next) + if (arch->kv.empty () || arch->kv [kv->key] != kv->value) f.put (kv->key, kv->value); - /* We don't need to worry about the arch's extra fields - they - * will get taken care of the copy_to method. - */ - if (op->uuid) - f.put (KW_uuid, op->uuid.c_str ()); + { + // highly optimised - this is often 25% of all data written + char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1); + char *ptr = cur; + + memcpy (ptr, "uuid ", sizeof ("uuid ") - 1); + ptr += sizeof ("uuid ") - 1; + ptr = op->uuid.append (ptr); + *ptr++ = '\n'; + + f.alloc (ptr - cur); + } -#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) -#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) +#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v) +#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v) - if (object *owner = op->owner) - f.put (KW_owner, static_cast(owner->ref ())); + CMP_OUT (x); + CMP_OUT (y); + + CMP_OUT (type); + CMP_OUT (subtype); + CMP_OUT (direction); CMP_OUT (name); CMP_OUT (name_pl); - CMP_OUT (custom_name); + CMP_OUT (speed); + + // speed_left is a major time-burner, and has good locality, so + // we use a simple lookup-cache to avoid the very slow printf. + if (op->speed_left != arch->speed_left) + { + static double last_speed_left = 0.; + static char last_speed_left_str [256] = "sl 0\n"; + static int last_speed_left_len = sizeof ("sl 0\n") - 1; + + if (last_speed_left != op->speed_left) + { + last_speed_left = op->speed_left; + last_speed_left_len = sizeof ("sl ") - 1 + + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left); + } + + f.add (last_speed_left_str, last_speed_left_len); + } + CMP_OUT (title); CMP_OUT (race); - CMP_OUT (skill); CMP_OUT (slaying); + CMP_OUT (skill); + CMP_OUT (tag); + CMP_OUT (custom_name); + + if (object *owner = op->owner) + if (const char *ref = owner->ref ()) + f.put (KW(owner), ref); + + // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved + CMP_OUT (other_arch); - if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); - if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); + if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg ); + if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore); - if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); - if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); - if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); + if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0); + if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0); + if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0); - if (op->animation_id != tmp->animation_id) + if (op->animation_id != arch->animation_id) if (op->has_anim ()) - f.put (KW_animation, op->anim ().name); + f.put (KW(animation), op->anim ().name); else { - f.put (KW_animation, (const char *)0); + f.put (KW(animation)); op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? } @@ -1357,7 +1300,7 @@ CMP_OUT2 (exp, stats.exp); CMP_OUT (perm_exp); - CMP_OUT (expmul); + //CMP_OUT (expmul); CMP_OUT2 (food, stats.food); CMP_OUT2 (dam, stats.dam); @@ -1365,28 +1308,25 @@ CMP_OUT2 (wc, stats.wc); CMP_OUT2 (ac, stats.ac); - CMP_OUT (x); - CMP_OUT (y); - CMP_OUT (speed); - CMP_OUT (speed_left); CMP_OUT2 (move_state, move_status); CMP_OUT (attack_movement); CMP_OUT (nrof); CMP_OUT (level); - CMP_OUT (direction); - CMP_OUT (type); - CMP_OUT (subtype); CMP_OUT (attacktype); + // using memcmp here seems to be a loss - is gcc vectorising? for (int i = 0; i < NROFATTACKS; i++) - if (expect_false (op->resist[i] != tmp->resist[i])) + if (expect_false (op->resist[i] != arch->resist[i])) f.put (resist_save[i], op->resist[i]); CMP_OUT (path_attuned); CMP_OUT (path_repelled); CMP_OUT (path_denied); + CMP_OUT2 (material, materials);//TODO: nuke - CMP_OUT (materialname); + if (op->material != arch->material) + f.put (KW(materialname), op->material->name); + CMP_OUT (value); CMP_OUT (carrying); CMP_OUT (weight); @@ -1401,9 +1341,10 @@ if (op->flag [FLAG_IS_LINKED]) if (auto (ol, op->find_link ())) - f.put (KW_connected, ol->id); + f.put (KW(connected), ol->id); CMP_OUT (randomitems); + CMP_OUT2 (container, weight_limit); CMP_OUT (run_away); @@ -1428,15 +1369,29 @@ CMP_OUT (move_slow); CMP_OUT (move_slow_penalty); - if (op->flag != tmp->flag) - for (int i = 0; i <= NUM_FLAGS; i++) - if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) - f.put (flag_names [i], op->flag [i] ? "1" : "0"); + object::flags_t diff = (op->flag ^ arch->flag) & flagmask; + +#if stdcpp // we need gcc, sorry + if (diff [FLAG_OBJ_ORIGINAL]) + f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); + + diff.reset (FLAG_OBJ_ORIGINAL); + + // quickly test whether any other flags differ + if (expect_true (diff.any ())) + for (int i = 0; i < NUM_FLAGS; i++) + if (expect_false (diff [i])) + f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); +#else + // use sgi extensions + for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i)) + f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); +#endif - // save body locations + // save body locations. gcc's memcmp does an abysmal job when used for (int i = 0; i < NUM_BODY_LOCATIONS; i++) - if (expect_false (op->slot[i].info != tmp->slot[i].info)) - f.put (body_locations[i].save_name, op->slot[i].info); + if (expect_false (op->slot[i].info != arch->slot[i].info)) + f.put (body_locations[i].kw, op->slot[i].info); } /* @@ -1447,14 +1402,14 @@ bool object::write (object_freezer &f) { - if (is_arch ()) + if (expect_false (is_arch ())) { - f.put (KW_object, arch->archname); + f.put (KW(object), arch->archname); write_diff (f, this, archetype::empty); } else { - f.put (KW_arch, arch->archname); + f.put (KW(arch), arch->archname); write_diff (f, this, arch); } @@ -1462,7 +1417,7 @@ tmp->write (f); f.put (this); - f.put (KW_end); + f.put (KW(end)); return true; } @@ -1478,6 +1433,8 @@ for (;;) { + coroapi::cede_to_tick (); + switch (f.kw) { case KW_region: